diff options
| author | David Srbecky <dsrbecky@google.com> | 2021-02-24 15:52:50 +0000 |
|---|---|---|
| committer | David Srbecky <dsrbecky@google.com> | 2021-02-24 15:52:50 +0000 |
| commit | 6a658e7a4df0cc8ea6465da46fcf1a823cb0d491 (patch) | |
| tree | 7ce2c9779133dd053d314fdb25818acbbb4fa2be | |
| parent | d2b8e1f0634a7e5de2e5fcd5c9ca51c06e8a318c (diff) | |
| download | junit-6a658e7a4df0cc8ea6465da46fcf1a823cb0d491.tar.gz | |
Revert "Extra generic type information to aid certain javacs."
Revert submission 1601635
Reason for revert: b/181123058
Reverted Changes:
I8f5cd1266:Remove support for stuck threads
Ifdb59336d:Remove DisableOnDebug (new in 4.12) as it is not s...
I6abae5aed:Extra generic type information to aid certain java...
I5ec909df6:Upgrade external/junit to 4.13.2
Change-Id: Ic641a09a2f6e661e2f466941123e74aba0ac4dac
| -rw-r--r-- | README.version | 1 | ||||
| -rw-r--r-- | src/main/java/org/junit/matchers/JUnitMatchers.java | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/README.version b/README.version index 43903b2..c79d145 100644 --- a/README.version +++ b/README.version @@ -3,4 +3,3 @@ 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 37e3d68..13407cc 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.<T>hasItems(elementMatchers); + return CoreMatchers.hasItems(elementMatchers); } /** @@ -57,7 +57,7 @@ public class JUnitMatchers { */ @Deprecated public static <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) { - return CoreMatchers.everyItem((Matcher) elementMatcher); + return CoreMatchers.everyItem(elementMatcher); } /** |