--- jsr166/src/test/tck/ScheduledExecutorTest.java	2009/11/20 22:58:48	1.25
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2015/09/28 08:23:49	1.58
@@ -1,166 +1,240 @@
 /*
  * 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.
  */
 
-import junit.framework.*;
-import java.util.*;
-import java.util.concurrent.*;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import java.util.concurrent.atomic.*;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CountDownLatch;
+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.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class ScheduledExecutorTest extends JSR166TestCase {
     public static void main(String[] args) {
-	junit.textui.TestRunner.run (suite());
+        main(suite(), args);
     }
     public static Test suite() {
-	return new TestSuite(ScheduledExecutorTest.class);
+        return new TestSuite(ScheduledExecutorTest.class);
     }
 
-
     /**
      * execute successfully executes a runnable
      */
     public void testExecute() throws InterruptedException {
-        TrackedShortRunnable runnable =new TrackedShortRunnable();
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        p1.execute(runnable);
-        assertFalse(runnable.done);
-        Thread.sleep(SHORT_DELAY_MS);
-        try { p1.shutdown(); } catch (SecurityException ok) { return; }
-        Thread.sleep(MEDIUM_DELAY_MS);
-        assertTrue(runnable.done);
-        try { p1.shutdown(); } catch (SecurityException ok) { return; }
-        joinPool(p1);
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        final Runnable task = new CheckedRunnable() {
+            public void realRun() {
+                done.countDown();
+            }};
+        try {
+            p.execute(task);
+            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
+        } finally {
+            joinPool(p);
+        }
     }
 
-
     /**
      * delayed schedule of callable successfully executes after delay
      */
     public void testSchedule1() throws Exception {
-        TrackedCallable callable = new TrackedCallable();
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
-        assertFalse(callable.done);
-        Thread.sleep(MEDIUM_DELAY_MS);
-        assertTrue(callable.done);
-        assertEquals(Boolean.TRUE, f.get());
-        try { p1.shutdown(); } catch (SecurityException ok) { return; }
-        joinPool(p1);
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        final long startTime = System.nanoTime();
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            Callable task = new CheckedCallable<Boolean>() {
+                public Boolean realCall() {
+                    done.countDown();
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+                    return Boolean.TRUE;
+                }};
+            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
+            assertSame(Boolean.TRUE, f.get());
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+            assertTrue(done.await(0L, MILLISECONDS));
+        } finally {
+            joinPool(p);
+        }
     }
 
     /**
-     *  delayed schedule of runnable successfully executes after delay
-     */
-    public void testSchedule3() throws InterruptedException {
-        TrackedShortRunnable runnable = new TrackedShortRunnable();
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        p1.schedule(runnable, SMALL_DELAY_MS, MILLISECONDS);
-        Thread.sleep(SHORT_DELAY_MS);
-        assertFalse(runnable.done);
-        Thread.sleep(MEDIUM_DELAY_MS);
-        assertTrue(runnable.done);
-        try { p1.shutdown(); } catch (SecurityException ok) { return; }
-        joinPool(p1);
+     * delayed schedule of runnable successfully executes after delay
+     */
+    public void testSchedule3() throws Exception {
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        final long startTime = System.nanoTime();
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            Runnable task = new CheckedRunnable() {
+                public void realRun() {
+                    done.countDown();
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+                }};
+            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
+            await(done);
+            assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+        } finally {
+            joinPool(p);
+        }
     }
 
     /**
      * scheduleAtFixedRate executes runnable after given initial delay
      */
