Turn down unused --experimental_persistent_test_runner experiment

PiperOrigin-RevId: 436225152

Author: cushon

src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD

@@ -22,7 +22,6 @@ java_library(
         ":common_runner_java_files",
     ],
     deps = [
-        ":persistent_test_runner",
         "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal",
         "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4",
         "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/model",
@@ -33,19 +32,6 @@ java_library(
     ],
 )
 
-java_binary(
-    name = "persistent_test_runner",
-    srcs = [
-        "PersistentTestRunner.java",
-        "SuiteTestRunner.java",
-    ],
-    deps = [
-        "//src/main/protobuf:worker_protocol_java_proto",
-        "//third_party:guava",
-        "//third_party:jsr305",
-    ],
-)
-
 java_binary(
     name = "Runner",
     main_class = "com.google.testing.junit.runner.BazelTestRunner",

src/java_tools/junitrunner/java/com/google/testing/junit/runner/BazelTestRunner.java

@@ -70,19 +70,9 @@ public static void main(String[] args) {
       System.exit(2);
     }
 
-    if (PersistentTestRunner.isPersistentTestRunner()) {
-      System.exit(
-          PersistentTestRunner.runPersistentTestRunner(
-              suiteClassName,
-              System.getenv("WORKSPACE_PREFIX"),
-              (suitClass, testArgs, classLoader, resolve) ->
-                  runTestsInSuite(suitClass, testArgs, classLoader, resolve)));
-    }
-
     int exitCode;
     try {
-      exitCode =
-          runTestsInSuite(suiteClassName, args, /* classLoader= */ null, /* resolve =*/ false);
+      exitCode = runTestsInSuite(suiteClassName, args);
     } catch (Throwable e) {
       // An exception was thrown by the runner. Print the error to the output stream so it will be
       // logged
@@ -137,9 +127,8 @@ private static boolean checkTestSuiteProperty(String testSuiteProperty) {
    * Runs the tests in the specified suite. Looks for the suite class in the given classLoader, or
    * in the system classloader if none is specified.
    */
-  private static int runTestsInSuite(
-      String suiteClassName, String[] args, ClassLoader classLoader, boolean resolve) {
-    Class<?> suite = PersistentTestRunner.getTestClass(suiteClassName, classLoader, resolve);
+  private static int runTestsInSuite(String suiteClassName, String[] args) {
+    Class<?> suite = getTestClass(suiteClassName);
 
     if (suite == null) {
       // No class found corresponding to the system property passed in from Bazel
@@ -159,6 +148,18 @@ private static int runTestsInSuite(
     return runner.run().wasSuccessful() ? 0 : 1;
   }
 
+  private static Class<?> getTestClass(String name) {
+    if (name == null) {
+      return null;
+    }
+
+    try {
+      return Class.forName(name);
+    } catch (ClassNotFoundException e) {
+      return null;
+    }
+  }
+
   /**
    * Prints out stack traces if the JVM does not exit quickly. This can help detect shutdown hooks
    * that are preventing the JVM from exiting quickly.