--- jsr166/src/test/tck/TreeSetTest.java	2013/05/30 03:28:55	1.29
+++ jsr166/src/test/tck/TreeSetTest.java	2015/05/23 00:53:08	1.40
@@ -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,9 +16,12 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class TreeSetTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(TreeSetTest.class);
@@ -43,9 +45,9 @@ public class TreeSetTest extends JSR166T
     private TreeSet<Integer> populatedSet(int n) {
         TreeSet<Integer> q = new TreeSet<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());
@@ -79,7 +81,7 @@ public class TreeSetTest extends JSR166T
      */
     public void testConstructor3() {
         try {
-            TreeSet q = new TreeSet((Collection)null);
+            new TreeSet((Collection)null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -89,8 +91,7 @@ public class TreeSetTest extends JSR166T
      */
     public void testConstructor4() {
         try {
-            Integer[] ints = new Integer[SIZE];
-            TreeSet q = new TreeSet(Arrays.asList(ints));
+            new TreeSet(Arrays.asList(new Integer[SIZE]));
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -99,11 +100,11 @@ public class TreeSetTest extends JSR166T
      * Initializing from Collection with some null elements throws NPE
      */
     public void testConstructor5() {
+        Integer[] ints = new Integer[SIZE];
+        for (int i = 0; i < SIZE - 1; ++i)
+            ints[i] = new Integer(i);
         try {
-            Integer[] ints = new Integer[SIZE];
-            for (int i = 0; i < SIZE-1; ++i)
-                ints[i] = new Integer(i);
-            TreeSet q = new TreeSet(Arrays.asList(ints));
+            new TreeSet(Arrays.asList(ints));
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -131,7 +132,7 @@ public class TreeSetTest extends JSR166T
         for (int i = 0; i < SIZE; ++i)
             ints[i] = new Integer(i);
         q.addAll(Arrays.asList(ints));
-        for (int i = SIZE-1; i >= 0; --i)
+        for (int i = SIZE - 1; i >= 0; --i)
             assertEquals(ints[i], q.pollFirst());
     }
 
@@ -155,7 +156,7 @@ public class TreeSetTest extends JSR166T
     public void testSize() {
         TreeSet q = populatedSet(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(SIZE-i, q.size());
+            assertEquals(SIZE - i, q.size());
             q.pollFirst();
         }
         for (int i = 0; i < SIZE; ++i) {
@@ -168,8 +169,8 @@ public class TreeSetTest extends JSR166T
      * add(null) throws NPE if nonempty
      */
     public void testAddNull() {
+        TreeSet q = populatedSet(SIZE);
         try {
-            TreeSet q = populatedSet(SIZE);
             q.add(null);
             shouldThrow();
         } catch (NullPointerException success) {}
@@ -197,9 +198,8 @@ public class TreeSetTest extends JSR166T
      * Add of non-Comparable throws CCE
      */
     public void testAddNonComparable() {
+        TreeSet q = new TreeSet();
         try {
-            TreeSet q = new TreeSet();
-            q.add(new Object());
             q.add(new Object());
             q.add(new Object());
             shouldThrow();
@@ -210,8 +210,8 @@ public class TreeSetTest extends JSR166T
      * addAll(null) throws NPE
      */
     public void testAddAll1() {
+        TreeSet q = new TreeSet();
         try {
-            TreeSet q = new TreeSet();
             q.addAll(null);
             shouldThrow();
         } catch (NullPointerException success) {}
@@ -221,9 +221,9 @@ public class TreeSetTest extends JSR166T
      * addAll of a collection with null elements throws NPE
      */
     public void testAddAll2() {
+        TreeSet q = new TreeSet();
+        Integer[] ints = new Integer[SIZE];
         try {
-            TreeSet q = new TreeSet();
-            Integer[] ints = new Integer[SIZE];
             q.addAll(Arrays.asList(ints));
             shouldThrow();
         } catch (NullPointerException success) {}
@@ -234,11 +234,11 @@ public class TreeSetTest extends JSR166T
      * possibly adding some elements
      */
     public void testAddAll3() {
+        TreeSet q = new TreeSet();
+        Integer[] ints = new Integer[SIZE];
+        for (int i = 0; i < SIZE - 1; ++i)
+            ints[i] = new Integer(i);
         try {
-            TreeSet q = new TreeSet();
-            Integer[] ints = new Integer[SIZE];
-            for (int i = 0; i < SIZE-1; ++i)
-                ints[i] = new Integer(i);
             q.addAll(Arrays.asList(ints));
             shouldThrow();
         } catch (NullPointerException success) {}
@@ -251,7 +251,7 @@ public class TreeSetTest extends JSR166T
         Integer[] empty = new Integer[0];
         Integer[] ints = new Integer[SIZE];
         for (int i = 0; i < SIZE; ++i)
-            ints[i] = new Integer(SIZE-1-i);
+            ints[i] = new Integer(SIZE - 1 - i);
         TreeSet q = new TreeSet();
         assertFalse(q.addAll(Arrays.asList(empty)));
         assertTrue(q.addAll(Arrays.asList(ints)));
@@ -275,7 +275,7 @@ public class TreeSetTest extends JSR166T
      */
     public void testPollLast() {
         TreeSet q = populatedSet(SIZE);
-        for (int i = SIZE-1; i >= 0; --i) {
+        for (int i = SIZE - 1; i >= 0; --i) {
             assertEquals(i, q.pollLast());
         }
         assertNull(q.pollFirst());
@@ -286,13 +286,13 @@ public class TreeSetTest extends JSR166T
      */
     public void testRemoveElement() {
         TreeSet 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));
@@ -356,7 +356,7 @@ public class TreeSetTest extends JSR166T
                 assertTrue(changed);
 
             assertTrue(q.containsAll(p));
-            assertEquals(SIZE-i, q.size());
+            assertEquals(SIZE - i, q.size());
             p.pollFirst();
         }
     }
@@ -369,10 +369,10 @@ public class TreeSetTest extends JSR166T
             TreeSet q = populatedSet(SIZE);
             TreeSet p = populatedSet(i);
             assertTrue(q.removeAll(p));
-            assertEquals(SIZE-i, q.size());
+            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));
             }
         }
     }
@@ -476,27 +476,19 @@ public class TreeSetTest extends JSR166T
      */
     public void testIterator() {
         TreeSet 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() {
-        TreeSet q = new TreeSet();
-        int i = 0;
-        Iterator it = q.iterator();
-        while (it.hasNext()) {
-            assertTrue(q.contains(it.next()));
-            ++i;
-        }
-        assertEquals(0, i);
+        assertIteratorExhausted(new TreeSet().iterator());
     }
 
     /**
@@ -736,7 +728,7 @@ public class TreeSetTest extends JSR166T
         // 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);
         }
     }
@@ -761,7 +753,7 @@ public class TreeSetTest extends JSR166T
         // 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);
             } else {
                 try {