Mini tidy of test config in build files (#7032)

* Use JUnitJupiter for all test suites * Simplify syntax * Remove redundant project path * Use cleaner syntax where available
detekt · Mar 9, 2024 · 9403c84 · 9403c84
1 parent 8e952c8
commit 9403c84
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/build-logic/src/main/kotlin/module.gradle.kts b/build-logic/src/main/kotlin/module.gradle.kts
@@ -22,7 +22,6 @@ val versionCatalog = versionCatalogs.named("libs")
 jacoco.toolVersion = versionCatalog.findVersion("jacoco").get().requiredVersion
 
 tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
     maxParallelForks = if (providers.environmentVariable("CI").isPresent) {
         Runtime.getRuntime().availableProcessors()
     } else {
@@ -68,7 +67,7 @@ project.tasks.withType<UsesKotlinJavaToolchain>().configureEach {
 
 testing {
     suites {
-        getByName("test", JvmTestSuite::class) {
+        withType<JvmTestSuite> {
             useJUnitJupiter(versionCatalog.findVersion("junit").get().requiredVersion)
         }
     }

diff --git a/code-coverage-report/build.gradle.kts b/code-coverage-report/build.gradle.kts
@@ -6,6 +6,9 @@ reporting {
     reports {
         create("jacocoMergedReport", JacocoCoverageReport::class) {
             testType = TestSuiteType.UNIT_TEST
+            reportTask {
+                dependsOn(":detekt-generator:generateDocumentation")
+            }
         }
     }
 }
@@ -42,7 +45,3 @@ dependencies {
     jacocoAggregation(projects.detektTooling)
     jacocoAggregation(projects.detektUtils)
 }
-
-tasks.withType<JacocoReport>().configureEach {
-    dependsOn(":detekt-generator:generateDocumentation")
-}
diff --git a/detekt-cli/build.gradle.kts b/detekt-cli/build.gradle.kts
@@ -70,7 +70,7 @@ tasks {
 
     processTestResources {
         inputs.property("kotlin-version", libs.versions.kotlin.get())
-        filter(ReplaceTokens::class, "tokens" to mapOf("kotlinVersion" to inputs.properties["kotlin-version"]))
+        filter<ReplaceTokens>("tokens" to mapOf("kotlinVersion" to inputs.properties["kotlin-version"]))
         filteringCharset = "UTF-8"
     }
 

diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts
@@ -43,12 +43,10 @@ testing {
                 implementation(gradleKotlinDsl())
             }
         }
-        register("functionalTest", JvmTestSuite::class) {
-            useJUnitJupiter(libs.versions.junit.get())
-
+        register<JvmTestSuite>("functionalTest") {
             dependencies {
                 implementation(libs.assertj)
-                implementation(testFixtures(project(":")))
+                implementation(testFixtures(project()))
             }
 
             targets {