Collapsing factory methods isArray

sf105 · sf105 · commit 2830455cf3e6 · 2014-12-26T11:26:30.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
@@ -486,7 +486,7 @@ public static org.hamcrest.Matcher<java.lang.String> endsWithIgnoringCase(java.l
      */
     @SafeVarargs
     public static <T> org.hamcrest.collection.IsArray<T> array(org.hamcrest.Matcher<? super T>... elementMatchers) {
-        return org.hamcrest.collection.IsArray.array(elementMatchers);
+        return MatchArrays.array(elementMatchers);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java
@@ -79,20 +79,5 @@ protected String descriptionSeparator() {
     protected String descriptionEnd() {
         return "]";
     }
-    
-    /**
-     * Creates a matcher that matches arrays whose elements are satisfied by the specified matchers.  Matches
-     * positively only if the number of matchers specified is equal to the length of the examined array and
-     * each matcher[i] is satisfied by array[i].
-     * For example:
-     * <pre>assertThat(new Integer[]{1,2,3}, is(array(equalTo(1), equalTo(2), equalTo(3))))</pre>
-     * 
-     * @param elementMatchers
-     *     the matchers that the elements of examined arrays should satisfy
-     */
-    @SafeVarargs
-    public static <T> IsArray<T> array(Matcher<? super T>... elementMatchers) {
-        return new IsArray<>(elementMatchers);
-    }
 
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/MatchArrays.java b/hamcrest-library/src/main/java/org/hamcrest/collection/MatchArrays.java
@@ -23,7 +23,7 @@ public class MatchArrays {
      */
     @SafeVarargs
     public static <T> IsArray<T> array(Matcher<? super T>... elementMatchers) {
-        return IsArray.array(elementMatchers);
+        return new IsArray<>(elementMatchers);
     }
 
     /**
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayTest.java
@@ -5,8 +5,8 @@
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 
-import static org.hamcrest.collection.IsArray.array;
-import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.collection.MatchArrays.array;
+import static org.hamcrest.object.MatchObjects.equalTo;
 
 @SuppressWarnings("unchecked")
 public class IsArrayTest extends AbstractMatcherTest {

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ public static org.hamcrest.Matcher<java.lang.String> endsWithIgnoringCase(java.l`
`486`	`486`	`*/`
`487`	`487`	`@SafeVarargs`
`488`	`488`	`public static <T> org.hamcrest.collection.IsArray<T> array(org.hamcrest.Matcher<? super T>... elementMatchers) {`
`489`		`- return org.hamcrest.collection.IsArray.array(elementMatchers);`
	`489`	`+ return MatchArrays.array(elementMatchers);`
`490`	`490`	`}`
`491`	`491`
`492`	`492`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class MatchArrays {`
`23`	`23`	`*/`
`24`	`24`	`@SafeVarargs`
`25`	`25`	`public static <T> IsArray<T> array(Matcher<? super T>... elementMatchers) {`
`26`		`- return IsArray.array(elementMatchers);`
	`26`	`+ return new IsArray<>(elementMatchers);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`