Rename GeneralOrdering to Orderer and make it no longer implement Ordering

Author: kcooney

src/main/java/junit/framework/JUnit4TestAdapter.java

@@ -9,7 +9,7 @@
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
 import org.junit.runner.manipulation.Filterable;
-import org.junit.runner.manipulation.GeneralOrdering;
+import org.junit.runner.manipulation.Orderer;
 import org.junit.runner.manipulation.InvalidOrderingException;
 import org.junit.runner.manipulation.NoTestsRemainException;
 import org.junit.runner.manipulation.Orderable;
@@ -101,7 +101,7 @@ public void sort(Sorter sorter) {
      *
      * @since 4.13
      */
-    public void order(GeneralOrdering ordering) throws InvalidOrderingException {
-        ordering.apply(fRunner);
+    public void order(Orderer orderer) throws InvalidOrderingException {
+        orderer.apply(fRunner);
     }
 }

src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java

@@ -15,7 +15,7 @@
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
 import org.junit.runner.manipulation.Filterable;
-import org.junit.runner.manipulation.GeneralOrdering;
+import org.junit.runner.manipulation.Orderer;
 import org.junit.runner.manipulation.InvalidOrderingException;
 import org.junit.runner.manipulation.NoTestsRemainException;
 import org.junit.runner.manipulation.Orderable;
@@ -179,10 +179,10 @@ public void sort(Sorter sorter) {
      *
      * @since 4.13
      */
-    public void order(GeneralOrdering ordering) throws InvalidOrderingException {
+    public void order(Orderer orderer) throws InvalidOrderingException {
         if (getTest() instanceof Orderable) {
             Orderable adapter = (Orderable) getTest();
-            adapter.order(ordering);
+            adapter.order(orderer);
         }
     }
 

src/main/java/org/junit/runner/manipulation/GeneralOrdering.java

@@ -17,5 +17,5 @@ public interface Orderable extends Sortable {
      * @throws InvalidOrderingException if ordering does something invalid (like remove or add
      * children)
      */
-    void order(GeneralOrdering ordering) throws InvalidOrderingException;
+    void order(Orderer ordering) throws InvalidOrderingException;
 }

src/main/java/org/junit/runner/manipulation/Orderable.java

@@ -0,0 +1,62 @@
+package org.junit.runner.manipulation;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.runner.Description;
+
+/**
+ * Orders tests.
+ *
+ * @since 4.13
+ */
+public final class Orderer  {
+    private final Ordering ordering;
+
+    Orderer(Ordering delegate) {
+        this.ordering = delegate;
+    }
+
+    /**
+     * Orders the descriptions.
+     *
+     * @return descriptions in order
+     */
+    public List<Description> order(Collection<Description> descriptions)
+            throws InvalidOrderingException {
+        List<Description> inOrder = ordering.orderItems(
+                Collections.unmodifiableCollection(descriptions));
+        if (!ordering.validateOrderingIsCorrect()) {
+            return inOrder;
+        }
+
+        Set<Description> uniqueDescriptions = new HashSet<Description>(descriptions);
+        if (!uniqueDescriptions.containsAll(inOrder)) {
+            throw new InvalidOrderingException("Ordering added items");
+        }
+        Set<Description> resultAsSet = new HashSet<Description>(inOrder);
+        if (resultAsSet.size() != inOrder.size()) {
+            throw new InvalidOrderingException("Ordering duplicated items");
+        } else if (!resultAsSet.containsAll(uniqueDescriptions)) {
+            throw new InvalidOrderingException("Ordering removed items");
+        }
+
+        return inOrder;
+    }
+
+    /**
+     * Order the tests in <code>target</code>.
+     *
+     * @throws InvalidOrderingException if ordering does something invalid (like remove or add
+     * children)
+     */
+    public void apply(Object target) throws InvalidOrderingException {
+        if (target instanceof Orderable) {
+            Orderable orderable = (Orderable) target;
+            orderable.order(this);
+        }
+    }
+}

src/main/java/org/junit/runner/manipulation/Orderer.java

@@ -4,10 +4,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
-import java.util.Set;
 
 import org.junit.runner.Description;
 import org.junit.runner.OrderWith;
@@ -118,46 +116,22 @@ public void apply(Object target) throws InvalidOrderingException {
         /*
          * Note that some subclasses of Ordering override apply(). The Sorter
          * subclass of Ordering overrides apply() to apply the sort (this is
-         * done because sorting is more efficient than ordering) the
-         * GeneralOrdering overrides apply() to avoid having a GenericOrdering
-         * wrap another GenericOrdering.
+         * done because sorting is more efficient than ordering).
          */
         if (target instanceof Orderable) {
             Orderable orderable = (Orderable) target;
-            orderable.order(new GeneralOrdering(this));
+            orderable.order(new Orderer(this));
         }
     }
 
+    /**
+     * Returns {@code true} if this ordering could produce invalid results (i.e.
+     * if it could add or remove values).
+     */
     boolean validateOrderingIsCorrect() {
         return true;
     }
 
-    /**
-     * Orders the descriptions.
-     *
-     * @return descriptions in order
-     */
-    public final List<Description> order(Collection<Description> descriptions)
-            throws InvalidOrderingException {
-        List<Description> inOrder = orderItems(Collections.unmodifiableCollection(descriptions));
-        if (!validateOrderingIsCorrect()) {
-            return inOrder;
-        }
-
-        Set<Description> uniqueDescriptions = new HashSet<Description>(descriptions);
-        if (!uniqueDescriptions.containsAll(inOrder)) {
-            throw new InvalidOrderingException("Ordering added items");
-        }
-        Set<Description> resultAsSet = new HashSet<Description>(inOrder);
-        if (resultAsSet.size() != inOrder.size()) {
-            throw new InvalidOrderingException("Ordering duplicated items");
-        } else if (!resultAsSet.containsAll(uniqueDescriptions)) {
-            throw new InvalidOrderingException("Ordering removed items");
-        }
-
-        return inOrder;
-    }
- 
     /**
      * Implemented by sub-classes to order the descriptions.
      *

src/main/java/org/junit/runner/manipulation/Ordering.java

@@ -32,13 +32,16 @@ public int compare(Description o1, Description o2) {
      * to sort tests
      *
      * @param comparator the {@link Comparator} to use when sorting tests
+     * @since 4.0
      */
     public Sorter(Comparator<Description> comparator) {
         this.comparator = comparator;
     }
 
     /**
      * Sorts the tests in <code>target</code> using <code>comparator</code>.
+     *
+     * @since 4.0
      */
     @Override
     public void apply(Object target) {

src/main/java/org/junit/runner/manipulation/Sorter.java

@@ -32,7 +32,7 @@
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
 import org.junit.runner.manipulation.Filterable;
-import org.junit.runner.manipulation.GeneralOrdering;
+import org.junit.runner.manipulation.Orderer;
 import org.junit.runner.manipulation.InvalidOrderingException;
 import org.junit.runner.manipulation.NoTestsRemainException;
 import org.junit.runner.manipulation.Orderable;
@@ -449,11 +449,11 @@ public void sort(Sorter sorter) {
     }
 
     /**
-     * Implementation of {@link Orderable#order(GeneralOrdering)}.
+     * Implementation of {@link Orderable#order(Orderer)}.
      *
      * @since 4.13
      */
-    public void order(GeneralOrdering ordering) throws InvalidOrderingException {
+    public void order(Orderer orderer) throws InvalidOrderingException {
         childrenLock.lock();
         try {
             List<T> children = getFilteredChildren();
@@ -469,10 +469,10 @@ public void order(GeneralOrdering ordering) throws InvalidOrderingException {
                     childMap.put(description, childrenWithDescription);
                 }
                 childrenWithDescription.add(child);
-                ordering.apply(child);
+                orderer.apply(child);
             }
 
-            List<Description> inOrder = ordering.order(childMap.keySet());
+            List<Description> inOrder = orderer.order(childMap.keySet());
 
             children = new ArrayList<T>(children.size());
             for (Description description : inOrder) {

src/main/java/org/junit/runners/ParentRunner.java

@@ -10,7 +10,7 @@
 import org.junit.runner.Request;
 import org.junit.runner.RunWith;
 import org.junit.runner.Runner;
-import org.junit.runner.manipulation.GeneralOrdering;
+import org.junit.runner.manipulation.Orderer;
 import org.junit.runner.manipulation.InvalidOrderingException;
 import org.junit.runner.manipulation.Orderable;
 import org.junit.runner.manipulation.Sorter;
@@ -142,8 +142,8 @@ public Description getDescription() {
                 return delegate.getDescription();
             }
 
-            public void order(GeneralOrdering ordering) throws InvalidOrderingException {
-                delegate.order(ordering);
+            public void order(Orderer orderer) throws InvalidOrderingException {
+                delegate.order(orderer);
             }
 
             public void sort(Sorter sorter) {