--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2010/11/05 00:17:22	1.18
+++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2011/04/14 22:55:08	1.21
@@ -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.*;
@@ -276,11 +276,17 @@ public class ConcurrentSkipListSetTest e
     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());
     }
@@ -840,7 +846,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);