--- jsr166/src/test/tck/AtomicIntegerArrayTest.java	2011/08/10 07:14:48	1.26
+++ jsr166/src/test/tck/AtomicIntegerArrayTest.java	2016/06/17 19:00:48	1.36
@@ -6,14 +6,16 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicIntegerArray;
 
+import junit.framework.Test;
+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);
@@ -34,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) {}
     }
@@ -162,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));
         }
     }
@@ -272,8 +274,6 @@ public class AtomicIntegerArrayTest exte
         }
     }
 
-    static final int COUNTDOWN = 100000;
-
     class Counter extends CheckedRunnable {
         final AtomicIntegerArray aa;
         volatile int counts;
@@ -286,7 +286,7 @@ public class AtomicIntegerArrayTest exte
                     assertTrue(v >= 0);
                     if (v != 0) {
                         done = false;
-                        if (aa.compareAndSet(i, v, v-1))
+                        if (aa.compareAndSet(i, v, v - 1))
                             ++counts;
                     }
                 }
@@ -302,8 +302,9 @@ public class AtomicIntegerArrayTest exte
      */
     public void testCountingInMultipleThreads() throws InterruptedException {
         final AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+        int countdown = 10000;
         for (int i = 0; i < SIZE; i++)
-            aa.set(i, COUNTDOWN);
+            aa.set(i, countdown);
         Counter c1 = new Counter(aa);
         Counter c2 = new Counter(aa);
         Thread t1 = new Thread(c1);
@@ -312,7 +313,7 @@ public class AtomicIntegerArrayTest exte
         t2.start();
         t1.join();
         t2.join();
-        assertEquals(c1.counts+c2.counts, SIZE * COUNTDOWN);
+        assertEquals(c1.counts+c2.counts, SIZE * countdown);
     }
 
     /**
@@ -323,7 +324,7 @@ public class AtomicIntegerArrayTest exte
         for (int i = 0; i < SIZE; i++)
             x.set(i, -i);
         AtomicIntegerArray y = serialClone(x);
-        assertTrue(x != y);
+        assertNotSame(x, y);
         assertEquals(x.length(), y.length());
         for (int i = 0; i < SIZE; i++) {
             assertEquals(x.get(i), y.get(i));