Issue 60. IsIterableContainingInAnyOrder now accepts any number of matchers.

smgfreeman · smgfreeman · commit 6472f4ec4d57 · 2009-01-20T22:09:52.000Z
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
@@ -17,9 +17,6 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeMatcher<Iterable<
     private final Collection<Matcher<? super T>> matchers;
 
     public IsIterableContainingInAnyOrder(Collection<Matcher<? super T>> matchers) {
-        if (matchers.size() < 2) {
-            throw new IllegalArgumentException("Must specify at least two expected elements!");
-        }
         this.matchers = matchers;
     }
 
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrderTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrderTest.java
@@ -15,28 +15,32 @@ public class IsIterableContainingInAnyOrderTest extends AbstractMatcherTest {
     protected Matcher<?> createMatcher() {
         return containsInAnyOrder(1, 2);
     }   
-    
-    public void testDoesNotMatchEmpty() throws Exception {
+
+    public void testMatchesSingleItemIterable() {
+      assertMatches("single item", containsInAnyOrder(1), asList(1));
+    }
+
+    public void testDoesNotMatchEmpty() {
         assertMismatchDescription("iterable was []", containsInAnyOrder(1, 2), Collections.<Integer>emptyList());
     }
     
-    public void testMatchesIterableOutOfOrder() throws Exception {
+    public void testMatchesIterableOutOfOrder() {
         assertMatches("Out of order", containsInAnyOrder(1, 2), asList(2, 1));
     }
     
-    public void testMatchesIterableInOrder() throws Exception {
+    public void testMatchesIterableInOrder() {
         assertMatches("In order", containsInAnyOrder(1, 2), asList(1, 2));
     }
     
-    public void testDoesNotMatchIfOneOfMultipleElementsMismatches() throws Exception {
+    public void testDoesNotMatchIfOneOfMultipleElementsMismatches() {
         assertMismatchDescription("iterable was [<1>, <2>, <4>]", containsInAnyOrder(1, 2, 3), asList(1, 2, 4));
     }
     
-    public void testDoesNotMatchIfThereAreMoreElementsThanMatchers() throws Exception {
+    public void testDoesNotMatchIfThereAreMoreElementsThanMatchers() {
         assertMismatchDescription("iterable was [<1>, <2>, <3>, <4>]", containsInAnyOrder(1, 2, 3), asList(1, 2, 3, 4));
     }
     
-    public void testDoesNotMatchIfThereAreMoreMatchersThanElements() throws Exception {
+    public void testDoesNotMatchIfThereAreMoreMatchersThanElements() {
         assertMismatchDescription("iterable was [<1>, <2>, <3>]", containsInAnyOrder(1, 2, 3, 4), asList(1, 2, 3));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,6 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeMatcher<Iterable<`
`17`	`17`	`private final Collection<Matcher<? super T>> matchers;`
`18`	`18`
`19`	`19`	`public IsIterableContainingInAnyOrder(Collection<Matcher<? super T>> matchers) {`
`20`		`- if (matchers.size() < 2) {`
`21`		`- throw new IllegalArgumentException("Must specify at least two expected elements!");`
`22`		`- }`
`23`	`20`	`this.matchers = matchers;`
`24`	`21`	`}`
`25`	`22`
Original file line number	Diff line number	Diff line change
`@@ -15,28 +15,32 @@ public class IsIterableContainingInAnyOrderTest extends AbstractMatcherTest {`
`15`	`15`	`protected Matcher<?> createMatcher() {`
`16`	`16`	`return containsInAnyOrder(1, 2);`
`17`	`17`	`}`
`18`		`-`
`19`		`- public void testDoesNotMatchEmpty() throws Exception {`
	`18`	`+`
	`19`	`+ public void testMatchesSingleItemIterable() {`
	`20`	`+ assertMatches("single item", containsInAnyOrder(1), asList(1));`
	`21`	`+ }`
	`22`	`+`
	`23`	`+ public void testDoesNotMatchEmpty() {`
`20`	`24`	`assertMismatchDescription("iterable was []", containsInAnyOrder(1, 2), Collections.<Integer>emptyList());`
`21`	`25`	`}`
`22`	`26`
`23`		`- public void testMatchesIterableOutOfOrder() throws Exception {`
	`27`	`+ public void testMatchesIterableOutOfOrder() {`
`24`	`28`	`assertMatches("Out of order", containsInAnyOrder(1, 2), asList(2, 1));`
`25`	`29`	`}`
`26`	`30`
`27`		`- public void testMatchesIterableInOrder() throws Exception {`
	`31`	`+ public void testMatchesIterableInOrder() {`
`28`	`32`	`assertMatches("In order", containsInAnyOrder(1, 2), asList(1, 2));`
`29`	`33`	`}`
`30`	`34`
`31`		`- public void testDoesNotMatchIfOneOfMultipleElementsMismatches() throws Exception {`
	`35`	`+ public void testDoesNotMatchIfOneOfMultipleElementsMismatches() {`
`32`	`36`	`assertMismatchDescription("iterable was [<1>, <2>, <4>]", containsInAnyOrder(1, 2, 3), asList(1, 2, 4));`
`33`	`37`	`}`
`34`	`38`
`35`		`- public void testDoesNotMatchIfThereAreMoreElementsThanMatchers() throws Exception {`
	`39`	`+ public void testDoesNotMatchIfThereAreMoreElementsThanMatchers() {`
`36`	`40`	`assertMismatchDescription("iterable was [<1>, <2>, <3>, <4>]", containsInAnyOrder(1, 2, 3), asList(1, 2, 3, 4));`
`37`	`41`	`}`
`38`	`42`
`39`		`- public void testDoesNotMatchIfThereAreMoreMatchersThanElements() throws Exception {`
	`43`	`+ public void testDoesNotMatchIfThereAreMoreMatchersThanElements() {`
`40`	`44`	`assertMismatchDescription("iterable was [<1>, <2>, <3>]", containsInAnyOrder(1, 2, 3, 4), asList(1, 2, 3));`
`41`	`45`	`}`
`42`	`46`