--- jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2009/11/21 20:17:40	1.15
+++ jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2011/05/07 19:34:51	1.27
@@ -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.
  */
@@ -60,15 +60,13 @@ public class ThreadPoolExecutorSubclassT
             finally { lock.unlock() ; }
         }
         public void run() {
-            boolean runme;
             lock.lock();
             try {
-                runme = !done;
-                if (!runme)
-                    thread = Thread.currentThread();
+                if (done)
+                    return;
+                thread = Thread.currentThread();
             }
             finally { lock.unlock() ; }
-            if (!runme) return;
             V v = null;
             Exception e = null;
             try {
@@ -192,89 +190,129 @@ public class ThreadPoolExecutorSubclassT
 
 
     /**
-     *  execute successfully executes a runnable
+     * execute successfully executes a runnable
      */
     public void testExecute() throws InterruptedException {
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        final ThreadPoolExecutor p =
+            new CustomTPE(1, 1,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10));
+        final CountDownLatch done = new CountDownLatch(1);
+        final Runnable task = new CheckedRunnable() {
+            public void realRun() {
+                done.countDown();
+            }};
         try {
-            p1.execute(new ShortRunnable());
-            Thread.sleep(SMALL_DELAY_MS);
+            p.execute(task);
+            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
         } finally {
-            joinPool(p1);
+            joinPool(p);
         }
     }
 
     /**
-     *  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 {
-        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertEquals(0, p2.getActiveCount());
-        p2.execute(new MediumRunnable());
-        Thread.sleep(SHORT_DELAY_MS);
-        assertEquals(1, p2.getActiveCount());
-        joinPool(p2);
+        final ThreadPoolExecutor p =
+            new CustomTPE(2, 2,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10));
+        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);
+        }
     }
 
     /**
-     *  prestartCoreThread starts a thread if under corePoolSize, else doesn't
+     * prestartCoreThread starts a thread if under corePoolSize, else doesn't
      */
     public void testPrestartCoreThread() {
-        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertEquals(0, p2.getPoolSize());
-        assertTrue(p2.prestartCoreThread());
-        assertEquals(1, p2.getPoolSize());
-        assertTrue(p2.prestartCoreThread());
-        assertEquals(2, p2.getPoolSize());
-        assertFalse(p2.prestartCoreThread());
-        assertEquals(2, p2.getPoolSize());
-        joinPool(p2);
+        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(0, p.getPoolSize());
+        assertTrue(p.prestartCoreThread());
+        assertEquals(1, p.getPoolSize());
+        assertTrue(p.prestartCoreThread());
+        assertEquals(2, p.getPoolSize());
+        assertFalse(p.prestartCoreThread());
+        assertEquals(2, p.getPoolSize());
+        joinPool(p);
     }
 
     /**
-     *  prestartAllCoreThreads starts all corePoolSize threads
+     * prestartAllCoreThreads starts all corePoolSize threads
      */
     public void testPrestartAllCoreThreads() {
-        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertEquals(0, p2.getPoolSize());
-        p2.prestartAllCoreThreads();
-        assertEquals(2, p2.getPoolSize());
-        p2.prestartAllCoreThreads();
-        assertEquals(2, p2.getPoolSize());
-        joinPool(p2);
+        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(0, p.getPoolSize());
+        p.prestartAllCoreThreads();
+        assertEquals(2, p.getPoolSize());
+        p.prestartAllCoreThreads();
+        assertEquals(2, p.getPoolSize());
+        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 {
-        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertEquals(0, p2.getCompletedTaskCount());
-        p2.execute(new ShortRunnable());
-        Thread.sleep(SMALL_DELAY_MS);
-        assertEquals(1, p2.getCompletedTaskCount());
-        try { p2.shutdown(); } catch (SecurityException ok) { return; }
-        joinPool(p2);
+        final ThreadPoolExecutor p =
+            new CustomTPE(2, 2,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10));
+        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();
+                }});
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertEquals(0, p.getCompletedTaskCount());
+            threadProceed.countDown();
+            threadDone.await();
+            delay(SHORT_DELAY_MS);
+            assertEquals(1, p.getCompletedTaskCount());
+        } 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() {
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertEquals(1, p1.getCorePoolSize());
-        joinPool(p1);
+        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(1, p.getCorePoolSize());
+        joinPool(p);
     }
 
     /**
-     *   getKeepAliveTime returns value given in constructor if not otherwise set
+     * getKeepAliveTime returns value given in constructor if not otherwise set
      */
     public void testGetKeepAliveTime() {
-        ThreadPoolExecutor p2 = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertEquals(1, p2.getKeepAliveTime(TimeUnit.SECONDS));
-        joinPool(p2);
+        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(1, p.getKeepAliveTime(TimeUnit.SECONDS));
+        joinPool(p);
     }
 
 
