Added hasItems(T...) convenience method

joeretro · joeretro · commit d8b4cef2e7ab · 2006-12-16T18:15:39.000Z
diff --git a/src/library/org/hamcrest/collection/IsCollectionContaining.java b/src/library/org/hamcrest/collection/IsCollectionContaining.java
@@ -50,4 +50,13 @@ public static <T> Matcher<Iterable<T>> hasItems(Matcher<T>... elementMatchers) {
         return allOf(all);
     }
 
+    @Factory
+    public static <T> Matcher<Iterable<T>> hasItems(T... elements) {
+        Collection<Matcher<Iterable<T>>> all = new ArrayList<Matcher<Iterable<T>>>(elements.length);
+        for (T element : elements) {
+            all.add(hasItem(element));
+        }
+        return allOf(all);
+    }
+
 }
diff --git a/src/unit-test/org/hamcrest/collection/IsCollectionContainingTest.java b/src/unit-test/org/hamcrest/collection/IsCollectionContainingTest.java
@@ -38,6 +38,9 @@ public void testMatchesAllItemsInCollection() {
         assertMatches("should match list containing all of items",
                 hasItems(equalTo("a"), equalTo("b"), equalTo("c")),
                 asList("a", "b", "c"));
+        assertMatches("should match list containing all of items (without matchers)",
+                hasItems("a", "b", "c"),
+                asList("a", "b", "c"));
         assertMatches("should match list containing all of items in any order",
                 hasItems(equalTo("a"), equalTo("b"), equalTo("c")),
                 asList("c", "b", "a"));

Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,13 @@ public static <T> Matcher<Iterable<T>> hasItems(Matcher<T>... elementMatchers) {`
`50`	`50`	`return allOf(all);`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ @Factory`
	`54`	`+ public static <T> Matcher<Iterable<T>> hasItems(T... elements) {`
	`55`	`+ Collection<Matcher<Iterable<T>>> all = new ArrayList<Matcher<Iterable<T>>>(elements.length);`
	`56`	`+ for (T element : elements) {`
	`57`	`+ all.add(hasItem(element));`
	`58`	`+ }`
	`59`	`+ return allOf(all);`
	`60`	`+ }`
	`61`	`+`
`53`	`62`	`}`