Revert "Move java25 tests to junit5"

This reverts commit aa680e03983b62e2f69a2ae704c0930e521e6a98.

Change-Id: I8ab5190d9678144268716f053be4572e7c8f3758

d8_r8/test_modules/tests_java_25/build.gradle.kts

diff --git a/d8_r8/test_modules/tests_java_25/build.gradle.kts b/d8_r8/test_modules/tests_java_25/build.gradle.kts
index 7123a46..6d5ead7 100644
--- a/d8_r8/test_modules/tests_java_25/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_25/build.gradle.kts
@@ -28,8 +28,6 @@
   implementation(mainTurboCompileJavaTask.outputs.files)
   implementation(project(":testbase"))
   implementation(project(":testbase", "depsJar"))
-  testImplementation(Deps.junitJupiter)
-  testRuntimeOnly(Deps.junitPlatform)
 }
 
 tasks {

src/main/java/com/android/tools/r8/cf/CfVersion.java

diff --git a/src/main/java/com/android/tools/r8/cf/CfVersion.java b/src/main/java/com/android/tools/r8/cf/CfVersion.java
index 88d5a0d..4caaf51 100644
--- a/src/main/java/com/android/tools/r8/cf/CfVersion.java
+++ b/src/main/java/com/android/tools/r8/cf/CfVersion.java
@@ -52,7 +52,7 @@
   public static final CfVersion V23_PREVIEW = new CfVersion(Opcodes.V23 | Opcodes.V_PREVIEW);
   public static final CfVersion V24 = new CfVersion(Opcodes.V24);
   public static final CfVersion V24_PREVIEW = new CfVersion(Opcodes.V24 | Opcodes.V_PREVIEW);
-  public static final CfVersion V25 = new CfVersion(Opcodes.V25);
+  public static final CfVersion V25 = new CfVersion(Opcodes.V24);
   public static final CfVersion V25_PREVIEW = new CfVersion(Opcodes.V25 | Opcodes.V_PREVIEW);
   public static final CfVersion V26 = new CfVersion(Opcodes.V26);
   public static final CfVersion V26_PREVIEW = new CfVersion(Opcodes.V26 | Opcodes.V_PREVIEW);

src/test/java25/com/android/tools/r8/jdk25/Java25ValidationTest.java

diff --git a/src/test/java25/com/android/tools/r8/jdk25/Java25ValidationTest.java b/src/test/java25/com/android/tools/r8/jdk25/Java25ValidationTest.java
index 213f418..65ac630 100644
--- a/src/test/java25/com/android/tools/r8/jdk25/Java25ValidationTest.java
+++ b/src/test/java25/com/android/tools/r8/jdk25/Java25ValidationTest.java
@@ -9,24 +9,38 @@
 
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.TestRuntime.CfVm;
 import com.android.tools.r8.ToolHelper;
-import com.android.tools.r8.WithAllCfRuntimes;
 import com.android.tools.r8.cf.CfVersion;
 import com.android.tools.r8.utils.StringUtils;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.objectweb.asm.Attribute;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 
 // Test to validate that the tests_java_25 module is built with JDK-25.
+@RunWith(Parameterized.class)
 public class Java25ValidationTest extends TestBase {
 
   static final String EXPECTED = StringUtils.lines("Hello, world");
 
+  private final TestParameters parameters;
+
+  @Parameterized.Parameters(name = "{0}")
+  public static TestParametersCollection data() {
+    return getTestParameters().withCfRuntimes().build();
+  }
+
+  public Java25ValidationTest(TestParameters parameters) {
+    this.parameters = parameters;
+  }
+
   protected static CfVersion extractClassFileVersion(Path classFile) throws IOException {
     class ClassFileVersionExtractor extends ClassVisitor {
       private int version;
@@ -61,17 +75,15 @@
     return extractor.getClassFileVersion();
   }
 
-  @ParameterizedTest
-  @WithAllCfRuntimes
-  public void testTestClassClassFileVersion(TestParameters parameters) throws Exception {
+  @Test
+  public void testTestClassClassFileVersion() throws Exception {
     assertEquals(
-        CfVersion.V25,
+        CfVersion.V24,
         extractClassFileVersion(ToolHelper.getClassFileForTestClass(TestClass.class)));
   }
 
-  @ParameterizedTest
-  @WithAllCfRuntimes
-  public void testRunning(TestParameters parameters) throws Exception {
+  @Test
+  public void testRunning() throws Exception {
     testForJvm(parameters)
         .addInnerClasses(getClass())
         .run(parameters.getRuntime(), TestClass.class)