--- jsr166/src/test/tck/AtomicIntegerTest.java	2013/05/30 03:28:55	1.25
+++ jsr166/src/test/tck/AtomicIntegerTest.java	2015/04/25 04:55:30	1.28
@@ -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);
@@ -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());
     }