Added intermediate variables to help out compiler with generics

smgfreeman · smgfreeman · commit 46a6d570ce45 · 2009-03-21T12:24:48.000Z
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
@@ -9,6 +9,7 @@
 
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
+import org.hamcrest.collection.IsIterableContainingInOrderTest.WithValue;
 
 public class IsIterableContainingInAnyOrderTest extends AbstractMatcherTest {
 
@@ -37,9 +38,9 @@ public void testDoesNotMatchIfOneOfMultipleElementsMismatches() {
         assertMismatchDescription("Not matched: <4>", containsInAnyOrder(1, 2, 3), asList(1, 2, 4));
     }
     
-    @SuppressWarnings("unchecked")
     public void testDoesNotMatchIfThereAreMoreElementsThanMatchers() {
-        assertMismatchDescription("Not matched: <WithValue 2>", containsInAnyOrder(value(1), value(3)), asList(make(1), make(2), make(3)));
+        Matcher<Iterable<WithValue>> helpTheCompilerOut = containsInAnyOrder(value(1), value(3));
+        assertMismatchDescription("Not matched: <WithValue 2>", helpTheCompilerOut, asList(make(1), make(2), make(3)));
     }
     
     public void testDoesNotMatchIfThereAreMoreMatchersThanElements() {
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java
@@ -10,7 +10,9 @@
 import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
 
+@SuppressWarnings("unchecked")
 public class IsIterableContainingInOrderTest extends AbstractMatcherTest {
+    private final Matcher<Iterable<WithValue>> contains123 = contains(value(1), value(2), value(3));
 
     @Override
     protected Matcher<?> createMatcher() {
@@ -29,18 +31,16 @@ public void testDoesNotMatchWithMoreElementsThanExpected() throws Exception {
         assertMismatchDescription("Not matched: <4>", contains(1, 2, 3), asList(1, 2, 3, 4));
     }
     
-    @SuppressWarnings("unchecked")
     public void testDoesNotMatchWithFewerElementsThanExpected() throws Exception {
-        assertMismatchDescription("No item: value with <3>", contains(value(1), value(2), value(3)), asList(make(1), make(2)));
+        assertMismatchDescription("No item: value with <3>", contains123, asList(make(1), make(2)));
     }
     
     public void testDoesNotMatchIfSingleItemMismatches() throws Exception {
         assertMismatchDescription("item 0: value was <3>", contains(value(4)), asList(make(3)));  
     }
     
-    @SuppressWarnings("unchecked")
     public void testDoesNotMatchIfOneOfMultipleItemsMismatch() throws Exception {
-        assertMismatchDescription("item 2: value was <4>", contains(value(1), value(2), value(3)), asList(make(1), make(2), make(4)));
+        assertMismatchDescription("item 2: value was <4>", contains123, asList(make(1), make(2), make(4)));
     }
 
     public void testDoesNotMatchEmptyIterable() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`import org.hamcrest.AbstractMatcherTest;`
`11`	`11`	`import org.hamcrest.Matcher;`
	`12`	`+import org.hamcrest.collection.IsIterableContainingInOrderTest.WithValue;`
`12`	`13`
`13`	`14`	`public class IsIterableContainingInAnyOrderTest extends AbstractMatcherTest {`
`14`	`15`
`@@ -37,9 +38,9 @@ public void testDoesNotMatchIfOneOfMultipleElementsMismatches() {`
`37`	`38`	`assertMismatchDescription("Not matched: <4>", containsInAnyOrder(1, 2, 3), asList(1, 2, 4));`
`38`	`39`	`}`
`39`	`40`
`40`		`- @SuppressWarnings("unchecked")`
`41`	`41`	`public void testDoesNotMatchIfThereAreMoreElementsThanMatchers() {`
`42`		`- assertMismatchDescription("Not matched: <WithValue 2>", containsInAnyOrder(value(1), value(3)), asList(make(1), make(2), make(3)));`
	`42`	`+ Matcher<Iterable<WithValue>> helpTheCompilerOut = containsInAnyOrder(value(1), value(3));`
	`43`	`+ assertMismatchDescription("Not matched: <WithValue 2>", helpTheCompilerOut, asList(make(1), make(2), make(3)));`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`public void testDoesNotMatchIfThereAreMoreMatchersThanElements() {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,9 @@`
`10`	`10`	`import org.hamcrest.FeatureMatcher;`
`11`	`11`	`import org.hamcrest.Matcher;`
`12`	`12`
	`13`	`+@SuppressWarnings("unchecked")`
`13`	`14`	`public class IsIterableContainingInOrderTest extends AbstractMatcherTest {`
	`15`	`+ private final Matcher<Iterable<WithValue>> contains123 = contains(value(1), value(2), value(3));`
`14`	`16`
`15`	`17`	`@Override`
`16`	`18`	`protected Matcher<?> createMatcher() {`
`@@ -29,18 +31,16 @@ public void testDoesNotMatchWithMoreElementsThanExpected() throws Exception {`
`29`	`31`	`assertMismatchDescription("Not matched: <4>", contains(1, 2, 3), asList(1, 2, 3, 4));`
`30`	`32`	`}`
`31`	`33`
`32`		`- @SuppressWarnings("unchecked")`
`33`	`34`	`public void testDoesNotMatchWithFewerElementsThanExpected() throws Exception {`
`34`		`- assertMismatchDescription("No item: value with <3>", contains(value(1), value(2), value(3)), asList(make(1), make(2)));`
	`35`	`+ assertMismatchDescription("No item: value with <3>", contains123, asList(make(1), make(2)));`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public void testDoesNotMatchIfSingleItemMismatches() throws Exception {`
`38`	`39`	`assertMismatchDescription("item 0: value was <3>", contains(value(4)), asList(make(3)));`
`39`	`40`	`}`
`40`	`41`
`41`		`- @SuppressWarnings("unchecked")`
`42`	`42`	`public void testDoesNotMatchIfOneOfMultipleItemsMismatch() throws Exception {`
`43`		`- assertMismatchDescription("item 2: value was <4>", contains(value(1), value(2), value(3)), asList(make(1), make(2), make(4)));`
	`43`	`+ assertMismatchDescription("item 2: value was <4>", contains123, asList(make(1), make(2), make(4)));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public void testDoesNotMatchEmptyIterable() throws Exception {`