diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-02-24 13:35:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-24 13:35:22 +0000 |
| commit | ec7ba37c4102e583e5b50b737db8ceaa133ba25f (patch) | |
| tree | c943ef6426c373006eda0dfd137bed3dcb7e7d30 | |
| parent | d4c13f281206c8f2a5d56141dcd3ab9e169e4aa1 (diff) | |
| parent | a4abf50c684223b81e8fdc1e26af5bd56ae83429 (diff) | |
| download | junit-ec7ba37c4102e583e5b50b737db8ceaa133ba25f.tar.gz | |
Merge changes from topic 'upgrade-hamcrest-to-2.0' am: a565149246
am: a4abf50c68
Change-Id: If9cdccb1d27c91084021e481b998fddb860a84c2
| -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); } /** |