--- jsr166/src/test/tck/AtomicStampedReferenceTest.java	2014/12/31 19:21:20	1.22
+++ jsr166/src/test/tck/AtomicStampedReferenceTest.java	2021/01/27 01:57:24	1.25
@@ -13,7 +13,7 @@ import junit.framework.TestSuite;
 
 public class AtomicStampedReferenceTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicStampedReferenceTest.class);
@@ -23,10 +23,10 @@ public class AtomicStampedReferenceTest
      * constructor initializes to given reference and stamp
      */
     public void testConstructor() {
-        AtomicStampedReference ai = new AtomicStampedReference(one, 0);
+        AtomicStampedReference<Item> ai = new AtomicStampedReference<>(one, 0);
         assertSame(one, ai.getReference());
         assertEquals(0, ai.getStamp());
-        AtomicStampedReference a2 = new AtomicStampedReference(null, 1);
+        AtomicStampedReference<Item> a2 = new AtomicStampedReference<>(null, 1);
         assertNull(a2.getReference());
         assertEquals(1, a2.getStamp());
     }
@@ -36,7 +36,7 @@ public class AtomicStampedReferenceTest
      */
     public void testGetSet() {
         int[] mark = new int[1];
-        AtomicStampedReference ai = new AtomicStampedReference(one, 0);
+        AtomicStampedReference<Item> ai = new AtomicStampedReference<>(one, 0);
         assertSame(one, ai.getReference());
         assertEquals(0, ai.getStamp());
         assertSame(one, ai.get(mark));
@@ -58,7 +58,7 @@ public class AtomicStampedReferenceTest
      */
     public void testAttemptStamp() {
         int[] mark = new int[1];
-        AtomicStampedReference ai = new AtomicStampedReference(one, 0);
+        AtomicStampedReference<Item> ai = new AtomicStampedReference<>(one, 0);
         assertEquals(0, ai.getStamp());
         assertTrue(ai.attemptStamp(one, 1));
         assertEquals(1, ai.getStamp());
@@ -72,7 +72,7 @@ public class AtomicStampedReferenceTest
      */
     public void testCompareAndSet() {
         int[] mark = new int[1];
-        AtomicStampedReference ai = new AtomicStampedReference(one, 0);
+        AtomicStampedReference<Item> ai = new AtomicStampedReference<>(one, 0);
         assertSame(one, ai.get(mark));
         assertEquals(0, ai.getStamp());
         assertEquals(0, mark[0]);
@@ -81,12 +81,12 @@ public class AtomicStampedReferenceTest
         assertSame(two, ai.get(mark));
         assertEquals(0, mark[0]);
 
-        assertTrue(ai.compareAndSet(two, m3, 0, 1));
-        assertSame(m3, ai.get(mark));
+        assertTrue(ai.compareAndSet(two, minusThree, 0, 1));
+        assertSame(minusThree, ai.get(mark));
         assertEquals(1, mark[0]);
 
-        assertFalse(ai.compareAndSet(two, m3, 1, 1));
-        assertSame(m3, ai.get(mark));
+        assertFalse(ai.compareAndSet(two, minusThree, 1, 1));
+        assertSame(minusThree, ai.get(mark));
         assertEquals(1, mark[0]);
     }
 
@@ -95,7 +95,7 @@ public class AtomicStampedReferenceTest
      * to succeed
      */
     public void testCompareAndSetInMultipleThreads() throws Exception {
-        final AtomicStampedReference ai = new AtomicStampedReference(one, 0);
+        final AtomicStampedReference<Item> ai = new AtomicStampedReference<>(one, 0);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
                 while (!ai.compareAndSet(two, three, 0, 0))
@@ -115,7 +115,7 @@ public class AtomicStampedReferenceTest
      * to succeed
      */
     public void testCompareAndSetInMultipleThreads2() throws Exception {
-        final AtomicStampedReference ai = new AtomicStampedReference(one, 0);
+        final AtomicStampedReference<Item> ai = new AtomicStampedReference<>(one, 0);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
                 while (!ai.compareAndSet(one, one, 1, 2))
@@ -136,7 +136,7 @@ public class AtomicStampedReferenceTest
      */
     public void testWeakCompareAndSet() {
         int[] mark = new int[1];
-        AtomicStampedReference ai = new AtomicStampedReference(one, 0);
+        AtomicStampedReference<Item> ai = new AtomicStampedReference<>(one, 0);
         assertSame(one, ai.get(mark));
         assertEquals(0, ai.getStamp());
         assertEquals(0, mark[0]);
@@ -145,8 +145,8 @@ public class AtomicStampedReferenceTest
         assertSame(two, ai.get(mark));
         assertEquals(0, mark[0]);
 
-        do {} while (!ai.weakCompareAndSet(two, m3, 0, 1));
-        assertSame(m3, ai.get(mark));
+        do {} while (!ai.weakCompareAndSet(two, minusThree, 0, 1));
+        assertSame(minusThree, ai.get(mark));
         assertEquals(1, mark[0]);
     }