Fix tests for junit 5.12.0

cqse · Feb 24, 2025 · b13adf7 · b13adf7
1 parent f560506
commit b13adf7
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 23 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/buildSrc/src/main/kotlin/com.teamscale.java-convention.gradle.kts b/buildSrc/src/main/kotlin/com.teamscale.java-convention.gradle.kts
@@ -34,14 +34,14 @@ val libs = catalogs.named("libs")
 fun lib(alias: String) = libs.findLibrary(alias).get()
 
 dependencies {
-    testImplementation(lib("junit-jupiter-api"))
+    testImplementation(platform(lib("junit-bom")))
+    testImplementation(lib("junit-jupiter"))
     testImplementation(lib("assertj"))
     testImplementation(lib("mockito-core"))
     testImplementation(lib("mockito-junit"))
 	testImplementation(lib("mockito-kotlin"))
 
     testRuntimeOnly(lib("junit-platform-launcher"))
-    testRuntimeOnly(lib("junit-jupiter-engine"))
 
     constraints {
         implementation("org.apache.commons:commons-compress:1.27.1")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,8 +9,6 @@ jacoco = "0.8.12"
 # We need to stay on the 1.3.x release line as 1.4.x requires Java 11
 logback = "1.3.15"
 retrofit = "2.11.0"
-junit = "5.12.0"
-junitPlatform = "1.12.0"
 okhttp = "4.12.0"
 mockito = "5.15.2"
 mockitoKotlin = "5.4.0"
@@ -64,12 +62,12 @@ jna-platform = { module = "net.java.dev.jna:jna-platform", version = "5.16.0" }
 
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version = "2.24.3" }
 
-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
-junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
-junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatform" }
-junit-platform-engine = { module = "org.junit.platform:junit-platform-engine", version.ref = "junitPlatform" }
-junit-platform-commons = { module = "org.junit.platform:junit-platform-commons", version.ref = "junitPlatform" }
+junit-bom = { module = "org.junit:junit-bom", version = "5.12.0" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
+junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
+junit-platform-engine = { module = "org.junit.platform:junit-platform-engine" }
+junit-platform-commons = { module = "org.junit.platform:junit-platform-commons" }
 
 junit4 = { module = "junit:junit", version = "4.13.2" }
 assertj = { module = "org.assertj:assertj-core", version = "3.27.3" }

diff --git a/impacted-test-engine/build.gradle.kts b/impacted-test-engine/build.gradle.kts
@@ -12,6 +12,7 @@ publishAs {
 }
 
 dependencies {
+    implementation(platform(libs.junit.bom))
     implementation(project(":teamscale-client"))
     implementation(project(":report-generator"))
     implementation(project(":tia-client"))

diff --git a/teamscale-gradle-plugin/src/test/resources/calculator_groovy/build.gradle b/teamscale-gradle-plugin/src/test/resources/calculator_groovy/build.gradle
@@ -13,11 +13,6 @@ plugins {
 
 import com.teamscale.TestImpacted
 
-ext.junit4Version = '4.13.2'
-ext.junitVintageVersion = '5.12.0'
-ext.junitPlatformVersion = '1.4.0'
-ext.junitJupiterVersion = '5.12.0'
-
 if (!project.hasProperty("withoutServerConfig")) {
 	teamscale {
 		server {
@@ -82,14 +77,14 @@ repositories {
 }
 
 dependencies {
-	// JUnit Jupiter API and TestEngine implementation
-	testImplementation("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
-	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
-	testImplementation("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
+	// JUnit Jupiter
+	testImplementation(platform("org.junit:junit-bom:5.12.0"))
+	testImplementation("org.junit.jupiter:junit-jupiter")
 
 	// If you also want to support JUnit 3 and JUnit 4 tests
-	testImplementation("junit:junit:${junit4Version}")
-	testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${junitVintageVersion}")
+	testImplementation("junit:junit:4.13.2")
+	testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 
diff --git a/teamscale-maven-plugin/build.gradle.kts b/teamscale-maven-plugin/build.gradle.kts
@@ -26,6 +26,5 @@ dependencies {
 	implementation(libs.jgit)
 	implementation(libs.teamscaleLibCommons)
 
-	testImplementation(libs.junit.jupiter.api)
 	testImplementation(libs.assertj)
 }
diff --git a/tia-runlisteners/build.gradle.kts b/tia-runlisteners/build.gradle.kts
@@ -18,6 +18,7 @@ tasks.jar {
 
 dependencies {
     implementation(project(":tia-client"))
+    implementation(platform(libs.junit.bom))
     api(libs.junit4)
     api(libs.junit.platform.launcher)
 }