Get rid of JUnit 4 completely and finish changes

Author: gbrail

buildSrc/src/main/groovy/rhino.java-conventions.gradle

@@ -18,12 +18,10 @@ repositories {
 }
 
 dependencies {
-    testImplementation platform("org.junit:junit-bom:5.10.3")
+    testImplementation platform(libs.junit.platform.get())
     testImplementation "org.junit.jupiter:junit-jupiter"
-    testImplementation libs.junit4
-    testRuntimeOnly "org.junit.vintage:junit-vintage-engine"
     testRuntimeOnly "org.junit.platform:junit-platform-launcher"
-    testImplementation "org.hamcrest:hamcrest:3.0"
+    testImplementation libs.hamcrest
 }
 
 tasks.withType(JavaCompile).configureEach {

buildSrc/src/main/groovy/rhino.library-conventions.gradle

@@ -13,7 +13,7 @@ plugins {
 }
 
 dependencies {
-    errorprone "com.google.errorprone:error_prone_core:2.45.0"
+    errorprone libs.errorprone.core
 }
 
 version = project.version

gradle.properties

@@ -6,6 +6,6 @@ mavenSnapshotRepo=https://oss.sonatype.org/content/repositories/snapshots
 githubPackagesRepo=https://maven.pkg.github.com/mozilla/rhino
 org.gradle.caching=true
 org.gradle.parallel=true
-#org.gradle.configuration-cache=true
+org.gradle.configuration-cache=true
 android.useAndroidX=true
 org.gradle.jvmargs=--enable-native-access=ALL-UNNAMED

gradle/libs.versions.toml

@@ -1,13 +1,17 @@
 [versions]
 jline = '3.30.6'
-junit4 = '4.13.2'
+junit5 = '5.10.3'
 
 [libraries]
-junit4 = { group = 'junit', name = 'junit', version.ref = 'junit4' }
+archunit = { group = 'com.tngtech.archunit', name = 'archunit-junit5', version = '1.4.1' }
+errorprone-core = { group = 'com.google.errorprone', name = 'error_prone_core', version = '2.45.0'}
+hamcrest = { group = 'org.hamcrest', name = 'hamcrest', version = '3.0' }
 jline-terminal = { group = 'org.jline', name = 'jline-terminal', version.ref = 'jline' }
 jline-reader = { group = 'org.jline', name = 'jline-reader', version.ref = 'jline' }
 jline-ffm = { group = 'org.jline', name = 'jline-terminal-ffm', version.ref = 'jline' }
 jline-jni = { group = 'org.jline', name = 'jline-terminal-jni', version.ref = 'jline' }
+junit-platform = { group = 'org.junit', name = 'junit-bom', version.ref = 'junit5' }
+junit-jupiter-api = { group = 'org.junit.jupiter', name = 'junit-jupiter-api', version.ref = 'junit5'}
 
 [bundles]
 jline-runtime = [ 'jline-ffm', 'jline-jni' ]

it-android/build.gradle

@@ -64,7 +64,8 @@ if (!System.getenv("ANDROID_HOME") && !localProperties.get("sdk.dir")) {
         implementation project(':rhino-tools')
         implementation project(':rhino-xml')*/
 
-        testImplementation libs.junit4
+        testImplementation platform(libs.junit.platform.get())
+        testImplementation "org.junit.jupiter:junit-jupiter"
         androidTestImplementation 'androidx.test:runner:1.7.0'
         androidTestImplementation 'androidx.test.ext:junit:1.3.0'
     }

rhino-engine/src/test/java/module-info.java

@@ -4,7 +4,5 @@
     requires org.mozilla.rhino.engine;
     requires org.mozilla.rhino;
     requires org.mozilla.rhino.testutils;
-    requires junit;
-    requires org.junit.jupiter.api;
     requires org.junit.jupiter.params;
 }

rhino-tools/src/test/java/module-info.java

@@ -2,7 +2,6 @@
     requires org.mozilla.rhino;
     requires org.mozilla.rhino.testutils;
     requires org.mozilla.rhino.tools;
-    requires junit;
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.params;
 

rhino-xml/src/test/java/module-info.java

@@ -4,7 +4,6 @@
 
     requires org.mozilla.javascript.xml;
     requires org.mozilla.rhino.testutils;
-    requires junit;
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.params;
 }

rhino/src/test/java/org/mozilla/javascript/tests/GeneratedMethodNameTest.java

@@ -4,13 +4,14 @@
 
 package org.mozilla.javascript.tests;
 
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import org.junit.jupiter.api.Test;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.ContextFactory;
 import org.mozilla.javascript.Script;
 import org.mozilla.javascript.TopLevel;
+import org.mozilla.javascript.testutils.Utils;
 
 /**
  * Takes care that the name of the method generated for a function "looks like" the original
@@ -94,18 +95,12 @@ public void doTest(final String scriptCode) throws Exception {
         // Stack traces seem to be showing up differently in Java 21. Since
         // this is not something that we can control, we're going to ignore
         // these tests in that case.
-        assumeTrue(isJava21(), () -> "Skipping test: Java 21 or higher");
+        assumeFalse(Utils.isJavaVersionAtLeast(21), () -> "Skipping test: Java 21 or higher");
         try (Context cx = ContextFactory.getGlobal().enterContext()) {
             TopLevel topScope = cx.initStandardObjects();
             topScope.put("javaNameGetter", topScope, new JavaNameGetter());
             Script script = cx.compileString(scriptCode, "myScript", 1, null);
             script.exec(cx, topScope, topScope);
         }
     }
-
-    private static boolean isJava21() {
-        String[] v = System.getProperty("java.version").split("\\.");
-        int version = Integer.parseInt(v[0]);
-        return version >= 21;
-    }
 }

tests/build.gradle

@@ -12,7 +12,7 @@ dependencies {
     implementation project(':rhino-xml')
 
     testImplementation project(':testutils')
-    testImplementation("com.tngtech.archunit:archunit-junit4:1.4.1") {
+    testImplementation(libs.archunit.get()) {
         exclude group: 'junit'
     }
     testImplementation("org.slf4j:slf4j-simple:2.0.17")