@@ -353,120 +391,201 @@ public class ThreadPoolExecutorSubclassT
 
 
     /**
-     *   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 {
-        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertEquals(0, p2.getLargestPoolSize());
-        p2.execute(new MediumRunnable());
-        p2.execute(new MediumRunnable());
-        Thread.sleep(SHORT_DELAY_MS);
-        assertEquals(2, p2.getLargestPoolSize());
-        joinPool(p2);
+        final int THREADS = 3;
+        final ThreadPoolExecutor p =
+            new CustomTPE(THREADS, THREADS,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10));
+        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());
+        }
     }
 
     /**
-     *   getMaximumPoolSize returns value given in constructor if not
-     *   otherwise set
+     * getMaximumPoolSize returns value given in constructor if not
+     * otherwise set
      */
     public void testGetMaximumPoolSize() {
-        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertEquals(2, p2.getMaximumPoolSize());
-        joinPool(p2);
+        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(2, p.getMaximumPoolSize());
+        joinPool(p);
     }
 
     /**
-     *   getPoolSize increases, but doesn't overestimate, when threads
-     *   become active
+     * getPoolSize increases, but doesn't overestimate, when threads
+     * become active
      */
-    public void testGetPoolSize() {
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertEquals(0, p1.getPoolSize());
-        p1.execute(new MediumRunnable());
-        assertEquals(1, p1.getPoolSize());
-        joinPool(p1);
+    public void testGetPoolSize() throws InterruptedException {
+        final ThreadPoolExecutor p =
+            new CustomTPE(1, 1,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10));
+        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 {
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertEquals(0, p1.getTaskCount());
-        p1.execute(new MediumRunnable());
-        Thread.sleep(SHORT_DELAY_MS);
-        assertEquals(1, p1.getTaskCount());
-        joinPool(p1);
+        final ThreadPoolExecutor p =
+            new CustomTPE(1, 1,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10));
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            assertEquals(0, p.getTaskCount());
+            p.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    threadStarted.countDown();
+                    assertEquals(1, p.getTaskCount());
+                    done.await();
+                }});
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertEquals(1, p.getTaskCount());
+        } finally {
+            done.countDown();
+            joinPool(p);
+        }
     }
 
     /**
-     *   isShutDown is false before shutdown, true after
+     * isShutDown is false before shutdown, true after
      */
     public void testIsShutdown() {
 
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertFalse(p1.isShutdown());
-        try { p1.shutdown(); } catch (SecurityException ok) { return; }
-        assertTrue(p1.isShutdown());
-        joinPool(p1);
+        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertFalse(p.isShutdown());
+        try { p.shutdown(); } catch (SecurityException ok) { return; }
+        assertTrue(p.isShutdown());
+        joinPool(p);
     }
 
 
     /**
-     *  isTerminated is false before termination, true after
+     * isTerminated is false before termination, true after
      */
     public void testIsTerminated() throws InterruptedException {
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertFalse(p1.isTerminated());
-        try {
-            p1.execute(new MediumRunnable());
-        } finally {
-            try { p1.shutdown(); } catch (SecurityException ok) { return; }
-        }
-        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
-        assertTrue(p1.isTerminated());
+        final ThreadPoolExecutor p =
+            new CustomTPE(1, 1,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10));
+        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());
     }
 
     /**
-     *  isTerminating is not true when running or when terminated
+     * isTerminating is not true when running or when terminated
      */
     public void testIsTerminating() throws InterruptedException {
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        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 CustomTPE(1, 1,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10));
+        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 {
-        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
-        FutureTask[] tasks = new FutureTask[5];
-        for (int i = 0; i < 5; i++) {
-            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
-            p1.execute(tasks[i]);
-        }
-        try {
-            Thread.sleep(SHORT_DELAY_MS);
-            BlockingQueue<Runnable> wq = p1.getQueue();
-            assertSame(q, wq);
-            assertFalse(wq.contains(tasks[0]));
-            assertTrue(wq.contains(tasks[4]));
-            for (int i = 1; i < 5; ++i)
-                tasks[i].cancel(true);
-            p1.shutdownNow();
+        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
+        final ThreadPoolExecutor p =
+            new CustomTPE(1, 1,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          q);
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            FutureTask[] tasks = new FutureTask[5];
+            for (int i = 0; i < tasks.length; i++) {
+                Callable task = new CheckedCallable<Boolean>() {
+                    public Boolean realCall() throws InterruptedException {
+                        threadStarted.countDown();
+                        assertSame(q, p.getQueue());
+                        done.await();
+                        return Boolean.TRUE;
+                    }};
+                tasks[i] = new FutureTask(task);
+                p.execute(tasks[i]);
+            }
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertSame(q, p.getQueue());
+            assertFalse(q.contains(tasks[0]));
+            assertTrue(q.contains(tasks[tasks.length - 1]));
+            assertEquals(tasks.length - 1, q.size());
         } finally {
-            joinPool(p1);
+            done.countDown();
+            joinPool(p);
         }
     }
 
