Upgrade testing dependencies

Author: REPLicated

build.gradle.kts

@@ -12,8 +12,9 @@ java {
 }
 
 dependencies {
-    testImplementation(libs.junit)
+    testImplementation(libs.junit.jupiter)
     testImplementation(libs.assertj.core)
+    testRuntimeOnly(libs.junit.platform.launcher)
 }
 
 repositories {
@@ -25,6 +26,12 @@ tasks.withType<AbstractArchiveTask>().configureEach {
     isReproducibleFileOrder = true
 }
 
+
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
+}
+
 group = "io.fuchs.gradle.classpath-collision-detector"
 version = "0.3"
 

gradle/libs.versions.toml

@@ -1,10 +1,12 @@
 [versions]
-junit = "4.13.2"
-assertj = "3.23.1"
+junit = "5.10.2"
+junit-platform-launcher = "1.10.2"
+assertj = "3.25.3"
 plugin-publish = "1.2.1"
 
 [libraries]
-junit = { module = "junit:junit", version.ref = "junit" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform-launcher" }
 assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 
 [plugins]

src/test/kotlin/io/fuchs/gradle/collisiondetector/testkit/CollisionDetectorPluginTest.kt

@@ -2,59 +2,51 @@ package io.fuchs.gradle.collisiondetector.testkit
 
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Assert.assertEquals
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.nio.file.Path
 
 class CollisionDetectorPluginTest {
 
-    @get:Rule
-    val temporaryFolder = TemporaryFolder()
-
-
     @Test
-    fun `plugin applies without error`() {
-        copyBuildFileToTempDir("apply_plugin_only.gradle")
+    fun `plugin applies without error`(@TempDir tempDir: Path) {
+        copyBuildFileToTempDir("apply_plugin_only.gradle", tempDir)
 
         GradleRunner.create()
-                .withProjectDir(temporaryFolder.root)
-                .withTestKitDir(temporaryFolder.newFolder())
+                .withProjectDir(tempDir.toFile())
                 .withPluginClasspath()
                 .build()
     }
 
     @Test
-    fun `plugin applies without error on minimal supported Gradle version`() {
-        copyBuildFileToTempDir("apply_plugin_only.gradle")
+    fun `plugin applies without error on minimal supported Gradle version`(@TempDir tempDir: Path) {
+        copyBuildFileToTempDir("apply_plugin_only.gradle", tempDir)
 
         GradleRunner.create()
-                .withProjectDir(temporaryFolder.root)
-                .withTestKitDir(temporaryFolder.newFolder())
+                .withProjectDir(tempDir.toFile())
                 .withPluginClasspath()
                 .withGradleVersion("6.6.1")
                 .build()
     }
 
     @Test
-    fun `task is compatible with configuration cache`() {
-        copyBuildFileToTempDir("apply_plugin_only.gradle")
+    fun `task is compatible with configuration cache`(@TempDir tempDir: Path) {
+        copyBuildFileToTempDir("apply_plugin_only.gradle", tempDir)
 
         GradleRunner.create()
-                .withProjectDir(temporaryFolder.root)
-                .withTestKitDir(temporaryFolder.newFolder())
+                .withProjectDir(tempDir.toFile())
                 .withPluginClasspath()
                 .withArguments(":detectCollisions", "--configuration-cache")
                 .build()
     }
 
     @Test
-    fun `task detects no collision`() {
-        copyBuildFileToTempDir("apply_plugin_only.gradle")
+    fun `task detects no collision`(@TempDir tempDir: Path) {
+        copyBuildFileToTempDir("apply_plugin_only.gradle", tempDir)
 
         val buildResult = GradleRunner.create()
-                .withProjectDir(temporaryFolder.root)
-                .withTestKitDir(temporaryFolder.newFolder())
+                .withProjectDir(tempDir.toFile())
                 .withPluginClasspath()
                     .withArguments(":detectCollisions")
                 .build()
@@ -64,12 +56,11 @@ class CollisionDetectorPluginTest {
     }
 
     @Test
-    fun `detects collisions and fails`() {
-        copyBuildFileToTempDir("found_collisions.gradle")
+    fun `detects collisions and fails`(@TempDir tempDir: Path) {
+        copyBuildFileToTempDir("found_collisions.gradle", tempDir)
 
         val buildResult = GradleRunner.create()
-                .withProjectDir(temporaryFolder.root)
-                .withTestKitDir(temporaryFolder.newFolder())
+                .withProjectDir(tempDir.toFile())
                 .withPluginClasspath()
                 .withArguments(":detectCollisions")
                 .buildAndFail()
@@ -79,12 +70,11 @@ class CollisionDetectorPluginTest {
     }
 
     @Test
-    fun `all collisions are ignored`() {
-        copyBuildFileToTempDir("ignored_collisions.gradle")
+    fun `all collisions are ignored`(@TempDir tempDir: Path) {
+        copyBuildFileToTempDir("ignored_collisions.gradle", tempDir)
 
         val buildResult = GradleRunner.create()
-                .withProjectDir(temporaryFolder.root)
-                .withTestKitDir(temporaryFolder.newFolder())
+                .withProjectDir(tempDir.toFile())
                 .withPluginClasspath()
                 .withArguments(":detectCollisions")
                 .build()
@@ -93,11 +83,11 @@ class CollisionDetectorPluginTest {
         assertEquals(TaskOutcome.SUCCESS, detectCollisionsTask?.outcome)
     }
 
-    private fun copyBuildFileToTempDir(buildFile: String) {
-        val file = temporaryFolder.newFile("build.gradle")
+    private fun copyBuildFileToTempDir(buildFile: String, tempDir: Path) {
+        val file = tempDir.resolve("build.gradle").toFile()
         ClassLoader.getSystemResourceAsStream(buildFile).use { inputStream ->
             file.outputStream().use { inputStream.copyTo(it) }
         }
     }
 
-}
+}