--- jsr166/src/test/tck/AbstractQueueTest.java	2015/02/28 18:06:38	1.11
+++ jsr166/src/test/tck/AbstractQueueTest.java	2015/05/23 00:53:08	1.14
@@ -16,7 +16,7 @@ import junit.framework.TestSuite;
 
 public class AbstractQueueTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AbstractQueueTest.class);
@@ -153,7 +153,7 @@ public class AbstractQueueTest extends J
     public void testAddAll3() {
         Succeed q = new Succeed();
         Integer[] ints = new Integer[SIZE];
-        for (int i = 0; i < SIZE-1; ++i)
+        for (int i = 0; i < SIZE - 1; ++i)
             ints[i] = new Integer(i);
         try {
             q.addAll(Arrays.asList(ints));
@@ -165,11 +165,11 @@ public class AbstractQueueTest extends J
      * addAll throws ISE if an add fails
      */
     public void testAddAll4() {
+        Fail q = new Fail();
+        Integer[] ints = new Integer[SIZE];
+        for (int i = 0; i < SIZE; ++i)
+            ints[i] = new Integer(i);
         try {
-            Fail q = new Fail();
-            Integer[] ints = new Integer[SIZE];
-            for (int i = 0; i < SIZE; ++i)
-                ints[i] = new Integer(i);
             q.addAll(Arrays.asList(ints));
             shouldThrow();
         } catch (IllegalStateException success) {}