--- jsr166/src/test/tck/AtomicIntegerTest.java	2011/06/10 20:01:21	1.23
+++ jsr166/src/test/tck/AtomicIntegerTest.java	2016/06/17 19:00:48	1.31
@@ -6,12 +6,14 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class AtomicIntegerTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicIntegerTest.class);
@@ -91,7 +93,7 @@ public class AtomicIntegerTest extends J
         assertTrue(ai.compareAndSet(1, 2));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertEquals(ai.get(), 3);
+        assertEquals(3, ai.get());
     }
 
     /**
@@ -100,10 +102,10 @@ public class AtomicIntegerTest extends J
      */
     public void testWeakCompareAndSet() {
         AtomicInteger ai = new AtomicInteger(1);
-        while (!ai.weakCompareAndSet(1, 2));
-        while (!ai.weakCompareAndSet(2, -4));
+        do {} while (!ai.weakCompareAndSet(1, 2));
+        do {} while (!ai.weakCompareAndSet(2, -4));
         assertEquals(-4, ai.get());
-        while (!ai.weakCompareAndSet(-4, 7));
+        do {} while (!ai.weakCompareAndSet(-4, 7));
         assertEquals(7, ai.get());
     }
 
@@ -194,7 +196,7 @@ public class AtomicIntegerTest extends J
     public void testSerialization() throws Exception {
         AtomicInteger x = new AtomicInteger();
         AtomicInteger y = serialClone(x);
-        assertTrue(x != y);
+        assertNotSame(x, y);
         x.set(22);
         AtomicInteger z = serialClone(x);
         assertEquals(22, x.get());
@@ -210,7 +212,7 @@ public class AtomicIntegerTest extends J
         assertEquals("0", ai.toString());
         for (int x : VALUES) {
             ai.set(x);
-            assertEquals(ai.toString(), Integer.toString(x));
+            assertEquals(Integer.toString(x), ai.toString());
         }
     }