--- jsr166/src/test/tck/AtomicReferenceTest.java	2009/11/17 03:12:51	1.12
+++ jsr166/src/test/tck/AtomicReferenceTest.java	2017/03/18 20:42:20	1.28
@@ -1,18 +1,19 @@
 /*
  * 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.
  */
 
-import junit.framework.*;
-import java.util.concurrent.atomic.*;
-import java.io.*;
+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());
+    public static void main(String[] args) {
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicReferenceTest.class);
@@ -23,7 +24,7 @@ public class AtomicReferenceTest extends
      */
     public void testConstructor() {
         AtomicReference ai = new AtomicReference(one);
-	assertEquals(one,ai.get());
+        assertSame(one, ai.get());
     }
 
     /**
@@ -31,7 +32,7 @@ public class AtomicReferenceTest extends
      */
     public void testConstructor2() {
         AtomicReference ai = new AtomicReference();
-	assertNull(ai.get());
+        assertNull(ai.get());
     }
 
     /**
@@ -39,11 +40,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 +52,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 +64,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 +79,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(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));
-	assertEquals(m4,ai.get());
-        while (!ai.weakCompareAndSet(m4,seven));
-	assertEquals(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,37 +110,34 @@ 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));
     }
 
     /**
      * a deserialized serialized atomic holds same value
      */
     public void testSerialization() throws Exception {
-        AtomicReference l = new AtomicReference();
-
-        l.set(one);
-        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
-        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
-        out.writeObject(l);
-        out.close();
-
-        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
-        AtomicReference r = (AtomicReference) in.readObject();
-        assertEquals(l.get(), r.get());
+        AtomicReference x = new AtomicReference();
+        AtomicReference y = serialClone(x);
+        assertNotSame(x, y);
+        x.set(one);
+        AtomicReference z = serialClone(x);
+        assertNotSame(y, z);
+        assertEquals(one, x.get());
+        assertNull(y.get());
+        assertEquals(one, z.get());
     }
 
     /**
      * toString returns current value.
      */
     public void testToString() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(ai.toString(), one.toString());
+        AtomicReference<Integer> ai = new AtomicReference<>(one);
+        assertEquals(one.toString(), ai.toString());
         ai.set(two);
-        assertEquals(ai.toString(), two.toString());
+        assertEquals(two.toString(), ai.toString());
     }
 
 }