-    public void testSchedule4() throws InterruptedException {
-        TrackedShortRunnable runnable = new TrackedShortRunnable();
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        ScheduledFuture h = p1.scheduleAtFixedRate(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
-        assertFalse(runnable.done);
-        Thread.sleep(MEDIUM_DELAY_MS);
-        assertTrue(runnable.done);
-        h.cancel(true);
-        joinPool(p1);
-    }
-
-    static class RunnableCounter implements Runnable {
-        AtomicInteger count = new AtomicInteger(0);
-        public void run() { count.getAndIncrement(); }
+    public void testSchedule4() throws Exception {
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        final long startTime = System.nanoTime();
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            Runnable task = new CheckedRunnable() {
+                public void realRun() {
+                    done.countDown();
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+                }};
+            ScheduledFuture f =
+                p.scheduleAtFixedRate(task, timeoutMillis(),
+                                      LONG_DELAY_MS, MILLISECONDS);
+            await(done);
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+            f.cancel(true);
+        } finally {
+            joinPool(p);
+        }
     }
 
     /**
      * scheduleWithFixedDelay executes runnable after given initial delay
      */
-    public void testSchedule5() throws InterruptedException {
-        TrackedShortRunnable runnable = new TrackedShortRunnable();
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        ScheduledFuture h = p1.scheduleWithFixedDelay(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
-        assertFalse(runnable.done);
-        Thread.sleep(MEDIUM_DELAY_MS);
-        assertTrue(runnable.done);
-        h.cancel(true);
-        joinPool(p1);
+    public void testSchedule5() throws Exception {
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        final long startTime = System.nanoTime();
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            Runnable task = new CheckedRunnable() {
+                public void realRun() {
+                    done.countDown();
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+                }};
+            ScheduledFuture f =
+                p.scheduleWithFixedDelay(task, timeoutMillis(),
+                                         LONG_DELAY_MS, MILLISECONDS);
+            await(done);
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+            f.cancel(true);
+        } finally {
+            joinPool(p);
+        }
+    }
+
+    static class RunnableCounter implements Runnable {
+        AtomicInteger count = new AtomicInteger(0);
+        public void run() { count.getAndIncrement(); }
     }
 
     /**
      * scheduleAtFixedRate executes series of tasks at given rate
      */
     public void testFixedRateSequence() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        RunnableCounter counter = new RunnableCounter();
-        ScheduledFuture h =
-            p1.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
-        Thread.sleep(SMALL_DELAY_MS);
-        h.cancel(true);
-        int c = counter.count.get();
-        // By time scaling conventions, we must have at least
-        // an execution per SHORT delay, but no more than one SHORT more
-        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
-        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
-        joinPool(p1);
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        try {
+            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
+                long startTime = System.nanoTime();
+                int cycles = 10;
+                final CountDownLatch done = new CountDownLatch(cycles);
+                Runnable task = new CheckedRunnable() {
+                    public void realRun() { done.countDown(); }};
+                ScheduledFuture h =
+                    p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
+                done.await();
+                h.cancel(true);
+                double normalizedTime =
+                    (double) millisElapsedSince(startTime) / delay;
+                if (normalizedTime >= cycles - 1 &&
+                    normalizedTime <= cycles)
+                    return;
+            }
+            throw new AssertionError("unexpected execution rate");
+        } finally {
+            joinPool(p);
+        }
     }
 
     /**
      * scheduleWithFixedDelay executes series of tasks with given period
      */
     public void testFixedDelaySequence() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        RunnableCounter counter = new RunnableCounter();
-        ScheduledFuture h =
-            p1.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
-        Thread.sleep(SMALL_DELAY_MS);
-        h.cancel(true);
-        int c = counter.count.get();
-        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
-        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
-        joinPool(p1);
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        try {
+            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
+                long startTime = System.nanoTime();
+                int cycles = 10;
+                final CountDownLatch done = new CountDownLatch(cycles);
+                Runnable task = new CheckedRunnable() {
+                    public void realRun() { done.countDown(); }};
+                ScheduledFuture h =
+                    p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
+                done.await();
+                h.cancel(true);
+                double normalizedTime =
+                    (double) millisElapsedSince(startTime) / delay;
+                if (normalizedTime >= cycles - 1 &&
+                    normalizedTime <= cycles)
+                    return;
+            }
+            throw new AssertionError("unexpected execution rate");
+        } finally {
+            joinPool(p);
+        }
     }
 
-
     /**
-     *  execute (null) throws NPE
+     * execute(null) throws NPE
      */
     public void testExecuteNull() throws InterruptedException {
         ScheduledThreadPoolExecutor se = null;
         try {
-	    se = new ScheduledThreadPoolExecutor(1);
-	    se.execute(null);
+            se = new ScheduledThreadPoolExecutor(1);
+            se.execute(null);
             shouldThrow();
-	} catch (NullPointerException success) {}
+        } catch (NullPointerException success) {}
 
-	joinPool(se);
+        joinPool(se);
     }
 
     /**
-     * schedule (null) throws NPE
+     * schedule(null) throws NPE
      */
     public void testScheduleNull() throws InterruptedException {
         ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
-	try {
+        try {
             TrackedCallable callable = null;
-	    Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
+            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
             shouldThrow();
-	} catch (NullPointerException success) {}
-	joinPool(se);
+        } catch (NullPointerException success) {}
+        joinPool(se);
     }
 
     /**
@@ -178,7 +252,6 @@ public class ScheduledExecutorTest exten
         }
 
         joinPool(se);
-
     }
 
     /**
@@ -200,9 +273,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);
@@ -210,11 +283,11 @@ public class ScheduledExecutorTest exten
         } catch (RejectedExecutionException success) {
         } catch (SecurityException ok) {
         }
-         joinPool(se);
+        joinPool(se);
     }
 
     /**
-     *  scheduleAtFixedRate throws RejectedExecutionException if shutdown
+     * scheduleAtFixedRate throws RejectedExecutionException if shutdown
      */
     public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
         ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
