Merge pull request hamcrest#122 from alb-i986/IsEqualIgnoringX-describeTo

sf105 · sf105 · commit fd3a60d2fd02 · 2016-04-06T14:31:22.000+02:00
IsEqualIgnoringCase, IsEqualIgnoringWhiteSpace: description in plain English
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java
@@ -33,9 +33,9 @@ public void describeMismatchSafely(String item, Description mismatchDescription)
     
     @Override
     public void describeTo(Description description) {
-        description.appendText("equalToIgnoringCase(")
+        description.appendText("a string equal to ")
                 .appendValue(string)
-                .appendText(")");
+                .appendText(" ignoring case");
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java
@@ -35,9 +35,9 @@ public void describeMismatchSafely(String item, Description mismatchDescription)
     
     @Override
     public void describeTo(Description description) {
-        description.appendText("equalToIgnoringWhiteSpace(")
+        description.appendText("a string equal to ")
                 .appendValue(string)
-                .appendText(")");
+                .appendText(" ignoring white space");
     }
 
     public String stripSpace(String toBeStripped) {
diff --git a/hamcrest-library/src/test/java/org/hamcrest/text/IsEqualIgnoringCaseTest.java b/hamcrest-library/src/test/java/org/hamcrest/text/IsEqualIgnoringCaseTest.java
@@ -50,7 +50,7 @@ public final class IsEqualIgnoringCaseTest {
     @Test public void
     describesItself() {
     	final Matcher<String> matcher = equalToIgnoringCase("heLLo");
-        assertDescription("equalToIgnoringCase(\"heLLo\")", matcher);
+        assertDescription("a string equal to \"heLLo\" ignoring case", matcher);
     }
 
     @Test public void
diff --git a/hamcrest-library/src/test/java/org/hamcrest/text/IsEqualIgnoringWhiteSpaceTest.java b/hamcrest-library/src/test/java/org/hamcrest/text/IsEqualIgnoringWhiteSpaceTest.java
@@ -45,7 +45,7 @@ public void testRequiresNonNullStringToBeConstructed() {
     }
 
     public void testHasAReadableDescription() {
-        assertDescription("equalToIgnoringWhiteSpace(\"Hello World   how\\n are we? \")",
+        assertDescription("a string equal to \"Hello World   how\\n are we? \" ignoring white space",
                         matcher);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public final class IsEqualIgnoringCaseTest {`
`50`	`50`	`@Test public void`
`51`	`51`	`describesItself() {`
`52`	`52`	`final Matcher<String> matcher = equalToIgnoringCase("heLLo");`
`53`		`- assertDescription("equalToIgnoringCase(\"heLLo\")", matcher);`
	`53`	`+ assertDescription("a string equal to \"heLLo\" ignoring case", matcher);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Test public void`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void testRequiresNonNullStringToBeConstructed() {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public void testHasAReadableDescription() {`
`48`		`- assertDescription("equalToIgnoringWhiteSpace(\"Hello World how\\n are we? \")",`
	`48`	`+ assertDescription("a string equal to \"Hello World how\\n are we? \" ignoring white space",`
`49`	`49`	`matcher);`
`50`	`50`	`}`
`51`	`51`	`}`