--- jsr166/src/test/tck/ScheduledExecutorTest.java	2010/10/11 15:46:40	1.34
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2011/05/06 11:22:07	1.39
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  * Other contributors include Andrew Wright, Jeffrey Hayes,
  * Pat Fisher, Mike Judd.
  */
@@ -150,7 +150,7 @@ public class ScheduledExecutorTest exten
         RunnableCounter counter = new RunnableCounter();
         ScheduledFuture h =
             p.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
-        Thread.sleep(SMALL_DELAY_MS);
+        delay(SMALL_DELAY_MS);
         h.cancel(true);
         int c = counter.count.get();
         // By time scaling conventions, we must have at least
@@ -168,7 +168,7 @@ public class ScheduledExecutorTest exten
         RunnableCounter counter = new RunnableCounter();
         ScheduledFuture h =
             p.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
-        Thread.sleep(SMALL_DELAY_MS);
+        delay(SMALL_DELAY_MS);
         h.cancel(true);
         int c = counter.count.get();
         assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
@@ -240,9 +240,9 @@ public class ScheduledExecutorTest exten
     /**
      * schedule callable throws RejectedExecutionException if shutdown
      */
-     public void testSchedule3_RejectedExecutionException() throws InterruptedException {
-         ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
-         try {
+    public void testSchedule3_RejectedExecutionException() throws InterruptedException {
+        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
+        try {
             se.shutdown();
             se.schedule(new NoOpCallable(),
                         MEDIUM_DELAY_MS, MILLISECONDS);
@@ -250,7 +250,7 @@ public class ScheduledExecutorTest exten
         } catch (RejectedExecutionException success) {
         } catch (SecurityException ok) {
         }
-         joinPool(se);
+        joinPool(se);
     }
 
     /**
@@ -331,7 +331,7 @@ public class ScheduledExecutorTest exten
             assertEquals(0, p.getCompletedTaskCount());
             threadProceed.countDown();
             threadDone.await();
-            Thread.sleep(SHORT_DELAY_MS);
+            delay(SHORT_DELAY_MS);
             assertEquals(1, p.getCompletedTaskCount());
         } finally {
             joinPool(p);
@@ -485,11 +485,12 @@ public class ScheduledExecutorTest exten
         try {
             p.execute(new CheckedRunnable() {
                 public void realRun() throws InterruptedException {
-                    threadStarted.countDown();
                     assertFalse(p.isTerminated());
+                    threadStarted.countDown();
                     done.await();
                 }});
             assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertFalse(p.isTerminating());
             done.countDown();
         } finally {
             try { p.shutdown(); } catch (SecurityException ok) { return; }
@@ -509,8 +510,8 @@ public class ScheduledExecutorTest exten
             assertFalse(p.isTerminating());
             p.execute(new CheckedRunnable() {
                 public void realRun() throws InterruptedException {
-                    threadStarted.countDown();
                     assertFalse(p.isTerminating());
+                    threadStarted.countDown();
                     done.await();
                 }});
             assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
@@ -606,7 +607,7 @@ public class ScheduledExecutorTest exten
                 long count = p.getTaskCount();
                 if (count >= 0 && count <= max)
                     break;
-                Thread.sleep(1);
+                delay(1);
             }
             assertTrue(k < SMALL_DELAY_MS);
         } finally {