Modernize testing frameworks and test fixtures

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 	@Suppress("DSL_SCOPE_VIOLATION") // TODEL https://github.com/gradle/gradle/issues/22797
 	alias(libs.plugins.nexus)
 	id("net.twisterrob.gradle.build.module.root")
-	id("idea")
+	id("org.gradle.idea")
 }
 
 val projectVersion: String by project
@@ -109,6 +109,11 @@ subprojects {
 			properties["net.twisterrob.gradle.runner.clearAfterSuccess"] = "false"
 			properties["net.twisterrob.gradle.runner.clearAfterFailure"] = "false"
 		}
+		val tmpdir = project.property("net.twisterrob.test.java.io.tmpdir").toString()
+		if (tmpdir.isNotEmpty()) {
+			// Used in GradleTestKitDirRelocator.
+			properties["java.io.tmpdir"] = tmpdir
+		}
 		properties.forEach { (name, value) -> inputs.property(name, value) }
 		properties.forEach { (name, value) -> value?.let { jvmArgs("-D${name}=${value}") } }
 	}
@@ -121,15 +126,22 @@ subprojects {
 		)
 		val properties = propertyNamesToReplace.keysToMap { project.property(it) }
 		properties.forEach { (name, value) -> inputs.property(name, value) }
-		filesMatching(listOf("**/build.gradle", "**/settings.gradle")) {
+		val processedFiles = listOf(
+			"**/build.gradle",
+			"**/build.gradle.kts",
+			"**/settings.gradle",
+			"**/settings.gradle.kts",
+			"**/gradle.properties",
+		)
+		filesMatching(processedFiles) {
 			val replacements = properties + mapOf(
 				// custom replacements (`"name" to value`) would come here
 			)
 			filter(mapOf("tokens" to replacements), org.apache.tools.ant.filters.ReplaceTokens::class.java)
 		}
 	}
 
