Matchers.throwsException will return interface

Author: tumbarumba

hamcrest/src/main/java/org/hamcrest/Matchers.java

@@ -2236,7 +2236,7 @@ public static <T> Matcher<Optional<T>> optionalWithValue(Matcher<? super T> matc
  * @param <T> type of the Runnable
  * @return The matcher.
  */
- public static <T extends Runnable> ThrowsException<T> throwsException() {
+ public static <T extends Runnable> Matcher<T> throwsException() {
  return ThrowsException.throwsException();
  }
 
@@ -2248,7 +2248,7 @@ public static <T extends Runnable> ThrowsException<T> throwsException() {
  * @param throwableClass the Throwable class against which examined exceptions are compared
  * @return The matcher.
  */
- public static <T extends Runnable, U extends Throwable> ThrowsException<T> throwsException(Class<U> throwableClass) {
+ public static <T extends Runnable, U extends Throwable> Matcher<T> throwsException(Class<U> throwableClass) {
  return ThrowsException.throwsException(throwableClass);
  }
 
@@ -2261,7 +2261,7 @@ public static <T extends Runnable, U extends Throwable> ThrowsException<T> throw
  * @param message the String against which examined exception messages are compared
  * @return The matcher.
  */
- public static <T extends Runnable, U extends Throwable> ThrowsException<T> throwsException(Class<U> throwableClass, String message) {
+ public static <T extends Runnable, U extends Throwable> Matcher<T> throwsException(Class<U> throwableClass, String message) {
  return ThrowsException.throwsException(throwableClass, message);
  }
 
@@ -2274,7 +2274,7 @@ public static <T extends Runnable, U extends Throwable> ThrowsException<T> throw
  * @param messageMatcher matcher to validate exception's message
  * @return The matcher.
  */
- public static <T extends Runnable, U extends Throwable> ThrowsException<T> throwsException(Class<U> throwableClass, Matcher<String> messageMatcher) {
+ public static <T extends Runnable, U extends Throwable> Matcher<T> throwsException(Class<U> throwableClass, Matcher<String> messageMatcher) {
  return ThrowsException.throwsException(throwableClass, messageMatcher);
  }
 
@@ -2286,7 +2286,7 @@ public static <T extends Runnable, U extends Throwable> ThrowsException<T> throw
  * @param message the String against which examined exception messages are compared
  * @return The matcher.
  */
- public static <T extends Runnable, U extends Throwable> ThrowsException<T> throwsExceptionWithMessage(String message) {
+ public static <T extends Runnable, U extends Throwable> Matcher<T> throwsExceptionWithMessage(String message) {
  return ThrowsException.throwsExceptionWithMessage(message);
  }
 
@@ -2298,7 +2298,7 @@ public static <T extends Runnable, U extends Throwable> ThrowsException<T> throw
  * @param messageMatcher matcher to validate exception's message
  * @return The matcher.
  */
- public static <T extends Runnable, U extends Throwable> ThrowsException<T> throwsExceptionWithMessage(Matcher<String> messageMatcher) {
+ public static <T extends Runnable, U extends Throwable> Matcher<T> throwsExceptionWithMessage(Matcher<String> messageMatcher) {
  return ThrowsException.throwsExceptionWithMessage(messageMatcher);
  }
 }

hamcrest/src/main/java/org/hamcrest/exception/ThrowsException.java

@@ -22,27 +22,27 @@ public ThrowsException(IsInstanceOf classMatcher, Matcher<? super String> messag
  this.messageMatcher = messageMatcher;
  }
 
- public static <T extends Runnable> ThrowsException<T> throwsException() {
+ public static <T extends Runnable> Matcher<T> throwsException() {
  return throwsException(Throwable.class);
  }
 
- public static <T extends Runnable, U extends Throwable> ThrowsException<T> throwsException(Class<U> throwableClass) {
+ public static <T extends Runnable, U extends Throwable> Matcher<T> throwsException(Class<U> throwableClass) {
  return new ThrowsException<>(new IsInstanceOf(throwableClass), anything("<anything>"));
  }
 
- public static <T extends Runnable, U extends Throwable> ThrowsException<T> throwsException(Class<U> throwableClass, String exactMessage) {
+ public static <T extends Runnable, U extends Throwable> Matcher<T> throwsException(Class<U> throwableClass, String exactMessage) {
  return throwsException(throwableClass, equalTo(exactMessage));
  }
 
- public static <T extends Runnable, U extends Throwable> ThrowsException<T> throwsException(Class<U> throwableClass, Matcher<String> messageMatcher) {
+ public static <T extends Runnable, U extends Throwable> Matcher<T> throwsException(Class<U> throwableClass, Matcher<String> messageMatcher) {
  return new ThrowsException<>(new IsInstanceOf(throwableClass), messageMatcher);
  }
 
- public static <T extends Runnable> ThrowsException<T> throwsExceptionWithMessage(String exactMessage) {
+ public static <T extends Runnable> Matcher<T> throwsExceptionWithMessage(String exactMessage) {
  return throwsException(Throwable.class, equalTo(exactMessage));
  }
 
- public static <T extends Runnable> ThrowsException<T> throwsExceptionWithMessage(Matcher<String> messageMatcher) {
+ public static <T extends Runnable> Matcher<T> throwsExceptionWithMessage(Matcher<String> messageMatcher) {
  return throwsException(Throwable.class, messageMatcher);
  }