--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2011/11/26 05:19:17	1.24
+++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2015/01/17 22:55:06	1.35
@@ -4,7 +4,6 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
 import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Collection;
@@ -17,6 +16,9 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.concurrent.ConcurrentSkipListSet;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class ConcurrentSkipListSetTest extends JSR166TestCase {
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -32,16 +34,16 @@ public class ConcurrentSkipListSetTest e
     }
 
     /**
-     * Create a set of given size containing consecutive
+     * Returns a new set of given size containing consecutive
      * Integers 0 ... n.
      */
     private ConcurrentSkipListSet<Integer> populatedSet(int n) {
         ConcurrentSkipListSet<Integer> q =
             new ConcurrentSkipListSet<Integer>();
         assertTrue(q.isEmpty());
-        for (int i = n-1; i >= 0; i-=2)
+        for (int i = n-1; i >= 0; i -= 2)
             assertTrue(q.add(new Integer(i)));
-        for (int i = (n & 1); i < n; i+=2)
+        for (int i = (n & 1); i < n; i += 2)
             assertTrue(q.add(new Integer(i)));
         assertFalse(q.isEmpty());
         assertEquals(n, q.size());
@@ -49,7 +51,7 @@ public class ConcurrentSkipListSetTest e
     }
 
     /**
-     * Create set of first 5 ints
+     * Returns a new set of first 5 ints.
      */
     private ConcurrentSkipListSet set5() {
         ConcurrentSkipListSet q = new ConcurrentSkipListSet();
@@ -282,13 +284,13 @@ public class ConcurrentSkipListSetTest e
      */
     public void testRemoveElement() {
         ConcurrentSkipListSet q = populatedSet(SIZE);
-        for (int i = 1; i < SIZE; i+=2) {
+        for (int i = 1; i < SIZE; i += 2) {
             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) {
+        for (int i = 0; i < SIZE; i += 2) {
             assertTrue(q.contains(i));
             assertTrue(q.remove(i));
             assertFalse(q.contains(i));
@@ -367,8 +369,8 @@ public class ConcurrentSkipListSetTest e
             assertTrue(q.removeAll(p));
             assertEquals(SIZE-i, q.size());
             for (int j = 0; j < i; ++j) {
-                Integer I = (Integer)(p.pollFirst());
-                assertFalse(q.contains(I));
+                Integer x = (Integer)(p.pollFirst());
+                assertFalse(q.contains(x));
             }
         }
     }
@@ -461,8 +463,7 @@ public class ConcurrentSkipListSetTest e
     public void testToArray2() {
         ConcurrentSkipListSet<Integer> q = populatedSet(SIZE);
         Integer[] ints = new Integer[SIZE];
-        Integer[] array = q.toArray(ints);
-        assertSame(ints, array);
+        assertSame(ints, q.toArray(ints));
         for (int i = 0; i < ints.length; i++)
             assertSame(ints[i], q.pollFirst());
     }
@@ -472,27 +473,21 @@ public class ConcurrentSkipListSetTest e
      */
     public void testIterator() {
         ConcurrentSkipListSet q = populatedSet(SIZE);
-        int i = 0;
         Iterator it = q.iterator();
-        while (it.hasNext()) {
+        int i;
+        for (i = 0; it.hasNext(); i++)
             assertTrue(q.contains(it.next()));
-            ++i;
-        }
         assertEquals(i, SIZE);
+        assertIteratorExhausted(it);
     }
 
     /**
      * iterator of empty set has no elements
      */
     public void testEmptyIterator() {
-        ConcurrentSkipListSet q = new ConcurrentSkipListSet();
-        int i = 0;
-        Iterator it = q.iterator();
-        while (it.hasNext()) {
-            assertTrue(q.contains(it.next()));
-            ++i;
-        }
-        assertEquals(0, i);
+        NavigableSet s = new ConcurrentSkipListSet();
+        assertIteratorExhausted(s.iterator());
+        assertIteratorExhausted(s.descendingSet().iterator());
     }
 
     /**
@@ -532,7 +527,7 @@ public class ConcurrentSkipListSetTest e
         NavigableSet x = populatedSet(SIZE);
         NavigableSet y = serialClone(x);
 
-        assertTrue(x != y);
+        assertNotSame(x, y);
         assertEquals(x.size(), y.size());
         assertEquals(x, y);
         assertEquals(y, x);
@@ -686,6 +681,17 @@ public class ConcurrentSkipListSetTest e
                    0, setSize - 1, true, bs);
     }
 
+    /**
+     * addAll is idempotent
+     */
+    public void testAddAll_idempotent() throws Exception {
+        Set x = populatedSet(SIZE);
+        Set y = new ConcurrentSkipListSet(x);
+        y.addAll(x);
+        assertEquals(x, y);
+        assertEquals(y, x);
+    }
+
     static NavigableSet<Integer> newSet(Class cl) throws Exception {
         NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
         assertEquals(0, result.size());
@@ -720,7 +726,7 @@ public class ConcurrentSkipListSetTest e
         // Add entries till we're back to original size
         while (set.size() < size) {
             int element = min + rnd.nextInt(rangeSize);
-            assertTrue(element >= min && element<= max);
+            assertTrue(element >= min && element <= max);
             put(set, element, bs);
         }
     }
@@ -746,7 +752,7 @@ public class ConcurrentSkipListSetTest e
         // Add entries till we're back to original size
         while (set.size() < size) {
             int element = min - 5 + rnd.nextInt(rangeSize + 10);
-            if (element >= min && element<= max) {
+            if (element >= min && element <= max) {
                 put(set, element, bs);
             } else {
                 try {
@@ -922,7 +928,7 @@ public class ConcurrentSkipListSetTest e
             if (bsContainsI)
                 size++;
         }
-        assertEquals(set.size(), size);
+        assertEquals(size, set.size());
 
         // Test contents using contains elementSet iterator
         int size2 = 0;