@@ -246,78 +319,145 @@ public class ScheduledExecutorTest exten
     }
 
     /**
-     *  getActiveCount increases but doesn't overestimate, when a
-     *  thread becomes active
+     * getActiveCount increases but doesn't overestimate, when a
+     * thread becomes active
      */
     public void testGetActiveCount() throws InterruptedException {
-        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
-        assertEquals(0, p2.getActiveCount());
-        p2.execute(new SmallRunnable());
-        Thread.sleep(SHORT_DELAY_MS);
-        assertEquals(1, p2.getActiveCount());
-        joinPool(p2);
+        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            assertEquals(0, p.getActiveCount());
+            p.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    threadStarted.countDown();
+                    assertEquals(1, p.getActiveCount());
+                    done.await();
+                }});
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertEquals(1, p.getActiveCount());
+        } finally {
+            done.countDown();
+            joinPool(p);
+        }
     }
 
     /**
-     *    getCompletedTaskCount increases, but doesn't overestimate,
-     *   when tasks complete
+     * getCompletedTaskCount increases, but doesn't overestimate,
+     * when tasks complete
      */
     public void testGetCompletedTaskCount() throws InterruptedException {
-        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
-        assertEquals(0, p2.getCompletedTaskCount());
-        p2.execute(new SmallRunnable());
-        Thread.sleep(MEDIUM_DELAY_MS);
-        assertEquals(1, p2.getCompletedTaskCount());
-        joinPool(p2);
+        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch threadProceed = new CountDownLatch(1);
+        final CountDownLatch threadDone = new CountDownLatch(1);
+        try {
+            assertEquals(0, p.getCompletedTaskCount());
+            p.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    threadStarted.countDown();
+                    assertEquals(0, p.getCompletedTaskCount());
+                    threadProceed.await();
+                    threadDone.countDown();
+                }});
+            await(threadStarted);
+            assertEquals(0, p.getCompletedTaskCount());
+            threadProceed.countDown();
+            threadDone.await();
+            long startTime = System.nanoTime();
+            while (p.getCompletedTaskCount() != 1) {
+                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
+                    fail("timed out");
+                Thread.yield();
+            }
+        } finally {
+            joinPool(p);
+        }
     }
 
     /**
-     *  getCorePoolSize returns size given in constructor if not otherwise set
+     * getCorePoolSize returns size given in constructor if not otherwise set
      */
     public void testGetCorePoolSize() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        assertEquals(1, p1.getCorePoolSize());
-        joinPool(p1);
+        ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        assertEquals(1, p.getCorePoolSize());
+        joinPool(p);
     }
 
     /**
-     *    getLargestPoolSize increases, but doesn't overestimate, when
-     *   multiple threads active
+     * getLargestPoolSize increases, but doesn't overestimate, when
+     * multiple threads active
      */
     public void testGetLargestPoolSize() throws InterruptedException {
-        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
-        assertEquals(0, p2.getLargestPoolSize());
-        p2.execute(new SmallRunnable());
-        p2.execute(new SmallRunnable());
-        Thread.sleep(SHORT_DELAY_MS);
-        assertEquals(2, p2.getLargestPoolSize());
-        joinPool(p2);
+        final int THREADS = 3;
+        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
+        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            assertEquals(0, p.getLargestPoolSize());
+            for (int i = 0; i < THREADS; i++)
+                p.execute(new CheckedRunnable() {
+                    public void realRun() throws InterruptedException {
+                        threadsStarted.countDown();
+                        done.await();
+                        assertEquals(THREADS, p.getLargestPoolSize());
+                    }});
+            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertEquals(THREADS, p.getLargestPoolSize());
+        } finally {
+            done.countDown();
+            joinPool(p);
+            assertEquals(THREADS, p.getLargestPoolSize());
+        }
     }
 
     /**
-     *   getPoolSize increases, but doesn't overestimate, when threads
-     *   become active
+     * getPoolSize increases, but doesn't overestimate, when threads
+     * become active
      */
     public void testGetPoolSize() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        assertEquals(0, p1.getPoolSize());
-        p1.execute(new SmallRunnable());
-        assertEquals(1, p1.getPoolSize());
-        joinPool(p1);
+        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            assertEquals(0, p.getPoolSize());
+            p.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    threadStarted.countDown();
+                    assertEquals(1, p.getPoolSize());
+                    done.await();
+                }});
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertEquals(1, p.getPoolSize());
+        } finally {
+            done.countDown();
+            joinPool(p);
+        }
     }
 
     /**
-     *    getTaskCount increases, but doesn't overestimate, when tasks
-     *    submitted
+     * getTaskCount increases, but doesn't overestimate, when tasks
+     * submitted
      */
     public void testGetTaskCount() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        assertEquals(0, p1.getTaskCount());
-        for (int i = 0; i < 5; i++)
-            p1.execute(new SmallRunnable());
-        Thread.sleep(SHORT_DELAY_MS);
-        assertEquals(5, p1.getTaskCount());
-        joinPool(p1);
+        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        final int TASKS = 5;
+        try {
+            assertEquals(0, p.getTaskCount());
+            for (int i = 0; i < TASKS; i++)
+                p.execute(new CheckedRunnable() {
+                    public void realRun() throws InterruptedException {
+                        threadStarted.countDown();
+                        done.await();
+                    }});
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertEquals(TASKS, p.getTaskCount());
+        } finally {
+            done.countDown();
+            joinPool(p);
+        }
     }
 
     /**
@@ -325,7 +465,7 @@ public class ScheduledExecutorTest exten
      */
     public void testGetThreadFactory() throws InterruptedException {
         ThreadFactory tf = new SimpleThreadFactory();
-	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf);
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf);
         assertSame(tf, p.getThreadFactory());
         joinPool(p);
     }
