--- jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2011/06/10 20:01:21	1.18
+++ jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2015/04/25 04:55:30	1.22
@@ -6,12 +6,14 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 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);
@@ -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]);
     }