Allow to setupe gradle properties

detekt · Mar 8, 2024 · 107ff27 · 107ff27
1 parent 239ca84
commit 107ff27
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 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"),
+        )
         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"),
+        )
         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()

diff --git a/...dle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/DslGradleRunner.kt b/...dle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/DslGradleRunner.kt
@@ -22,6 +22,7 @@ constructor(
     val gradleVersionOrNone: String? = null,
     val dryRun: Boolean = false,
     val jvmArgs: String = "-Xmx2g -XX:MaxMetaspaceSize=1g",
+    gradleProperties: Map<String, String> = emptyMap(),
     val projectScript: Project.() -> Unit = {}
 ) {
 
@@ -34,6 +35,9 @@ constructor(
         include(${projectLayout.submodules.joinToString(",") { "\"${it.name}\"" }})
     """.trimIndent()
 
+    private val propertiesContent = gradleProperties.toList()
+        .joinToString(separator = "\n") { (key, value) -> "$key=$value" }
+
     @Language("xml")
     private val baselineContent = """
         <some>
@@ -65,6 +69,7 @@ constructor(
     fun setupProject() {
         writeProjectFile(buildFileName, mainBuildFileContent)
         writeProjectFile(SETTINGS_FILENAME, settingsContent)
+        writeProjectFile(PROPERTIES_FILENAME, propertiesContent)
         configFileOrNone?.let { writeProjectFile(it, configFileContent) }
         baselineFiles.forEach { file -> writeProjectFile(file, baselineContent) }
         projectLayout.srcDirs.forEachIndexed { srcDirIdx, sourceDir ->
@@ -170,7 +175,8 @@ constructor(
     }
 
     companion object {
-        const val SETTINGS_FILENAME = "settings.gradle"
+        private const val SETTINGS_FILENAME = "settings.gradle"
+        private const val PROPERTIES_FILENAME = "gradle.properties"
         private const val DETEKT_TASK = "detekt"
     }
 }