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 | 08a6d4b74555db6d01048fc7065eb1e2bfaf33bc (patch) | |
| tree | 81124de095a6b4a53b223d0f70cadde9744ee44a /src/main/java/org/junit/matchers | |
| parent | 6a658e7a4df0cc8ea6465da46fcf1a823cb0d491 (diff) | |
| download | junit-08a6d4b74555db6d01048fc7065eb1e2bfaf33bc.tar.gz | |
Revert "Upgrade external/junit to 4.13.2"
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: Idaddfc2039816a8d7b12c91fdd540b801ab854ff
Diffstat (limited to 'src/main/java/org/junit/matchers')
| -rw-r--r-- | src/main/java/org/junit/matchers/JUnitMatchers.java | 4 |
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 13407cc..5bb48d7 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); } /** |