Internal cleanups regarding createTestMethodProcessorList

Author: nymanjens

junit4/src/main/java/com/google/testing/junit/testparameterinjector/PluggableTestRunner.java

@@ -65,14 +65,6 @@ protected PluggableTestRunner(Class<?> klass) throws InitializationError {
     super(klass);
   }
 
-  /**
-   * Returns the TestMethodProcessorList to use.
-   */
-  @Deprecated
-  protected TestMethodProcessorList createTestMethodProcessorList() {
-    return TestMethodProcessorList.createNewParameterizedProcessors();
-  }
-
   /**
    * This method is run to perform optional additional operations on the test instance, right after
    * it was created.
@@ -397,7 +389,7 @@ protected final void validatePublicVoidNoArgMethods(
 
   private synchronized TestMethodProcessorList getTestMethodProcessors() {
     if (testMethodProcessors == null) {
-      testMethodProcessors = createTestMethodProcessorList();
+      testMethodProcessors = TestMethodProcessorList.createNewParameterizedProcessors();
     }
     return testMethodProcessors;
   }

junit4/src/test/java/com/google/testing/junit/testparameterinjector/PluggableTestRunnerTest.java

@@ -85,7 +85,6 @@ public void evaluate() throws Throwable {
     }
   }
 
-  @RunWith(PluggableTestRunner.class)
   public static class TestAndMethodRuleTestClass {
 
     @Rule public TestAndMethodRule rule = new TestAndMethodRule();
@@ -99,17 +98,11 @@ public void test() {
   @Test
   public void ruleThatIsBothTestRuleAndMethodRuleIsInvokedOnceOnly() throws Exception {
     SharedTestUtilitiesJUnit4.runTestsAndAssertNoFailures(
-        new PluggableTestRunner(TestAndMethodRuleTestClass.class) {
-          @Override
-          protected TestMethodProcessorList createTestMethodProcessorList() {
-            return TestMethodProcessorList.empty();
-          }
-        });
+        new PluggableTestRunner(TestAndMethodRuleTestClass.class) {});
 
     assertThat(ruleInvocations).hasSize(1);
   }
 
-  @RunWith(PluggableTestRunner.class)
   public static class RuleOrderingTestClassWithExplicitOrder {
 
     @Rule(order = 3)
@@ -130,17 +123,11 @@ public void test() {
   @Test
   public void rulesAreSortedCorrectly_withExplicitOrder() throws Exception {
     SharedTestUtilitiesJUnit4.runTestsAndAssertNoFailures(
-        new PluggableTestRunner(RuleOrderingTestClassWithExplicitOrder.class) {
-          @Override
-          protected TestMethodProcessorList createTestMethodProcessorList() {
-            return TestMethodProcessorList.empty();
-          }
-        });
+        new PluggableTestRunner(RuleOrderingTestClassWithExplicitOrder.class) {});
 
     assertThat(ruleInvocations).containsExactly("B", "C", "A").inOrder();
   }
 
-  @RunWith(PluggableTestRunner.class)
   public static class CustomTestAnnotationTestClass {
     @SuppressWarnings("JUnit4TestNotRun")
     @CustomTest
@@ -159,10 +146,6 @@ public void testMarkedWithCustomClassIsInvoked() throws Exception {
     testMethodInvocationCount = 0;
     SharedTestUtilitiesJUnit4.runTestsAndAssertNoFailures(
         new PluggableTestRunner(CustomTestAnnotationTestClass.class) {
-          @Override
-          protected TestMethodProcessorList createTestMethodProcessorList() {
-            return TestMethodProcessorList.empty();
-          }
 
           @Override
           protected ImmutableList<Class<? extends Annotation>> getSupportedTestAnnotations() {
@@ -173,7 +156,6 @@ protected ImmutableList<Class<? extends Annotation>> getSupportedTestAnnotations
     assertThat(testMethodInvocationCount).isEqualTo(2);
   }
 
-  @RunWith(PluggableTestRunner.class)
   public static class SortedPluggableTestRunnerTestClass {
     @Test
     public void a() {
@@ -196,10 +178,6 @@ public void testsAreSortedCorrectly() throws Exception {
     testOrder.clear();
     SharedTestUtilitiesJUnit4.runTestsAndAssertNoFailures(
         new PluggableTestRunner(SortedPluggableTestRunnerTestClass.class) {
-          @Override
-          protected TestMethodProcessorList createTestMethodProcessorList() {
-            return TestMethodProcessorList.empty();
-          }
 
           @Override
           protected ImmutableList<FrameworkMethod> sortTestMethods(

junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterAnnotationMethodProcessorTest.java

@@ -27,12 +27,10 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.model.TestClass;
 
 /**
  * Test class to test the PluggableTestRunner test harness works with {@link
@@ -830,37 +828,28 @@ public void test() throws Exception {
     switch (result) {
       case SUCCESS_ALWAYS:
         SharedTestUtilitiesJUnit4.runTestsAndAssertNoFailures(
-            newTestRunnerWithParameterizedSupport(
-                testClass -> TestMethodProcessorList.createNewParameterizedProcessors()));
+            newTestRunner(/* supportLegacyFeatures= */ false));
         break;
 
       case SUCCESS_FOR_ALL_PLACEMENTS_ONLY:
         assertThrows(
             Exception.class,
             () ->
                 SharedTestUtilitiesJUnit4.runTestsAndGetFailures(
-                    newTestRunnerWithParameterizedSupport(
-                        testClass -> TestMethodProcessorList.createNewParameterizedProcessors())));
+                    newTestRunner(/* supportLegacyFeatures= */ false)));
         break;
 
       case FAILURE:
         assertThrows(
             Exception.class,
             () ->
                 SharedTestUtilitiesJUnit4.runTestsAndGetFailures(
-                    newTestRunnerWithParameterizedSupport(
-                        testClass -> TestMethodProcessorList.createNewParameterizedProcessors())));
+                    newTestRunner(/* supportLegacyFeatures= */ false)));
         break;
     }
   }
 
