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/Assume.java | |
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/Assume.java')
-rw-r--r-- | src/main/java/org/junit/Assume.java | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/main/java/org/junit/Assume.java b/src/main/java/org/junit/Assume.java index 29b705b..b7687f7 100644 --- a/src/main/java/org/junit/Assume.java +++ b/src/main/java/org/junit/Assume.java @@ -14,7 +14,7 @@ import org.hamcrest.Matcher; * basically means "don't run this test if these conditions don't apply". The default JUnit runner skips tests with * failing assumptions. Custom runners may behave differently. * <p> - * A good example of using assumptions is in <a href="https://github.com/junit-team/junit4/wiki/Theories">Theories</a> where they are needed to exclude certain datapoints that aren't suitable or allowed for a certain test case. + * A good example of using assumptions is in <a href="https://github.com/junit-team/junit/wiki/Theories">Theories</a> where they are needed to exclude certain datapoints that aren't suitable or allowed for a certain test case. * </p> * Failed assumptions are usually not logged, because there may be many tests that don't apply to certain * configurations. @@ -29,20 +29,11 @@ import org.hamcrest.Matcher; * </pre> * </p> * - * @see <a href="https://github.com/junit-team/junit4/wiki/Theories">Theories</a> + * @see <a href="https://github.com/junit-team/junit/wiki/Theories">Theories</a> * * @since 4.4 */ public class Assume { - - /** - * Do not instantiate. - * @deprecated since 4.13. - */ - @Deprecated - public Assume() { - } - /** * If called with an expression evaluating to {@code false}, the test will halt and be ignored. */ @@ -54,7 +45,7 @@ public class Assume { * The inverse of {@link #assumeTrue(boolean)}. */ public static void assumeFalse(boolean b) { - assumeThat(b, is(false)); + assumeTrue(!b); } /** @@ -76,11 +67,9 @@ public class Assume { } /** - * If called with a {@code null} array or one or more {@code null} elements in {@code objects}, - * the test will halt and be ignored. + * 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(objects, notNullValue()); assumeThat(asList(objects), everyItem(notNullValue())); } |