Change: Port Throwable matchers to TypeSafeDiagnosingMatcher

Author: ggalmazor

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

@@ -1,14 +1,14 @@
 package org.hamcrest.exception;
 
 import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
+import org.hamcrest.TypeSafeDiagnosingMatcher;
 
 /**
  * A matcher that checks if a Runnable throws an expected exception when run.
  *
  * @param <T> the type of the expected exception.
  */
-public class ThrowsExceptionEqualTo<T extends Throwable> extends TypeSafeMatcher<T> {
+public class ThrowsExceptionEqualTo<T extends Throwable> extends TypeSafeDiagnosingMatcher<T> {
     private final T expectedException;
 
     /**
@@ -25,21 +25,21 @@ public static <U extends Throwable> ThrowsExceptionEqualTo<U> exceptionEqualTo(U
     }
 
     @Override
-    public boolean matchesSafely(T item) {
-        return this.expectedException.getClass().isAssignableFrom(item.getClass()) && item.getMessage().equals(this.expectedException.getMessage());
+    public boolean matchesSafely(T item, Description mismatchDescription) {
+        if (!this.expectedException.getClass().isAssignableFrom(item.getClass())) {
+            mismatchDescription.appendValue(item.getClass().getName()).appendText(" instead of a ").appendValue(this.expectedException.getClass().getName()).appendText(" exception");
+            return false;
+        }
+        if (!item.getMessage().equals(this.expectedException.getMessage())) {
+            mismatchDescription.appendValue(item.getClass().getName()).appendText(" with message ").appendValue(item.getMessage()).appendText(" instead of ").appendValue(this.expectedException.getMessage());
+            return false;
+        }
+
+        return true;
     }
 
     @Override
     public void describeTo(Description description) {
         description.appendValue(expectedException.getClass().getName()).appendText(" with message ").appendValue(expectedException.getMessage());
     }
-
-    @Override
-    protected void describeMismatchSafely(T item, Description mismatchDescription) {
-        if (this.expectedException.getClass().isAssignableFrom(item.getClass())) {
-            mismatchDescription.appendValue(item.getClass().getName()).appendText(" with message ").appendValue(item.getMessage()).appendText(" instead of ").appendValue(this.expectedException.getMessage());
-            return;
-        }
-        mismatchDescription.appendValue(item.getClass().getName()).appendText(" instead of a ").appendValue(this.expectedException.getClass().getName()).appendText(" exception");
-    }
 }

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

@@ -2,7 +2,7 @@
 
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
+import org.hamcrest.TypeSafeDiagnosingMatcher;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 
@@ -11,7 +11,7 @@
  *
  * @param <T> the type of the expected exception.
  */
-public class ThrowsExceptionWithMessage<T extends Throwable> extends TypeSafeMatcher<T> {
+public class ThrowsExceptionWithMessage<T extends Throwable> extends TypeSafeDiagnosingMatcher<T> {
     private final Matcher<? super String> messageMatcher;
 
     /**
@@ -32,17 +32,17 @@ public static <U extends Throwable> ThrowsExceptionWithMessage<U> withMessage(Ma
     }
 
     @Override
-    protected boolean matchesSafely(T item) {
-        return this.messageMatcher.matches(item.getMessage());
+    protected boolean matchesSafely(T item, Description mismatchDescription) {
+        if (!this.messageMatcher.matches(item.getMessage())) {
+            mismatchDescription.appendText("an exception with message ").appendValue(item.getMessage()).appendText(" instead of ").appendDescriptionOf(messageMatcher);
+            return false;
+        }
+
+        return true;
     }
 
     @Override
     public void describeTo(Description description) {
         description.appendText("an exception with message ").appendDescriptionOf(messageMatcher);
     }
-
-    @Override
-    protected void describeMismatchSafely(T item, Description mismatchDescription) {
-        mismatchDescription.appendText("an exception with message ").appendValue(item.getMessage()).appendText(" instead of ").appendDescriptionOf(messageMatcher);
-    }
 }