--- jsr166/src/test/tck/AtomicIntegerArrayTest.java	2009/11/17 06:58:50	1.15
+++ jsr166/src/test/tck/AtomicIntegerArrayTest.java	2011/03/15 19:47:06	1.20
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  * Other contributors include Andrew Wright, Jeffrey Hayes,
  * Pat Fisher, Mike Judd.
  */
@@ -13,8 +13,8 @@ import java.util.*;
 
 public class AtomicIntegerArrayTest extends JSR166TestCase {
 
-    public static void main (String[] args) {
-        junit.textui.TestRunner.run (suite());
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
     }
     public static Test suite() {
         return new TestSuite(AtomicIntegerArrayTest.class);
@@ -120,7 +120,7 @@ public class AtomicIntegerArrayTest exte
             assertTrue(ai.compareAndSet(i, 2,-4));
             assertEquals(-4,ai.get(i));
             assertFalse(ai.compareAndSet(i, -5,7));
-            assertFalse((7 == ai.get(i)));
+            assertEquals(-4,ai.get(i));
             assertTrue(ai.compareAndSet(i, -4,7));
             assertEquals(7,ai.get(i));
         }
@@ -163,7 +163,7 @@ public class AtomicIntegerArrayTest exte
     }
 
     /**
-     *  getAndSet returns previous value and sets to given value at given index
+     * getAndSet returns previous value and sets to given value at given index
      */
     public void testGetAndSet() {
         AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
@@ -176,7 +176,7 @@ public class AtomicIntegerArrayTest exte
     }
 
     /**
-     *  getAndAdd returns previous value and adds given value
+     * getAndAdd returns previous value and adds given value
      */
     public void testGetAndAdd() {
         AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
@@ -220,7 +220,7 @@ public class AtomicIntegerArrayTest exte
     }
 
     /**
-     *  addAndGet adds given value to current, and returns current value
+     * addAndGet adds given value to current, and returns current value
      */
     public void testAddAndGet() {
         AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
@@ -248,7 +248,7 @@ public class AtomicIntegerArrayTest exte
     }
 
     /**
-     *  incrementAndGet increments and returns current value
+     * incrementAndGet increments and returns current value
      */
     public void testIncrementAndGet() {
         AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
@@ -266,16 +266,16 @@ public class AtomicIntegerArrayTest exte
 
     static final int COUNTDOWN = 100000;
 
-    class Counter implements Runnable {
+    class Counter extends CheckedRunnable {
         final AtomicIntegerArray ai;
         volatile int counts;
         Counter(AtomicIntegerArray a) { ai = a; }
-        public void run() {
+        public void realRun() {
             for (;;) {
                 boolean done = true;
                 for (int i = 0; i < ai.length(); ++i) {
                     int v = ai.get(i);
-                    threadAssertTrue(v >= 0);
+                    assertTrue(v >= 0);
                     if (v != 0) {
                         done = false;
                         if (ai.compareAndSet(i, v, v-1))