Fix for issue 134: DescribedAs does not delegate describeMismatch

nat.pryce · nat.pryce · commit bc04aff3d2a7 · 2011-02-10T23:19:03.000Z
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/DescribedAs.java b/hamcrest-core/src/main/java/org/hamcrest/core/DescribedAs.java
@@ -2,13 +2,13 @@
  */
 package org.hamcrest.core;
 
-import java.util.regex.Pattern;
-
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 
+import java.util.regex.Pattern;
+
 /**
  * Provides a custom description to another matcher.
  */
@@ -44,6 +44,11 @@ public void describeTo(Description description) {
             description.appendText(descriptionTemplate.substring(textStart));
         }
     }
+    
+    @Override
+    public void describeMismatch(Object item, Description description) {
+        matcher.describeMismatch(item, description);
+    }
 
     /**
      * Wraps an existing matcher and overrides the description when it fails.
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/core/DescribedAsTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/core/DescribedAsTest.java
@@ -2,15 +2,18 @@
  */
 package org.hamcrest.core;
 
+import org.hamcrest.AbstractMatcherTest;
+import org.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
+
 import static org.hamcrest.core.DescribedAs.describedAs;
 import static org.hamcrest.core.IsAnything.anything;
+import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.IsNot.not;
 
-import org.hamcrest.AbstractMatcherTest;
-import org.hamcrest.Matcher;
-
 public class DescribedAsTest extends AbstractMatcherTest {
-    @Override protected Matcher<?> createMatcher() {
+    @Override
+    protected Matcher<?> createMatcher() {
         return describedAs("irrelevant", anything());
     }
 
@@ -24,16 +27,25 @@ public void testOverridesDescriptionOfOtherMatcherWithThatPassedToConstructor()
 
     public void testAppendsValuesToDescription() {
         Matcher<?> m = describedAs("value 1 = %0, value 2 = %1",
-                                anything(), 33, 97);
-        
+                anything(), 33, 97);
+
         assertDescription("value 1 = <33>, value 2 = <97>", m);
     }
-    
+
     public void testDelegatesMatchingToAnotherMatcher() {
         Matcher<Object> m1 = describedAs("irrelevant", anything());
         Matcher<Object> m2 = describedAs("irrelevant", not(anything()));
 
         assertTrue(m1.matches(new Object()));
         assertFalse(m2.matches("hi"));
     }
+
+    public void testDelegatesMismatchDescriptionToAnotherMatcher() {
+        Matcher<Integer> m1 = describedAs("irrelevant", equalTo(2));
+
+        StringDescription description = new StringDescription();
+        m1.describeMismatch(1, description);
+
+        assertEquals("was <1>", description.toString());
+    }
 }
