diff options
author | Paul Duffin <paulduffin@google.com> | 2017-01-23 17:45:29 +0000 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2017-02-22 11:21:06 +0000 |
commit | 32dc498f7b8622c59d4b77117eb971ed0a553be5 (patch) | |
tree | 61d319d63692c62d254777f96fb32cac6653040f | |
parent | 6f4e8908ed0d9f5a292c6acd82fa492252c2a4e3 (diff) | |
download | hamcrest-32dc498f7b8622c59d4b77117eb971ed0a553be5.tar.gz |
Make it compile in error prone
Bug: 30946317
Test: make checkbuild
Change-Id: If762c67adc8ffd0db9d7ea4dd0e41c5fdb0197f2
6 files changed, 15 insertions, 13 deletions
diff --git a/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java b/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java index d690f7b..ada655a 100644 --- a/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java +++ b/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java @@ -9,7 +9,7 @@ public class CoreMatchers { * <pre>assertThat("myValue", allOf(startsWith("my"), containsString("Val")))</pre> */ public static <T> org.hamcrest.Matcher<T> allOf(java.lang.Iterable<org.hamcrest.Matcher<? super T>> matchers) { - return org.hamcrest.core.AllOf.allOf(matchers); + return org.hamcrest.core.AllOf.<T>allOf(matchers); } /** @@ -19,7 +19,7 @@ public class CoreMatchers { */ @SafeVarargs public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<? super T>... matchers) { - return org.hamcrest.core.AllOf.allOf(matchers); + return org.hamcrest.core.AllOf.<T>allOf(matchers); } @@ -29,7 +29,7 @@ public class CoreMatchers { * <pre>assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))</pre> */ public static <T> org.hamcrest.core.AnyOf<T> anyOf(java.lang.Iterable<org.hamcrest.Matcher<? super T>> matchers) { - return org.hamcrest.core.AnyOf.anyOf(matchers); + return org.hamcrest.core.AnyOf.<T>anyOf(matchers); } /** @@ -39,7 +39,7 @@ public class CoreMatchers { */ @SafeVarargs public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<? super T>... matchers) { - return org.hamcrest.core.AnyOf.anyOf(matchers); + return org.hamcrest.core.AnyOf.<T>anyOf(matchers); } /** @@ -155,7 +155,7 @@ public class CoreMatchers { * the matcher to apply to items provided by the examined {@link Iterable} */ public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(org.hamcrest.Matcher<? super T> itemMatcher) { - return org.hamcrest.core.IsCollectionContaining.hasItem(itemMatcher); + return org.hamcrest.core.IsCollectionContaining.<T>hasItem(itemMatcher); } /** @@ -170,7 +170,7 @@ public class CoreMatchers { * the item to compare against the items provided by the examined {@link Iterable} */ public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(T item) { - return org.hamcrest.core.IsCollectionContaining.hasItem(item); + return org.hamcrest.core.IsCollectionContaining.<T>hasItem(item); } /** @@ -186,7 +186,7 @@ public class CoreMatchers { */ @SafeVarargs public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(org.hamcrest.Matcher<? super T>... itemMatchers) { - return org.hamcrest.core.IsCollectionContaining.hasItems(itemMatchers); + return org.hamcrest.core.IsCollectionContaining.<T>hasItems(itemMatchers); } /** @@ -202,7 +202,7 @@ public class CoreMatchers { */ @SafeVarargs public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(T... items) { - return org.hamcrest.core.IsCollectionContaining.hasItems(items); + return org.hamcrest.core.IsCollectionContaining.<T>hasItems(items); } /** diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java index 06e999a..2cbe2e3 100644 --- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java @@ -5,6 +5,7 @@ import org.hamcrest.DiagnosingMatcher; import org.hamcrest.Matcher; import java.util.Arrays; +import java.util.List; /** * Calculates the logical conjunction of multiple matchers. Evaluation is shortcut, so @@ -51,6 +52,6 @@ public class AllOf<T> extends DiagnosingMatcher<T> { */ @SafeVarargs public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) { - return allOf(Arrays.asList(matchers)); + return allOf((List) Arrays.asList(matchers)); } } diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java index 03cc210..106a473 100644 --- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java @@ -4,6 +4,7 @@ import org.hamcrest.Description; import org.hamcrest.Matcher; import java.util.Arrays; +import java.util.List; /** * Calculates the logical disjunction of multiple matchers. Evaluation is shortcut, so @@ -41,6 +42,6 @@ public class AnyOf<T> extends ShortcutCombination<T> { */ @SafeVarargs public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) { - return anyOf(Arrays.asList(matchers)); + return anyOf((List) Arrays.asList(matchers)); } } diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java index 5748820..a3a93c1 100644 --- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java +++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java @@ -57,7 +57,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> { * a list of matchers, each of which must be satisfied by an entry in an examined array */ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) { - return arrayContainingInAnyOrder(Arrays.asList(itemMatchers)); + return arrayContainingInAnyOrder((List) Arrays.asList(itemMatchers)); } /** diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java index 4933e38..6f2fc47 100644 --- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java +++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java @@ -97,7 +97,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher * a list of matchers, each of which must be satisfied by an item provided by an examined {@link Iterable} */ public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) { - return containsInAnyOrder(Arrays.asList(itemMatchers)); + return containsInAnyOrder((List) Arrays.asList(itemMatchers)); } /** diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java index b0b9db2..f669835 100644 --- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java +++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java @@ -97,7 +97,7 @@ public class IsIterableContainingInRelativeOrder<E> extends TypeSafeDiagnosingMa * the matchers that must be satisfied by the items provided by an examined {@link Iterable} in the same relative order */ public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) { - return containsInRelativeOrder(asList(itemMatchers)); + return containsInRelativeOrder((List) asList(itemMatchers)); } /** |