--- jsr166/src/test/tck/AtomicReferenceTest.java	2011/06/10 20:17:11	1.20
+++ jsr166/src/test/tck/AtomicReferenceTest.java	2015/04/25 04:55:30	1.24
@@ -6,12 +6,14 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 import java.util.concurrent.atomic.AtomicReference;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class AtomicReferenceTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicReferenceTest.class);
@@ -96,10 +98,10 @@ public class AtomicReferenceTest extends
      */
     public void testWeakCompareAndSet() {
         AtomicReference ai = new AtomicReference(one);
-        while (!ai.weakCompareAndSet(one, two));
-        while (!ai.weakCompareAndSet(two, m4));
+        do {} while (!ai.weakCompareAndSet(one, two));
+        do {} while (!ai.weakCompareAndSet(two, m4));
         assertSame(m4, ai.get());
-        while (!ai.weakCompareAndSet(m4, seven));
+        do {} while (!ai.weakCompareAndSet(m4, seven));
         assertSame(seven, ai.get());
     }
 
@@ -119,9 +121,10 @@ public class AtomicReferenceTest extends
     public void testSerialization() throws Exception {
         AtomicReference x = new AtomicReference();
         AtomicReference y = serialClone(x);
-        assertTrue(x != y);
+        assertNotSame(x, y);
         x.set(one);
         AtomicReference z = serialClone(x);
+        assertNotSame(y, z);
         assertEquals(one, x.get());
         assertEquals(null, y.get());
         assertEquals(one, z.get());