--- jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2009/11/21 02:07:26	1.12
+++ jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2010/10/09 19:30:34	1.15
@@ -10,45 +10,44 @@ import junit.framework.*;
 import java.util.concurrent.atomic.*;
 
 public class AtomicMarkableReferenceTest 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(AtomicMarkableReferenceTest.class);
     }
 
     /**
-     *  constructor initializes to given reference and mark
+     * constructor initializes to given reference and mark
      */
     public void testConstructor() {
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
-        assertEquals(one,ai.getReference());
+        assertSame(one,ai.getReference());
         assertFalse(ai.isMarked());
         AtomicMarkableReference a2 = new AtomicMarkableReference(null, true);
         assertNull(a2.getReference());
         assertTrue(a2.isMarked());
-
     }
 
     /**
-     *  get returns the last values of reference and mark set
+     * get returns the last values of reference and mark set
      */
     public void testGetSet() {
         boolean[] mark = new boolean[1];
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
-        assertEquals(one,ai.getReference());
+        assertSame(one,ai.getReference());
         assertFalse(ai.isMarked());
-        assertEquals(one, ai.get(mark));
+        assertSame(one, ai.get(mark));
         assertFalse(mark[0]);
         ai.set(two, false);
-        assertEquals(two,ai.getReference());
+        assertSame(two,ai.getReference());
         assertFalse(ai.isMarked());
-        assertEquals(two, ai.get(mark));
+        assertSame(two, ai.get(mark));
         assertFalse(mark[0]);
         ai.set(one, true);
-        assertEquals(one,ai.getReference());
+        assertSame(one,ai.getReference());
         assertTrue(ai.isMarked());
-        assertEquals(one, ai.get(mark));
+        assertSame(one, ai.get(mark));
         assertTrue(mark[0]);
     }
 
@@ -61,7 +60,7 @@ public class AtomicMarkableReferenceTest
         assertFalse(ai.isMarked());
         assertTrue(ai.attemptMark(one, true));
         assertTrue(ai.isMarked());
-        assertEquals(one, ai.get(mark));
+        assertSame(one, ai.get(mark));
         assertTrue(mark[0]);
     }
 
@@ -72,20 +71,20 @@ public class AtomicMarkableReferenceTest
     public void testCompareAndSet() {
         boolean[] mark = new boolean[1];
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
-        assertEquals(one, ai.get(mark));
+        assertSame(one, ai.get(mark));
         assertFalse(ai.isMarked());
         assertFalse(mark[0]);
 
         assertTrue(ai.compareAndSet(one, two, false, false));
-        assertEquals(two, ai.get(mark));
+        assertSame(two, ai.get(mark));
         assertFalse(mark[0]);
 
         assertTrue(ai.compareAndSet(two, m3, false, true));
-        assertEquals(m3, ai.get(mark));
+        assertSame(m3, ai.get(mark));
         assertTrue(mark[0]);
 
         assertFalse(ai.compareAndSet(two, m3, true, true));
-        assertEquals(m3, ai.get(mark));
+        assertSame(m3, ai.get(mark));
         assertTrue(mark[0]);
     }
 
@@ -105,7 +104,7 @@ public class AtomicMarkableReferenceTest
         assertTrue(ai.compareAndSet(one, two, false, false));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertEquals(ai.getReference(), three);
+        assertSame(ai.getReference(), three);
         assertFalse(ai.isMarked());
     }
 
@@ -125,7 +124,7 @@ public class AtomicMarkableReferenceTest
         assertTrue(ai.compareAndSet(one, one, false, true));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertEquals(ai.getReference(), one);
+        assertSame(ai.getReference(), one);
         assertFalse(ai.isMarked());
     }
 
@@ -136,16 +135,16 @@ public class AtomicMarkableReferenceTest
     public void testWeakCompareAndSet() {
         boolean[] mark = new boolean[1];
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
-        assertEquals(one, ai.get(mark));
+        assertSame(one, ai.get(mark));
         assertFalse(ai.isMarked());
         assertFalse(mark[0]);
 
         while (!ai.weakCompareAndSet(one, two, false, false));
-        assertEquals(two, ai.get(mark));
+        assertSame(two, ai.get(mark));
         assertFalse(mark[0]);
 
         while (!ai.weakCompareAndSet(two, m3, false, true));
-        assertEquals(m3, ai.get(mark));
+        assertSame(m3, ai.get(mark));
         assertTrue(mark[0]);
     }