--- jsr166/src/test/tck/AtomicLongArrayTest.java	2013/09/24 18:50:44	1.27
+++ jsr166/src/test/tck/AtomicLongArrayTest.java	2016/06/17 19:00:48	1.35
@@ -6,13 +6,15 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicLongArray;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class AtomicLongArrayTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicLongArrayTest.class);
@@ -33,7 +35,7 @@ public class AtomicLongArrayTest extends
     public void testConstructor2NPE() {
         try {
             long[] a = null;
-            AtomicLongArray aa = new AtomicLongArray(a);
+            new AtomicLongArray(a);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -161,10 +163,10 @@ public class AtomicLongArrayTest extends
         AtomicLongArray aa = new AtomicLongArray(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));
         }
     }
@@ -283,7 +285,7 @@ public class AtomicLongArrayTest extends
                     assertTrue(v >= 0);
                     if (v != 0) {
                         done = false;
-                        if (aa.compareAndSet(i, v, v-1))
+                        if (aa.compareAndSet(i, v, v - 1))
                             ++counts;
                     }
                 }