--- jsr166/src/test/tck/ConcurrentHashMapTest.java	2003/12/27 19:26:43	1.9
+++ jsr166/src/test/tck/ConcurrentHashMapTest.java	2005/05/20 14:31:06	1.12
@@ -81,8 +81,8 @@ public class ConcurrentHashMapTest exten
      */
     public void testContainsValue() {
         ConcurrentHashMap map = map5();
-	assertTrue(map.contains("A"));
-        assertFalse(map.contains("Z"));
+	assertTrue(map.containsValue("A"));
+        assertFalse(map.containsValue("Z"));
     }
 
     /**
@@ -101,15 +101,6 @@ public class ConcurrentHashMapTest exten
     }
 
     /**
-     *   Clone creates an equal map
-     */
-    public void testClone() {
-        ConcurrentHashMap map = map5();
-        ConcurrentHashMap m2 = (ConcurrentHashMap)(map.clone());
-	assertEquals(map, m2);
-    }
-
-    /**
      *  get returns the correct element at the given key,
      *  or null if not present
      */
@@ -510,6 +501,19 @@ public class ConcurrentHashMapTest exten
     }
 
     /**
+     * remove(x, null) returns false
+     */
+    public void testRemove3() {
+        try {
+            ConcurrentHashMap c = new ConcurrentHashMap(5);
+            c.put("sadsdf", "asdads");
+            assertFalse(c.remove("sadsdf", null));
+        } catch(NullPointerException e){
+            fail();
+        }
+    }
+
+    /**
      * A deserialized map equals original
      */
     public void testSerialization() {