aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2016-05-03 16:59:19 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-03 16:59:19 +0000
commitd4399625aaa4c41d460f80df334b322b170bbfb3 (patch)
tree3ceeae29c476beb52e70b7ad86f926e739abdca5
parent3d48bd3d08a433fda3135a6ab4fbf8803e9c50b3 (diff)
parentb88e8ddc52991f6b9f4e49b6a882dc6bc96ea35f (diff)
downloadjunit-d4399625aaa4c41d460f80df334b322b170bbfb3.tar.gz
Merge "Extra generic type information to aid certain javacs."
am: b88e8ddc52 * commit 'b88e8ddc52991f6b9f4e49b6a882dc6bc96ea35f': Extra generic type information to aid certain javacs. Change-Id: Iccecb4f4e91dcb142ce0df1caae01259721c2a14
-rw-r--r--src/org/junit/matchers/JUnitMatchers.java4
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);
}
/**