Simplifying CompressingWhiteSpace

sf105 · sf105 · commit d61955166207 · 2016-04-08T16:45:35.000+02:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualCompressingWhiteSpace.java b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualCompressingWhiteSpace.java
@@ -25,7 +25,7 @@ public IsEqualCompressingWhiteSpace(String string) {
 
     @Override
     public boolean matchesSafely(String item) {
-        return stripSpace(string).equals(stripSpace(item));
+        return stripSpaces(string).equals(stripSpaces(item));
     }
     
     @Override
@@ -40,22 +40,8 @@ public void describeTo(Description description) {
                 .appendText(" compressing white space");
     }
 
-    public String stripSpace(String toBeStripped) {
-        final StringBuilder result = new StringBuilder();
-        boolean lastWasSpace = true;
-        for (int i = 0; i < toBeStripped.length(); i++) {
-            char c = toBeStripped.charAt(i);
-            if (isWhitespace(c)) {
-                if (!lastWasSpace) {
-                    result.append(' ');
-                }
-                lastWasSpace = true;
-            } else {
-                result.append(c);
-                lastWasSpace = false;
-            }
-        }
-        return result.toString().trim();
+    public String stripSpaces(String toBeStripped) {
+        return toBeStripped.replaceAll("\\s+", " ").trim();
     }
 
     /**
diff --git a/hamcrest-library/src/test/java/org/hamcrest/text/IsEqualCompressingWhiteSpaceTest.java b/hamcrest-library/src/test/java/org/hamcrest/text/IsEqualCompressingWhiteSpaceTest.java
@@ -7,7 +7,7 @@
 
 public class IsEqualCompressingWhiteSpaceTest extends AbstractMatcherTest {
 
-    private final Matcher<String> matcher = equalToCompressingWhiteSpace("Hello World   how\n are we? ");
+    private final Matcher<String> matcher = equalToCompressingWhiteSpace(" Hello World   how\n are we? ");
 
     @Override
     protected Matcher<?> createMatcher() {
@@ -38,7 +38,7 @@ public void testFailsIfMatchingAgainstNull() {
     }
 
     public void testHasAReadableDescription() {
-        assertDescription("a string equal to \"Hello World   how\\n are we? \" compressing white space",
+        assertDescription("a string equal to \" Hello World   how\\n are we? \" compressing white space",
                         matcher);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`public class IsEqualCompressingWhiteSpaceTest extends AbstractMatcherTest {`
`9`	`9`
`10`		`- private final Matcher<String> matcher = equalToCompressingWhiteSpace("Hello World how\n are we? ");`
	`10`	`+ private final Matcher<String> matcher = equalToCompressingWhiteSpace(" Hello World how\n are we? ");`
`11`	`11`
`12`	`12`	`@Override`
`13`	`13`	`protected Matcher<?> createMatcher() {`
`@@ -38,7 +38,7 @@ public void testFailsIfMatchingAgainstNull() {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public void testHasAReadableDescription() {`
`41`		`- assertDescription("a string equal to \"Hello World how\\n are we? \" compressing white space",`
	`41`	`+ assertDescription("a string equal to \" Hello World how\\n are we? \" compressing white space",`
`42`	`42`	`matcher);`
`43`	`43`	`}`
`44`	`44`	`}`