--- jsr166/src/test/tck/AtomicReferenceTest.java	2011/05/31 16:16:23	1.18
+++ jsr166/src/test/tck/AtomicReferenceTest.java	2021/01/26 13:33:05	1.30
@@ -6,12 +6,14 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 import java.util.concurrent.atomic.AtomicReference;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class AtomicReferenceTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicReferenceTest.class);
@@ -21,15 +23,15 @@ public class AtomicReferenceTest extends
      * constructor initializes to given value
      */
     public void testConstructor() {
-        AtomicReference ai = new AtomicReference(one);
-        assertSame(one,ai.get());
+        AtomicReference<Item> ai = new AtomicReference<Item>(one);
+        assertSame(one, ai.get());
     }
 
     /**
      * default constructed initializes to null
      */
     public void testConstructor2() {
-        AtomicReference ai = new AtomicReference();
+        AtomicReference<Item> ai = new AtomicReference<Item>();
         assertNull(ai.get());
     }
 
@@ -37,38 +39,38 @@ public class AtomicReferenceTest extends
      * get returns the last value set
      */
     public void testGetSet() {
-        AtomicReference ai = new AtomicReference(one);
-        assertSame(one,ai.get());
+        AtomicReference<Item> ai = new AtomicReference<Item>(one);
+        assertSame(one, ai.get());
         ai.set(two);
-        assertSame(two,ai.get());
-        ai.set(m3);
-        assertSame(m3,ai.get());
+        assertSame(two, ai.get());
+        ai.set(minusThree);
+        assertSame(minusThree, ai.get());
     }
 
     /**
      * get returns the last value lazySet in same thread
      */
     public void testGetLazySet() {
-        AtomicReference ai = new AtomicReference(one);
-        assertSame(one,ai.get());
+        AtomicReference<Item> ai = new AtomicReference<Item>(one);
+        assertSame(one, ai.get());
         ai.lazySet(two);
-        assertSame(two,ai.get());
-        ai.lazySet(m3);
-        assertSame(m3,ai.get());
+        assertSame(two, ai.get());
+        ai.lazySet(minusThree);
+        assertSame(minusThree, ai.get());
     }
 
     /**
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
     public void testCompareAndSet() {
-        AtomicReference ai = new AtomicReference(one);
-        assertTrue(ai.compareAndSet(one,two));
-        assertTrue(ai.compareAndSet(two,m4));
-        assertSame(m4,ai.get());
-        assertFalse(ai.compareAndSet(m5,seven));
-        assertSame(m4,ai.get());
-        assertTrue(ai.compareAndSet(m4,seven));
-        assertSame(seven,ai.get());
+        AtomicReference<Item> ai = new AtomicReference<Item>(one);
+        assertTrue(ai.compareAndSet(one, two));
+        assertTrue(ai.compareAndSet(two, minusFour));
+        assertSame(minusFour, ai.get());
+        assertFalse(ai.compareAndSet(minusFive, seven));
+        assertSame(minusFour, ai.get());
+        assertTrue(ai.compareAndSet(minusFour, seven));
+        assertSame(seven, ai.get());
     }
 
     /**
@@ -76,7 +78,7 @@ public class AtomicReferenceTest extends
      * to succeed
      */
     public void testCompareAndSetInMultipleThreads() throws Exception {
-        final AtomicReference ai = new AtomicReference(one);
+        final AtomicReference<Item> ai = new AtomicReference<Item>(one);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
                 while (!ai.compareAndSet(two, three))
@@ -87,43 +89,45 @@ public class AtomicReferenceTest extends
         assertTrue(ai.compareAndSet(one, two));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertSame(ai.get(), three);
+        assertSame(three, ai.get());
     }
 
     /**
      * repeated weakCompareAndSet succeeds in changing value when equal
      * to expected
      */
+    @SuppressWarnings("deprecation")
     public void testWeakCompareAndSet() {
-        AtomicReference ai = new AtomicReference(one);
-        while (!ai.weakCompareAndSet(one,two));
-        while (!ai.weakCompareAndSet(two,m4));
-        assertSame(m4,ai.get());
-        while (!ai.weakCompareAndSet(m4,seven));
-        assertSame(seven,ai.get());
+        AtomicReference<Item> ai = new AtomicReference<Item>(one);
+        do {} while (!ai.weakCompareAndSet(one, two));
+        do {} while (!ai.weakCompareAndSet(two, minusFour));
+        assertSame(minusFour, ai.get());
+        do {} while (!ai.weakCompareAndSet(minusFour, seven));
+        assertSame(seven, ai.get());
     }
 
     /**
      * getAndSet returns previous value and sets to given value
      */
     public void testGetAndSet() {
-        AtomicReference ai = new AtomicReference(one);
-        assertSame(one,ai.getAndSet(zero));
-        assertSame(zero,ai.getAndSet(m10));
-        assertSame(m10,ai.getAndSet(one));
+        AtomicReference<Item> ai = new AtomicReference<Item>(one);
+        assertSame(one, ai.getAndSet(zero));
+        assertSame(zero, ai.getAndSet(minusTen));
+        assertSame(minusTen, ai.getAndSet(one));
     }
 
     /**
-     * a deserialized serialized atomic holds same value
+     * a deserialized/reserialized atomic holds same value
      */
     public void testSerialization() throws Exception {
-        AtomicReference x = new AtomicReference();
-        AtomicReference y = serialClone(x);
-        assertTrue(x != y);
+        AtomicReference<Item> x = new AtomicReference<Item>();
+        AtomicReference<Item> y = serialClone(x);
+        assertNotSame(x, y);
         x.set(one);
-        AtomicReference z = serialClone(x);
+        AtomicReference<Item> z = serialClone(x);
+        assertNotSame(y, z);
         assertEquals(one, x.get());
-        assertEquals(null, y.get());
+        assertNull(y.get());
         assertEquals(one, z.get());
     }
 
@@ -131,10 +135,10 @@ public class AtomicReferenceTest extends
      * toString returns current value.
      */
     public void testToString() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(ai.toString(), one.toString());
+        AtomicReference<Item> ai = new AtomicReference<Item>(one);
+        assertEquals(one.toString(), ai.toString());
         ai.set(two);
-        assertEquals(ai.toString(), two.toString());
+        assertEquals(two.toString(), ai.toString());
     }
 
 }