use TreeMap to guarantee order of keys so that the mismatch description string comparison works everywhere all the time

p3muet@gmail.com · p3muet@gmail.com · commit 8cbad6d43e4f · 2008-12-29T21:45:35.000Z
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsMapContainingKeyTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsMapContainingKeyTest.java
@@ -1,12 +1,14 @@
 package org.hamcrest.collection;
 
-import java.util.HashMap;
-import java.util.Map;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.collection.IsMapContainingKey.hasKey;
 
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.collection.IsMapContainingKey.hasKey;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
 
 public class IsMapContainingKeyTest extends AbstractMatcherTest {
 
@@ -74,11 +76,11 @@ public void testDoesNotMatchEmptyMap() {
     }
     
     public void testDoesNotMatchMapMissingKey() {
-        Map<String,Integer> map = new HashMap<String, Integer>();
+        Map<String,Integer> map = new TreeMap<String, Integer>();
         map.put("a", 1);
         map.put("b", 2);
         map.put("c", 3);
         
-        assertMismatchDescription("map was [<a=1>, <c=3>, <b=2>]", hasKey("d"), map);
+        assertMismatchDescription("map was [<a=1>, <b=2>, <c=3>]", hasKey("d"), map);
     }
 }
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsMapContainingTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsMapContainingTest.java
@@ -1,14 +1,14 @@
 package org.hamcrest.collection;
 
-import org.hamcrest.AbstractMatcherTest;
-import org.hamcrest.Matcher;
 import static org.hamcrest.collection.IsMapContaining.hasEntry;
 import static org.hamcrest.core.IsAnything.anything;
 import static org.hamcrest.core.IsEqual.equalTo;
 
+import org.hamcrest.AbstractMatcherTest;
+import org.hamcrest.Matcher;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
 public class IsMapContainingTest extends AbstractMatcherTest {
 
@@ -18,7 +18,7 @@ protected Matcher<?> createMatcher() {
     }
 
     public void testMatchesMapContainingMatchingKeyAndValue() {
-        Map<String,Integer> map = new HashMap<String,Integer>();
+        Map<String,Integer> map = new TreeMap<String,Integer>();
         map.put("a", 1);
         map.put("b", 2);
 
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsMapContainingValueTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsMapContainingValueTest.java
@@ -1,11 +1,13 @@
 package org.hamcrest.collection;
 
-import java.util.HashMap;
-import java.util.Map;
+import static org.hamcrest.collection.IsMapContainingValue.hasValue;
 
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
-import static org.hamcrest.collection.IsMapContainingValue.hasValue;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
 
 public class IsMapContainingValueTest extends AbstractMatcherTest {
 
@@ -40,13 +42,13 @@ public void testMatchesSingletonMapContainingValue() {
 //    }
 
     public void testMatchesMapContainingValue() {
-        Map<String,Integer> map = new HashMap<String,Integer>();
+        Map<String,Integer> map = new TreeMap<String,Integer>();
         map.put("a", 1);
         map.put("b", 2);
         map.put("c", 3);
         
         assertMatches("hasValue 1", hasValue(1), map);      
         assertMatches("hasValue 3", hasValue(3), map);      
-        assertMismatchDescription("map was [<a=1>, <c=3>, <b=2>]", hasValue(4), map);      
+        assertMismatchDescription("map was [<a=1>, <b=2>, <c=3>]", hasValue(4), map);      
     }
 }
