diff --git a/plugin/src/test/groovy/com/novoda/staticanalysis/internal/ktlint/KtlintIntegrationTest.groovy b/plugin/src/test/groovy/com/novoda/staticanalysis/internal/ktlint/KtlintIntegrationTest.groovy index 111b957..f31bb0e 100644 --- a/plugin/src/test/groovy/com/novoda/staticanalysis/internal/ktlint/KtlintIntegrationTest.groovy +++ b/plugin/src/test/groovy/com/novoda/staticanalysis/internal/ktlint/KtlintIntegrationTest.groovy @@ -35,8 +35,7 @@ class KtlintIntegrationTest { [TestProjectRule.forKotlinProject(), '5.1.0', 'ktlint-main.txt'], [TestProjectRule.forAndroidKotlinProject(), '5.1.0', 'ktlint-debug.txt'], [TestProjectRule.forKotlinProject(), '6.1.0', 'ktlintMainCheck.txt'], - // Fails for our test setup since we have custom sourceDirs. https://github.com/JLLeitschuh/ktlint-gradle/issues/153 - // [TestProjectRule.forAndroidKotlinProject(), '6.1.0', 'ktlintDebugCheck.txt'], + [TestProjectRule.forAndroidKotlinProject(), '6.1.0', 'ktlintDebugCheck.txt'], [TestProjectRule.forKotlinProject(), '6.2.1', 'ktlintMainCheck.txt'], [TestProjectRule.forAndroidKotlinProject(), '6.2.1', 'ktlintMainCheck.txt'], [TestProjectRule.forKotlinProject(), '6.3.1', 'ktlintMainCheck.txt'], @@ -116,7 +115,7 @@ class KtlintIntegrationTest { private TestProject createProjectWith(File sources, int maxErrors = 0) { projectRule.newProject() .withPlugin('org.jlleitschuh.gradle.ktlint', ktlintVersion) - .withSourceSet('main', sources) + .copyIntoSourceSet('main', sources) .withPenalty("""{ maxWarnings = 0 maxErrors = ${maxErrors} diff --git a/plugin/src/test/groovy/com/novoda/test/TestProject.groovy b/plugin/src/test/groovy/com/novoda/test/TestProject.groovy index c8e7efd..de906a5 100644 --- a/plugin/src/test/groovy/com/novoda/test/TestProject.groovy +++ b/plugin/src/test/groovy/com/novoda/test/TestProject.groovy @@ -63,6 +63,13 @@ ${project.additionalConfiguration} file.text = text } + public T copyIntoSourceSet(String sourceSet, File srcDir) { + sourceDir.listFiles().each { + withFile(it, "src/${sourceSet}/java/${it.name}") + } + return this + } + public T withSourceSet(String sourceSet, File... srcDirs) { sourceSets[sourceSet] = srcDirs return this