--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2009/12/01 09:48:13	1.12
+++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2010/11/04 01:04:54	1.17
@@ -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);
@@ -203,6 +203,7 @@ public class ConcurrentSkipListSetTest e
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with null elements throws NPE
      */
@@ -214,6 +215,7 @@ public class ConcurrentSkipListSetTest e
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with any null elements throws NPE after
      * possibly adding some elements
@@ -432,26 +434,24 @@ 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);
         Integer[] ints = new Integer[SIZE];
-        ints = (Integer[])q.toArray(ints);
-        Arrays.sort(ints);
+        assertSame(ints, q.toArray(ints));
         for (int i = 0; i < ints.length; i++)
-            assertEquals(ints[i], q.pollFirst());
+            assertSame(ints[i], q.pollFirst());
     }
 
     /**
@@ -485,7 +485,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 +657,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 +873,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;