-	plugins.withId("kotlin") {
+	plugins.withId("org.jetbrains.kotlin.jvm") {
 		dependencies {
 			// Make sure we don't have many versions of Kotlin lying around.
 			add("compileOnly", enforcedPlatform(deps.kotlin.bom))
@@ -144,12 +156,10 @@ subprojects {
 			add("api", deps.kotlin.stdlib)
 			add("api", deps.kotlin.stdlib.jdk8)
 			add("api", deps.kotlin.reflect)
-
-			add("testImplementation", deps.kotlin.test)
 		}
 	}
 
-	plugins.withId("java") {
+	plugins.withId("org.gradle.java") {
 		val java = extensions.getByName<JavaPluginExtension>("java")
 		java.sourceCompatibility = JavaVersion.toVersion(deps.versions.java.get())
 		java.targetCompatibility = JavaVersion.toVersion(deps.versions.java.get())

checkers/checkstyle/build.gradle.kts

@@ -35,6 +35,9 @@ dependencies {
 
 	testImplementation(projects.test.internal)
 	testImplementation(projects.compat.agpBase)
+	testInjectedPluginClasspath(libs.android.gradle) {
+		version { require(property("net.twisterrob.test.android.pluginVersion").toString()) }
+	}
 
 	testFixturesImplementation(projects.test.internal)
 }

checkers/checkstyle/src/test/kotlin/net/twisterrob/gradle/checkstyle/CheckStylePluginTest.kt

@@ -5,9 +5,14 @@ import net.twisterrob.gradle.checkstyle.test.CheckstyleTestResources
 import net.twisterrob.gradle.common.TaskConfigurator
 import net.twisterrob.gradle.test.GradleRunnerRule
 import net.twisterrob.gradle.test.GradleRunnerRuleExtension
+import net.twisterrob.gradle.test.assertFailed
 import net.twisterrob.gradle.test.assertHasOutputLine
 import net.twisterrob.gradle.test.assertNoOutputLine
+import net.twisterrob.gradle.test.assertNoSource
+import net.twisterrob.gradle.test.assertSuccess
+import net.twisterrob.gradle.test.assertUpToDate
 import net.twisterrob.gradle.test.failReason
+import net.twisterrob.gradle.test.fixtures.ContentMergeMode
 import net.twisterrob.gradle.test.minus
 import net.twisterrob.gradle.test.runBuild
 import net.twisterrob.gradle.test.runFailingBuild
@@ -24,7 +29,6 @@ import org.hamcrest.Matchers.startsWith
 import org.intellij.lang.annotations.Language
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
-import kotlin.test.assertEquals
 
 /**
  * @see CheckStylePlugin
@@ -38,12 +42,15 @@ class CheckStylePluginTest : BaseIntgTest() {
 	}
 
 	override lateinit var gradle: GradleRunnerRule
+
 	private val checkstyle = CheckstyleTestResources()
 
 	@Test fun `does not apply to empty project`() {
 		@Language("gradle")
 		val script = """
-			apply plugin: 'net.twisterrob.gradle.plugin.checkstyle'
+			plugins {
+				id("net.twisterrob.gradle.plugin.checkstyle")
+			}
 		""".trimIndent()
 
 		val result = gradle.runFailingBuild {
@@ -56,8 +63,10 @@ class CheckStylePluginTest : BaseIntgTest() {
 	@Test fun `does not apply to a Java project`() {
 		@Language("gradle")
 		val script = """
-			apply plugin: 'java'
-			apply plugin: 'net.twisterrob.gradle.plugin.checkstyle'
+			plugins {
+				id("org.gradle.java")
+				id("net.twisterrob.gradle.plugin.checkstyle")
+			}
 		""".trimIndent()
 
 		val result = gradle.runFailingBuild {
@@ -70,33 +79,39 @@ class CheckStylePluginTest : BaseIntgTest() {
 	@Test fun `applies without a hitch to an Android project`() {
 		@Language("gradle")
 		val script = """
-			apply plugin: 'net.twisterrob.gradle.plugin.checkstyle'
+			plugins {
+				id("net.twisterrob.gradle.plugin.checkstyle")
+			}
 		""".trimIndent()
 
 		val result = gradle.runBuild {
 			basedOn("android-root_app")
 			run(script, "checkstyleEach")
 		}
 
-		assertEquals(TaskOutcome.UP_TO_DATE, result.task(":checkstyleEach")!!.outcome)
-		assertEquals(TaskOutcome.NO_SOURCE, result.task(":checkstyleDebug")!!.outcome)
-		assertEquals(TaskOutcome.NO_SOURCE, result.task(":checkstyleRelease")!!.outcome)
+		result.assertUpToDate(":checkstyleEach")
+		result.assertNoSource(":checkstyleDebug")
+		result.assertNoSource(":checkstyleRelease")
 	}
 
 	@Test fun `applies to all types of subprojects`() {
+		gradle.basedOn("android-all_kinds")
 		gradle.file(checkstyle.empty.config, "config", "checkstyle", "checkstyle.xml")
-		@Language("gradle")
-		val script = """
-			allprojects {
-				apply plugin: 'net.twisterrob.gradle.plugin.checkstyle'
-			}
-		""".trimIndent()
 		// TODO add :dynamic-feature
 		val modules = arrayOf(":app", ":library", ":library:nested", ":test")
+		modules.forEach { modulePath ->
+			@Language("gradle")
+			val subProject = """
+				plugins {
+					id("net.twisterrob.gradle.plugin.checkstyle")
+				}
+			""".trimIndent()
+			val subPath = modulePath.substringAfter(':').split(":").toTypedArray()
+			gradle.file(subProject, ContentMergeMode.MERGE_GRADLE, *subPath, "build.gradle")
+		}
 
 		val result = gradle.runBuild {
-			basedOn("android-all_kinds")
-			run(script, "checkstyleEach")
+			run(null, "checkstyleEach")
 		}
 
 		val exceptions = arrayOf(
@@ -131,7 +146,9 @@ class CheckStylePluginTest : BaseIntgTest() {
 
 			@Language("gradle")
 			val subProject = """
-				apply plugin: 'com.android.library'
+				plugins {
+					id("com.android.library")
+				}
 				android.namespace = "project${modulePath.replace(":", ".")}"
 			""".trimIndent()
 
@@ -143,8 +160,11 @@ class CheckStylePluginTest : BaseIntgTest() {
 
 		@Language("gradle")
 		val rootProject = """
+			plugins {
+				id("net.twisterrob.gradle.plugin.checkstyle") apply false
+			}
 			allprojects {
-				apply plugin: 'net.twisterrob.gradle.plugin.checkstyle'
+				apply plugin: "net.twisterrob.gradle.plugin.checkstyle"
 			}
 		""".trimIndent()
 
@@ -167,7 +187,6 @@ class CheckStylePluginTest : BaseIntgTest() {
 	}
 
 	@Test fun `applies to individual subprojects`() {
-
 		val modules = arrayOf(
 			":module1",
 			":module2",
@@ -184,13 +203,17 @@ class CheckStylePluginTest : BaseIntgTest() {
 			@Language("gradle")
 			val subProject = if (module in applyTo)
 				"""
-					apply plugin: 'net.twisterrob.gradle.plugin.checkstyle'
-					apply plugin: 'com.android.library'
+					plugins {
+						id("net.twisterrob.gradle.plugin.checkstyle")
+						id("com.android.library")
+					}
 					android.namespace = "project${module.replace(":", ".")}"
 				""".trimIndent()
 			else
 				"""
-					apply plugin: 'com.android.library'
+					plugins {
+						id("com.android.library")
+					}
 					android.namespace = "project${module.replace(":", ".")}"
 				""".trimIndent()
 
@@ -227,7 +250,9 @@ class CheckStylePluginTest : BaseIntgTest() {
 
 		@Language("gradle")
 		val applyCheckstyle = """
-			apply plugin: 'net.twisterrob.gradle.plugin.checkstyle'
+			plugins {
+				id("net.twisterrob.gradle.plugin.checkstyle")
+			}
 			tasks.withType(${Checkstyle::class.java.name}).configureEach {
 				// output all violations to the console so that we can parse the results
 				showViolations = true
@@ -238,7 +263,7 @@ class CheckStylePluginTest : BaseIntgTest() {
 			run(applyCheckstyle, ":checkstyleDebug")
 		}
 
-		assertEquals(TaskOutcome.FAILED, result.task(":checkstyleDebug")!!.outcome)
+		result.assertFailed(":checkstyleDebug")
 		assertThat(result.failReason, containsString("Checkstyle rule violations were found"))
 		result.assertHasOutputLine(Regex(""".*\[ERROR] src.main.java.Checkstyle\.java:1: .*? \[Header]"""))
 	}
@@ -250,7 +275,9 @@ class CheckStylePluginTest : BaseIntgTest() {
 
 		@Language("gradle")
 		val build = """
-			apply plugin: 'net.twisterrob.gradle.plugin.checkstyle'
+			plugins {
+				id("net.twisterrob.gradle.plugin.checkstyle")
+			}
 			tasks.withType(${Checkstyle::class.java.name}).configureEach {
 				// output all violations to the console so that we can parse the results
 				showViolations = true
@@ -262,7 +289,7 @@ class CheckStylePluginTest : BaseIntgTest() {
 			run(build, ":checkstyleDebug")
 		}
 
-		assertEquals(TaskOutcome.FAILED, result.task(":checkstyleDebug")!!.outcome)
+		result.assertFailed(":checkstyleDebug")
 		assertThat(result.failReason, containsString("Checkstyle rule violations were found"))
 		result.assertHasOutputLine(Regex(""".*custom.Checkstyle\.java:1: .*? \[Header]"""))
 	}
@@ -279,7 +306,9 @@ class CheckStylePluginTest : BaseIntgTest() {
 
 		@Language("gradle")
 		val build = """
-			apply plugin: 'net.twisterrob.gradle.plugin.checkstyle'
+			plugins {
+				id("net.twisterrob.gradle.plugin.checkstyle")
+			}
 			tasks.withType(${Checkstyle::class.java.name}).configureEach {
 				// output all violations to the console so that we can parse the results
 				showViolations = true
@@ -297,7 +326,7 @@ class CheckStylePluginTest : BaseIntgTest() {
 			run(build, ":checkstyleDebug")
 		}
 
-		assertEquals(TaskOutcome.FAILED, result.task(":checkstyleDebug")!!.outcome)
+		result.assertFailed(":checkstyleDebug")
 		assertThat(result.failReason, containsString("Checkstyle rule violations were found"))
 		result.assertHasOutputLine(Regex(""".*com.example.foo.Checkstyle\.java:1: .*? \[Header]"""))
 		result.assertNoOutputLine(Regex(""".*com.example.bar.Checkstyle\.java.*"""))
@@ -312,18 +341,26 @@ class CheckStylePluginTest : BaseIntgTest() {
 
 		@Language("gradle")
 		val applyCheckstyle = """
-			apply plugin: 'net.twisterrob.gradle.plugin.checkstyle'
+			plugins {
+				id("net.twisterrob.gradle.plugin.checkstyle")
+			}
 		""".trimIndent()
 
 		val result = gradle.runBuild {
 			run(applyCheckstyle, ":checkstyleDebug")
 		}
 
-		assertEquals(TaskOutcome.SUCCESS, result.task(":checkstyleDebug")!!.outcome)
+		result.assertSuccess(":checkstyleDebug")
 	}
 
 	@Test fun `applying by the old name is deprecated`() {
-		val result = gradle.run("apply plugin: 'net.twisterrob.checkstyle'").buildAndFail()
+		@Language("gradle")
+		val script = """
+			plugins {
+				id("net.twisterrob.checkstyle")
+			}
+		""".trimIndent()
+		val result = gradle.run(script).buildAndFail()
 		result.assertHasOutputLine(
 			Regex(
 				"""org\.gradle\.api\.GradleException: """ +