--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2009/11/21 17:38:05	1.17
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2011/05/27 19:39:07	1.22
@@ -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.
  */
@@ -34,7 +34,6 @@ public class AtomicReferenceFieldUpdater
         } catch (RuntimeException success) {}
     }
 
-
     /**
      * construction with field not of given type throws RuntimeException
      */
@@ -60,7 +59,7 @@ public class AtomicReferenceFieldUpdater
     }
 
     /**
-     *  get returns the last value set or assigned
+     * get returns the last value set or assigned
      */
     public void testGetSet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
@@ -70,15 +69,15 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-        assertEquals(one,a.get(this));
+        assertSame(one,a.get(this));
         a.set(this,two);
-        assertEquals(two,a.get(this));
+        assertSame(two,a.get(this));
         a.set(this,m3);
-        assertEquals(m3,a.get(this));
+        assertSame(m3,a.get(this));
     }
 
     /**
-     *  get returns the last value lazySet by same thread
+     * get returns the last value lazySet by same thread
      */
     public void testGetLazySet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
@@ -88,11 +87,11 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-        assertEquals(one,a.get(this));
+        assertSame(one,a.get(this));
         a.lazySet(this,two);
-        assertEquals(two,a.get(this));
+        assertSame(two,a.get(this));
         a.lazySet(this,m3);
-        assertEquals(m3,a.get(this));
+        assertSame(m3,a.get(this));
     }
 
     /**
@@ -106,13 +105,13 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-        assertTrue(a.compareAndSet(this,one,two));
-        assertTrue(a.compareAndSet(this,two,m4));
-        assertEquals(m4,a.get(this));
-        assertFalse(a.compareAndSet(this,m5,seven));
-        assertFalse((seven == a.get(this)));
-        assertTrue(a.compareAndSet(this,m4,seven));
-        assertEquals(seven,a.get(this));
+        assertTrue(a.compareAndSet(this, one, two));
+        assertTrue(a.compareAndSet(this, two, m4));
+        assertSame(m4, a.get(this));
+        assertFalse(a.compareAndSet(this, m5, seven));
+        assertFalse(seven == a.get(this));
+        assertTrue(a.compareAndSet(this, m4, seven));
+        assertSame(seven,a.get(this));
     }
 
     /**
@@ -138,7 +137,7 @@ public class AtomicReferenceFieldUpdater
         assertTrue(a.compareAndSet(this, one, two));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertEquals(a.get(this), three);
+        assertSame(a.get(this), three);
     }
 
     /**
@@ -155,9 +154,9 @@ public class AtomicReferenceFieldUpdater
         x = one;
         while (!a.weakCompareAndSet(this,one,two));
         while (!a.weakCompareAndSet(this,two,m4));
-        assertEquals(m4,a.get(this));
+        assertSame(m4,a.get(this));
         while (!a.weakCompareAndSet(this,m4,seven));
-        assertEquals(seven,a.get(this));
+        assertSame(seven,a.get(this));
     }
 
     /**
@@ -171,9 +170,9 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-        assertEquals(one,a.getAndSet(this, zero));
-        assertEquals(zero,a.getAndSet(this,m10));
-        assertEquals(m10,a.getAndSet(this,1));
+        assertSame(one,a.getAndSet(this, zero));
+        assertSame(zero,a.getAndSet(this,m10));
+        assertSame(m10,a.getAndSet(this,1));
     }
 
 }