Factory methods. Map hasKey/Value

sf105 · sf105 · commit 755e9a4e8122 · 2014-12-26T19:04:57.000+01:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java
@@ -7,9 +7,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import static org.hamcrest.core.IsAnything.anything;
-import static org.hamcrest.core.IsEqual.equalTo;
-
 public class IsMapContaining<K,V> extends TypeSafeMatcher<Map<? extends K, ? extends V>> {
     private final Matcher<? super K> keyMatcher;
     private final Matcher<? super V> valueMatcher;
@@ -43,55 +40,4 @@ public void describeTo(Description description) {
                    .appendText("]");
     }
 
-    /**
-     * Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
-     * at least one key that satisfies the specified matcher.
-     * For example:
-     * <pre>assertThat(myMap, hasKey(equalTo("bar")))</pre>
-     * 
-     * @param keyMatcher
-     *     the matcher that must be satisfied by at least one key
-     */
-    public static <K> Matcher<Map<? extends K, ?>> hasKey(Matcher<? super K> keyMatcher) {
-        return new IsMapContaining<>(keyMatcher, anything());
-    }
-
-    /**
-     * Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
-     * at least one key that is equal to the specified key.
-     * For example:
-     * <pre>assertThat(myMap, hasKey("bar"))</pre>
-     * 
-     * @param key
-     *     the key that satisfying maps must contain
-     */
-    public static <K> Matcher<Map<? extends K, ?>> hasKey(K key) {
-        return new IsMapContaining<>(equalTo(key), anything());
-    }
-
-    /**
-     * Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
-     * at least one value that satisfies the specified valueMatcher.
-     * For example:
-     * <pre>assertThat(myMap, hasValue(equalTo("foo")))</pre>
-     * 
-     * @param valueMatcher
-     *     the matcher that must be satisfied by at least one value
-     */
-    public static <V> Matcher<Map<?, ? extends V>> hasValue(Matcher<? super V> valueMatcher) {
-        return new IsMapContaining<>(anything(), valueMatcher);
-    }
-
-    /**
-     * Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
-     * at least one value that is equal to the specified value.
-     * For example:
-     * <pre>assertThat(myMap, hasValue("foo"))</pre>
-     * 
-     * @param value
-     *     the value that satisfying maps must contain
-     */
-    public static <V> Matcher<Map<?, ? extends V>> hasValue(V value) {
-        return new IsMapContaining<>(anything(), equalTo(value));
-    }
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/MatchingMaps.java b/hamcrest-library/src/main/java/org/hamcrest/collection/MatchingMaps.java
@@ -4,6 +4,7 @@
 
 import java.util.Map;
 
+import static org.hamcrest.core.IsAnything.anything;
 import static org.hamcrest.core.IsEqual.equalTo;
 
 public class MatchingMaps {
@@ -78,7 +79,7 @@ public class MatchingMaps {
      * @param keyMatcher the matcher that must be satisfied by at least one key
      */
     public static <K> org.hamcrest.Matcher<Map<? extends K, ?>> hasKey(Matcher<? super K> keyMatcher) {
-        return IsMapContaining.hasKey(keyMatcher);
+        return new IsMapContaining<>(keyMatcher, anything());
     }
 
     /**
@@ -89,9 +90,7 @@ public class MatchingMaps {
      *
      * @param key the key that satisfying maps must contain
      */
-    public static <K> org.hamcrest.Matcher<Map<? extends K, ?>> hasKey(K key) {
-        return IsMapContaining.hasKey(key);
-    }
+    public static <K> org.hamcrest.Matcher<Map<? extends K, ?>> hasKey(K key) { return hasKey(equalTo(key)); }
 
     /**
      * Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
@@ -102,7 +101,7 @@ public class MatchingMaps {
      * @param valueMatcher the matcher that must be satisfied by at least one value
      */
     public static <V> org.hamcrest.Matcher<Map<?, ? extends V>> hasValue(Matcher<? super V> valueMatcher) {
-        return IsMapContaining.hasValue(valueMatcher);
+        return new IsMapContaining<>(anything(), valueMatcher);
     }
 
     /**
@@ -114,7 +113,7 @@ public class MatchingMaps {
      * @param value the value that satisfying maps must contain
      */
     public static <V> org.hamcrest.Matcher<Map<?, ? extends V>> hasValue(V value) {
-        return IsMapContaining.hasValue(value);
+        return hasValue(equalTo(value));
     }
 
 }
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingKeyTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingKeyTest.java
@@ -8,7 +8,7 @@
 import java.util.TreeMap;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.collection.IsMapContaining.hasKey;
+import static org.hamcrest.collection.MatchingMaps.hasKey;
 
 public class IsMapContainingKeyTest extends AbstractMatcherTest {
 
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingValueTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingValueTest.java
@@ -8,7 +8,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import static org.hamcrest.collection.IsMapContaining.hasValue;
+import static org.hamcrest.collection.MatchingMaps.hasValue;
 
 public class IsMapContainingValueTest extends AbstractMatcherTest {
 