@@ -475,63 +594,96 @@ public class ThreadPoolExecutorSubclassT
      */
     public void testRemove() throws InterruptedException {
         BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
-        FutureTask[] tasks = new FutureTask[5];
-        for (int i = 0; i < 5; i++) {
-            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
-            p1.execute(tasks[i]);
-        }
-        try {
-            Thread.sleep(SHORT_DELAY_MS);
-            assertFalse(p1.remove(tasks[0]));
+        final ThreadPoolExecutor p =
+            new CustomTPE(1, 1,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          q);
+        Runnable[] tasks = new Runnable[6];
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            for (int i = 0; i < tasks.length; i++) {
+                tasks[i] = new CheckedRunnable() {
+                        public void realRun() throws InterruptedException {
+                            threadStarted.countDown();
+                            done.await();
+                        }};
+                p.execute(tasks[i]);
+            }
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertFalse(p.remove(tasks[0]));
             assertTrue(q.contains(tasks[4]));
             assertTrue(q.contains(tasks[3]));
-            assertTrue(p1.remove(tasks[4]));
-            assertFalse(p1.remove(tasks[4]));
+            assertTrue(p.remove(tasks[4]));
+            assertFalse(p.remove(tasks[4]));
             assertFalse(q.contains(tasks[4]));
             assertTrue(q.contains(tasks[3]));
-            assertTrue(p1.remove(tasks[3]));
+            assertTrue(p.remove(tasks[3]));
             assertFalse(q.contains(tasks[3]));
         } finally {
-            joinPool(p1);
+            done.countDown();
+            joinPool(p);
         }
     }
 
     /**
-     *   purge removes cancelled tasks from the queue
+     * purge removes cancelled tasks from the queue
      */
