Merge pull request hamcrest#41 from bjoernpollex/master

npryce · npryce · commit 4c4c3fa53c86 · 2014-11-25T01:00:46.000Z
Fixed Issue hamcrest#40 - added generic bounds
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/Every.java b/hamcrest-core/src/main/java/org/hamcrest/core/Every.java
@@ -5,15 +5,15 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 
-public class Every<T> extends TypeSafeDiagnosingMatcher<Iterable<T>> {
+public class Every<T> extends TypeSafeDiagnosingMatcher<Iterable<? extends T>> {
     private final Matcher<? super T> matcher;
 
     public Every(Matcher<? super T> matcher) {
         this.matcher= matcher;
     }
 
     @Override
-    public boolean matchesSafely(Iterable<T> collection, Description mismatchDescription) {
+    public boolean matchesSafely(Iterable<? extends T> collection, Description mismatchDescription) {
         for (T t : collection) {
             if (!matcher.matches(t)) {
                 mismatchDescription.appendText("an item ");
@@ -40,7 +40,7 @@ public void describeTo(Description description) {
      *     the matcher to apply to every item provided by the examined {@link Iterable}
      */
     @Factory
-    public static <U> Matcher<Iterable<U>> everyItem(final Matcher<U> itemMatcher) {
+    public static <U> Matcher<Iterable<? extends U>> everyItem(final Matcher<U> itemMatcher) {
         return new Every<U>(itemMatcher);
     }
 }
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/EveryTest.java b/hamcrest-core/src/test/java/org/hamcrest/core/EveryTest.java
@@ -16,7 +16,7 @@
 
 public final class EveryTest {
 
-    private final Matcher<Iterable<String>> matcher = Every.everyItem(containsString("a"));
+    private final Matcher<Iterable<? extends String>> matcher = Every.everyItem(containsString("a"));
 
     @Test public void
     copesWithNullsAndUnknownTypes() {