@@ -335,7 +475,7 @@ public class ScheduledExecutorTest exten
      */
     public void testSetThreadFactory() throws InterruptedException {
         ThreadFactory tf = new SimpleThreadFactory();
-	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
         p.setThreadFactory(tf);
         assertSame(tf, p.getThreadFactory());
         joinPool(p);
@@ -345,7 +485,7 @@ public class ScheduledExecutorTest exten
      * setThreadFactory(null) throws NPE
      */
     public void testSetThreadFactoryNull() throws InterruptedException {
-	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
         try {
             p.setThreadFactory(null);
             shouldThrow();
@@ -356,69 +496,95 @@ public class ScheduledExecutorTest exten
     }
 
     /**
-     *   is isShutDown is false before shutdown, true after
+     * isShutdown is false before shutdown, true after
      */
     public void testIsShutdown() {
 
-	ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
         try {
-            assertFalse(p1.isShutdown());
+            assertFalse(p.isShutdown());
         }
         finally {
-            try { p1.shutdown(); } catch (SecurityException ok) { return; }
+            try { p.shutdown(); } catch (SecurityException ok) { return; }
         }
-	assertTrue(p1.isShutdown());
+        assertTrue(p.isShutdown());
     }
 
-
     /**
-     *   isTerminated is false before termination, true after
+     * isTerminated is false before termination, true after
      */
     public void testIsTerminated() throws InterruptedException {
-	ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
+        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        assertFalse(p.isTerminated());
         try {
-            p1.execute(new SmallRunnable());
+            p.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    assertFalse(p.isTerminated());
+                    threadStarted.countDown();
+                    done.await();
+                }});
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertFalse(p.isTerminating());
+            done.countDown();
         } finally {
-            try { p1.shutdown(); } catch (SecurityException ok) { return; }
+            try { p.shutdown(); } catch (SecurityException ok) { return; }
         }
-        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
-        assertTrue(p1.isTerminated());
+        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+        assertTrue(p.isTerminated());
     }
 
     /**
-     *  isTerminating is not true when running or when terminated
+     * isTerminating is not true when running or when terminated
      */
     public void testIsTerminating() throws InterruptedException {
-	ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        assertFalse(p1.isTerminating());
-        try {
-            p1.execute(new SmallRunnable());
-            assertFalse(p1.isTerminating());
-        } finally {
-            try { p1.shutdown(); } catch (SecurityException ok) { return; }
-        }
-
-        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
-        assertTrue(p1.isTerminated());
-        assertFalse(p1.isTerminating());
+        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            assertFalse(p.isTerminating());
+            p.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    assertFalse(p.isTerminating());
+                    threadStarted.countDown();
+                    done.await();
+                }});
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertFalse(p.isTerminating());
+            done.countDown();
+        } finally {
+            try { p.shutdown(); } catch (SecurityException ok) { return; }
+        }
+        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+        assertTrue(p.isTerminated());
+        assertFalse(p.isTerminating());
     }
 
     /**
      * getQueue returns the work queue, which contains queued tasks
      */
     public void testGetQueue() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        ScheduledFuture[] tasks = new ScheduledFuture[5];
-        for (int i = 0; i < 5; i++) {
-            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
-        }
-        try {
-            Thread.sleep(SHORT_DELAY_MS);
-            BlockingQueue<Runnable> q = p1.getQueue();
-            assertTrue(q.contains(tasks[4]));
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            ScheduledFuture[] tasks = new ScheduledFuture[5];
+            for (int i = 0; i < tasks.length; i++) {
+                Runnable r = new CheckedRunnable() {
+                    public void realRun() throws InterruptedException {
+                        threadStarted.countDown();
+                        done.await();
+                    }};
+                tasks[i] = p.schedule(r, 1, MILLISECONDS);
+            }
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            BlockingQueue<Runnable> q = p.getQueue();
+            assertTrue(q.contains(tasks[tasks.length - 1]));
             assertFalse(q.contains(tasks[0]));
         } finally {
-            joinPool(p1);
+            done.countDown();
+            joinPool(p);
         }
     }
 
@@ -426,164 +592,231 @@ public class ScheduledExecutorTest exten
      * remove(task) removes queued task, and fails to remove active task
      */
     public void testRemove() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
+        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
         ScheduledFuture[] tasks = new ScheduledFuture[5];
-        for (int i = 0; i < 5; i++) {
-            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
-        }
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
         try {
-            Thread.sleep(SHORT_DELAY_MS);
-            BlockingQueue<Runnable> q = p1.getQueue();
-            assertFalse(p1.remove((Runnable)tasks[0]));
+            for (int i = 0; i < tasks.length; i++) {
+                Runnable r = new CheckedRunnable() {
+                    public void realRun() throws InterruptedException {
+                        threadStarted.countDown();
+                        done.await();
+                    }};
+                tasks[i] = p.schedule(r, 1, MILLISECONDS);
+            }
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            BlockingQueue<Runnable> q = p.getQueue();
+            assertFalse(p.remove((Runnable)tasks[0]));
             assertTrue(q.contains((Runnable)tasks[4]));
             assertTrue(q.contains((Runnable)tasks[3]));
-            assertTrue(p1.remove((Runnable)tasks[4]));
-            assertFalse(p1.remove((Runnable)tasks[4]));
+            assertTrue(p.remove((Runnable)tasks[4]));
+            assertFalse(p.remove((Runnable)tasks[4]));
             assertFalse(q.contains((Runnable)tasks[4]));
             assertTrue(q.contains((Runnable)tasks[3]));
-            assertTrue(p1.remove((Runnable)tasks[3]));
+            assertTrue(p.remove((Runnable)tasks[3]));
             assertFalse(q.contains((Runnable)tasks[3]));
         } finally {
-            joinPool(p1);
+            done.countDown();
+            joinPool(p);
         }
     }
 
     /**
-     *  purge removes cancelled tasks from the queue
+     * purge eventually removes cancelled tasks from the queue
      */
     public void testPurge() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
         ScheduledFuture[] tasks = new ScheduledFuture[5];
