--- jsr166/src/test/tck/AtomicIntegerArrayTest.java	2010/08/25 00:07:03	1.17
+++ jsr166/src/test/tck/AtomicIntegerArrayTest.java	2011/05/27 19:39:07	1.21
@@ -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.
  */
@@ -20,7 +20,6 @@ public class AtomicIntegerArrayTest exte
         return new TestSuite(AtomicIntegerArrayTest.class);
     }
 
-
     /**
      * constructor creates array of given size with all elements zero
      */
@@ -163,7 +162,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 +175,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 +219,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 +247,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 +265,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))
@@ -307,7 +306,6 @@ public class AtomicIntegerArrayTest exte
         assertEquals(c1.counts+c2.counts, SIZE * COUNTDOWN);
     }
 
-
     /**
      * a deserialized serialized array holds same values
      */
@@ -329,7 +327,6 @@ public class AtomicIntegerArrayTest exte
         }
     }
 
-
     /**
      * toString returns current value.
      */