From dd005455faab6c5580a129123714e05ebea2a456 Mon Sep 17 00:00:00 2001
From: Kevin Cooney <kcooney@google.com>
Date: Wed, 30 Nov 2016 10:38:13 -0800
Subject: [PATCH] Change generics on ExpectedException.expectCause().

The previous generics (Matcher<? extends Throwable>) would not allow
you do use matchers on Object, like notNullValue().

Fixes #1073
---
 .../org/junit/internal/matchers/ThrowableCauseMatcher.java  | 6 +++---
 src/main/java/org/junit/rules/ExpectedException.java        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
index 6b99004dd709..a8d9cefd932d 100644
--- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
+++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
@@ -16,9 +16,9 @@
 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;
     }
 
@@ -46,7 +46,7 @@ protected void describeMismatchSafely(T item, Description description) {
      * @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
diff --git a/src/main/java/org/junit/rules/ExpectedException.java b/src/main/java/org/junit/rules/ExpectedException.java
index dd482cface8e..0f1cb82bd309 100644
--- a/src/main/java/org/junit/rules/ExpectedException.java
+++ b/src/main/java/org/junit/rules/ExpectedException.java
@@ -240,7 +240,7 @@ public ExpectedException expectMessage(Matcher<String> matcher) {
      * @deprecated use {@code org.hamcrest.junit.ExpectedException.expectCause()}
      */
     @Deprecated
-    public ExpectedException expectCause(Matcher<? extends Throwable> expectedCause) {
+    public ExpectedException expectCause(Matcher<?> expectedCause) {
         expect(hasCause(expectedCause));
         return this;
     }