Defer more test configurations

diffplug · Jan 24, 2023 · 5955883 · 5955883
1 parent 2353037
commit 5955883
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/_ext/eclipse-wtp/build.gradle b/_ext/eclipse-wtp/build.gradle
@@ -100,7 +100,7 @@ sourceSets {
  * All test classes need to run separately since they all instatiate different setups of the
  * Eclipse framework.
  */
-test {
+tasks.withType(Test).configureEach {
 	//Skip default tests, which would run every test case.
 	exclude '**'
 }

diff --git a/_ext/gradle/java-setup.gradle b/_ext/gradle/java-setup.gradle
@@ -22,4 +22,6 @@ dependencies {
 	testImplementation project(':testlib')
 }
 
-test { useJUnitPlatform() }
+tasks.withType(Test).configureEach {
+	useJUnitPlatform()
+}
diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
@@ -7,7 +7,7 @@ def special = [
 ]
 
 boolean isCiServer = System.getenv().containsKey("CI")
-tasks.named('test') {
+tasks.withType(Test).configureEach {
 	// See com.diffplug.spotless.tag package for available JUnit 5 @Tag annotations
 	useJUnitPlatform {
 		excludeTags special as String[]

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
 
 apply from: rootProject.file('gradle/special-tests.gradle')
-tasks.named('test') {
+tasks.withType(Test).configureEach {
 	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
 		// needed for EclipseCdtFormatterStepTest
 		jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'

diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
@@ -28,7 +28,7 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')
-tasks.named('test') {
+tasks.withType(Test).configureEach {
 	testLogging.showStandardStreams = true
 }
 

diff --git a/testlib/build.gradle b/testlib/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 spotbugs { reportLevel = 'high' } // low|medium|high (low = sensitive to even minor mistakes)
 
 apply from: rootProject.file('gradle/special-tests.gradle')
-tasks.named('test') {
+tasks.withType(Test).configureEach {
 	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
 		// for Antlr4FormatterStepTest and KtLintStepTest
 		def args = [