Collapsed IsArrayContaining...

sf105 · sf105 · commit 81f5fe213817 · 2016-04-06T15:10:31.000+02:00
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 isArrayContainingInAnyOrder(itemMatchers);
+    return new ArrayMatcher<>(new IsIterableContainingInAnyOrder<>(itemMatchers), itemMatchers, "in any order");
   }
 
   /**
@@ -171,10 +171,7 @@ public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatcher
    *     a list of matchers, each of which must be satisfied by the corresponding item in an examined array
    */
   public static <E> Matcher<E[]> arrayContaining(List<Matcher<? super E>> itemMatchers) {
-      return new IsArrayContainingInOrder<>(itemMatchers);
+      return new  ArrayMatcher<>(new IsIterableContainingInOrder<>(itemMatchers), 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/IsArrayContainingInOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingInOrderTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingInOrderTest.java
@@ -3,7 +3,6 @@
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
 
-import static org.hamcrest.collection.ArrayMatching.arrayContaining;
 import static org.hamcrest.core.IsEqual.equalTo;
 
 public class IsArrayContainingInOrderTest extends AbstractMatcherTest {

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 isArrayContainingInAnyOrder(itemMatchers);`
	`95`	`+ return new ArrayMatcher<>(new IsIterableContainingInAnyOrder<>(itemMatchers), itemMatchers, "in any order");`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
`@@ -171,10 +171,7 @@ public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatcher`
`171`	`171`	`* a list of matchers, each of which must be satisfied by the corresponding item in an examined array`
`172`	`172`	`*/`
`173`	`173`	`public static <E> Matcher<E[]> arrayContaining(List<Matcher<? super E>> itemMatchers) {`
`174`		`- return new IsArrayContainingInOrder<>(itemMatchers);`
	`174`	`+ return new ArrayMatcher<>(new IsIterableContainingInOrder<>(itemMatchers), itemMatchers, "");`
`175`	`175`	`}`
`176`	`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`		`- }`
`180`	`177`	`}`