--- jsr166/src/test/tck/AtomicIntegerArrayTest.java	2014/12/31 19:05:42	1.29
+++ jsr166/src/test/tck/AtomicIntegerArrayTest.java	2015/04/25 04:55:30	1.32
@@ -15,7 +15,7 @@ import junit.framework.TestSuite;
 public class AtomicIntegerArrayTest extends JSR166TestCase {
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicIntegerArrayTest.class);
@@ -36,7 +36,7 @@ public class AtomicIntegerArrayTest exte
     public void testConstructor2NPE() {
         try {
             int[] a = null;
-            AtomicIntegerArray aa = new AtomicIntegerArray(a);
+            new AtomicIntegerArray(a);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -164,10 +164,10 @@ public class AtomicIntegerArrayTest exte
         AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
         for (int i = 0; i < SIZE; i++) {
             aa.set(i, 1);
-            while (!aa.weakCompareAndSet(i, 1, 2));
-            while (!aa.weakCompareAndSet(i, 2, -4));
+            do {} while (!aa.weakCompareAndSet(i, 1, 2));
+            do {} while (!aa.weakCompareAndSet(i, 2, -4));
             assertEquals(-4, aa.get(i));
-            while (!aa.weakCompareAndSet(i, -4, 7));
+            do {} while (!aa.weakCompareAndSet(i, -4, 7));
             assertEquals(7, aa.get(i));
         }
     }