--- jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java	2012/02/21 01:54:04	1.22
+++ jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java	2015/01/17 22:55:06	1.29
@@ -4,19 +4,16 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
 import java.util.Arrays;
-import java.util.BitSet;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.NavigableSet;
-import java.util.NoSuchElementException;
-import java.util.Random;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.concurrent.ConcurrentSkipListSet;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class ConcurrentSkipListSubSetTest extends JSR166TestCase {
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -32,7 +29,7 @@ public class ConcurrentSkipListSubSetTes
     }
 
     /**
-     * Creates a set of given size containing consecutive
+     * Returns a new set of given size containing consecutive
      * Integers 0 ... n.
      */
     private NavigableSet<Integer> populatedSet(int n) {
@@ -40,9 +37,9 @@ public class ConcurrentSkipListSubSetTes
             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)));
         assertTrue(q.add(new Integer(-n)));
         assertTrue(q.add(new Integer(n)));
@@ -53,7 +50,7 @@ public class ConcurrentSkipListSubSetTes
     }
 
     /**
-     * Creates set of first 5 ints.
+     * Returns a new set of first 5 ints.
      */
     private NavigableSet set5() {
         ConcurrentSkipListSet q = new ConcurrentSkipListSet();
@@ -71,7 +68,7 @@ public class ConcurrentSkipListSubSetTes
     }
 
     /**
-     * Creates set of first 5 negative ints.
+     * Returns a new set of first 5 negative ints.
      */
     private NavigableSet dset5() {
         ConcurrentSkipListSet q = new ConcurrentSkipListSet();
@@ -244,13 +241,13 @@ public class ConcurrentSkipListSubSetTes
      */
     public void testRemoveElement() {
         NavigableSet 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));
@@ -329,8 +326,8 @@ public class ConcurrentSkipListSubSetTes
             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));
             }
         }
     }
@@ -434,27 +431,19 @@ public class ConcurrentSkipListSubSetTes
      */
     public void testIterator() {
         NavigableSet 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() {
-        NavigableSet q = set0();
-        int i = 0;
-        Iterator it = q.iterator();
-        while (it.hasNext()) {
-            assertTrue(q.contains(it.next()));
-            ++i;
-        }
-        assertEquals(0, i);
+        assertIteratorExhausted(set0().iterator());
     }
 
     /**
@@ -494,7 +483,7 @@ public class ConcurrentSkipListSubSetTes
         NavigableSet x = populatedSet(SIZE);
         NavigableSet y = serialClone(x);
 
-        assertTrue(x != y);
+        assertNotSame(y, x);
         assertEquals(x.size(), y.size());
         assertEquals(x, y);
         assertEquals(y, x);
@@ -749,10 +738,10 @@ public class ConcurrentSkipListSubSetTes
      */
     public void testDescendingRemoveElement() {
         NavigableSet q = populatedSet(SIZE);
-        for (int i = 1; i < SIZE; i+=2) {
+        for (int i = 1; i < SIZE; i += 2) {
             assertTrue(q.remove(new Integer(i)));
         }
-        for (int i = 0; i < SIZE; i+=2) {
+        for (int i = 0; i < SIZE; i += 2 ) {
             assertTrue(q.remove(new Integer(i)));
             assertFalse(q.remove(new Integer(i+1)));
         }
@@ -828,8 +817,8 @@ public class ConcurrentSkipListSubSetTes
             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));
             }
         }
     }
@@ -994,7 +983,7 @@ public class ConcurrentSkipListSubSetTes
         NavigableSet x = dset5();
         NavigableSet y = serialClone(x);
 
-        assertTrue(x != y);
+        assertNotSame(y, x);
         assertEquals(x.size(), y.size());
         assertEquals(x, y);
         assertEquals(y, x);