--- jsr166/src/test/tck/AtomicBooleanTest.java	2009/12/01 09:56:28	1.16
+++ jsr166/src/test/tck/AtomicBooleanTest.java	2011/06/10 20:01:21	1.20
@@ -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.AtomicBoolean;
 
 public class AtomicBooleanTest 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(AtomicBooleanTest.class);
@@ -63,13 +62,13 @@ public class AtomicBooleanTest extends J
      */
     public void testCompareAndSet() {
         AtomicBoolean ai = new AtomicBoolean(true);
-        assertTrue(ai.compareAndSet(true,false));
+        assertTrue(ai.compareAndSet(true, false));
         assertFalse(ai.get());
-        assertTrue(ai.compareAndSet(false,false));
+        assertTrue(ai.compareAndSet(false, false));
         assertFalse(ai.get());
-        assertFalse(ai.compareAndSet(true,false));
+        assertFalse(ai.compareAndSet(true, false));
         assertFalse(ai.get());
-        assertTrue(ai.compareAndSet(false,true));
+        assertTrue(ai.compareAndSet(false, true));
         assertTrue(ai.get());
     }
 
@@ -96,11 +95,11 @@ public class AtomicBooleanTest extends J
      */
     public void testWeakCompareAndSet() {
         AtomicBoolean ai = new AtomicBoolean(true);
-        while (!ai.weakCompareAndSet(true,false));
+        while (!ai.weakCompareAndSet(true, false));
         assertFalse(ai.get());
-        while (!ai.weakCompareAndSet(false,false));
+        while (!ai.weakCompareAndSet(false, false));
         assertFalse(ai.get());
-        while (!ai.weakCompareAndSet(false,true));
+        while (!ai.weakCompareAndSet(false, true));
         assertTrue(ai.get());
     }
 
@@ -109,9 +108,9 @@ public class AtomicBooleanTest extends J
      */
     public void testGetAndSet() {
         AtomicBoolean ai = new AtomicBoolean(true);
-        assertEquals(true,ai.getAndSet(false));
-        assertEquals(false,ai.getAndSet(false));
-        assertEquals(false,ai.getAndSet(true));
+        assertEquals(true, ai.getAndSet(false));
+        assertEquals(false, ai.getAndSet(false));
+        assertEquals(false, ai.getAndSet(true));
         assertTrue(ai.get());
     }
 
@@ -119,18 +118,13 @@ public class AtomicBooleanTest extends J
      * a deserialized serialized atomic holds same value
      */
     public void testSerialization() throws Exception {
-        AtomicBoolean l = new AtomicBoolean();
-
-        l.set(true);
-        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));
-        AtomicBoolean r = (AtomicBoolean) in.readObject();
-        assertEquals(l.get(), r.get());
+        AtomicBoolean x = new AtomicBoolean();
+        AtomicBoolean y = serialClone(x);
+        x.set(true);
+        AtomicBoolean z = serialClone(x);
+        assertTrue(x.get());
+        assertFalse(y.get());
+        assertTrue(z.get());
     }
 
     /**