Simplifed description of equalTo() matcher.

joeretro · joeretro · commit 4ca40ccf27aa · 2006-12-14T15:43:37.000Z
diff --git a/src/library/org/hamcrest/core/IsEqual.java b/src/library/org/hamcrest/core/IsEqual.java
@@ -26,9 +26,7 @@ public boolean matches(Object arg) {
     }
 
     public void describeTo(Description description) {
-        description.appendText("eq(")
-                .appendValue(object)
-                .appendText(")");
+        description.appendValue(object);
     }
 
     private static boolean areEqual(Object o1, Object o2) {
diff --git a/src/unit-test/org/hamcrest/collection/IsArrayContainingTest.java b/src/unit-test/org/hamcrest/collection/IsArrayContainingTest.java
@@ -28,7 +28,7 @@ public void testDoesNotMatchNull() {
     }
 
     public void testHasAReadableDescription() {
-        assertDescription("an array containing eq(\"a\")", arrayContaining("a"));
+        assertDescription("an array containing \"a\"", arrayContaining("a"));
     }
 
     // Remaining code no longer compiles, thanks to generics. I think that's a good thing, but
diff --git a/src/unit-test/org/hamcrest/collection/IsArrayTest.java b/src/unit-test/org/hamcrest/collection/IsArrayTest.java
@@ -36,6 +36,6 @@ public void testDoesNotMatchNull() {
     }
     
     public void testHasAReadableDescription() {
-        assertDescription("[eq(\"a\"), eq(\"b\")]", array(equalTo("a"), equalTo("b")));
+        assertDescription("[\"a\", \"b\"]", array(equalTo("a"), equalTo("b")));
     }
 }
diff --git a/src/unit-test/org/hamcrest/collection/IsCollectionContainingTest.java b/src/unit-test/org/hamcrest/collection/IsCollectionContainingTest.java
@@ -32,7 +32,7 @@ public void testDoesNotMatchNull() {
     }
 
     public void testHasAReadableDescription() {
-        assertDescription("a collection containing eq(\"a\")", collectionContaining(equalTo("a")));
+        assertDescription("a collection containing \"a\"", collectionContaining(equalTo("a")));
     }
 
     public void testMatchesAllItemsInCollection() {
diff --git a/src/unit-test/org/hamcrest/collection/IsMapContainingTest.java b/src/unit-test/org/hamcrest/collection/IsMapContainingTest.java
@@ -31,7 +31,7 @@ public void testDoesNotMatchNull() {
     }
 
     public void testHasReadableDescription() {
-        assertDescription("map containing [eq(\"a\")->eq(<2>)]",
+        assertDescription("map containing [\"a\"-><2>]",
                 mapContaining(equalTo("a"), (equalTo(2))));
     }
 
diff --git a/src/unit-test/org/hamcrest/core/IsEqualTest.java b/src/unit-test/org/hamcrest/core/IsEqualTest.java
@@ -73,16 +73,16 @@ public String toString() {
                 return argumentDescription;
             }
         };
-        assertDescription("eq(<" + argumentDescription + ">)", equalTo(argument));
+        assertDescription("<" + argumentDescription + ">", equalTo(argument));
     }
 
     public void testReturnsAnObviousDescriptionIfCreatedWithANestedMatcherByMistake() {
         Matcher<String> innerMatcher = equalTo("NestedMatcher");
-        assertDescription("eq(<" + innerMatcher.toString() + ">)", equalTo(innerMatcher));
+        assertDescription("<" + innerMatcher.toString() + ">", equalTo(innerMatcher));
     }
 
     public void testReturnsGoodDescriptionIfCreatedWithNullReference() {
-        assertDescription("eq(null)", equalTo(null));
+        assertDescription("null", equalTo(null));
     }
 }
 
diff --git a/src/unit-test/org/hamcrest/xml/HasXPathTest.java b/src/unit-test/org/hamcrest/xml/HasXPathTest.java
@@ -57,7 +57,7 @@ public void testThrowsIllegalArgumentExceptionIfGivenIllegalExpression() {
     }
 
     public void testDescribesItself() throws Exception {
-        assertDescription("an XML document with XPath /some/path eq(\"Cheddar\")",
+        assertDescription("an XML document with XPath /some/path \"Cheddar\"",
                 hasXPath("/some/path", equalTo("Cheddar")));
         assertDescription("an XML document with XPath /some/path",
                 hasXPath("/some/path"));

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ public boolean matches(Object arg) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public void describeTo(Description description) {`
`29`		`- description.appendText("eq(")`
`30`		`- .appendValue(object)`
`31`		`- .appendText(")");`
	`29`	`+ description.appendValue(object);`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`private static boolean areEqual(Object o1, Object o2) {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void testDoesNotMatchNull() {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public void testHasAReadableDescription() {`
`31`		`- assertDescription("an array containing eq(\"a\")", arrayContaining("a"));`
	`31`	`+ assertDescription("an array containing \"a\"", arrayContaining("a"));`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// Remaining code no longer compiles, thanks to generics. I think that's a good thing, but`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ public void testDoesNotMatchNull() {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public void testHasAReadableDescription() {`
`39`		`- assertDescription("[eq(\"a\"), eq(\"b\")]", array(equalTo("a"), equalTo("b")));`
	`39`	`+ assertDescription("[\"a\", \"b\"]", array(equalTo("a"), equalTo("b")));`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void testDoesNotMatchNull() {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public void testHasAReadableDescription() {`
`35`		`- assertDescription("a collection containing eq(\"a\")", collectionContaining(equalTo("a")));`
	`35`	`+ assertDescription("a collection containing \"a\"", collectionContaining(equalTo("a")));`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public void testMatchesAllItemsInCollection() {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void testDoesNotMatchNull() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public void testHasReadableDescription() {`
`34`		`- assertDescription("map containing [eq(\"a\")->eq(<2>)]",`
	`34`	`+ assertDescription("map containing [\"a\"-><2>]",`
`35`	`35`	`mapContaining(equalTo("a"), (equalTo(2))));`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -73,16 +73,16 @@ public String toString() {`
`73`	`73`	`return argumentDescription;`
`74`	`74`	`}`
`75`	`75`	`};`
`76`		`- assertDescription("eq(<" + argumentDescription + ">)", equalTo(argument));`
	`76`	`+ assertDescription("<" + argumentDescription + ">", equalTo(argument));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public void testReturnsAnObviousDescriptionIfCreatedWithANestedMatcherByMistake() {`
`80`	`80`	`Matcher<String> innerMatcher = equalTo("NestedMatcher");`
`81`		`- assertDescription("eq(<" + innerMatcher.toString() + ">)", equalTo(innerMatcher));`
	`81`	`+ assertDescription("<" + innerMatcher.toString() + ">", equalTo(innerMatcher));`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public void testReturnsGoodDescriptionIfCreatedWithNullReference() {`
`85`		`- assertDescription("eq(null)", equalTo(null));`
	`85`	`+ assertDescription("null", equalTo(null));`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public void testThrowsIllegalArgumentExceptionIfGivenIllegalExpression() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public void testDescribesItself() throws Exception {`
`60`		`- assertDescription("an XML document with XPath /some/path eq(\"Cheddar\")",`
	`60`	`+ assertDescription("an XML document with XPath /some/path \"Cheddar\"",`
`61`	`61`	`hasXPath("/some/path", equalTo("Cheddar")));`
`62`	`62`	`assertDescription("an XML document with XPath /some/path",`
`63`	`63`	`hasXPath("/some/path"));`