TypeSafeMatcher no longer breaks backward compatability.

nat.pryce · nat.pryce · commit 969cf38a3618 · 2009-05-11T20:45:50.000Z
diff --git a/hamcrest-core/src/main/java/org/hamcrest/TypeSafeMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/TypeSafeMatcher.java
@@ -7,25 +7,20 @@
  * This simply implements the null check, checks the type and then casts.
  *
  * @author Joe Walnes
+ * @author Steve Freeman
+ * @author Nat Pryce
  */
 public abstract class TypeSafeMatcher<T> extends BaseMatcher<T> {
-    private static final ReflectiveTypeFinder TYPE_FINDER = new ReflectiveTypeFinder("matchesSafely", 1, 0); 
+    private static final ReflectiveTypeFinder TYPE_FINDER = new ReflectiveTypeFinder("matchesSafely", 1, 0);
+    
     final private Class<?> expectedType;
 
-    /**
-     * Subclasses should implement these. The item will already have been checked for
-     * the specific type and will never be null.
-     */
-    protected abstract boolean matchesSafely(T item);
-    protected abstract void describeMismatchSafely(T item, Description mismatchDescription);
-    
     /**
      * The default constructor for simple sub types
      */
     protected TypeSafeMatcher() {
         this(TYPE_FINDER);
     }
-    
    
     /**
      * Use this constructor if the subclass that implements <code>matchesSafely</code> 
@@ -35,7 +30,6 @@ protected TypeSafeMatcher() {
     protected TypeSafeMatcher(Class<?> expectedType) {
         this.expectedType = expectedType;
     }
-
     
     /**
      * Use this constructor if the subclass that implements <code>matchesSafely</code> 
@@ -46,6 +40,20 @@ protected TypeSafeMatcher(ReflectiveTypeFinder typeFinder) {
       this.expectedType = typeFinder.findExpectedType(getClass()); 
     }
  
+    /**
+     * Subclasses should implement this. The item will already have been checked for
+     * the specific type and will never be null.
+     */
+    protected abstract boolean matchesSafely(T item);
+    
+    /**
+     * Subclasses should override this. The item will already have been checked for
+     * the specific type and will never be null.
+     */
+    protected void describeMismatchSafely(T item, Description mismatchDescription) {
+        super.describeMismatch(item, mismatchDescription);
+    }
+    
     /**
      * Methods made final to prevent accidental override.
      * If you need to override this, there's no point on extending TypeSafeMatcher.
@@ -61,10 +69,16 @@ public final boolean matches(Object item) {
     @SuppressWarnings("unchecked")
     @Override
     final public void describeMismatch(Object item, Description description) {
-      if (item == null || ! expectedType.isInstance(item)) {
-        super.describeMismatch(item, description);
-      } else {
-        describeMismatchSafely((T)item, description);
-      }
+        if (item == null) {
+            super.describeMismatch(item, description);
+        } else if (! expectedType.isInstance(item)) {
+            description.appendText("was a ")
+                       .appendText(item.getClass().getName())
+                       .appendText(" (")
+                       .appendValue(item)
+                       .appendText(")");
+        } else {
+            describeMismatchSafely((T)item, description);
+        }
     }
 }
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/TypeSafeMatcherTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/TypeSafeMatcherTest.java
@@ -28,7 +28,7 @@ public void testCanDetermineMatcherTypeFromProtectedMatchesSafelyMethod() {
     
     public void testDescribesMismatches() {
       assertMismatchDescription("was null", null);
-      assertMismatchDescription("was <3>", new Integer(3));
+      assertMismatchDescription("was a java.lang.Integer (<3>)", new Integer(3));
       assertMismatchDescription("The mismatch", "a string");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void testCanDetermineMatcherTypeFromProtectedMatchesSafelyMethod() {`
`28`	`28`
`29`	`29`	`public void testDescribesMismatches() {`
`30`	`30`	`assertMismatchDescription("was null", null);`
`31`		`- assertMismatchDescription("was <3>", new Integer(3));`
	`31`	`+ assertMismatchDescription("was a java.lang.Integer (<3>)", new Integer(3));`
`32`	`32`	`assertMismatchDescription("The mismatch", "a string");`
`33`	`33`	`}`
`34`	`34`