--- jsr166/src/test/tck/AtomicStampedReferenceTest.java	2011/05/31 16:16:23	1.18
+++ jsr166/src/test/tck/AtomicStampedReferenceTest.java	2014/12/31 19:21:20	1.22
@@ -6,9 +6,11 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 import java.util.concurrent.atomic.AtomicStampedReference;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class AtomicStampedReferenceTest extends JSR166TestCase {
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -22,7 +24,7 @@ public class AtomicStampedReferenceTest
      */
     public void testConstructor() {
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
-        assertSame(one,ai.getReference());
+        assertSame(one, ai.getReference());
         assertEquals(0, ai.getStamp());
         AtomicStampedReference a2 = new AtomicStampedReference(null, 1);
         assertNull(a2.getReference());
@@ -35,20 +37,20 @@ public class AtomicStampedReferenceTest
     public void testGetSet() {
         int[] mark = new int[1];
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
-        assertSame(one,ai.getReference());
+        assertSame(one, ai.getReference());
         assertEquals(0, ai.getStamp());
         assertSame(one, ai.get(mark));
         assertEquals(0, mark[0]);
         ai.set(two, 0);
-        assertSame(two,ai.getReference());
+        assertSame(two, ai.getReference());
         assertEquals(0, ai.getStamp());
         assertSame(two, ai.get(mark));
         assertEquals(0, mark[0]);
         ai.set(one, 1);
-        assertSame(one,ai.getReference());
+        assertSame(one, ai.getReference());
         assertEquals(1, ai.getStamp());
         assertSame(one, ai.get(mark));
-        assertEquals(1,mark[0]);
+        assertEquals(1, mark[0]);
     }
 
     /**
@@ -104,8 +106,8 @@ public class AtomicStampedReferenceTest
         assertTrue(ai.compareAndSet(one, two, 0, 0));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertSame(ai.getReference(), three);
-        assertEquals(ai.getStamp(), 0);
+        assertSame(three, ai.getReference());
+        assertEquals(0, ai.getStamp());
     }
 
     /**
@@ -124,8 +126,8 @@ public class AtomicStampedReferenceTest
         assertTrue(ai.compareAndSet(one, one, 0, 1));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertSame(ai.getReference(), one);
-        assertEquals(ai.getStamp(), 2);
+        assertSame(one, ai.getReference());
+        assertEquals(2, ai.getStamp());
     }
 
     /**
@@ -139,11 +141,11 @@ public class AtomicStampedReferenceTest
         assertEquals(0, ai.getStamp());
         assertEquals(0, mark[0]);
 
-        while (!ai.weakCompareAndSet(one, two, 0, 0));
+        do {} while (!ai.weakCompareAndSet(one, two, 0, 0));
         assertSame(two, ai.get(mark));
         assertEquals(0, mark[0]);
 
-        while (!ai.weakCompareAndSet(two, m3, 0, 1));
+        do {} while (!ai.weakCompareAndSet(two, m3, 0, 1));
         assertSame(m3, ai.get(mark));
         assertEquals(1, mark[0]);
     }