--- jsr166/src/test/tck/AtomicReferenceTest.java	2009/11/21 02:07:26	1.14
+++ jsr166/src/test/tck/AtomicReferenceTest.java	2011/06/10 20:01:21	1.19
@@ -1,18 +1,17 @@
 /*
  * 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;
 
 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 +22,7 @@ public class AtomicReferenceTest extends
      */
     public void testConstructor() {
         AtomicReference ai = new AtomicReference(one);
-        assertEquals(one,ai.get());
+        assertSame(one, ai.get());
     }
 
     /**
@@ -39,11 +38,11 @@ public class AtomicReferenceTest extends
      */
     public void testGetSet() {
         AtomicReference ai = new AtomicReference(one);
-        assertEquals(one,ai.get());
+        assertSame(one, ai.get());
         ai.set(two);
-        assertEquals(two,ai.get());
+        assertSame(two, ai.get());
         ai.set(m3);
-        assertEquals(m3,ai.get());
+        assertSame(m3, ai.get());
     }
 
     /**
@@ -51,11 +50,11 @@ public class AtomicReferenceTest extends
      */
     public void testGetLazySet() {
         AtomicReference ai = new AtomicReference(one);
-        assertEquals(one,ai.get());
+        assertSame(one, ai.get());
         ai.lazySet(two);
-        assertEquals(two,ai.get());
+        assertSame(two, ai.get());
         ai.lazySet(m3);
-        assertEquals(m3,ai.get());
+        assertSame(m3, ai.get());
     }
 
     /**
@@ -63,13 +62,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());
     }
 
     /**
@@ -88,7 +87,7 @@ public class AtomicReferenceTest extends
         assertTrue(ai.compareAndSet(one, two));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertEquals(ai.get(), three);
+        assertSame(ai.get(), three);
     }
 
     /**
@@ -97,11 +96,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());
+        while (!ai.weakCompareAndSet(one, two));
+        while (!ai.weakCompareAndSet(two, m4));
+        assertSame(m4, ai.get());
+        while (!ai.weakCompareAndSet(m4, seven));
+        assertSame(seven, ai.get());
     }
 
     /**
@@ -109,27 +108,23 @@ 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);
+        assertTrue(x != y);
+        x.set(one);
+        AtomicReference z = serialClone(x);
+        assertEquals(one, x.get());
+        assertEquals(null, y.get());
+        assertEquals(one, z.get());
     }
 
     /**