--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2009/11/21 17:38:05	1.10
+++ 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.*;
@@ -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);
         }
     }
 
@@ -31,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)));
@@ -207,6 +204,7 @@ public class ConcurrentSkipListSetTest e
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with null elements throws NPE
      */
@@ -218,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
@@ -245,7 +244,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 +253,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 +264,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());
     }
@@ -277,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());
     }
@@ -379,7 +384,6 @@ public class ConcurrentSkipListSetTest e
 
         Object e4 = q.lower(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -398,7 +402,6 @@ public class ConcurrentSkipListSetTest e
 
         Object e4 = q.higher(six);
         assertNull(e4);
-
     }
 
     /**
@@ -417,7 +420,6 @@ public class ConcurrentSkipListSetTest e
 
         Object e4 = q.floor(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -436,30 +438,28 @@ 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);
+        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());
     }
 
     /**
@@ -493,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));
@@ -665,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);
@@ -846,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);
@@ -881,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;