-    public void testPurge() {
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+    public void testPurge() throws InterruptedException {
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        final CountDownLatch done = new CountDownLatch(1);
+        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
+        final ThreadPoolExecutor p =
+            new CustomTPE(1, 1,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          q);
         FutureTask[] tasks = new FutureTask[5];
-        for (int i = 0; i < 5; i++) {
-            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
-            p1.execute(tasks[i]);
+        try {
+            for (int i = 0; i < tasks.length; i++) {
+                Callable task = new CheckedCallable<Boolean>() {
+                    public Boolean realCall() throws InterruptedException {
+                        threadStarted.countDown();
+                        done.await();
+                        return Boolean.TRUE;
+                    }};
+                tasks[i] = new FutureTask(task);
+                p.execute(tasks[i]);
+            }
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            assertEquals(tasks.length, p.getTaskCount());
+            assertEquals(tasks.length - 1, q.size());
+            assertEquals(1L, p.getActiveCount());
+            assertEquals(0L, p.getCompletedTaskCount());
+            tasks[4].cancel(true);
+            tasks[3].cancel(false);
+            p.purge();
+            assertEquals(tasks.length - 3, q.size());
+            assertEquals(tasks.length - 2, p.getTaskCount());
+            p.purge();         // Nothing to do
+            assertEquals(tasks.length - 3, q.size());
+            assertEquals(tasks.length - 2, p.getTaskCount());
+        } finally {
+            done.countDown();
+            joinPool(p);
         }
-        tasks[4].cancel(true);
-        tasks[3].cancel(true);
-        p1.purge();
-        long count = p1.getTaskCount();
-        assertTrue(count >= 2 && count < 5);
-        joinPool(p1);
     }
 
     /**
-     *  shutDownNow returns a list containing tasks that were not run
+     * shutDownNow returns a list containing tasks that were not run
      */
-    public void testShutDownNow() {
-        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+    public void testShutdownNow() {
+        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         List l;
         try {
             for (int i = 0; i < 5; i++)
-                p1.execute(new MediumPossiblyInterruptedRunnable());
+                p.execute(new MediumPossiblyInterruptedRunnable());
         }
         finally {
             try {
-                l = p1.shutdownNow();
+                l = p.shutdownNow();
             } catch (SecurityException ok) { return; }
-
         }
-        assertTrue(p1.isShutdown());
+        assertTrue(p.isShutdown());
         assertTrue(l.size() <= 4);
     }
 
@@ -795,7 +947,7 @@ public class ThreadPoolExecutorSubclassT
     }
 
     /**
-     * Constructor throws if workQueue is set to null
+     * Constructor throws if workQueue is null
      */
     public void testConstructorNullPointerException6() {
         try {
@@ -805,7 +957,7 @@ public class ThreadPoolExecutorSubclassT
     }
 
     /**
-     * Constructor throws if handler is set to null
+     * Constructor throws if handler is null
      */
     public void testConstructorNullPointerException7() {
         try {
@@ -816,53 +968,68 @@ public class ThreadPoolExecutorSubclassT
     }
 
     /**
-     * Constructor throws if ThreadFactory is set top null
+     * Constructor throws if ThreadFactory is null
      */
     public void testConstructorNullPointerException8() {
         try {
-            ThreadFactory f = null;
-            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new NoOpREHandler());
+            new CustomTPE(1, 2,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10),
+                          (ThreadFactory) null,
+                          new NoOpREHandler());
             shouldThrow();
         } catch (NullPointerException success) {}
     }
 
 
     /**
-     *  execute throws RejectedExecutionException
-     *  if saturated.
+     * execute throws RejectedExecutionException if saturated.
      */
     public void testSaturatedExecute() {
-        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
-        try {
-
-            for (int i = 0; i < 5; ++i) {
-                p.execute(new MediumRunnable());
+        ThreadPoolExecutor p =
+            new CustomTPE(1, 1,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(1));
+        final CountDownLatch done = new CountDownLatch(1);
+        try {
+            Runnable task = new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    done.await();
+                }};
+            for (int i = 0; i < 2; ++i)
+                p.execute(task);
+            for (int i = 0; i < 2; ++i) {
+                try {
+                    p.execute(task);
+                    shouldThrow();
+                } catch (RejectedExecutionException success) {}
+                assertTrue(p.getTaskCount() <= 2);
             }
-            shouldThrow();
-        } catch (RejectedExecutionException success) {}
-        joinPool(p);
+        } finally {
+            done.countDown();
+            joinPool(p);
+        }
     }
 
     /**
-     *  executor using CallerRunsPolicy runs task if saturated.
+     * executor using CallerRunsPolicy runs task if saturated.
      */
     public void testSaturatedExecute2() {
         RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
-        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
+        ThreadPoolExecutor p = new CustomTPE(1, 1,
+                                             LONG_DELAY_MS, MILLISECONDS,
+                                             new ArrayBlockingQueue<Runnable>(1),
+                                             h);
         try {
-
             TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
-            for (int i = 0; i < 5; ++i) {
+            for (int i = 0; i < tasks.length; ++i)
                 tasks[i] = new TrackedNoOpRunnable();
-            }
             TrackedLongRunnable mr = new TrackedLongRunnable();
             p.execute(mr);
-            for (int i = 0; i < 5; ++i) {
+            for (int i = 0; i < tasks.length; ++i)
                 p.execute(tasks[i]);
-            }
-            for (int i = 1; i < 5; ++i) {
+            for (int i = 1; i < tasks.length; ++i)
                 assertTrue(tasks[i].done);
-            }
             try { p.shutdownNow(); } catch (SecurityException ok) { return; }
         } finally {
             joinPool(p);
@@ -870,24 +1037,24 @@ public class ThreadPoolExecutorSubclassT
     }
 
     /**
-     *  executor using DiscardPolicy drops task if saturated.
+     * executor using DiscardPolicy drops task if saturated.
      */
     public void testSaturatedExecute3() {
         RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
-        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
+        ThreadPoolExecutor p =
+            new CustomTPE(1, 1,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(1),
+                          h);
         try {
-
             TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
-            for (int i = 0; i < 5; ++i) {
+            for (int i = 0; i < tasks.length; ++i)
                 tasks[i] = new TrackedNoOpRunnable();
-            }
             p.execute(new TrackedLongRunnable());
-            for (int i = 0; i < 5; ++i) {
-                p.execute(tasks[i]);
-            }
-            for (int i = 0; i < 5; ++i) {
-                assertFalse(tasks[i].done);
-            }
+            for (TrackedNoOpRunnable task : tasks)
+                p.execute(task);
+            for (TrackedNoOpRunnable task : tasks)
+                assertFalse(task.done);
             try { p.shutdownNow(); } catch (SecurityException ok) { return; }
         } finally {
             joinPool(p);
@@ -895,7 +1062,7 @@ public class ThreadPoolExecutorSubclassT
     }
 
     /**
-     *  executor using DiscardOldestPolicy drops oldest task if saturated.
+     * executor using DiscardOldestPolicy drops oldest task if saturated.
      */
     public void testSaturatedExecute4() {
         RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
@@ -916,22 +1083,22 @@ public class ThreadPoolExecutorSubclassT
     }
 
     /**
-     *  execute throws RejectedExecutionException if shutdown
+     * execute throws RejectedExecutionException if shutdown
      */
     public void testRejectedExecutionExceptionOnShutdown() {
-        ThreadPoolExecutor tpe =
+        ThreadPoolExecutor p =
             new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
-        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
+        try { p.shutdown(); } catch (SecurityException ok) { return; }
         try {
-            tpe.execute(new NoOpRunnable());
+            p.execute(new NoOpRunnable());
             shouldThrow();
         } catch (RejectedExecutionException success) {}
 
-        joinPool(tpe);
+        joinPool(p);
     }
 
     /**
-     *  execute using CallerRunsPolicy drops task on shutdown
+     * execute using CallerRunsPolicy drops task on shutdown
      */
     public void testCallerRunsOnShutdown() {
         RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
@@ -948,7 +1115,7 @@ public class ThreadPoolExecutorSubclassT
     }
 
     /**
-     *  execute using DiscardPolicy drops task on shutdown
+     * execute using DiscardPolicy drops task on shutdown
      */
     public void testDiscardOnShutdown() {
         RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
@@ -966,7 +1133,7 @@ public class ThreadPoolExecutorSubclassT
 
 
     /**
-     *  execute using DiscardOldestPolicy drops task on shutdown
+     * execute using DiscardOldestPolicy drops task on shutdown
      */
     public void testDiscardOldestOnShutdown() {
         RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
@@ -984,113 +1151,113 @@ public class ThreadPoolExecutorSubclassT
 
 
     /**
-     *  execute (null) throws NPE
+     * execute(null) throws NPE
      */
     public void testExecuteNull() {
-        ThreadPoolExecutor tpe = null;
+        ThreadPoolExecutor p = null;
         try {
-            tpe = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
-            tpe.execute(null);
+            p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
+            p.execute(null);
             shouldThrow();
         } catch (NullPointerException success) {}
 
-        joinPool(tpe);
+        joinPool(p);
     }
 
     /**
-     *  setCorePoolSize of negative value throws IllegalArgumentException
+     * setCorePoolSize of negative value throws IllegalArgumentException
      */
     public void testCorePoolSizeIllegalArgumentException() {
-        ThreadPoolExecutor tpe =
+        ThreadPoolExecutor p =
             new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
         try {
-            tpe.setCorePoolSize(-1);
+            p.setCorePoolSize(-1);
             shouldThrow();
         } catch (IllegalArgumentException success) {
         } finally {
-            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
+            try { p.shutdown(); } catch (SecurityException ok) { return; }
         }
-        joinPool(tpe);
+        joinPool(p);
     }
 
     /**
-     *  setMaximumPoolSize(int) throws IllegalArgumentException if
-     *  given a value less the core pool size
+     * setMaximumPoolSize(int) throws IllegalArgumentException
+     * if given a value less the core pool size
      */
     public void testMaximumPoolSizeIllegalArgumentException() {
-        ThreadPoolExecutor tpe =
+        ThreadPoolExecutor p =
             new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
         try {
-            tpe.setMaximumPoolSize(1);
+            p.setMaximumPoolSize(1);
             shouldThrow();
         } catch (IllegalArgumentException success) {
         } finally {
-            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
+            try { p.shutdown(); } catch (SecurityException ok) { return; }
         }
-        joinPool(tpe);
+        joinPool(p);
     }
 
     /**
-     *  setMaximumPoolSize throws IllegalArgumentException
-     *  if given a negative value
+     * setMaximumPoolSize throws IllegalArgumentException
+     * if given a negative value
      */
     public void testMaximumPoolSizeIllegalArgumentException2() {
-        ThreadPoolExecutor tpe =
+        ThreadPoolExecutor p =
             new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
         try {
-            tpe.setMaximumPoolSize(-1);
+            p.setMaximumPoolSize(-1);
             shouldThrow();
         } catch (IllegalArgumentException success) {
         } finally {
-            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
+            try { p.shutdown(); } catch (SecurityException ok) { return; }
         }
-        joinPool(tpe);
+        joinPool(p);
     }
 
 
     /**
-     *  setKeepAliveTime  throws IllegalArgumentException
-     *  when given a negative value
+     * setKeepAliveTime throws IllegalArgumentException
+     * when given a negative value
      */
     public void testKeepAliveTimeIllegalArgumentException() {
-        ThreadPoolExecutor tpe =
+        ThreadPoolExecutor p =
             new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
 
         try {
-            tpe.setKeepAliveTime(-1,MILLISECONDS);
+            p.setKeepAliveTime(-1,MILLISECONDS);
             shouldThrow();
         } catch (IllegalArgumentException success) {
         } finally {
-            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
+            try { p.shutdown(); } catch (SecurityException ok) { return; }
         }
-        joinPool(tpe);
+        joinPool(p);
     }
 
     /**
      * terminated() is called on termination
      */
     public void testTerminated() {
-        CustomTPE tpe = new CustomTPE();
-        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
-        assertTrue(tpe.terminatedCalled);
-        joinPool(tpe);
+        CustomTPE p = new CustomTPE();
+        try { p.shutdown(); } catch (SecurityException ok) { return; }
+        assertTrue(p.terminatedCalled);
+        joinPool(p);
     }
 
     /**
      * beforeExecute and afterExecute are called when executing task
      */
     public void testBeforeAfter() throws InterruptedException {
-        CustomTPE tpe = new CustomTPE();
+        CustomTPE p = new CustomTPE();
         try {
             TrackedNoOpRunnable r = new TrackedNoOpRunnable();
-            tpe.execute(r);
-            Thread.sleep(SHORT_DELAY_MS);
+            p.execute(r);
+            delay(SHORT_DELAY_MS);
             assertTrue(r.done);
-            assertTrue(tpe.beforeCalled);
-            assertTrue(tpe.afterCalled);
-            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
+            assertTrue(p.beforeCalled);
+            assertTrue(p.afterCalled);
+            try { p.shutdown(); } catch (SecurityException ok) { return; }
         } finally {
-            joinPool(tpe);
+            joinPool(p);
         }
     }
 
@@ -1169,18 +1336,12 @@ public class ThreadPoolExecutorSubclassT
      * 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 CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        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) {
@@ -1195,9 +1356,9 @@ public class ThreadPoolExecutorSubclassT
      */
     public void testInvokeAny4() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        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) {
@@ -1213,7 +1374,7 @@ public class ThreadPoolExecutorSubclassT
     public void testInvokeAny5() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         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);
@@ -1255,10 +1416,10 @@ public class ThreadPoolExecutorSubclassT
      */
     public void testInvokeAll3() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        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) {
@@ -1272,13 +1433,12 @@ public class ThreadPoolExecutorSubclassT
      */
     public void testInvokeAll4() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        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);
@@ -1293,12 +1453,12 @@ public class ThreadPoolExecutorSubclassT
     public void testInvokeAll5() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         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);
@@ -1326,9 +1486,9 @@ public class ThreadPoolExecutorSubclassT
      */
     public void testTimedInvokeAnyNullTimeUnit() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        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) {
@@ -1355,18 +1515,12 @@ public class ThreadPoolExecutorSubclassT
      * 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 CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        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) {
@@ -1381,9 +1535,9 @@ public class ThreadPoolExecutorSubclassT
      */
     public void testTimedInvokeAny4() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        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) {
@@ -1399,7 +1553,7 @@ public class ThreadPoolExecutorSubclassT
     public void testTimedInvokeAny5() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         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);
@@ -1428,9 +1582,9 @@ public class ThreadPoolExecutorSubclassT
      */
     public void testTimedInvokeAllNullTimeUnit() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        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) {
@@ -1457,10 +1611,10 @@ public class ThreadPoolExecutorSubclassT
      */
     public void testTimedInvokeAll3() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        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) {
@@ -1474,13 +1628,13 @@ public class ThreadPoolExecutorSubclassT
      */
     public void testTimedInvokeAll4() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        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);
