diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-14 12:42:07 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2016-12-20 15:52:52 +0000 |
| commit | 86f323b2a73c9c250fbe25b828435aa936704ab3 (patch) | |
| tree | 5e35bd76d6575654fdba8c7d6d64c11e55327755 /src/main/java/org/junit/Assume.java | |
| parent | 4156f43b51c6f2d42df6e45535e1967aa46514d3 (diff) | |
| download | junit-86f323b2a73c9c250fbe25b828435aa936704ab3.tar.gz | |
Revert matchers back to 4.10 to compile against Hamcrest 1.1
JUnit 4.12 is supposed to be built against Hamcrest 1.3 or above
but external/hamcrest is still at 1.1. This reverts affected
files back to their 4.10 version so that they will compile
against Hamcrest 1.1 for now.
Bug: 33613916
Test: make checkbuild
Change-Id: Ie3c15047aa5a942ed0987c31c345725bef4db3d4
Diffstat (limited to 'src/main/java/org/junit/Assume.java')
| -rw-r--r-- | src/main/java/org/junit/Assume.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/org/junit/Assume.java b/src/main/java/org/junit/Assume.java index b7687f7..c96ff99 100644 --- a/src/main/java/org/junit/Assume.java +++ b/src/main/java/org/junit/Assume.java @@ -1,12 +1,12 @@ package org.junit; import static java.util.Arrays.asList; -import static org.hamcrest.CoreMatchers.everyItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; import org.hamcrest.Matcher; +import org.junit.internal.matchers.Each; /** * A set of methods useful for stating assumptions about the conditions in which a test is meaningful. @@ -66,12 +66,13 @@ public class Assume { assumeTrue(message, !b); } - /** - * If called with one or more null elements in <code>objects</code>, the test will halt and be ignored. - */ - public static void assumeNotNull(Object... objects) { - assumeThat(asList(objects), everyItem(notNullValue())); - } + /** + * If called with one or more null elements in <code>objects</code>, the test will halt and be ignored. + * @param objects + */ + public static void assumeNotNull(Object... objects) { + assumeThat(asList(objects), Each.each(notNullValue())); + } /** * Call to assume that <code>actual</code> satisfies the condition specified by <code>matcher</code>. |