improved mismatch message for IsInstanceOf

smgfreeman · smgfreeman · commit d5f2a7f52aed · 2009-03-25T16:11:58.000Z
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java
@@ -32,7 +32,7 @@ protected boolean matches(Object item, Description mismatchDescription) {
       }
       
       if (!theClass.isInstance(item)) {
-        mismatchDescription.appendText("[" + item.getClass().getSimpleName() + "] ").appendValue(item);
+        mismatchDescription.appendValue(item).appendText(" is a " + item.getClass().getName());
         return false;
       }
       
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/core/IsInstanceOfTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/core/IsInstanceOfTest.java
@@ -27,7 +27,7 @@ public void testHasAReadableDescription() {
     }
 
     public void testDecribesActualClassInMismatchMessage() {
-      assertMismatchDescription("[String] \"some text\"", instanceOf(Number.class), "some text");
+      assertMismatchDescription("\"some text\" is a java.lang.String", instanceOf(Number.class), "some text");
     }
     
     public void testInstanceOfRequiresACastToReturnTheCorrectTypeForUseInJMock() {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected boolean matches(Object item, Description mismatchDescription) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if (!theClass.isInstance(item)) {`
`35`		`- mismatchDescription.appendText("[" + item.getClass().getSimpleName() + "] ").appendValue(item);`
	`35`	`+ mismatchDescription.appendValue(item).appendText(" is a " + item.getClass().getName());`
`36`	`36`	`return false;`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public void testHasAReadableDescription() {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public void testDecribesActualClassInMismatchMessage() {`
`30`		`- assertMismatchDescription("[String] \"some text\"", instanceOf(Number.class), "some text");`
	`30`	`+ assertMismatchDescription("\"some text\" is a java.lang.String", instanceOf(Number.class), "some text");`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public void testInstanceOfRequiresACastToReturnTheCorrectTypeForUseInJMock() {`