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.22 by jsr166, Mon Oct 11 08:28:05 2010 UTC vs.
Revision 1.107 by dl, Tue Mar 22 21:29:24 2022 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.Collection;
14 > import java.util.Collections;
15 > import java.util.List;
16 > import java.util.concurrent.ArrayBlockingQueue;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.Callable;
19 > import java.util.concurrent.CancellationException;
20 > import java.util.concurrent.CountDownLatch;
21 > import java.util.concurrent.ExecutionException;
22 > import java.util.concurrent.ExecutorService;
23 > import java.util.concurrent.Future;
24 > import java.util.concurrent.FutureTask;
25 > import java.util.concurrent.LinkedBlockingQueue;
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.ThreadLocalRandom;
31 > import java.util.concurrent.ThreadPoolExecutor;
32 > import java.util.concurrent.TimeoutException;
33 > import java.util.concurrent.TimeUnit;
34 > import java.util.concurrent.atomic.AtomicInteger;
35 > import java.util.concurrent.locks.Condition;
36 > import java.util.concurrent.locks.ReentrantLock;
37 >
38 > import junit.framework.Test;
39 > import junit.framework.TestSuite;
40  
41   public class ThreadPoolExecutorSubclassTest extends JSR166TestCase {
42      public static void main(String[] args) {
43 <        junit.textui.TestRunner.run(suite());
43 >        main(suite(), args);
44      }
45      public static Test suite() {
46          return new TestSuite(ThreadPoolExecutorSubclassTest.class);
# Line 37 | Line 62 | public class ThreadPoolExecutorSubclassT
62          CustomTask(final Runnable r, final V res) {
63              if (r == null) throw new NullPointerException();
64              callable = new Callable<V>() {
65 <            public V call() throws Exception { r.run(); return res; }};
65 >                public V call() throws Exception { r.run(); return res; }};
66          }
67          public boolean isDone() {
68              lock.lock(); try { return done; } finally { lock.unlock() ; }
# Line 77 | Line 102 | public class ThreadPoolExecutorSubclassT
102              }
103              lock.lock();
104              try {
105 <                result = v;
106 <                exception = e;
107 <                done = true;
108 <                thread = null;
109 <                cond.signalAll();
105 >                if (!done) {
106 >                    result = v;
107 >                    exception = e;
108 >                    done = true;
109 >                    thread = null;
110 >                    cond.signalAll();
111 >                }
112              }
113              finally { lock.unlock(); }
114          }
# Line 90 | Line 117 | public class ThreadPoolExecutorSubclassT
117              try {
118                  while (!done)
119                      cond.await();
120 +                if (cancelled)
121 +                    throw new CancellationException();
122                  if (exception != null)
123                      throw new ExecutionException(exception);
124                  return result;
# Line 101 | Line 130 | public class ThreadPoolExecutorSubclassT
130              long nanos = unit.toNanos(timeout);
131              lock.lock();
132              try {
133 <                for (;;) {
134 <                    if (done) break;
106 <                    if (nanos < 0)
133 >                while (!done) {
134 >                    if (nanos <= 0L)
135                          throw new TimeoutException();
136                      nanos = cond.awaitNanos(nanos);
137                  }
138 +                if (cancelled)
139 +                    throw new CancellationException();
140                  if (exception != null)
141                      throw new ExecutionException(exception);
142                  return result;
# Line 115 | Line 145 | public class ThreadPoolExecutorSubclassT
145          }
146      }
147  
118
148      static class CustomTPE extends ThreadPoolExecutor {
149          protected <V> RunnableFuture<V> newTaskFor(Callable<V> c) {
150              return new CustomTask<V>(c);
# Line 162 | Line 191 | public class ThreadPoolExecutorSubclassT
191                workQueue, threadFactory, handler);
192          }
193  
194 <        volatile boolean beforeCalled = false;
195 <        volatile boolean afterCalled = false;
196 <        volatile boolean terminatedCalled = false;
194 >        final CountDownLatch beforeCalled = new CountDownLatch(1);
195 >        final CountDownLatch afterCalled = new CountDownLatch(1);
196 >        final CountDownLatch terminatedCalled = new CountDownLatch(1);
197 >
198          public CustomTPE() {
199              super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
200          }
201          protected void beforeExecute(Thread t, Runnable r) {
202 <            beforeCalled = true;
202 >            beforeCalled.countDown();
203          }
204          protected void afterExecute(Runnable r, Throwable t) {
205 <            afterCalled = true;
205 >            afterCalled.countDown();
206          }
207          protected void terminated() {
208 <            terminatedCalled = true;
208 >            terminatedCalled.countDown();
209          }
210  
211 +        public boolean beforeCalled() {
212 +            return beforeCalled.getCount() == 0;
213 +        }
214 +        public boolean afterCalled() {
215 +            return afterCalled.getCount() == 0;
216 +        }
217 +        public boolean terminatedCalled() {
218 +            return terminatedCalled.getCount() == 0;
219 +        }
220      }
221  
222      static class FailingThreadFactory implements ThreadFactory {
# Line 188 | Line 227 | public class ThreadPoolExecutorSubclassT
227          }
228      }
229  
191
230      /**
231       * execute successfully executes a runnable
232       */
233      public void testExecute() throws InterruptedException {
234          final ThreadPoolExecutor p =
235              new CustomTPE(1, 1,
236 <                          LONG_DELAY_MS, MILLISECONDS,
236 >                          2 * LONG_DELAY_MS, MILLISECONDS,
237                            new ArrayBlockingQueue<Runnable>(10));
238 <        final CountDownLatch done = new CountDownLatch(1);
239 <        final Runnable task = new CheckedRunnable() {
240 <            public void realRun() {
241 <                done.countDown();
204 <            }};
205 <        try {
238 >        try (PoolCleaner cleaner = cleaner(p)) {
239 >            final CountDownLatch done = new CountDownLatch(1);
240 >            final Runnable task = new CheckedRunnable() {
241 >                public void realRun() { done.countDown(); }};
242              p.execute(task);
243 <            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
208 <        } finally {
209 <            joinPool(p);
243 >            await(done);
244          }
245      }
246  
# Line 215 | Line 249 | public class ThreadPoolExecutorSubclassT
249       * thread becomes active
250       */
251      public void testGetActiveCount() throws InterruptedException {
252 +        final CountDownLatch done = new CountDownLatch(1);
253          final ThreadPoolExecutor p =
254              new CustomTPE(2, 2,
255                            LONG_DELAY_MS, MILLISECONDS,
256                            new ArrayBlockingQueue<Runnable>(10));
257 <        final CountDownLatch threadStarted = new CountDownLatch(1);
258 <        final CountDownLatch done = new CountDownLatch(1);
224 <        try {
257 >        try (PoolCleaner cleaner = cleaner(p, done)) {
258 >            final CountDownLatch threadStarted = new CountDownLatch(1);
259              assertEquals(0, p.getActiveCount());
260              p.execute(new CheckedRunnable() {
261                  public void realRun() throws InterruptedException {
262                      threadStarted.countDown();
263                      assertEquals(1, p.getActiveCount());
264 <                    done.await();
264 >                    await(done);
265                  }});
266 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
266 >            await(threadStarted);
267              assertEquals(1, p.getActiveCount());
234        } finally {
235            done.countDown();
236            joinPool(p);
268          }
269      }
270  
# Line 241 | Line 272 | public class ThreadPoolExecutorSubclassT
272       * prestartCoreThread starts a thread if under corePoolSize, else doesn't
273       */
274      public void testPrestartCoreThread() {
275 <        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
276 <        assertEquals(0, p.getPoolSize());
277 <        assertTrue(p.prestartCoreThread());
278 <        assertEquals(1, p.getPoolSize());
279 <        assertTrue(p.prestartCoreThread());
280 <        assertEquals(2, p.getPoolSize());
281 <        assertFalse(p.prestartCoreThread());
282 <        assertEquals(2, p.getPoolSize());
283 <        joinPool(p);
275 >        final 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
299       */
300      public void testPrestartAllCoreThreads() {
301 <        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
302 <        assertEquals(0, p.getPoolSize());
303 <        p.prestartAllCoreThreads();
304 <        assertEquals(2, p.getPoolSize());
305 <        p.prestartAllCoreThreads();
306 <        assertEquals(2, p.getPoolSize());
307 <        joinPool(p);
301 >        final 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      /**
# Line 274 | Line 325 | public class ThreadPoolExecutorSubclassT
325              new CustomTPE(2, 2,
326                            LONG_DELAY_MS, MILLISECONDS,
327                            new ArrayBlockingQueue<Runnable>(10));
328 <        final CountDownLatch threadStarted = new CountDownLatch(1);
329 <        final CountDownLatch threadProceed = new CountDownLatch(1);
330 <        final CountDownLatch threadDone = new CountDownLatch(1);
331 <        try {
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();
337 >                    await(threadProceed);
338                      threadDone.countDown();
339                  }});
340 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
340 >            await(threadStarted);
341              assertEquals(0, p.getCompletedTaskCount());
342              threadProceed.countDown();
343 <            threadDone.await();
344 <            Thread.sleep(SHORT_DELAY_MS);
345 <            assertEquals(1, p.getCompletedTaskCount());
346 <        } finally {
347 <            joinPool(p);
343 >            await(threadDone);
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  
# Line 301 | Line 354 | public class ThreadPoolExecutorSubclassT
354       * getCorePoolSize returns size given in constructor if not otherwise set
355       */
356      public void testGetCorePoolSize() {
357 <        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
358 <        assertEquals(1, p.getCorePoolSize());
359 <        joinPool(p);
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
368       */
369      public void testGetKeepAliveTime() {
370 <        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
371 <        assertEquals(1, p.getKeepAliveTime(TimeUnit.SECONDS));
372 <        joinPool(p);
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  
318
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  
340
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 356 | 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 367 | 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  
377
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  
392
473      /**
474       * getLargestPoolSize increases, but doesn't overestimate, when
475       * multiple threads active
476       */
477      public void testGetLargestPoolSize() throws InterruptedException {
478          final int THREADS = 3;
479 +        final CountDownLatch done = new CountDownLatch(1);
480          final ThreadPoolExecutor p =
481              new CustomTPE(THREADS, THREADS,
482                            LONG_DELAY_MS, MILLISECONDS,
483                            new ArrayBlockingQueue<Runnable>(10));
484 <        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
404 <        final CountDownLatch done = new CountDownLatch(1);
405 <        try {
484 >        try (PoolCleaner cleaner = cleaner(p, done)) {
485              assertEquals(0, p.getLargestPoolSize());
486 +            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
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();
491 >                        await(done);
492                          assertEquals(THREADS, p.getLargestPoolSize());
493                      }});
494 <            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
415 <            assertEquals(THREADS, p.getLargestPoolSize());
416 <        } finally {
417 <            done.countDown();
418 <            joinPool(p);
494 >            await(threadsStarted);
495              assertEquals(THREADS, p.getLargestPoolSize());
496          }
497 +        assertEquals(THREADS, p.getLargestPoolSize());
498      }
499  
500      /**
# Line 425 | Line 502 | public class ThreadPoolExecutorSubclassT
502       * otherwise set
503       */
504      public void testGetMaximumPoolSize() {
505 <        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
506 <        assertEquals(2, p.getMaximumPoolSize());
507 <        joinPool(p);
505 >        final ThreadPoolExecutor p =
506 >            new CustomTPE(2, 3,
507 >                          LONG_DELAY_MS, MILLISECONDS,
508 >                          new ArrayBlockingQueue<Runnable>(10));
509 >        try (PoolCleaner cleaner = cleaner(p)) {
510 >            assertEquals(3, p.getMaximumPoolSize());
511 >            p.setMaximumPoolSize(5);
512 >            assertEquals(5, p.getMaximumPoolSize());
513 >            p.setMaximumPoolSize(4);
514 >            assertEquals(4, p.getMaximumPoolSize());
515 >        }
516      }
517  
518      /**
# Line 435 | Line 520 | public class ThreadPoolExecutorSubclassT
520       * become active
521       */
522      public void testGetPoolSize() throws InterruptedException {
523 +        final CountDownLatch done = new CountDownLatch(1);
524          final ThreadPoolExecutor p =
525              new CustomTPE(1, 1,
526                            LONG_DELAY_MS, MILLISECONDS,
527                            new ArrayBlockingQueue<Runnable>(10));
528 <        final CountDownLatch threadStarted = new CountDownLatch(1);
443 <        final CountDownLatch done = new CountDownLatch(1);
444 <        try {
528 >        try (PoolCleaner cleaner = cleaner(p, done)) {
529              assertEquals(0, p.getPoolSize());
530 +            final CountDownLatch threadStarted = new CountDownLatch(1);
531              p.execute(new CheckedRunnable() {
532                  public void realRun() throws InterruptedException {
533                      threadStarted.countDown();
534                      assertEquals(1, p.getPoolSize());
535 <                    done.await();
535 >                    await(done);
536                  }});
537 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
537 >            await(threadStarted);
538              assertEquals(1, p.getPoolSize());
454        } finally {
455            done.countDown();
456            joinPool(p);
539          }
540      }
541  
# Line 461 | Line 543 | public class ThreadPoolExecutorSubclassT
543       * getTaskCount increases, but doesn't overestimate, when tasks submitted
544       */
545      public void testGetTaskCount() throws InterruptedException {
546 +        final int TASKS = 3;
547 +        final CountDownLatch done = new CountDownLatch(1);
548          final ThreadPoolExecutor p =
549              new CustomTPE(1, 1,
550                            LONG_DELAY_MS, MILLISECONDS,
551                            new ArrayBlockingQueue<Runnable>(10));
552 <        final CountDownLatch threadStarted = new CountDownLatch(1);
553 <        final CountDownLatch done = new CountDownLatch(1);
470 <        try {
552 >        try (PoolCleaner cleaner = cleaner(p, done)) {
553 >            final CountDownLatch threadStarted = new CountDownLatch(1);
554              assertEquals(0, p.getTaskCount());
555 +            assertEquals(0, p.getCompletedTaskCount());
556              p.execute(new CheckedRunnable() {
557                  public void realRun() throws InterruptedException {
558                      threadStarted.countDown();
559 <                    assertEquals(1, p.getTaskCount());
476 <                    done.await();
559 >                    await(done);
560                  }});
561 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
561 >            await(threadStarted);
562              assertEquals(1, p.getTaskCount());
563 <        } finally {
564 <            done.countDown();
565 <            joinPool(p);
563 >            assertEquals(0, p.getCompletedTaskCount());
564 >            for (int i = 0; i < TASKS; i++) {
565 >                assertEquals(1 + i, p.getTaskCount());
566 >                p.execute(new CheckedRunnable() {
567 >                    public void realRun() throws InterruptedException {
568 >                        threadStarted.countDown();
569 >                        assertEquals(1 + TASKS, p.getTaskCount());
570 >                        await(done);
571 >                    }});
572 >            }
573 >            assertEquals(1 + TASKS, p.getTaskCount());
574 >            assertEquals(0, p.getCompletedTaskCount());
575          }
576 +        assertEquals(1 + TASKS, p.getTaskCount());
577 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
578      }
579  
580      /**
581 <     * isShutDown is false before shutdown, true after
581 >     * isShutdown is false before shutdown, true after
582       */
583      public void testIsShutdown() {
584 <
585 <        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
586 <        assertFalse(p.isShutdown());
587 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
588 <        assertTrue(p.isShutdown());
589 <        joinPool(p);
584 >        final ThreadPoolExecutor p =
585 >            new CustomTPE(1, 1,
586 >                          LONG_DELAY_MS, MILLISECONDS,
587 >                          new ArrayBlockingQueue<Runnable>(10));
588 >        try (PoolCleaner cleaner = cleaner(p)) {
589 >            assertFalse(p.isShutdown());
590 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
591 >            assertTrue(p.isShutdown());
592 >        }
593      }
594  
498
595      /**
596       * isTerminated is false before termination, true after
597       */
# Line 504 | Line 600 | public class ThreadPoolExecutorSubclassT
600              new CustomTPE(1, 1,
601                            LONG_DELAY_MS, MILLISECONDS,
602                            new ArrayBlockingQueue<Runnable>(10));
603 <        final CountDownLatch threadStarted = new CountDownLatch(1);
604 <        final CountDownLatch done = new CountDownLatch(1);
605 <        try {
603 >        try (PoolCleaner cleaner = cleaner(p)) {
604 >            final CountDownLatch threadStarted = new CountDownLatch(1);
605 >            final CountDownLatch done = new CountDownLatch(1);
606              assertFalse(p.isTerminating());
607              p.execute(new CheckedRunnable() {
608                  public void realRun() throws InterruptedException {
513                    threadStarted.countDown();
609                      assertFalse(p.isTerminating());
610 <                    done.await();
610 >                    threadStarted.countDown();
611 >                    await(done);
612                  }});
613 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
613 >            await(threadStarted);
614              assertFalse(p.isTerminating());
615              done.countDown();
520        } finally {
616              try { p.shutdown(); } catch (SecurityException ok) { return; }
617 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
618 +            assertTrue(p.isTerminated());
619 +            assertFalse(p.isTerminating());
620          }
523        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
524        assertTrue(p.isTerminated());
525        assertFalse(p.isTerminating());
621      }
622  
623      /**
# Line 533 | Line 628 | public class ThreadPoolExecutorSubclassT
628              new CustomTPE(1, 1,
629                            LONG_DELAY_MS, MILLISECONDS,
630                            new ArrayBlockingQueue<Runnable>(10));
631 <        final CountDownLatch threadStarted = new CountDownLatch(1);
632 <        final CountDownLatch done = new CountDownLatch(1);
633 <        try {
631 >        try (PoolCleaner cleaner = cleaner(p)) {
632 >            final CountDownLatch threadStarted = new CountDownLatch(1);
633 >            final CountDownLatch done = new CountDownLatch(1);
634              assertFalse(p.isTerminating());
635              p.execute(new CheckedRunnable() {
636                  public void realRun() throws InterruptedException {
542                    threadStarted.countDown();
637                      assertFalse(p.isTerminating());
638 <                    done.await();
638 >                    threadStarted.countDown();
639 >                    await(done);
640                  }});
641 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
641 >            await(threadStarted);
642              assertFalse(p.isTerminating());
643              done.countDown();
549        } finally {
644              try { p.shutdown(); } catch (SecurityException ok) { return; }
645 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
646 +            assertTrue(p.isTerminated());
647 +            assertFalse(p.isTerminating());
648          }
552        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
553        assertTrue(p.isTerminated());
554        assertFalse(p.isTerminating());
649      }
650  
651      /**
652       * getQueue returns the work queue, which contains queued tasks
653       */
654      public void testGetQueue() throws InterruptedException {
655 <        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
655 >        final CountDownLatch done = new CountDownLatch(1);
656 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
657          final ThreadPoolExecutor p =
658              new CustomTPE(1, 1,
659                            LONG_DELAY_MS, MILLISECONDS,
660                            q);
661 <        final CountDownLatch threadStarted = new CountDownLatch(1);
662 <        final CountDownLatch done = new CountDownLatch(1);
663 <        try {
664 <            FutureTask[] tasks = new FutureTask[5];
661 >        try (PoolCleaner cleaner = cleaner(p, done)) {
662 >            final CountDownLatch threadStarted = new CountDownLatch(1);
663 >            FutureTask[] rtasks = new FutureTask[5];
664 >            @SuppressWarnings("unchecked")
665 >            FutureTask<Boolean>[] tasks = (FutureTask<Boolean>[])rtasks;
666              for (int i = 0; i < tasks.length; i++) {
667 <                Callable task = new CheckedCallable<Boolean>() {
667 >                Callable<Boolean> task = new CheckedCallable<>() {
668                      public Boolean realCall() throws InterruptedException {
669                          threadStarted.countDown();
670                          assertSame(q, p.getQueue());
671 <                        done.await();
671 >                        await(done);
672                          return Boolean.TRUE;
673                      }};
674 <                tasks[i] = new FutureTask(task);
674 >                tasks[i] = new FutureTask<>(task);
675                  p.execute(tasks[i]);
676              }
677 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
677 >            await(threadStarted);
678              assertSame(q, p.getQueue());
679              assertFalse(q.contains(tasks[0]));
680              assertTrue(q.contains(tasks[tasks.length - 1]));
681              assertEquals(tasks.length - 1, q.size());
586        } finally {
587            done.countDown();
588            joinPool(p);
682          }
683      }
684  
# Line 593 | Line 686 | public class ThreadPoolExecutorSubclassT
686       * remove(task) removes queued task, and fails to remove active task
687       */
688      public void testRemove() throws InterruptedException {
689 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
689 >        final CountDownLatch done = new CountDownLatch(1);
690 >        BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
691          final ThreadPoolExecutor p =
692              new CustomTPE(1, 1,
693                            LONG_DELAY_MS, MILLISECONDS,
694                            q);
695 <        Runnable[] tasks = new Runnable[6];
696 <        final CountDownLatch threadStarted = new CountDownLatch(1);
697 <        final CountDownLatch done = new CountDownLatch(1);
604 <        try {
695 >        try (PoolCleaner cleaner = cleaner(p, done)) {
696 >            Runnable[] tasks = new Runnable[6];
697 >            final CountDownLatch threadStarted = new CountDownLatch(1);
698              for (int i = 0; i < tasks.length; i++) {
699                  tasks[i] = new CheckedRunnable() {
700 <                        public void realRun() throws InterruptedException {
701 <                            threadStarted.countDown();
702 <                            done.await();
703 <                        }};
700 >                    public void realRun() throws InterruptedException {
701 >                        threadStarted.countDown();
702 >                        await(done);
703 >                    }};
704                  p.execute(tasks[i]);
705              }
706 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
706 >            await(threadStarted);
707              assertFalse(p.remove(tasks[0]));
708              assertTrue(q.contains(tasks[4]));
709              assertTrue(q.contains(tasks[3]));
# Line 620 | Line 713 | public class ThreadPoolExecutorSubclassT
713              assertTrue(q.contains(tasks[3]));
714              assertTrue(p.remove(tasks[3]));
715              assertFalse(q.contains(tasks[3]));
623        } finally {
624            done.countDown();
625            joinPool(p);
716          }
717      }
718  
# Line 632 | Line 722 | public class ThreadPoolExecutorSubclassT
722      public void testPurge() throws InterruptedException {
723          final CountDownLatch threadStarted = new CountDownLatch(1);
724          final CountDownLatch done = new CountDownLatch(1);
725 <        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
725 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
726          final ThreadPoolExecutor p =
727              new CustomTPE(1, 1,
728                            LONG_DELAY_MS, MILLISECONDS,
729                            q);
730 <        FutureTask[] tasks = new FutureTask[5];
731 <        try {
730 >        try (PoolCleaner cleaner = cleaner(p, done)) {
731 >            FutureTask[] rtasks = new FutureTask[5];
732 >            @SuppressWarnings("unchecked")
733 >            FutureTask<Boolean>[] tasks = (FutureTask<Boolean>[])rtasks;
734              for (int i = 0; i < tasks.length; i++) {
735 <                Callable task = new CheckedCallable<Boolean>() {
735 >                Callable<Boolean> task = new CheckedCallable<>() {
736                      public Boolean realCall() throws InterruptedException {
737                          threadStarted.countDown();
738 <                        done.await();
738 >                        await(done);
739                          return Boolean.TRUE;
740                      }};
741 <                tasks[i] = new FutureTask(task);
741 >                tasks[i] = new FutureTask<>(task);
742                  p.execute(tasks[i]);
743              }
744 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
744 >            await(threadStarted);
745              assertEquals(tasks.length, p.getTaskCount());
746              assertEquals(tasks.length - 1, q.size());
747              assertEquals(1L, p.getActiveCount());
# Line 662 | Line 754 | public class ThreadPoolExecutorSubclassT
754              p.purge();         // Nothing to do
755              assertEquals(tasks.length - 3, q.size());
756              assertEquals(tasks.length - 2, p.getTaskCount());
665        } finally {
666            done.countDown();
667            joinPool(p);
757          }
758      }
759  
760      /**
761 <     * shutDownNow returns a list containing tasks that were not run
761 >     * shutdownNow returns a list containing tasks that were not run,
762 >     * and those tasks are drained from the queue
763       */
764 <    public void testShutDownNow() {
765 <        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
766 <        List l;
767 <        try {
768 <            for (int i = 0; i < 5; i++)
769 <                p.execute(new MediumPossiblyInterruptedRunnable());
770 <        }
771 <        finally {
764 >    public void testShutdownNow() throws InterruptedException {
765 >        final int poolSize = 2;
766 >        final int count = 5;
767 >        final AtomicInteger ran = new AtomicInteger(0);
768 >        final ThreadPoolExecutor p =
769 >            new CustomTPE(poolSize, poolSize,
770 >                          LONG_DELAY_MS, MILLISECONDS,
771 >                          new ArrayBlockingQueue<Runnable>(10));
772 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
773 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
774 >            threadsStarted.countDown();
775              try {
776 <                l = p.shutdownNow();
777 <            } catch (SecurityException ok) { return; }
776 >                MILLISECONDS.sleep(LONGER_DELAY_MS);
777 >            } catch (InterruptedException success) {}
778 >            ran.getAndIncrement();
779 >        }};
780 >        for (int i = 0; i < count; i++)
781 >            p.execute(waiter);
782 >        await(threadsStarted);
783 >        assertEquals(poolSize, p.getActiveCount());
784 >        assertEquals(0, p.getCompletedTaskCount());
785 >        final List<Runnable> queuedTasks;
786 >        try {
787 >            queuedTasks = p.shutdownNow();
788 >        } catch (SecurityException ok) {
789 >            return; // Allowed in case test doesn't have privs
790          }
791          assertTrue(p.isShutdown());
792 <        assertTrue(l.size() <= 4);
792 >        assertTrue(p.getQueue().isEmpty());
793 >        assertEquals(count - poolSize, queuedTasks.size());
794 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
795 >        assertTrue(p.isTerminated());
796 >        assertEquals(poolSize, ran.get());
797 >        assertEquals(poolSize, p.getCompletedTaskCount());
798      }
799  
800      // Exception Tests
801  
692
802      /**
803       * Constructor throws if corePoolSize argument is less than zero
804       */
805      public void testConstructor1() {
806          try {
807 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
807 >            new CustomTPE(-1, 1, 1L, SECONDS,
808 >                          new ArrayBlockingQueue<Runnable>(10));
809              shouldThrow();
810          } catch (IllegalArgumentException success) {}
811      }
# Line 705 | Line 815 | public class ThreadPoolExecutorSubclassT
815       */
816      public void testConstructor2() {
817          try {
818 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
818 >            new CustomTPE(1, -1, 1L, SECONDS,
819 >                          new ArrayBlockingQueue<Runnable>(10));
820              shouldThrow();
821          } catch (IllegalArgumentException success) {}
822      }
# Line 715 | Line 826 | public class ThreadPoolExecutorSubclassT
826       */
827      public void testConstructor3() {
828          try {
829 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
829 >            new CustomTPE(1, 0, 1L, SECONDS,
830 >                          new ArrayBlockingQueue<Runnable>(10));
831              shouldThrow();
832          } catch (IllegalArgumentException success) {}
833      }
# Line 725 | Line 837 | public class ThreadPoolExecutorSubclassT
837       */
838      public void testConstructor4() {
839          try {
840 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
840 >            new CustomTPE(1, 2, -1L, SECONDS,
841 >                          new ArrayBlockingQueue<Runnable>(10));
842              shouldThrow();
843          } catch (IllegalArgumentException success) {}
844      }
# Line 735 | Line 848 | public class ThreadPoolExecutorSubclassT
848       */
849      public void testConstructor5() {
850          try {
851 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
851 >            new CustomTPE(2, 1, 1L, SECONDS,
852 >                          new ArrayBlockingQueue<Runnable>(10));
853              shouldThrow();
854          } catch (IllegalArgumentException success) {}
855      }
# Line 745 | Line 859 | public class ThreadPoolExecutorSubclassT
859       */
860      public void testConstructorNullPointerException() {
861          try {
862 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
862 >            new CustomTPE(1, 2, 1L, SECONDS, null);
863              shouldThrow();
864          } catch (NullPointerException success) {}
865      }
866  
753
754
867      /**
868       * Constructor throws if corePoolSize argument is less than zero
869       */
870      public void testConstructor6() {
871          try {
872 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
872 >            new CustomTPE(-1, 1, 1L, SECONDS,
873 >                          new ArrayBlockingQueue<Runnable>(10),
874 >                          new SimpleThreadFactory());
875              shouldThrow();
876          } catch (IllegalArgumentException success) {}
877      }
# Line 767 | Line 881 | public class ThreadPoolExecutorSubclassT
881       */
882      public void testConstructor7() {
883          try {
884 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
884 >            new CustomTPE(1,-1, 1L, SECONDS,
885 >                          new ArrayBlockingQueue<Runnable>(10),
886 >                          new SimpleThreadFactory());
887              shouldThrow();
888          } catch (IllegalArgumentException success) {}
889      }
# Line 777 | Line 893 | public class ThreadPoolExecutorSubclassT
893       */
894      public void testConstructor8() {
895          try {
896 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
896 >            new CustomTPE(1, 0, 1L, SECONDS,
897 >                          new ArrayBlockingQueue<Runnable>(10),
898 >                          new SimpleThreadFactory());
899              shouldThrow();
900          } catch (IllegalArgumentException success) {}
901      }
# Line 787 | Line 905 | public class ThreadPoolExecutorSubclassT
905       */
906      public void testConstructor9() {
907          try {
908 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
908 >            new CustomTPE(1, 2, -1L, SECONDS,
909 >                          new ArrayBlockingQueue<Runnable>(10),
910 >                          new SimpleThreadFactory());
911              shouldThrow();
912          } catch (IllegalArgumentException success) {}
913      }
# Line 797 | Line 917 | public class ThreadPoolExecutorSubclassT
917       */
918      public void testConstructor10() {
919          try {
920 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
920 >            new CustomTPE(2, 1, 1L, SECONDS,
921 >                          new ArrayBlockingQueue<Runnable>(10),
922 >                          new SimpleThreadFactory());
923              shouldThrow();
924          } catch (IllegalArgumentException success) {}
925      }
# Line 807 | Line 929 | public class ThreadPoolExecutorSubclassT
929       */
930      public void testConstructorNullPointerException2() {
931          try {
932 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
932 >            new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
933              shouldThrow();
934          } catch (NullPointerException success) {}
935      }
# Line 817 | Line 939 | public class ThreadPoolExecutorSubclassT
939       */
940      public void testConstructorNullPointerException3() {
941          try {
942 <            ThreadFactory f = null;
943 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
942 >            new CustomTPE(1, 2, 1L, SECONDS,
943 >                          new ArrayBlockingQueue<Runnable>(10),
944 >                          (ThreadFactory) null);
945              shouldThrow();
946          } catch (NullPointerException success) {}
947      }
948  
826
949      /**
950       * Constructor throws if corePoolSize argument is less than zero
951       */
952      public void testConstructor11() {
953          try {
954 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
954 >            new CustomTPE(-1, 1, 1L, SECONDS,
955 >                          new ArrayBlockingQueue<Runnable>(10),
956 >                          new NoOpREHandler());
957              shouldThrow();
958          } catch (IllegalArgumentException success) {}
959      }
# Line 839 | Line 963 | public class ThreadPoolExecutorSubclassT
963       */
964      public void testConstructor12() {
965          try {
966 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
966 >            new CustomTPE(1, -1, 1L, SECONDS,
967 >                          new ArrayBlockingQueue<Runnable>(10),
968 >                          new NoOpREHandler());
969              shouldThrow();
970          } catch (IllegalArgumentException success) {}
971      }
# Line 849 | Line 975 | public class ThreadPoolExecutorSubclassT
975       */
976      public void testConstructor13() {
977          try {
978 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
978 >            new CustomTPE(1, 0, 1L, SECONDS,
979 >                          new ArrayBlockingQueue<Runnable>(10),
980 >                          new NoOpREHandler());
981              shouldThrow();
982          } catch (IllegalArgumentException success) {}
983      }
# Line 859 | Line 987 | public class ThreadPoolExecutorSubclassT
987       */
988      public void testConstructor14() {
989          try {
990 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
990 >            new CustomTPE(1, 2, -1L, SECONDS,
991 >                          new ArrayBlockingQueue<Runnable>(10),
992 >                          new NoOpREHandler());
993              shouldThrow();
994          } catch (IllegalArgumentException success) {}
995      }
# Line 869 | Line 999 | public class ThreadPoolExecutorSubclassT
999       */
1000      public void testConstructor15() {
1001          try {
1002 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
1002 >            new CustomTPE(2, 1, 1L, SECONDS,
1003 >                          new ArrayBlockingQueue<Runnable>(10),
1004 >                          new NoOpREHandler());
1005              shouldThrow();
1006          } catch (IllegalArgumentException success) {}
1007      }
# Line 879 | Line 1011 | public class ThreadPoolExecutorSubclassT
1011       */
1012      public void testConstructorNullPointerException4() {
1013          try {
1014 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
1014 >            new CustomTPE(1, 2, 1L, SECONDS,
1015 >                          null,
1016 >                          new NoOpREHandler());
1017              shouldThrow();
1018          } catch (NullPointerException success) {}
1019      }
# Line 889 | Line 1023 | public class ThreadPoolExecutorSubclassT
1023       */
1024      public void testConstructorNullPointerException5() {
1025          try {
1026 <            RejectedExecutionHandler r = null;
1027 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
1026 >            new CustomTPE(1, 2, 1L, SECONDS,
1027 >                          new ArrayBlockingQueue<Runnable>(10),
1028 >                          (RejectedExecutionHandler) null);
1029              shouldThrow();
1030          } catch (NullPointerException success) {}
1031      }
1032  
898
1033      /**
1034       * Constructor throws if corePoolSize argument is less than zero
1035       */
1036      public void testConstructor16() {
1037          try {
1038 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1038 >            new CustomTPE(-1, 1, 1L, SECONDS,
1039 >                          new ArrayBlockingQueue<Runnable>(10),
1040 >                          new SimpleThreadFactory(),
1041 >                          new NoOpREHandler());
1042              shouldThrow();
1043          } catch (IllegalArgumentException success) {}
1044      }
# Line 911 | Line 1048 | public class ThreadPoolExecutorSubclassT
1048       */
1049      public void testConstructor17() {
1050          try {
1051 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1051 >            new CustomTPE(1, -1, 1L, SECONDS,
1052 >                          new ArrayBlockingQueue<Runnable>(10),
1053 >                          new SimpleThreadFactory(),
1054 >                          new NoOpREHandler());
1055              shouldThrow();
1056          } catch (IllegalArgumentException success) {}
1057      }
# Line 921 | Line 1061 | public class ThreadPoolExecutorSubclassT
1061       */
1062      public void testConstructor18() {
1063          try {
1064 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1064 >            new CustomTPE(1, 0, 1L, SECONDS,
1065 >                          new ArrayBlockingQueue<Runnable>(10),
1066 >                          new SimpleThreadFactory(),
1067 >                          new NoOpREHandler());
1068              shouldThrow();
1069          } catch (IllegalArgumentException success) {}
1070      }
# Line 931 | Line 1074 | public class ThreadPoolExecutorSubclassT
1074       */
1075      public void testConstructor19() {
1076          try {
1077 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1077 >            new CustomTPE(1, 2, -1L, SECONDS,
1078 >                          new ArrayBlockingQueue<Runnable>(10),
1079 >                          new SimpleThreadFactory(),
1080 >                          new NoOpREHandler());
1081              shouldThrow();
1082          } catch (IllegalArgumentException success) {}
1083      }
# Line 941 | Line 1087 | public class ThreadPoolExecutorSubclassT
1087       */
1088      public void testConstructor20() {
1089          try {
1090 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1090 >            new CustomTPE(2, 1, 1L, SECONDS,
1091 >                          new ArrayBlockingQueue<Runnable>(10),
1092 >                          new SimpleThreadFactory(),
1093 >                          new NoOpREHandler());
1094              shouldThrow();
1095          } catch (IllegalArgumentException success) {}
1096      }
# Line 951 | Line 1100 | public class ThreadPoolExecutorSubclassT
1100       */
1101      public void testConstructorNullPointerException6() {
1102          try {
1103 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1103 >            new CustomTPE(1, 2, 1L, SECONDS,
1104 >                          null,
1105 >                          new SimpleThreadFactory(),
1106 >                          new NoOpREHandler());
1107              shouldThrow();
1108          } catch (NullPointerException success) {}
1109      }
# Line 961 | Line 1113 | public class ThreadPoolExecutorSubclassT
1113       */
1114      public void testConstructorNullPointerException7() {
1115          try {
1116 <            RejectedExecutionHandler r = null;
1117 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1116 >            new CustomTPE(1, 2, 1L, SECONDS,
1117 >                          new ArrayBlockingQueue<Runnable>(10),
1118 >                          new SimpleThreadFactory(),
1119 >                          (RejectedExecutionHandler) null);
1120              shouldThrow();
1121          } catch (NullPointerException success) {}
1122      }
# Line 972 | Line 1126 | public class ThreadPoolExecutorSubclassT
1126       */
1127      public void testConstructorNullPointerException8() {
1128          try {
1129 <            new CustomTPE(1, 2,
976 <                          LONG_DELAY_MS, MILLISECONDS,
1129 >            new CustomTPE(1, 2, 1L, SECONDS,
1130                            new ArrayBlockingQueue<Runnable>(10),
1131                            (ThreadFactory) null,
1132                            new NoOpREHandler());
# Line 981 | Line 1134 | public class ThreadPoolExecutorSubclassT
1134          } catch (NullPointerException success) {}
1135      }
1136  
984
1137      /**
1138 <     * execute throws RejectedExecutionException if saturated.
1138 >     * Submitted tasks are rejected when saturated or shutdown
1139       */
1140 <    public void testSaturatedExecute() {
1141 <        ThreadPoolExecutor p =
1140 >    public void testSubmittedTasksRejectedWhenSaturatedOrShutdown() throws InterruptedException {
1141 >        final ThreadPoolExecutor p =
1142              new CustomTPE(1, 1,
1143                            LONG_DELAY_MS, MILLISECONDS,
1144                            new ArrayBlockingQueue<Runnable>(1));
1145 +        final int saturatedSize = saturatedSize(p);
1146 +        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
1147 +        final CountDownLatch threadsStarted = new CountDownLatch(p.getMaximumPoolSize());
1148          final CountDownLatch done = new CountDownLatch(1);
1149 <        try {
1150 <            Runnable task = new CheckedRunnable() {
1151 <                public void realRun() throws InterruptedException {
1149 >        final Runnable r = () -> {
1150 >            threadsStarted.countDown();
1151 >            for (;;) {
1152 >                try {
1153                      done.await();
1154 <                }};
1155 <            for (int i = 0; i < 2; ++i)
1156 <                p.execute(task);
1157 <            for (int i = 0; i < 2; ++i) {
1154 >                    return;
1155 >                } catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
1156 >            }};
1157 >        final Callable<Boolean> c = () -> {
1158 >            threadsStarted.countDown();
1159 >            for (;;) {
1160                  try {
1161 <                    p.execute(task);
1162 <                    shouldThrow();
1163 <                } catch (RejectedExecutionException success) {}
1164 <                assertTrue(p.getTaskCount() <= 2);
1161 >                    done.await();
1162 >                    return Boolean.TRUE;
1163 >                } catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
1164 >            }};
1165 >        final boolean shutdownNow = rnd.nextBoolean();
1166 >
1167 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1168 >            // saturate
1169 >            for (int i = saturatedSize; i--> 0; ) {
1170 >                switch (rnd.nextInt(4)) {
1171 >                case 0: p.execute(r); break;
1172 >                case 1: assertFalse(p.submit(r).isDone()); break;
1173 >                case 2: assertFalse(p.submit(r, Boolean.TRUE).isDone()); break;
1174 >                case 3: assertFalse(p.submit(c).isDone()); break;
1175 >                }
1176              }
1008        } finally {
1009            done.countDown();
1010            joinPool(p);
1011        }
1012    }
1177  
1178 <    /**
1179 <     * executor using CallerRunsPolicy runs task if saturated.
1180 <     */
1181 <    public void testSaturatedExecute2() {
1182 <        RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1183 <        ThreadPoolExecutor p = new CustomTPE(1, 1,
1184 <                                             LONG_DELAY_MS, MILLISECONDS,
1185 <                                             new ArrayBlockingQueue<Runnable>(1),
1186 <                                             h);
1187 <        try {
1188 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1189 <            for (int i = 0; i < tasks.length; ++i)
1190 <                tasks[i] = new TrackedNoOpRunnable();
1191 <            TrackedLongRunnable mr = new TrackedLongRunnable();
1192 <            p.execute(mr);
1193 <            for (int i = 0; i < tasks.length; ++i)
1194 <                p.execute(tasks[i]);
1195 <            for (int i = 1; i < tasks.length; ++i)
1196 <                assertTrue(tasks[i].done);
1033 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1034 <        } finally {
1035 <            joinPool(p);
1036 <        }
1178 >            await(threadsStarted);
1179 >            assertTaskSubmissionsAreRejected(p);
1180 >
1181 >            if (shutdownNow)
1182 >                p.shutdownNow();
1183 >            else
1184 >                p.shutdown();
1185 >            // Pool is shutdown, but not yet terminated
1186 >            assertTaskSubmissionsAreRejected(p);
1187 >            assertFalse(p.isTerminated());
1188 >
1189 >            done.countDown();   // release blocking tasks
1190 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
1191 >
1192 >            assertTaskSubmissionsAreRejected(p);
1193 >        }
1194 >        assertEquals(saturatedSize(p)
1195 >                     - (shutdownNow ? p.getQueue().remainingCapacity() : 0),
1196 >                     p.getCompletedTaskCount());
1197      }
1198  
1199      /**
1200 <     * executor using DiscardPolicy drops task if saturated.
1200 >     * executor using DiscardOldestPolicy drops oldest task if saturated.
1201       */
1202 <    public void testSaturatedExecute3() {
1203 <        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1204 <        ThreadPoolExecutor p =
1202 >    public void testSaturatedExecute_DiscardOldestPolicy() {
1203 >        final CountDownLatch done = new CountDownLatch(1);
1204 >        LatchAwaiter r1 = awaiter(done);
1205 >        LatchAwaiter r2 = awaiter(done);
1206 >        LatchAwaiter r3 = awaiter(done);
1207 >        final ThreadPoolExecutor p =
1208              new CustomTPE(1, 1,
1209                            LONG_DELAY_MS, MILLISECONDS,
1210                            new ArrayBlockingQueue<Runnable>(1),
1211 <                          h);
1212 <        try {
1213 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1214 <            for (int i = 0; i < tasks.length; ++i)
1215 <                tasks[i] = new TrackedNoOpRunnable();
1216 <            p.execute(new TrackedLongRunnable());
1054 <            for (TrackedNoOpRunnable task : tasks)
1055 <                p.execute(task);
1056 <            for (TrackedNoOpRunnable task : tasks)
1057 <                assertFalse(task.done);
1058 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1059 <        } finally {
1060 <            joinPool(p);
1061 <        }
1062 <    }
1063 <
1064 <    /**
1065 <     * executor using DiscardOldestPolicy drops oldest task if saturated.
1066 <     */
1067 <    public void testSaturatedExecute4() {
1068 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1069 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1070 <        try {
1071 <            p.execute(new TrackedLongRunnable());
1072 <            TrackedLongRunnable r2 = new TrackedLongRunnable();
1211 >                          new ThreadPoolExecutor.DiscardOldestPolicy());
1212 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1213 >            assertEquals(LatchAwaiter.NEW, r1.state);
1214 >            assertEquals(LatchAwaiter.NEW, r2.state);
1215 >            assertEquals(LatchAwaiter.NEW, r3.state);
1216 >            p.execute(r1);
1217              p.execute(r2);
1218              assertTrue(p.getQueue().contains(r2));
1075            TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1219              p.execute(r3);
1220              assertFalse(p.getQueue().contains(r2));
1221              assertTrue(p.getQueue().contains(r3));
1079            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1080        } finally {
1081            joinPool(p);
1082        }
1083    }
1084
1085    /**
1086     * execute throws RejectedExecutionException if shutdown
1087     */
1088    public void testRejectedExecutionExceptionOnShutdown() {
1089        ThreadPoolExecutor p =
1090            new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1091        try { p.shutdown(); } catch (SecurityException ok) { return; }
1092        try {
1093            p.execute(new NoOpRunnable());
1094            shouldThrow();
1095        } catch (RejectedExecutionException success) {}
1096
1097        joinPool(p);
1098    }
1099
1100    /**
1101     * execute using CallerRunsPolicy drops task on shutdown
1102     */
1103    public void testCallerRunsOnShutdown() {
1104        RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1105        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1106
1107        try { p.shutdown(); } catch (SecurityException ok) { return; }
1108        try {
1109            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1110            p.execute(r);
1111            assertFalse(r.done);
1112        } finally {
1113            joinPool(p);
1222          }
1223 +        assertEquals(LatchAwaiter.DONE, r1.state);
1224 +        assertEquals(LatchAwaiter.NEW, r2.state);
1225 +        assertEquals(LatchAwaiter.DONE, r3.state);
1226      }
1227  
1228      /**
1118     * execute using DiscardPolicy drops task on shutdown
1119     */
1120    public void testDiscardOnShutdown() {
1121        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1122        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1123
1124        try { p.shutdown(); } catch (SecurityException ok) { return; }
1125        try {
1126            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1127            p.execute(r);
1128            assertFalse(r.done);
1129        } finally {
1130            joinPool(p);
1131        }
1132    }
1133
1134
1135    /**
1229       * execute using DiscardOldestPolicy drops task on shutdown
1230       */
1231      public void testDiscardOldestOnShutdown() {
1232 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1233 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1232 >        final ThreadPoolExecutor p =
1233 >            new CustomTPE(1, 1,
1234 >                          LONG_DELAY_MS, MILLISECONDS,
1235 >                          new ArrayBlockingQueue<Runnable>(1),
1236 >                          new ThreadPoolExecutor.DiscardOldestPolicy());
1237  
1238          try { p.shutdown(); } catch (SecurityException ok) { return; }
1239 <        try {
1239 >        try (PoolCleaner cleaner = cleaner(p)) {
1240              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1241              p.execute(r);
1242              assertFalse(r.done);
1147        } finally {
1148            joinPool(p);
1243          }
1244      }
1245  
1152
1246      /**
1247 <     * execute(null) throws NPE
1247 >     * Submitting null tasks throws NullPointerException
1248       */
1249 <    public void testExecuteNull() {
1250 <        ThreadPoolExecutor p = null;
1251 <        try {
1252 <            p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1253 <            p.execute(null);
1254 <            shouldThrow();
1255 <        } catch (NullPointerException success) {}
1256 <
1164 <        joinPool(p);
1249 >    public void testNullTaskSubmission() {
1250 >        final ThreadPoolExecutor p =
1251 >            new CustomTPE(1, 2,
1252 >                          1L, SECONDS,
1253 >                          new ArrayBlockingQueue<Runnable>(10));
1254 >        try (PoolCleaner cleaner = cleaner(p)) {
1255 >            assertNullTaskSubmissionThrowsNullPointerException(p);
1256 >        }
1257      }
1258  
1259      /**
1260       * setCorePoolSize of negative value throws IllegalArgumentException
1261       */
1262      public void testCorePoolSizeIllegalArgumentException() {
1263 <        ThreadPoolExecutor p =
1264 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1265 <        try {
1266 <            p.setCorePoolSize(-1);
1267 <            shouldThrow();
1268 <        } catch (IllegalArgumentException success) {
1269 <        } finally {
1270 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1263 >        final ThreadPoolExecutor p =
1264 >            new CustomTPE(1, 2,
1265 >                          LONG_DELAY_MS, MILLISECONDS,
1266 >                          new ArrayBlockingQueue<Runnable>(10));
1267 >        try (PoolCleaner cleaner = cleaner(p)) {
1268 >            try {
1269 >                p.setCorePoolSize(-1);
1270 >                shouldThrow();
1271 >            } catch (IllegalArgumentException success) {}
1272          }
1180        joinPool(p);
1273      }
1274  
1275      /**
# Line 1185 | Line 1277 | public class ThreadPoolExecutorSubclassT
1277       * if given a value less the core pool size
1278       */
1279      public void testMaximumPoolSizeIllegalArgumentException() {
1280 <        ThreadPoolExecutor p =
1281 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1282 <        try {
1283 <            p.setMaximumPoolSize(1);
1284 <            shouldThrow();
1285 <        } catch (IllegalArgumentException success) {
1286 <        } finally {
1287 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1280 >        final ThreadPoolExecutor p =
1281 >            new CustomTPE(2, 3,
1282 >                          LONG_DELAY_MS, MILLISECONDS,
1283 >                          new ArrayBlockingQueue<Runnable>(10));
1284 >        try (PoolCleaner cleaner = cleaner(p)) {
1285 >            try {
1286 >                p.setMaximumPoolSize(1);
1287 >                shouldThrow();
1288 >            } catch (IllegalArgumentException success) {}
1289          }
1197        joinPool(p);
1290      }
1291  
1292      /**
# Line 1202 | Line 1294 | public class ThreadPoolExecutorSubclassT
1294       * if given a negative value
1295       */
1296      public void testMaximumPoolSizeIllegalArgumentException2() {
1297 <        ThreadPoolExecutor p =
1298 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1299 <        try {
1300 <            p.setMaximumPoolSize(-1);
1301 <            shouldThrow();
1302 <        } catch (IllegalArgumentException success) {
1303 <        } finally {
1304 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1297 >        final ThreadPoolExecutor p =
1298 >            new CustomTPE(2, 3,
1299 >                          LONG_DELAY_MS, MILLISECONDS,
1300 >                          new ArrayBlockingQueue<Runnable>(10));
1301 >        try (PoolCleaner cleaner = cleaner(p)) {
1302 >            try {
1303 >                p.setMaximumPoolSize(-1);
1304 >                shouldThrow();
1305 >            } catch (IllegalArgumentException success) {}
1306          }
1214        joinPool(p);
1307      }
1308  
1217
1309      /**
1310       * setKeepAliveTime throws IllegalArgumentException
1311       * when given a negative value
1312       */
1313      public void testKeepAliveTimeIllegalArgumentException() {
1314 <        ThreadPoolExecutor p =
1315 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1316 <
1317 <        try {
1318 <            p.setKeepAliveTime(-1,MILLISECONDS);
1319 <            shouldThrow();
1320 <        } catch (IllegalArgumentException success) {
1321 <        } finally {
1322 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1314 >        final ThreadPoolExecutor p =
1315 >            new CustomTPE(2, 3,
1316 >                          LONG_DELAY_MS, MILLISECONDS,
1317 >                          new ArrayBlockingQueue<Runnable>(10));
1318 >        try (PoolCleaner cleaner = cleaner(p)) {
1319 >            try {
1320 >                p.setKeepAliveTime(-1, MILLISECONDS);
1321 >                shouldThrow();
1322 >            } catch (IllegalArgumentException success) {}
1323          }
1233        joinPool(p);
1324      }
1325  
1326      /**
# Line 1238 | Line 1328 | public class ThreadPoolExecutorSubclassT
1328       */
1329      public void testTerminated() {
1330          CustomTPE p = new CustomTPE();
1331 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
1332 <        assertTrue(p.terminatedCalled);
1333 <        joinPool(p);
1331 >        try (PoolCleaner cleaner = cleaner(p)) {
1332 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1333 >            assertTrue(p.terminatedCalled());
1334 >            assertTrue(p.isShutdown());
1335 >        }
1336      }
1337  
1338      /**
# Line 1248 | Line 1340 | public class ThreadPoolExecutorSubclassT
1340       */
1341      public void testBeforeAfter() throws InterruptedException {
1342          CustomTPE p = new CustomTPE();
1343 <        try {
1344 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1345 <            p.execute(r);
1346 <            Thread.sleep(SHORT_DELAY_MS);
1347 <            assertTrue(r.done);
1348 <            assertTrue(p.beforeCalled);
1349 <            assertTrue(p.afterCalled);
1350 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1351 <        } finally {
1352 <            joinPool(p);
1343 >        try (PoolCleaner cleaner = cleaner(p)) {
1344 >            final CountDownLatch done = new CountDownLatch(1);
1345 >            p.execute(new CheckedRunnable() {
1346 >                public void realRun() {
1347 >                    done.countDown();
1348 >                }});
1349 >            await(p.afterCalled);
1350 >            assertEquals(0, done.getCount());
1351 >            assertTrue(p.afterCalled());
1352 >            assertTrue(p.beforeCalled());
1353          }
1354      }
1355  
# Line 1265 | Line 1357 | public class ThreadPoolExecutorSubclassT
1357       * completed submit of callable returns result
1358       */
1359      public void testSubmitCallable() throws Exception {
1360 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1361 <        try {
1360 >        final ExecutorService e =
1361 >            new CustomTPE(2, 2,
1362 >                          LONG_DELAY_MS, MILLISECONDS,
1363 >                          new ArrayBlockingQueue<Runnable>(10));
1364 >        try (PoolCleaner cleaner = cleaner(e)) {
1365              Future<String> future = e.submit(new StringTask());
1366              String result = future.get();
1367              assertSame(TEST_STRING, result);
1273        } finally {
1274            joinPool(e);
1368          }
1369      }
1370  
# Line 1279 | Line 1372 | public class ThreadPoolExecutorSubclassT
1372       * completed submit of runnable returns successfully
1373       */
1374      public void testSubmitRunnable() throws Exception {
1375 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1376 <        try {
1375 >        final ExecutorService e =
1376 >            new CustomTPE(2, 2,
1377 >                          LONG_DELAY_MS, MILLISECONDS,
1378 >                          new ArrayBlockingQueue<Runnable>(10));
1379 >        try (PoolCleaner cleaner = cleaner(e)) {
1380              Future<?> future = e.submit(new NoOpRunnable());
1381              future.get();
1382              assertTrue(future.isDone());
1287        } finally {
1288            joinPool(e);
1383          }
1384      }
1385  
# Line 1293 | Line 1387 | public class ThreadPoolExecutorSubclassT
1387       * completed submit of (runnable, result) returns result
1388       */
1389      public void testSubmitRunnable2() throws Exception {
1390 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1391 <        try {
1390 >        final ExecutorService e =
1391 >            new CustomTPE(2, 2,
1392 >                          LONG_DELAY_MS, MILLISECONDS,
1393 >                          new ArrayBlockingQueue<Runnable>(10));
1394 >        try (PoolCleaner cleaner = cleaner(e)) {
1395              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1396              String result = future.get();
1397              assertSame(TEST_STRING, result);
1301        } finally {
1302            joinPool(e);
1398          }
1399      }
1400  
1306
1401      /**
1402 <     * invokeAny(null) throws NPE
1402 >     * invokeAny(null) throws NullPointerException
1403       */
1404      public void testInvokeAny1() throws Exception {
1405 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1406 <        try {
1407 <            e.invokeAny(null);
1408 <            shouldThrow();
1409 <        } catch (NullPointerException success) {
1410 <        } finally {
1411 <            joinPool(e);
1405 >        final ExecutorService e =
1406 >            new CustomTPE(2, 2,
1407 >                          LONG_DELAY_MS, MILLISECONDS,
1408 >                          new ArrayBlockingQueue<Runnable>(10));
1409 >        try (PoolCleaner cleaner = cleaner(e)) {
1410 >            try {
1411 >                e.invokeAny(null);
1412 >                shouldThrow();
1413 >            } catch (NullPointerException success) {}
1414          }
1415      }
1416  
1417      /**
1418 <     * invokeAny(empty collection) throws IAE
1418 >     * invokeAny(empty collection) throws IllegalArgumentException
1419       */
1420      public void testInvokeAny2() throws Exception {
1421 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1422 <        try {
1423 <            e.invokeAny(new ArrayList<Callable<String>>());
1424 <            shouldThrow();
1425 <        } catch (IllegalArgumentException success) {
1426 <        } finally {
1427 <            joinPool(e);
1421 >        final ExecutorService e =
1422 >            new CustomTPE(2, 2,
1423 >                          LONG_DELAY_MS, MILLISECONDS,
1424 >                          new ArrayBlockingQueue<Runnable>(10));
1425 >        try (PoolCleaner cleaner = cleaner(e)) {
1426 >            try {
1427 >                e.invokeAny(new ArrayList<Callable<String>>());
1428 >                shouldThrow();
1429 >            } catch (IllegalArgumentException success) {}
1430          }
1431      }
1432  
# Line 1337 | Line 1435 | public class ThreadPoolExecutorSubclassT
1435       */
1436      public void testInvokeAny3() throws Exception {
1437          CountDownLatch latch = new CountDownLatch(1);
1438 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1439 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1440 <        l.add(latchAwaitingStringTask(latch));
1441 <        l.add(null);
1442 <        try {
1443 <            e.invokeAny(l);
1444 <            shouldThrow();
1445 <        } catch (NullPointerException success) {
1446 <        } finally {
1438 >        final ExecutorService e =
1439 >            new CustomTPE(2, 2,
1440 >                          LONG_DELAY_MS, MILLISECONDS,
1441 >                          new ArrayBlockingQueue<Runnable>(10));
1442 >        try (PoolCleaner cleaner = cleaner(e)) {
1443 >            List<Callable<String>> l = new ArrayList<>();
1444 >            l.add(latchAwaitingStringTask(latch));
1445 >            l.add(null);
1446 >            try {
1447 >                e.invokeAny(l);
1448 >                shouldThrow();
1449 >            } catch (NullPointerException success) {}
1450              latch.countDown();
1350            joinPool(e);
1451          }
1452      }
1453  
# Line 1355 | Line 1455 | public class ThreadPoolExecutorSubclassT
1455       * invokeAny(c) throws ExecutionException if no task completes
1456       */
1457      public void testInvokeAny4() throws Exception {
1458 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1459 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1460 <        l.add(new NPETask());
1461 <        try {
1462 <            e.invokeAny(l);
1463 <            shouldThrow();
1464 <        } catch (ExecutionException success) {
1465 <            assertTrue(success.getCause() instanceof NullPointerException);
1466 <        } finally {
1467 <            joinPool(e);
1458 >        final ExecutorService e =
1459 >            new CustomTPE(2, 2,
1460 >                          LONG_DELAY_MS, MILLISECONDS,
1461 >                          new ArrayBlockingQueue<Runnable>(10));
1462 >        try (PoolCleaner cleaner = cleaner(e)) {
1463 >            List<Callable<String>> l = new ArrayList<>();
1464 >            l.add(new NPETask());
1465 >            try {
1466 >                e.invokeAny(l);
1467 >                shouldThrow();
1468 >            } catch (ExecutionException success) {
1469 >                assertTrue(success.getCause() instanceof NullPointerException);
1470 >            }
1471          }
1472      }
1473  
# Line 1372 | Line 1475 | public class ThreadPoolExecutorSubclassT
1475       * invokeAny(c) returns result of some task
1476       */
1477      public void testInvokeAny5() throws Exception {
1478 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1479 <        try {
1480 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1478 >        final ExecutorService e =
1479 >            new CustomTPE(2, 2,
1480 >                          LONG_DELAY_MS, MILLISECONDS,
1481 >                          new ArrayBlockingQueue<Runnable>(10));
1482 >        try (PoolCleaner cleaner = cleaner(e)) {
1483 >            List<Callable<String>> l = new ArrayList<>();
1484              l.add(new StringTask());
1485              l.add(new StringTask());
1486              String result = e.invokeAny(l);
1487              assertSame(TEST_STRING, result);
1382        } finally {
1383            joinPool(e);
1488          }
1489      }
1490  
# Line 1388 | Line 1492 | public class ThreadPoolExecutorSubclassT
1492       * invokeAll(null) throws NPE
1493       */
1494      public void testInvokeAll1() throws Exception {
1495 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1496 <        try {
1497 <            e.invokeAll(null);
1498 <            shouldThrow();
1499 <        } catch (NullPointerException success) {
1500 <        } finally {
1501 <            joinPool(e);
1495 >        final ExecutorService e =
1496 >            new CustomTPE(2, 2,
1497 >                          LONG_DELAY_MS, MILLISECONDS,
1498 >                          new ArrayBlockingQueue<Runnable>(10));
1499 >        try (PoolCleaner cleaner = cleaner(e)) {
1500 >            try {
1501 >                e.invokeAll(null);
1502 >                shouldThrow();
1503 >            } catch (NullPointerException success) {}
1504          }
1505      }
1506  
1507      /**
1508 <     * invokeAll(empty collection) returns empty collection
1508 >     * invokeAll(empty collection) returns empty list
1509       */
1510      public void testInvokeAll2() throws Exception {
1511 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1512 <        try {
1513 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1511 >        final ExecutorService e =
1512 >            new CustomTPE(2, 2,
1513 >                          LONG_DELAY_MS, MILLISECONDS,
1514 >                          new ArrayBlockingQueue<Runnable>(10));
1515 >        final Collection<Callable<String>> emptyCollection
1516 >            = Collections.emptyList();
1517 >        try (PoolCleaner cleaner = cleaner(e)) {
1518 >            List<Future<String>> r = e.invokeAll(emptyCollection);
1519              assertTrue(r.isEmpty());
1409        } finally {
1410            joinPool(e);
1520          }
1521      }
1522  
# Line 1415 | Line 1524 | public class ThreadPoolExecutorSubclassT
1524       * invokeAll(c) throws NPE if c has null elements
1525       */
1526      public void testInvokeAll3() throws Exception {
1527 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1528 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1529 <        l.add(new StringTask());
1530 <        l.add(null);
1531 <        try {
1532 <            e.invokeAll(l);
1533 <            shouldThrow();
1534 <        } catch (NullPointerException success) {
1535 <        } finally {
1536 <            joinPool(e);
1527 >        final ExecutorService e =
1528 >            new CustomTPE(2, 2,
1529 >                          LONG_DELAY_MS, MILLISECONDS,
1530 >                          new ArrayBlockingQueue<Runnable>(10));
1531 >        try (PoolCleaner cleaner = cleaner(e)) {
1532 >            List<Callable<String>> l = new ArrayList<>();
1533 >            l.add(new StringTask());
1534 >            l.add(null);
1535 >            try {
1536 >                e.invokeAll(l);
1537 >                shouldThrow();
1538 >            } catch (NullPointerException success) {}
1539          }
1540      }
1541  
# Line 1432 | Line 1543 | public class ThreadPoolExecutorSubclassT
1543       * get of element of invokeAll(c) throws exception on failed task
1544       */
1545      public void testInvokeAll4() throws Exception {
1546 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1547 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1548 <        l.add(new NPETask());
1549 <        List<Future<String>> futures = e.invokeAll(l);
1550 <        assertEquals(1, futures.size());
1551 <        try {
1552 <            futures.get(0).get();
1553 <            shouldThrow();
1554 <        } catch (ExecutionException success) {
1555 <            assertTrue(success.getCause() instanceof NullPointerException);
1556 <        } finally {
1557 <            joinPool(e);
1546 >        final ExecutorService e =
1547 >            new CustomTPE(2, 2,
1548 >                          LONG_DELAY_MS, MILLISECONDS,
1549 >                          new ArrayBlockingQueue<Runnable>(10));
1550 >        try (PoolCleaner cleaner = cleaner(e)) {
1551 >            List<Callable<String>> l = new ArrayList<>();
1552 >            l.add(new NPETask());
1553 >            List<Future<String>> futures = e.invokeAll(l);
1554 >            assertEquals(1, futures.size());
1555 >            try {
1556 >                futures.get(0).get();
1557 >                shouldThrow();
1558 >            } catch (ExecutionException success) {
1559 >                assertTrue(success.getCause() instanceof NullPointerException);
1560 >            }
1561          }
1562      }
1563  
# Line 1451 | Line 1565 | public class ThreadPoolExecutorSubclassT
1565       * invokeAll(c) returns results of all completed tasks
1566       */
1567      public void testInvokeAll5() throws Exception {
1568 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1569 <        try {
1570 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1568 >        final ExecutorService e =
1569 >            new CustomTPE(2, 2,
1570 >                          LONG_DELAY_MS, MILLISECONDS,
1571 >                          new ArrayBlockingQueue<Runnable>(10));
1572 >        try (PoolCleaner cleaner = cleaner(e)) {
1573 >            List<Callable<String>> l = new ArrayList<>();
1574              l.add(new StringTask());
1575              l.add(new StringTask());
1576              List<Future<String>> futures = e.invokeAll(l);
1577              assertEquals(2, futures.size());
1578              for (Future<String> future : futures)
1579                  assertSame(TEST_STRING, future.get());
1463        } finally {
1464            joinPool(e);
1580          }
1581      }
1582  
1468
1469
1583      /**
1584       * timed invokeAny(null) throws NPE
1585       */
1586      public void testTimedInvokeAny1() throws Exception {
1587 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1588 <        try {
1589 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1590 <            shouldThrow();
1591 <        } catch (NullPointerException success) {
1592 <        } finally {
1593 <            joinPool(e);
1587 >        final ExecutorService e =
1588 >            new CustomTPE(2, 2,
1589 >                          LONG_DELAY_MS, MILLISECONDS,
1590 >                          new ArrayBlockingQueue<Runnable>(10));
1591 >        try (PoolCleaner cleaner = cleaner(e)) {
1592 >            try {
1593 >                e.invokeAny(null, randomTimeout(), randomTimeUnit());
1594 >                shouldThrow();
1595 >            } catch (NullPointerException success) {}
1596          }
1597      }
1598  
# Line 1485 | Line 1600 | public class ThreadPoolExecutorSubclassT
1600       * timed invokeAny(,,null) throws NPE
1601       */
1602      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1603 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1604 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1605 <        l.add(new StringTask());
1606 <        try {
1607 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1608 <            shouldThrow();
1609 <        } catch (NullPointerException success) {
1610 <        } finally {
1611 <            joinPool(e);
1603 >        final ExecutorService e =
1604 >            new CustomTPE(2, 2,
1605 >                          LONG_DELAY_MS, MILLISECONDS,
1606 >                          new ArrayBlockingQueue<Runnable>(10));
1607 >        try (PoolCleaner cleaner = cleaner(e)) {
1608 >            List<Callable<String>> l = new ArrayList<>();
1609 >            l.add(new StringTask());
1610 >            try {
1611 >                e.invokeAny(l, randomTimeout(), null);
1612 >                shouldThrow();
1613 >            } catch (NullPointerException success) {}
1614          }
1615      }
1616  
1617      /**
1618 <     * timed invokeAny(empty collection) throws IAE
1618 >     * timed invokeAny(empty collection) throws IllegalArgumentException
1619       */
1620      public void testTimedInvokeAny2() throws Exception {
1621 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1622 <        try {
1623 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1624 <            shouldThrow();
1625 <        } catch (IllegalArgumentException success) {
1626 <        } finally {
1627 <            joinPool(e);
1621 >        final ExecutorService e =
1622 >            new CustomTPE(2, 2,
1623 >                          LONG_DELAY_MS, MILLISECONDS,
1624 >                          new ArrayBlockingQueue<Runnable>(10));
1625 >        final Collection<Callable<String>> emptyCollection
1626 >            = Collections.emptyList();
1627 >        try (PoolCleaner cleaner = cleaner(e)) {
1628 >            try {
1629 >                e.invokeAny(emptyCollection, randomTimeout(), randomTimeUnit());
1630 >                shouldThrow();
1631 >            } catch (IllegalArgumentException success) {}
1632          }
1633      }
1634  
# Line 1516 | Line 1637 | public class ThreadPoolExecutorSubclassT
1637       */
1638      public void testTimedInvokeAny3() throws Exception {
1639          CountDownLatch latch = new CountDownLatch(1);
1640 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1641 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1642 <        l.add(latchAwaitingStringTask(latch));
1643 <        l.add(null);
1644 <        try {
1645 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1646 <            shouldThrow();
1647 <        } catch (NullPointerException success) {
1648 <        } finally {
1640 >        final ExecutorService e =
1641 >            new CustomTPE(2, 2,
1642 >                          LONG_DELAY_MS, MILLISECONDS,
1643 >                          new ArrayBlockingQueue<Runnable>(10));
1644 >        try (PoolCleaner cleaner = cleaner(e)) {
1645 >            List<Callable<String>> l = new ArrayList<>();
1646 >            l.add(latchAwaitingStringTask(latch));
1647 >            l.add(null);
1648 >            try {
1649 >                e.invokeAny(l, randomTimeout(), randomTimeUnit());
1650 >                shouldThrow();
1651 >            } catch (NullPointerException success) {}
1652              latch.countDown();
1529            joinPool(e);
1653          }
1654      }
1655  
# Line 1534 | Line 1657 | public class ThreadPoolExecutorSubclassT
1657       * timed invokeAny(c) throws ExecutionException if no task completes
1658       */
1659      public void testTimedInvokeAny4() throws Exception {
1660 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1661 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1662 <        l.add(new NPETask());
1663 <        try {
1664 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1665 <            shouldThrow();
1666 <        } catch (ExecutionException success) {
1667 <            assertTrue(success.getCause() instanceof NullPointerException);
1668 <        } finally {
1669 <            joinPool(e);
1660 >        final ExecutorService e =
1661 >            new CustomTPE(2, 2,
1662 >                          LONG_DELAY_MS, MILLISECONDS,
1663 >                          new ArrayBlockingQueue<Runnable>(10));
1664 >        try (PoolCleaner cleaner = cleaner(e)) {
1665 >            long startTime = System.nanoTime();
1666 >            List<Callable<String>> l = new ArrayList<>();
1667 >            l.add(new NPETask());
1668 >            try {
1669 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1670 >                shouldThrow();
1671 >            } catch (ExecutionException success) {
1672 >                assertTrue(success.getCause() instanceof NullPointerException);
1673 >            }
1674 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1675          }
1676      }
1677  
# Line 1551 | Line 1679 | public class ThreadPoolExecutorSubclassT
1679       * timed invokeAny(c) returns result of some task
1680       */
1681      public void testTimedInvokeAny5() throws Exception {
1682 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1683 <        try {
1684 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1682 >        final ExecutorService e =
1683 >            new CustomTPE(2, 2,
1684 >                          LONG_DELAY_MS, MILLISECONDS,
1685 >                          new ArrayBlockingQueue<Runnable>(10));
1686 >        try (PoolCleaner cleaner = cleaner(e)) {
1687 >            long startTime = System.nanoTime();
1688 >            List<Callable<String>> l = new ArrayList<>();
1689              l.add(new StringTask());
1690              l.add(new StringTask());
1691 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1691 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1692              assertSame(TEST_STRING, result);
1693 <        } finally {
1562 <            joinPool(e);
1693 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1694          }
1695      }
1696  
# Line 1567 | Line 1698 | public class ThreadPoolExecutorSubclassT
1698       * timed invokeAll(null) throws NPE
1699       */
1700      public void testTimedInvokeAll1() throws Exception {
1701 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1702 <        try {
1703 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1704 <            shouldThrow();
1705 <        } catch (NullPointerException success) {
1706 <        } finally {
1707 <            joinPool(e);
1701 >        final ExecutorService e =
1702 >            new CustomTPE(2, 2,
1703 >                          LONG_DELAY_MS, MILLISECONDS,
1704 >                          new ArrayBlockingQueue<Runnable>(10));
1705 >        try (PoolCleaner cleaner = cleaner(e)) {
1706 >            try {
1707 >                e.invokeAll(null, randomTimeout(), randomTimeUnit());
1708 >                shouldThrow();
1709 >            } catch (NullPointerException success) {}
1710          }
1711      }
1712  
# Line 1581 | Line 1714 | public class ThreadPoolExecutorSubclassT
1714       * timed invokeAll(,,null) throws NPE
1715       */
1716      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1717 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1718 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1719 <        l.add(new StringTask());
1720 <        try {
1721 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1722 <            shouldThrow();
1723 <        } catch (NullPointerException success) {
1724 <        } finally {
1725 <            joinPool(e);
1717 >        final ExecutorService e =
1718 >            new CustomTPE(2, 2,
1719 >                          LONG_DELAY_MS, MILLISECONDS,
1720 >                          new ArrayBlockingQueue<Runnable>(10));
1721 >        try (PoolCleaner cleaner = cleaner(e)) {
1722 >            List<Callable<String>> l = new ArrayList<>();
1723 >            l.add(new StringTask());
1724 >            try {
1725 >                e.invokeAll(l, randomTimeout(), null);
1726 >                shouldThrow();
1727 >            } catch (NullPointerException success) {}
1728          }
1729      }
1730  
1731      /**
1732 <     * timed invokeAll(empty collection) returns empty collection
1732 >     * timed invokeAll(empty collection) returns empty list
1733       */
1734      public void testTimedInvokeAll2() throws Exception {
1735 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1736 <        try {
1737 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1735 >        final ExecutorService e =
1736 >            new CustomTPE(2, 2,
1737 >                          LONG_DELAY_MS, MILLISECONDS,
1738 >                          new ArrayBlockingQueue<Runnable>(10));
1739 >        final Collection<Callable<String>> emptyCollection
1740 >            = Collections.emptyList();
1741 >        try (PoolCleaner cleaner = cleaner(e)) {
1742 >            List<Future<String>> r =
1743 >                e.invokeAll(emptyCollection, randomTimeout(), randomTimeUnit());
1744              assertTrue(r.isEmpty());
1604        } finally {
1605            joinPool(e);
1745          }
1746      }
1747  
# Line 1610 | Line 1749 | public class ThreadPoolExecutorSubclassT
1749       * timed invokeAll(c) throws NPE if c has null elements
1750       */
1751      public void testTimedInvokeAll3() throws Exception {
1752 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1753 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1754 <        l.add(new StringTask());
1755 <        l.add(null);
1756 <        try {
1757 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1758 <            shouldThrow();
1759 <        } catch (NullPointerException success) {
1760 <        } finally {
1761 <            joinPool(e);
1752 >        final ExecutorService e =
1753 >            new CustomTPE(2, 2,
1754 >                          LONG_DELAY_MS, MILLISECONDS,
1755 >                          new ArrayBlockingQueue<Runnable>(10));
1756 >        try (PoolCleaner cleaner = cleaner(e)) {
1757 >            List<Callable<String>> l = new ArrayList<>();
1758 >            l.add(new StringTask());
1759 >            l.add(null);
1760 >            try {
1761 >                e.invokeAll(l, randomTimeout(), randomTimeUnit());
1762 >                shouldThrow();
1763 >            } catch (NullPointerException success) {}
1764          }
1765      }
1766  
# Line 1627 | Line 1768 | public class ThreadPoolExecutorSubclassT
1768       * get of element of invokeAll(c) throws exception on failed task
1769       */
1770      public void testTimedInvokeAll4() throws Exception {
1771 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1772 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1773 <        l.add(new NPETask());
1774 <        List<Future<String>> futures =
1775 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1776 <        assertEquals(1, futures.size());
1777 <        try {
1778 <            futures.get(0).get();
1779 <            shouldThrow();
1780 <        } catch (ExecutionException success) {
1781 <            assertTrue(success.getCause() instanceof NullPointerException);
1782 <        } finally {
1783 <            joinPool(e);
1771 >        final ExecutorService e =
1772 >            new CustomTPE(2, 2,
1773 >                          LONG_DELAY_MS, MILLISECONDS,
1774 >                          new ArrayBlockingQueue<Runnable>(10));
1775 >        try (PoolCleaner cleaner = cleaner(e)) {
1776 >            List<Callable<String>> l = new ArrayList<>();
1777 >            l.add(new NPETask());
1778 >            List<Future<String>> futures =
1779 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1780 >            assertEquals(1, futures.size());
1781 >            try {
1782 >                futures.get(0).get();
1783 >                shouldThrow();
1784 >            } catch (ExecutionException success) {
1785 >                assertTrue(success.getCause() instanceof NullPointerException);
1786 >            }
1787          }
1788      }
1789  
# Line 1647 | Line 1791 | public class ThreadPoolExecutorSubclassT
1791       * timed invokeAll(c) returns results of all completed tasks
1792       */
1793      public void testTimedInvokeAll5() throws Exception {
1794 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1795 <        try {
1796 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1794 >        final ExecutorService e =
1795 >            new CustomTPE(2, 2,
1796 >                          LONG_DELAY_MS, MILLISECONDS,
1797 >                          new ArrayBlockingQueue<Runnable>(10));
1798 >        try (PoolCleaner cleaner = cleaner(e)) {
1799 >            List<Callable<String>> l = new ArrayList<>();
1800              l.add(new StringTask());
1801              l.add(new StringTask());
1802              List<Future<String>> futures =
1803 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1803 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1804              assertEquals(2, futures.size());
1805              for (Future<String> future : futures)
1806                  assertSame(TEST_STRING, future.get());
1660        } finally {
1661            joinPool(e);
1807          }
1808      }
1809  
# Line 1666 | Line 1811 | public class ThreadPoolExecutorSubclassT
1811       * timed invokeAll(c) cancels tasks not completed by timeout
1812       */
1813      public void testTimedInvokeAll6() throws Exception {
1814 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1815 <        try {
1816 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1817 <            l.add(new StringTask());
1818 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1819 <            l.add(new StringTask());
1820 <            List<Future<String>> futures =
1821 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1822 <            assertEquals(3, futures.size());
1823 <            Iterator<Future<String>> it = futures.iterator();
1824 <            Future<String> f1 = it.next();
1825 <            Future<String> f2 = it.next();
1826 <            Future<String> f3 = it.next();
1827 <            assertTrue(f1.isDone());
1828 <            assertTrue(f2.isDone());
1829 <            assertTrue(f3.isDone());
1830 <            assertFalse(f1.isCancelled());
1831 <            assertTrue(f2.isCancelled());
1832 <        } finally {
1833 <            joinPool(e);
1814 >        for (long timeout = timeoutMillis();;) {
1815 >            final CountDownLatch done = new CountDownLatch(1);
1816 >            final Callable<String> waiter = new CheckedCallable<>() {
1817 >                public String realCall() {
1818 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1819 >                    catch (InterruptedException ok) {}
1820 >                    return "1"; }};
1821 >            final ExecutorService p =
1822 >                new CustomTPE(2, 2,
1823 >                              LONG_DELAY_MS, MILLISECONDS,
1824 >                              new ArrayBlockingQueue<Runnable>(10));
1825 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1826 >                List<Callable<String>> tasks = new ArrayList<>();
1827 >                tasks.add(new StringTask("0"));
1828 >                tasks.add(waiter);
1829 >                tasks.add(new StringTask("2"));
1830 >                long startTime = System.nanoTime();
1831 >                List<Future<String>> futures =
1832 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1833 >                assertEquals(tasks.size(), futures.size());
1834 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1835 >                for (Future<?> future : futures)
1836 >                    assertTrue(future.isDone());
1837 >                assertTrue(futures.get(1).isCancelled());
1838 >                try {
1839 >                    assertEquals("0", futures.get(0).get());
1840 >                    assertEquals("2", futures.get(2).get());
1841 >                    break;
1842 >                } catch (CancellationException retryWithLongerTimeout) {
1843 >                    timeout *= 2;
1844 >                    if (timeout >= LONG_DELAY_MS / 2)
1845 >                        fail("expected exactly one task to be cancelled");
1846 >                }
1847 >            }
1848          }
1849      }
1850  
# Line 1699 | Line 1858 | public class ThreadPoolExecutorSubclassT
1858                            LONG_DELAY_MS, MILLISECONDS,
1859                            new LinkedBlockingQueue<Runnable>(),
1860                            new FailingThreadFactory());
1861 <        try {
1861 >        try (PoolCleaner cleaner = cleaner(e)) {
1862              final int TASKS = 100;
1863              final CountDownLatch done = new CountDownLatch(TASKS);
1864              for (int k = 0; k < TASKS; ++k)
# Line 1707 | Line 1866 | public class ThreadPoolExecutorSubclassT
1866                      public void realRun() {
1867                          done.countDown();
1868                      }});
1869 <            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1711 <        } finally {
1712 <            joinPool(e);
1869 >            await(done);
1870          }
1871      }
1872  
# Line 1717 | Line 1874 | public class ThreadPoolExecutorSubclassT
1874       * allowsCoreThreadTimeOut is by default false.
1875       */
1876      public void testAllowsCoreThreadTimeOut() {
1877 <        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1878 <        assertFalse(p.allowsCoreThreadTimeOut());
1879 <        joinPool(p);
1877 >        final ThreadPoolExecutor p =
1878 >            new CustomTPE(2, 2,
1879 >                          1000, MILLISECONDS,
1880 >                          new ArrayBlockingQueue<Runnable>(10));
1881 >        try (PoolCleaner cleaner = cleaner(p)) {
1882 >            assertFalse(p.allowsCoreThreadTimeOut());
1883 >        }
1884      }
1885  
1886      /**
1887       * allowCoreThreadTimeOut(true) causes idle threads to time out
1888       */
1889      public void testAllowCoreThreadTimeOut_true() throws Exception {
1890 +        long keepAliveTime = timeoutMillis();
1891          final ThreadPoolExecutor p =
1892              new CustomTPE(2, 10,
1893 <                          SHORT_DELAY_MS, MILLISECONDS,
1893 >                          keepAliveTime, MILLISECONDS,
1894                            new ArrayBlockingQueue<Runnable>(10));
1895 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1896 <        try {
1895 >        try (PoolCleaner cleaner = cleaner(p)) {
1896 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1897              p.allowCoreThreadTimeOut(true);
1898              p.execute(new CheckedRunnable() {
1899 <                public void realRun() throws InterruptedException {
1899 >                public void realRun() {
1900                      threadStarted.countDown();
1901                      assertEquals(1, p.getPoolSize());
1902                  }});
1903 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1904 <            for (int i = 0; i < (MEDIUM_DELAY_MS/10); i++) {
1905 <                if (p.getPoolSize() == 0)
1906 <                    break;
1907 <                Thread.sleep(10);
1908 <            }
1903 >            await(threadStarted);
1904 >            delay(keepAliveTime);
1905 >            long startTime = System.nanoTime();
1906 >            while (p.getPoolSize() > 0
1907 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1908 >                Thread.yield();
1909 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1910              assertEquals(0, p.getPoolSize());
1748        } finally {
1749            joinPool(p);
1911          }
1912      }
1913  
# Line 1754 | Line 1915 | public class ThreadPoolExecutorSubclassT
1915       * allowCoreThreadTimeOut(false) causes idle threads not to time out
1916       */
1917      public void testAllowCoreThreadTimeOut_false() throws Exception {
1918 +        long keepAliveTime = timeoutMillis();
1919          final ThreadPoolExecutor p =
1920              new CustomTPE(2, 10,
1921 <                          SHORT_DELAY_MS, MILLISECONDS,
1921 >                          keepAliveTime, MILLISECONDS,
1922                            new ArrayBlockingQueue<Runnable>(10));
1923 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1924 <        try {
1923 >        try (PoolCleaner cleaner = cleaner(p)) {
1924 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1925              p.allowCoreThreadTimeOut(false);
1926              p.execute(new CheckedRunnable() {
1927                  public void realRun() throws InterruptedException {
1928                      threadStarted.countDown();
1929                      assertTrue(p.getPoolSize() >= 1);
1930                  }});
1931 <            Thread.sleep(SMALL_DELAY_MS);
1931 >            delay(2 * keepAliveTime);
1932              assertTrue(p.getPoolSize() >= 1);
1771        } finally {
1772            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 CountDownLatch done = new CountDownLatch(1);
1942 +        final ExecutorService e =
1943 +            new CustomTPE(1, 1,
1944 +                          LONG_DELAY_MS, MILLISECONDS,
1945 +                          new LinkedBlockingQueue<Runnable>());
1946 +        try (PoolCleaner cleaner = cleaner(e, done)) {
1947 +            final CountDownLatch blockerStarted = 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 +            await(blockerStarted);
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 +        }
1972 +    }
1973 +    @SuppressWarnings("removal")
1974 +    public void testFinalizeMethodCallsSuperFinalize() {
1975 +        new CustomTPE(1, 1,
1976 +                      LONG_DELAY_MS, MILLISECONDS,
1977 +                      new LinkedBlockingQueue<Runnable>()) {
1978 +
1979 +            /**
1980 +             * A finalize method without "throws Throwable", that
1981 +             * calls super.finalize().
1982 +             */
1983 +            protected void finalize() {
1984 +                super.finalize();
1985 +            }
1986 +        }.shutdown();
1987 +    }
1988 +
1989   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines