--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2009/11/21 02:07:26	1.16
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2011/05/31 16:16:23	1.23
@@ -1,14 +1,13 @@
 /*
  * 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 java.util.concurrent.atomic.*;
 import junit.framework.*;
-import java.util.*;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 public class AtomicReferenceFieldUpdaterTest extends JSR166TestCase {
     volatile Integer x = null;
@@ -31,11 +30,9 @@ public class AtomicReferenceFieldUpdater
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "y");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
-
     /**
      * construction with field not of given type throws RuntimeException
      */
@@ -45,8 +42,7 @@ public class AtomicReferenceFieldUpdater
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "z");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
@@ -58,12 +54,11 @@ public class AtomicReferenceFieldUpdater
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "w");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
-     *  get returns the last value set or assigned
+     * get returns the last value set or assigned
      */
     public void testGetSet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
@@ -73,15 +68,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;
@@ -91,11 +86,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));
     }
 
     /**
@@ -109,13 +104,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));
     }
 
     /**
@@ -141,7 +136,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);
     }
 
     /**
@@ -158,9 +153,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));
     }
 
     /**
@@ -174,9 +169,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));
     }
 
 }