Collapsing factory methods. remove IsArrayWithSize

sf105 · sf105 · commit 3ff8c3439052 · 2014-12-25T13:53:00.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
@@ -634,7 +634,7 @@ public static <E> org.hamcrest.Matcher<E[]> arrayContainingInAnyOrder(E... items
      * @param sizeMatcher a matcher for the length of an examined array
      */
     public static <E> org.hamcrest.Matcher<E[]> arrayWithSize(org.hamcrest.Matcher<? super java.lang.Integer> sizeMatcher) {
-        return org.hamcrest.collection.IsArrayWithSize.arrayWithSize(sizeMatcher);
+        return MatchArrays.arrayWithSize(sizeMatcher);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayWithSize.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayWithSize.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/MatchArrays.java b/hamcrest-library/src/main/java/org/hamcrest/collection/MatchArrays.java
@@ -1,10 +1,12 @@
 package org.hamcrest.collection;
 
+import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
 
 import java.util.Collection;
 
 import static org.hamcrest.core.DescribedAs.describedAs;
+import static org.hamcrest.core.IsEqual.equalTo;
 
 public class MatchArrays {
     /**
@@ -166,7 +168,9 @@ public static <E> Matcher<E[]> arrayContainingInAnyOrder(E... items) {
      * @param sizeMatcher a matcher for the length of an examined array
      */
     public static <E> Matcher<E[]> arrayWithSize(Matcher<? super Integer> sizeMatcher) {
-        return IsArrayWithSize.arrayWithSize(sizeMatcher);
+        return new FeatureMatcher<E[], Integer> (sizeMatcher, "an array with size","array size") {
+            @Override protected Integer featureValueOf(E[] actual) { return actual.length; }
+        };
     }
 
     /**
@@ -178,7 +182,7 @@ public static <E> Matcher<E[]> arrayWithSize(Matcher<? super Integer> sizeMatche
      * @param size the length that an examined array must have for a positive match
      */
     public static <E> Matcher<E[]> arrayWithSize(int size) {
-        return IsArrayWithSize.arrayWithSize(size);
+        return arrayWithSize(equalTo(size));
     }
 
     /**
@@ -188,7 +192,7 @@ public static <E> Matcher<E[]> arrayWithSize(int size) {
      * <pre>assertThat(new String[0], emptyArray())</pre>
      */
     public static <E> Matcher<E[]> emptyArray() {
-        return describedAs("an empty array", IsArrayWithSize.<E>arrayWithSize(0));
+        return describedAs("an empty array", MatchArrays.<E>arrayWithSize(0));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ public static <E> org.hamcrest.Matcher<E[]> arrayContainingInAnyOrder(E... items`
`634`	`634`	`* @param sizeMatcher a matcher for the length of an examined array`
`635`	`635`	`*/`
`636`	`636`	`public static <E> org.hamcrest.Matcher<E[]> arrayWithSize(org.hamcrest.Matcher<? super java.lang.Integer> sizeMatcher) {`
`637`		`- return org.hamcrest.collection.IsArrayWithSize.arrayWithSize(sizeMatcher);`
	`637`	`+ return MatchArrays.arrayWithSize(sizeMatcher);`
`638`	`638`	`}`
`639`	`639`
`640`	`640`	`/**`