--- jsr166/src/test/tck/AtomicReferenceTest.java	2009/11/17 03:12:51	1.12
+++ jsr166/src/test/tck/AtomicReferenceTest.java	2010/08/25 00:07:03	1.16
@@ -11,8 +11,8 @@ import java.util.concurrent.atomic.*;
 import java.io.*;
 
 public class AtomicReferenceTest 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(AtomicReferenceTest.class);
@@ -23,7 +23,7 @@ public class AtomicReferenceTest extends
      */
     public void testConstructor() {
         AtomicReference ai = new AtomicReference(one);
-	assertEquals(one,ai.get());
+        assertSame(one,ai.get());
     }
 
     /**
@@ -31,7 +31,7 @@ public class AtomicReferenceTest extends
      */
     public void testConstructor2() {
         AtomicReference ai = new AtomicReference();
-	assertNull(ai.get());
+        assertNull(ai.get());
     }
 
     /**
@@ -39,11 +39,11 @@ public class AtomicReferenceTest extends
      */
     public void testGetSet() {
         AtomicReference ai = new AtomicReference(one);
-	assertEquals(one,ai.get());
-	ai.set(two);
-	assertEquals(two,ai.get());
-	ai.set(m3);
-	assertEquals(m3,ai.get());
+        assertSame(one,ai.get());
+        ai.set(two);
+        assertSame(two,ai.get());
+        ai.set(m3);
+        assertSame(m3,ai.get());
     }
 
     /**
@@ -51,11 +51,11 @@ public class AtomicReferenceTest extends
      */
     public void testGetLazySet() {
         AtomicReference ai = new AtomicReference(one);
-	assertEquals(one,ai.get());
-	ai.lazySet(two);
-	assertEquals(two,ai.get());
-	ai.lazySet(m3);
-	assertEquals(m3,ai.get());
+        assertSame(one,ai.get());
+        ai.lazySet(two);
+        assertSame(two,ai.get());
+        ai.lazySet(m3);
+        assertSame(m3,ai.get());
     }
 
     /**
@@ -63,13 +63,13 @@ public class AtomicReferenceTest extends
      */
     public void testCompareAndSet() {
         AtomicReference ai = new AtomicReference(one);
-	assertTrue(ai.compareAndSet(one,two));
-	assertTrue(ai.compareAndSet(two,m4));
-	assertEquals(m4,ai.get());
-	assertFalse(ai.compareAndSet(m5,seven));
-	assertFalse((seven.equals(ai.get())));
-	assertTrue(ai.compareAndSet(m4,seven));
-	assertEquals(seven,ai.get());
+        assertTrue(ai.compareAndSet(one,two));
+        assertTrue(ai.compareAndSet(two,m4));
+        assertSame(m4,ai.get());
+        assertFalse(ai.compareAndSet(m5,seven));
+        assertSame(m4,ai.get());
+        assertTrue(ai.compareAndSet(m4,seven));
+        assertSame(seven,ai.get());
     }
 
     /**
@@ -78,16 +78,17 @@ public class AtomicReferenceTest extends
      */
     public void testCompareAndSetInMultipleThreads() throws Exception {
         final AtomicReference ai = new AtomicReference(one);
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    while (!ai.compareAndSet(two, three)) Thread.yield();
-                }});
+        Thread t = new Thread(new CheckedRunnable() {
+            public void realRun() {
+                while (!ai.compareAndSet(two, three))
+                    Thread.yield();
+            }});
 
         t.start();
         assertTrue(ai.compareAndSet(one, two));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertEquals(ai.get(), three);
+        assertSame(ai.get(), three);
     }
 
     /**
@@ -96,11 +97,11 @@ public class AtomicReferenceTest extends
      */
     public void testWeakCompareAndSet() {
         AtomicReference ai = new AtomicReference(one);
-	while (!ai.weakCompareAndSet(one,two));
-	while (!ai.weakCompareAndSet(two,m4));
-	assertEquals(m4,ai.get());
+        while (!ai.weakCompareAndSet(one,two));
+        while (!ai.weakCompareAndSet(two,m4));
+        assertSame(m4,ai.get());
         while (!ai.weakCompareAndSet(m4,seven));
-	assertEquals(seven,ai.get());
+        assertSame(seven,ai.get());
     }
 
     /**
@@ -108,9 +109,9 @@ public class AtomicReferenceTest extends
      */
     public void testGetAndSet() {
         AtomicReference ai = new AtomicReference(one);
-	assertEquals(one,ai.getAndSet(zero));
-	assertEquals(zero,ai.getAndSet(m10));
-	assertEquals(m10,ai.getAndSet(one));
+        assertSame(one,ai.getAndSet(zero));
+        assertSame(zero,ai.getAndSet(m10));
+        assertSame(m10,ai.getAndSet(one));
     }
 
     /**