Tidying up string matchers. All factory methods in MatchStrings

sf105 · sf105 · commit 62590341c8cb · 2014-12-25T12:21:39.000+01:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/Matchers.java b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
@@ -1219,7 +1219,7 @@ public static <T extends java.lang.Comparable<T>> org.hamcrest.Matcher<T> lessTh
      * @param expectedString the expected value of matched strings
      */
     public static org.hamcrest.Matcher<java.lang.String> equalToIgnoringCase(java.lang.String expectedString) {
-        return org.hamcrest.text.IsEqualIgnoringCase.equalToIgnoringCase(expectedString);
+        return MatchStrings.equalToIgnoringCase(expectedString);
     }
 
     /**
@@ -1236,7 +1236,7 @@ public static org.hamcrest.Matcher<java.lang.String> equalToIgnoringCase(java.la
      * @param expectedString the expected value of matched strings
      */
     public static org.hamcrest.Matcher<java.lang.String> equalToIgnoringWhiteSpace(java.lang.String expectedString) {
-        return org.hamcrest.text.IsEqualIgnoringWhiteSpace.equalToIgnoringWhiteSpace(expectedString);
+        return MatchStrings.equalToIgnoringWhiteSpace(expectedString);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java
@@ -3,7 +3,6 @@
 package org.hamcrest.text;
 
 import org.hamcrest.Description;
-import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
 /**
@@ -34,18 +33,4 @@ public void describeTo(Description description) {
                 .appendValue(string)
                 .appendText(")");
     }
-
-    /**
-     * Creates a matcher of {@link String} that matches when the examined string is equal to
-     * the specified expectedString, ignoring case.
-     * For example:
-     * <pre>assertThat("Foo", equalToIgnoringCase("FOO"))</pre>
-     * 
-     * @param expectedString
-     *     the expected value of matched strings
-     */
-    public static Matcher<String> equalToIgnoringCase(String expectedString) {
-        return new IsEqualIgnoringCase(expectedString);
-    }
-
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java
@@ -3,7 +3,6 @@
 package org.hamcrest.text;
 
 import org.hamcrest.Description;
-import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
 import static java.lang.Character.isWhitespace;
@@ -54,23 +53,4 @@ public String stripSpace(String toBeStripped) {
         }
         return result.toString().trim();
     }
-
-    /**
-     * Creates a matcher of {@link String} that matches when the examined string is equal to
-     * the specified expectedString, when whitespace differences are (mostly) ignored.  To be
-     * exact, the following whitespace rules are applied:
-     * <ul>
-     *   <li>all leading and trailing whitespace of both the expectedString and the examined string are ignored</li>
-     *   <li>any remaining whitespace, appearing within either string, is collapsed to a single space before comparison</li>
-     * </ul>
-     * For example:
-     * <pre>assertThat("   my\tfoo  bar ", equalToIgnoringWhiteSpace(" my  foo bar"))</pre>
-     * 
-     * @param expectedString
-     *     the expected value of matched strings
-     */
-    public static Matcher<String> equalToIgnoringWhiteSpace(String expectedString) {
-        return new IsEqualIgnoringWhiteSpace(expectedString);
-    }
-
 }
