--- jsr166/src/test/tck/ScheduledExecutorSubclassTest.java	2013/09/24 18:35:21	1.31
+++ jsr166/src/test/tck/ScheduledExecutorSubclassTest.java	2015/04/25 04:55:31	1.35
@@ -4,15 +4,35 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
-import java.util.*;
-import java.util.concurrent.*;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Delayed;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.RunnableScheduledFuture;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class ScheduledExecutorSubclassTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(ScheduledExecutorSubclassTest.class);
@@ -198,9 +218,8 @@ public class ScheduledExecutorSubclassTe
                 long startTime = System.nanoTime();
                 int cycles = 10;
                 final CountDownLatch done = new CountDownLatch(cycles);
-                CheckedRunnable task = new CheckedRunnable() {
+                Runnable task = new CheckedRunnable() {
                     public void realRun() { done.countDown(); }};
-                
                 ScheduledFuture h =
                     p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
                 done.await();
@@ -227,9 +246,8 @@ public class ScheduledExecutorSubclassTe
                 long startTime = System.nanoTime();
                 int cycles = 10;
                 final CountDownLatch done = new CountDownLatch(cycles);
-                CheckedRunnable task = new CheckedRunnable() {
+                Runnable task = new CheckedRunnable() {
                     public void realRun() { done.countDown(); }};
-                
                 ScheduledFuture h =
                     p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
                 done.await();