diff options
| author | Pete Bentley <prb@google.com> | 2021-02-22 18:49:01 +0000 |
|---|---|---|
| committer | Pete Bentley <prb@google.com> | 2021-03-02 23:56:43 +0000 |
| commit | 75dd2ceb505380a918bec2cb3d3096a6b362574c (patch) | |
| tree | ba94e340088a6112ab63ceaec885c1c21667f558 | |
| parent | 8e80a2a7b89329f95cb41e8b2981044362478c04 (diff) | |
| download | junit-75dd2ceb505380a918bec2cb3d3096a6b362574c.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.
This change re-lands https://r.android.com/1601633
Bug: 129054170
Test: m
Change-Id: I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc
(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 2f38283..e525ad8 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); } /** |