-        for (int i = 0; i < 5; i++) {
-            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
-        }
+        for (int i = 0; i < tasks.length; i++)
+            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
+                                  LONG_DELAY_MS, MILLISECONDS);
         try {
-            int max = 5;
+            int max = tasks.length;
             if (tasks[4].cancel(true)) --max;
             if (tasks[3].cancel(true)) --max;
             // There must eventually be an interference-free point at
             // which purge will not fail. (At worst, when queue is empty.)
-            int k;
-            for (k = 0; k < SMALL_DELAY_MS; ++k) {
-                p1.purge();
-                long count = p1.getTaskCount();
-                if (count >= 0 && count <= max)
-                    break;
-                Thread.sleep(1);
-            }
-            assertTrue(k < SMALL_DELAY_MS);
+            long startTime = System.nanoTime();
+            do {
+                p.purge();
+                long count = p.getTaskCount();
+                if (count == max)
+                    return;
+            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
+            fail("Purge failed to remove cancelled tasks");
         } finally {
-            joinPool(p1);
+            for (ScheduledFuture task : tasks)
+                task.cancel(true);
+            joinPool(p);
         }
     }
 
     /**
-     *  shutDownNow returns a list containing tasks that were not run
+     * shutdownNow returns a list containing tasks that were not run,
+     * and those tasks are drained from the queue
      */
