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

Comparing jsr166/src/test/tck/ThreadPoolExecutorTest.java (file contents):
Revision 1.53 by jsr166, Fri May 15 18:21:19 2015 UTC vs.
Revision 1.123 by jsr166, Sat Jul 15 23:15:21 2017 UTC

# Line 11 | Line 11 | import static java.util.concurrent.TimeU
11   import static java.util.concurrent.TimeUnit.SECONDS;
12  
13   import java.util.ArrayList;
14 + import java.util.Collection;
15 + import java.util.Collections;
16   import java.util.List;
17   import java.util.concurrent.ArrayBlockingQueue;
18   import java.util.concurrent.BlockingQueue;
19   import java.util.concurrent.Callable;
20 + import java.util.concurrent.CancellationException;
21   import java.util.concurrent.CountDownLatch;
22   import java.util.concurrent.ExecutionException;
20 import java.util.concurrent.Executors;
23   import java.util.concurrent.ExecutorService;
24   import java.util.concurrent.Future;
25   import java.util.concurrent.FutureTask;
# Line 26 | Line 28 | import java.util.concurrent.RejectedExec
28   import java.util.concurrent.RejectedExecutionHandler;
29   import java.util.concurrent.SynchronousQueue;
30   import java.util.concurrent.ThreadFactory;
31 + import java.util.concurrent.ThreadLocalRandom;
32   import java.util.concurrent.ThreadPoolExecutor;
33 < import java.util.concurrent.TimeUnit;
33 > import java.util.concurrent.ThreadPoolExecutor.AbortPolicy;
34 > import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
35 > import java.util.concurrent.ThreadPoolExecutor.DiscardPolicy;
36 > import java.util.concurrent.ThreadPoolExecutor.DiscardOldestPolicy;
37 > import java.util.concurrent.atomic.AtomicInteger;
38 > import java.util.concurrent.atomic.AtomicReference;
39  
40   import junit.framework.Test;
41   import junit.framework.TestSuite;
# Line 85 | Line 93 | public class ThreadPoolExecutorTest exte
93              new ThreadPoolExecutor(1, 1,
94                                     LONG_DELAY_MS, MILLISECONDS,
95                                     new ArrayBlockingQueue<Runnable>(10));
96 <        final CountDownLatch done = new CountDownLatch(1);
97 <        final Runnable task = new CheckedRunnable() {
98 <            public void realRun() {
99 <                done.countDown();
92 <            }};
93 <        try {
96 >        try (PoolCleaner cleaner = cleaner(p)) {
97 >            final CountDownLatch done = new CountDownLatch(1);
98 >            final Runnable task = new CheckedRunnable() {
99 >                public void realRun() { done.countDown(); }};
100              p.execute(task);
101 <            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
96 <        } finally {
97 <            joinPool(p);
101 >            await(done);
102          }
103      }
104  
# Line 103 | Line 107 | public class ThreadPoolExecutorTest exte
107       * thread becomes active
108       */
109      public void testGetActiveCount() throws InterruptedException {
110 +        final CountDownLatch done = new CountDownLatch(1);
111          final ThreadPoolExecutor p =
112              new ThreadPoolExecutor(2, 2,
113                                     LONG_DELAY_MS, MILLISECONDS,
114                                     new ArrayBlockingQueue<Runnable>(10));
115 <        final CountDownLatch threadStarted = new CountDownLatch(1);
116 <        final CountDownLatch done = new CountDownLatch(1);
112 <        try {
115 >        try (PoolCleaner cleaner = cleaner(p, done)) {
116 >            final CountDownLatch threadStarted = new CountDownLatch(1);
117              assertEquals(0, p.getActiveCount());
118              p.execute(new CheckedRunnable() {
119                  public void realRun() throws InterruptedException {
120                      threadStarted.countDown();
121                      assertEquals(1, p.getActiveCount());
122 <                    done.await();
122 >                    await(done);
123                  }});
124 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
124 >            await(threadStarted);
125              assertEquals(1, p.getActiveCount());
122        } finally {
123            done.countDown();
124            joinPool(p);
126          }
127      }
128  
# Line 130 | Line 131 | public class ThreadPoolExecutorTest exte
131       */
132      public void testPrestartCoreThread() {
133          final ThreadPoolExecutor p =
134 <            new ThreadPoolExecutor(2, 2,
134 >            new ThreadPoolExecutor(2, 6,
135                                     LONG_DELAY_MS, MILLISECONDS,
136                                     new ArrayBlockingQueue<Runnable>(10));
137 <        assertEquals(0, p.getPoolSize());
138 <        assertTrue(p.prestartCoreThread());
139 <        assertEquals(1, p.getPoolSize());
140 <        assertTrue(p.prestartCoreThread());
141 <        assertEquals(2, p.getPoolSize());
142 <        assertFalse(p.prestartCoreThread());
143 <        assertEquals(2, p.getPoolSize());
144 <        joinPool(p);
137 >        try (PoolCleaner cleaner = cleaner(p)) {
138 >            assertEquals(0, p.getPoolSize());
139 >            assertTrue(p.prestartCoreThread());
140 >            assertEquals(1, p.getPoolSize());
141 >            assertTrue(p.prestartCoreThread());
142 >            assertEquals(2, p.getPoolSize());
143 >            assertFalse(p.prestartCoreThread());
144 >            assertEquals(2, p.getPoolSize());
145 >            p.setCorePoolSize(4);
146 >            assertTrue(p.prestartCoreThread());
147 >            assertEquals(3, p.getPoolSize());
148 >            assertTrue(p.prestartCoreThread());
149 >            assertEquals(4, p.getPoolSize());
150 >            assertFalse(p.prestartCoreThread());
151 >            assertEquals(4, p.getPoolSize());
152 >        }
153      }
154  
155      /**
# Line 148 | Line 157 | public class ThreadPoolExecutorTest exte
157       */
158      public void testPrestartAllCoreThreads() {
159          final ThreadPoolExecutor p =
160 <            new ThreadPoolExecutor(2, 2,
160 >            new ThreadPoolExecutor(2, 6,
161                                     LONG_DELAY_MS, MILLISECONDS,
162                                     new ArrayBlockingQueue<Runnable>(10));
163 <        assertEquals(0, p.getPoolSize());
164 <        p.prestartAllCoreThreads();
165 <        assertEquals(2, p.getPoolSize());
166 <        p.prestartAllCoreThreads();
167 <        assertEquals(2, p.getPoolSize());
168 <        joinPool(p);
163 >        try (PoolCleaner cleaner = cleaner(p)) {
164 >            assertEquals(0, p.getPoolSize());
165 >            p.prestartAllCoreThreads();
166 >            assertEquals(2, p.getPoolSize());
167 >            p.prestartAllCoreThreads();
168 >            assertEquals(2, p.getPoolSize());
169 >            p.setCorePoolSize(4);
170 >            p.prestartAllCoreThreads();
171 >            assertEquals(4, p.getPoolSize());
172 >            p.prestartAllCoreThreads();
173 >            assertEquals(4, p.getPoolSize());
174 >        }
175      }
176  
177      /**
# Line 168 | Line 183 | public class ThreadPoolExecutorTest exte
183              new ThreadPoolExecutor(2, 2,
184                                     LONG_DELAY_MS, MILLISECONDS,
185                                     new ArrayBlockingQueue<Runnable>(10));
186 <        final CountDownLatch threadStarted = new CountDownLatch(1);
187 <        final CountDownLatch threadProceed = new CountDownLatch(1);
188 <        final CountDownLatch threadDone = new CountDownLatch(1);
189 <        try {
186 >        try (PoolCleaner cleaner = cleaner(p)) {
187 >            final CountDownLatch threadStarted = new CountDownLatch(1);
188 >            final CountDownLatch threadProceed = new CountDownLatch(1);
189 >            final CountDownLatch threadDone = new CountDownLatch(1);
190              assertEquals(0, p.getCompletedTaskCount());
191              p.execute(new CheckedRunnable() {
192                  public void realRun() throws InterruptedException {
193                      threadStarted.countDown();
194                      assertEquals(0, p.getCompletedTaskCount());
195 <                    threadProceed.await();
195 >                    await(threadProceed);
196                      threadDone.countDown();
197                  }});
198              await(threadStarted);
199              assertEquals(0, p.getCompletedTaskCount());
200              threadProceed.countDown();
201 <            threadDone.await();
201 >            await(threadDone);
202              long startTime = System.nanoTime();
203              while (p.getCompletedTaskCount() != 1) {
204                  if (millisElapsedSince(startTime) > LONG_DELAY_MS)
205                      fail("timed out");
206                  Thread.yield();
207              }
193        } finally {
194            joinPool(p);
208          }
209      }
210  
# Line 203 | Line 216 | public class ThreadPoolExecutorTest exte
216              new ThreadPoolExecutor(1, 1,
217                                     LONG_DELAY_MS, MILLISECONDS,
218                                     new ArrayBlockingQueue<Runnable>(10));
219 <        assertEquals(1, p.getCorePoolSize());
220 <        joinPool(p);
219 >        try (PoolCleaner cleaner = cleaner(p)) {
220 >            assertEquals(1, p.getCorePoolSize());
221 >        }
222      }
223  
224      /**
# Line 215 | Line 229 | public class ThreadPoolExecutorTest exte
229              new ThreadPoolExecutor(2, 2,
230                                     1000, MILLISECONDS,
231                                     new ArrayBlockingQueue<Runnable>(10));
232 <        assertEquals(1, p.getKeepAliveTime(TimeUnit.SECONDS));
233 <        joinPool(p);
232 >        try (PoolCleaner cleaner = cleaner(p)) {
233 >            assertEquals(1, p.getKeepAliveTime(SECONDS));
234 >        }
235      }
236  
237      /**
238       * getThreadFactory returns factory in constructor if not set
239       */
240      public void testGetThreadFactory() {
241 <        ThreadFactory tf = new SimpleThreadFactory();
241 >        ThreadFactory threadFactory = new SimpleThreadFactory();
242          final ThreadPoolExecutor p =
243              new ThreadPoolExecutor(1, 2,
244                                     LONG_DELAY_MS, MILLISECONDS,
245                                     new ArrayBlockingQueue<Runnable>(10),
246 <                                   tf,
246 >                                   threadFactory,
247                                     new NoOpREHandler());
248 <        assertSame(tf, p.getThreadFactory());
249 <        joinPool(p);
248 >        try (PoolCleaner cleaner = cleaner(p)) {
249 >            assertSame(threadFactory, p.getThreadFactory());
250 >        }
251      }
252  
253      /**
# Line 242 | Line 258 | public class ThreadPoolExecutorTest exte
258              new ThreadPoolExecutor(1, 2,
259                                     LONG_DELAY_MS, MILLISECONDS,
260                                     new ArrayBlockingQueue<Runnable>(10));
261 <        ThreadFactory tf = new SimpleThreadFactory();
262 <        p.setThreadFactory(tf);
263 <        assertSame(tf, p.getThreadFactory());
264 <        joinPool(p);
261 >        try (PoolCleaner cleaner = cleaner(p)) {
262 >            ThreadFactory threadFactory = new SimpleThreadFactory();
263 >            p.setThreadFactory(threadFactory);
264 >            assertSame(threadFactory, p.getThreadFactory());
265 >        }
266      }
267  
268      /**
# Line 256 | Line 273 | public class ThreadPoolExecutorTest exte
273              new ThreadPoolExecutor(1, 2,
274                                     LONG_DELAY_MS, MILLISECONDS,
275                                     new ArrayBlockingQueue<Runnable>(10));
276 <        try {
277 <            p.setThreadFactory(null);
278 <            shouldThrow();
279 <        } catch (NullPointerException success) {
280 <        } finally {
281 <            joinPool(p);
276 >        try (PoolCleaner cleaner = cleaner(p)) {
277 >            try {
278 >                p.setThreadFactory(null);
279 >                shouldThrow();
280 >            } catch (NullPointerException success) {}
281 >        }
282 >    }
283 >
284 >    /**
285 >     * The default rejected execution handler is AbortPolicy.
286 >     */
287 >    public void testDefaultRejectedExecutionHandler() {
288 >        final ThreadPoolExecutor p =
289 >            new ThreadPoolExecutor(1, 2,
290 >                                   LONG_DELAY_MS, MILLISECONDS,
291 >                                   new ArrayBlockingQueue<Runnable>(10));
292 >        try (PoolCleaner cleaner = cleaner(p)) {
293 >            assertTrue(p.getRejectedExecutionHandler() instanceof AbortPolicy);
294          }
295      }
296  
# Line 269 | Line 298 | public class ThreadPoolExecutorTest exte
298       * getRejectedExecutionHandler returns handler in constructor if not set
299       */
300      public void testGetRejectedExecutionHandler() {
301 <        final RejectedExecutionHandler h = new NoOpREHandler();
301 >        final RejectedExecutionHandler handler = new NoOpREHandler();
302          final ThreadPoolExecutor p =
303              new ThreadPoolExecutor(1, 2,
304                                     LONG_DELAY_MS, MILLISECONDS,
305                                     new ArrayBlockingQueue<Runnable>(10),
306 <                                   h);
307 <        assertSame(h, p.getRejectedExecutionHandler());
308 <        joinPool(p);
306 >                                   handler);
307 >        try (PoolCleaner cleaner = cleaner(p)) {
308 >            assertSame(handler, p.getRejectedExecutionHandler());
309 >        }
310      }
311  
312      /**
# Line 288 | Line 318 | public class ThreadPoolExecutorTest exte
318              new ThreadPoolExecutor(1, 2,
319                                     LONG_DELAY_MS, MILLISECONDS,
320                                     new ArrayBlockingQueue<Runnable>(10));
321 <        RejectedExecutionHandler h = new NoOpREHandler();
322 <        p.setRejectedExecutionHandler(h);
323 <        assertSame(h, p.getRejectedExecutionHandler());
324 <        joinPool(p);
321 >        try (PoolCleaner cleaner = cleaner(p)) {
322 >            RejectedExecutionHandler handler = new NoOpREHandler();
323 >            p.setRejectedExecutionHandler(handler);
324 >            assertSame(handler, p.getRejectedExecutionHandler());
325 >        }
326      }
327  
328      /**
# Line 302 | Line 333 | public class ThreadPoolExecutorTest exte
333              new ThreadPoolExecutor(1, 2,
334                                     LONG_DELAY_MS, MILLISECONDS,
335                                     new ArrayBlockingQueue<Runnable>(10));
336 <        try {
337 <            p.setRejectedExecutionHandler(null);
338 <            shouldThrow();
339 <        } catch (NullPointerException success) {
340 <        } finally {
310 <            joinPool(p);
336 >        try (PoolCleaner cleaner = cleaner(p)) {
337 >            try {
338 >                p.setRejectedExecutionHandler(null);
339 >                shouldThrow();
340 >            } catch (NullPointerException success) {}
341          }
342      }
343  
# Line 317 | Line 347 | public class ThreadPoolExecutorTest exte
347       */
348      public void testGetLargestPoolSize() throws InterruptedException {
349          final int THREADS = 3;
350 +        final CountDownLatch done = new CountDownLatch(1);
351          final ThreadPoolExecutor p =
352              new ThreadPoolExecutor(THREADS, THREADS,
353                                     LONG_DELAY_MS, MILLISECONDS,
354                                     new ArrayBlockingQueue<Runnable>(10));
355 <        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
325 <        final CountDownLatch done = new CountDownLatch(1);
326 <        try {
355 >        try (PoolCleaner cleaner = cleaner(p, done)) {
356              assertEquals(0, p.getLargestPoolSize());
357 +            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
358              for (int i = 0; i < THREADS; i++)
359                  p.execute(new CheckedRunnable() {
360                      public void realRun() throws InterruptedException {
361                          threadsStarted.countDown();
362 <                        done.await();
362 >                        await(done);
363                          assertEquals(THREADS, p.getLargestPoolSize());
364                      }});
365 <            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
336 <            assertEquals(THREADS, p.getLargestPoolSize());
337 <        } finally {
338 <            done.countDown();
339 <            joinPool(p);
365 >            await(threadsStarted);
366              assertEquals(THREADS, p.getLargestPoolSize());
367          }
368 +        assertEquals(THREADS, p.getLargestPoolSize());
369      }
370  
371      /**
# Line 350 | Line 377 | public class ThreadPoolExecutorTest exte
377              new ThreadPoolExecutor(2, 3,
378                                     LONG_DELAY_MS, MILLISECONDS,
379                                     new ArrayBlockingQueue<Runnable>(10));
380 <        assertEquals(3, p.getMaximumPoolSize());
381 <        joinPool(p);
380 >        try (PoolCleaner cleaner = cleaner(p)) {
381 >            assertEquals(3, p.getMaximumPoolSize());
382 >            p.setMaximumPoolSize(5);
383 >            assertEquals(5, p.getMaximumPoolSize());
384 >            p.setMaximumPoolSize(4);
385 >            assertEquals(4, p.getMaximumPoolSize());
386 >        }
387      }
388  
389      /**
# Line 359 | Line 391 | public class ThreadPoolExecutorTest exte
391       * become active
392       */
393      public void testGetPoolSize() throws InterruptedException {
394 +        final CountDownLatch done = new CountDownLatch(1);
395          final ThreadPoolExecutor p =
396              new ThreadPoolExecutor(1, 1,
397                                     LONG_DELAY_MS, MILLISECONDS,
398                                     new ArrayBlockingQueue<Runnable>(10));
399 <        final CountDownLatch threadStarted = new CountDownLatch(1);
367 <        final CountDownLatch done = new CountDownLatch(1);
368 <        try {
399 >        try (PoolCleaner cleaner = cleaner(p, done)) {
400              assertEquals(0, p.getPoolSize());
401 +            final CountDownLatch threadStarted = new CountDownLatch(1);
402              p.execute(new CheckedRunnable() {
403                  public void realRun() throws InterruptedException {
404                      threadStarted.countDown();
405                      assertEquals(1, p.getPoolSize());
406 <                    done.await();
406 >                    await(done);
407                  }});
408 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
408 >            await(threadStarted);
409              assertEquals(1, p.getPoolSize());
378        } finally {
379            done.countDown();
380            joinPool(p);
410          }
411      }
412  
# Line 385 | Line 414 | public class ThreadPoolExecutorTest exte
414       * getTaskCount increases, but doesn't overestimate, when tasks submitted
415       */
416      public void testGetTaskCount() throws InterruptedException {
417 +        final int TASKS = 3;
418 +        final CountDownLatch done = new CountDownLatch(1);
419          final ThreadPoolExecutor p =
420              new ThreadPoolExecutor(1, 1,
421                                     LONG_DELAY_MS, MILLISECONDS,
422                                     new ArrayBlockingQueue<Runnable>(10));
423 <        final CountDownLatch threadStarted = new CountDownLatch(1);
424 <        final CountDownLatch done = new CountDownLatch(1);
394 <        try {
423 >        try (PoolCleaner cleaner = cleaner(p, done)) {
424 >            final CountDownLatch threadStarted = new CountDownLatch(1);
425              assertEquals(0, p.getTaskCount());
426 +            assertEquals(0, p.getCompletedTaskCount());
427              p.execute(new CheckedRunnable() {
428                  public void realRun() throws InterruptedException {
429                      threadStarted.countDown();
430 <                    assertEquals(1, p.getTaskCount());
400 <                    done.await();
430 >                    await(done);
431                  }});
432 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
432 >            await(threadStarted);
433              assertEquals(1, p.getTaskCount());
434 <        } finally {
435 <            done.countDown();
436 <            joinPool(p);
434 >            assertEquals(0, p.getCompletedTaskCount());
435 >            for (int i = 0; i < TASKS; i++) {
436 >                assertEquals(1 + i, p.getTaskCount());
437 >                p.execute(new CheckedRunnable() {
438 >                    public void realRun() throws InterruptedException {
439 >                        threadStarted.countDown();
440 >                        assertEquals(1 + TASKS, p.getTaskCount());
441 >                        await(done);
442 >                    }});
443 >            }
444 >            assertEquals(1 + TASKS, p.getTaskCount());
445 >            assertEquals(0, p.getCompletedTaskCount());
446          }
447 +        assertEquals(1 + TASKS, p.getTaskCount());
448 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
449      }
450  
451      /**
# Line 415 | Line 456 | public class ThreadPoolExecutorTest exte
456              new ThreadPoolExecutor(1, 1,
457                                     LONG_DELAY_MS, MILLISECONDS,
458                                     new ArrayBlockingQueue<Runnable>(10));
459 <        assertFalse(p.isShutdown());
460 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
461 <        assertTrue(p.isShutdown());
462 <        joinPool(p);
459 >        try (PoolCleaner cleaner = cleaner(p)) {
460 >            assertFalse(p.isShutdown());
461 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
462 >            assertTrue(p.isShutdown());
463 >        }
464      }
465  
466      /**
# Line 429 | Line 471 | public class ThreadPoolExecutorTest exte
471              new ThreadPoolExecutor(1, 1,
472                                     LONG_DELAY_MS, MILLISECONDS,
473                                     new ArrayBlockingQueue<Runnable>(10));
474 <        assertFalse(p.isTerminated());
475 <        assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
476 <        assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
477 <        assertFalse(p.awaitTermination(-1L, NANOSECONDS));
478 <        assertFalse(p.awaitTermination(-1L, MILLISECONDS));
479 <        assertFalse(p.awaitTermination(0L, NANOSECONDS));
480 <        assertFalse(p.awaitTermination(0L, MILLISECONDS));
481 <        long timeoutNanos = 999999L;
482 <        long startTime = System.nanoTime();
483 <        assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
484 <        assertTrue(System.nanoTime() - startTime >= timeoutNanos);
485 <        assertFalse(p.isTerminated());
486 <        startTime = System.nanoTime();
487 <        long timeoutMillis = timeoutMillis();
488 <        assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
489 <        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
490 <        assertFalse(p.isTerminated());
491 <        p.shutdown();
492 <        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
493 <        assertTrue(p.isTerminated());
474 >        try (PoolCleaner cleaner = cleaner(p)) {
475 >            assertFalse(p.isTerminated());
476 >            assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
477 >            assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
478 >            assertFalse(p.awaitTermination(-1L, NANOSECONDS));
479 >            assertFalse(p.awaitTermination(-1L, MILLISECONDS));
480 >            assertFalse(p.awaitTermination(randomExpiredTimeout(),
481 >                                           randomTimeUnit()));
482 >            long timeoutNanos = 999999L;
483 >            long startTime = System.nanoTime();
484 >            assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
485 >            assertTrue(System.nanoTime() - startTime >= timeoutNanos);
486 >            assertFalse(p.isTerminated());
487 >            startTime = System.nanoTime();
488 >            long timeoutMillis = timeoutMillis();
489 >            assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
490 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
491 >            assertFalse(p.isTerminated());
492 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
493 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
494 >            assertTrue(p.isTerminated());
495 >        }
496      }
497  
498      /**
# Line 459 | Line 503 | public class ThreadPoolExecutorTest exte
503              new ThreadPoolExecutor(1, 1,
504                                     LONG_DELAY_MS, MILLISECONDS,
505                                     new ArrayBlockingQueue<Runnable>(10));
506 <        final CountDownLatch threadStarted = new CountDownLatch(1);
507 <        final CountDownLatch done = new CountDownLatch(1);
508 <        assertFalse(p.isTerminated());
509 <        try {
506 >        try (PoolCleaner cleaner = cleaner(p)) {
507 >            final CountDownLatch threadStarted = new CountDownLatch(1);
508 >            final CountDownLatch done = new CountDownLatch(1);
509 >            assertFalse(p.isTerminating());
510              p.execute(new CheckedRunnable() {
511                  public void realRun() throws InterruptedException {
512 <                    assertFalse(p.isTerminated());
512 >                    assertFalse(p.isTerminating());
513                      threadStarted.countDown();
514 <                    done.await();
514 >                    await(done);
515                  }});
516 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
516 >            await(threadStarted);
517              assertFalse(p.isTerminating());
518              done.countDown();
475        } finally {
519              try { p.shutdown(); } catch (SecurityException ok) { return; }
520 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
521 +            assertTrue(p.isTerminated());
522 +            assertFalse(p.isTerminating());
523          }
478        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
479        assertTrue(p.isTerminated());
524      }
525  
526      /**
# Line 487 | Line 531 | public class ThreadPoolExecutorTest exte
531              new ThreadPoolExecutor(1, 1,
532                                     LONG_DELAY_MS, MILLISECONDS,
533                                     new ArrayBlockingQueue<Runnable>(10));
534 <        final CountDownLatch threadStarted = new CountDownLatch(1);
535 <        final CountDownLatch done = new CountDownLatch(1);
536 <        try {
534 >        try (PoolCleaner cleaner = cleaner(p)) {
535 >            final CountDownLatch threadStarted = new CountDownLatch(1);
536 >            final CountDownLatch done = new CountDownLatch(1);
537              assertFalse(p.isTerminating());
538              p.execute(new CheckedRunnable() {
539                  public void realRun() throws InterruptedException {
540                      assertFalse(p.isTerminating());
541                      threadStarted.countDown();
542 <                    done.await();
542 >                    await(done);
543                  }});
544 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
544 >            await(threadStarted);
545              assertFalse(p.isTerminating());
546              done.countDown();
503        } finally {
547              try { p.shutdown(); } catch (SecurityException ok) { return; }
548 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
549 +            assertTrue(p.isTerminated());
550 +            assertFalse(p.isTerminating());
551          }
506        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
507        assertTrue(p.isTerminated());
508        assertFalse(p.isTerminating());
552      }
553  
554      /**
555       * getQueue returns the work queue, which contains queued tasks
556       */
557      public void testGetQueue() throws InterruptedException {
558 <        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
558 >        final CountDownLatch done = new CountDownLatch(1);
559 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
560          final ThreadPoolExecutor p =
561              new ThreadPoolExecutor(1, 1,
562                                     LONG_DELAY_MS, MILLISECONDS,
563                                     q);
564 <        final CountDownLatch threadStarted = new CountDownLatch(1);
565 <        final CountDownLatch done = new CountDownLatch(1);
522 <        try {
564 >        try (PoolCleaner cleaner = cleaner(p, done)) {
565 >            final CountDownLatch threadStarted = new CountDownLatch(1);
566              FutureTask[] tasks = new FutureTask[5];
567              for (int i = 0; i < tasks.length; i++) {
568                  Callable task = new CheckedCallable<Boolean>() {
569                      public Boolean realCall() throws InterruptedException {
570                          threadStarted.countDown();
571                          assertSame(q, p.getQueue());
572 <                        done.await();
572 >                        await(done);
573                          return Boolean.TRUE;
574                      }};
575                  tasks[i] = new FutureTask(task);
576                  p.execute(tasks[i]);
577              }
578 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
578 >            await(threadStarted);
579              assertSame(q, p.getQueue());
580              assertFalse(q.contains(tasks[0]));
581              assertTrue(q.contains(tasks[tasks.length - 1]));
582              assertEquals(tasks.length - 1, q.size());
540        } finally {
541            done.countDown();
542            joinPool(p);
583          }
584      }
585  
# Line 547 | Line 587 | public class ThreadPoolExecutorTest exte
587       * remove(task) removes queued task, and fails to remove active task
588       */
589      public void testRemove() throws InterruptedException {
590 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
590 >        final CountDownLatch done = new CountDownLatch(1);
591 >        BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
592          final ThreadPoolExecutor p =
593              new ThreadPoolExecutor(1, 1,
594                                     LONG_DELAY_MS, MILLISECONDS,
595                                     q);
596 <        Runnable[] tasks = new Runnable[5];
597 <        final CountDownLatch threadStarted = new CountDownLatch(1);
598 <        final CountDownLatch done = new CountDownLatch(1);
558 <        try {
596 >        try (PoolCleaner cleaner = cleaner(p, done)) {
597 >            Runnable[] tasks = new Runnable[6];
598 >            final CountDownLatch threadStarted = new CountDownLatch(1);
599              for (int i = 0; i < tasks.length; i++) {
600                  tasks[i] = new CheckedRunnable() {
601                      public void realRun() throws InterruptedException {
602                          threadStarted.countDown();
603 <                        done.await();
603 >                        await(done);
604                      }};
605                  p.execute(tasks[i]);
606              }
607 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
607 >            await(threadStarted);
608              assertFalse(p.remove(tasks[0]));
609              assertTrue(q.contains(tasks[4]));
610              assertTrue(q.contains(tasks[3]));
# Line 574 | Line 614 | public class ThreadPoolExecutorTest exte
614              assertTrue(q.contains(tasks[3]));
615              assertTrue(p.remove(tasks[3]));
616              assertFalse(q.contains(tasks[3]));
577        } finally {
578            done.countDown();
579            joinPool(p);
617          }
618      }
619  
# Line 586 | Line 623 | public class ThreadPoolExecutorTest exte
623      public void testPurge() throws InterruptedException {
624          final CountDownLatch threadStarted = new CountDownLatch(1);
625          final CountDownLatch done = new CountDownLatch(1);
626 <        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
626 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
627          final ThreadPoolExecutor p =
628              new ThreadPoolExecutor(1, 1,
629                                     LONG_DELAY_MS, MILLISECONDS,
630                                     q);
631 <        FutureTask[] tasks = new FutureTask[5];
632 <        try {
631 >        try (PoolCleaner cleaner = cleaner(p, done)) {
632 >            FutureTask[] tasks = new FutureTask[5];
633              for (int i = 0; i < tasks.length; i++) {
634                  Callable task = new CheckedCallable<Boolean>() {
635                      public Boolean realCall() throws InterruptedException {
636                          threadStarted.countDown();
637 <                        done.await();
637 >                        await(done);
638                          return Boolean.TRUE;
639                      }};
640                  tasks[i] = new FutureTask(task);
641                  p.execute(tasks[i]);
642              }
643 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
643 >            await(threadStarted);
644              assertEquals(tasks.length, p.getTaskCount());
645              assertEquals(tasks.length - 1, q.size());
646              assertEquals(1L, p.getActiveCount());
# Line 616 | Line 653 | public class ThreadPoolExecutorTest exte
653              p.purge();         // Nothing to do
654              assertEquals(tasks.length - 3, q.size());
655              assertEquals(tasks.length - 2, p.getTaskCount());
619        } finally {
620            done.countDown();
621            joinPool(p);
656          }
657      }
658  
659      /**
660 <     * shutdownNow returns a list containing tasks that were not run
660 >     * shutdownNow returns a list containing tasks that were not run,
661 >     * and those tasks are drained from the queue
662       */
663 <    public void testShutdownNow() {
663 >    public void testShutdownNow() throws InterruptedException {
664 >        final int poolSize = 2;
665 >        final int count = 5;
666 >        final AtomicInteger ran = new AtomicInteger(0);
667          final ThreadPoolExecutor p =
668 <            new ThreadPoolExecutor(1, 1,
668 >            new ThreadPoolExecutor(poolSize, poolSize,
669                                     LONG_DELAY_MS, MILLISECONDS,
670                                     new ArrayBlockingQueue<Runnable>(10));
671 <        List l;
672 <        try {
673 <            for (int i = 0; i < 5; i++)
636 <                p.execute(new MediumPossiblyInterruptedRunnable());
637 <        }
638 <        finally {
671 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
672 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
673 >            threadsStarted.countDown();
674              try {
675 <                l = p.shutdownNow();
676 <            } catch (SecurityException ok) { return; }
675 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
676 >            } catch (InterruptedException success) {}
677 >            ran.getAndIncrement();
678 >        }};
679 >        for (int i = 0; i < count; i++)
680 >            p.execute(waiter);
681 >        await(threadsStarted);
682 >        assertEquals(poolSize, p.getActiveCount());
683 >        assertEquals(0, p.getCompletedTaskCount());
684 >        final List<Runnable> queuedTasks;
685 >        try {
686 >            queuedTasks = p.shutdownNow();
687 >        } catch (SecurityException ok) {
688 >            return; // Allowed in case test doesn't have privs
689          }
690          assertTrue(p.isShutdown());
691 <        assertTrue(l.size() <= 4);
691 >        assertTrue(p.getQueue().isEmpty());
692 >        assertEquals(count - poolSize, queuedTasks.size());
693 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
694 >        assertTrue(p.isTerminated());
695 >        assertEquals(poolSize, ran.get());
696 >        assertEquals(poolSize, p.getCompletedTaskCount());
697      }
698  
699      // Exception Tests
# Line 988 | Line 1040 | public class ThreadPoolExecutorTest exte
1040       * get of submitted callable throws InterruptedException if interrupted
1041       */
1042      public void testInterruptedSubmit() throws InterruptedException {
1043 +        final CountDownLatch done = new CountDownLatch(1);
1044          final ThreadPoolExecutor p =
1045              new ThreadPoolExecutor(1, 1,
1046 <                                   60, TimeUnit.SECONDS,
1046 >                                   60, SECONDS,
1047                                     new ArrayBlockingQueue<Runnable>(10));
1048  
1049 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1050 <        final CountDownLatch done = new CountDownLatch(1);
998 <        try {
1049 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1050 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1051              Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1052                  public void realRun() throws Exception {
1053                      Callable task = new CheckedCallable<Boolean>() {
1054                          public Boolean realCall() throws InterruptedException {
1055                              threadStarted.countDown();
1056 <                            done.await();
1056 >                            await(done);
1057                              return Boolean.TRUE;
1058                          }};
1059                      p.submit(task).get();
1060                  }});
1061  
1062 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1062 >            await(threadStarted);
1063              t.interrupt();
1064 <            awaitTermination(t, MEDIUM_DELAY_MS);
1013 <        } finally {
1014 <            done.countDown();
1015 <            joinPool(p);
1064 >            awaitTermination(t);
1065          }
1066      }
1067  
1068      /**
1069 <     * execute throws RejectedExecutionException if saturated.
1069 >     * Submitted tasks are rejected when saturated.
1070       */
1071 <    public void testSaturatedExecute() {
1072 <        ThreadPoolExecutor p =
1073 <            new ThreadPoolExecutor(1, 1,
1025 <                                   LONG_DELAY_MS, MILLISECONDS,
1026 <                                   new ArrayBlockingQueue<Runnable>(1));
1071 >    @SuppressWarnings("FutureReturnValueIgnored")
1072 >    public void testSubmittedTasksRejectedWhenSaturated() {
1073 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
1074          final CountDownLatch done = new CountDownLatch(1);
1075 <        try {
1076 <            Runnable task = new CheckedRunnable() {
1077 <                public void realRun() throws InterruptedException {
1078 <                    done.await();
1079 <                }};
1080 <            for (int i = 0; i < 2; ++i)
1081 <                p.execute(task);
1082 <            for (int i = 0; i < 2; ++i) {
1075 >        final Runnable r = awaiter(done);
1076 >        final Callable<Boolean> c = new CheckedCallable() {
1077 >            public Boolean realCall() throws InterruptedException {
1078 >                await(done);
1079 >                return Boolean.TRUE;
1080 >            }};
1081 >        final ThreadPoolExecutor p = new ThreadPoolExecutor(
1082 >            1, 1, 1, SECONDS, new ArrayBlockingQueue<Runnable>(1));
1083 >
1084 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1085 >            // saturate
1086 >            for (int i = saturatedSize(p); i--> 0; ) {
1087 >                switch (rnd.nextInt(3)) {
1088 >                case 0: p.execute(r); break;
1089 >                case 1: assertFalse(p.submit(r).isDone()); break;
1090 >                case 2: assertFalse(p.submit(c).isDone()); break;
1091 >                }
1092 >            }
1093 >
1094 >            // check default handler
1095 >            assertTrue(p.getRejectedExecutionHandler() instanceof AbortPolicy);
1096 >            for (int i = 2; i--> 0; ) {
1097                  try {
1098 <                    p.execute(task);
1098 >                    p.execute(r);
1099                      shouldThrow();
1100                  } catch (RejectedExecutionException success) {}
1040                assertTrue(p.getTaskCount() <= 2);
1041            }
1042        } finally {
1043            done.countDown();
1044            joinPool(p);
1045        }
1046    }
1047
1048    /**
1049     * submit(runnable) throws RejectedExecutionException if saturated.
1050     */
1051    public void testSaturatedSubmitRunnable() {
1052        ThreadPoolExecutor p =
1053            new ThreadPoolExecutor(1, 1,
1054                                   LONG_DELAY_MS, MILLISECONDS,
1055                                   new ArrayBlockingQueue<Runnable>(1));
1056        final CountDownLatch done = new CountDownLatch(1);
1057        try {
1058            Runnable task = new CheckedRunnable() {
1059                public void realRun() throws InterruptedException {
1060                    done.await();
1061                }};
1062            for (int i = 0; i < 2; ++i)
1063                p.submit(task);
1064            for (int i = 0; i < 2; ++i) {
1101                  try {
1102 <                    p.execute(task);
1102 >                    p.submit(r);
1103                      shouldThrow();
1104                  } catch (RejectedExecutionException success) {}
1069                assertTrue(p.getTaskCount() <= 2);
1070            }
1071        } finally {
1072            done.countDown();
1073            joinPool(p);
1074        }
1075    }
1076
1077    /**
1078     * submit(callable) throws RejectedExecutionException if saturated.
1079     */
1080    public void testSaturatedSubmitCallable() {
1081        ThreadPoolExecutor p =
1082            new ThreadPoolExecutor(1, 1,
1083                                   LONG_DELAY_MS, MILLISECONDS,
1084                                   new ArrayBlockingQueue<Runnable>(1));
1085        final CountDownLatch done = new CountDownLatch(1);
1086        try {
1087            Runnable task = new CheckedRunnable() {
1088                public void realRun() throws InterruptedException {
1089                    done.await();
1090                }};
1091            for (int i = 0; i < 2; ++i)
1092                p.submit(Executors.callable(task));
1093            for (int i = 0; i < 2; ++i) {
1105                  try {
1106 <                    p.execute(task);
1106 >                    p.submit(c);
1107                      shouldThrow();
1108                  } catch (RejectedExecutionException success) {}
1098                assertTrue(p.getTaskCount() <= 2);
1109              }
1110 <        } finally {
1111 <            done.countDown();
1112 <            joinPool(p);
1110 >
1111 >            // check CallerRunsPolicy runs task in caller thread
1112 >            {
1113 >                RejectedExecutionHandler handler = new CallerRunsPolicy();
1114 >                p.setRejectedExecutionHandler(handler);
1115 >                assertSame(handler, p.getRejectedExecutionHandler());
1116 >                final AtomicReference<Thread> thread = new AtomicReference<>();
1117 >                p.execute(new Runnable() { public void run() {
1118 >                    thread.set(Thread.currentThread()); }});
1119 >                assertSame(Thread.currentThread(), thread.get());
1120 >            }
1121 >
1122 >            // check DiscardPolicy does nothing
1123 >            {
1124 >                RejectedExecutionHandler handler = new DiscardPolicy();
1125 >                p.setRejectedExecutionHandler(handler);
1126 >                assertSame(handler, p.getRejectedExecutionHandler());
1127 >                final AtomicReference<Thread> thread = new AtomicReference<>();
1128 >                p.execute(new Runnable() { public void run() {
1129 >                    thread.set(Thread.currentThread()); }});
1130 >                assertNull(thread.get());
1131 >            }
1132 >
1133 >            class Recorder implements RejectedExecutionHandler {
1134 >                public volatile Runnable r = null;
1135 >                public volatile ThreadPoolExecutor p = null;
1136 >                public void reset() { r = null; p = null; }
1137 >                public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1138 >                    assertNull(this.r);
1139 >                    assertNull(this.p);
1140 >                    this.r = r;
1141 >                    this.p = p;
1142 >                }
1143 >            }
1144 >
1145 >            // check custom handler is invoked exactly once per task
1146 >            Recorder recorder = new Recorder();
1147 >            p.setRejectedExecutionHandler(recorder);
1148 >            assertSame(recorder, p.getRejectedExecutionHandler());
1149 >            for (int i = 2; i--> 0; ) {
1150 >                recorder.reset();
1151 >                p.execute(r);
1152 >                assertSame(r, recorder.r);
1153 >                assertSame(p, recorder.p);
1154 >
1155 >                recorder.reset();
1156 >                assertFalse(p.submit(r).isDone());
1157 >                assertTrue(recorder.r instanceof FutureTask);
1158 >                assertSame(p, recorder.p);
1159 >
1160 >                recorder.reset();
1161 >                assertFalse(p.submit(c).isDone());
1162 >                assertTrue(recorder.r instanceof FutureTask);
1163 >                assertSame(p, recorder.p);
1164 >            }
1165 >
1166 >            // check that pool was not perturbed by handlers
1167 >            assertEquals(2, p.getTaskCount());
1168 >            assertEquals(0, p.getCompletedTaskCount());
1169 >            assertEquals(0, p.getQueue().remainingCapacity());
1170          }
1171 +        assertEquals(saturatedSize(p), p.getCompletedTaskCount());
1172      }
1173  
1174      /**
1175       * executor using CallerRunsPolicy runs task if saturated.
1176       */
1177      public void testSaturatedExecute2() {
1178 <        RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1179 <        final ThreadPoolExecutor p =
1180 <            new ThreadPoolExecutor(1, 1,
1181 <                                   LONG_DELAY_MS,
1182 <                                   MILLISECONDS,
1183 <                                   new ArrayBlockingQueue<Runnable>(1),
1184 <                                   h);
1185 <        try {
1186 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1187 <            for (int i = 0; i < tasks.length; ++i)
1188 <                tasks[i] = new TrackedNoOpRunnable();
1189 <            TrackedLongRunnable mr = new TrackedLongRunnable();
1190 <            p.execute(mr);
1191 <            for (int i = 0; i < tasks.length; ++i)
1124 <                p.execute(tasks[i]);
1125 <            for (int i = 1; i < tasks.length; ++i)
1178 >        final RejectedExecutionHandler handler = new CallerRunsPolicy();
1179 >        final ThreadPoolExecutor p = new ThreadPoolExecutor(
1180 >            1, 1, LONG_DELAY_MS, SECONDS, new ArrayBlockingQueue<Runnable>(1),
1181 >            handler);
1182 >        assertSame(handler, p.getRejectedExecutionHandler());
1183 >        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1184 >        final CountDownLatch done = new CountDownLatch(1);
1185 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1186 >            p.execute(awaiter(done));
1187 >
1188 >            for (int i = 0; i < tasks.length; i++)
1189 >                p.execute(tasks[i] = new TrackedNoOpRunnable());
1190 >
1191 >            for (int i = 1; i < tasks.length; i++)
1192                  assertTrue(tasks[i].done);
1193 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1128 <        } finally {
1129 <            joinPool(p);
1193 >            assertFalse(tasks[0].done); // waiting in queue
1194          }
1195 +        for (TrackedNoOpRunnable task : tasks)
1196 +            assertTrue(task.done);
1197      }
1198  
1199      /**
1200       * executor using DiscardPolicy drops task if saturated.
1201       */
1202      public void testSaturatedExecute3() {
1203 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1204 <        final ThreadPoolExecutor p =
1205 <            new ThreadPoolExecutor(1, 1,
1206 <                                   LONG_DELAY_MS, MILLISECONDS,
1207 <                                   new ArrayBlockingQueue<Runnable>(1),
1208 <                                   h);
1209 <        try {
1210 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1211 <            for (int i = 0; i < tasks.length; ++i)
1212 <                tasks[i] = new TrackedNoOpRunnable();
1213 <            p.execute(new TrackedLongRunnable());
1214 <            for (TrackedNoOpRunnable task : tasks)
1215 <                p.execute(task);
1216 <            for (TrackedNoOpRunnable task : tasks)
1217 <                assertFalse(task.done);
1152 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1153 <        } finally {
1154 <            joinPool(p);
1203 >        final RejectedExecutionHandler handler = new DiscardPolicy();
1204 >        final ThreadPoolExecutor p = new ThreadPoolExecutor(
1205 >            1, 1, LONG_DELAY_MS, SECONDS, new ArrayBlockingQueue<Runnable>(1),
1206 >            handler);
1207 >        assertSame(handler, p.getRejectedExecutionHandler());
1208 >        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1209 >        final CountDownLatch done = new CountDownLatch(1);
1210 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1211 >            p.execute(awaiter(done));
1212 >
1213 >            for (int i = 0; i < tasks.length; i++)
1214 >                p.execute(tasks[i] = new TrackedNoOpRunnable());
1215 >
1216 >            for (int i = 1; i < tasks.length; i++)
1217 >                assertFalse(tasks[i].done);
1218          }
1219 +        for (int i = 1; i < tasks.length; i++)
1220 +            assertFalse(tasks[i].done);
1221 +        assertTrue(tasks[0].done); // was waiting in queue
1222      }
1223  
1224      /**
1225       * executor using DiscardOldestPolicy drops oldest task if saturated.
1226       */
1227      public void testSaturatedExecute4() {
1228 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1228 >        final CountDownLatch done = new CountDownLatch(1);
1229 >        LatchAwaiter r1 = awaiter(done);
1230 >        LatchAwaiter r2 = awaiter(done);
1231 >        LatchAwaiter r3 = awaiter(done);
1232          final ThreadPoolExecutor p =
1233              new ThreadPoolExecutor(1, 1,
1234                                     LONG_DELAY_MS, MILLISECONDS,
1235                                     new ArrayBlockingQueue<Runnable>(1),
1236 <                                   h);
1237 <        try {
1238 <            p.execute(new TrackedLongRunnable());
1239 <            TrackedLongRunnable r2 = new TrackedLongRunnable();
1236 >                                   new DiscardOldestPolicy());
1237 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1238 >            assertEquals(LatchAwaiter.NEW, r1.state);
1239 >            assertEquals(LatchAwaiter.NEW, r2.state);
1240 >            assertEquals(LatchAwaiter.NEW, r3.state);
1241 >            p.execute(r1);
1242              p.execute(r2);
1243              assertTrue(p.getQueue().contains(r2));
1173            TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1244              p.execute(r3);
1245              assertFalse(p.getQueue().contains(r2));
1246              assertTrue(p.getQueue().contains(r3));
1177            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1178        } finally {
1179            joinPool(p);
1247          }
1248 +        assertEquals(LatchAwaiter.DONE, r1.state);
1249 +        assertEquals(LatchAwaiter.NEW, r2.state);
1250 +        assertEquals(LatchAwaiter.DONE, r3.state);
1251      }
1252  
1253      /**
1254       * execute throws RejectedExecutionException if shutdown
1255       */
1256      public void testRejectedExecutionExceptionOnShutdown() {
1257 <        ThreadPoolExecutor p =
1257 >        final ThreadPoolExecutor p =
1258              new ThreadPoolExecutor(1, 1,
1259                                     LONG_DELAY_MS, MILLISECONDS,
1260                                     new ArrayBlockingQueue<Runnable>(1));
1261          try { p.shutdown(); } catch (SecurityException ok) { return; }
1262 <        try {
1263 <            p.execute(new NoOpRunnable());
1264 <            shouldThrow();
1265 <        } catch (RejectedExecutionException success) {}
1266 <
1267 <        joinPool(p);
1262 >        try (PoolCleaner cleaner = cleaner(p)) {
1263 >            try {
1264 >                p.execute(new NoOpRunnable());
1265 >                shouldThrow();
1266 >            } catch (RejectedExecutionException success) {}
1267 >        }
1268      }
1269  
1270      /**
1271       * execute using CallerRunsPolicy drops task on shutdown
1272       */
1273      public void testCallerRunsOnShutdown() {
1274 <        RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1274 >        RejectedExecutionHandler h = new CallerRunsPolicy();
1275          final ThreadPoolExecutor p =
1276              new ThreadPoolExecutor(1, 1,
1277                                     LONG_DELAY_MS, MILLISECONDS,
1278                                     new ArrayBlockingQueue<Runnable>(1), h);
1279  
1280          try { p.shutdown(); } catch (SecurityException ok) { return; }
1281 <        try {
1281 >        try (PoolCleaner cleaner = cleaner(p)) {
1282              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1283              p.execute(r);
1284              assertFalse(r.done);
1215        } finally {
1216            joinPool(p);
1285          }
1286      }
1287  
# Line 1221 | Line 1289 | public class ThreadPoolExecutorTest exte
1289       * execute using DiscardPolicy drops task on shutdown
1290       */
1291      public void testDiscardOnShutdown() {
1292 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1225 <        ThreadPoolExecutor p =
1292 >        final ThreadPoolExecutor p =
1293              new ThreadPoolExecutor(1, 1,
1294                                     LONG_DELAY_MS, MILLISECONDS,
1295                                     new ArrayBlockingQueue<Runnable>(1),
1296 <                                   h);
1296 >                                   new DiscardPolicy());
1297  
1298          try { p.shutdown(); } catch (SecurityException ok) { return; }
1299 <        try {
1299 >        try (PoolCleaner cleaner = cleaner(p)) {
1300              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1301              p.execute(r);
1302              assertFalse(r.done);
1236        } finally {
1237            joinPool(p);
1303          }
1304      }
1305  
# Line 1242 | Line 1307 | public class ThreadPoolExecutorTest exte
1307       * execute using DiscardOldestPolicy drops task on shutdown
1308       */
1309      public void testDiscardOldestOnShutdown() {
1310 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1246 <        ThreadPoolExecutor p =
1310 >        final ThreadPoolExecutor p =
1311              new ThreadPoolExecutor(1, 1,
1312                                     LONG_DELAY_MS, MILLISECONDS,
1313                                     new ArrayBlockingQueue<Runnable>(1),
1314 <                                   h);
1314 >                                   new DiscardOldestPolicy());
1315  
1316          try { p.shutdown(); } catch (SecurityException ok) { return; }
1317 <        try {
1317 >        try (PoolCleaner cleaner = cleaner(p)) {
1318              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1319              p.execute(r);
1320              assertFalse(r.done);
1257        } finally {
1258            joinPool(p);
1321          }
1322      }
1323  
# Line 1263 | Line 1325 | public class ThreadPoolExecutorTest exte
1325       * execute(null) throws NPE
1326       */
1327      public void testExecuteNull() {
1328 <        ThreadPoolExecutor p =
1329 <            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1328 >        final ThreadPoolExecutor p =
1329 >            new ThreadPoolExecutor(1, 2,
1330 >                                   1L, SECONDS,
1331                                     new ArrayBlockingQueue<Runnable>(10));
1332 <        try {
1333 <            p.execute(null);
1334 <            shouldThrow();
1335 <        } catch (NullPointerException success) {}
1336 <
1337 <        joinPool(p);
1332 >        try (PoolCleaner cleaner = cleaner(p)) {
1333 >            try {
1334 >                p.execute(null);
1335 >                shouldThrow();
1336 >            } catch (NullPointerException success) {}
1337 >        }
1338      }
1339  
1340      /**
1341       * setCorePoolSize of negative value throws IllegalArgumentException
1342       */
1343      public void testCorePoolSizeIllegalArgumentException() {
1344 <        ThreadPoolExecutor p =
1344 >        final ThreadPoolExecutor p =
1345              new ThreadPoolExecutor(1, 2,
1346                                     LONG_DELAY_MS, MILLISECONDS,
1347                                     new ArrayBlockingQueue<Runnable>(10));
1348 <        try {
1349 <            p.setCorePoolSize(-1);
1350 <            shouldThrow();
1351 <        } catch (IllegalArgumentException success) {
1352 <        } finally {
1290 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1348 >        try (PoolCleaner cleaner = cleaner(p)) {
1349 >            try {
1350 >                p.setCorePoolSize(-1);
1351 >                shouldThrow();
1352 >            } catch (IllegalArgumentException success) {}
1353          }
1292        joinPool(p);
1354      }
1355  
1356      /**
# Line 1297 | Line 1358 | public class ThreadPoolExecutorTest exte
1358       * given a value less the core pool size
1359       */
1360      public void testMaximumPoolSizeIllegalArgumentException() {
1361 <        ThreadPoolExecutor p =
1361 >        final ThreadPoolExecutor p =
1362              new ThreadPoolExecutor(2, 3,
1363                                     LONG_DELAY_MS, MILLISECONDS,
1364                                     new ArrayBlockingQueue<Runnable>(10));
1365 <        try {
1366 <            p.setMaximumPoolSize(1);
1367 <            shouldThrow();
1368 <        } catch (IllegalArgumentException success) {
1369 <        } finally {
1309 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1365 >        try (PoolCleaner cleaner = cleaner(p)) {
1366 >            try {
1367 >                p.setMaximumPoolSize(1);
1368 >                shouldThrow();
1369 >            } catch (IllegalArgumentException success) {}
1370          }
1311        joinPool(p);
1371      }
1372  
1373      /**
# Line 1316 | Line 1375 | public class ThreadPoolExecutorTest exte
1375       * if given a negative value
1376       */
1377      public void testMaximumPoolSizeIllegalArgumentException2() {
1378 <        ThreadPoolExecutor p =
1378 >        final ThreadPoolExecutor p =
1379              new ThreadPoolExecutor(2, 3,
1380                                     LONG_DELAY_MS, MILLISECONDS,
1381                                     new ArrayBlockingQueue<Runnable>(10));
1382 <        try {
1383 <            p.setMaximumPoolSize(-1);
1384 <            shouldThrow();
1385 <        } catch (IllegalArgumentException success) {
1386 <        } finally {
1387 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1382 >        try (PoolCleaner cleaner = cleaner(p)) {
1383 >            try {
1384 >                p.setMaximumPoolSize(-1);
1385 >                shouldThrow();
1386 >            } catch (IllegalArgumentException success) {}
1387 >        }
1388 >    }
1389 >
1390 >    /**
1391 >     * Configuration changes that allow core pool size greater than
1392 >     * max pool size result in IllegalArgumentException.
1393 >     */
1394 >    public void testPoolSizeInvariants() {
1395 >        final ThreadPoolExecutor p =
1396 >            new ThreadPoolExecutor(1, 1,
1397 >                                   LONG_DELAY_MS, MILLISECONDS,
1398 >                                   new ArrayBlockingQueue<Runnable>(10));
1399 >        try (PoolCleaner cleaner = cleaner(p)) {
1400 >            for (int s = 1; s < 5; s++) {
1401 >                p.setMaximumPoolSize(s);
1402 >                p.setCorePoolSize(s);
1403 >                try {
1404 >                    p.setMaximumPoolSize(s - 1);
1405 >                    shouldThrow();
1406 >                } catch (IllegalArgumentException success) {}
1407 >                assertEquals(s, p.getCorePoolSize());
1408 >                assertEquals(s, p.getMaximumPoolSize());
1409 >                try {
1410 >                    p.setCorePoolSize(s + 1);
1411 >                    shouldThrow();
1412 >                } catch (IllegalArgumentException success) {}
1413 >                assertEquals(s, p.getCorePoolSize());
1414 >                assertEquals(s, p.getMaximumPoolSize());
1415 >            }
1416          }
1330        joinPool(p);
1417      }
1418  
1419      /**
# Line 1335 | Line 1421 | public class ThreadPoolExecutorTest exte
1421       * when given a negative value
1422       */
1423      public void testKeepAliveTimeIllegalArgumentException() {
1424 <        ThreadPoolExecutor p =
1424 >        final ThreadPoolExecutor p =
1425              new ThreadPoolExecutor(2, 3,
1426                                     LONG_DELAY_MS, MILLISECONDS,
1427                                     new ArrayBlockingQueue<Runnable>(10));
1428 <        try {
1429 <            p.setKeepAliveTime(-1,MILLISECONDS);
1430 <            shouldThrow();
1431 <        } catch (IllegalArgumentException success) {
1432 <        } finally {
1347 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1428 >        try (PoolCleaner cleaner = cleaner(p)) {
1429 >            try {
1430 >                p.setKeepAliveTime(-1, MILLISECONDS);
1431 >                shouldThrow();
1432 >            } catch (IllegalArgumentException success) {}
1433          }
1349        joinPool(p);
1434      }
1435  
1436      /**
# Line 1354 | Line 1438 | public class ThreadPoolExecutorTest exte
1438       */
1439      public void testTerminated() {
1440          ExtendedTPE p = new ExtendedTPE();
1441 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
1442 <        assertTrue(p.terminatedCalled());
1443 <        joinPool(p);
1441 >        try (PoolCleaner cleaner = cleaner(p)) {
1442 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1443 >            assertTrue(p.terminatedCalled());
1444 >            assertTrue(p.isShutdown());
1445 >        }
1446      }
1447  
1448      /**
# Line 1364 | Line 1450 | public class ThreadPoolExecutorTest exte
1450       */
1451      public void testBeforeAfter() throws InterruptedException {
1452          ExtendedTPE p = new ExtendedTPE();
1453 <        try {
1453 >        try (PoolCleaner cleaner = cleaner(p)) {
1454              final CountDownLatch done = new CountDownLatch(1);
1455              p.execute(new CheckedRunnable() {
1456                  public void realRun() {
# Line 1374 | Line 1460 | public class ThreadPoolExecutorTest exte
1460              assertEquals(0, done.getCount());
1461              assertTrue(p.afterCalled());
1462              assertTrue(p.beforeCalled());
1377            try { p.shutdown(); } catch (SecurityException ok) { return; }
1378        } finally {
1379            joinPool(p);
1463          }
1464      }
1465  
# Line 1384 | Line 1467 | public class ThreadPoolExecutorTest exte
1467       * completed submit of callable returns result
1468       */
1469      public void testSubmitCallable() throws Exception {
1470 <        ExecutorService e =
1470 >        final ExecutorService e =
1471              new ThreadPoolExecutor(2, 2,
1472                                     LONG_DELAY_MS, MILLISECONDS,
1473                                     new ArrayBlockingQueue<Runnable>(10));
1474 <        try {
1474 >        try (PoolCleaner cleaner = cleaner(e)) {
1475              Future<String> future = e.submit(new StringTask());
1476              String result = future.get();
1477              assertSame(TEST_STRING, result);
1395        } finally {
1396            joinPool(e);
1478          }
1479      }
1480  
# Line 1401 | Line 1482 | public class ThreadPoolExecutorTest exte
1482       * completed submit of runnable returns successfully
1483       */
1484      public void testSubmitRunnable() throws Exception {
1485 <        ExecutorService e =
1485 >        final ExecutorService e =
1486              new ThreadPoolExecutor(2, 2,
1487                                     LONG_DELAY_MS, MILLISECONDS,
1488                                     new ArrayBlockingQueue<Runnable>(10));
1489 <        try {
1489 >        try (PoolCleaner cleaner = cleaner(e)) {
1490              Future<?> future = e.submit(new NoOpRunnable());
1491              future.get();
1492              assertTrue(future.isDone());
1412        } finally {
1413            joinPool(e);
1493          }
1494      }
1495  
# Line 1418 | Line 1497 | public class ThreadPoolExecutorTest exte
1497       * completed submit of (runnable, result) returns result
1498       */
1499      public void testSubmitRunnable2() throws Exception {
1500 <        ExecutorService e =
1500 >        final ExecutorService e =
1501              new ThreadPoolExecutor(2, 2,
1502                                     LONG_DELAY_MS, MILLISECONDS,
1503                                     new ArrayBlockingQueue<Runnable>(10));
1504 <        try {
1504 >        try (PoolCleaner cleaner = cleaner(e)) {
1505              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1506              String result = future.get();
1507              assertSame(TEST_STRING, result);
1429        } finally {
1430            joinPool(e);
1508          }
1509      }
1510  
# Line 1435 | Line 1512 | public class ThreadPoolExecutorTest exte
1512       * invokeAny(null) throws NPE
1513       */
1514      public void testInvokeAny1() throws Exception {
1515 <        ExecutorService e =
1515 >        final ExecutorService e =
1516              new ThreadPoolExecutor(2, 2,
1517                                     LONG_DELAY_MS, MILLISECONDS,
1518                                     new ArrayBlockingQueue<Runnable>(10));
1519 <        try {
1520 <            e.invokeAny(null);
1521 <            shouldThrow();
1522 <        } catch (NullPointerException success) {
1523 <        } finally {
1447 <            joinPool(e);
1519 >        try (PoolCleaner cleaner = cleaner(e)) {
1520 >            try {
1521 >                e.invokeAny(null);
1522 >                shouldThrow();
1523 >            } catch (NullPointerException success) {}
1524          }
1525      }
1526  
1527      /**
1528 <     * invokeAny(empty collection) throws IAE
1528 >     * invokeAny(empty collection) throws IllegalArgumentException
1529       */
1530      public void testInvokeAny2() throws Exception {
1531 <        ExecutorService e =
1531 >        final ExecutorService e =
1532              new ThreadPoolExecutor(2, 2,
1533                                     LONG_DELAY_MS, MILLISECONDS,
1534                                     new ArrayBlockingQueue<Runnable>(10));
1535 <        try {
1536 <            e.invokeAny(new ArrayList<Callable<String>>());
1537 <            shouldThrow();
1538 <        } catch (IllegalArgumentException success) {
1539 <        } finally {
1464 <            joinPool(e);
1535 >        try (PoolCleaner cleaner = cleaner(e)) {
1536 >            try {
1537 >                e.invokeAny(new ArrayList<Callable<String>>());
1538 >                shouldThrow();
1539 >            } catch (IllegalArgumentException success) {}
1540          }
1541      }
1542  
# Line 1474 | Line 1549 | public class ThreadPoolExecutorTest exte
1549              new ThreadPoolExecutor(2, 2,
1550                                     LONG_DELAY_MS, MILLISECONDS,
1551                                     new ArrayBlockingQueue<Runnable>(10));
1552 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1553 <        l.add(latchAwaitingStringTask(latch));
1554 <        l.add(null);
1555 <        try {
1556 <            e.invokeAny(l);
1557 <            shouldThrow();
1558 <        } catch (NullPointerException success) {
1559 <        } finally {
1552 >        try (PoolCleaner cleaner = cleaner(e)) {
1553 >            List<Callable<String>> l = new ArrayList<>();
1554 >            l.add(latchAwaitingStringTask(latch));
1555 >            l.add(null);
1556 >            try {
1557 >                e.invokeAny(l);
1558 >                shouldThrow();
1559 >            } catch (NullPointerException success) {}
1560              latch.countDown();
1486            joinPool(e);
1561          }
1562      }
1563  
# Line 1491 | Line 1565 | public class ThreadPoolExecutorTest exte
1565       * invokeAny(c) throws ExecutionException if no task completes
1566       */
1567      public void testInvokeAny4() throws Exception {
1568 <        ExecutorService e =
1568 >        final ExecutorService e =
1569              new ThreadPoolExecutor(2, 2,
1570                                     LONG_DELAY_MS, MILLISECONDS,
1571                                     new ArrayBlockingQueue<Runnable>(10));
1572 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1573 <        l.add(new NPETask());
1574 <        try {
1575 <            e.invokeAny(l);
1576 <            shouldThrow();
1577 <        } catch (ExecutionException success) {
1578 <            assertTrue(success.getCause() instanceof NullPointerException);
1579 <        } finally {
1580 <            joinPool(e);
1572 >        try (PoolCleaner cleaner = cleaner(e)) {
1573 >            List<Callable<String>> l = new ArrayList<>();
1574 >            l.add(new NPETask());
1575 >            try {
1576 >                e.invokeAny(l);
1577 >                shouldThrow();
1578 >            } catch (ExecutionException success) {
1579 >                assertTrue(success.getCause() instanceof NullPointerException);
1580 >            }
1581          }
1582      }
1583  
# Line 1511 | Line 1585 | public class ThreadPoolExecutorTest exte
1585       * invokeAny(c) returns result of some task
1586       */
1587      public void testInvokeAny5() throws Exception {
1588 <        ExecutorService e =
1588 >        final ExecutorService e =
1589              new ThreadPoolExecutor(2, 2,
1590                                     LONG_DELAY_MS, MILLISECONDS,
1591                                     new ArrayBlockingQueue<Runnable>(10));
1592 <        try {
1593 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1592 >        try (PoolCleaner cleaner = cleaner(e)) {
1593 >            List<Callable<String>> l = new ArrayList<>();
1594              l.add(new StringTask());
1595              l.add(new StringTask());
1596              String result = e.invokeAny(l);
1597              assertSame(TEST_STRING, result);
1524        } finally {
1525            joinPool(e);
1598          }
1599      }
1600  
# Line 1530 | Line 1602 | public class ThreadPoolExecutorTest exte
1602       * invokeAll(null) throws NPE
1603       */
1604      public void testInvokeAll1() throws Exception {
1605 <        ExecutorService e =
1605 >        final ExecutorService e =
1606              new ThreadPoolExecutor(2, 2,
1607                                     LONG_DELAY_MS, MILLISECONDS,
1608                                     new ArrayBlockingQueue<Runnable>(10));
1609 <        try {
1610 <            e.invokeAll(null);
1611 <            shouldThrow();
1612 <        } catch (NullPointerException success) {
1613 <        } finally {
1542 <            joinPool(e);
1609 >        try (PoolCleaner cleaner = cleaner(e)) {
1610 >            try {
1611 >                e.invokeAll(null);
1612 >                shouldThrow();
1613 >            } catch (NullPointerException success) {}
1614          }
1615      }
1616  
1617      /**
1618 <     * invokeAll(empty collection) returns empty collection
1618 >     * invokeAll(empty collection) returns empty list
1619       */
1620      public void testInvokeAll2() throws InterruptedException {
1621 <        ExecutorService e =
1621 >        final ExecutorService e =
1622              new ThreadPoolExecutor(2, 2,
1623                                     LONG_DELAY_MS, MILLISECONDS,
1624                                     new ArrayBlockingQueue<Runnable>(10));
1625 <        try {
1626 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1625 >        final Collection<Callable<String>> emptyCollection
1626 >            = Collections.emptyList();
1627 >        try (PoolCleaner cleaner = cleaner(e)) {
1628 >            List<Future<String>> r = e.invokeAll(emptyCollection);
1629              assertTrue(r.isEmpty());
1557        } finally {
1558            joinPool(e);
1630          }
1631      }
1632  
# Line 1563 | Line 1634 | public class ThreadPoolExecutorTest exte
1634       * invokeAll(c) throws NPE if c has null elements
1635       */
1636      public void testInvokeAll3() throws Exception {
1637 <        ExecutorService e =
1637 >        final ExecutorService e =
1638              new ThreadPoolExecutor(2, 2,
1639                                     LONG_DELAY_MS, MILLISECONDS,
1640                                     new ArrayBlockingQueue<Runnable>(10));
1641 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1642 <        l.add(new StringTask());
1643 <        l.add(null);
1644 <        try {
1645 <            e.invokeAll(l);
1646 <            shouldThrow();
1647 <        } catch (NullPointerException success) {
1648 <        } finally {
1578 <            joinPool(e);
1641 >        try (PoolCleaner cleaner = cleaner(e)) {
1642 >            List<Callable<String>> l = new ArrayList<>();
1643 >            l.add(new StringTask());
1644 >            l.add(null);
1645 >            try {
1646 >                e.invokeAll(l);
1647 >                shouldThrow();
1648 >            } catch (NullPointerException success) {}
1649          }
1650      }
1651  
# Line 1583 | Line 1653 | public class ThreadPoolExecutorTest exte
1653       * get of element of invokeAll(c) throws exception on failed task
1654       */
1655      public void testInvokeAll4() throws Exception {
1656 <        ExecutorService e =
1656 >        final ExecutorService e =
1657              new ThreadPoolExecutor(2, 2,
1658                                     LONG_DELAY_MS, MILLISECONDS,
1659                                     new ArrayBlockingQueue<Runnable>(10));
1660 <        try {
1661 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1660 >        try (PoolCleaner cleaner = cleaner(e)) {
1661 >            List<Callable<String>> l = new ArrayList<>();
1662              l.add(new NPETask());
1663              List<Future<String>> futures = e.invokeAll(l);
1664              assertEquals(1, futures.size());
# Line 1598 | Line 1668 | public class ThreadPoolExecutorTest exte
1668              } catch (ExecutionException success) {
1669                  assertTrue(success.getCause() instanceof NullPointerException);
1670              }
1601        } finally {
1602            joinPool(e);
1671          }
1672      }
1673  
# Line 1607 | Line 1675 | public class ThreadPoolExecutorTest exte
1675       * invokeAll(c) returns results of all completed tasks
1676       */
1677      public void testInvokeAll5() throws Exception {
1678 <        ExecutorService e =
1678 >        final ExecutorService e =
1679              new ThreadPoolExecutor(2, 2,
1680                                     LONG_DELAY_MS, MILLISECONDS,
1681                                     new ArrayBlockingQueue<Runnable>(10));
1682 <        try {
1683 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1682 >        try (PoolCleaner cleaner = cleaner(e)) {
1683 >            List<Callable<String>> l = new ArrayList<>();
1684              l.add(new StringTask());
1685              l.add(new StringTask());
1686              List<Future<String>> futures = e.invokeAll(l);
1687              assertEquals(2, futures.size());
1688              for (Future<String> future : futures)
1689                  assertSame(TEST_STRING, future.get());
1622        } finally {
1623            joinPool(e);
1690          }
1691      }
1692  
# Line 1628 | Line 1694 | public class ThreadPoolExecutorTest exte
1694       * timed invokeAny(null) throws NPE
1695       */
1696      public void testTimedInvokeAny1() throws Exception {
1697 <        ExecutorService e =
1697 >        final ExecutorService e =
1698              new ThreadPoolExecutor(2, 2,
1699                                     LONG_DELAY_MS, MILLISECONDS,
1700                                     new ArrayBlockingQueue<Runnable>(10));
1701 <        try {
1702 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1703 <            shouldThrow();
1704 <        } catch (NullPointerException success) {
1705 <        } finally {
1640 <            joinPool(e);
1701 >        try (PoolCleaner cleaner = cleaner(e)) {
1702 >            try {
1703 >                e.invokeAny(null, randomTimeout(), randomTimeUnit());
1704 >                shouldThrow();
1705 >            } catch (NullPointerException success) {}
1706          }
1707      }
1708  
# Line 1645 | Line 1710 | public class ThreadPoolExecutorTest exte
1710       * timed invokeAny(,,null) throws NPE
1711       */
1712      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1713 <        ExecutorService e =
1713 >        final ExecutorService e =
1714              new ThreadPoolExecutor(2, 2,
1715                                     LONG_DELAY_MS, MILLISECONDS,
1716                                     new ArrayBlockingQueue<Runnable>(10));
1717 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1718 <        l.add(new StringTask());
1719 <        try {
1720 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1721 <            shouldThrow();
1722 <        } catch (NullPointerException success) {
1723 <        } finally {
1659 <            joinPool(e);
1717 >        try (PoolCleaner cleaner = cleaner(e)) {
1718 >            List<Callable<String>> l = new ArrayList<>();
1719 >            l.add(new StringTask());
1720 >            try {
1721 >                e.invokeAny(l, randomTimeout(), null);
1722 >                shouldThrow();
1723 >            } catch (NullPointerException success) {}
1724          }
1725      }
1726  
1727      /**
1728 <     * timed invokeAny(empty collection) throws IAE
1728 >     * timed invokeAny(empty collection) throws IllegalArgumentException
1729       */
1730      public void testTimedInvokeAny2() throws Exception {
1731 <        ExecutorService e =
1731 >        final ExecutorService e =
1732              new ThreadPoolExecutor(2, 2,
1733                                     LONG_DELAY_MS, MILLISECONDS,
1734                                     new ArrayBlockingQueue<Runnable>(10));
1735 <        try {
1736 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1737 <            shouldThrow();
1738 <        } catch (IllegalArgumentException success) {
1739 <        } finally {
1740 <            joinPool(e);
1735 >        try (PoolCleaner cleaner = cleaner(e)) {
1736 >            try {
1737 >                e.invokeAny(new ArrayList<Callable<String>>(),
1738 >                            randomTimeout(), randomTimeUnit());
1739 >                shouldThrow();
1740 >            } catch (IllegalArgumentException success) {}
1741          }
1742      }
1743  
1744      /**
1745 <     * timed invokeAny(c) throws NPE if c has null elements
1745 >     * timed invokeAny(c) throws NullPointerException if c has null elements
1746       */
1747      public void testTimedInvokeAny3() throws Exception {
1748          final CountDownLatch latch = new CountDownLatch(1);
# Line 1686 | Line 1750 | public class ThreadPoolExecutorTest exte
1750              new ThreadPoolExecutor(2, 2,
1751                                     LONG_DELAY_MS, MILLISECONDS,
1752                                     new ArrayBlockingQueue<Runnable>(10));
1753 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1754 <        l.add(latchAwaitingStringTask(latch));
1755 <        l.add(null);
1756 <        try {
1757 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1758 <            shouldThrow();
1759 <        } catch (NullPointerException success) {
1760 <        } finally {
1753 >        try (PoolCleaner cleaner = cleaner(e)) {
1754 >            List<Callable<String>> l = new ArrayList<>();
1755 >            l.add(latchAwaitingStringTask(latch));
1756 >            l.add(null);
1757 >            try {
1758 >                e.invokeAny(l, randomTimeout(), randomTimeUnit());
1759 >                shouldThrow();
1760 >            } catch (NullPointerException success) {}
1761              latch.countDown();
1698            joinPool(e);
1762          }
1763      }
1764  
# Line 1703 | Line 1766 | public class ThreadPoolExecutorTest exte
1766       * timed invokeAny(c) throws ExecutionException if no task completes
1767       */
1768      public void testTimedInvokeAny4() throws Exception {
1769 <        ExecutorService e =
1769 >        final ExecutorService e =
1770              new ThreadPoolExecutor(2, 2,
1771                                     LONG_DELAY_MS, MILLISECONDS,
1772                                     new ArrayBlockingQueue<Runnable>(10));
1773 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1774 <        l.add(new NPETask());
1775 <        try {
1776 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1777 <            shouldThrow();
1778 <        } catch (ExecutionException success) {
1779 <            assertTrue(success.getCause() instanceof NullPointerException);
1780 <        } finally {
1781 <            joinPool(e);
1773 >        try (PoolCleaner cleaner = cleaner(e)) {
1774 >            long startTime = System.nanoTime();
1775 >            List<Callable<String>> l = new ArrayList<>();
1776 >            l.add(new NPETask());
1777 >            try {
1778 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1779 >                shouldThrow();
1780 >            } catch (ExecutionException success) {
1781 >                assertTrue(success.getCause() instanceof NullPointerException);
1782 >            }
1783 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1784          }
1785      }
1786  
# Line 1723 | Line 1788 | public class ThreadPoolExecutorTest exte
1788       * timed invokeAny(c) returns result of some task
1789       */
1790      public void testTimedInvokeAny5() throws Exception {
1791 <        ExecutorService e =
1791 >        final ExecutorService e =
1792              new ThreadPoolExecutor(2, 2,
1793                                     LONG_DELAY_MS, MILLISECONDS,
1794                                     new ArrayBlockingQueue<Runnable>(10));
1795 <        try {
1796 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1795 >        try (PoolCleaner cleaner = cleaner(e)) {
1796 >            long startTime = System.nanoTime();
1797 >            List<Callable<String>> l = new ArrayList<>();
1798              l.add(new StringTask());
1799              l.add(new StringTask());
1800 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1800 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1801              assertSame(TEST_STRING, result);
1802 <        } finally {
1737 <            joinPool(e);
1802 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1803          }
1804      }
1805  
# Line 1742 | Line 1807 | public class ThreadPoolExecutorTest exte
1807       * timed invokeAll(null) throws NPE
1808       */
1809      public void testTimedInvokeAll1() throws Exception {
1810 <        ExecutorService e =
1810 >        final ExecutorService e =
1811              new ThreadPoolExecutor(2, 2,
1812                                     LONG_DELAY_MS, MILLISECONDS,
1813                                     new ArrayBlockingQueue<Runnable>(10));
1814 <        try {
1815 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1816 <            shouldThrow();
1817 <        } catch (NullPointerException success) {
1818 <        } finally {
1754 <            joinPool(e);
1814 >        try (PoolCleaner cleaner = cleaner(e)) {
1815 >            try {
1816 >                e.invokeAll(null, randomTimeout(), randomTimeUnit());
1817 >                shouldThrow();
1818 >            } catch (NullPointerException success) {}
1819          }
1820      }
1821  
# Line 1759 | Line 1823 | public class ThreadPoolExecutorTest exte
1823       * timed invokeAll(,,null) throws NPE
1824       */
1825      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1826 <        ExecutorService e =
1826 >        final ExecutorService e =
1827              new ThreadPoolExecutor(2, 2,
1828                                     LONG_DELAY_MS, MILLISECONDS,
1829                                     new ArrayBlockingQueue<Runnable>(10));
1830 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1831 <        l.add(new StringTask());
1832 <        try {
1833 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1834 <            shouldThrow();
1835 <        } catch (NullPointerException success) {
1836 <        } finally {
1773 <            joinPool(e);
1830 >        try (PoolCleaner cleaner = cleaner(e)) {
1831 >            List<Callable<String>> l = new ArrayList<>();
1832 >            l.add(new StringTask());
1833 >            try {
1834 >                e.invokeAll(l, randomTimeout(), null);
1835 >                shouldThrow();
1836 >            } catch (NullPointerException success) {}
1837          }
1838      }
1839  
1840      /**
1841 <     * timed invokeAll(empty collection) returns empty collection
1841 >     * timed invokeAll(empty collection) returns empty list
1842       */
1843      public void testTimedInvokeAll2() throws InterruptedException {
1844 <        ExecutorService e =
1844 >        final ExecutorService e =
1845              new ThreadPoolExecutor(2, 2,
1846                                     LONG_DELAY_MS, MILLISECONDS,
1847                                     new ArrayBlockingQueue<Runnable>(10));
1848 <        try {
1849 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1848 >        final Collection<Callable<String>> emptyCollection
1849 >            = Collections.emptyList();
1850 >        try (PoolCleaner cleaner = cleaner(e)) {
1851 >            List<Future<String>> r =
1852 >                e.invokeAll(emptyCollection, randomTimeout(), randomTimeUnit());
1853              assertTrue(r.isEmpty());
1788        } finally {
1789            joinPool(e);
1854          }
1855      }
1856  
# Line 1794 | Line 1858 | public class ThreadPoolExecutorTest exte
1858       * timed invokeAll(c) throws NPE if c has null elements
1859       */
1860      public void testTimedInvokeAll3() throws Exception {
1861 <        ExecutorService e =
1861 >        final ExecutorService e =
1862              new ThreadPoolExecutor(2, 2,
1863                                     LONG_DELAY_MS, MILLISECONDS,
1864                                     new ArrayBlockingQueue<Runnable>(10));
1865 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1866 <        l.add(new StringTask());
1867 <        l.add(null);
1868 <        try {
1869 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1870 <            shouldThrow();
1871 <        } catch (NullPointerException success) {
1872 <        } finally {
1809 <            joinPool(e);
1865 >        try (PoolCleaner cleaner = cleaner(e)) {
1866 >            List<Callable<String>> l = new ArrayList<>();
1867 >            l.add(new StringTask());
1868 >            l.add(null);
1869 >            try {
1870 >                e.invokeAll(l, randomTimeout(), randomTimeUnit());
1871 >                shouldThrow();
1872 >            } catch (NullPointerException success) {}
1873          }
1874      }
1875  
# Line 1814 | Line 1877 | public class ThreadPoolExecutorTest exte
1877       * get of element of invokeAll(c) throws exception on failed task
1878       */
1879      public void testTimedInvokeAll4() throws Exception {
1880 <        ExecutorService e =
1880 >        final ExecutorService e =
1881              new ThreadPoolExecutor(2, 2,
1882                                     LONG_DELAY_MS, MILLISECONDS,
1883                                     new ArrayBlockingQueue<Runnable>(10));
1884 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1885 <        l.add(new NPETask());
1886 <        List<Future<String>> futures =
1887 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1888 <        assertEquals(1, futures.size());
1889 <        try {
1890 <            futures.get(0).get();
1891 <            shouldThrow();
1892 <        } catch (ExecutionException success) {
1893 <            assertTrue(success.getCause() instanceof NullPointerException);
1894 <        } finally {
1895 <            joinPool(e);
1884 >        try (PoolCleaner cleaner = cleaner(e)) {
1885 >            List<Callable<String>> l = new ArrayList<>();
1886 >            l.add(new NPETask());
1887 >            List<Future<String>> futures =
1888 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1889 >            assertEquals(1, futures.size());
1890 >            try {
1891 >                futures.get(0).get();
1892 >                shouldThrow();
1893 >            } catch (ExecutionException success) {
1894 >                assertTrue(success.getCause() instanceof NullPointerException);
1895 >            }
1896          }
1897      }
1898  
# Line 1837 | Line 1900 | public class ThreadPoolExecutorTest exte
1900       * timed invokeAll(c) returns results of all completed tasks
1901       */
1902      public void testTimedInvokeAll5() throws Exception {
1903 <        ExecutorService e =
1903 >        final ExecutorService e =
1904              new ThreadPoolExecutor(2, 2,
1905                                     LONG_DELAY_MS, MILLISECONDS,
1906                                     new ArrayBlockingQueue<Runnable>(10));
1907 <        try {
1908 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1907 >        try (PoolCleaner cleaner = cleaner(e)) {
1908 >            List<Callable<String>> l = new ArrayList<>();
1909              l.add(new StringTask());
1910              l.add(new StringTask());
1911              List<Future<String>> futures =
1912 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1912 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1913              assertEquals(2, futures.size());
1914              for (Future<String> future : futures)
1915                  assertSame(TEST_STRING, future.get());
1853        } finally {
1854            joinPool(e);
1916          }
1917      }
1918  
# Line 1859 | Line 1920 | public class ThreadPoolExecutorTest exte
1920       * timed invokeAll(c) cancels tasks not completed by timeout
1921       */
1922      public void testTimedInvokeAll6() throws Exception {
1923 <        ExecutorService e =
1924 <            new ThreadPoolExecutor(2, 2,
1925 <                                   LONG_DELAY_MS, MILLISECONDS,
1926 <                                   new ArrayBlockingQueue<Runnable>(10));
1927 <        try {
1928 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1929 <            l.add(new StringTask());
1930 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1931 <            l.add(new StringTask());
1932 <            List<Future<String>> futures =
1933 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1934 <            assertEquals(l.size(), futures.size());
1935 <            for (Future future : futures)
1936 <                assertTrue(future.isDone());
1937 <            assertFalse(futures.get(0).isCancelled());
1938 <            assertTrue(futures.get(1).isCancelled());
1939 <        } finally {
1940 <            joinPool(e);
1923 >        for (long timeout = timeoutMillis();;) {
1924 >            final CountDownLatch done = new CountDownLatch(1);
1925 >            final Callable<String> waiter = new CheckedCallable<String>() {
1926 >                public String realCall() {
1927 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1928 >                    catch (InterruptedException ok) {}
1929 >                    return "1"; }};
1930 >            final ExecutorService p =
1931 >                new ThreadPoolExecutor(2, 2,
1932 >                                       LONG_DELAY_MS, MILLISECONDS,
1933 >                                       new ArrayBlockingQueue<Runnable>(10));
1934 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1935 >                List<Callable<String>> tasks = new ArrayList<>();
1936 >                tasks.add(new StringTask("0"));
1937 >                tasks.add(waiter);
1938 >                tasks.add(new StringTask("2"));
1939 >                long startTime = System.nanoTime();
1940 >                List<Future<String>> futures =
1941 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1942 >                assertEquals(tasks.size(), futures.size());
1943 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1944 >                for (Future future : futures)
1945 >                    assertTrue(future.isDone());
1946 >                assertTrue(futures.get(1).isCancelled());
1947 >                try {
1948 >                    assertEquals("0", futures.get(0).get());
1949 >                    assertEquals("2", futures.get(2).get());
1950 >                    break;
1951 >                } catch (CancellationException retryWithLongerTimeout) {
1952 >                    timeout *= 2;
1953 >                    if (timeout >= LONG_DELAY_MS / 2)
1954 >                        fail("expected exactly one task to be cancelled");
1955 >                }
1956 >            }
1957          }
1958      }
1959  
# Line 1890 | Line 1967 | public class ThreadPoolExecutorTest exte
1967                                     LONG_DELAY_MS, MILLISECONDS,
1968                                     new LinkedBlockingQueue<Runnable>(),
1969                                     new FailingThreadFactory());
1970 <        try {
1970 >        try (PoolCleaner cleaner = cleaner(e)) {
1971              final int TASKS = 100;
1972              final CountDownLatch done = new CountDownLatch(TASKS);
1973              for (int k = 0; k < TASKS; ++k)
# Line 1898 | Line 1975 | public class ThreadPoolExecutorTest exte
1975                      public void realRun() {
1976                          done.countDown();
1977                      }});
1978 <            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1902 <        } finally {
1903 <            joinPool(e);
1978 >            await(done);
1979          }
1980      }
1981  
# Line 1912 | Line 1987 | public class ThreadPoolExecutorTest exte
1987              new ThreadPoolExecutor(2, 2,
1988                                     1000, MILLISECONDS,
1989                                     new ArrayBlockingQueue<Runnable>(10));
1990 <        assertFalse(p.allowsCoreThreadTimeOut());
1991 <        joinPool(p);
1990 >        try (PoolCleaner cleaner = cleaner(p)) {
1991 >            assertFalse(p.allowsCoreThreadTimeOut());
1992 >        }
1993      }
1994  
1995      /**
1996       * allowCoreThreadTimeOut(true) causes idle threads to time out
1997       */
1998      public void testAllowCoreThreadTimeOut_true() throws Exception {
1999 <        long coreThreadTimeOut = SHORT_DELAY_MS;
1999 >        long keepAliveTime = timeoutMillis();
2000          final ThreadPoolExecutor p =
2001              new ThreadPoolExecutor(2, 10,
2002 <                                   coreThreadTimeOut, MILLISECONDS,
2002 >                                   keepAliveTime, MILLISECONDS,
2003                                     new ArrayBlockingQueue<Runnable>(10));
2004 <        final CountDownLatch threadStarted = new CountDownLatch(1);
2005 <        try {
2004 >        try (PoolCleaner cleaner = cleaner(p)) {
2005 >            final CountDownLatch threadStarted = new CountDownLatch(1);
2006              p.allowCoreThreadTimeOut(true);
2007              p.execute(new CheckedRunnable() {
2008                  public void realRun() {
# Line 1934 | Line 2010 | public class ThreadPoolExecutorTest exte
2010                      assertEquals(1, p.getPoolSize());
2011                  }});
2012              await(threadStarted);
2013 <            delay(coreThreadTimeOut);
2013 >            delay(keepAliveTime);
2014              long startTime = System.nanoTime();
2015              while (p.getPoolSize() > 0
2016                     && millisElapsedSince(startTime) < LONG_DELAY_MS)
2017                  Thread.yield();
2018              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
2019              assertEquals(0, p.getPoolSize());
1944        } finally {
1945            joinPool(p);
2020          }
2021      }
2022  
# Line 1950 | Line 2024 | public class ThreadPoolExecutorTest exte
2024       * allowCoreThreadTimeOut(false) causes idle threads not to time out
2025       */
2026      public void testAllowCoreThreadTimeOut_false() throws Exception {
2027 <        long coreThreadTimeOut = SHORT_DELAY_MS;
2027 >        long keepAliveTime = timeoutMillis();
2028          final ThreadPoolExecutor p =
2029              new ThreadPoolExecutor(2, 10,
2030 <                                   coreThreadTimeOut, MILLISECONDS,
2030 >                                   keepAliveTime, MILLISECONDS,
2031                                     new ArrayBlockingQueue<Runnable>(10));
2032 <        final CountDownLatch threadStarted = new CountDownLatch(1);
2033 <        try {
2032 >        try (PoolCleaner cleaner = cleaner(p)) {
2033 >            final CountDownLatch threadStarted = new CountDownLatch(1);
2034              p.allowCoreThreadTimeOut(false);
2035              p.execute(new CheckedRunnable() {
2036                  public void realRun() throws InterruptedException {
2037                      threadStarted.countDown();
2038                      assertTrue(p.getPoolSize() >= 1);
2039                  }});
2040 <            delay(2 * coreThreadTimeOut);
2040 >            delay(2 * keepAliveTime);
2041              assertTrue(p.getPoolSize() >= 1);
1968        } finally {
1969            joinPool(p);
2042          }
2043      }
2044  
# Line 1982 | Line 2054 | public class ThreadPoolExecutorTest exte
2054                  done.countDown();
2055              }};
2056          final ThreadPoolExecutor p =
2057 <            new ThreadPoolExecutor(1, 30, 60, TimeUnit.SECONDS,
2057 >            new ThreadPoolExecutor(1, 30,
2058 >                                   60, SECONDS,
2059                                     new ArrayBlockingQueue(30));
2060 <        try {
2060 >        try (PoolCleaner cleaner = cleaner(p)) {
2061              for (int i = 0; i < nTasks; ++i) {
2062                  for (;;) {
2063                      try {
# Line 1995 | Line 2068 | public class ThreadPoolExecutorTest exte
2068                  }
2069              }
2070              // enough time to run all tasks
2071 <            assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
2072 <        } finally {
2073 <            joinPool(p);
2071 >            await(done, nTasks * SHORT_DELAY_MS);
2072 >        }
2073 >    }
2074 >
2075 >    /**
2076 >     * get(cancelled task) throws CancellationException
2077 >     */
2078 >    public void testGet_cancelled() throws Exception {
2079 >        final CountDownLatch done = new CountDownLatch(1);
2080 >        final ExecutorService e =
2081 >            new ThreadPoolExecutor(1, 1,
2082 >                                   LONG_DELAY_MS, MILLISECONDS,
2083 >                                   new LinkedBlockingQueue<Runnable>());
2084 >        try (PoolCleaner cleaner = cleaner(e, done)) {
2085 >            final CountDownLatch blockerStarted = new CountDownLatch(1);
2086 >            final List<Future<?>> futures = new ArrayList<>();
2087 >            for (int i = 0; i < 2; i++) {
2088 >                Runnable r = new CheckedRunnable() { public void realRun()
2089 >                                                         throws Throwable {
2090 >                    blockerStarted.countDown();
2091 >                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
2092 >                }};
2093 >                futures.add(e.submit(r));
2094 >            }
2095 >            await(blockerStarted);
2096 >            for (Future<?> future : futures) future.cancel(false);
2097 >            for (Future<?> future : futures) {
2098 >                try {
2099 >                    future.get();
2100 >                    shouldThrow();
2101 >                } catch (CancellationException success) {}
2102 >                try {
2103 >                    future.get(LONG_DELAY_MS, MILLISECONDS);
2104 >                    shouldThrow();
2105 >                } catch (CancellationException success) {}
2106 >                assertTrue(future.isCancelled());
2107 >                assertTrue(future.isDone());
2108 >            }
2109          }
2110      }
2111  
2112 +    /** Directly test simple ThreadPoolExecutor RejectedExecutionHandlers. */
2113 +    public void testStandardRejectedExecutionHandlers() {
2114 +        final ThreadPoolExecutor p =
2115 +            new ThreadPoolExecutor(1, 1, 1, SECONDS,
2116 +                                   new ArrayBlockingQueue<Runnable>(1));
2117 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2118 +        final Runnable r = new Runnable() { public void run() {
2119 +            thread.set(Thread.currentThread()); }};
2120 +
2121 +        try {
2122 +            new AbortPolicy().rejectedExecution(r, p);
2123 +            shouldThrow();
2124 +        } catch (RejectedExecutionException success) {}
2125 +        assertNull(thread.get());
2126 +
2127 +        new DiscardPolicy().rejectedExecution(r, p);
2128 +        assertNull(thread.get());
2129 +
2130 +        new CallerRunsPolicy().rejectedExecution(r, p);
2131 +        assertSame(Thread.currentThread(), thread.get());
2132 +
2133 +        // check that pool was not perturbed by handlers
2134 +        assertTrue(p.getRejectedExecutionHandler() instanceof AbortPolicy);
2135 +        assertEquals(0, p.getTaskCount());
2136 +        assertTrue(p.getQueue().isEmpty());
2137 +    }
2138 +
2139   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines