Issue 74: Mismatch description for FeatureMatcher should use mismatchDescription of submatcher

smgfreeman · smgfreeman · commit e878329d15d4 · 2009-04-25T20:59:05.000Z
diff --git a/hamcrest-core/src/main/java/org/hamcrest/FeatureMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/FeatureMatcher.java
@@ -39,7 +39,8 @@ public FeatureMatcher(Matcher<? super U> subMatcher, String featureDescription,
   protected boolean matchesSafely(T actual, Description mismatchDescription) {
     final U featureValue = featureValueOf(actual);
     if (!subMatcher.matches(featureValue)) {
-      mismatchDescription.appendText(featureName).appendText(" was ").appendValue(featureValue);
+      mismatchDescription.appendText(featureName).appendText(" was ");
+      subMatcher.describeMismatch(featureValue, mismatchDescription);
       return false;
     }
     return true;
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/FeatureMatcherTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/FeatureMatcherTest.java
@@ -1,32 +1,42 @@
 package org.hamcrest;
 
-import static org.hamcrest.AbstractMatcherTest.*;
-import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.AbstractMatcherTest.assertDescription;
+import static org.hamcrest.AbstractMatcherTest.assertMatches;
+import static org.hamcrest.AbstractMatcherTest.assertMismatchDescription;
 import junit.framework.TestCase;
 
+import org.hamcrest.core.IsEqual;
+
 public class FeatureMatcherTest extends TestCase {
   private final FeatureMatcher<Thingy, String> resultMatcher = resultMatcher();
 
-    public void testMatchesPartOfAnObject() {
-      assertMatches("feature", resultMatcher, new Thingy("bar"));
-      assertDescription("Thingy with result \"bar\"", resultMatcher);
-    }
+  public void testMatchesPartOfAnObject() {
+    assertMatches("feature", resultMatcher, new Thingy("bar"));
+    assertDescription("Thingy with result \"bar\"", resultMatcher);
+  }
+  
+  public void testMismatchesPartOfAnObject() {
+    assertMismatchDescription("result was mismatch-description", resultMatcher, new Thingy("foo"));
+  }
+   
+  public void testDoesNotThrowNullPointerException() {
+    assertMismatchDescription("was null", resultMatcher, null);
+  }
+  
+  public void testDoesNotThrowClassCastException() {
+    resultMatcher.matches(new ShouldNotMatch());
+    StringDescription mismatchDescription = new StringDescription(); 
+    resultMatcher.describeMismatch(new ShouldNotMatch(), mismatchDescription);
+    assertEquals("was <ShouldNotMatch>", mismatchDescription.toString());
+  }
 
-    public void testMismatchesPartOfAnObject() {
-      assertMismatchDescription("result was \"foo\"", resultMatcher, new Thingy("foo"));
+  
+  public static class Match extends IsEqual<String> {
+    public Match(String equalArg) { super(equalArg); }
+    @Override public void describeMismatch(Object item, Description description) {
+      description.appendText("mismatch-description");
     }
- 
-    public void testDoesNotThrowNullPointerException() {
-      assertMismatchDescription("was null", resultMatcher, null);
-   }
-
-   public void testDoesNotThrowClassCastException() {
-       resultMatcher.matches(new ShouldNotMatch());
-       StringDescription mismatchDescription = new StringDescription(); 
-       resultMatcher.describeMismatch(new ShouldNotMatch(), mismatchDescription);
-       assertEquals("was <ShouldNotMatch>", mismatchDescription.toString());
-   }
-
+  }
   public static class Thingy {
     private final String result;
 
@@ -44,7 +54,7 @@ public static class ShouldNotMatch {
   } 
   
   private static FeatureMatcher<Thingy, String> resultMatcher() {
-    return new FeatureMatcher<Thingy, String>(equalTo("bar"), "Thingy with result", "result") {
+    return new FeatureMatcher<Thingy, String>(new Match("bar"), "Thingy with result", "result") {
       @Override
       public String featureValueOf(Thingy actual) {
         return actual.getResult();