-    public void testShutDownNow() throws InterruptedException {
-	ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        for (int i = 0; i < 5; i++)
-            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
-        List l;
+    public void testShutdownNow() throws InterruptedException {
+        final int poolSize = 2;
+        final int count = 5;
+        final AtomicInteger ran = new AtomicInteger(0);
+        final ScheduledThreadPoolExecutor p =
+            new ScheduledThreadPoolExecutor(poolSize);
+        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
+        Runnable waiter = new CheckedRunnable() { public void realRun() {
+            threadsStarted.countDown();
+            try {
+                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
+            } catch (InterruptedException success) {}
+            ran.getAndIncrement();
+        }};
+        for (int i = 0; i < count; i++)
+            p.execute(waiter);
+        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
+        assertEquals(poolSize, p.getActiveCount());
+        assertEquals(0, p.getCompletedTaskCount());
+        final List<Runnable> queuedTasks;
         try {
-            l = p1.shutdownNow();
+            queuedTasks = p.shutdownNow();
         } catch (SecurityException ok) {
-            return;
+            return; // Allowed in case test doesn't have privs
         }
-	assertTrue(p1.isShutdown());
-	assertTrue(l.size() > 0 && l.size() <= 5);
-        joinPool(p1);
+        assertTrue(p.isShutdown());
+        assertTrue(p.getQueue().isEmpty());
+        assertEquals(count - poolSize, queuedTasks.size());
+        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+        assertTrue(p.isTerminated());
+        assertEquals(poolSize, ran.get());
+        assertEquals(poolSize, p.getCompletedTaskCount());
     }
 
     /**
-     * In default setting, shutdown cancels periodic but not delayed
-     * tasks at shutdown
-     */
-    public void testShutDown1() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
-        assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
-
-        ScheduledFuture[] tasks = new ScheduledFuture[5];
-        for (int i = 0; i < 5; i++)
-            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
-        try { p1.shutdown(); } catch (SecurityException ok) { return; }
-        BlockingQueue q = p1.getQueue();
-        for (Iterator it = q.iterator(); it.hasNext();) {
-            ScheduledFuture t = (ScheduledFuture)it.next();
-            assertFalse(t.isCancelled());
+     * shutdownNow returns a list containing tasks that were not run,
+     * and those tasks are drained from the queue
+     */
+    public void testShutdownNow_delayedTasks() throws InterruptedException {
+        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        List<ScheduledFuture> tasks = new ArrayList<>();
+        for (int i = 0; i < 3; i++) {
+            Runnable r = new NoOpRunnable();
+            tasks.add(p.schedule(r, 9, SECONDS));
+            tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
+            tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
+        }
+        if (testImplementationDetails)
+            assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
+        final List<Runnable> queuedTasks;
+        try {
+            queuedTasks = p.shutdownNow();
+        } catch (SecurityException ok) {
+            return; // Allowed in case test doesn't have privs
         }
-        assertTrue(p1.isShutdown());
-        Thread.sleep(SMALL_DELAY_MS);
-        for (int i = 0; i < 5; ++i) {
-            assertTrue(tasks[i].isDone());
-            assertFalse(tasks[i].isCancelled());
+        assertTrue(p.isShutdown());
+        assertTrue(p.getQueue().isEmpty());
+        if (testImplementationDetails)
+            assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
+        assertEquals(tasks.size(), queuedTasks.size());
+        for (ScheduledFuture task : tasks) {
+            assertFalse(task.isDone());
+            assertFalse(task.isCancelled());
         }
+        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+        assertTrue(p.isTerminated());
     }
 
-
     /**
-     * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
-     * delayed tasks are cancelled at shutdown
-     */
-    public void testShutDown2() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
-        ScheduledFuture[] tasks = new ScheduledFuture[5];
-        for (int i = 0; i < 5; i++)
-            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
-        try { p1.shutdown(); } catch (SecurityException ok) { return; }
-        assertTrue(p1.isShutdown());
-        BlockingQueue q = p1.getQueue();
-        assertTrue(q.isEmpty());
-        Thread.sleep(SMALL_DELAY_MS);
-        assertTrue(p1.isTerminated());
-    }
-
-
-    /**
-     * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
-     * periodic tasks are not cancelled at shutdown
-     */
-    public void testShutDown3() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
-        ScheduledFuture task =
-            p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, MILLISECONDS);
-        try { p1.shutdown(); } catch (SecurityException ok) { return; }
-        assertTrue(p1.isShutdown());
-        BlockingQueue q = p1.getQueue();
-        assertTrue(q.isEmpty());
-        Thread.sleep(SHORT_DELAY_MS);
-        assertTrue(p1.isTerminated());
-    }
-
-    /**
-     * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
-     * periodic tasks are cancelled at shutdown
-     */
-    public void testShutDown4() throws InterruptedException {
-        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
-        try {
-            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
-            ScheduledFuture task =
-                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, MILLISECONDS);
-            assertFalse(task.isCancelled());
-            try { p1.shutdown(); } catch (SecurityException ok) { return; }
-            assertFalse(task.isCancelled());
-            assertFalse(p1.isTerminated());
-            assertTrue(p1.isShutdown());
-            Thread.sleep(SHORT_DELAY_MS);
-            assertFalse(task.isCancelled());
-            assertTrue(task.cancel(true));
-            assertTrue(task.isDone());
-            Thread.sleep(SHORT_DELAY_MS);
-            assertTrue(p1.isTerminated());
+     * By default, periodic tasks are cancelled at shutdown.
+     * By default, delayed tasks keep running after shutdown.
+     * Check that changing the default values work:
+     * - setExecuteExistingDelayedTasksAfterShutdownPolicy
+     * - setContinueExistingPeriodicTasksAfterShutdownPolicy
+     */
+    public void testShutdown_cancellation() throws Exception {
+        Boolean[] allBooleans = { null, Boolean.FALSE, Boolean.TRUE };
+        for (Boolean policy : allBooleans)
+    {
+        final int poolSize = 2;
+        final ScheduledThreadPoolExecutor p
+            = new ScheduledThreadPoolExecutor(poolSize);
+        final boolean effectiveDelayedPolicy = (policy != Boolean.FALSE);
+        final boolean effectivePeriodicPolicy = (policy == Boolean.TRUE);
+        final boolean effectiveRemovePolicy = (policy == Boolean.TRUE);
+        if (policy != null) {
+            p.setExecuteExistingDelayedTasksAfterShutdownPolicy(policy);
+            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(policy);
+            p.setRemoveOnCancelPolicy(policy);
+        }
+        assertEquals(effectiveDelayedPolicy,
+                     p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
+        assertEquals(effectivePeriodicPolicy,
+                     p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
+        assertEquals(effectiveRemovePolicy,
+                     p.getRemoveOnCancelPolicy());
+        // Strategy: Wedge the pool with poolSize "blocker" threads
+        final AtomicInteger ran = new AtomicInteger(0);
+        final CountDownLatch poolBlocked = new CountDownLatch(poolSize);
+        final CountDownLatch unblock = new CountDownLatch(1);
+        final CountDownLatch periodicLatch1 = new CountDownLatch(2);
+        final CountDownLatch periodicLatch2 = new CountDownLatch(2);
+        Runnable task = new CheckedRunnable() { public void realRun()
+                                                    throws InterruptedException {
+            poolBlocked.countDown();
+            assertTrue(unblock.await(LONG_DELAY_MS, MILLISECONDS));
+            ran.getAndIncrement();
+        }};
+        List<Future<?>> blockers = new ArrayList<>();
+        List<Future<?>> periodics = new ArrayList<>();
+        List<Future<?>> delayeds = new ArrayList<>();
+        for (int i = 0; i < poolSize; i++)
+            blockers.add(p.submit(task));
+        assertTrue(poolBlocked.await(LONG_DELAY_MS, MILLISECONDS));
+
+        periodics.add(p.scheduleAtFixedRate(countDowner(periodicLatch1),
+                                            1, 1, MILLISECONDS));
+        periodics.add(p.scheduleWithFixedDelay(countDowner(periodicLatch2),
+                                               1, 1, MILLISECONDS));
+        delayeds.add(p.schedule(task, 1, MILLISECONDS));
+
+        assertTrue(p.getQueue().containsAll(periodics));
+        assertTrue(p.getQueue().containsAll(delayeds));
+        try { p.shutdown(); } catch (SecurityException ok) { return; }
+        assertTrue(p.isShutdown());
+        assertFalse(p.isTerminated());
+        for (Future<?> periodic : periodics) {
+            assertTrue(effectivePeriodicPolicy ^ periodic.isCancelled());
+            assertTrue(effectivePeriodicPolicy ^ periodic.isDone());
+        }
+        for (Future<?> delayed : delayeds) {
+            assertTrue(effectiveDelayedPolicy ^ delayed.isCancelled());
+            assertTrue(effectiveDelayedPolicy ^ delayed.isDone());
+        }
+        if (testImplementationDetails) {
+            assertEquals(effectivePeriodicPolicy,
+                         p.getQueue().containsAll(periodics));
+            assertEquals(effectiveDelayedPolicy,
+                         p.getQueue().containsAll(delayeds));
+        }
+        // Release all pool threads
+        unblock.countDown();
+
+        for (Future<?> delayed : delayeds) {
+            if (effectiveDelayedPolicy) {
+                assertNull(delayed.get());
+            }
         }
-        finally {
-            joinPool(p1);
+        if (effectivePeriodicPolicy) {
+            assertTrue(periodicLatch1.await(LONG_DELAY_MS, MILLISECONDS));
+            assertTrue(periodicLatch2.await(LONG_DELAY_MS, MILLISECONDS));
+            for (Future<?> periodic : periodics) {
+                assertTrue(periodic.cancel(false));
+                assertTrue(periodic.isCancelled());
+                assertTrue(periodic.isDone());
+            }
         }
-    }
+        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+        assertTrue(p.isTerminated());
+        assertEquals(2 + (effectiveDelayedPolicy ? 1 : 0), ran.get());
+    }}
 
     /**
      * completed submit of callable returns result
@@ -659,18 +892,12 @@ public class ScheduledExecutorTest exten
      * invokeAny(c) throws NPE if c has null elements
      */
     public void testInvokeAny3() throws Exception {
-        final CountDownLatch latch = new CountDownLatch(1);
+        CountDownLatch latch = new CountDownLatch(1);
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
+        List<Callable<String>> l = new ArrayList<Callable<String>>();
+        l.add(latchAwaitingStringTask(latch));
+        l.add(null);
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new Callable<String>() {
-                      public String call() {
-                          try {
-                              latch.await();
-                          } catch (InterruptedException ok) {}
-                          return TEST_STRING;
-                      }});
-            l.add(null);
             e.invokeAny(l);
             shouldThrow();
         } catch (NullPointerException success) {
@@ -685,9 +912,9 @@ public class ScheduledExecutorTest exten
      */
     public void testInvokeAny4() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
+        List<Callable<String>> l = new ArrayList<Callable<String>>();
+        l.add(new NPETask());
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new NPETask());
             e.invokeAny(l);
             shouldThrow();
         } catch (ExecutionException success) {
@@ -703,7 +930,7 @@ public class ScheduledExecutorTest exten
     public void testInvokeAny5() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
+            List<Callable<String>> l = new ArrayList<Callable<String>>();
             l.add(new StringTask());
             l.add(new StringTask());
             String result = e.invokeAny(l);
@@ -745,10 +972,10 @@ public class ScheduledExecutorTest exten
      */
     public void testInvokeAll3() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
+        List<Callable<String>> l = new ArrayList<Callable<String>>();
+        l.add(new StringTask());
+        l.add(null);
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new StringTask());
-            l.add(null);
             e.invokeAll(l);
             shouldThrow();
         } catch (NullPointerException success) {
@@ -762,13 +989,12 @@ public class ScheduledExecutorTest exten
      */
     public void testInvokeAll4() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
+        List<Callable<String>> l = new ArrayList<Callable<String>>();
+        l.add(new NPETask());
+        List<Future<String>> futures = e.invokeAll(l);
+        assertEquals(1, futures.size());
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new NPETask());
-            List<Future<String>> result = e.invokeAll(l);
-            assertEquals(1, result.size());
-            for (Future<String> future : result)
-                future.get();
+            futures.get(0).get();
             shouldThrow();
         } catch (ExecutionException success) {
             assertTrue(success.getCause() instanceof NullPointerException);
@@ -783,12 +1009,12 @@ public class ScheduledExecutorTest exten
     public void testInvokeAll5() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
+            List<Callable<String>> l = new ArrayList<Callable<String>>();
             l.add(new StringTask());
             l.add(new StringTask());
-            List<Future<String>> result = e.invokeAll(l);
-            assertEquals(2, result.size());
-            for (Future<String> future : result)
+            List<Future<String>> futures = e.invokeAll(l);
+            assertEquals(2, futures.size());
+            for (Future<String> future : futures)
                 assertSame(TEST_STRING, future.get());
         } finally {
             joinPool(e);
@@ -814,9 +1040,9 @@ public class ScheduledExecutorTest exten
      */
     public void testTimedInvokeAnyNullTimeUnit() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
+        List<Callable<String>> l = new ArrayList<Callable<String>>();
+        l.add(new StringTask());
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new StringTask());
             e.invokeAny(l, MEDIUM_DELAY_MS, null);
             shouldThrow();
         } catch (NullPointerException success) {
@@ -843,18 +1069,12 @@ public class ScheduledExecutorTest exten
      * timed invokeAny(c) throws NPE if c has null elements
      */
     public void testTimedInvokeAny3() throws Exception {
-        final CountDownLatch latch = new CountDownLatch(1);
+        CountDownLatch latch = new CountDownLatch(1);
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
+        List<Callable<String>> l = new ArrayList<Callable<String>>();
+        l.add(latchAwaitingStringTask(latch));
+        l.add(null);
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new Callable<String>() {
-                      public String call() {
-                          try {
-                              latch.await();
-                          } catch (InterruptedException ok) {}
-                          return TEST_STRING;
-                      }});
-            l.add(null);
             e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
             shouldThrow();
         } catch (NullPointerException success) {
@@ -869,9 +1089,9 @@ public class ScheduledExecutorTest exten
      */
     public void testTimedInvokeAny4() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
+        List<Callable<String>> l = new ArrayList<Callable<String>>();
+        l.add(new NPETask());
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new NPETask());
             e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
             shouldThrow();
         } catch (ExecutionException success) {
@@ -887,7 +1107,7 @@ public class ScheduledExecutorTest exten
     public void testTimedInvokeAny5() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
+            List<Callable<String>> l = new ArrayList<Callable<String>>();
             l.add(new StringTask());
             l.add(new StringTask());
             String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
@@ -916,9 +1136,9 @@ public class ScheduledExecutorTest exten
      */
     public void testTimedInvokeAllNullTimeUnit() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
+        List<Callable<String>> l = new ArrayList<Callable<String>>();
+        l.add(new StringTask());
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new StringTask());
             e.invokeAll(l, MEDIUM_DELAY_MS, null);
             shouldThrow();
         } catch (NullPointerException success) {
@@ -945,10 +1165,10 @@ public class ScheduledExecutorTest exten
      */
     public void testTimedInvokeAll3() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
+        List<Callable<String>> l = new ArrayList<Callable<String>>();
+        l.add(new StringTask());
+        l.add(null);
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new StringTask());
-            l.add(null);
             e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
             shouldThrow();
         } catch (NullPointerException success) {
@@ -962,13 +1182,13 @@ public class ScheduledExecutorTest exten
      */
     public void testTimedInvokeAll4() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
+        List<Callable<String>> l = new ArrayList<Callable<String>>();
+        l.add(new NPETask());
+        List<Future<String>> futures =
+            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
+        assertEquals(1, futures.size());
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new NPETask());
-            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
-            assertEquals(1, result.size());
-            for (Future<String> future : result)
-                future.get();
+            futures.get(0).get();
             shouldThrow();
         } catch (ExecutionException success) {
             assertTrue(success.getCause() instanceof NullPointerException);
@@ -983,12 +1203,13 @@ public class ScheduledExecutorTest exten
     public void testTimedInvokeAll5() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
+            List<Callable<String>> l = new ArrayList<Callable<String>>();
             l.add(new StringTask());
             l.add(new StringTask());
-            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
-            assertEquals(2, result.size());
-            for (Future<String> future : result)
+            List<Future<String>> futures =
+                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
+            assertEquals(2, futures.size());
+            for (Future<String> future : futures)
                 assertSame(TEST_STRING, future.get());
         } finally {
             joinPool(e);
@@ -1001,25 +1222,32 @@ public class ScheduledExecutorTest exten
     public void testTimedInvokeAll6() throws Exception {
         ExecutorService e = new ScheduledThreadPoolExecutor(2);
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
-            l.add(new StringTask());
-            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
-            l.add(new StringTask());
-            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
-            assertEquals(3, result.size());
-            Iterator<Future<String>> it = result.iterator();
-            Future<String> f1 = it.next();
-            Future<String> f2 = it.next();
-            Future<String> f3 = it.next();
-            assertTrue(f1.isDone());
-            assertTrue(f2.isDone());
-            assertTrue(f3.isDone());
-            assertFalse(f1.isCancelled());
-            assertTrue(f2.isCancelled());
+            for (long timeout = timeoutMillis();;) {
+                List<Callable<String>> tasks = new ArrayList<>();
+                tasks.add(new StringTask("0"));
+                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
+                tasks.add(new StringTask("2"));
+                long startTime = System.nanoTime();
+                List<Future<String>> futures =
+                    e.invokeAll(tasks, timeout, MILLISECONDS);
+                assertEquals(tasks.size(), futures.size());
+                assertTrue(millisElapsedSince(startTime) >= timeout);
+                for (Future future : futures)
+                    assertTrue(future.isDone());
+                assertTrue(futures.get(1).isCancelled());
+                try {
+                    assertEquals("0", futures.get(0).get());
+                    assertEquals("2", futures.get(2).get());
+                    break;
+                } catch (CancellationException retryWithLongerTimeout) {
+                    timeout *= 2;
+                    if (timeout >= LONG_DELAY_MS / 2)
+                        fail("expected exactly one task to be cancelled");
+                }
+            }
         } finally {
             joinPool(e);
         }
     }
 
-
 }