--- jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2010/08/25 00:07:03	1.14
+++ jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2021/01/27 01:57:24	1.24
@@ -1,51 +1,53 @@
 /*
  * 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 junit.framework.*;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicMarkableReference;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class AtomicMarkableReferenceTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     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);
-        assertSame(one,ai.getReference());
+        AtomicMarkableReference<Item> ai = new AtomicMarkableReference<>(one, false);
+        assertSame(one, ai.getReference());
         assertFalse(ai.isMarked());
-        AtomicMarkableReference a2 = new AtomicMarkableReference(null, true);
+        AtomicMarkableReference<Item> 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);
-        assertSame(one,ai.getReference());
+        AtomicMarkableReference<Item> ai = new AtomicMarkableReference<>(one, false);
+        assertSame(one, ai.getReference());
         assertFalse(ai.isMarked());
         assertSame(one, ai.get(mark));
         assertFalse(mark[0]);
         ai.set(two, false);
-        assertSame(two,ai.getReference());
+        assertSame(two, ai.getReference());
         assertFalse(ai.isMarked());
         assertSame(two, ai.get(mark));
         assertFalse(mark[0]);
         ai.set(one, true);
-        assertSame(one,ai.getReference());
+        assertSame(one, ai.getReference());
         assertTrue(ai.isMarked());
         assertSame(one, ai.get(mark));
         assertTrue(mark[0]);
@@ -56,7 +58,7 @@ public class AtomicMarkableReferenceTest
      */
     public void testAttemptMark() {
         boolean[] mark = new boolean[1];
-        AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
+        AtomicMarkableReference<Item> ai = new AtomicMarkableReference<>(one, false);
         assertFalse(ai.isMarked());
         assertTrue(ai.attemptMark(one, true));
         assertTrue(ai.isMarked());
@@ -70,7 +72,7 @@ public class AtomicMarkableReferenceTest
      */
     public void testCompareAndSet() {
         boolean[] mark = new boolean[1];
-        AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
+        AtomicMarkableReference<Item> ai = new AtomicMarkableReference<>(one, false);
         assertSame(one, ai.get(mark));
         assertFalse(ai.isMarked());
         assertFalse(mark[0]);
@@ -79,12 +81,12 @@ public class AtomicMarkableReferenceTest
         assertSame(two, ai.get(mark));
         assertFalse(mark[0]);
 
-        assertTrue(ai.compareAndSet(two, m3, false, true));
-        assertSame(m3, ai.get(mark));
+        assertTrue(ai.compareAndSet(two, minusThree, false, true));
+        assertSame(minusThree, ai.get(mark));
         assertTrue(mark[0]);
 
-        assertFalse(ai.compareAndSet(two, m3, true, true));
-        assertSame(m3, ai.get(mark));
+        assertFalse(ai.compareAndSet(two, minusThree, true, true));
+        assertSame(minusThree, ai.get(mark));
         assertTrue(mark[0]);
     }
 
@@ -93,7 +95,7 @@ public class AtomicMarkableReferenceTest
      * to succeed
      */
     public void testCompareAndSetInMultipleThreads() throws Exception {
-        final AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
+        final AtomicMarkableReference<Item> ai = new AtomicMarkableReference<>(one, false);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
                 while (!ai.compareAndSet(two, three, false, false))
@@ -104,7 +106,7 @@ public class AtomicMarkableReferenceTest
         assertTrue(ai.compareAndSet(one, two, false, false));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertSame(ai.getReference(), three);
+        assertSame(three, ai.getReference());
         assertFalse(ai.isMarked());
     }
 
@@ -113,7 +115,7 @@ public class AtomicMarkableReferenceTest
      * to succeed
      */
     public void testCompareAndSetInMultipleThreads2() throws Exception {
-        final AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
+        final AtomicMarkableReference<Item> ai = new AtomicMarkableReference<>(one, false);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
                 while (!ai.compareAndSet(one, one, true, false))
@@ -124,7 +126,7 @@ public class AtomicMarkableReferenceTest
         assertTrue(ai.compareAndSet(one, one, false, true));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertSame(ai.getReference(), one);
+        assertSame(one, ai.getReference());
         assertFalse(ai.isMarked());
     }
 
@@ -134,17 +136,17 @@ public class AtomicMarkableReferenceTest
      */
     public void testWeakCompareAndSet() {
         boolean[] mark = new boolean[1];
-        AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
+        AtomicMarkableReference<Item> ai = new AtomicMarkableReference<>(one, false);
         assertSame(one, ai.get(mark));
         assertFalse(ai.isMarked());
         assertFalse(mark[0]);
 
-        while (!ai.weakCompareAndSet(one, two, false, false));
+        do {} while (!ai.weakCompareAndSet(one, two, false, false));
         assertSame(two, ai.get(mark));
         assertFalse(mark[0]);
 
-        while (!ai.weakCompareAndSet(two, m3, false, true));
-        assertSame(m3, ai.get(mark));
+        do {} while (!ai.weakCompareAndSet(two, minusThree, false, true));
+        assertSame(minusThree, ai.get(mark));
         assertTrue(mark[0]);
     }