diff options
| author | Ian Rogers <irogers@google.com> | 2016-05-03 17:09:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-03 17:09:42 +0000 |
| commit | 0a780cb8b9de02975a556837a88de6ad1b9b19a0 (patch) | |
| tree | a83570202c27bef31f026c416070a87c8746893b | |
| parent | f31b2fcfcfba4a5c6d13a4a2147567c08c72b034 (diff) | |
| parent | 9a62c015862adfec113c5a2dc786d835e50230af (diff) | |
| download | hamcrest-0a780cb8b9de02975a556837a88de6ad1b9b19a0.tar.gz | |
Merge "Extra generic type information to aid certain javacs."
am: 9a62c01586
* commit '9a62c015862adfec113c5a2dc786d835e50230af':
Extra generic type information to aid certain javacs.
Change-Id: Ie0d0c8a3f3b42bae5b54d750207f8aa150d8d986
| -rw-r--r-- | library/src/org/hamcrest/Matchers.java | 8 | ||||
| -rw-r--r-- | src/org/hamcrest/CoreMatchers.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/library/src/org/hamcrest/Matchers.java b/library/src/org/hamcrest/Matchers.java index b78864a..ce550b5 100644 --- a/library/src/org/hamcrest/Matchers.java +++ b/library/src/org/hamcrest/Matchers.java @@ -70,7 +70,7 @@ public class Matchers { * Evaluates to true only if ALL of the passed in matchers evaluate to true. */ public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<? extends T>... matchers) { - return org.hamcrest.core.AllOf.allOf(matchers); + return org.hamcrest.core.AllOf.<T>allOf(matchers); } /** @@ -84,7 +84,7 @@ public class Matchers { * Evaluates to true if ANY of the passed in matchers evaluate to true. */ public static <T> org.hamcrest.Matcher<T> anyOf(org.hamcrest.Matcher<? extends T>... matchers) { - return org.hamcrest.core.AnyOf.anyOf(matchers); + return org.hamcrest.core.AnyOf.<T>anyOf(matchers); } /** @@ -175,11 +175,11 @@ public class Matchers { } public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItem(org.hamcrest.Matcher<? extends T> elementMatcher) { - return org.hamcrest.collection.IsCollectionContaining.hasItem(elementMatcher); + return org.hamcrest.collection.IsCollectionContaining.<T>hasItem(elementMatcher); } public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(org.hamcrest.Matcher<? extends T>... elementMatchers) { - return org.hamcrest.collection.IsCollectionContaining.hasItems(elementMatchers); + return org.hamcrest.collection.IsCollectionContaining.<T>hasItems(elementMatchers); } public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(T... elements) { diff --git a/src/org/hamcrest/CoreMatchers.java b/src/org/hamcrest/CoreMatchers.java index fac3acf..dd36acb 100644 --- a/src/org/hamcrest/CoreMatchers.java +++ b/src/org/hamcrest/CoreMatchers.java @@ -70,7 +70,7 @@ public class CoreMatchers { * Evaluates to true only if ALL of the passed in matchers evaluate to true. */ public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<? extends T>... matchers) { - return org.hamcrest.core.AllOf.allOf(matchers); + return org.hamcrest.core.AllOf.<T>allOf(matchers); } /** @@ -84,7 +84,7 @@ public class CoreMatchers { * Evaluates to true if ANY of the passed in matchers evaluate to true. */ public static <T> org.hamcrest.Matcher<T> anyOf(org.hamcrest.Matcher<? extends T>... matchers) { - return org.hamcrest.core.AnyOf.anyOf(matchers); + return org.hamcrest.core.AnyOf.<T>anyOf(matchers); } /** |