@@ -1495,12 +1649,13 @@ public class ThreadPoolExecutorSubclassT
     public void testTimedInvokeAll5() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         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);
@@ -1513,13 +1668,14 @@ public class ThreadPoolExecutorSubclassT
     public void testTimedInvokeAll6() throws Exception {
         ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         try {
-            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
+            List<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();
+            List<Future<String>> futures =
+                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
+            assertEquals(3, futures.size());
+            Iterator<Future<String>> it = futures.iterator();
             Future<String> f1 = it.next();
             Future<String> f2 = it.next();
             Future<String> f3 = it.next();
@@ -1538,12 +1694,20 @@ public class ThreadPoolExecutorSubclassT
      * thread factory fails to create more
      */
     public void testFailingThreadFactory() throws InterruptedException {
-        ExecutorService e = new CustomTPE(100, 100, LONG_DELAY_MS, MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
-        try {
-            for (int k = 0; k < 100; ++k) {
-                e.execute(new NoOpRunnable());
-            }
-            Thread.sleep(LONG_DELAY_MS);
+        final ExecutorService e =
+            new CustomTPE(100, 100,
+                          LONG_DELAY_MS, MILLISECONDS,
+                          new LinkedBlockingQueue<Runnable>(),
+                          new FailingThreadFactory());
+        try {
+            final int TASKS = 100;
+            final CountDownLatch done = new CountDownLatch(TASKS);
+            for (int k = 0; k < TASKS; ++k)
+                e.execute(new CheckedRunnable() {
+                    public void realRun() {
+                        done.countDown();
+                    }});
+            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
         } finally {
             joinPool(e);
         }
@@ -1553,38 +1717,59 @@ public class ThreadPoolExecutorSubclassT
      * allowsCoreThreadTimeOut is by default false.
      */
     public void testAllowsCoreThreadTimeOut() {
-        ThreadPoolExecutor tpe = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        assertFalse(tpe.allowsCoreThreadTimeOut());
-        joinPool(tpe);
+        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertFalse(p.allowsCoreThreadTimeOut());
+        joinPool(p);
     }
 
     /**
      * allowCoreThreadTimeOut(true) causes idle threads to time out
      */
-    public void testAllowCoreThreadTimeOut_true() throws InterruptedException {
-        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        tpe.allowCoreThreadTimeOut(true);
-        tpe.execute(new NoOpRunnable());
-        try {
-            Thread.sleep(MEDIUM_DELAY_MS);
-            assertEquals(0, tpe.getPoolSize());
+    public void testAllowCoreThreadTimeOut_true() throws Exception {
+        final ThreadPoolExecutor p =
+            new CustomTPE(2, 10,
+                          SHORT_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10));
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        try {
+            p.allowCoreThreadTimeOut(true);
+            p.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    threadStarted.countDown();
+                    assertEquals(1, p.getPoolSize());
+                }});
+            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
+            for (int i = 0; i < (MEDIUM_DELAY_MS/10); i++) {
+                if (p.getPoolSize() == 0)
+                    break;
+                delay(10);
+            }
+            assertEquals(0, p.getPoolSize());
         } finally {
-            joinPool(tpe);
+            joinPool(p);
         }
     }
 
     /**
      * allowCoreThreadTimeOut(false) causes idle threads not to time out
      */
-    public void testAllowCoreThreadTimeOut_false() throws InterruptedException {
-        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        tpe.allowCoreThreadTimeOut(false);
-        tpe.execute(new NoOpRunnable());
-        try {
-            Thread.sleep(MEDIUM_DELAY_MS);
-            assertTrue(tpe.getPoolSize() >= 1);
+    public void testAllowCoreThreadTimeOut_false() throws Exception {
+        final ThreadPoolExecutor p =
+            new CustomTPE(2, 10,
+                          SHORT_DELAY_MS, MILLISECONDS,
+                          new ArrayBlockingQueue<Runnable>(10));
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        try {
+            p.allowCoreThreadTimeOut(false);
+            p.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    threadStarted.countDown();
+                    assertTrue(p.getPoolSize() >= 1);
+                }});
+            delay(SMALL_DELAY_MS);
+            assertTrue(p.getPoolSize() >= 1);
         } finally {
-            joinPool(tpe);
+            joinPool(p);
         }
     }