diff options
| author | Pete Bentley <prb@google.com> | 2021-02-24 11:41:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-24 11:41:00 +0000 |
| commit | f7adff9d456ec1fd10bfe84951d4756d78dbba6f (patch) | |
| tree | 5ae2f0fddfaf8cf38a22f2e954387f1e59ec6e1f /src/main/java/org/junit/internal/runners/statements/ExpectException.java | |
| parent | b7d327f57d78e42387240a4caf22875227df7a68 (diff) | |
| parent | 99022df227f5503b68838d97e0a6b3fa5f558f1b (diff) | |
| download | junit-f7adff9d456ec1fd10bfe84951d4756d78dbba6f.tar.gz | |
Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: d8911c6e95 am: 82af4b8b1d am: 99022df227
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9d6917a074028da6e240c6974f79d484e028da3
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, 3 insertions, 1 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 d0636bd..9a2a952 100644 --- a/src/main/java/org/junit/internal/runners/statements/ExpectException.java +++ b/src/main/java/org/junit/internal/runners/statements/ExpectException.java @@ -19,7 +19,9 @@ public class ExpectException extends Statement { next.evaluate(); complete = true; } catch (AssumptionViolatedException e) { - throw e; + if (!expected.isAssignableFrom(e.getClass())) { + throw e; + } } catch (Throwable e) { if (!expected.isAssignableFrom(e.getClass())) { String message = "Unexpected exception, expected<" |