diff options
| author | Ian Rogers <irogers@google.com> | 2017-01-10 10:47:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-10 10:47:32 +0000 |
| commit | 08c646823c02d8dca29188a03f065e2443f14fcd (patch) | |
| tree | f32ad1cdf945bc0319c6a505033aa00ff8605757 | |
| parent | cd58d3905ff5efdebf5df158e2b59a82ae67b618 (diff) | |
| parent | bc00960c0f70c9c4f1e1ffc8d46481e18fbc3fcb (diff) | |
| download | junit-08c646823c02d8dca29188a03f065e2443f14fcd.tar.gz | |
Extra generic type information to aid certain javacs. am: a0b1fd6752 am: 472f7143b4
am: bc00960c0f
Change-Id: Ic382f2e0bae783532c2dc95672a545d5add7059f
| -rw-r--r-- | README.version | 1 | ||||
| -rw-r--r-- | src/main/java/org/junit/matchers/JUnitMatchers.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/README.version b/README.version index 0ca87b6..41e2c6f 100644 --- a/README.version +++ b/README.version @@ -6,3 +6,4 @@ Local Changes: Remove DisableOnDebug (new in 4.12) as it is not supported on Android Remove support for stuck threads Revert matchers back to 4.10 to compile against Hamcrest 1.1 + Extra generic type information to aid certain javacs. diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java index 01b8489..847a347 100644 --- a/src/main/java/org/junit/matchers/JUnitMatchers.java +++ b/src/main/java/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); } /** |