Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281 am: 23e304a839 am: 91c5e5ff9d

Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa51f5a85f96ec87a01eff9bc98e2274fc5a97dd

1 files changed, 3 insertions, 19 deletions

diff --git a/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java b/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java
index 0d51541..631fcf2 100644
--- a/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java
+++ b/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java
@@ -1,8 +1,5 @@
 package org.junit.internal.runners;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-
 import junit.extensions.TestDecorator;
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
@@ -15,16 +12,15 @@ import org.junit.runner.Description;
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
 import org.junit.runner.manipulation.Filterable;
-import org.junit.runner.manipulation.Orderer;
-import org.junit.runner.manipulation.InvalidOrderingException;
 import org.junit.runner.manipulation.NoTestsRemainException;
-import org.junit.runner.manipulation.Orderable;
 import org.junit.runner.manipulation.Sortable;
 import org.junit.runner.manipulation.Sorter;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
 
-public class JUnit38ClassRunner extends Runner implements Filterable, Orderable {
+public class JUnit38ClassRunner extends Runner implements Filterable, Sortable {
     private static final class OldTestClassAdaptingListener implements
             TestListener {
         private final RunNotifier notifier;
@@ -174,18 +170,6 @@ public class JUnit38ClassRunner extends Runner implements Filterable, Orderable
         }
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @since 4.13
-     */
-    public void order(Orderer orderer) throws InvalidOrderingException {
-        if (getTest() instanceof Orderable) {
-            Orderable adapter = (Orderable) getTest();
-            adapter.order(orderer);
-        }
-    }
-
     private void setTest(Test test) {
         this.test = test;
     }