Removed IsArrayContainingInAnyOrderClass

sf105 · sf105 · commit f8c22860ffaf · 2016-04-06T15:07:07.000+02:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/ArrayMatcher.java b/hamcrest-library/src/main/java/org/hamcrest/collection/ArrayMatcher.java
@@ -0,0 +1,45 @@
+package org.hamcrest.collection;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeDiagnosingMatcher;
+import org.hamcrest.TypeSafeMatcher;
+
+import java.util.Collection;
+
+import static java.util.Arrays.asList;
+
+/**
+ * @author Steve Freeman 2016 http://www.hamcrest.com
+ */
+public class ArrayMatcher<E> extends TypeSafeMatcher<E[]> {
+  protected final TypeSafeDiagnosingMatcher<Iterable<? extends E>> iterableMatcher;
+  private final String message;
+  protected final Collection<Matcher<? super E>> matchers;
+
+  public ArrayMatcher(
+        TypeSafeDiagnosingMatcher<Iterable<? extends E>> iterableMatcher,
+        Collection<Matcher<? super E>> matchers,
+        String message)
+  {
+    this.matchers = matchers;
+    this.iterableMatcher = iterableMatcher;
+    this.message = message;
+  }
+
+  @Override
+  public boolean matchesSafely(E[] item) {
+      return iterableMatcher.matches(asList(item));
+  }
+
+  @Override
+  public void describeMismatchSafely(E[] item, Description mismatchDescription) {
+    iterableMatcher.describeMismatch(asList(item), mismatchDescription);
+  }
+
+  @Override
+  public void describeTo(Description description) {
+      description.appendList("[", ", ", "]", matchers)
+          .appendText(" ").appendText(message);
+  }
+}
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest-library/src/main/java/org/hamcrest/collection/ArrayMatching.java
@@ -92,7 +92,7 @@ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... i
    *     a list of matchers, each of which must be satisfied by an item provided by an examined array
    */
   public static <E> Matcher<E[]> arrayContainingInAnyOrder(Collection<Matcher<? super E>> itemMatchers) {
-      return new IsArrayContainingInAnyOrder<>(itemMatchers);
+      return isArrayContainingInAnyOrder(itemMatchers);
   }
 
   /**
@@ -115,11 +115,11 @@ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Collection<Matcher<? su
    */
   @SafeVarargs
   public static <E> Matcher<E[]> arrayContainingInAnyOrder(E... items) {
-    List<Matcher<? super E>> matchers = new ArrayList<>();
+    final List<Matcher<? super E>> matchers = new ArrayList<>();
     for (E item : items) {
         matchers.add(equalTo(item));
     }
-    return new IsArrayContainingInAnyOrder<>(matchers);
+    return arrayContainingInAnyOrder(matchers);
   }
 
   /**
@@ -173,4 +173,8 @@ public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatcher
   public static <E> Matcher<E[]> arrayContaining(List<Matcher<? super E>> itemMatchers) {
       return new IsArrayContainingInOrder<>(itemMatchers);
   }
+
+  private static <E> ArrayMatcher<E> isArrayContainingInAnyOrder(Collection<Matcher<? super E>> matchers) {
+    return new ArrayMatcher<>(new IsIterableContainingInAnyOrder<>(matchers), matchers, "in any order");
+  }
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... i`
`92`	`92`	`* a list of matchers, each of which must be satisfied by an item provided by an examined array`
`93`	`93`	`*/`
`94`	`94`	`public static <E> Matcher<E[]> arrayContainingInAnyOrder(Collection<Matcher<? super E>> itemMatchers) {`
`95`		`- return new IsArrayContainingInAnyOrder<>(itemMatchers);`
	`95`	`+ return isArrayContainingInAnyOrder(itemMatchers);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
`@@ -115,11 +115,11 @@ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Collection<Matcher<? su`
`115`	`115`	`*/`
`116`	`116`	`@SafeVarargs`
`117`	`117`	`public static <E> Matcher<E[]> arrayContainingInAnyOrder(E... items) {`
`118`		`- List<Matcher<? super E>> matchers = new ArrayList<>();`
	`118`	`+ final List<Matcher<? super E>> matchers = new ArrayList<>();`
`119`	`119`	`for (E item : items) {`
`120`	`120`	`matchers.add(equalTo(item));`
`121`	`121`	`}`
`122`		`- return new IsArrayContainingInAnyOrder<>(matchers);`
	`122`	`+ return arrayContainingInAnyOrder(matchers);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`/**`
`@@ -173,4 +173,8 @@ public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatcher`
`173`	`173`	`public static <E> Matcher<E[]> arrayContaining(List<Matcher<? super E>> itemMatchers) {`
`174`	`174`	`return new IsArrayContainingInOrder<>(itemMatchers);`
`175`	`175`	`}`
	`176`	`+`
	`177`	`+ private static <E> ArrayMatcher<E> isArrayContainingInAnyOrder(Collection<Matcher<? super E>> matchers) {`
	`178`	`+ return new ArrayMatcher<>(new IsIterableContainingInAnyOrder<>(matchers), matchers, "in any order");`
	`179`	`+ }`
`176`	`180`	`}`