--- jsr166/src/test/tck/AtomicReferenceArrayTest.java	2009/11/17 06:58:50	1.16
+++ jsr166/src/test/tck/AtomicReferenceArrayTest.java	2011/05/27 19:39:07	1.20
@@ -1,7 +1,7 @@
 /*
  * 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.
  */
@@ -12,8 +12,8 @@ import java.io.*;
 import java.util.*;
 
 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);
@@ -51,7 +51,6 @@ public class AtomicReferenceArrayTest ex
             assertEquals(a[i], ai.get(i));
     }
 
-
     /**
      * get and set for out of bound indices throw IndexOutOfBoundsException
      */
@@ -86,11 +85,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 +100,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 +117,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));
         }
     }
 
@@ -143,7 +142,7 @@ public class AtomicReferenceArrayTest ex
         assertTrue(a.compareAndSet(0, one, two));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertEquals(a.get(0), three);
+        assertSame(a.get(0), three);
     }
 
     /**
@@ -156,9 +155,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));
         }
     }
 
@@ -169,9 +168,9 @@ 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));
         }
     }
 
@@ -198,7 +197,6 @@ public class AtomicReferenceArrayTest ex
         }
     }
 
-
     /**
      * toString returns current value.
      */