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/internal/runners/statements/ExpectException.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/internal/runners/statements/ExpectException.java')
| -rw-r--r-- | src/main/java/org/junit/internal/runners/statements/ExpectException.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/org/junit/internal/runners/statements/ExpectException.java b/src/main/java/org/junit/internal/runners/statements/ExpectException.java index 9a2a952..d0636bd 100644 --- a/src/main/java/org/junit/internal/runners/statements/ExpectException.java +++ b/src/main/java/org/junit/internal/runners/statements/ExpectException.java @@ -19,9 +19,7 @@ public class ExpectException extends Statement { next.evaluate(); complete = true; } catch (AssumptionViolatedException e) { - if (!expected.isAssignableFrom(e.getClass())) { - throw e; - } + throw e; } catch (Throwable e) { if (!expected.isAssignableFrom(e.getClass())) { String message = "Unexpected exception, expected<" |