--- jsr166/src/test/tck/AtomicLongArrayTest.java	2009/11/17 06:58:50	1.14
+++ jsr166/src/test/tck/AtomicLongArrayTest.java	2010/09/16 00:52:49	1.17
@@ -12,8 +12,8 @@ import java.io.*;
 import java.util.*;
 
 public class AtomicLongArrayTest 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(AtomicLongArrayTest.class);
@@ -118,7 +118,7 @@ public class AtomicLongArrayTest extends
             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));
         }
@@ -264,16 +264,16 @@ public class AtomicLongArrayTest extends
 
     static final long COUNTDOWN = 100000;
 
-    class Counter implements Runnable {
+    class Counter extends CheckedRunnable {
         final AtomicLongArray ai;
         volatile long counts;
         Counter(AtomicLongArray a) { ai = a; }
-        public void run() {
+        public void realRun() {
             for (;;) {
                 boolean done = true;
                 for (int i = 0; i < ai.length(); ++i) {
                     long v = ai.get(i);
-                    threadAssertTrue(v >= 0);
+                    assertTrue(v >= 0);
                     if (v != 0) {
                         done = false;
                         if (ai.compareAndSet(i, v, v-1))