Factory methods. Iterables contains in relative order

sf105 · sf105 · commit 88c6c7b8e954 · 2014-12-26T14:04:49.000+01:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/Matchers.java b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
@@ -900,7 +900,7 @@ public static <T> org.hamcrest.Matcher<java.lang.Iterable<? extends T>> contains
      */
     @SafeVarargs
     public static <E> org.hamcrest.Matcher<java.lang.Iterable<? extends E>> containsInRelativeOrder(E... items) {
-        return org.hamcrest.collection.IsIterableContainingInRelativeOrder.containsInRelativeOrder(items);
+        return MatchIterables.containsInRelativeOrder(items);
     }
 
     /**
@@ -914,7 +914,7 @@ public static <E> org.hamcrest.Matcher<java.lang.Iterable<? extends E>> contains
      */
     @SafeVarargs
     public static <E> org.hamcrest.Matcher<java.lang.Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
-        return org.hamcrest.collection.IsIterableContainingInRelativeOrder.containsInRelativeOrder(itemMatchers);
+        return MatchIterables.containsInRelativeOrder(itemMatchers);
     }
 
     /**
@@ -928,7 +928,7 @@ public static <E> org.hamcrest.Matcher<java.lang.Iterable<? extends E>> contains
      *                     an examined {@link Iterable} in the same relative order
      */
     public static <E> org.hamcrest.Matcher<java.lang.Iterable<? extends E>> containsInRelativeOrder(java.util.List<Matcher<? super E>> itemMatchers) {
-        return org.hamcrest.collection.IsIterableContainingInRelativeOrder.containsInRelativeOrder(itemMatchers);
+        return MatchIterables.containsInRelativeOrder(itemMatchers);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
@@ -4,12 +4,8 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static org.hamcrest.core.IsEqual.equalTo;
-
 public class IsIterableContainingInRelativeOrder<E> extends TypeSafeDiagnosingMatcher<Iterable<? extends E>> {
     private final List<Matcher<? super E>> matchers;
 
@@ -65,54 +61,4 @@ public boolean isFinished() {
         }
 
     }
-
-    /**
-     * Creates a matcher for {@link Iterable}s that matches when a single pass over the
-     * examined {@link Iterable} yields a series of items, that contains items logically equal to the
-     * corresponding item in the specified items, in the same relative order
-     * For example:
-     * <pre>assertThat(Arrays.asList("a", "b", "c", "d", "e"), containsInRelativeOrder("b", "d"))</pre>
-     * 
-     * @param items
-     *     the items that must be contained within items provided by an examined {@link Iterable} in the same relative order
-     */
-    @SafeVarargs
-    public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(E... items) {
-        List<Matcher<? super E>> matchers = new ArrayList<>();
-        for (E item : items) {
-            matchers.add(equalTo(item));
-        }
-
-        return containsInRelativeOrder(matchers);
-    }
-
-    /**
-     * Creates a matcher for {@link Iterable}s that matches when a single pass over the
-     * examined {@link Iterable} yields a series of items, that each satisfying the corresponding
-     * matcher in the specified matchers, in the same relative order.
-     * For example:
-     * <pre>assertThat(Arrays.asList("a", "b", "c", "d", "e"), containsInRelativeOrder(equalTo("b"), equalTo("d")))</pre>
-     * 
-     * @param itemMatchers
-     *     the matchers that must be satisfied by the items provided by an examined {@link Iterable} in the same relative order
-     */
-    @SafeVarargs
-    public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
-        return containsInRelativeOrder(asList(itemMatchers));
-    }
-
-    /**
-     * Creates a matcher for {@link Iterable}s that matches when a single pass over the
-     * examined {@link Iterable} yields a series of items, that contains items satisfying the corresponding
-     * matcher in the specified list of matchers, in the same relative order.
-     * For example:
-     * <pre>assertThat(Arrays.asList("a", "b", "c", "d", "e"), contains(Arrays.asList(equalTo("b"), equalTo("d"))))</pre>
-     * 
-     * @param itemMatchers
-     *     a list of matchers, each of which must be satisfied by the items provided by
-     *     an examined {@link Iterable} in the same relative order
-     */
-    public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(List<Matcher<? super E>> itemMatchers) {
-        return new IsIterableContainingInRelativeOrder<>(itemMatchers);
-    }
 }
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInRelativeOrderTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInRelativeOrderTest.java
@@ -8,7 +8,7 @@
 import java.util.List;
 
 import static java.util.Arrays.asList;
-import static org.hamcrest.collection.IsIterableContainingInRelativeOrder.containsInRelativeOrder;
+import static org.hamcrest.collection.MatchIterables.containsInRelativeOrder;
 import static org.hamcrest.core.IsEqual.equalTo;
 
 @SuppressWarnings("unchecked")
