diff options
| author | Ian Rogers <irogers@google.com> | 2016-05-03 16:45:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-03 16:45:52 +0000 |
| commit | b88e8ddc52991f6b9f4e49b6a882dc6bc96ea35f (patch) | |
| tree | 3ceeae29c476beb52e70b7ad86f926e739abdca5 | |
| parent | 3d48bd3d08a433fda3135a6ab4fbf8803e9c50b3 (diff) | |
| parent | 3b8fe889fba29c80db890e0ff58dde9e0a3cc544 (diff) | |
| download | junit-b88e8ddc52991f6b9f4e49b6a882dc6bc96ea35f.tar.gz | |
Merge "Extra generic type information to aid certain javacs."android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
| -rw-r--r-- | src/org/junit/matchers/JUnitMatchers.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/junit/matchers/JUnitMatchers.java b/src/org/junit/matchers/JUnitMatchers.java index ec2ec4a..837ed33 100644 --- a/src/org/junit/matchers/JUnitMatchers.java +++ b/src/org/junit/matchers/JUnitMatchers.java @@ -24,7 +24,7 @@ public class JUnitMatchers { * @return A matcher matching any collection containing an element matching elementMatcher */ public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItem(org.hamcrest.Matcher<? extends T> elementMatcher) { - return IsCollectionContaining.hasItem(elementMatcher); + return IsCollectionContaining.<T>hasItem(elementMatcher); } /** @@ -42,7 +42,7 @@ public class JUnitMatchers { * or different elements matching each matcher) */ public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(org.hamcrest.Matcher<? extends T>... elementMatchers) { - return IsCollectionContaining.hasItems(elementMatchers); + return IsCollectionContaining.<T>hasItems(elementMatchers); } /** |