diff options
| author | Pete Bentley <prb@google.com> | 2021-03-03 13:03:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 13:03:13 +0000 |
| commit | fcd81b3e3fa66cb13ab508ef8f9a4a8704309350 (patch) | |
| tree | 9d0ef66d108d76d38341cb002d5a46f74299983f /src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java | |
| parent | 23e304a839c5924c7ac7399076318adc511e9985 (diff) | |
| parent | b6446bec0ab6e17c7e047f5063201f66c7eaf8e2 (diff) | |
| download | junit-fcd81b3e3fa66cb13ab508ef8f9a4a8704309350.tar.gz | |
Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: b6446bec0a
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88041ad8242f07c65db7bbc3b8167363b604af63
Diffstat (limited to 'src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java')
| -rw-r--r-- | src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java index 22ce8bd..6e2ff5e 100644 --- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java @@ -14,9 +14,9 @@ import org.hamcrest.TypeSafeMatcher; public class ThrowableCauseMatcher<T extends Throwable> extends TypeSafeMatcher<T> { - private final Matcher<? extends Throwable> causeMatcher; + private final Matcher<?> causeMatcher; - public ThrowableCauseMatcher(Matcher<? extends Throwable> causeMatcher) { + public ThrowableCauseMatcher(Matcher<?> causeMatcher) { this.causeMatcher = causeMatcher; } @@ -44,7 +44,7 @@ public class ThrowableCauseMatcher<T extends Throwable> extends * @param <T> type of the outer exception */ @Factory - public static <T extends Throwable> Matcher<T> hasCause(final Matcher<? extends Throwable> matcher) { + public static <T extends Throwable> Matcher<T> hasCause(final Matcher<?> matcher) { return new ThrowableCauseMatcher<T>(matcher); } }
\ No newline at end of file |