ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java (file contents):
Revision 1.14 by jsr166, Sat Nov 21 20:13:20 2009 UTC vs.
Revision 1.77 by jsr166, Sun Oct 4 03:51:35 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.util.concurrent.locks.*;
10 > import static java.util.concurrent.TimeUnit.SECONDS;
11  
12 < import junit.framework.*;
13 < import java.util.*;
12 > import java.util.ArrayList;
13 > import java.util.List;
14 > import java.util.concurrent.ArrayBlockingQueue;
15 > import java.util.concurrent.BlockingQueue;
16 > import java.util.concurrent.Callable;
17 > import java.util.concurrent.CancellationException;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.ExecutionException;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.Future;
23 > import java.util.concurrent.FutureTask;
24 > import java.util.concurrent.LinkedBlockingQueue;
25 > import java.util.concurrent.RejectedExecutionException;
26 > import java.util.concurrent.RejectedExecutionHandler;
27 > import java.util.concurrent.RunnableFuture;
28 > import java.util.concurrent.SynchronousQueue;
29 > import java.util.concurrent.ThreadFactory;
30 > import java.util.concurrent.ThreadPoolExecutor;
31 > import java.util.concurrent.TimeoutException;
32 > import java.util.concurrent.TimeUnit;
33 > import java.util.concurrent.atomic.AtomicInteger;
34 > import java.util.concurrent.locks.Condition;
35 > import java.util.concurrent.locks.ReentrantLock;
36 >
37 > import junit.framework.Test;
38 > import junit.framework.TestSuite;
39  
40   public class ThreadPoolExecutorSubclassTest extends JSR166TestCase {
41      public static void main(String[] args) {
42 <        junit.textui.TestRunner.run(suite());
42 >        main(suite(), args);
43      }
44      public static Test suite() {
45          return new TestSuite(ThreadPoolExecutorSubclassTest.class);
# Line 37 | Line 61 | public class ThreadPoolExecutorSubclassT
61          CustomTask(final Runnable r, final V res) {
62              if (r == null) throw new NullPointerException();
63              callable = new Callable<V>() {
64 <            public V call() throws Exception { r.run(); return res; }};
64 >                public V call() throws Exception { r.run(); return res; }};
65          }
66          public boolean isDone() {
67              lock.lock(); try { return done; } finally { lock.unlock() ; }
# Line 60 | Line 84 | public class ThreadPoolExecutorSubclassT
84              finally { lock.unlock() ; }
85          }
86          public void run() {
63            boolean runme;
87              lock.lock();
88              try {
89 <                runme = !done;
90 <                if (!runme)
91 <                    thread = Thread.currentThread();
89 >                if (done)
90 >                    return;
91 >                thread = Thread.currentThread();
92              }
93              finally { lock.unlock() ; }
71            if (!runme) return;
94              V v = null;
95              Exception e = null;
96              try {
# Line 79 | Line 101 | public class ThreadPoolExecutorSubclassT
101              }
102              lock.lock();
103              try {
104 <                result = v;
105 <                exception = e;
106 <                done = true;
107 <                thread = null;
108 <                cond.signalAll();
104 >                if (!done) {
105 >                    result = v;
106 >                    exception = e;
107 >                    done = true;
108 >                    thread = null;
109 >                    cond.signalAll();
110 >                }
111              }
112              finally { lock.unlock(); }
113          }
# Line 92 | Line 116 | public class ThreadPoolExecutorSubclassT
116              try {
117                  while (!done)
118                      cond.await();
119 +                if (cancelled)
120 +                    throw new CancellationException();
121                  if (exception != null)
122                      throw new ExecutionException(exception);
123                  return result;
# Line 103 | Line 129 | public class ThreadPoolExecutorSubclassT
129              long nanos = unit.toNanos(timeout);
130              lock.lock();
131              try {
132 <                for (;;) {
133 <                    if (done) break;
108 <                    if (nanos < 0)
132 >                while (!done) {
133 >                    if (nanos <= 0L)
134                          throw new TimeoutException();
135                      nanos = cond.awaitNanos(nanos);
136                  }
137 +                if (cancelled)
138 +                    throw new CancellationException();
139                  if (exception != null)
140                      throw new ExecutionException(exception);
141                  return result;
# Line 117 | Line 144 | public class ThreadPoolExecutorSubclassT
144          }
145      }
146  
120
147      static class CustomTPE extends ThreadPoolExecutor {
148          protected <V> RunnableFuture<V> newTaskFor(Callable<V> c) {
149              return new CustomTask<V>(c);
# Line 164 | Line 190 | public class ThreadPoolExecutorSubclassT
190                workQueue, threadFactory, handler);
191          }
192  
193 <        volatile boolean beforeCalled = false;
194 <        volatile boolean afterCalled = false;
195 <        volatile boolean terminatedCalled = false;
193 >        final CountDownLatch beforeCalled = new CountDownLatch(1);
194 >        final CountDownLatch afterCalled = new CountDownLatch(1);
195 >        final CountDownLatch terminatedCalled = new CountDownLatch(1);
196 >
197          public CustomTPE() {
198              super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
199          }
200          protected void beforeExecute(Thread t, Runnable r) {
201 <            beforeCalled = true;
201 >            beforeCalled.countDown();
202          }
203          protected void afterExecute(Runnable r, Throwable t) {
204 <            afterCalled = true;
204 >            afterCalled.countDown();
205          }
206          protected void terminated() {
207 <            terminatedCalled = true;
207 >            terminatedCalled.countDown();
208          }
209  
210 +        public boolean beforeCalled() {
211 +            return beforeCalled.getCount() == 0;
212 +        }
213 +        public boolean afterCalled() {
214 +            return afterCalled.getCount() == 0;
215 +        }
216 +        public boolean terminatedCalled() {
217 +            return terminatedCalled.getCount() == 0;
218 +        }
219      }
220  
221      static class FailingThreadFactory implements ThreadFactory {
# Line 190 | Line 226 | public class ThreadPoolExecutorSubclassT
226          }
227      }
228  
193
229      /**
230 <     *  execute successfully executes a runnable
230 >     * execute successfully executes a runnable
231       */
232      public void testExecute() throws InterruptedException {
233 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
234 <        try {
235 <            p1.execute(new ShortRunnable());
236 <            Thread.sleep(SMALL_DELAY_MS);
237 <        } finally {
238 <            joinPool(p1);
233 >        final ThreadPoolExecutor p =
234 >            new CustomTPE(1, 1,
235 >                          2 * LONG_DELAY_MS, MILLISECONDS,
236 >                          new ArrayBlockingQueue<Runnable>(10));
237 >        try (PoolCleaner cleaner = cleaner(p)) {
238 >            final CountDownLatch done = new CountDownLatch(1);
239 >            final Runnable task = new CheckedRunnable() {
240 >                public void realRun() { done.countDown(); }};
241 >            p.execute(task);
242 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243          }
244      }
245  
246      /**
247 <     *  getActiveCount increases but doesn't overestimate, when a
248 <     *  thread becomes active
247 >     * getActiveCount increases but doesn't overestimate, when a
248 >     * thread becomes active
249       */
250      public void testGetActiveCount() throws InterruptedException {
251 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
252 <        assertEquals(0, p2.getActiveCount());
253 <        p2.execute(new MediumRunnable());
254 <        Thread.sleep(SHORT_DELAY_MS);
255 <        assertEquals(1, p2.getActiveCount());
256 <        joinPool(p2);
251 >        final ThreadPoolExecutor p =
252 >            new CustomTPE(2, 2,
253 >                          LONG_DELAY_MS, MILLISECONDS,
254 >                          new ArrayBlockingQueue<Runnable>(10));
255 >        try (PoolCleaner cleaner = cleaner(p)) {
256 >            final CountDownLatch threadStarted = new CountDownLatch(1);
257 >            final CountDownLatch done = new CountDownLatch(1);
258 >            assertEquals(0, p.getActiveCount());
259 >            p.execute(new CheckedRunnable() {
260 >                public void realRun() throws InterruptedException {
261 >                    threadStarted.countDown();
262 >                    assertEquals(1, p.getActiveCount());
263 >                    done.await();
264 >                }});
265 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
266 >            assertEquals(1, p.getActiveCount());
267 >            done.countDown();
268 >        }
269      }
270  
271      /**
272 <     *  prestartCoreThread starts a thread if under corePoolSize, else doesn't
272 >     * prestartCoreThread starts a thread if under corePoolSize, else doesn't
273       */
274      public void testPrestartCoreThread() {
275 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
276 <        assertEquals(0, p2.getPoolSize());
277 <        assertTrue(p2.prestartCoreThread());
278 <        assertEquals(1, p2.getPoolSize());
279 <        assertTrue(p2.prestartCoreThread());
280 <        assertEquals(2, p2.getPoolSize());
281 <        assertFalse(p2.prestartCoreThread());
282 <        assertEquals(2, p2.getPoolSize());
283 <        joinPool(p2);
275 >        ThreadPoolExecutor p =
276 >            new CustomTPE(2, 6,
277 >                          LONG_DELAY_MS, MILLISECONDS,
278 >                          new ArrayBlockingQueue<Runnable>(10));
279 >        try (PoolCleaner cleaner = cleaner(p)) {
280 >            assertEquals(0, p.getPoolSize());
281 >            assertTrue(p.prestartCoreThread());
282 >            assertEquals(1, p.getPoolSize());
283 >            assertTrue(p.prestartCoreThread());
284 >            assertEquals(2, p.getPoolSize());
285 >            assertFalse(p.prestartCoreThread());
286 >            assertEquals(2, p.getPoolSize());
287 >            p.setCorePoolSize(4);
288 >            assertTrue(p.prestartCoreThread());
289 >            assertEquals(3, p.getPoolSize());
290 >            assertTrue(p.prestartCoreThread());
291 >            assertEquals(4, p.getPoolSize());
292 >            assertFalse(p.prestartCoreThread());
293 >            assertEquals(4, p.getPoolSize());
294 >        }
295      }
296  
297      /**
298 <     *  prestartAllCoreThreads starts all corePoolSize threads
298 >     * prestartAllCoreThreads starts all corePoolSize threads
299       */
300      public void testPrestartAllCoreThreads() {
301 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
302 <        assertEquals(0, p2.getPoolSize());
303 <        p2.prestartAllCoreThreads();
304 <        assertEquals(2, p2.getPoolSize());
305 <        p2.prestartAllCoreThreads();
306 <        assertEquals(2, p2.getPoolSize());
307 <        joinPool(p2);
301 >        ThreadPoolExecutor p =
302 >            new CustomTPE(2, 6,
303 >                          LONG_DELAY_MS, MILLISECONDS,
304 >                          new ArrayBlockingQueue<Runnable>(10));
305 >        try (PoolCleaner cleaner = cleaner(p)) {
306 >            assertEquals(0, p.getPoolSize());
307 >            p.prestartAllCoreThreads();
308 >            assertEquals(2, p.getPoolSize());
309 >            p.prestartAllCoreThreads();
310 >            assertEquals(2, p.getPoolSize());
311 >            p.setCorePoolSize(4);
312 >            p.prestartAllCoreThreads();
313 >            assertEquals(4, p.getPoolSize());
314 >            p.prestartAllCoreThreads();
315 >            assertEquals(4, p.getPoolSize());
316 >        }
317      }
318  
319      /**
320 <     *   getCompletedTaskCount increases, but doesn't overestimate,
321 <     *   when tasks complete
320 >     * getCompletedTaskCount increases, but doesn't overestimate,
321 >     * when tasks complete
322       */
323      public void testGetCompletedTaskCount() throws InterruptedException {
324 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
325 <        assertEquals(0, p2.getCompletedTaskCount());
326 <        p2.execute(new ShortRunnable());
327 <        Thread.sleep(SMALL_DELAY_MS);
328 <        assertEquals(1, p2.getCompletedTaskCount());
329 <        try { p2.shutdown(); } catch (SecurityException ok) { return; }
330 <        joinPool(p2);
324 >        final ThreadPoolExecutor p =
325 >            new CustomTPE(2, 2,
326 >                          LONG_DELAY_MS, MILLISECONDS,
327 >                          new ArrayBlockingQueue<Runnable>(10));
328 >        try (PoolCleaner cleaner = cleaner(p)) {
329 >            final CountDownLatch threadStarted = new CountDownLatch(1);
330 >            final CountDownLatch threadProceed = new CountDownLatch(1);
331 >            final CountDownLatch threadDone = new CountDownLatch(1);
332 >            assertEquals(0, p.getCompletedTaskCount());
333 >            p.execute(new CheckedRunnable() {
334 >                public void realRun() throws InterruptedException {
335 >                    threadStarted.countDown();
336 >                    assertEquals(0, p.getCompletedTaskCount());
337 >                    threadProceed.await();
338 >                    threadDone.countDown();
339 >                }});
340 >            await(threadStarted);
341 >            assertEquals(0, p.getCompletedTaskCount());
342 >            threadProceed.countDown();
343 >            threadDone.await();
344 >            long startTime = System.nanoTime();
345 >            while (p.getCompletedTaskCount() != 1) {
346 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
347 >                    fail("timed out");
348 >                Thread.yield();
349 >            }
350 >        }
351      }
352  
353      /**
354 <     *   getCorePoolSize returns size given in constructor if not otherwise set
354 >     * getCorePoolSize returns size given in constructor if not otherwise set
355       */
356      public void testGetCorePoolSize() {
357 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
358 <        assertEquals(1, p1.getCorePoolSize());
359 <        joinPool(p1);
357 >        final ThreadPoolExecutor p =
358 >            new CustomTPE(1, 1,
359 >                          LONG_DELAY_MS, MILLISECONDS,
360 >                          new ArrayBlockingQueue<Runnable>(10));
361 >        try (PoolCleaner cleaner = cleaner(p)) {
362 >            assertEquals(1, p.getCorePoolSize());
363 >        }
364      }
365  
366      /**
367 <     *   getKeepAliveTime returns value given in constructor if not otherwise set
367 >     * getKeepAliveTime returns value given in constructor if not otherwise set
368       */
369      public void testGetKeepAliveTime() {
370 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
371 <        assertEquals(1, p2.getKeepAliveTime(TimeUnit.SECONDS));
372 <        joinPool(p2);
370 >        final ThreadPoolExecutor p =
371 >            new CustomTPE(2, 2,
372 >                          1000, MILLISECONDS,
373 >                          new ArrayBlockingQueue<Runnable>(10));
374 >        try (PoolCleaner cleaner = cleaner(p)) {
375 >            assertEquals(1, p.getKeepAliveTime(SECONDS));
376 >        }
377      }
378  
280
379      /**
380       * getThreadFactory returns factory in constructor if not set
381       */
382      public void testGetThreadFactory() {
383 <        ThreadFactory tf = new SimpleThreadFactory();
384 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), tf, new NoOpREHandler());
385 <        assertSame(tf, p.getThreadFactory());
386 <        joinPool(p);
383 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
384 >        final ThreadPoolExecutor p =
385 >            new CustomTPE(1, 2,
386 >                          LONG_DELAY_MS, MILLISECONDS,
387 >                          new ArrayBlockingQueue<Runnable>(10),
388 >                          threadFactory,
389 >                          new NoOpREHandler());
390 >        try (PoolCleaner cleaner = cleaner(p)) {
391 >            assertSame(threadFactory, p.getThreadFactory());
392 >        }
393      }
394  
395      /**
396       * setThreadFactory sets the thread factory returned by getThreadFactory
397       */
398      public void testSetThreadFactory() {
399 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
400 <        ThreadFactory tf = new SimpleThreadFactory();
401 <        p.setThreadFactory(tf);
402 <        assertSame(tf, p.getThreadFactory());
403 <        joinPool(p);
399 >        final ThreadPoolExecutor p =
400 >            new CustomTPE(1, 2,
401 >                          LONG_DELAY_MS, MILLISECONDS,
402 >                          new ArrayBlockingQueue<Runnable>(10));
403 >        try (PoolCleaner cleaner = cleaner(p)) {
404 >            ThreadFactory threadFactory = new SimpleThreadFactory();
405 >            p.setThreadFactory(threadFactory);
406 >            assertSame(threadFactory, p.getThreadFactory());
407 >        }
408      }
409  
302
410      /**
411       * setThreadFactory(null) throws NPE
412       */
413      public void testSetThreadFactoryNull() {
414 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
415 <        try {
416 <            p.setThreadFactory(null);
417 <            shouldThrow();
418 <        } catch (NullPointerException success) {
419 <        } finally {
420 <            joinPool(p);
414 >        final ThreadPoolExecutor p =
415 >            new CustomTPE(1, 2,
416 >                          LONG_DELAY_MS, MILLISECONDS,
417 >                          new ArrayBlockingQueue<Runnable>(10));
418 >        try (PoolCleaner cleaner = cleaner(p)) {
419 >            try {
420 >                p.setThreadFactory(null);
421 >                shouldThrow();
422 >            } catch (NullPointerException success) {}
423          }
424      }
425  
# Line 318 | Line 427 | public class ThreadPoolExecutorSubclassT
427       * getRejectedExecutionHandler returns handler in constructor if not set
428       */
429      public void testGetRejectedExecutionHandler() {
430 <        RejectedExecutionHandler h = new NoOpREHandler();
431 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), h);
432 <        assertSame(h, p.getRejectedExecutionHandler());
433 <        joinPool(p);
430 >        final RejectedExecutionHandler handler = new NoOpREHandler();
431 >        final ThreadPoolExecutor p =
432 >            new CustomTPE(1, 2,
433 >                          LONG_DELAY_MS, MILLISECONDS,
434 >                          new ArrayBlockingQueue<Runnable>(10),
435 >                          handler);
436 >        try (PoolCleaner cleaner = cleaner(p)) {
437 >            assertSame(handler, p.getRejectedExecutionHandler());
438 >        }
439      }
440  
441      /**
# Line 329 | Line 443 | public class ThreadPoolExecutorSubclassT
443       * getRejectedExecutionHandler
444       */
445      public void testSetRejectedExecutionHandler() {
446 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
447 <        RejectedExecutionHandler h = new NoOpREHandler();
448 <        p.setRejectedExecutionHandler(h);
449 <        assertSame(h, p.getRejectedExecutionHandler());
450 <        joinPool(p);
446 >        final ThreadPoolExecutor p =
447 >            new CustomTPE(1, 2,
448 >                          LONG_DELAY_MS, MILLISECONDS,
449 >                          new ArrayBlockingQueue<Runnable>(10));
450 >        try (PoolCleaner cleaner = cleaner(p)) {
451 >            RejectedExecutionHandler handler = new NoOpREHandler();
452 >            p.setRejectedExecutionHandler(handler);
453 >            assertSame(handler, p.getRejectedExecutionHandler());
454 >        }
455      }
456  
339
457      /**
458       * setRejectedExecutionHandler(null) throws NPE
459       */
460      public void testSetRejectedExecutionHandlerNull() {
461 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
462 <        try {
463 <            p.setRejectedExecutionHandler(null);
464 <            shouldThrow();
465 <        } catch (NullPointerException success) {
466 <        } finally {
467 <            joinPool(p);
461 >        final ThreadPoolExecutor p =
462 >            new CustomTPE(1, 2,
463 >                          LONG_DELAY_MS, MILLISECONDS,
464 >                          new ArrayBlockingQueue<Runnable>(10));
465 >        try (PoolCleaner cleaner = cleaner(p)) {
466 >            try {
467 >                p.setRejectedExecutionHandler(null);
468 >                shouldThrow();
469 >            } catch (NullPointerException success) {}
470          }
471      }
472  
354
473      /**
474 <     *   getLargestPoolSize increases, but doesn't overestimate, when
475 <     *   multiple threads active
474 >     * getLargestPoolSize increases, but doesn't overestimate, when
475 >     * multiple threads active
476       */
477      public void testGetLargestPoolSize() throws InterruptedException {
478 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
479 <        assertEquals(0, p2.getLargestPoolSize());
480 <        p2.execute(new MediumRunnable());
481 <        p2.execute(new MediumRunnable());
482 <        Thread.sleep(SHORT_DELAY_MS);
483 <        assertEquals(2, p2.getLargestPoolSize());
484 <        joinPool(p2);
478 >        final int THREADS = 3;
479 >        final ThreadPoolExecutor p =
480 >            new CustomTPE(THREADS, THREADS,
481 >                          LONG_DELAY_MS, MILLISECONDS,
482 >                          new ArrayBlockingQueue<Runnable>(10));
483 >        try (PoolCleaner cleaner = cleaner(p)) {
484 >            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
485 >            final CountDownLatch done = new CountDownLatch(1);
486 >            assertEquals(0, p.getLargestPoolSize());
487 >            for (int i = 0; i < THREADS; i++)
488 >                p.execute(new CheckedRunnable() {
489 >                    public void realRun() throws InterruptedException {
490 >                        threadsStarted.countDown();
491 >                        done.await();
492 >                        assertEquals(THREADS, p.getLargestPoolSize());
493 >                    }});
494 >            assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
495 >            assertEquals(THREADS, p.getLargestPoolSize());
496 >            done.countDown();   // release pool
497 >        }
498 >        assertEquals(THREADS, p.getLargestPoolSize());
499      }
500  
501      /**
502 <     *   getMaximumPoolSize returns value given in constructor if not
503 <     *   otherwise set
502 >     * getMaximumPoolSize returns value given in constructor if not
503 >     * otherwise set
504       */
505      public void testGetMaximumPoolSize() {
506 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
507 <        assertEquals(2, p2.getMaximumPoolSize());
508 <        joinPool(p2);
506 >        final ThreadPoolExecutor p =
507 >            new CustomTPE(2, 3,
508 >                          LONG_DELAY_MS, MILLISECONDS,
509 >                          new ArrayBlockingQueue<Runnable>(10));
510 >        try (PoolCleaner cleaner = cleaner(p)) {
511 >            assertEquals(3, p.getMaximumPoolSize());
512 >            p.setMaximumPoolSize(5);
513 >            assertEquals(5, p.getMaximumPoolSize());
514 >            p.setMaximumPoolSize(4);
515 >            assertEquals(4, p.getMaximumPoolSize());
516 >        }
517      }
518  
519      /**
520 <     *   getPoolSize increases, but doesn't overestimate, when threads
521 <     *   become active
522 <     */
523 <    public void testGetPoolSize() {
524 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
525 <        assertEquals(0, p1.getPoolSize());
526 <        p1.execute(new MediumRunnable());
527 <        assertEquals(1, p1.getPoolSize());
528 <        joinPool(p1);
520 >     * getPoolSize increases, but doesn't overestimate, when threads
521 >     * become active
522 >     */
523 >    public void testGetPoolSize() throws InterruptedException {
524 >        final ThreadPoolExecutor p =
525 >            new CustomTPE(1, 1,
526 >                          LONG_DELAY_MS, MILLISECONDS,
527 >                          new ArrayBlockingQueue<Runnable>(10));
528 >        try (PoolCleaner cleaner = cleaner(p)) {
529 >            final CountDownLatch threadStarted = new CountDownLatch(1);
530 >            final CountDownLatch done = new CountDownLatch(1);
531 >            assertEquals(0, p.getPoolSize());
532 >            p.execute(new CheckedRunnable() {
533 >                public void realRun() throws InterruptedException {
534 >                    threadStarted.countDown();
535 >                    assertEquals(1, p.getPoolSize());
536 >                    done.await();
537 >                }});
538 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
539 >            assertEquals(1, p.getPoolSize());
540 >            done.countDown();   // release pool
541 >        }
542      }
543  
544      /**
545 <     *  getTaskCount increases, but doesn't overestimate, when tasks submitted
545 >     * getTaskCount increases, but doesn't overestimate, when tasks submitted
546       */
547      public void testGetTaskCount() throws InterruptedException {
548 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
549 <        assertEquals(0, p1.getTaskCount());
550 <        p1.execute(new MediumRunnable());
551 <        Thread.sleep(SHORT_DELAY_MS);
552 <        assertEquals(1, p1.getTaskCount());
553 <        joinPool(p1);
548 >        final ThreadPoolExecutor p =
549 >            new CustomTPE(1, 1,
550 >                          LONG_DELAY_MS, MILLISECONDS,
551 >                          new ArrayBlockingQueue<Runnable>(10));
552 >        try (PoolCleaner cleaner = cleaner(p)) {
553 >            final CountDownLatch threadStarted = new CountDownLatch(1);
554 >            final CountDownLatch done = new CountDownLatch(1);
555 >            assertEquals(0, p.getTaskCount());
556 >            p.execute(new CheckedRunnable() {
557 >                public void realRun() throws InterruptedException {
558 >                    threadStarted.countDown();
559 >                    assertEquals(1, p.getTaskCount());
560 >                    done.await();
561 >                }});
562 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
563 >            assertEquals(1, p.getTaskCount());
564 >            done.countDown();
565 >        }
566      }
567  
568      /**
569 <     *   isShutDown is false before shutdown, true after
569 >     * isShutdown is false before shutdown, true after
570       */
571      public void testIsShutdown() {
572 <
573 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
574 <        assertFalse(p1.isShutdown());
575 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
576 <        assertTrue(p1.isShutdown());
577 <        joinPool(p1);
572 >        final ThreadPoolExecutor p =
573 >            new CustomTPE(1, 1,
574 >                          LONG_DELAY_MS, MILLISECONDS,
575 >                          new ArrayBlockingQueue<Runnable>(10));
576 >        try (PoolCleaner cleaner = cleaner(p)) {
577 >            assertFalse(p.isShutdown());
578 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
579 >            assertTrue(p.isShutdown());
580 >        }
581      }
582  
415
583      /**
584 <     *  isTerminated is false before termination, true after
584 >     * isTerminated is false before termination, true after
585       */
586      public void testIsTerminated() throws InterruptedException {
587 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
588 <        assertFalse(p1.isTerminated());
589 <        try {
590 <            p1.execute(new MediumRunnable());
591 <        } finally {
592 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
587 >        final ThreadPoolExecutor p =
588 >            new CustomTPE(1, 1,
589 >                          LONG_DELAY_MS, MILLISECONDS,
590 >                          new ArrayBlockingQueue<Runnable>(10));
591 >        try (PoolCleaner cleaner = cleaner(p)) {
592 >            final CountDownLatch threadStarted = new CountDownLatch(1);
593 >            final CountDownLatch done = new CountDownLatch(1);
594 >            assertFalse(p.isTerminating());
595 >            p.execute(new CheckedRunnable() {
596 >                public void realRun() throws InterruptedException {
597 >                    assertFalse(p.isTerminating());
598 >                    threadStarted.countDown();
599 >                    done.await();
600 >                }});
601 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
602 >            assertFalse(p.isTerminating());
603 >            done.countDown();
604 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
605 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
606 >            assertTrue(p.isTerminated());
607 >            assertFalse(p.isTerminating());
608          }
427        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
428        assertTrue(p1.isTerminated());
609      }
610  
611      /**
612 <     *  isTerminating is not true when running or when terminated
612 >     * isTerminating is not true when running or when terminated
613       */
614      public void testIsTerminating() throws InterruptedException {
615 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
616 <        assertFalse(p1.isTerminating());
617 <        try {
618 <            p1.execute(new SmallRunnable());
619 <            assertFalse(p1.isTerminating());
620 <        } finally {
621 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
615 >        final ThreadPoolExecutor p =
616 >            new CustomTPE(1, 1,
617 >                          LONG_DELAY_MS, MILLISECONDS,
618 >                          new ArrayBlockingQueue<Runnable>(10));
619 >        try (PoolCleaner cleaner = cleaner(p)) {
620 >            final CountDownLatch threadStarted = new CountDownLatch(1);
621 >            final CountDownLatch done = new CountDownLatch(1);
622 >            assertFalse(p.isTerminating());
623 >            p.execute(new CheckedRunnable() {
624 >                public void realRun() throws InterruptedException {
625 >                    assertFalse(p.isTerminating());
626 >                    threadStarted.countDown();
627 >                    done.await();
628 >                }});
629 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
630 >            assertFalse(p.isTerminating());
631 >            done.countDown();
632 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
633 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
634 >            assertTrue(p.isTerminated());
635 >            assertFalse(p.isTerminating());
636          }
443        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
444        assertTrue(p1.isTerminated());
445        assertFalse(p1.isTerminating());
637      }
638  
639      /**
640       * getQueue returns the work queue, which contains queued tasks
641       */
642      public void testGetQueue() throws InterruptedException {
643 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
644 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
645 <        FutureTask[] tasks = new FutureTask[5];
646 <        for (int i = 0; i < 5; i++) {
647 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
648 <            p1.execute(tasks[i]);
649 <        }
650 <        try {
651 <            Thread.sleep(SHORT_DELAY_MS);
652 <            BlockingQueue<Runnable> wq = p1.getQueue();
653 <            assertSame(q, wq);
654 <            assertFalse(wq.contains(tasks[0]));
655 <            assertTrue(wq.contains(tasks[4]));
656 <            for (int i = 1; i < 5; ++i)
657 <                tasks[i].cancel(true);
658 <            p1.shutdownNow();
659 <        } finally {
660 <            joinPool(p1);
643 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
644 >        final ThreadPoolExecutor p =
645 >            new CustomTPE(1, 1,
646 >                          LONG_DELAY_MS, MILLISECONDS,
647 >                          q);
648 >        try (PoolCleaner cleaner = cleaner(p)) {
649 >            final CountDownLatch threadStarted = new CountDownLatch(1);
650 >            final CountDownLatch done = new CountDownLatch(1);
651 >            FutureTask[] tasks = new FutureTask[5];
652 >            for (int i = 0; i < tasks.length; i++) {
653 >                Callable task = new CheckedCallable<Boolean>() {
654 >                    public Boolean realCall() throws InterruptedException {
655 >                        threadStarted.countDown();
656 >                        assertSame(q, p.getQueue());
657 >                        done.await();
658 >                        return Boolean.TRUE;
659 >                    }};
660 >                tasks[i] = new FutureTask(task);
661 >                p.execute(tasks[i]);
662 >            }
663 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
664 >            assertSame(q, p.getQueue());
665 >            assertFalse(q.contains(tasks[0]));
666 >            assertTrue(q.contains(tasks[tasks.length - 1]));
667 >            assertEquals(tasks.length - 1, q.size());
668 >            done.countDown();
669          }
670      }
671  
# Line 475 | Line 674 | public class ThreadPoolExecutorSubclassT
674       */
675      public void testRemove() throws InterruptedException {
676          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
677 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
678 <        FutureTask[] tasks = new FutureTask[5];
679 <        for (int i = 0; i < 5; i++) {
680 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
681 <            p1.execute(tasks[i]);
682 <        }
683 <        try {
684 <            Thread.sleep(SHORT_DELAY_MS);
685 <            assertFalse(p1.remove(tasks[0]));
677 >        final ThreadPoolExecutor p =
678 >            new CustomTPE(1, 1,
679 >                          LONG_DELAY_MS, MILLISECONDS,
680 >                          q);
681 >        try (PoolCleaner cleaner = cleaner(p)) {
682 >            Runnable[] tasks = new Runnable[6];
683 >            final CountDownLatch threadStarted = new CountDownLatch(1);
684 >            final CountDownLatch done = new CountDownLatch(1);
685 >            for (int i = 0; i < tasks.length; i++) {
686 >                tasks[i] = new CheckedRunnable() {
687 >                    public void realRun() throws InterruptedException {
688 >                        threadStarted.countDown();
689 >                        done.await();
690 >                    }};
691 >                p.execute(tasks[i]);
692 >            }
693 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
694 >            assertFalse(p.remove(tasks[0]));
695              assertTrue(q.contains(tasks[4]));
696              assertTrue(q.contains(tasks[3]));
697 <            assertTrue(p1.remove(tasks[4]));
698 <            assertFalse(p1.remove(tasks[4]));
697 >            assertTrue(p.remove(tasks[4]));
698 >            assertFalse(p.remove(tasks[4]));
699              assertFalse(q.contains(tasks[4]));
700              assertTrue(q.contains(tasks[3]));
701 <            assertTrue(p1.remove(tasks[3]));
701 >            assertTrue(p.remove(tasks[3]));
702              assertFalse(q.contains(tasks[3]));
703 <        } finally {
496 <            joinPool(p1);
703 >            done.countDown();
704          }
705      }
706  
707      /**
708 <     *   purge removes cancelled tasks from the queue
708 >     * purge removes cancelled tasks from the queue
709       */
710 <    public void testPurge() {
711 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
712 <        FutureTask[] tasks = new FutureTask[5];
713 <        for (int i = 0; i < 5; i++) {
714 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
715 <            p1.execute(tasks[i]);
710 >    public void testPurge() throws InterruptedException {
711 >        final CountDownLatch threadStarted = new CountDownLatch(1);
712 >        final CountDownLatch done = new CountDownLatch(1);
713 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
714 >        final ThreadPoolExecutor p =
715 >            new CustomTPE(1, 1,
716 >                          LONG_DELAY_MS, MILLISECONDS,
717 >                          q);
718 >        try (PoolCleaner cleaner = cleaner(p)) {
719 >            FutureTask[] tasks = new FutureTask[5];
720 >            for (int i = 0; i < tasks.length; i++) {
721 >                Callable task = new CheckedCallable<Boolean>() {
722 >                    public Boolean realCall() throws InterruptedException {
723 >                        threadStarted.countDown();
724 >                        done.await();
725 >                        return Boolean.TRUE;
726 >                    }};
727 >                tasks[i] = new FutureTask(task);
728 >                p.execute(tasks[i]);
729 >            }
730 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
731 >            assertEquals(tasks.length, p.getTaskCount());
732 >            assertEquals(tasks.length - 1, q.size());
733 >            assertEquals(1L, p.getActiveCount());
734 >            assertEquals(0L, p.getCompletedTaskCount());
735 >            tasks[4].cancel(true);
736 >            tasks[3].cancel(false);
737 >            p.purge();
738 >            assertEquals(tasks.length - 3, q.size());
739 >            assertEquals(tasks.length - 2, p.getTaskCount());
740 >            p.purge();         // Nothing to do
741 >            assertEquals(tasks.length - 3, q.size());
742 >            assertEquals(tasks.length - 2, p.getTaskCount());
743 >            done.countDown();
744          }
510        tasks[4].cancel(true);
511        tasks[3].cancel(true);
512        p1.purge();
513        long count = p1.getTaskCount();
514        assertTrue(count >= 2 && count < 5);
515        joinPool(p1);
745      }
746  
747      /**
748 <     *  shutDownNow returns a list containing tasks that were not run
749 <     */
750 <    public void testShutDownNow() {
751 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
752 <        List l;
753 <        try {
754 <            for (int i = 0; i < 5; i++)
755 <                p1.execute(new MediumPossiblyInterruptedRunnable());
756 <        }
757 <        finally {
748 >     * shutdownNow returns a list containing tasks that were not run,
749 >     * and those tasks are drained from the queue
750 >     */
751 >    public void testShutdownNow() throws InterruptedException {
752 >        final int poolSize = 2;
753 >        final int count = 5;
754 >        final AtomicInteger ran = new AtomicInteger(0);
755 >        ThreadPoolExecutor p =
756 >            new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
757 >                          new ArrayBlockingQueue<Runnable>(10));
758 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
759 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
760 >            threadsStarted.countDown();
761              try {
762 <                l = p1.shutdownNow();
763 <            } catch (SecurityException ok) { return; }
764 <
765 <        }
766 <        assertTrue(p1.isShutdown());
767 <        assertTrue(l.size() <= 4);
762 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
763 >            } catch (InterruptedException success) {}
764 >            ran.getAndIncrement();
765 >        }};
766 >        for (int i = 0; i < count; i++)
767 >            p.execute(waiter);
768 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
769 >        assertEquals(poolSize, p.getActiveCount());
770 >        assertEquals(0, p.getCompletedTaskCount());
771 >        final List<Runnable> queuedTasks;
772 >        try {
773 >            queuedTasks = p.shutdownNow();
774 >        } catch (SecurityException ok) {
775 >            return; // Allowed in case test doesn't have privs
776 >        }
777 >        assertTrue(p.isShutdown());
778 >        assertTrue(p.getQueue().isEmpty());
779 >        assertEquals(count - poolSize, queuedTasks.size());
780 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
781 >        assertTrue(p.isTerminated());
782 >        assertEquals(poolSize, ran.get());
783 >        assertEquals(poolSize, p.getCompletedTaskCount());
784      }
785  
786      // Exception Tests
787  
540
788      /**
789       * Constructor throws if corePoolSize argument is less than zero
790       */
791      public void testConstructor1() {
792          try {
793 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
793 >            new CustomTPE(-1, 1, 1L, SECONDS,
794 >                          new ArrayBlockingQueue<Runnable>(10));
795              shouldThrow();
796          } catch (IllegalArgumentException success) {}
797      }
# Line 553 | Line 801 | public class ThreadPoolExecutorSubclassT
801       */
802      public void testConstructor2() {
803          try {
804 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
804 >            new CustomTPE(1, -1, 1L, SECONDS,
805 >                          new ArrayBlockingQueue<Runnable>(10));
806              shouldThrow();
807          } catch (IllegalArgumentException success) {}
808      }
# Line 563 | Line 812 | public class ThreadPoolExecutorSubclassT
812       */
813      public void testConstructor3() {
814          try {
815 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
815 >            new CustomTPE(1, 0, 1L, SECONDS,
816 >                          new ArrayBlockingQueue<Runnable>(10));
817              shouldThrow();
818          } catch (IllegalArgumentException success) {}
819      }
# Line 573 | Line 823 | public class ThreadPoolExecutorSubclassT
823       */
824      public void testConstructor4() {
825          try {
826 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
826 >            new CustomTPE(1, 2, -1L, SECONDS,
827 >                          new ArrayBlockingQueue<Runnable>(10));
828              shouldThrow();
829          } catch (IllegalArgumentException success) {}
830      }
# Line 583 | Line 834 | public class ThreadPoolExecutorSubclassT
834       */
835      public void testConstructor5() {
836          try {
837 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
837 >            new CustomTPE(2, 1, 1L, SECONDS,
838 >                          new ArrayBlockingQueue<Runnable>(10));
839              shouldThrow();
840          } catch (IllegalArgumentException success) {}
841      }
# Line 593 | Line 845 | public class ThreadPoolExecutorSubclassT
845       */
846      public void testConstructorNullPointerException() {
847          try {
848 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
848 >            new CustomTPE(1, 2, 1L, SECONDS, null);
849              shouldThrow();
850          } catch (NullPointerException success) {}
851      }
852  
601
602
853      /**
854       * Constructor throws if corePoolSize argument is less than zero
855       */
856      public void testConstructor6() {
857          try {
858 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
858 >            new CustomTPE(-1, 1, 1L, SECONDS,
859 >                          new ArrayBlockingQueue<Runnable>(10),
860 >                          new SimpleThreadFactory());
861              shouldThrow();
862          } catch (IllegalArgumentException success) {}
863      }
# Line 615 | Line 867 | public class ThreadPoolExecutorSubclassT
867       */
868      public void testConstructor7() {
869          try {
870 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
870 >            new CustomTPE(1,-1, 1L, SECONDS,
871 >                          new ArrayBlockingQueue<Runnable>(10),
872 >                          new SimpleThreadFactory());
873              shouldThrow();
874          } catch (IllegalArgumentException success) {}
875      }
# Line 625 | Line 879 | public class ThreadPoolExecutorSubclassT
879       */
880      public void testConstructor8() {
881          try {
882 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
882 >            new CustomTPE(1, 0, 1L, SECONDS,
883 >                          new ArrayBlockingQueue<Runnable>(10),
884 >                          new SimpleThreadFactory());
885              shouldThrow();
886          } catch (IllegalArgumentException success) {}
887      }
# Line 635 | Line 891 | public class ThreadPoolExecutorSubclassT
891       */
892      public void testConstructor9() {
893          try {
894 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
894 >            new CustomTPE(1, 2, -1L, SECONDS,
895 >                          new ArrayBlockingQueue<Runnable>(10),
896 >                          new SimpleThreadFactory());
897              shouldThrow();
898          } catch (IllegalArgumentException success) {}
899      }
# Line 645 | Line 903 | public class ThreadPoolExecutorSubclassT
903       */
904      public void testConstructor10() {
905          try {
906 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
906 >            new CustomTPE(2, 1, 1L, SECONDS,
907 >                          new ArrayBlockingQueue<Runnable>(10),
908 >                          new SimpleThreadFactory());
909              shouldThrow();
910          } catch (IllegalArgumentException success) {}
911      }
# Line 655 | Line 915 | public class ThreadPoolExecutorSubclassT
915       */
916      public void testConstructorNullPointerException2() {
917          try {
918 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
918 >            new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
919              shouldThrow();
920          } catch (NullPointerException success) {}
921      }
# Line 665 | Line 925 | public class ThreadPoolExecutorSubclassT
925       */
926      public void testConstructorNullPointerException3() {
927          try {
928 <            ThreadFactory f = null;
929 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
928 >            new CustomTPE(1, 2, 1L, SECONDS,
929 >                          new ArrayBlockingQueue<Runnable>(10),
930 >                          (ThreadFactory) null);
931              shouldThrow();
932          } catch (NullPointerException success) {}
933      }
934  
674
935      /**
936       * Constructor throws if corePoolSize argument is less than zero
937       */
938      public void testConstructor11() {
939          try {
940 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
940 >            new CustomTPE(-1, 1, 1L, SECONDS,
941 >                          new ArrayBlockingQueue<Runnable>(10),
942 >                          new NoOpREHandler());
943              shouldThrow();
944          } catch (IllegalArgumentException success) {}
945      }
# Line 687 | Line 949 | public class ThreadPoolExecutorSubclassT
949       */
950      public void testConstructor12() {
951          try {
952 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
952 >            new CustomTPE(1, -1, 1L, SECONDS,
953 >                          new ArrayBlockingQueue<Runnable>(10),
954 >                          new NoOpREHandler());
955              shouldThrow();
956          } catch (IllegalArgumentException success) {}
957      }
# Line 697 | Line 961 | public class ThreadPoolExecutorSubclassT
961       */
962      public void testConstructor13() {
963          try {
964 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
964 >            new CustomTPE(1, 0, 1L, SECONDS,
965 >                          new ArrayBlockingQueue<Runnable>(10),
966 >                          new NoOpREHandler());
967              shouldThrow();
968          } catch (IllegalArgumentException success) {}
969      }
# Line 707 | Line 973 | public class ThreadPoolExecutorSubclassT
973       */
974      public void testConstructor14() {
975          try {
976 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
976 >            new CustomTPE(1, 2, -1L, SECONDS,
977 >                          new ArrayBlockingQueue<Runnable>(10),
978 >                          new NoOpREHandler());
979              shouldThrow();
980          } catch (IllegalArgumentException success) {}
981      }
# Line 717 | Line 985 | public class ThreadPoolExecutorSubclassT
985       */
986      public void testConstructor15() {
987          try {
988 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
988 >            new CustomTPE(2, 1, 1L, SECONDS,
989 >                          new ArrayBlockingQueue<Runnable>(10),
990 >                          new NoOpREHandler());
991              shouldThrow();
992          } catch (IllegalArgumentException success) {}
993      }
# Line 727 | Line 997 | public class ThreadPoolExecutorSubclassT
997       */
998      public void testConstructorNullPointerException4() {
999          try {
1000 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
1000 >            new CustomTPE(1, 2, 1L, SECONDS,
1001 >                          null,
1002 >                          new NoOpREHandler());
1003              shouldThrow();
1004          } catch (NullPointerException success) {}
1005      }
# Line 737 | Line 1009 | public class ThreadPoolExecutorSubclassT
1009       */
1010      public void testConstructorNullPointerException5() {
1011          try {
1012 <            RejectedExecutionHandler r = null;
1013 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
1012 >            new CustomTPE(1, 2, 1L, SECONDS,
1013 >                          new ArrayBlockingQueue<Runnable>(10),
1014 >                          (RejectedExecutionHandler) null);
1015              shouldThrow();
1016          } catch (NullPointerException success) {}
1017      }
1018  
746
1019      /**
1020       * Constructor throws if corePoolSize argument is less than zero
1021       */
1022      public void testConstructor16() {
1023          try {
1024 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1024 >            new CustomTPE(-1, 1, 1L, SECONDS,
1025 >                          new ArrayBlockingQueue<Runnable>(10),
1026 >                          new SimpleThreadFactory(),
1027 >                          new NoOpREHandler());
1028              shouldThrow();
1029          } catch (IllegalArgumentException success) {}
1030      }
# Line 759 | Line 1034 | public class ThreadPoolExecutorSubclassT
1034       */
1035      public void testConstructor17() {
1036          try {
1037 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1037 >            new CustomTPE(1, -1, 1L, SECONDS,
1038 >                          new ArrayBlockingQueue<Runnable>(10),
1039 >                          new SimpleThreadFactory(),
1040 >                          new NoOpREHandler());
1041              shouldThrow();
1042          } catch (IllegalArgumentException success) {}
1043      }
# Line 769 | Line 1047 | public class ThreadPoolExecutorSubclassT
1047       */
1048      public void testConstructor18() {
1049          try {
1050 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1050 >            new CustomTPE(1, 0, 1L, SECONDS,
1051 >                          new ArrayBlockingQueue<Runnable>(10),
1052 >                          new SimpleThreadFactory(),
1053 >                          new NoOpREHandler());
1054              shouldThrow();
1055          } catch (IllegalArgumentException success) {}
1056      }
# Line 779 | Line 1060 | public class ThreadPoolExecutorSubclassT
1060       */
1061      public void testConstructor19() {
1062          try {
1063 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1063 >            new CustomTPE(1, 2, -1L, SECONDS,
1064 >                          new ArrayBlockingQueue<Runnable>(10),
1065 >                          new SimpleThreadFactory(),
1066 >                          new NoOpREHandler());
1067              shouldThrow();
1068          } catch (IllegalArgumentException success) {}
1069      }
# Line 789 | Line 1073 | public class ThreadPoolExecutorSubclassT
1073       */
1074      public void testConstructor20() {
1075          try {
1076 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1076 >            new CustomTPE(2, 1, 1L, SECONDS,
1077 >                          new ArrayBlockingQueue<Runnable>(10),
1078 >                          new SimpleThreadFactory(),
1079 >                          new NoOpREHandler());
1080              shouldThrow();
1081          } catch (IllegalArgumentException success) {}
1082      }
1083  
1084      /**
1085 <     * Constructor throws if workQueue is set to null
1085 >     * Constructor throws if workQueue is null
1086       */
1087      public void testConstructorNullPointerException6() {
1088          try {
1089 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1089 >            new CustomTPE(1, 2, 1L, SECONDS,
1090 >                          null,
1091 >                          new SimpleThreadFactory(),
1092 >                          new NoOpREHandler());
1093              shouldThrow();
1094          } catch (NullPointerException success) {}
1095      }
1096  
1097      /**
1098 <     * Constructor throws if handler is set to null
1098 >     * Constructor throws if handler is null
1099       */
1100      public void testConstructorNullPointerException7() {
1101          try {
1102 <            RejectedExecutionHandler r = null;
1103 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1102 >            new CustomTPE(1, 2, 1L, SECONDS,
1103 >                          new ArrayBlockingQueue<Runnable>(10),
1104 >                          new SimpleThreadFactory(),
1105 >                          (RejectedExecutionHandler) null);
1106              shouldThrow();
1107          } catch (NullPointerException success) {}
1108      }
1109  
1110      /**
1111 <     * Constructor throws if ThreadFactory is set top null
1111 >     * Constructor throws if ThreadFactory is null
1112       */
1113      public void testConstructorNullPointerException8() {
1114          try {
1115 <            ThreadFactory f = null;
1116 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new NoOpREHandler());
1115 >            new CustomTPE(1, 2, 1L, SECONDS,
1116 >                          new ArrayBlockingQueue<Runnable>(10),
1117 >                          (ThreadFactory) null,
1118 >                          new NoOpREHandler());
1119              shouldThrow();
1120          } catch (NullPointerException success) {}
1121      }
1122  
829
1123      /**
1124 <     *  execute throws RejectedExecutionException
832 <     *  if saturated.
1124 >     * execute throws RejectedExecutionException if saturated.
1125       */
1126      public void testSaturatedExecute() {
1127 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
1128 <        try {
1129 <
1130 <            for (int i = 0; i < 5; ++i) {
1131 <                p.execute(new MediumRunnable());
1127 >        final ThreadPoolExecutor p =
1128 >            new CustomTPE(1, 1,
1129 >                          LONG_DELAY_MS, MILLISECONDS,
1130 >                          new ArrayBlockingQueue<Runnable>(1));
1131 >        try (PoolCleaner cleaner = cleaner(p)) {
1132 >            final CountDownLatch done = new CountDownLatch(1);
1133 >            Runnable task = new CheckedRunnable() {
1134 >                public void realRun() throws InterruptedException {
1135 >                    done.await();
1136 >                }};
1137 >            for (int i = 0; i < 2; ++i)
1138 >                p.execute(task);
1139 >            for (int i = 0; i < 2; ++i) {
1140 >                try {
1141 >                    p.execute(task);
1142 >                    shouldThrow();
1143 >                } catch (RejectedExecutionException success) {}
1144 >                assertTrue(p.getTaskCount() <= 2);
1145              }
1146 <            shouldThrow();
1147 <        } catch (RejectedExecutionException success) {}
843 <        joinPool(p);
1146 >            done.countDown();
1147 >        }
1148      }
1149  
1150      /**
1151 <     *  executor using CallerRunsPolicy runs task if saturated.
1151 >     * executor using CallerRunsPolicy runs task if saturated.
1152       */
1153      public void testSaturatedExecute2() {
1154 <        RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1155 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1156 <        try {
1157 <
1154 >        final ThreadPoolExecutor p =
1155 >            new CustomTPE(1, 1,
1156 >                          LONG_DELAY_MS, MILLISECONDS,
1157 >                          new ArrayBlockingQueue<Runnable>(1),
1158 >                          new CustomTPE.CallerRunsPolicy());
1159 >        try (PoolCleaner cleaner = cleaner(p)) {
1160 >            final CountDownLatch done = new CountDownLatch(1);
1161 >            Runnable blocker = new CheckedRunnable() {
1162 >                public void realRun() throws InterruptedException {
1163 >                    done.await();
1164 >                }};
1165 >            p.execute(blocker);
1166              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1167 <            for (int i = 0; i < 5; ++i) {
1167 >            for (int i = 0; i < tasks.length; i++)
1168                  tasks[i] = new TrackedNoOpRunnable();
1169 <            }
858 <            TrackedLongRunnable mr = new TrackedLongRunnable();
859 <            p.execute(mr);
860 <            for (int i = 0; i < 5; ++i) {
1169 >            for (int i = 0; i < tasks.length; i++)
1170                  p.execute(tasks[i]);
1171 <            }
863 <            for (int i = 1; i < 5; ++i) {
1171 >            for (int i = 1; i < tasks.length; i++)
1172                  assertTrue(tasks[i].done);
1173 <            }
1174 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
867 <        } finally {
868 <            joinPool(p);
1173 >            assertFalse(tasks[0].done); // waiting in queue
1174 >            done.countDown();
1175          }
1176      }
1177  
1178      /**
1179 <     *  executor using DiscardPolicy drops task if saturated.
1179 >     * executor using DiscardPolicy drops task if saturated.
1180       */
1181      public void testSaturatedExecute3() {
1182 <        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1183 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1184 <        try {
1185 <
1186 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1187 <            for (int i = 0; i < 5; ++i) {
1188 <                tasks[i] = new TrackedNoOpRunnable();
1189 <            }
1190 <            p.execute(new TrackedLongRunnable());
1191 <            for (int i = 0; i < 5; ++i) {
1192 <                p.execute(tasks[i]);
1193 <            }
1194 <            for (int i = 0; i < 5; ++i) {
1182 >        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1183 >        for (int i = 0; i < tasks.length; ++i)
1184 >            tasks[i] = new TrackedNoOpRunnable();
1185 >        final ThreadPoolExecutor p =
1186 >            new CustomTPE(1, 1,
1187 >                          LONG_DELAY_MS, MILLISECONDS,
1188 >                          new ArrayBlockingQueue<Runnable>(1),
1189 >                          new CustomTPE.DiscardPolicy());
1190 >        try (PoolCleaner cleaner = cleaner(p)) {
1191 >            final CountDownLatch done = new CountDownLatch(1);
1192 >            p.execute(awaiter(done));
1193 >
1194 >            for (TrackedNoOpRunnable task : tasks)
1195 >                p.execute(task);
1196 >            for (int i = 1; i < tasks.length; i++)
1197                  assertFalse(tasks[i].done);
1198 <            }
891 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
892 <        } finally {
893 <            joinPool(p);
1198 >            done.countDown();
1199          }
1200 +        for (int i = 1; i < tasks.length; i++)
1201 +            assertFalse(tasks[i].done);
1202 +        assertTrue(tasks[0].done); // was waiting in queue
1203      }
1204  
1205      /**
1206 <     *  executor using DiscardOldestPolicy drops oldest task if saturated.
1206 >     * executor using DiscardOldestPolicy drops oldest task if saturated.
1207       */
1208      public void testSaturatedExecute4() {
1209 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1210 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1211 <        try {
1212 <            p.execute(new TrackedLongRunnable());
1213 <            TrackedLongRunnable r2 = new TrackedLongRunnable();
1209 >        final CountDownLatch done = new CountDownLatch(1);
1210 >        LatchAwaiter r1 = awaiter(done);
1211 >        LatchAwaiter r2 = awaiter(done);
1212 >        LatchAwaiter r3 = awaiter(done);
1213 >        final ThreadPoolExecutor p =
1214 >            new CustomTPE(1, 1,
1215 >                          LONG_DELAY_MS, MILLISECONDS,
1216 >                          new ArrayBlockingQueue<Runnable>(1),
1217 >                          new CustomTPE.DiscardOldestPolicy());
1218 >        try (PoolCleaner cleaner = cleaner(p)) {
1219 >            assertEquals(LatchAwaiter.NEW, r1.state);
1220 >            assertEquals(LatchAwaiter.NEW, r2.state);
1221 >            assertEquals(LatchAwaiter.NEW, r3.state);
1222 >            p.execute(r1);
1223              p.execute(r2);
1224              assertTrue(p.getQueue().contains(r2));
908            TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1225              p.execute(r3);
1226              assertFalse(p.getQueue().contains(r2));
1227              assertTrue(p.getQueue().contains(r3));
1228 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
913 <        } finally {
914 <            joinPool(p);
1228 >            done.countDown();
1229          }
1230 +        assertEquals(LatchAwaiter.DONE, r1.state);
1231 +        assertEquals(LatchAwaiter.NEW, r2.state);
1232 +        assertEquals(LatchAwaiter.DONE, r3.state);
1233      }
1234  
1235      /**
1236 <     *  execute throws RejectedExecutionException if shutdown
1236 >     * execute throws RejectedExecutionException if shutdown
1237       */
1238      public void testRejectedExecutionExceptionOnShutdown() {
1239 <        ThreadPoolExecutor tpe =
1240 <            new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1241 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1242 <        try {
1243 <            tpe.execute(new NoOpRunnable());
1244 <            shouldThrow();
1245 <        } catch (RejectedExecutionException success) {}
1246 <
1247 <        joinPool(tpe);
1239 >        final ThreadPoolExecutor p =
1240 >            new CustomTPE(1, 1,
1241 >                          LONG_DELAY_MS, MILLISECONDS,
1242 >                          new ArrayBlockingQueue<Runnable>(1));
1243 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1244 >        try (PoolCleaner cleaner = cleaner(p)) {
1245 >            try {
1246 >                p.execute(new NoOpRunnable());
1247 >                shouldThrow();
1248 >            } catch (RejectedExecutionException success) {}
1249 >        }
1250      }
1251  
1252      /**
1253 <     *  execute using CallerRunsPolicy drops task on shutdown
1253 >     * execute using CallerRunsPolicy drops task on shutdown
1254       */
1255      public void testCallerRunsOnShutdown() {
1256          RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
# Line 948 | Line 1267 | public class ThreadPoolExecutorSubclassT
1267      }
1268  
1269      /**
1270 <     *  execute using DiscardPolicy drops task on shutdown
1270 >     * execute using DiscardPolicy drops task on shutdown
1271       */
1272      public void testDiscardOnShutdown() {
1273          RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
# Line 964 | Line 1283 | public class ThreadPoolExecutorSubclassT
1283          }
1284      }
1285  
967
1286      /**
1287 <     *  execute using DiscardOldestPolicy drops task on shutdown
1287 >     * execute using DiscardOldestPolicy drops task on shutdown
1288       */
1289      public void testDiscardOldestOnShutdown() {
1290          RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
# Line 982 | Line 1300 | public class ThreadPoolExecutorSubclassT
1300          }
1301      }
1302  
985
1303      /**
1304 <     *  execute (null) throws NPE
1304 >     * execute(null) throws NPE
1305       */
1306      public void testExecuteNull() {
1307 <        ThreadPoolExecutor tpe = null;
1307 >        ThreadPoolExecutor p =
1308 >            new CustomTPE(1, 2, 1L, SECONDS,
1309 >                          new ArrayBlockingQueue<Runnable>(10));
1310          try {
1311 <            tpe = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
993 <            tpe.execute(null);
1311 >            p.execute(null);
1312              shouldThrow();
1313          } catch (NullPointerException success) {}
1314  
1315 <        joinPool(tpe);
1315 >        joinPool(p);
1316      }
1317  
1318      /**
1319 <     *  setCorePoolSize of negative value throws IllegalArgumentException
1319 >     * setCorePoolSize of negative value throws IllegalArgumentException
1320       */
1321      public void testCorePoolSizeIllegalArgumentException() {
1322 <        ThreadPoolExecutor tpe =
1322 >        ThreadPoolExecutor p =
1323              new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1324          try {
1325 <            tpe.setCorePoolSize(-1);
1325 >            p.setCorePoolSize(-1);
1326              shouldThrow();
1327          } catch (IllegalArgumentException success) {
1328          } finally {
1329 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1329 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1330          }
1331 <        joinPool(tpe);
1331 >        joinPool(p);
1332      }
1333  
1334      /**
1335 <     *  setMaximumPoolSize(int) throws IllegalArgumentException if
1336 <     *  given a value less the core pool size
1335 >     * setMaximumPoolSize(int) throws IllegalArgumentException
1336 >     * if given a value less the core pool size
1337       */
1338      public void testMaximumPoolSizeIllegalArgumentException() {
1339 <        ThreadPoolExecutor tpe =
1339 >        ThreadPoolExecutor p =
1340              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1341          try {
1342 <            tpe.setMaximumPoolSize(1);
1342 >            p.setMaximumPoolSize(1);
1343              shouldThrow();
1344          } catch (IllegalArgumentException success) {
1345          } finally {
1346 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1346 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1347          }
1348 <        joinPool(tpe);
1348 >        joinPool(p);
1349      }
1350  
1351      /**
1352 <     *  setMaximumPoolSize throws IllegalArgumentException
1353 <     *  if given a negative value
1352 >     * setMaximumPoolSize throws IllegalArgumentException
1353 >     * if given a negative value
1354       */
1355      public void testMaximumPoolSizeIllegalArgumentException2() {
1356 <        ThreadPoolExecutor tpe =
1356 >        ThreadPoolExecutor p =
1357              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1358          try {
1359 <            tpe.setMaximumPoolSize(-1);
1359 >            p.setMaximumPoolSize(-1);
1360              shouldThrow();
1361          } catch (IllegalArgumentException success) {
1362          } finally {
1363 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1363 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1364          }
1365 <        joinPool(tpe);
1365 >        joinPool(p);
1366      }
1367  
1050
1368      /**
1369 <     *  setKeepAliveTime  throws IllegalArgumentException
1370 <     *  when given a negative value
1369 >     * setKeepAliveTime throws IllegalArgumentException
1370 >     * when given a negative value
1371       */
1372      public void testKeepAliveTimeIllegalArgumentException() {
1373 <        ThreadPoolExecutor tpe =
1373 >        ThreadPoolExecutor p =
1374              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1375  
1376          try {
1377 <            tpe.setKeepAliveTime(-1,MILLISECONDS);
1377 >            p.setKeepAliveTime(-1,MILLISECONDS);
1378              shouldThrow();
1379          } catch (IllegalArgumentException success) {
1380          } finally {
1381 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1381 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1382          }
1383 <        joinPool(tpe);
1383 >        joinPool(p);
1384      }
1385  
1386      /**
1387       * terminated() is called on termination
1388       */
1389      public void testTerminated() {
1390 <        CustomTPE tpe = new CustomTPE();
1391 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1392 <        assertTrue(tpe.terminatedCalled);
1393 <        joinPool(tpe);
1390 >        CustomTPE p = new CustomTPE();
1391 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1392 >        assertTrue(p.terminatedCalled());
1393 >        joinPool(p);
1394      }
1395  
1396      /**
1397       * beforeExecute and afterExecute are called when executing task
1398       */
1399      public void testBeforeAfter() throws InterruptedException {
1400 <        CustomTPE tpe = new CustomTPE();
1400 >        CustomTPE p = new CustomTPE();
1401          try {
1402 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1403 <            tpe.execute(r);
1404 <            Thread.sleep(SHORT_DELAY_MS);
1405 <            assertTrue(r.done);
1406 <            assertTrue(tpe.beforeCalled);
1407 <            assertTrue(tpe.afterCalled);
1408 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1402 >            final CountDownLatch done = new CountDownLatch(1);
1403 >            p.execute(new CheckedRunnable() {
1404 >                public void realRun() {
1405 >                    done.countDown();
1406 >                }});
1407 >            await(p.afterCalled);
1408 >            assertEquals(0, done.getCount());
1409 >            assertTrue(p.afterCalled());
1410 >            assertTrue(p.beforeCalled());
1411 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1412          } finally {
1413 <            joinPool(tpe);
1413 >            joinPool(p);
1414          }
1415      }
1416  
# Line 1136 | Line 1456 | public class ThreadPoolExecutorSubclassT
1456          }
1457      }
1458  
1139
1459      /**
1460       * invokeAny(null) throws NPE
1461       */
# Line 1169 | Line 1488 | public class ThreadPoolExecutorSubclassT
1488       * invokeAny(c) throws NPE if c has null elements
1489       */
1490      public void testInvokeAny3() throws Exception {
1491 <        final CountDownLatch latch = new CountDownLatch(1);
1491 >        CountDownLatch latch = new CountDownLatch(1);
1492          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1493 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1494 +        l.add(latchAwaitingStringTask(latch));
1495 +        l.add(null);
1496          try {
1175            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1176            l.add(new Callable<String>() {
1177                      public String call() {
1178                          try {
1179                              latch.await();
1180                          } catch (InterruptedException ok) {}
1181                          return TEST_STRING;
1182                      }});
1183            l.add(null);
1497              e.invokeAny(l);
1498              shouldThrow();
1499          } catch (NullPointerException success) {
# Line 1195 | Line 1508 | public class ThreadPoolExecutorSubclassT
1508       */
1509      public void testInvokeAny4() throws Exception {
1510          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1511 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1512 +        l.add(new NPETask());
1513          try {
1199            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1200            l.add(new NPETask());
1514              e.invokeAny(l);
1515              shouldThrow();
1516          } catch (ExecutionException success) {
# Line 1213 | Line 1526 | public class ThreadPoolExecutorSubclassT
1526      public void testInvokeAny5() throws Exception {
1527          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1528          try {
1529 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1529 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1530              l.add(new StringTask());
1531              l.add(new StringTask());
1532              String result = e.invokeAny(l);
# Line 1255 | Line 1568 | public class ThreadPoolExecutorSubclassT
1568       */
1569      public void testInvokeAll3() throws Exception {
1570          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1571 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1572 +        l.add(new StringTask());
1573 +        l.add(null);
1574          try {
1259            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1260            l.add(new StringTask());
1261            l.add(null);
1575              e.invokeAll(l);
1576              shouldThrow();
1577          } catch (NullPointerException success) {
# Line 1272 | Line 1585 | public class ThreadPoolExecutorSubclassT
1585       */
1586      public void testInvokeAll4() throws Exception {
1587          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1588 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1589 +        l.add(new NPETask());
1590 +        List<Future<String>> futures = e.invokeAll(l);
1591 +        assertEquals(1, futures.size());
1592          try {
1593 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1277 <            l.add(new NPETask());
1278 <            List<Future<String>> result = e.invokeAll(l);
1279 <            assertEquals(1, result.size());
1280 <            for (Future<String> future : result)
1281 <                future.get();
1593 >            futures.get(0).get();
1594              shouldThrow();
1595          } catch (ExecutionException success) {
1596 +            assertTrue(success.getCause() instanceof NullPointerException);
1597          } finally {
1598              joinPool(e);
1599          }
# Line 1292 | Line 1605 | public class ThreadPoolExecutorSubclassT
1605      public void testInvokeAll5() throws Exception {
1606          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1607          try {
1608 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1608 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1609              l.add(new StringTask());
1610              l.add(new StringTask());
1611 <            List<Future<String>> result = e.invokeAll(l);
1612 <            assertEquals(2, result.size());
1613 <            for (Future<String> future : result)
1611 >            List<Future<String>> futures = e.invokeAll(l);
1612 >            assertEquals(2, futures.size());
1613 >            for (Future<String> future : futures)
1614                  assertSame(TEST_STRING, future.get());
1615          } finally {
1616              joinPool(e);
1617          }
1618      }
1619  
1307
1308
1620      /**
1621       * timed invokeAny(null) throws NPE
1622       */
# Line 1325 | Line 1636 | public class ThreadPoolExecutorSubclassT
1636       */
1637      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1638          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1639 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1640 +        l.add(new StringTask());
1641          try {
1329            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1330            l.add(new StringTask());
1642              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1643              shouldThrow();
1644          } catch (NullPointerException success) {
# Line 1354 | Line 1665 | public class ThreadPoolExecutorSubclassT
1665       * timed invokeAny(c) throws NPE if c has null elements
1666       */
1667      public void testTimedInvokeAny3() throws Exception {
1668 <        final CountDownLatch latch = new CountDownLatch(1);
1668 >        CountDownLatch latch = new CountDownLatch(1);
1669          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1670 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1671 +        l.add(latchAwaitingStringTask(latch));
1672 +        l.add(null);
1673          try {
1360            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1361            l.add(new Callable<String>() {
1362                      public String call() {
1363                          try {
1364                              latch.await();
1365                          } catch (InterruptedException ok) {}
1366                          return TEST_STRING;
1367                      }});
1368            l.add(null);
1674              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1675              shouldThrow();
1676          } catch (NullPointerException success) {
# Line 1380 | Line 1685 | public class ThreadPoolExecutorSubclassT
1685       */
1686      public void testTimedInvokeAny4() throws Exception {
1687          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1688 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1689 +        l.add(new NPETask());
1690          try {
1384            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1385            l.add(new NPETask());
1691              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1692              shouldThrow();
1693          } catch (ExecutionException success) {
# Line 1398 | Line 1703 | public class ThreadPoolExecutorSubclassT
1703      public void testTimedInvokeAny5() throws Exception {
1704          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1705          try {
1706 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1706 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1707              l.add(new StringTask());
1708              l.add(new StringTask());
1709              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 1427 | Line 1732 | public class ThreadPoolExecutorSubclassT
1732       */
1733      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1734          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1735 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1736 +        l.add(new StringTask());
1737          try {
1431            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1432            l.add(new StringTask());
1738              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1739              shouldThrow();
1740          } catch (NullPointerException success) {
# Line 1456 | Line 1761 | public class ThreadPoolExecutorSubclassT
1761       */
1762      public void testTimedInvokeAll3() throws Exception {
1763          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1764 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1765 +        l.add(new StringTask());
1766 +        l.add(null);
1767          try {
1460            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1461            l.add(new StringTask());
1462            l.add(null);
1768              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1769              shouldThrow();
1770          } catch (NullPointerException success) {
# Line 1473 | Line 1778 | public class ThreadPoolExecutorSubclassT
1778       */
1779      public void testTimedInvokeAll4() throws Exception {
1780          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1781 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1782 +        l.add(new NPETask());
1783 +        List<Future<String>> futures =
1784 +            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1785 +        assertEquals(1, futures.size());
1786          try {
1787 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1478 <            l.add(new NPETask());
1479 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1480 <            assertEquals(1, result.size());
1481 <            for (Future<String> future : result)
1482 <                future.get();
1787 >            futures.get(0).get();
1788              shouldThrow();
1789          } catch (ExecutionException success) {
1790              assertTrue(success.getCause() instanceof NullPointerException);
# Line 1494 | Line 1799 | public class ThreadPoolExecutorSubclassT
1799      public void testTimedInvokeAll5() throws Exception {
1800          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1801          try {
1802 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1802 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1803              l.add(new StringTask());
1804              l.add(new StringTask());
1805 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1806 <            assertEquals(2, result.size());
1807 <            for (Future<String> future : result)
1805 >            List<Future<String>> futures =
1806 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1807 >            assertEquals(2, futures.size());
1808 >            for (Future<String> future : futures)
1809                  assertSame(TEST_STRING, future.get());
1810          } finally {
1811              joinPool(e);
# Line 1512 | Line 1818 | public class ThreadPoolExecutorSubclassT
1818      public void testTimedInvokeAll6() throws Exception {
1819          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1820          try {
1821 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1822 <            l.add(new StringTask());
1823 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1824 <            l.add(new StringTask());
1825 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1826 <            assertEquals(3, result.size());
1827 <            Iterator<Future<String>> it = result.iterator();
1828 <            Future<String> f1 = it.next();
1829 <            Future<String> f2 = it.next();
1830 <            Future<String> f3 = it.next();
1831 <            assertTrue(f1.isDone());
1832 <            assertTrue(f2.isDone());
1833 <            assertTrue(f3.isDone());
1834 <            assertFalse(f1.isCancelled());
1835 <            assertTrue(f2.isCancelled());
1821 >            for (long timeout = timeoutMillis();;) {
1822 >                List<Callable<String>> tasks = new ArrayList<>();
1823 >                tasks.add(new StringTask("0"));
1824 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1825 >                tasks.add(new StringTask("2"));
1826 >                long startTime = System.nanoTime();
1827 >                List<Future<String>> futures =
1828 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1829 >                assertEquals(tasks.size(), futures.size());
1830 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1831 >                for (Future future : futures)
1832 >                    assertTrue(future.isDone());
1833 >                assertTrue(futures.get(1).isCancelled());
1834 >                try {
1835 >                    assertEquals("0", futures.get(0).get());
1836 >                    assertEquals("2", futures.get(2).get());
1837 >                    break;
1838 >                } catch (CancellationException retryWithLongerTimeout) {
1839 >                    timeout *= 2;
1840 >                    if (timeout >= LONG_DELAY_MS / 2)
1841 >                        fail("expected exactly one task to be cancelled");
1842 >                }
1843 >            }
1844          } finally {
1845              joinPool(e);
1846          }
# Line 1537 | Line 1851 | public class ThreadPoolExecutorSubclassT
1851       * thread factory fails to create more
1852       */
1853      public void testFailingThreadFactory() throws InterruptedException {
1854 <        ExecutorService e = new CustomTPE(100, 100, LONG_DELAY_MS, MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
1855 <        try {
1856 <            for (int k = 0; k < 100; ++k) {
1857 <                e.execute(new NoOpRunnable());
1858 <            }
1859 <            Thread.sleep(LONG_DELAY_MS);
1854 >        final ExecutorService e =
1855 >            new CustomTPE(100, 100,
1856 >                          LONG_DELAY_MS, MILLISECONDS,
1857 >                          new LinkedBlockingQueue<Runnable>(),
1858 >                          new FailingThreadFactory());
1859 >        try {
1860 >            final int TASKS = 100;
1861 >            final CountDownLatch done = new CountDownLatch(TASKS);
1862 >            for (int k = 0; k < TASKS; ++k)
1863 >                e.execute(new CheckedRunnable() {
1864 >                    public void realRun() {
1865 >                        done.countDown();
1866 >                    }});
1867 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1868          } finally {
1869              joinPool(e);
1870          }
# Line 1552 | Line 1874 | public class ThreadPoolExecutorSubclassT
1874       * allowsCoreThreadTimeOut is by default false.
1875       */
1876      public void testAllowsCoreThreadTimeOut() {
1877 <        ThreadPoolExecutor tpe = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1878 <        assertFalse(tpe.allowsCoreThreadTimeOut());
1879 <        joinPool(tpe);
1877 >        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1878 >        assertFalse(p.allowsCoreThreadTimeOut());
1879 >        joinPool(p);
1880      }
1881  
1882      /**
1883       * allowCoreThreadTimeOut(true) causes idle threads to time out
1884       */
1885 <    public void testAllowCoreThreadTimeOut_true() throws InterruptedException {
1886 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1887 <        tpe.allowCoreThreadTimeOut(true);
1888 <        tpe.execute(new NoOpRunnable());
1889 <        try {
1890 <            Thread.sleep(MEDIUM_DELAY_MS);
1891 <            assertEquals(0, tpe.getPoolSize());
1885 >    public void testAllowCoreThreadTimeOut_true() throws Exception {
1886 >        long keepAliveTime = timeoutMillis();
1887 >        final ThreadPoolExecutor p =
1888 >            new CustomTPE(2, 10,
1889 >                          keepAliveTime, MILLISECONDS,
1890 >                          new ArrayBlockingQueue<Runnable>(10));
1891 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1892 >        try {
1893 >            p.allowCoreThreadTimeOut(true);
1894 >            p.execute(new CheckedRunnable() {
1895 >                public void realRun() {
1896 >                    threadStarted.countDown();
1897 >                    assertEquals(1, p.getPoolSize());
1898 >                }});
1899 >            await(threadStarted);
1900 >            delay(keepAliveTime);
1901 >            long startTime = System.nanoTime();
1902 >            while (p.getPoolSize() > 0
1903 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1904 >                Thread.yield();
1905 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1906 >            assertEquals(0, p.getPoolSize());
1907          } finally {
1908 <            joinPool(tpe);
1908 >            joinPool(p);
1909          }
1910      }
1911  
1912      /**
1913       * allowCoreThreadTimeOut(false) causes idle threads not to time out
1914       */
1915 <    public void testAllowCoreThreadTimeOut_false() throws InterruptedException {
1916 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1917 <        tpe.allowCoreThreadTimeOut(false);
1918 <        tpe.execute(new NoOpRunnable());
1919 <        try {
1920 <            Thread.sleep(MEDIUM_DELAY_MS);
1921 <            assertTrue(tpe.getPoolSize() >= 1);
1915 >    public void testAllowCoreThreadTimeOut_false() throws Exception {
1916 >        long keepAliveTime = timeoutMillis();
1917 >        final ThreadPoolExecutor p =
1918 >            new CustomTPE(2, 10,
1919 >                          keepAliveTime, MILLISECONDS,
1920 >                          new ArrayBlockingQueue<Runnable>(10));
1921 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1922 >        try {
1923 >            p.allowCoreThreadTimeOut(false);
1924 >            p.execute(new CheckedRunnable() {
1925 >                public void realRun() throws InterruptedException {
1926 >                    threadStarted.countDown();
1927 >                    assertTrue(p.getPoolSize() >= 1);
1928 >                }});
1929 >            delay(2 * keepAliveTime);
1930 >            assertTrue(p.getPoolSize() >= 1);
1931          } finally {
1932 <            joinPool(tpe);
1932 >            joinPool(p);
1933 >        }
1934 >    }
1935 >
1936 >    /**
1937 >     * get(cancelled task) throws CancellationException
1938 >     * (in part, a test of CustomTPE itself)
1939 >     */
1940 >    public void testGet_cancelled() throws Exception {
1941 >        final ExecutorService e =
1942 >            new CustomTPE(1, 1,
1943 >                          LONG_DELAY_MS, MILLISECONDS,
1944 >                          new LinkedBlockingQueue<Runnable>());
1945 >        try {
1946 >            final CountDownLatch blockerStarted = new CountDownLatch(1);
1947 >            final CountDownLatch done = new CountDownLatch(1);
1948 >            final List<Future<?>> futures = new ArrayList<>();
1949 >            for (int i = 0; i < 2; i++) {
1950 >                Runnable r = new CheckedRunnable() { public void realRun()
1951 >                                                         throws Throwable {
1952 >                    blockerStarted.countDown();
1953 >                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1954 >                }};
1955 >                futures.add(e.submit(r));
1956 >            }
1957 >            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1958 >            for (Future<?> future : futures) future.cancel(false);
1959 >            for (Future<?> future : futures) {
1960 >                try {
1961 >                    future.get();
1962 >                    shouldThrow();
1963 >                } catch (CancellationException success) {}
1964 >                try {
1965 >                    future.get(LONG_DELAY_MS, MILLISECONDS);
1966 >                    shouldThrow();
1967 >                } catch (CancellationException success) {}
1968 >                assertTrue(future.isCancelled());
1969 >                assertTrue(future.isDone());
1970 >            }
1971 >            done.countDown();
1972 >        } finally {
1973 >            joinPool(e);
1974          }
1975      }
1976  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines