Collapse HasToString

sf105 · sf105 · commit 03054474b77d · 2014-12-25T13:33:14.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
@@ -1,5 +1,6 @@
 package org.hamcrest;
 
+import org.hamcrest.object.MatchObjects;
 import org.hamcrest.text.MatchStrings;
 import org.hamcrest.xml.MatchXml;
 
@@ -1355,7 +1356,7 @@ public static org.hamcrest.Matcher<java.lang.String> stringContainsInOrder(java.
      * @param toStringMatcher the matcher used to verify the toString result
      */
     public static <T> org.hamcrest.Matcher<T> hasToString(org.hamcrest.Matcher<? super java.lang.String> toStringMatcher) {
-        return org.hamcrest.object.HasToString.hasToString(toStringMatcher);
+        return MatchObjects.hasToString(toStringMatcher);
     }
 
     /**
@@ -1367,7 +1368,7 @@ public static <T> org.hamcrest.Matcher<T> hasToString(org.hamcrest.Matcher<? sup
      * @param expectedToString the expected toString result
      */
     public static <T> org.hamcrest.Matcher<T> hasToString(java.lang.String expectedToString) {
-        return org.hamcrest.object.HasToString.hasToString(expectedToString);
+        return MatchObjects.hasToString(expectedToString);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/HasToString.java b/hamcrest-library/src/main/java/org/hamcrest/object/HasToString.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/MatchObjects.java b/hamcrest-library/src/main/java/org/hamcrest/object/MatchObjects.java
@@ -1,5 +1,6 @@
 package org.hamcrest.object;
 
+import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
 import org.hamcrest.collection.IsIn;
 import org.hamcrest.comparator.ComparatorMatcherBuilder;
@@ -134,6 +135,7 @@ public static Matcher<Object> nullValue() {
      *
      * @param type dummy parameter used to infer the generic type of the returned matcher
      */
+    @SuppressWarnings("UnusedParameters")
     public static <T> Matcher<T> nullValue(Class<T> type) {
         return new IsNull<>();
     }
@@ -264,9 +266,10 @@ public static <T extends Comparable<? super T>> Matcher<T> lessThanOrEqualTo(T v
      * @param toStringMatcher the matcher used to verify the toString result
      */
     public static <T> Matcher<T> hasToString(org.hamcrest.Matcher<? super String> toStringMatcher) {
-        return org.hamcrest.object.HasToString.hasToString(toStringMatcher);
+        return new FeatureMatcher<T, String>(toStringMatcher, "with toString()", "toString()") {
+            @Override protected String featureValueOf(T actual) { return String.valueOf(actual); }
+        };
     }
-
     /**
      * Creates a matcher that matches any examined object whose <code>toString</code> method
      * returns a value equalTo the specified string.
@@ -276,7 +279,7 @@ public static <T> Matcher<T> hasToString(org.hamcrest.Matcher<? super String> to
      * @param expectedToString the expected toString result
      */
     public static <T> Matcher<T> hasToString(String expectedToString) {
-        return org.hamcrest.object.HasToString.hasToString(expectedToString);
+        return hasToString(equalTo(expectedToString));
     }
 
     /**
