Allow to setupe gradle properties

detekt · Mar 8, 2024 · e5885ce · e5885ce
1 parent 3fc226d
commit e5885ce
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/...dle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektReportMergeSpec.kt b/...dle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektReportMergeSpec.kt
@@ -45,22 +45,25 @@ class DetektReportMergeSpec {
             )
         }
 
-        val gradleRunner = DslGradleRunner(projectLayout, builder.gradleBuildName, buildFileContent)
+        val gradleRunner = DslGradleRunner(
+            projectLayout,
+            builder.gradleBuildName,
+            buildFileContent,
+            gradleProperties = mapOf("detekt.use.worker.api" to "false"), // because of https://github.com/gradle/gradle/issues/28034
+        )
         gradleRunner.setupProject()
         gradleRunner.runTasksAndExpectFailure("detekt", "sarifReportMerge", "--continue") { result ->
             assertThat(result.output).contains("FAILURE: Build completed with 2 failures.")
             assertThat(result.output).containsIgnoringWhitespaces(
                 """
                     Execution failed for task ':child1:detekt'.
-                    > A failure occurred while executing io.gitlab.arturbosch.detekt.invoke.DetektWorkAction
-                        > Analysis failed with 2 issues.
+                    > Analysis failed with 2 issues.
                 """.trimIndent()
             )
             assertThat(result.output).containsIgnoringWhitespaces(
                 """
                     Execution failed for task ':child2:detekt'.
-                    > A failure occurred while executing io.gitlab.arturbosch.detekt.invoke.DetektWorkAction
-                        > Analysis failed with 4 issues.
+                    > Analysis failed with 4 issues.
                 """.trimIndent()
             )
             assertThat(projectFile("build/reports/detekt/detekt.sarif")).doesNotExist()
@@ -110,22 +113,25 @@ class DetektReportMergeSpec {
             )
         }
 
-        val gradleRunner = DslGradleRunner(projectLayout, builder.gradleBuildName, buildFileContent)
+        val gradleRunner = DslGradleRunner(
+            projectLayout,
+            builder.gradleBuildName,
+            buildFileContent,
+            gradleProperties = mapOf("detekt.use.worker.api" to "false"), // because of https://github.com/gradle/gradle/issues/28034
+        )
         gradleRunner.setupProject()
         gradleRunner.runTasksAndExpectFailure("detekt", "xmlReportMerge", "--continue") { result ->
             assertThat(result.output).contains("FAILURE: Build completed with 2 failures.")
             assertThat(result.output).containsIgnoringWhitespaces(
                 """
                     Execution failed for task ':child1:detekt'.
-                    > A failure occurred while executing io.gitlab.arturbosch.detekt.invoke.DetektWorkAction
-                        > Analysis failed with 2 issues.
+                    > Analysis failed with 2 issues.
                 """.trimIndent()
             )
             assertThat(result.output).containsIgnoringWhitespaces(
                 """
                     Execution failed for task ':child2:detekt'.
-                    > A failure occurred while executing io.gitlab.arturbosch.detekt.invoke.DetektWorkAction
-                        > Analysis failed with 4 issues.
+                    > Analysis failed with 4 issues.
                 """.trimIndent()
             )
             assertThat(projectFile("build/reports/detekt/detekt.xml")).doesNotExist()