--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2009/12/01 09:48:13	1.12
+++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2010/11/18 20:21:53	1.19
@@ -11,7 +11,7 @@ import java.io.*;
 
 public class ConcurrentSkipListSetTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run (suite());
+        junit.textui.TestRunner.run(suite());
     }
     public static Test suite() {
         return new TestSuite(ConcurrentSkipListSetTest.class);
@@ -27,8 +27,9 @@ public class ConcurrentSkipListSetTest e
      * Create a set of given size containing consecutive
      * Integers 0 ... n.
      */
-    private ConcurrentSkipListSet populatedSet(int n) {
-        ConcurrentSkipListSet q = new ConcurrentSkipListSet();
+    private ConcurrentSkipListSet<Integer> populatedSet(int n) {
+        ConcurrentSkipListSet<Integer> q =
+            new ConcurrentSkipListSet<Integer>();
         assertTrue(q.isEmpty());
         for (int i = n-1; i >= 0; i-=2)
             assertTrue(q.add(new Integer(i)));
@@ -203,6 +204,7 @@ public class ConcurrentSkipListSetTest e
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with null elements throws NPE
      */
@@ -214,6 +216,7 @@ public class ConcurrentSkipListSetTest e
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with any null elements throws NPE after
      * possibly adding some elements
@@ -273,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());
     }
@@ -432,26 +441,25 @@ public class ConcurrentSkipListSetTest e
     }
 
     /**
-     * toArray contains all elements
+     * toArray contains all elements in sorted order
      */
     public void testToArray() {
         ConcurrentSkipListSet q = populatedSet(SIZE);
         Object[] o = q.toArray();
-        Arrays.sort(o);
         for (int i = 0; i < o.length; i++)
-            assertEquals(o[i], q.pollFirst());
+            assertSame(o[i], q.pollFirst());
     }
 
     /**
-     * toArray(a) contains all elements
+     * toArray(a) contains all elements in sorted order
      */
     public void testToArray2() {
-        ConcurrentSkipListSet q = populatedSet(SIZE);
+        ConcurrentSkipListSet<Integer> q = populatedSet(SIZE);
         Integer[] ints = new Integer[SIZE];
-        ints = (Integer[])q.toArray(ints);
-        Arrays.sort(ints);
+        Integer[] array = q.toArray(ints);
+        assertSame(ints, array);
         for (int i = 0; i < ints.length; i++)
-            assertEquals(ints[i], q.pollFirst());
+            assertSame(ints[i], q.pollFirst());
     }
 
     /**
@@ -485,7 +493,7 @@ public class ConcurrentSkipListSetTest e
     /**
      * iterator.remove removes current element
      */
-    public void testIteratorRemove () {
+    public void testIteratorRemove() {
         final ConcurrentSkipListSet q = new ConcurrentSkipListSet();
         q.add(new Integer(2));
         q.add(new Integer(1));
@@ -657,7 +665,7 @@ public class ConcurrentSkipListSetTest e
      * Subsets of subsets subdivide correctly
      */
     public void testRecursiveSubSets() throws Exception {
-        int setSize = 1000;
+        int setSize = expensiveTests ? 1000 : 100;
         Class cl = ConcurrentSkipListSet.class;
 
         NavigableSet<Integer> set = newSet(cl);
@@ -873,7 +881,7 @@ public class ConcurrentSkipListSetTest e
                 // BitSet should support this! Test would run much faster
                 while (element >= min) {
                     if (bs.get(element))
-                        return(element);
+                        return element;
                     element--;
                 }
                 return -1;