Use Junit Platform on all jvmCompilerTest tests

JetBrains · Oct 22, 2024 · 3ad9445 · 3ad9445
1 parent 05075af
commit 3ad9445
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts
@@ -11,9 +11,12 @@ dependencies {
     testApi(kotlinStdlib())
     testCompileOnly("org.jetbrains:annotations:13.0")
     testApi(kotlinTest("junit"))
-    testImplementation(libs.junit4)
+    testCompileOnly(libs.junit4)
     testCompileOnly(intellijCore())
 
+    testImplementation("org.junit.jupiter:junit-jupiter:${libs.versions.junit5.get()}")
+    testRuntimeOnly(libs.junit.vintage.engine)
+    testRuntimeOnly(libs.junit.platform.launcher)
     testRuntimeOnly(intellijCore())
     testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
 }
@@ -27,4 +30,5 @@ testsJar {}
 
 projectTest(parallel = true) {
     workingDir = rootDir
+    useJUnitPlatform()
 }
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
@@ -10,7 +10,10 @@ dependencies {
     testApi(projectTests(":compiler:tests-common"))
     testImplementation(intellijCore())
     testApi(platform(libs.junit.bom))
-    testImplementation(libs.junit4)
+    testCompileOnly(libs.junit4)
+    testImplementation("org.junit.jupiter:junit-jupiter:${libs.versions.junit5.get()}")
+    testRuntimeOnly(libs.junit.vintage.engine)
+    testRuntimeOnly(libs.junit.platform.launcher)
     testApi(projectTests(":generators:test-generator"))
     testRuntimeOnly(toolsJar())
 }
@@ -22,6 +25,7 @@ sourceSets {
 
 projectTest(parallel = true) {
     dependsOn(":dist")
+    useJUnitPlatform()
     workingDir = rootDir
     systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator))
 }
@@ -43,12 +47,9 @@ task<Exec>("downloadJspecifyTests") {
     }
 }
 
-val test: Test by tasks
-
-test.apply {
+tasks.test {
     exclude("**/*JspecifyAnnotationsTestGenerated*")
 }
-
 task<Test>("jspecifyTests") {
     workingDir(project.rootDir)
     include("**/*JspecifyAnnotationsTestGenerated*")