-  private PluggableTestRunner newTestRunnerWithParameterizedSupport(
-      Function<TestClass, TestMethodProcessorList> processorListGenerator) throws Exception {
-    return new PluggableTestRunner(testClass) {
-      @Override
-      protected TestMethodProcessorList createTestMethodProcessorList() {
-        return processorListGenerator.apply(getTestClass());
-      }
-    };
+  private PluggableTestRunner newTestRunner(boolean supportLegacyFeatures) throws Exception {
+    return new PluggableTestRunner(testClass) {};
   }
 }

junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterInjectorKotlinTest.kt

@@ -243,11 +243,7 @@ class TestParameterInjectorKotlinTest {
   @Test
   fun test_success() {
     SharedTestUtilitiesJUnit4.runTestsAndAssertNoFailures(
-      object : PluggableTestRunner(testClass) {
-        override fun createTestMethodProcessorList(): TestMethodProcessorList {
-          return TestMethodProcessorList.createNewParameterizedProcessors()
-        }
-      }
+      object : PluggableTestRunner(testClass) {}
     )
   }
 
@@ -267,7 +263,7 @@ class TestParameterInjectorKotlinTest {
   enum class Color {
     RED,
     BLUE,
-    GREEN
+    GREEN,
   }
 
   @JvmInline value class ColorValueClass(val onlyValue: Color)

junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterTest.java

@@ -238,13 +238,7 @@ public TestParameterTest(String name, Class<?> testClass) {
 
   @Test
   public void test() throws Exception {
-    SharedTestUtilitiesJUnit4.runTestsAndAssertNoFailures(
-        new PluggableTestRunner(testClass) {
-          @Override
-          protected TestMethodProcessorList createTestMethodProcessorList() {
-            return TestMethodProcessorList.createNewParameterizedProcessors();
-          }
-        });
+    SharedTestUtilitiesJUnit4.runTestsAndAssertNoFailures(new PluggableTestRunner(testClass) {});
   }
 
   private static ImmutableList<Class<? extends Annotation>> annotationTypes(

junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParametersMethodProcessorTest.java

@@ -664,12 +664,7 @@ public void test_failure() throws Exception {
   }
 
   private PluggableTestRunner newTestRunner() throws Exception {
-    return new PluggableTestRunner(testClass) {
-      @Override
-      protected TestMethodProcessorList createTestMethodProcessorList() {
-        return TestMethodProcessorList.createNewParameterizedProcessors();
-      }
-    };
+    return new PluggableTestRunner(testClass) {};
   }
 
   private static ImmutableList<Class<? extends Annotation>> annotationTypes(