1 files changed, 5 insertions, 35 deletions
diff --git a/guava-tests/test/com/google/common/collect/ForwardingMapTest.java b/guava-tests/test/com/google/common/collect/ForwardingMapTest.java
index 6874627..1f92e90 100644
--- a/guava-tests/test/com/google/common/collect/ForwardingMapTest.java
+++ b/guava-tests/test/com/google/common/collect/ForwardingMapTest.java
@@ -24,7 +24,6 @@ import static org.easymock.EasyMock.verify;
 
 import com.google.common.collect.testing.MapTestSuiteBuilder;
 import com.google.common.collect.testing.TestStringMapGenerator;
-import com.google.common.collect.testing.features.CollectionFeature;
 import com.google.common.collect.testing.features.CollectionSize;
 import com.google.common.collect.testing.features.MapFeature;
 
@@ -132,8 +131,7 @@ public class ForwardingMapTest extends ForwardingTestCase {
 
     }).named("ForwardingMap[LinkedHashMap] with standard implementations")
         .withFeatures(CollectionSize.ANY, MapFeature.ALLOWS_NULL_VALUES,
-            MapFeature.ALLOWS_NULL_KEYS, MapFeature.GENERAL_PURPOSE,
-            CollectionFeature.KNOWN_ORDER)
+            MapFeature.ALLOWS_NULL_KEYS, MapFeature.GENERAL_PURPOSE)
         .createTestSuite());
     suite.addTest(MapTestSuiteBuilder.using(new TestStringMapGenerator() {
 
@@ -149,7 +147,7 @@ public class ForwardingMapTest extends ForwardingTestCase {
     }).named("ForwardingMap[ImmutableMap] with standard implementations")
         .withFeatures(
             CollectionSize.ANY, MapFeature.REJECTS_DUPLICATES_AT_CREATION,
-            MapFeature.ALLOWS_NULL_QUERIES, CollectionFeature.KNOWN_ORDER)
+            MapFeature.ALLOWS_NULL_QUERIES)
         .createTestSuite());
 
     return suite;
@@ -245,7 +243,7 @@ public class ForwardingMapTest extends ForwardingTestCase {
     forward().hashCode();
     assertEquals("[hashCode]", getCalls());
   }
-
+  
   public void testStandardEntrySet() throws InvocationTargetException {
     @SuppressWarnings("unchecked")
     final Map<String, Boolean> map = createMock(Map.class);
@@ -282,7 +280,7 @@ public class ForwardingMapTest extends ForwardingTestCase {
 
     verify(map, entrySet);
   }
-
+  
   public void testStandardKeySet() throws InvocationTargetException {
     @SuppressWarnings("unchecked")
     Set<Entry<String, Boolean>> entrySet = createMock(Set.class);
@@ -314,7 +312,7 @@ public class ForwardingMapTest extends ForwardingTestCase {
 
     verify(entrySet, map);
   }
-
+  
   public void testStandardValues() throws InvocationTargetException {
     @SuppressWarnings("unchecked")
     Set<Entry<String, Boolean>> entrySet = createMock(Set.class);
@@ -346,34 +344,6 @@ public class ForwardingMapTest extends ForwardingTestCase {
     verify(entrySet, map);
   }
 
-  public void testToStringWithNullKeys() throws Exception {
-    Map<String, String> hashmap = Maps.newHashMap();
-    hashmap.put("foo", "bar");
-    hashmap.put(null, "baz");
-
-    StandardImplForwardingMap<String, String> forwardingMap =
-        new StandardImplForwardingMap<String, String>(
-            Maps.<String, String>newHashMap());
-    forwardingMap.put("foo", "bar");
-    forwardingMap.put(null, "baz");
-
-    assertEquals(hashmap.toString(), forwardingMap.toString());
-  }
-
-  public void testToStringWithNullValues() throws Exception {
-    Map<String, String> hashmap = Maps.newHashMap();
-    hashmap.put("foo", "bar");
-    hashmap.put("baz", null);
-
-    StandardImplForwardingMap<String, String> forwardingMap =
-        new StandardImplForwardingMap<String, String>(
-            Maps.<String, String>newHashMap());
-    forwardingMap.put("foo", "bar");
-    forwardingMap.put("baz", null);
-
-    assertEquals(hashmap.toString(), forwardingMap.toString());
-  }
-
   Map<String, Boolean> forward() {
     return forward;
   }