--- jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2010/08/25 00:07:03	1.14
+++ jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2014/12/31 19:21:20	1.21
@@ -1,13 +1,15 @@
 /*
  * 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) {
@@ -18,11 +20,11 @@ public class AtomicMarkableReferenceTest
     }
 
     /**
-     *  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());
+        assertSame(one, ai.getReference());
         assertFalse(ai.isMarked());
         AtomicMarkableReference a2 = new AtomicMarkableReference(null, true);
         assertNull(a2.getReference());
@@ -30,22 +32,22 @@ public class AtomicMarkableReferenceTest
     }
 
     /**
-     *  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());
+        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]);
@@ -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());
     }
 
@@ -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());
     }
 
@@ -139,11 +141,11 @@ public class AtomicMarkableReferenceTest
         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));
+        do {} while (!ai.weakCompareAndSet(two, m3, false, true));
         assertSame(m3, ai.get(mark));
         assertTrue(mark[0]);
     }