--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2009/11/21 10:29:50	1.9
+++ 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);
@@ -19,11 +19,7 @@ public class ConcurrentSkipListSetTest e
 
     static class MyReverseComparator implements Comparator {
         public int compare(Object x, Object y) {
-            int i = ((Integer)x).intValue();
-            int j = ((Integer)y).intValue();
-            if (i < j) return 1;
-            if (i > j) return -1;
-            return 0;
+            return ((Comparable)y).compareTo(x);
         }
     }
 
@@ -207,6 +203,7 @@ public class ConcurrentSkipListSetTest e
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with null elements throws NPE
      */
@@ -218,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
@@ -245,7 +243,7 @@ public class ConcurrentSkipListSetTest e
         assertFalse(q.addAll(Arrays.asList(empty)));
         assertTrue(q.addAll(Arrays.asList(ints)));
         for (int i = 0; i < SIZE; ++i)
-            assertEquals(new Integer(i), q.pollFirst());
+            assertEquals(i, q.pollFirst());
     }
 
     /**
@@ -254,7 +252,7 @@ public class ConcurrentSkipListSetTest e
     public void testPollFirst() {
         ConcurrentSkipListSet q = populatedSet(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, ((Integer)q.pollFirst()).intValue());
+            assertEquals(i, q.pollFirst());
         }
         assertNull(q.pollFirst());
     }
@@ -265,7 +263,7 @@ public class ConcurrentSkipListSetTest e
     public void testPollLast() {
         ConcurrentSkipListSet q = populatedSet(SIZE);
         for (int i = SIZE-1; i >= 0; --i) {
-            assertEquals(i, ((Integer)q.pollLast()).intValue());
+            assertEquals(i, q.pollLast());
         }
         assertNull(q.pollFirst());
     }
@@ -379,7 +377,6 @@ public class ConcurrentSkipListSetTest e
 
         Object e4 = q.lower(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -398,7 +395,6 @@ public class ConcurrentSkipListSetTest e
 
         Object e4 = q.higher(six);
         assertNull(e4);
-
     }
 
     /**
@@ -417,7 +413,6 @@ public class ConcurrentSkipListSetTest e
 
         Object e4 = q.floor(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -436,30 +431,27 @@ public class ConcurrentSkipListSetTest e
 
         Object e4 = q.ceiling(six);
         assertNull(e4);
-
     }
 
     /**
-     * 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());
     }
 
     /**
@@ -493,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));
@@ -664,8 +656,8 @@ public class ConcurrentSkipListSetTest e
     /**
      * Subsets of subsets subdivide correctly
      */
-    public void testRecursiveSubSets() {
-        int setSize = 1000;
+    public void testRecursiveSubSets() throws Exception {
+        int setSize = expensiveTests ? 1000 : 100;
         Class cl = ConcurrentSkipListSet.class;
 
         NavigableSet<Integer> set = newSet(cl);
@@ -683,13 +675,8 @@ public class ConcurrentSkipListSetTest e
                    0, setSize - 1, true);
     }
 
-    static NavigableSet<Integer> newSet(Class cl) {
-        NavigableSet<Integer> result = null;
-        try {
-            result = (NavigableSet<Integer>) cl.newInstance();
-        } catch (Exception e) {
-            fail();
-        }
+    static NavigableSet<Integer> newSet(Class cl) throws Exception {
+        NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
         assertEquals(result.size(), 0);
         assertFalse(result.iterator().hasNext());
         return result;
@@ -752,10 +739,8 @@ public class ConcurrentSkipListSetTest e
             } else {
                 try {
                     set.add(element);
-                    fail();
-                } catch (IllegalArgumentException e) {
-                    // expected
-                }
+                    shouldThrow();
+                } catch (IllegalArgumentException success) {}
             }
         }
     }
@@ -888,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;
@@ -954,16 +939,12 @@ public class ConcurrentSkipListSetTest e
             assertEq(rs.last(),  -1);
             try {
                 set.first();
-                fail();
-            } catch (NoSuchElementException e) {
-                // expected
-            }
+                shouldThrow();
+            } catch (NoSuchElementException success) {}
             try {
                 set.last();
-                fail();
-            } catch (NoSuchElementException e) {
-                // expected
-            }
+                shouldThrow();
+            } catch (NoSuchElementException success) {}
         }
     }