Factory methods. Iterables contains in any order

sf105 · sf105 · commit ee836b8f8eeb · 2014-12-26T14:01:46.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
@@ -841,7 +841,7 @@ public static <E> org.hamcrest.Matcher<java.lang.Iterable<? extends E>> contains
      */
     @SafeVarargs
     public static <T> org.hamcrest.Matcher<java.lang.Iterable<? extends T>> containsInAnyOrder(org.hamcrest.Matcher<? super T>... itemMatchers) {
-        return org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder(itemMatchers);
+        return MatchIterables.containsInAnyOrder(itemMatchers);
     }
 
     /**
@@ -865,7 +865,7 @@ public static <T> org.hamcrest.Matcher<java.lang.Iterable<? extends T>> contains
      */
     @SafeVarargs
     public static <T> org.hamcrest.Matcher<java.lang.Iterable<? extends T>> containsInAnyOrder(T... items) {
-        return org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder(items);
+        return MatchIterables.containsInAnyOrder(items);
     }
 
     /**
@@ -886,7 +886,7 @@ public static <T> org.hamcrest.Matcher<java.lang.Iterable<? extends T>> contains
      * @param itemMatchers a list of matchers, each of which must be satisfied by an item provided by an examined {@link Iterable}
      */
     public static <T> org.hamcrest.Matcher<java.lang.Iterable<? extends T>> containsInAnyOrder(java.util.Collection<org.hamcrest.Matcher<? super T>> itemMatchers) {
-        return org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder(itemMatchers);
+        return MatchIterables.containsInAnyOrder(itemMatchers);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
@@ -3,13 +3,10 @@
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
-import org.hamcrest.internal.Wrapping;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import static java.util.Arrays.asList;
-
 public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher<Iterable<? extends T>> {
     private final Collection<Matcher<? super T>> matchers;
 
@@ -74,77 +71,5 @@ private boolean isMatched(S item) {
         return false;
       }
     }
-
-    /**
-     * <p>
-     * Creates an order agnostic matcher for {@link Iterable}s that matches when a single pass over
-     * the examined {@link Iterable} yields a series of items, each satisfying one matcher anywhere
-     * in the specified matchers.  For a positive match, the examined iterable must be of the same
-     * length as the number of specified matchers.
-     * </p>
-     * <p>
-     * N.B. each of the specified matchers will only be used once during a given examination, so be
-     * careful when specifying matchers that may be satisfied by more than one entry in an examined
-     * iterable.
-     * </p>
-     * <p>
-     * For example:
-     * </p>
-     * <pre>assertThat(Arrays.asList("foo", "bar"), containsInAnyOrder(equalTo("bar"), equalTo("foo")))</pre>
-     * 
-     * @param itemMatchers
-     *     a list of matchers, each of which must be satisfied by an item provided by an examined {@link Iterable}
-     */
-    @SafeVarargs
-    public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
-        return containsInAnyOrder(asList(itemMatchers));
-    }
-
-    /**
-     * <p>
-     * Creates an order agnostic matcher for {@link Iterable}s that matches when a single pass over
-     * the examined {@link Iterable} yields a series of items, each logically equal to one item
-     * anywhere in the specified items. For a positive match, the examined iterable
-     * must be of the same length as the number of specified items.
-     * </p>
-     * <p>
-     * N.B. each of the specified items will only be used once during a given examination, so be
-     * careful when specifying items that may be equal to more than one entry in an examined
-     * iterable.
-     * </p>
-     * <p>
-     * For example:
-     * </p>
-     * <pre>assertThat(Arrays.asList("foo", "bar"), containsInAnyOrder("bar", "foo"))</pre>
-     * 
-     * @param items
-     *     the items that must equal the items provided by an examined {@link Iterable} in any order
-     */
-    @SafeVarargs
-    public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(T... items) {
-        return new IsIterableContainingInAnyOrder<>(Wrapping.asEqualToMatchers(items));
-    }
-
-    /**
-     * <p>
-     * Creates an order agnostic matcher for {@link Iterable}s that matches when a single pass over
-     * the examined {@link Iterable} yields a series of items, each satisfying one matcher anywhere
-     * in the specified collection of matchers.  For a positive match, the examined iterable
-     * must be of the same length as the specified collection of matchers.
-     * </p>
-     * <p>
-     * N.B. each matcher in the specified collection will only be used once during a given
-     * examination, so be careful when specifying matchers that may be satisfied by more than
-     * one entry in an examined iterable.
-     * </p>
-     * <p>For example:</p>
-     * <pre>assertThat(Arrays.asList("foo", "bar"), containsInAnyOrder(Arrays.asList(equalTo("bar"), equalTo("foo"))))</pre>
-     * 
-     * @param itemMatchers
-     *     a list of matchers, each of which must be satisfied by an item provided by an examined {@link Iterable}
-     */
-    public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Collection<Matcher<? super T>> itemMatchers) {
-        return new IsIterableContainingInAnyOrder<>(itemMatchers);
-    }
 }
 
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInAnyOrderTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInAnyOrderTest.java
@@ -7,9 +7,9 @@
 import java.util.Collections;
 
 import static java.util.Arrays.asList;
-import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
 import static org.hamcrest.collection.IsIterableContainingInOrderTest.make;
 import static org.hamcrest.collection.IsIterableContainingInOrderTest.value;
+import static org.hamcrest.collection.MatchIterables.containsInAnyOrder;
 
 public class IsIterableContainingInAnyOrderTest extends AbstractMatcherTest {
 
