aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2016-04-29 22:03:51 -0700
committerPaul Duffin <paulduffin@google.com>2016-12-20 15:52:52 +0000
commita0b1fd6752e65aaeaddb1684cdbb1baabfa85433 (patch)
treef32ad1cdf945bc0319c6a505033aa00ff8605757 /src
parent86f323b2a73c9c250fbe25b828435aa936704ab3 (diff)
downloadjunit-a0b1fd6752e65aaeaddb1684cdbb1baabfa85433.tar.gz
Extra generic type information to aid certain javacs.
In particular this is needed for the code to compile using the error prone analyzer. (cherry picked from 3b8fe889fba29c80db890e0ff58dde9e0a3cc544) Bug: 27723540 Test: Copied to internal/master and ran error prone build Change-Id: I5f70f09a189b4ad833a3ea4100eb978abae30849
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/junit/matchers/JUnitMatchers.java4
1 files changed, 2 insertions, 2 deletions
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);
}
/**