Factory methods for IsIterableWithSize

sf105 · sf105 · commit 0dd0797a6d24 · 2014-12-26T12:05:02.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
@@ -1,6 +1,7 @@
 package org.hamcrest;
 
 import org.hamcrest.collection.MatchArrays;
+import org.hamcrest.collection.MatchIterables;
 import org.hamcrest.number.MatchNumbers;
 import org.hamcrest.object.MatchObjects;
 import org.hamcrest.text.MatchStrings;
@@ -939,7 +940,7 @@ public static <E> org.hamcrest.Matcher<java.lang.Iterable<? extends E>> contains
      * @param sizeMatcher a matcher for the number of items that should be yielded by an examined {@link Iterable}
      */
     public static <E> org.hamcrest.Matcher<java.lang.Iterable<E>> iterableWithSize(org.hamcrest.Matcher<? super java.lang.Integer> sizeMatcher) {
-        return org.hamcrest.collection.IsIterableWithSize.iterableWithSize(sizeMatcher);
+        return MatchIterables.iterableWithSize(sizeMatcher);
     }
 
     /**
@@ -952,7 +953,7 @@ public static <E> org.hamcrest.Matcher<java.lang.Iterable<E>> iterableWithSize(o
      * @param size the number of items that should be yielded by an examined {@link Iterable}
      */
     public static <E> org.hamcrest.Matcher<java.lang.Iterable<E>> iterableWithSize(int size) {
-        return org.hamcrest.collection.IsIterableWithSize.iterableWithSize(size);
+        return MatchIterables.iterableWithSize(size);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableWithSize.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableWithSize.java
@@ -5,8 +5,6 @@
 
 import java.util.Iterator;
 
-import static org.hamcrest.core.IsEqual.equalTo;
-
 public class IsIterableWithSize<E> extends FeatureMatcher<Iterable<E>, Integer> {
 
     public IsIterableWithSize(Matcher<? super Integer> sizeMatcher) {
@@ -23,31 +21,4 @@ protected Integer featureValueOf(Iterable<E> actual) {
       return size;
     }
 
-    /**
-     * Creates a matcher for {@link Iterable}s that matches when a single pass over the
-     * examined {@link Iterable} yields an item count that satisfies the specified
-     * matcher.
-     * For example:
-     * <pre>assertThat(Arrays.asList("foo", "bar"), iterableWithSize(equalTo(2)))</pre>
-     * 
-     * @param sizeMatcher
-     *     a matcher for the number of items that should be yielded by an examined {@link Iterable}
-     */
-    public static <E> Matcher<Iterable<E>> iterableWithSize(Matcher<? super Integer> sizeMatcher) {
-        return new IsIterableWithSize<>(sizeMatcher);
-    }
-
-    /**
-     * Creates a matcher for {@link Iterable}s that matches when a single pass over the
-     * examined {@link Iterable} yields an item count that is equal to the specified
-     * <code>size</code> argument.
-     * For example:
-     * <pre>assertThat(Arrays.asList("foo", "bar"), iterableWithSize(2))</pre>
-     * 
-     * @param size
-     *     the number of items that should be yielded by an examined {@link Iterable}
-     */
-    public static <E> Matcher<Iterable<E>> iterableWithSize(int size) {
-        return iterableWithSize(equalTo(size));
-    }
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/MatchIterables.java b/hamcrest-library/src/main/java/org/hamcrest/collection/MatchIterables.java
@@ -358,7 +358,7 @@ public static <E> Matcher<Iterable<E>> iterableWithSize(Matcher<? super Integer>
      * @param size the number of items that should be yielded by an examined {@link Iterable}
      */
     public static <E> Matcher<Iterable<E>> iterableWithSize(int size) {
-        return IsIterableWithSize.iterableWithSize(equalTo(size));
+        return iterableWithSize(equalTo(size));
     }
 
     public static <T> Matcher<Iterable<? extends T>> hasSubsequence(List<Matcher<? super T>> matchers) {
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableWithSizeTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableWithSizeTest.java
@@ -6,7 +6,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 
-import static org.hamcrest.collection.IsIterableWithSize.iterableWithSize;
+import static org.hamcrest.collection.MatchIterables.iterableWithSize;
+
 
 public class IsIterableWithSizeTest extends AbstractMatcherTest {
 

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ public static <E> Matcher<Iterable<E>> iterableWithSize(Matcher<? super Integer>`
`358`	`358`	`* @param size the number of items that should be yielded by an examined {@link Iterable}`
`359`	`359`	`*/`
`360`	`360`	`public static <E> Matcher<Iterable<E>> iterableWithSize(int size) {`
`361`		`- return IsIterableWithSize.iterableWithSize(equalTo(size));`
	`361`	`+ return iterableWithSize(equalTo(size));`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`public static <T> Matcher<Iterable<? extends T>> hasSubsequence(List<Matcher<? super T>> matchers) {`