--- jsr166/src/test/tck/CyclicBarrierTest.java	2011/05/31 16:16:23	1.24
+++ jsr166/src/test/tck/CyclicBarrierTest.java	2015/04/25 04:55:30	1.27
@@ -6,18 +6,20 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
-import java.util.*;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class CyclicBarrierTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(CyclicBarrierTest.class);
@@ -92,7 +94,7 @@ public class CyclicBarrierTest extends J
         b.await();
         b.await();
         assertEquals(0, b.getNumberWaiting());
-        assertEquals(countAction, 2);
+        assertEquals(2, countAction);
     }
 
     /**