--- jsr166/src/test/tck/AtomicReferenceTest.java	2011/05/31 16:16:23	1.18
+++ 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);
@@ -22,7 +24,7 @@ public class AtomicReferenceTest extends
      */
     public void testConstructor() {
         AtomicReference ai = new AtomicReference(one);
-        assertSame(one,ai.get());
+        assertSame(one, ai.get());
     }
 
     /**
@@ -38,11 +40,11 @@ public class AtomicReferenceTest extends
      */
     public void testGetSet() {
         AtomicReference ai = new AtomicReference(one);
-        assertSame(one,ai.get());
+        assertSame(one, ai.get());
         ai.set(two);
-        assertSame(two,ai.get());
+        assertSame(two, ai.get());
         ai.set(m3);
-        assertSame(m3,ai.get());
+        assertSame(m3, ai.get());
     }
 
     /**
@@ -50,11 +52,11 @@ public class AtomicReferenceTest extends
      */
     public void testGetLazySet() {
         AtomicReference ai = new AtomicReference(one);
-        assertSame(one,ai.get());
+        assertSame(one, ai.get());
         ai.lazySet(two);
-        assertSame(two,ai.get());
+        assertSame(two, ai.get());
         ai.lazySet(m3);
-        assertSame(m3,ai.get());
+        assertSame(m3, ai.get());
     }
 
     /**
@@ -62,13 +64,13 @@ public class AtomicReferenceTest extends
      */
     public void testCompareAndSet() {
         AtomicReference ai = new AtomicReference(one);
-        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());
+        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());
     }
 
     /**
@@ -87,7 +89,7 @@ public class AtomicReferenceTest extends
         assertTrue(ai.compareAndSet(one, two));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertSame(ai.get(), three);
+        assertSame(three, ai.get());
     }
 
     /**
@@ -96,11 +98,11 @@ public class AtomicReferenceTest extends
      */
     public void testWeakCompareAndSet() {
         AtomicReference ai = new AtomicReference(one);
-        while (!ai.weakCompareAndSet(one,two));
-        while (!ai.weakCompareAndSet(two,m4));
-        assertSame(m4,ai.get());
-        while (!ai.weakCompareAndSet(m4,seven));
-        assertSame(seven,ai.get());
+        do {} while (!ai.weakCompareAndSet(one, two));
+        do {} while (!ai.weakCompareAndSet(two, m4));
+        assertSame(m4, ai.get());
+        do {} while (!ai.weakCompareAndSet(m4, seven));
+        assertSame(seven, ai.get());
     }
 
     /**
@@ -108,9 +110,9 @@ public class AtomicReferenceTest extends
      */
     public void testGetAndSet() {
         AtomicReference ai = new AtomicReference(one);
-        assertSame(one,ai.getAndSet(zero));
-        assertSame(zero,ai.getAndSet(m10));
-        assertSame(m10,ai.getAndSet(one));
+        assertSame(one, ai.getAndSet(zero));
+        assertSame(zero, ai.getAndSet(m10));
+        assertSame(m10, ai.getAndSet(one));
     }
 
     /**
@@ -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());
@@ -132,9 +135,9 @@ public class AtomicReferenceTest extends
      */
     public void testToString() {
         AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(ai.toString(), one.toString());
+        assertEquals(one.toString(), ai.toString());
         ai.set(two);
-        assertEquals(ai.toString(), two.toString());
+        assertEquals(two.toString(), ai.toString());
     }
 
 }