--- jsr166/src/test/tck/AtomicReferenceArrayTest.java	2009/11/17 02:50:57	1.14
+++ jsr166/src/test/tck/AtomicReferenceArrayTest.java	2011/05/31 16:16:23	1.21
@@ -1,19 +1,18 @@
 /*
  * 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.*;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicReferenceArray;
 
 public class AtomicReferenceArrayTest 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(AtomicReferenceArrayTest.class);
@@ -37,7 +36,7 @@ public class AtomicReferenceArrayTest ex
             Integer[] a = null;
             AtomicReferenceArray<Integer> ai = new AtomicReferenceArray<Integer>(a);
             shouldThrow();
-        } catch (NullPointerException success) {
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -51,7 +50,6 @@ public class AtomicReferenceArrayTest ex
             assertEquals(a[i], ai.get(i));
     }
 
-
     /**
      * get and set for out of bound indices throw IndexOutOfBoundsException
      */
@@ -86,11 +84,11 @@ public class AtomicReferenceArrayTest ex
         AtomicReferenceArray ai = new AtomicReferenceArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, one);
-            assertEquals(one,ai.get(i));
+            assertSame(one,ai.get(i));
             ai.set(i, two);
-            assertEquals(two,ai.get(i));
+            assertSame(two,ai.get(i));
             ai.set(i, m3);
-            assertEquals(m3,ai.get(i));
+            assertSame(m3,ai.get(i));
         }
     }
 
@@ -101,11 +99,11 @@ public class AtomicReferenceArrayTest ex
         AtomicReferenceArray ai = new AtomicReferenceArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.lazySet(i, one);
-            assertEquals(one,ai.get(i));
+            assertSame(one,ai.get(i));
             ai.lazySet(i, two);
-            assertEquals(two,ai.get(i));
+            assertSame(two,ai.get(i));
             ai.lazySet(i, m3);
-            assertEquals(m3,ai.get(i));
+            assertSame(m3,ai.get(i));
         }
     }
 
@@ -118,11 +116,11 @@ public class AtomicReferenceArrayTest ex
             ai.set(i, one);
             assertTrue(ai.compareAndSet(i, one,two));
             assertTrue(ai.compareAndSet(i, two,m4));
-            assertEquals(m4,ai.get(i));
+            assertSame(m4,ai.get(i));
             assertFalse(ai.compareAndSet(i, m5,seven));
-            assertFalse((seven.equals(ai.get(i))));
+            assertSame(m4,ai.get(i));
             assertTrue(ai.compareAndSet(i, m4,seven));
-            assertEquals(seven,ai.get(i));
+            assertSame(seven,ai.get(i));
         }
     }
 
@@ -130,23 +128,20 @@ public class AtomicReferenceArrayTest ex
      * compareAndSet in one thread enables another waiting for value
      * to succeed
      */
-    public void testCompareAndSetInMultipleThreads() {
+    public void testCompareAndSetInMultipleThreads() throws InterruptedException {
         final AtomicReferenceArray a = new AtomicReferenceArray(1);
         a.set(0, one);
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    while (!a.compareAndSet(0, two, three)) Thread.yield();
-                }});
-        try {
-            t.start();
-            assertTrue(a.compareAndSet(0, one, two));
-            t.join(LONG_DELAY_MS);
-            assertFalse(t.isAlive());
-            assertEquals(a.get(0), three);
-        }
-        catch (Exception e) {
-            unexpectedException();
-        }
+        Thread t = new Thread(new CheckedRunnable() {
+            public void realRun() {
+                while (!a.compareAndSet(0, two, three))
+                    Thread.yield();
+            }});
+
+        t.start();
+        assertTrue(a.compareAndSet(0, one, two));
+        t.join(LONG_DELAY_MS);
+        assertFalse(t.isAlive());
+        assertSame(a.get(0), three);
     }
 
     /**
@@ -159,9 +154,9 @@ public class AtomicReferenceArrayTest ex
             ai.set(i, one);
             while (!ai.weakCompareAndSet(i, one,two));
             while (!ai.weakCompareAndSet(i, two,m4));
-            assertEquals(m4,ai.get(i));
+            assertSame(m4,ai.get(i));
             while (!ai.weakCompareAndSet(i, m4,seven));
-            assertEquals(seven,ai.get(i));
+            assertSame(seven,ai.get(i));
         }
     }
 
@@ -172,40 +167,28 @@ public class AtomicReferenceArrayTest ex
         AtomicReferenceArray ai = new AtomicReferenceArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, one);
-            assertEquals(one,ai.getAndSet(i,zero));
-            assertEquals(0,ai.getAndSet(i,m10));
-            assertEquals(m10,ai.getAndSet(i,one));
+            assertSame(one,ai.getAndSet(i,zero));
+            assertSame(zero,ai.getAndSet(i,m10));
+            assertSame(m10,ai.getAndSet(i,one));
         }
     }
 
     /**
      * a deserialized serialized array holds same values
      */
-    public void testSerialization() {
-        AtomicReferenceArray l = new AtomicReferenceArray(SIZE);
-        for (int i = 0; i < SIZE; ++i) {
-            l.set(i, new Integer(-i));
-        }
-
-        try {
-            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));
-            AtomicReferenceArray r = (AtomicReferenceArray) in.readObject();
-            assertEquals(l.length(), r.length());
-            for (int i = 0; i < SIZE; ++i) {
-                assertEquals(r.get(i), l.get(i));
-            }
-        } catch (Exception e) {
-            unexpectedException();
+    public void testSerialization() throws Exception {
+        AtomicReferenceArray x = new AtomicReferenceArray(SIZE);
+        for (int i = 0; i < SIZE; i++) {
+            x.set(i, new Integer(-i));
+        }
+        AtomicReferenceArray y = serialClone(x);
+        assertTrue(x != y);
+        assertEquals(x.length(), y.length());
+        for (int i = 0; i < SIZE; i++) {
+            assertEquals(x.get(i), y.get(i));
         }
     }
 
-
     /**
      * toString returns current value.
      */