diff options
| author | Pete Bentley <prb@google.com> | 2021-02-22 18:49:01 +0000 |
|---|---|---|
| committer | Pete Bentley <prb@google.com> | 2021-02-23 10:20:24 +0000 |
| commit | 9c4310548094b61751701c601121fb892e5fb698 (patch) | |
| tree | 28d0743f864c93736238f083adab0f9c715ae25c | |
| parent | aa1524950fb5fbffbb61d23c5442984cb731a1eb (diff) | |
| download | junit-9c4310548094b61751701c601121fb892e5fb698.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.
Bug: 129054170
Test: m
Change-Id: I6abae5aedc567d3c6a991046551b62a08a8b3337
(cherry picked from commit a0b1fd6752e65aaeaddb1684cdbb1baabfa85433)
| -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 c79d145..43903b2 100644 --- a/README.version +++ b/README.version @@ -3,3 +3,4 @@ Version: 4.13.2 BugComponent: 40416 Local Changes: + 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 13407cc..37e3d68 100644 --- a/src/main/java/org/junit/matchers/JUnitMatchers.java +++ b/src/main/java/org/junit/matchers/JUnitMatchers.java @@ -48,7 +48,7 @@ public class JUnitMatchers { */ @Deprecated public static <T> Matcher<Iterable<T>> hasItems(Matcher<? super T>... elementMatchers) { - return CoreMatchers.hasItems(elementMatchers); + return CoreMatchers.<T>hasItems(elementMatchers); } /** @@ -57,7 +57,7 @@ public class JUnitMatchers { */ @Deprecated public static <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) { - return CoreMatchers.everyItem(elementMatcher); + return CoreMatchers.everyItem((Matcher) elementMatcher); } /** |