--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2010/11/05 00:17:22	1.18
+++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2011/05/27 19:21:27	1.22
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 import junit.framework.*;
@@ -269,18 +269,23 @@ public class ConcurrentSkipListSetTest e
         assertNull(q.pollFirst());
     }
 
-
     /**
      * remove(x) removes x and returns true if present
      */
     public void testRemoveElement() {
         ConcurrentSkipListSet q = populatedSet(SIZE);
         for (int i = 1; i < SIZE; i+=2) {
-            assertTrue(q.remove(new Integer(i)));
+            assertTrue(q.contains(i));
+            assertTrue(q.remove(i));
+            assertFalse(q.contains(i));
+            assertTrue(q.contains(i-1));
         }
         for (int i = 0; i < SIZE; i+=2) {
-            assertTrue(q.remove(new Integer(i)));
-            assertFalse(q.remove(new Integer(i+1)));
+            assertTrue(q.contains(i));
+            assertTrue(q.remove(i));
+            assertFalse(q.contains(i));
+            assertFalse(q.remove(i+1));
+            assertFalse(q.contains(i+1));
         }
         assertTrue(q.isEmpty());
     }
@@ -360,8 +365,6 @@ public class ConcurrentSkipListSetTest e
         }
     }
 
-
-
     /**
      * lower returns preceding element
      */
@@ -503,7 +506,6 @@ public class ConcurrentSkipListSetTest e
         assertFalse(it.hasNext());
     }
 
-
     /**
      * toString contains toStrings of elements
      */
@@ -511,7 +513,7 @@ public class ConcurrentSkipListSetTest e
         ConcurrentSkipListSet q = populatedSet(SIZE);
         String s = q.toString();
         for (int i = 0; i < SIZE; ++i) {
-            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
+            assertTrue(s.contains(String.valueOf(i)));
         }
     }
 
@@ -840,7 +842,7 @@ public class ConcurrentSkipListSetTest e
      */
     void check(NavigableSet<Integer> set,
                       final int min, final int max, final boolean ascending) {
-       class ReferenceSet {
+        class ReferenceSet {
             int lower(int element) {
                 return ascending ?
                     lowerAscending(element) : higherAscending(element);