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.37 by jsr166, Mon Oct 11 07:21:32 2010 UTC vs.
Revision 1.103 by jsr166, Mon Oct 5 22:19:00 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.util.concurrent.atomic.*;
11 < import junit.framework.*;
12 < import java.util.*;
10 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
11 > import static java.util.concurrent.TimeUnit.SECONDS;
12 >
13 > import java.util.ArrayList;
14 > import java.util.List;
15 > import java.util.concurrent.ArrayBlockingQueue;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.Callable;
18 > import java.util.concurrent.CancellationException;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.ExecutionException;
21 > import java.util.concurrent.Executors;
22 > import java.util.concurrent.ExecutorService;
23 > import java.util.concurrent.Future;
24 > import java.util.concurrent.FutureTask;
25 > import java.util.concurrent.LinkedBlockingQueue;
26 > import java.util.concurrent.RejectedExecutionException;
27 > import java.util.concurrent.RejectedExecutionHandler;
28 > import java.util.concurrent.SynchronousQueue;
29 > import java.util.concurrent.ThreadFactory;
30 > import java.util.concurrent.ThreadPoolExecutor;
31 > import java.util.concurrent.TimeUnit;
32 > import java.util.concurrent.atomic.AtomicInteger;
33 >
34 > import junit.framework.Test;
35 > import junit.framework.TestSuite;
36  
37   public class ThreadPoolExecutorTest extends JSR166TestCase {
38      public static void main(String[] args) {
39 <        junit.textui.TestRunner.run(suite());
39 >        main(suite(), args);
40      }
41      public static Test suite() {
42          return new TestSuite(ThreadPoolExecutorTest.class);
43      }
44  
45      static class ExtendedTPE extends ThreadPoolExecutor {
46 <        volatile boolean beforeCalled = false;
47 <        volatile boolean afterCalled = false;
48 <        volatile boolean terminatedCalled = false;
46 >        final CountDownLatch beforeCalled = new CountDownLatch(1);
47 >        final CountDownLatch afterCalled = new CountDownLatch(1);
48 >        final CountDownLatch terminatedCalled = new CountDownLatch(1);
49 >
50          public ExtendedTPE() {
51              super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
52          }
53          protected void beforeExecute(Thread t, Runnable r) {
54 <            beforeCalled = true;
54 >            beforeCalled.countDown();
55          }
56          protected void afterExecute(Runnable r, Throwable t) {
57 <            afterCalled = true;
57 >            afterCalled.countDown();
58          }
59          protected void terminated() {
60 <            terminatedCalled = true;
60 >            terminatedCalled.countDown();
61 >        }
62 >
63 >        public boolean beforeCalled() {
64 >            return beforeCalled.getCount() == 0;
65 >        }
66 >        public boolean afterCalled() {
67 >            return afterCalled.getCount() == 0;
68 >        }
69 >        public boolean terminatedCalled() {
70 >            return terminatedCalled.getCount() == 0;
71          }
72      }
73  
# Line 46 | Line 79 | public class ThreadPoolExecutorTest exte
79          }
80      }
81  
49
82      /**
83       * execute successfully executes a runnable
84       */
# Line 55 | Line 87 | public class ThreadPoolExecutorTest exte
87              new ThreadPoolExecutor(1, 1,
88                                     LONG_DELAY_MS, MILLISECONDS,
89                                     new ArrayBlockingQueue<Runnable>(10));
90 <        final CountDownLatch done = new CountDownLatch(1);
91 <        final Runnable task = new CheckedRunnable() {
92 <            public void realRun() {
93 <                done.countDown();
62 <            }};
63 <        try {
90 >        try (PoolCleaner cleaner = cleaner(p)) {
91 >            final CountDownLatch done = new CountDownLatch(1);
92 >            final Runnable task = new CheckedRunnable() {
93 >                public void realRun() { done.countDown(); }};
94              p.execute(task);
95 <            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
66 <        } finally {
67 <            joinPool(p);
95 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
96          }
97      }
98  
# Line 77 | Line 105 | public class ThreadPoolExecutorTest exte
105              new ThreadPoolExecutor(2, 2,
106                                     LONG_DELAY_MS, MILLISECONDS,
107                                     new ArrayBlockingQueue<Runnable>(10));
108 <        final CountDownLatch threadStarted = new CountDownLatch(1);
109 <        final CountDownLatch done = new CountDownLatch(1);
110 <        try {
108 >        try (PoolCleaner cleaner = cleaner(p)) {
109 >            final CountDownLatch threadStarted = new CountDownLatch(1);
110 >            final CountDownLatch done = new CountDownLatch(1);
111              assertEquals(0, p.getActiveCount());
112              p.execute(new CheckedRunnable() {
113                  public void realRun() throws InterruptedException {
# Line 87 | Line 115 | public class ThreadPoolExecutorTest exte
115                      assertEquals(1, p.getActiveCount());
116                      done.await();
117                  }});
118 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
118 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
119              assertEquals(1, p.getActiveCount());
92        } finally {
120              done.countDown();
94            joinPool(p);
121          }
122      }
123  
# Line 100 | Line 126 | public class ThreadPoolExecutorTest exte
126       */
127      public void testPrestartCoreThread() {
128          final ThreadPoolExecutor p =
129 <            new ThreadPoolExecutor(2, 2,
129 >            new ThreadPoolExecutor(2, 6,
130                                     LONG_DELAY_MS, MILLISECONDS,
131                                     new ArrayBlockingQueue<Runnable>(10));
132 <        assertEquals(0, p.getPoolSize());
133 <        assertTrue(p.prestartCoreThread());
134 <        assertEquals(1, p.getPoolSize());
135 <        assertTrue(p.prestartCoreThread());
136 <        assertEquals(2, p.getPoolSize());
137 <        assertFalse(p.prestartCoreThread());
138 <        assertEquals(2, p.getPoolSize());
139 <        joinPool(p);
132 >        try (PoolCleaner cleaner = cleaner(p)) {
133 >            assertEquals(0, p.getPoolSize());
134 >            assertTrue(p.prestartCoreThread());
135 >            assertEquals(1, p.getPoolSize());
136 >            assertTrue(p.prestartCoreThread());
137 >            assertEquals(2, p.getPoolSize());
138 >            assertFalse(p.prestartCoreThread());
139 >            assertEquals(2, p.getPoolSize());
140 >            p.setCorePoolSize(4);
141 >            assertTrue(p.prestartCoreThread());
142 >            assertEquals(3, p.getPoolSize());
143 >            assertTrue(p.prestartCoreThread());
144 >            assertEquals(4, p.getPoolSize());
145 >            assertFalse(p.prestartCoreThread());
146 >            assertEquals(4, p.getPoolSize());
147 >        }
148      }
149  
150      /**
# Line 118 | Line 152 | public class ThreadPoolExecutorTest exte
152       */
153      public void testPrestartAllCoreThreads() {
154          final ThreadPoolExecutor p =
155 <            new ThreadPoolExecutor(2, 2,
155 >            new ThreadPoolExecutor(2, 6,
156                                     LONG_DELAY_MS, MILLISECONDS,
157                                     new ArrayBlockingQueue<Runnable>(10));
158 <        assertEquals(0, p.getPoolSize());
159 <        p.prestartAllCoreThreads();
160 <        assertEquals(2, p.getPoolSize());
161 <        p.prestartAllCoreThreads();
162 <        assertEquals(2, p.getPoolSize());
163 <        joinPool(p);
158 >        try (PoolCleaner cleaner = cleaner(p)) {
159 >            assertEquals(0, p.getPoolSize());
160 >            p.prestartAllCoreThreads();
161 >            assertEquals(2, p.getPoolSize());
162 >            p.prestartAllCoreThreads();
163 >            assertEquals(2, p.getPoolSize());
164 >            p.setCorePoolSize(4);
165 >            p.prestartAllCoreThreads();
166 >            assertEquals(4, p.getPoolSize());
167 >            p.prestartAllCoreThreads();
168 >            assertEquals(4, p.getPoolSize());
169 >        }
170      }
171  
172      /**
# Line 138 | Line 178 | public class ThreadPoolExecutorTest exte
178              new ThreadPoolExecutor(2, 2,
179                                     LONG_DELAY_MS, MILLISECONDS,
180                                     new ArrayBlockingQueue<Runnable>(10));
181 <        final CountDownLatch threadStarted = new CountDownLatch(1);
182 <        final CountDownLatch threadProceed = new CountDownLatch(1);
183 <        final CountDownLatch threadDone = new CountDownLatch(1);
184 <        try {
181 >        try (PoolCleaner cleaner = cleaner(p)) {
182 >            final CountDownLatch threadStarted = new CountDownLatch(1);
183 >            final CountDownLatch threadProceed = new CountDownLatch(1);
184 >            final CountDownLatch threadDone = new CountDownLatch(1);
185              assertEquals(0, p.getCompletedTaskCount());
186              p.execute(new CheckedRunnable() {
187                  public void realRun() throws InterruptedException {
# Line 150 | Line 190 | public class ThreadPoolExecutorTest exte
190                      threadProceed.await();
191                      threadDone.countDown();
192                  }});
193 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
193 >            await(threadStarted);
194              assertEquals(0, p.getCompletedTaskCount());
195              threadProceed.countDown();
196              threadDone.await();
197 <            Thread.sleep(SHORT_DELAY_MS);
198 <            assertEquals(1, p.getCompletedTaskCount());
199 <        } finally {
200 <            joinPool(p);
197 >            long startTime = System.nanoTime();
198 >            while (p.getCompletedTaskCount() != 1) {
199 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
200 >                    fail("timed out");
201 >                Thread.yield();
202 >            }
203          }
204      }
205  
# Line 169 | Line 211 | public class ThreadPoolExecutorTest exte
211              new ThreadPoolExecutor(1, 1,
212                                     LONG_DELAY_MS, MILLISECONDS,
213                                     new ArrayBlockingQueue<Runnable>(10));
214 <        assertEquals(1, p.getCorePoolSize());
215 <        joinPool(p);
214 >        try (PoolCleaner cleaner = cleaner(p)) {
215 >            assertEquals(1, p.getCorePoolSize());
216 >        }
217      }
218  
219      /**
# Line 181 | Line 224 | public class ThreadPoolExecutorTest exte
224              new ThreadPoolExecutor(2, 2,
225                                     1000, MILLISECONDS,
226                                     new ArrayBlockingQueue<Runnable>(10));
227 <        assertEquals(1, p.getKeepAliveTime(TimeUnit.SECONDS));
228 <        joinPool(p);
227 >        try (PoolCleaner cleaner = cleaner(p)) {
228 >            assertEquals(1, p.getKeepAliveTime(SECONDS));
229 >        }
230      }
231  
188
232      /**
233       * getThreadFactory returns factory in constructor if not set
234       */
235      public void testGetThreadFactory() {
236 <        ThreadFactory tf = new SimpleThreadFactory();
236 >        ThreadFactory threadFactory = new SimpleThreadFactory();
237          final ThreadPoolExecutor p =
238              new ThreadPoolExecutor(1, 2,
239                                     LONG_DELAY_MS, MILLISECONDS,
240                                     new ArrayBlockingQueue<Runnable>(10),
241 <                                   tf,
241 >                                   threadFactory,
242                                     new NoOpREHandler());
243 <        assertSame(tf, p.getThreadFactory());
244 <        joinPool(p);
243 >        try (PoolCleaner cleaner = cleaner(p)) {
244 >            assertSame(threadFactory, p.getThreadFactory());
245 >        }
246      }
247  
248      /**
# Line 209 | Line 253 | public class ThreadPoolExecutorTest exte
253              new ThreadPoolExecutor(1, 2,
254                                     LONG_DELAY_MS, MILLISECONDS,
255                                     new ArrayBlockingQueue<Runnable>(10));
256 <        ThreadFactory tf = new SimpleThreadFactory();
257 <        p.setThreadFactory(tf);
258 <        assertSame(tf, p.getThreadFactory());
259 <        joinPool(p);
256 >        try (PoolCleaner cleaner = cleaner(p)) {
257 >            ThreadFactory threadFactory = new SimpleThreadFactory();
258 >            p.setThreadFactory(threadFactory);
259 >            assertSame(threadFactory, p.getThreadFactory());
260 >        }
261      }
262  
218
263      /**
264       * setThreadFactory(null) throws NPE
265       */
# Line 224 | Line 268 | public class ThreadPoolExecutorTest exte
268              new ThreadPoolExecutor(1, 2,
269                                     LONG_DELAY_MS, MILLISECONDS,
270                                     new ArrayBlockingQueue<Runnable>(10));
271 <        try {
272 <            p.setThreadFactory(null);
273 <            shouldThrow();
274 <        } catch (NullPointerException success) {
275 <        } finally {
232 <            joinPool(p);
271 >        try (PoolCleaner cleaner = cleaner(p)) {
272 >            try {
273 >                p.setThreadFactory(null);
274 >                shouldThrow();
275 >            } catch (NullPointerException success) {}
276          }
277      }
278  
# Line 237 | Line 280 | public class ThreadPoolExecutorTest exte
280       * getRejectedExecutionHandler returns handler in constructor if not set
281       */
282      public void testGetRejectedExecutionHandler() {
283 <        final RejectedExecutionHandler h = new NoOpREHandler();
283 >        final RejectedExecutionHandler handler = new NoOpREHandler();
284          final ThreadPoolExecutor p =
285              new ThreadPoolExecutor(1, 2,
286                                     LONG_DELAY_MS, MILLISECONDS,
287                                     new ArrayBlockingQueue<Runnable>(10),
288 <                                   h);
289 <        assertSame(h, p.getRejectedExecutionHandler());
290 <        joinPool(p);
288 >                                   handler);
289 >        try (PoolCleaner cleaner = cleaner(p)) {
290 >            assertSame(handler, p.getRejectedExecutionHandler());
291 >        }
292      }
293  
294      /**
# Line 256 | Line 300 | public class ThreadPoolExecutorTest exte
300              new ThreadPoolExecutor(1, 2,
301                                     LONG_DELAY_MS, MILLISECONDS,
302                                     new ArrayBlockingQueue<Runnable>(10));
303 <        RejectedExecutionHandler h = new NoOpREHandler();
304 <        p.setRejectedExecutionHandler(h);
305 <        assertSame(h, p.getRejectedExecutionHandler());
306 <        joinPool(p);
303 >        try (PoolCleaner cleaner = cleaner(p)) {
304 >            RejectedExecutionHandler handler = new NoOpREHandler();
305 >            p.setRejectedExecutionHandler(handler);
306 >            assertSame(handler, p.getRejectedExecutionHandler());
307 >        }
308      }
309  
265
310      /**
311       * setRejectedExecutionHandler(null) throws NPE
312       */
# Line 271 | Line 315 | public class ThreadPoolExecutorTest exte
315              new ThreadPoolExecutor(1, 2,
316                                     LONG_DELAY_MS, MILLISECONDS,
317                                     new ArrayBlockingQueue<Runnable>(10));
318 <        try {
319 <            p.setRejectedExecutionHandler(null);
320 <            shouldThrow();
321 <        } catch (NullPointerException success) {
322 <        } finally {
279 <            joinPool(p);
318 >        try (PoolCleaner cleaner = cleaner(p)) {
319 >            try {
320 >                p.setRejectedExecutionHandler(null);
321 >                shouldThrow();
322 >            } catch (NullPointerException success) {}
323          }
324      }
325  
283
326      /**
327       * getLargestPoolSize increases, but doesn't overestimate, when
328       * multiple threads active
329       */
330      public void testGetLargestPoolSize() throws InterruptedException {
331          final int THREADS = 3;
332 +        final CountDownLatch done = new CountDownLatch(1);
333          final ThreadPoolExecutor p =
334              new ThreadPoolExecutor(THREADS, THREADS,
335                                     LONG_DELAY_MS, MILLISECONDS,
336                                     new ArrayBlockingQueue<Runnable>(10));
337 <        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
295 <        final CountDownLatch done = new CountDownLatch(1);
296 <        try {
337 >        try (PoolCleaner cleaner = cleaner(p, done)) {
338              assertEquals(0, p.getLargestPoolSize());
339 +            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
340              for (int i = 0; i < THREADS; i++)
341                  p.execute(new CheckedRunnable() {
342                      public void realRun() throws InterruptedException {
# Line 302 | Line 344 | public class ThreadPoolExecutorTest exte
344                          done.await();
345                          assertEquals(THREADS, p.getLargestPoolSize());
346                      }});
347 <            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
306 <            assertEquals(THREADS, p.getLargestPoolSize());
307 <        } finally {
308 <            done.countDown();
309 <            joinPool(p);
347 >            assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
348              assertEquals(THREADS, p.getLargestPoolSize());
349          }
350 +        assertEquals(THREADS, p.getLargestPoolSize());
351      }
352  
353      /**
# Line 320 | Line 359 | public class ThreadPoolExecutorTest exte
359              new ThreadPoolExecutor(2, 3,
360                                     LONG_DELAY_MS, MILLISECONDS,
361                                     new ArrayBlockingQueue<Runnable>(10));
362 <        assertEquals(3, p.getMaximumPoolSize());
363 <        joinPool(p);
362 >        try (PoolCleaner cleaner = cleaner(p)) {
363 >            assertEquals(3, p.getMaximumPoolSize());
364 >            p.setMaximumPoolSize(5);
365 >            assertEquals(5, p.getMaximumPoolSize());
366 >            p.setMaximumPoolSize(4);
367 >            assertEquals(4, p.getMaximumPoolSize());
368 >        }
369      }
370  
371      /**
# Line 329 | Line 373 | public class ThreadPoolExecutorTest exte
373       * become active
374       */
375      public void testGetPoolSize() throws InterruptedException {
376 +        final CountDownLatch done = new CountDownLatch(1);
377          final ThreadPoolExecutor p =
378              new ThreadPoolExecutor(1, 1,
379                                     LONG_DELAY_MS, MILLISECONDS,
380                                     new ArrayBlockingQueue<Runnable>(10));
381 <        final CountDownLatch threadStarted = new CountDownLatch(1);
337 <        final CountDownLatch done = new CountDownLatch(1);
338 <        try {
381 >        try (PoolCleaner cleaner = cleaner(p, done)) {
382              assertEquals(0, p.getPoolSize());
383 +            final CountDownLatch threadStarted = new CountDownLatch(1);
384              p.execute(new CheckedRunnable() {
385                  public void realRun() throws InterruptedException {
386                      threadStarted.countDown();
387                      assertEquals(1, p.getPoolSize());
388                      done.await();
389                  }});
390 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
390 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
391              assertEquals(1, p.getPoolSize());
348        } finally {
349            done.countDown();
350            joinPool(p);
392          }
393      }
394  
# Line 355 | Line 396 | public class ThreadPoolExecutorTest exte
396       * getTaskCount increases, but doesn't overestimate, when tasks submitted
397       */
398      public void testGetTaskCount() throws InterruptedException {
399 +        final int TASKS = 3;
400 +        final CountDownLatch done = new CountDownLatch(1);
401          final ThreadPoolExecutor p =
402              new ThreadPoolExecutor(1, 1,
403                                     LONG_DELAY_MS, MILLISECONDS,
404                                     new ArrayBlockingQueue<Runnable>(10));
405 <        final CountDownLatch threadStarted = new CountDownLatch(1);
406 <        final CountDownLatch done = new CountDownLatch(1);
364 <        try {
405 >        try (PoolCleaner cleaner = cleaner(p, done)) {
406 >            final CountDownLatch threadStarted = new CountDownLatch(1);
407              assertEquals(0, p.getTaskCount());
408 +            assertEquals(0, p.getCompletedTaskCount());
409              p.execute(new CheckedRunnable() {
410                  public void realRun() throws InterruptedException {
411                      threadStarted.countDown();
369                    assertEquals(1, p.getTaskCount());
412                      done.await();
413                  }});
414 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
414 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
415              assertEquals(1, p.getTaskCount());
416 <        } finally {
417 <            done.countDown();
418 <            joinPool(p);
416 >            assertEquals(0, p.getCompletedTaskCount());
417 >            for (int i = 0; i < TASKS; i++) {
418 >                assertEquals(1 + i, p.getTaskCount());
419 >                p.execute(new CheckedRunnable() {
420 >                    public void realRun() throws InterruptedException {
421 >                        threadStarted.countDown();
422 >                        assertEquals(1 + TASKS, p.getTaskCount());
423 >                        done.await();
424 >                    }});
425 >            }
426 >            assertEquals(1 + TASKS, p.getTaskCount());
427 >            assertEquals(0, p.getCompletedTaskCount());
428          }
429 +        assertEquals(1 + TASKS, p.getTaskCount());
430 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
431      }
432  
433      /**
434 <     * isShutDown is false before shutdown, true after
434 >     * isShutdown is false before shutdown, true after
435       */
436      public void testIsShutdown() {
437          final ThreadPoolExecutor p =
438              new ThreadPoolExecutor(1, 1,
439                                     LONG_DELAY_MS, MILLISECONDS,
440                                     new ArrayBlockingQueue<Runnable>(10));
441 <        assertFalse(p.isShutdown());
442 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
443 <        assertTrue(p.isShutdown());
444 <        joinPool(p);
441 >        try (PoolCleaner cleaner = cleaner(p)) {
442 >            assertFalse(p.isShutdown());
443 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
444 >            assertTrue(p.isShutdown());
445 >        }
446      }
447  
448 +    /**
449 +     * awaitTermination on a non-shutdown pool times out
450 +     */
451 +    public void testAwaitTermination_timesOut() throws InterruptedException {
452 +        final ThreadPoolExecutor p =
453 +            new ThreadPoolExecutor(1, 1,
454 +                                   LONG_DELAY_MS, MILLISECONDS,
455 +                                   new ArrayBlockingQueue<Runnable>(10));
456 +        try (PoolCleaner cleaner = cleaner(p)) {
457 +            assertFalse(p.isTerminated());
458 +            assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
459 +            assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
460 +            assertFalse(p.awaitTermination(-1L, NANOSECONDS));
461 +            assertFalse(p.awaitTermination(-1L, MILLISECONDS));
462 +            assertFalse(p.awaitTermination(0L, NANOSECONDS));
463 +            assertFalse(p.awaitTermination(0L, MILLISECONDS));
464 +            long timeoutNanos = 999999L;
465 +            long startTime = System.nanoTime();
466 +            assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
467 +            assertTrue(System.nanoTime() - startTime >= timeoutNanos);
468 +            assertFalse(p.isTerminated());
469 +            startTime = System.nanoTime();
470 +            long timeoutMillis = timeoutMillis();
471 +            assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
472 +            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
473 +            assertFalse(p.isTerminated());
474 +            try { p.shutdown(); } catch (SecurityException ok) { return; }
475 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
476 +            assertTrue(p.isTerminated());
477 +        }
478 +    }
479  
480      /**
481       * isTerminated is false before termination, true after
# Line 400 | Line 485 | public class ThreadPoolExecutorTest exte
485              new ThreadPoolExecutor(1, 1,
486                                     LONG_DELAY_MS, MILLISECONDS,
487                                     new ArrayBlockingQueue<Runnable>(10));
488 <        final CountDownLatch threadStarted = new CountDownLatch(1);
489 <        final CountDownLatch done = new CountDownLatch(1);
490 <        assertFalse(p.isTerminated());
491 <        try {
488 >        try (PoolCleaner cleaner = cleaner(p)) {
489 >            final CountDownLatch threadStarted = new CountDownLatch(1);
490 >            final CountDownLatch done = new CountDownLatch(1);
491 >            assertFalse(p.isTerminating());
492              p.execute(new CheckedRunnable() {
493                  public void realRun() throws InterruptedException {
494 +                    assertFalse(p.isTerminating());
495                      threadStarted.countDown();
410                    assertFalse(p.isTerminated());
496                      done.await();
497                  }});
498 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
498 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
499 >            assertFalse(p.isTerminating());
500              done.countDown();
415        } finally {
501              try { p.shutdown(); } catch (SecurityException ok) { return; }
502 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
503 +            assertTrue(p.isTerminated());
504 +            assertFalse(p.isTerminating());
505          }
418        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
419        assertTrue(p.isTerminated());
506      }
507  
508      /**
# Line 427 | Line 513 | public class ThreadPoolExecutorTest exte
513              new ThreadPoolExecutor(1, 1,
514                                     LONG_DELAY_MS, MILLISECONDS,
515                                     new ArrayBlockingQueue<Runnable>(10));
516 <        final CountDownLatch threadStarted = new CountDownLatch(1);
517 <        final CountDownLatch done = new CountDownLatch(1);
518 <        try {
516 >        try (PoolCleaner cleaner = cleaner(p)) {
517 >            final CountDownLatch threadStarted = new CountDownLatch(1);
518 >            final CountDownLatch done = new CountDownLatch(1);
519              assertFalse(p.isTerminating());
520              p.execute(new CheckedRunnable() {
521                  public void realRun() throws InterruptedException {
436                    threadStarted.countDown();
522                      assertFalse(p.isTerminating());
523 +                    threadStarted.countDown();
524                      done.await();
525                  }});
526 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
526 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
527              assertFalse(p.isTerminating());
528              done.countDown();
443        } finally {
529              try { p.shutdown(); } catch (SecurityException ok) { return; }
530 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
531 +            assertTrue(p.isTerminated());
532 +            assertFalse(p.isTerminating());
533          }
446        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
447        assertTrue(p.isTerminated());
448        assertFalse(p.isTerminating());
534      }
535  
536      /**
# Line 457 | Line 542 | public class ThreadPoolExecutorTest exte
542              new ThreadPoolExecutor(1, 1,
543                                     LONG_DELAY_MS, MILLISECONDS,
544                                     q);
545 <        final CountDownLatch threadStarted = new CountDownLatch(1);
546 <        final CountDownLatch done = new CountDownLatch(1);
547 <        try {
545 >        try (PoolCleaner cleaner = cleaner(p)) {
546 >            final CountDownLatch threadStarted = new CountDownLatch(1);
547 >            final CountDownLatch done = new CountDownLatch(1);
548              FutureTask[] tasks = new FutureTask[5];
549              for (int i = 0; i < tasks.length; i++) {
550                  Callable task = new CheckedCallable<Boolean>() {
# Line 472 | Line 557 | public class ThreadPoolExecutorTest exte
557                  tasks[i] = new FutureTask(task);
558                  p.execute(tasks[i]);
559              }
560 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
560 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
561              assertSame(q, p.getQueue());
562              assertFalse(q.contains(tasks[0]));
563              assertTrue(q.contains(tasks[tasks.length - 1]));
564              assertEquals(tasks.length - 1, q.size());
480        } finally {
565              done.countDown();
482            joinPool(p);
566          }
567      }
568  
# Line 492 | Line 575 | public class ThreadPoolExecutorTest exte
575              new ThreadPoolExecutor(1, 1,
576                                     LONG_DELAY_MS, MILLISECONDS,
577                                     q);
578 <        Runnable[] tasks = new Runnable[5];
579 <        final CountDownLatch threadStarted = new CountDownLatch(1);
580 <        final CountDownLatch done = new CountDownLatch(1);
581 <        try {
578 >        try (PoolCleaner cleaner = cleaner(p)) {
579 >            Runnable[] tasks = new Runnable[6];
580 >            final CountDownLatch threadStarted = new CountDownLatch(1);
581 >            final CountDownLatch done = new CountDownLatch(1);
582              for (int i = 0; i < tasks.length; i++) {
583                  tasks[i] = new CheckedRunnable() {
584                      public void realRun() throws InterruptedException {
# Line 504 | Line 587 | public class ThreadPoolExecutorTest exte
587                      }};
588                  p.execute(tasks[i]);
589              }
590 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
590 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
591              assertFalse(p.remove(tasks[0]));
592              assertTrue(q.contains(tasks[4]));
593              assertTrue(q.contains(tasks[3]));
# Line 514 | Line 597 | public class ThreadPoolExecutorTest exte
597              assertTrue(q.contains(tasks[3]));
598              assertTrue(p.remove(tasks[3]));
599              assertFalse(q.contains(tasks[3]));
517        } finally {
600              done.countDown();
519            joinPool(p);
601          }
602      }
603  
# Line 531 | Line 612 | public class ThreadPoolExecutorTest exte
612              new ThreadPoolExecutor(1, 1,
613                                     LONG_DELAY_MS, MILLISECONDS,
614                                     q);
615 <        FutureTask[] tasks = new FutureTask[5];
616 <        try {
615 >        try (PoolCleaner cleaner = cleaner(p, done)) {
616 >            FutureTask[] tasks = new FutureTask[5];
617              for (int i = 0; i < tasks.length; i++) {
618                  Callable task = new CheckedCallable<Boolean>() {
619                      public Boolean realCall() throws InterruptedException {
# Line 543 | Line 624 | public class ThreadPoolExecutorTest exte
624                  tasks[i] = new FutureTask(task);
625                  p.execute(tasks[i]);
626              }
627 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
627 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
628              assertEquals(tasks.length, p.getTaskCount());
629              assertEquals(tasks.length - 1, q.size());
630              assertEquals(1L, p.getActiveCount());
# Line 556 | Line 637 | public class ThreadPoolExecutorTest exte
637              p.purge();         // Nothing to do
638              assertEquals(tasks.length - 3, q.size());
639              assertEquals(tasks.length - 2, p.getTaskCount());
559        } finally {
560            done.countDown();
561            joinPool(p);
640          }
641      }
642  
643      /**
644 <     * shutDownNow returns a list containing tasks that were not run
644 >     * shutdownNow returns a list containing tasks that were not run,
645 >     * and those tasks are drained from the queue
646       */
647 <    public void testShutDownNow() {
647 >    public void testShutdownNow() throws InterruptedException {
648 >        final int poolSize = 2;
649 >        final int count = 5;
650 >        final AtomicInteger ran = new AtomicInteger(0);
651          final ThreadPoolExecutor p =
652 <            new ThreadPoolExecutor(1, 1,
652 >            new ThreadPoolExecutor(poolSize, poolSize,
653                                     LONG_DELAY_MS, MILLISECONDS,
654                                     new ArrayBlockingQueue<Runnable>(10));
655 <        List l;
656 <        try {
657 <            for (int i = 0; i < 5; i++)
576 <                p.execute(new MediumPossiblyInterruptedRunnable());
577 <        }
578 <        finally {
655 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
656 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
657 >            threadsStarted.countDown();
658              try {
659 <                l = p.shutdownNow();
660 <            } catch (SecurityException ok) { return; }
659 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
660 >            } catch (InterruptedException success) {}
661 >            ran.getAndIncrement();
662 >        }};
663 >        for (int i = 0; i < count; i++)
664 >            p.execute(waiter);
665 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
666 >        assertEquals(poolSize, p.getActiveCount());
667 >        assertEquals(0, p.getCompletedTaskCount());
668 >        final List<Runnable> queuedTasks;
669 >        try {
670 >            queuedTasks = p.shutdownNow();
671 >        } catch (SecurityException ok) {
672 >            return; // Allowed in case test doesn't have privs
673          }
674          assertTrue(p.isShutdown());
675 <        assertTrue(l.size() <= 4);
675 >        assertTrue(p.getQueue().isEmpty());
676 >        assertEquals(count - poolSize, queuedTasks.size());
677 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
678 >        assertTrue(p.isTerminated());
679 >        assertEquals(poolSize, ran.get());
680 >        assertEquals(poolSize, p.getCompletedTaskCount());
681      }
682  
683      // Exception Tests
684  
589
685      /**
686       * Constructor throws if corePoolSize argument is less than zero
687       */
688      public void testConstructor1() {
689          try {
690 <            new ThreadPoolExecutor(-1, 1,
596 <                                   LONG_DELAY_MS, MILLISECONDS,
690 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
691                                     new ArrayBlockingQueue<Runnable>(10));
692              shouldThrow();
693          } catch (IllegalArgumentException success) {}
# Line 604 | Line 698 | public class ThreadPoolExecutorTest exte
698       */
699      public void testConstructor2() {
700          try {
701 <            new ThreadPoolExecutor(1, -1,
608 <                                   LONG_DELAY_MS, MILLISECONDS,
701 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
702                                     new ArrayBlockingQueue<Runnable>(10));
703              shouldThrow();
704          } catch (IllegalArgumentException success) {}
# Line 616 | Line 709 | public class ThreadPoolExecutorTest exte
709       */
710      public void testConstructor3() {
711          try {
712 <            new ThreadPoolExecutor(1, 0,
620 <                                   LONG_DELAY_MS, MILLISECONDS,
712 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
713                                     new ArrayBlockingQueue<Runnable>(10));
714              shouldThrow();
715          } catch (IllegalArgumentException success) {}
# Line 628 | Line 720 | public class ThreadPoolExecutorTest exte
720       */
721      public void testConstructor4() {
722          try {
723 <            new ThreadPoolExecutor(1, 2,
632 <                                   -1L, MILLISECONDS,
723 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
724                                     new ArrayBlockingQueue<Runnable>(10));
725              shouldThrow();
726          } catch (IllegalArgumentException success) {}
# Line 640 | Line 731 | public class ThreadPoolExecutorTest exte
731       */
732      public void testConstructor5() {
733          try {
734 <            new ThreadPoolExecutor(2, 1,
644 <                                   LONG_DELAY_MS, MILLISECONDS,
734 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
735                                     new ArrayBlockingQueue<Runnable>(10));
736              shouldThrow();
737          } catch (IllegalArgumentException success) {}
# Line 652 | Line 742 | public class ThreadPoolExecutorTest exte
742       */
743      public void testConstructorNullPointerException() {
744          try {
745 <            new ThreadPoolExecutor(1, 2,
656 <                                   LONG_DELAY_MS, MILLISECONDS,
745 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
746                                     (BlockingQueue) null);
747              shouldThrow();
748          } catch (NullPointerException success) {}
749      }
750  
662
663
751      /**
752       * Constructor throws if corePoolSize argument is less than zero
753       */
754      public void testConstructor6() {
755          try {
756 <            new ThreadPoolExecutor(-1, 1,
670 <                                   LONG_DELAY_MS, MILLISECONDS,
756 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
757                                     new ArrayBlockingQueue<Runnable>(10),
758                                     new SimpleThreadFactory());
759              shouldThrow();
# Line 679 | Line 765 | public class ThreadPoolExecutorTest exte
765       */
766      public void testConstructor7() {
767          try {
768 <            new ThreadPoolExecutor(1, -1,
683 <                                   LONG_DELAY_MS, MILLISECONDS,
768 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
769                                     new ArrayBlockingQueue<Runnable>(10),
770                                     new SimpleThreadFactory());
771              shouldThrow();
# Line 692 | Line 777 | public class ThreadPoolExecutorTest exte
777       */
778      public void testConstructor8() {
779          try {
780 <            new ThreadPoolExecutor(1, 0,
696 <                                   LONG_DELAY_MS, MILLISECONDS,
780 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
781                                     new ArrayBlockingQueue<Runnable>(10),
782                                     new SimpleThreadFactory());
783              shouldThrow();
# Line 705 | Line 789 | public class ThreadPoolExecutorTest exte
789       */
790      public void testConstructor9() {
791          try {
792 <            new ThreadPoolExecutor(1, 2,
709 <                                   -1L, MILLISECONDS,
792 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
793                                     new ArrayBlockingQueue<Runnable>(10),
794                                     new SimpleThreadFactory());
795              shouldThrow();
# Line 718 | Line 801 | public class ThreadPoolExecutorTest exte
801       */
802      public void testConstructor10() {
803          try {
804 <            new ThreadPoolExecutor(2, 1,
722 <                                   LONG_DELAY_MS, MILLISECONDS,
804 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
805                                     new ArrayBlockingQueue<Runnable>(10),
806                                     new SimpleThreadFactory());
807              shouldThrow();
# Line 731 | Line 813 | public class ThreadPoolExecutorTest exte
813       */
814      public void testConstructorNullPointerException2() {
815          try {
816 <            new ThreadPoolExecutor(1, 2,
735 <                                   LONG_DELAY_MS, MILLISECONDS,
816 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
817                                     (BlockingQueue) null,
818                                     new SimpleThreadFactory());
819              shouldThrow();
# Line 744 | Line 825 | public class ThreadPoolExecutorTest exte
825       */
826      public void testConstructorNullPointerException3() {
827          try {
828 <            new ThreadPoolExecutor(1, 2,
748 <                                   LONG_DELAY_MS, MILLISECONDS,
828 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
829                                     new ArrayBlockingQueue<Runnable>(10),
830                                     (ThreadFactory) null);
831              shouldThrow();
832          } catch (NullPointerException success) {}
833      }
834  
755
835      /**
836       * Constructor throws if corePoolSize argument is less than zero
837       */
838      public void testConstructor11() {
839          try {
840 <            new ThreadPoolExecutor(-1, 1,
762 <                                   LONG_DELAY_MS, MILLISECONDS,
840 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
841                                     new ArrayBlockingQueue<Runnable>(10),
842                                     new NoOpREHandler());
843              shouldThrow();
# Line 771 | Line 849 | public class ThreadPoolExecutorTest exte
849       */
850      public void testConstructor12() {
851          try {
852 <            new ThreadPoolExecutor(1, -1,
775 <                                   LONG_DELAY_MS, MILLISECONDS,
852 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
853                                     new ArrayBlockingQueue<Runnable>(10),
854                                     new NoOpREHandler());
855              shouldThrow();
# Line 784 | Line 861 | public class ThreadPoolExecutorTest exte
861       */
862      public void testConstructor13() {
863          try {
864 <            new ThreadPoolExecutor(1, 0,
788 <                                   LONG_DELAY_MS, MILLISECONDS,
864 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
865                                     new ArrayBlockingQueue<Runnable>(10),
866                                     new NoOpREHandler());
867              shouldThrow();
# Line 797 | Line 873 | public class ThreadPoolExecutorTest exte
873       */
874      public void testConstructor14() {
875          try {
876 <            new ThreadPoolExecutor(1, 2,
801 <                                   -1L, MILLISECONDS,
876 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
877                                     new ArrayBlockingQueue<Runnable>(10),
878                                     new NoOpREHandler());
879              shouldThrow();
# Line 810 | Line 885 | public class ThreadPoolExecutorTest exte
885       */
886      public void testConstructor15() {
887          try {
888 <            new ThreadPoolExecutor(2, 1,
814 <                                   LONG_DELAY_MS, MILLISECONDS,
888 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
889                                     new ArrayBlockingQueue<Runnable>(10),
890                                     new NoOpREHandler());
891              shouldThrow();
# Line 823 | Line 897 | public class ThreadPoolExecutorTest exte
897       */
898      public void testConstructorNullPointerException4() {
899          try {
900 <            new ThreadPoolExecutor(1, 2,
827 <                                   LONG_DELAY_MS, MILLISECONDS,
900 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
901                                     (BlockingQueue) null,
902                                     new NoOpREHandler());
903              shouldThrow();
# Line 836 | Line 909 | public class ThreadPoolExecutorTest exte
909       */
910      public void testConstructorNullPointerException5() {
911          try {
912 <            new ThreadPoolExecutor(1, 2,
840 <                                   LONG_DELAY_MS, MILLISECONDS,
912 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
913                                     new ArrayBlockingQueue<Runnable>(10),
914                                     (RejectedExecutionHandler) null);
915              shouldThrow();
916          } catch (NullPointerException success) {}
917      }
918  
847
919      /**
920       * Constructor throws if corePoolSize argument is less than zero
921       */
922      public void testConstructor16() {
923          try {
924 <            new ThreadPoolExecutor(-1, 1,
854 <                                   LONG_DELAY_MS, MILLISECONDS,
924 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
925                                     new ArrayBlockingQueue<Runnable>(10),
926                                     new SimpleThreadFactory(),
927                                     new NoOpREHandler());
# Line 864 | Line 934 | public class ThreadPoolExecutorTest exte
934       */
935      public void testConstructor17() {
936          try {
937 <            new ThreadPoolExecutor(1, -1,
868 <                                   LONG_DELAY_MS, MILLISECONDS,
937 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
938                                     new ArrayBlockingQueue<Runnable>(10),
939                                     new SimpleThreadFactory(),
940                                     new NoOpREHandler());
# Line 878 | Line 947 | public class ThreadPoolExecutorTest exte
947       */
948      public void testConstructor18() {
949          try {
950 <            new ThreadPoolExecutor(1, 0,
882 <                                   LONG_DELAY_MS, MILLISECONDS,
950 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
951                                     new ArrayBlockingQueue<Runnable>(10),
952                                     new SimpleThreadFactory(),
953                                     new NoOpREHandler());
# Line 892 | Line 960 | public class ThreadPoolExecutorTest exte
960       */
961      public void testConstructor19() {
962          try {
963 <            new ThreadPoolExecutor(1, 2,
896 <                                   -1L, MILLISECONDS,
963 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
964                                     new ArrayBlockingQueue<Runnable>(10),
965                                     new SimpleThreadFactory(),
966                                     new NoOpREHandler());
# Line 906 | Line 973 | public class ThreadPoolExecutorTest exte
973       */
974      public void testConstructor20() {
975          try {
976 <            new ThreadPoolExecutor(2, 1,
910 <                                   LONG_DELAY_MS, MILLISECONDS,
976 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
977                                     new ArrayBlockingQueue<Runnable>(10),
978                                     new SimpleThreadFactory(),
979                                     new NoOpREHandler());
# Line 920 | Line 986 | public class ThreadPoolExecutorTest exte
986       */
987      public void testConstructorNullPointerException6() {
988          try {
989 <            new ThreadPoolExecutor(1, 2,
924 <                                   LONG_DELAY_MS, MILLISECONDS,
989 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
990                                     (BlockingQueue) null,
991                                     new SimpleThreadFactory(),
992                                     new NoOpREHandler());
# Line 934 | Line 999 | public class ThreadPoolExecutorTest exte
999       */
1000      public void testConstructorNullPointerException7() {
1001          try {
1002 <            new ThreadPoolExecutor(1, 2,
938 <                                   LONG_DELAY_MS, MILLISECONDS,
1002 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1003                                     new ArrayBlockingQueue<Runnable>(10),
1004                                     new SimpleThreadFactory(),
1005                                     (RejectedExecutionHandler) null);
# Line 948 | Line 1012 | public class ThreadPoolExecutorTest exte
1012       */
1013      public void testConstructorNullPointerException8() {
1014          try {
1015 <            new ThreadPoolExecutor(1, 2,
952 <                                   LONG_DELAY_MS, MILLISECONDS,
1015 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1016                                     new ArrayBlockingQueue<Runnable>(10),
1017                                     (ThreadFactory) null,
1018                                     new NoOpREHandler());
# Line 963 | Line 1026 | public class ThreadPoolExecutorTest exte
1026      public void testInterruptedSubmit() throws InterruptedException {
1027          final ThreadPoolExecutor p =
1028              new ThreadPoolExecutor(1, 1,
1029 <                                   60, TimeUnit.SECONDS,
1029 >                                   60, SECONDS,
1030                                     new ArrayBlockingQueue<Runnable>(10));
1031  
1032 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1033 <        final CountDownLatch done = new CountDownLatch(1);
1034 <        try {
1032 >        try (PoolCleaner cleaner = cleaner(p)) {
1033 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1034 >            final CountDownLatch done = new CountDownLatch(1);
1035              Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1036                  public void realRun() throws Exception {
1037                      Callable task = new CheckedCallable<Boolean>() {
# Line 980 | Line 1043 | public class ThreadPoolExecutorTest exte
1043                      p.submit(task).get();
1044                  }});
1045  
1046 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1046 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
1047              t.interrupt();
1048              awaitTermination(t, MEDIUM_DELAY_MS);
986        } finally {
1049              done.countDown();
988            joinPool(p);
1050          }
1051      }
1052  
# Line 993 | Line 1054 | public class ThreadPoolExecutorTest exte
1054       * execute throws RejectedExecutionException if saturated.
1055       */
1056      public void testSaturatedExecute() {
1057 <        ThreadPoolExecutor p =
1057 >        final ThreadPoolExecutor p =
1058              new ThreadPoolExecutor(1, 1,
1059                                     LONG_DELAY_MS, MILLISECONDS,
1060                                     new ArrayBlockingQueue<Runnable>(1));
1061 <        final CountDownLatch done = new CountDownLatch(1);
1062 <        try {
1061 >        try (PoolCleaner cleaner = cleaner(p)) {
1062 >            final CountDownLatch done = new CountDownLatch(1);
1063              Runnable task = new CheckedRunnable() {
1064                  public void realRun() throws InterruptedException {
1065                      done.await();
# Line 1012 | Line 1073 | public class ThreadPoolExecutorTest exte
1073                  } catch (RejectedExecutionException success) {}
1074                  assertTrue(p.getTaskCount() <= 2);
1075              }
1015        } finally {
1076              done.countDown();
1017            joinPool(p);
1077          }
1078      }
1079  
# Line 1022 | Line 1081 | public class ThreadPoolExecutorTest exte
1081       * submit(runnable) throws RejectedExecutionException if saturated.
1082       */
1083      public void testSaturatedSubmitRunnable() {
1084 <        ThreadPoolExecutor p =
1084 >        final ThreadPoolExecutor p =
1085              new ThreadPoolExecutor(1, 1,
1086                                     LONG_DELAY_MS, MILLISECONDS,
1087                                     new ArrayBlockingQueue<Runnable>(1));
1088 <        final CountDownLatch done = new CountDownLatch(1);
1089 <        try {
1088 >        try (PoolCleaner cleaner = cleaner(p)) {
1089 >            final CountDownLatch done = new CountDownLatch(1);
1090              Runnable task = new CheckedRunnable() {
1091                  public void realRun() throws InterruptedException {
1092                      done.await();
# Line 1041 | Line 1100 | public class ThreadPoolExecutorTest exte
1100                  } catch (RejectedExecutionException success) {}
1101                  assertTrue(p.getTaskCount() <= 2);
1102              }
1044        } finally {
1103              done.countDown();
1046            joinPool(p);
1104          }
1105      }
1106  
# Line 1051 | Line 1108 | public class ThreadPoolExecutorTest exte
1108       * submit(callable) throws RejectedExecutionException if saturated.
1109       */
1110      public void testSaturatedSubmitCallable() {
1111 <        ThreadPoolExecutor p =
1111 >        final ThreadPoolExecutor p =
1112              new ThreadPoolExecutor(1, 1,
1113                                     LONG_DELAY_MS, MILLISECONDS,
1114                                     new ArrayBlockingQueue<Runnable>(1));
1115 <        final CountDownLatch done = new CountDownLatch(1);
1116 <        try {
1115 >        try (PoolCleaner cleaner = cleaner(p)) {
1116 >            final CountDownLatch done = new CountDownLatch(1);
1117              Runnable task = new CheckedRunnable() {
1118                  public void realRun() throws InterruptedException {
1119                      done.await();
# Line 1070 | Line 1127 | public class ThreadPoolExecutorTest exte
1127                  } catch (RejectedExecutionException success) {}
1128                  assertTrue(p.getTaskCount() <= 2);
1129              }
1073        } finally {
1130              done.countDown();
1075            joinPool(p);
1131          }
1132      }
1133  
# Line 1080 | Line 1135 | public class ThreadPoolExecutorTest exte
1135       * executor using CallerRunsPolicy runs task if saturated.
1136       */
1137      public void testSaturatedExecute2() {
1083        RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1138          final ThreadPoolExecutor p =
1139              new ThreadPoolExecutor(1, 1,
1140                                     LONG_DELAY_MS,
1141                                     MILLISECONDS,
1142                                     new ArrayBlockingQueue<Runnable>(1),
1143 <                                   h);
1144 <        try {
1143 >                                   new ThreadPoolExecutor.CallerRunsPolicy());
1144 >        try (PoolCleaner cleaner = cleaner(p)) {
1145 >            final CountDownLatch done = new CountDownLatch(1);
1146 >            Runnable blocker = new CheckedRunnable() {
1147 >                public void realRun() throws InterruptedException {
1148 >                    done.await();
1149 >                }};
1150 >            p.execute(blocker);
1151              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1152 <            for (int i = 0; i < tasks.length; ++i)
1152 >            for (int i = 0; i < tasks.length; i++)
1153                  tasks[i] = new TrackedNoOpRunnable();
1154 <            TrackedLongRunnable mr = new TrackedLongRunnable();
1095 <            p.execute(mr);
1096 <            for (int i = 0; i < tasks.length; ++i)
1154 >            for (int i = 0; i < tasks.length; i++)
1155                  p.execute(tasks[i]);
1156 <            for (int i = 1; i < tasks.length; ++i)
1156 >            for (int i = 1; i < tasks.length; i++)
1157                  assertTrue(tasks[i].done);
1158 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1159 <        } finally {
1102 <            joinPool(p);
1158 >            assertFalse(tasks[0].done); // waiting in queue
1159 >            done.countDown();
1160          }
1161      }
1162  
# Line 1107 | Line 1164 | public class ThreadPoolExecutorTest exte
1164       * executor using DiscardPolicy drops task if saturated.
1165       */
1166      public void testSaturatedExecute3() {
1167 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1167 >        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1168 >        for (int i = 0; i < tasks.length; ++i)
1169 >            tasks[i] = new TrackedNoOpRunnable();
1170          final ThreadPoolExecutor p =
1171              new ThreadPoolExecutor(1, 1,
1172 <                                   LONG_DELAY_MS, MILLISECONDS,
1173 <                                   new ArrayBlockingQueue<Runnable>(1),
1174 <                                   h);
1175 <        try {
1176 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1177 <            for (int i = 0; i < tasks.length; ++i)
1178 <                tasks[i] = new TrackedNoOpRunnable();
1120 <            p.execute(new TrackedLongRunnable());
1172 >                          LONG_DELAY_MS, MILLISECONDS,
1173 >                          new ArrayBlockingQueue<Runnable>(1),
1174 >                          new ThreadPoolExecutor.DiscardPolicy());
1175 >        try (PoolCleaner cleaner = cleaner(p)) {
1176 >            final CountDownLatch done = new CountDownLatch(1);
1177 >            p.execute(awaiter(done));
1178 >
1179              for (TrackedNoOpRunnable task : tasks)
1180                  p.execute(task);
1181 <            for (TrackedNoOpRunnable task : tasks)
1182 <                assertFalse(task.done);
1183 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1126 <        } finally {
1127 <            joinPool(p);
1181 >            for (int i = 1; i < tasks.length; i++)
1182 >                assertFalse(tasks[i].done);
1183 >            done.countDown();
1184          }
1185 +        for (int i = 1; i < tasks.length; i++)
1186 +            assertFalse(tasks[i].done);
1187 +        assertTrue(tasks[0].done); // was waiting in queue
1188      }
1189  
1190      /**
1191       * executor using DiscardOldestPolicy drops oldest task if saturated.
1192       */
1193      public void testSaturatedExecute4() {
1194 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1194 >        final CountDownLatch done = new CountDownLatch(1);
1195 >        LatchAwaiter r1 = awaiter(done);
1196 >        LatchAwaiter r2 = awaiter(done);
1197 >        LatchAwaiter r3 = awaiter(done);
1198          final ThreadPoolExecutor p =
1199              new ThreadPoolExecutor(1, 1,
1200                                     LONG_DELAY_MS, MILLISECONDS,
1201                                     new ArrayBlockingQueue<Runnable>(1),
1202 <                                   h);
1203 <        try {
1204 <            p.execute(new TrackedLongRunnable());
1205 <            TrackedLongRunnable r2 = new TrackedLongRunnable();
1202 >                                   new ThreadPoolExecutor.DiscardOldestPolicy());
1203 >        try (PoolCleaner cleaner = cleaner(p)) {
1204 >            assertEquals(LatchAwaiter.NEW, r1.state);
1205 >            assertEquals(LatchAwaiter.NEW, r2.state);
1206 >            assertEquals(LatchAwaiter.NEW, r3.state);
1207 >            p.execute(r1);
1208              p.execute(r2);
1209              assertTrue(p.getQueue().contains(r2));
1146            TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1210              p.execute(r3);
1211              assertFalse(p.getQueue().contains(r2));
1212              assertTrue(p.getQueue().contains(r3));
1213 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1151 <        } finally {
1152 <            joinPool(p);
1213 >            done.countDown();
1214          }
1215 +        assertEquals(LatchAwaiter.DONE, r1.state);
1216 +        assertEquals(LatchAwaiter.NEW, r2.state);
1217 +        assertEquals(LatchAwaiter.DONE, r3.state);
1218      }
1219  
1220      /**
1221       * execute throws RejectedExecutionException if shutdown
1222       */
1223      public void testRejectedExecutionExceptionOnShutdown() {
1224 <        ThreadPoolExecutor p =
1224 >        final ThreadPoolExecutor p =
1225              new ThreadPoolExecutor(1, 1,
1226                                     LONG_DELAY_MS, MILLISECONDS,
1227                                     new ArrayBlockingQueue<Runnable>(1));
1228          try { p.shutdown(); } catch (SecurityException ok) { return; }
1229 <        try {
1230 <            p.execute(new NoOpRunnable());
1231 <            shouldThrow();
1232 <        } catch (RejectedExecutionException success) {}
1233 <
1234 <        joinPool(p);
1229 >        try (PoolCleaner cleaner = cleaner(p)) {
1230 >            try {
1231 >                p.execute(new NoOpRunnable());
1232 >                shouldThrow();
1233 >            } catch (RejectedExecutionException success) {}
1234 >        }
1235      }
1236  
1237      /**
# Line 1181 | Line 1245 | public class ThreadPoolExecutorTest exte
1245                                     new ArrayBlockingQueue<Runnable>(1), h);
1246  
1247          try { p.shutdown(); } catch (SecurityException ok) { return; }
1248 <        try {
1248 >        try (PoolCleaner cleaner = cleaner(p)) {
1249              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1250              p.execute(r);
1251              assertFalse(r.done);
1188        } finally {
1189            joinPool(p);
1252          }
1253      }
1254  
# Line 1194 | Line 1256 | public class ThreadPoolExecutorTest exte
1256       * execute using DiscardPolicy drops task on shutdown
1257       */
1258      public void testDiscardOnShutdown() {
1259 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1198 <        ThreadPoolExecutor p =
1259 >        final ThreadPoolExecutor p =
1260              new ThreadPoolExecutor(1, 1,
1261                                     LONG_DELAY_MS, MILLISECONDS,
1262                                     new ArrayBlockingQueue<Runnable>(1),
1263 <                                   h);
1263 >                                   new ThreadPoolExecutor.DiscardPolicy());
1264  
1265          try { p.shutdown(); } catch (SecurityException ok) { return; }
1266 <        try {
1266 >        try (PoolCleaner cleaner = cleaner(p)) {
1267              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1268              p.execute(r);
1269              assertFalse(r.done);
1209        } finally {
1210            joinPool(p);
1270          }
1271      }
1272  
1214
1273      /**
1274       * execute using DiscardOldestPolicy drops task on shutdown
1275       */
1276      public void testDiscardOldestOnShutdown() {
1277 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1220 <        ThreadPoolExecutor p =
1277 >        final ThreadPoolExecutor p =
1278              new ThreadPoolExecutor(1, 1,
1279                                     LONG_DELAY_MS, MILLISECONDS,
1280                                     new ArrayBlockingQueue<Runnable>(1),
1281 <                                   h);
1281 >                                   new ThreadPoolExecutor.DiscardOldestPolicy());
1282  
1283          try { p.shutdown(); } catch (SecurityException ok) { return; }
1284 <        try {
1284 >        try (PoolCleaner cleaner = cleaner(p)) {
1285              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1286              p.execute(r);
1287              assertFalse(r.done);
1231        } finally {
1232            joinPool(p);
1288          }
1289      }
1290  
1236
1291      /**
1292       * execute(null) throws NPE
1293       */
1294      public void testExecuteNull() {
1295 <        ThreadPoolExecutor p =
1295 >        final ThreadPoolExecutor p =
1296              new ThreadPoolExecutor(1, 2,
1297 <                                   LONG_DELAY_MS, MILLISECONDS,
1297 >                                   1L, SECONDS,
1298                                     new ArrayBlockingQueue<Runnable>(10));
1299 <        try {
1300 <            p.execute(null);
1301 <            shouldThrow();
1302 <        } catch (NullPointerException success) {}
1303 <
1304 <        joinPool(p);
1299 >        try (PoolCleaner cleaner = cleaner(p)) {
1300 >            try {
1301 >                p.execute(null);
1302 >                shouldThrow();
1303 >            } catch (NullPointerException success) {}
1304 >        }
1305      }
1306  
1307      /**
1308       * setCorePoolSize of negative value throws IllegalArgumentException
1309       */
1310      public void testCorePoolSizeIllegalArgumentException() {
1311 <        ThreadPoolExecutor p =
1311 >        final ThreadPoolExecutor p =
1312              new ThreadPoolExecutor(1, 2,
1313                                     LONG_DELAY_MS, MILLISECONDS,
1314                                     new ArrayBlockingQueue<Runnable>(10));
1315 <        try {
1316 <            p.setCorePoolSize(-1);
1317 <            shouldThrow();
1318 <        } catch (IllegalArgumentException success) {
1319 <        } finally {
1266 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1315 >        try (PoolCleaner cleaner = cleaner(p)) {
1316 >            try {
1317 >                p.setCorePoolSize(-1);
1318 >                shouldThrow();
1319 >            } catch (IllegalArgumentException success) {}
1320          }
1268        joinPool(p);
1321      }
1322  
1323      /**
# Line 1273 | Line 1325 | public class ThreadPoolExecutorTest exte
1325       * given a value less the core pool size
1326       */
1327      public void testMaximumPoolSizeIllegalArgumentException() {
1328 <        ThreadPoolExecutor p =
1328 >        final ThreadPoolExecutor p =
1329              new ThreadPoolExecutor(2, 3,
1330                                     LONG_DELAY_MS, MILLISECONDS,
1331                                     new ArrayBlockingQueue<Runnable>(10));
1332 <        try {
1333 <            p.setMaximumPoolSize(1);
1334 <            shouldThrow();
1335 <        } catch (IllegalArgumentException success) {
1336 <        } finally {
1285 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1332 >        try (PoolCleaner cleaner = cleaner(p)) {
1333 >            try {
1334 >                p.setMaximumPoolSize(1);
1335 >                shouldThrow();
1336 >            } catch (IllegalArgumentException success) {}
1337          }
1287        joinPool(p);
1338      }
1339  
1340      /**
# Line 1292 | Line 1342 | public class ThreadPoolExecutorTest exte
1342       * if given a negative value
1343       */
1344      public void testMaximumPoolSizeIllegalArgumentException2() {
1345 <        ThreadPoolExecutor p =
1345 >        final ThreadPoolExecutor p =
1346              new ThreadPoolExecutor(2, 3,
1347                                     LONG_DELAY_MS, MILLISECONDS,
1348                                     new ArrayBlockingQueue<Runnable>(10));
1349 <        try {
1350 <            p.setMaximumPoolSize(-1);
1351 <            shouldThrow();
1352 <        } catch (IllegalArgumentException success) {
1353 <        } finally {
1304 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1349 >        try (PoolCleaner cleaner = cleaner(p)) {
1350 >            try {
1351 >                p.setMaximumPoolSize(-1);
1352 >                shouldThrow();
1353 >            } catch (IllegalArgumentException success) {}
1354          }
1306        joinPool(p);
1355      }
1356  
1357 +    /**
1358 +     * Configuration changes that allow core pool size greater than
1359 +     * max pool size result in IllegalArgumentException.
1360 +     */
1361 +    public void testPoolSizeInvariants() {
1362 +        final ThreadPoolExecutor p =
1363 +            new ThreadPoolExecutor(1, 1,
1364 +                                   LONG_DELAY_MS, MILLISECONDS,
1365 +                                   new ArrayBlockingQueue<Runnable>(10));
1366 +        try (PoolCleaner cleaner = cleaner(p)) {
1367 +            for (int s = 1; s < 5; s++) {
1368 +                p.setMaximumPoolSize(s);
1369 +                p.setCorePoolSize(s);
1370 +                try {
1371 +                    p.setMaximumPoolSize(s - 1);
1372 +                    shouldThrow();
1373 +                } catch (IllegalArgumentException success) {}
1374 +                assertEquals(s, p.getCorePoolSize());
1375 +                assertEquals(s, p.getMaximumPoolSize());
1376 +                try {
1377 +                    p.setCorePoolSize(s + 1);
1378 +                    shouldThrow();
1379 +                } catch (IllegalArgumentException success) {}
1380 +                assertEquals(s, p.getCorePoolSize());
1381 +                assertEquals(s, p.getMaximumPoolSize());
1382 +            }
1383 +        }
1384 +    }
1385  
1386      /**
1387       * setKeepAliveTime throws IllegalArgumentException
1388       * when given a negative value
1389       */
1390      public void testKeepAliveTimeIllegalArgumentException() {
1391 <        ThreadPoolExecutor p =
1391 >        final ThreadPoolExecutor p =
1392              new ThreadPoolExecutor(2, 3,
1393                                     LONG_DELAY_MS, MILLISECONDS,
1394                                     new ArrayBlockingQueue<Runnable>(10));
1395 <        try {
1396 <            p.setKeepAliveTime(-1,MILLISECONDS);
1397 <            shouldThrow();
1398 <        } catch (IllegalArgumentException success) {
1399 <        } finally {
1324 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1395 >        try (PoolCleaner cleaner = cleaner(p)) {
1396 >            try {
1397 >                p.setKeepAliveTime(-1, MILLISECONDS);
1398 >                shouldThrow();
1399 >            } catch (IllegalArgumentException success) {}
1400          }
1326        joinPool(p);
1401      }
1402  
1403      /**
# Line 1331 | Line 1405 | public class ThreadPoolExecutorTest exte
1405       */
1406      public void testTerminated() {
1407          ExtendedTPE p = new ExtendedTPE();
1408 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
1409 <        assertTrue(p.terminatedCalled);
1410 <        joinPool(p);
1408 >        try (PoolCleaner cleaner = cleaner(p)) {
1409 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1410 >            assertTrue(p.terminatedCalled());
1411 >            assertTrue(p.isShutdown());
1412 >        }
1413      }
1414  
1415      /**
# Line 1341 | Line 1417 | public class ThreadPoolExecutorTest exte
1417       */
1418      public void testBeforeAfter() throws InterruptedException {
1419          ExtendedTPE p = new ExtendedTPE();
1420 <        try {
1421 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1422 <            p.execute(r);
1423 <            Thread.sleep(SHORT_DELAY_MS);
1424 <            assertTrue(r.done);
1425 <            assertTrue(p.beforeCalled);
1426 <            assertTrue(p.afterCalled);
1427 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1428 <        } finally {
1429 <            joinPool(p);
1420 >        try (PoolCleaner cleaner = cleaner(p)) {
1421 >            final CountDownLatch done = new CountDownLatch(1);
1422 >            p.execute(new CheckedRunnable() {
1423 >                public void realRun() {
1424 >                    done.countDown();
1425 >                }});
1426 >            await(p.afterCalled);
1427 >            assertEquals(0, done.getCount());
1428 >            assertTrue(p.afterCalled());
1429 >            assertTrue(p.beforeCalled());
1430          }
1431      }
1432  
# Line 1358 | Line 1434 | public class ThreadPoolExecutorTest exte
1434       * completed submit of callable returns result
1435       */
1436      public void testSubmitCallable() throws Exception {
1437 <        ExecutorService e =
1437 >        final ExecutorService e =
1438              new ThreadPoolExecutor(2, 2,
1439                                     LONG_DELAY_MS, MILLISECONDS,
1440                                     new ArrayBlockingQueue<Runnable>(10));
1441 <        try {
1441 >        try (PoolCleaner cleaner = cleaner(e)) {
1442              Future<String> future = e.submit(new StringTask());
1443              String result = future.get();
1444              assertSame(TEST_STRING, result);
1369        } finally {
1370            joinPool(e);
1445          }
1446      }
1447  
# Line 1375 | Line 1449 | public class ThreadPoolExecutorTest exte
1449       * completed submit of runnable returns successfully
1450       */
1451      public void testSubmitRunnable() throws Exception {
1452 <        ExecutorService e =
1452 >        final ExecutorService e =
1453              new ThreadPoolExecutor(2, 2,
1454                                     LONG_DELAY_MS, MILLISECONDS,
1455                                     new ArrayBlockingQueue<Runnable>(10));
1456 <        try {
1456 >        try (PoolCleaner cleaner = cleaner(e)) {
1457              Future<?> future = e.submit(new NoOpRunnable());
1458              future.get();
1459              assertTrue(future.isDone());
1386        } finally {
1387            joinPool(e);
1460          }
1461      }
1462  
# Line 1392 | Line 1464 | public class ThreadPoolExecutorTest exte
1464       * completed submit of (runnable, result) returns result
1465       */
1466      public void testSubmitRunnable2() throws Exception {
1467 <        ExecutorService e =
1467 >        final ExecutorService e =
1468              new ThreadPoolExecutor(2, 2,
1469                                     LONG_DELAY_MS, MILLISECONDS,
1470                                     new ArrayBlockingQueue<Runnable>(10));
1471 <        try {
1471 >        try (PoolCleaner cleaner = cleaner(e)) {
1472              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1473              String result = future.get();
1474              assertSame(TEST_STRING, result);
1403        } finally {
1404            joinPool(e);
1475          }
1476      }
1477  
1408
1478      /**
1479       * invokeAny(null) throws NPE
1480       */
1481      public void testInvokeAny1() throws Exception {
1482 <        ExecutorService e =
1482 >        final ExecutorService e =
1483              new ThreadPoolExecutor(2, 2,
1484                                     LONG_DELAY_MS, MILLISECONDS,
1485                                     new ArrayBlockingQueue<Runnable>(10));
1486 <        try {
1487 <            e.invokeAny(null);
1488 <            shouldThrow();
1489 <        } catch (NullPointerException success) {
1490 <        } finally {
1422 <            joinPool(e);
1486 >        try (PoolCleaner cleaner = cleaner(e)) {
1487 >            try {
1488 >                e.invokeAny(null);
1489 >                shouldThrow();
1490 >            } catch (NullPointerException success) {}
1491          }
1492      }
1493  
# Line 1427 | Line 1495 | public class ThreadPoolExecutorTest exte
1495       * invokeAny(empty collection) throws IAE
1496       */
1497      public void testInvokeAny2() throws Exception {
1498 <        ExecutorService e =
1498 >        final ExecutorService e =
1499              new ThreadPoolExecutor(2, 2,
1500                                     LONG_DELAY_MS, MILLISECONDS,
1501                                     new ArrayBlockingQueue<Runnable>(10));
1502 <        try {
1503 <            e.invokeAny(new ArrayList<Callable<String>>());
1504 <            shouldThrow();
1505 <        } catch (IllegalArgumentException success) {
1506 <        } finally {
1439 <            joinPool(e);
1502 >        try (PoolCleaner cleaner = cleaner(e)) {
1503 >            try {
1504 >                e.invokeAny(new ArrayList<Callable<String>>());
1505 >                shouldThrow();
1506 >            } catch (IllegalArgumentException success) {}
1507          }
1508      }
1509  
# Line 1449 | Line 1516 | public class ThreadPoolExecutorTest exte
1516              new ThreadPoolExecutor(2, 2,
1517                                     LONG_DELAY_MS, MILLISECONDS,
1518                                     new ArrayBlockingQueue<Runnable>(10));
1519 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1520 <        l.add(latchAwaitingStringTask(latch));
1521 <        l.add(null);
1522 <        try {
1523 <            e.invokeAny(l);
1524 <            shouldThrow();
1525 <        } catch (NullPointerException success) {
1526 <        } finally {
1519 >        try (PoolCleaner cleaner = cleaner(e)) {
1520 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1521 >            l.add(latchAwaitingStringTask(latch));
1522 >            l.add(null);
1523 >            try {
1524 >                e.invokeAny(l);
1525 >                shouldThrow();
1526 >            } catch (NullPointerException success) {}
1527              latch.countDown();
1461            joinPool(e);
1528          }
1529      }
1530  
# Line 1466 | Line 1532 | public class ThreadPoolExecutorTest exte
1532       * invokeAny(c) throws ExecutionException if no task completes
1533       */
1534      public void testInvokeAny4() throws Exception {
1535 <        ExecutorService e =
1535 >        final ExecutorService e =
1536              new ThreadPoolExecutor(2, 2,
1537                                     LONG_DELAY_MS, MILLISECONDS,
1538                                     new ArrayBlockingQueue<Runnable>(10));
1539 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1540 <        l.add(new NPETask());
1541 <        try {
1542 <            e.invokeAny(l);
1543 <            shouldThrow();
1544 <        } catch (ExecutionException success) {
1545 <            assertTrue(success.getCause() instanceof NullPointerException);
1546 <        } finally {
1547 <            joinPool(e);
1539 >        try (PoolCleaner cleaner = cleaner(e)) {
1540 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1541 >            l.add(new NPETask());
1542 >            try {
1543 >                e.invokeAny(l);
1544 >                shouldThrow();
1545 >            } catch (ExecutionException success) {
1546 >                assertTrue(success.getCause() instanceof NullPointerException);
1547 >            }
1548          }
1549      }
1550  
# Line 1486 | Line 1552 | public class ThreadPoolExecutorTest exte
1552       * invokeAny(c) returns result of some task
1553       */
1554      public void testInvokeAny5() throws Exception {
1555 <        ExecutorService e =
1555 >        final ExecutorService e =
1556              new ThreadPoolExecutor(2, 2,
1557                                     LONG_DELAY_MS, MILLISECONDS,
1558                                     new ArrayBlockingQueue<Runnable>(10));
1559 <        try {
1559 >        try (PoolCleaner cleaner = cleaner(e)) {
1560              List<Callable<String>> l = new ArrayList<Callable<String>>();
1561              l.add(new StringTask());
1562              l.add(new StringTask());
1563              String result = e.invokeAny(l);
1564              assertSame(TEST_STRING, result);
1499        } finally {
1500            joinPool(e);
1565          }
1566      }
1567  
# Line 1505 | Line 1569 | public class ThreadPoolExecutorTest exte
1569       * invokeAll(null) throws NPE
1570       */
1571      public void testInvokeAll1() throws Exception {
1572 <        ExecutorService e =
1572 >        final ExecutorService e =
1573              new ThreadPoolExecutor(2, 2,
1574                                     LONG_DELAY_MS, MILLISECONDS,
1575                                     new ArrayBlockingQueue<Runnable>(10));
1576 <        try {
1577 <            e.invokeAll(null);
1578 <            shouldThrow();
1579 <        } catch (NullPointerException success) {
1580 <        } finally {
1517 <            joinPool(e);
1576 >        try (PoolCleaner cleaner = cleaner(e)) {
1577 >            try {
1578 >                e.invokeAll(null);
1579 >                shouldThrow();
1580 >            } catch (NullPointerException success) {}
1581          }
1582      }
1583  
# Line 1522 | Line 1585 | public class ThreadPoolExecutorTest exte
1585       * invokeAll(empty collection) returns empty collection
1586       */
1587      public void testInvokeAll2() throws InterruptedException {
1588 <        ExecutorService e =
1588 >        final ExecutorService e =
1589              new ThreadPoolExecutor(2, 2,
1590                                     LONG_DELAY_MS, MILLISECONDS,
1591                                     new ArrayBlockingQueue<Runnable>(10));
1592 <        try {
1592 >        try (PoolCleaner cleaner = cleaner(e)) {
1593              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1594              assertTrue(r.isEmpty());
1532        } finally {
1533            joinPool(e);
1595          }
1596      }
1597  
# Line 1538 | Line 1599 | public class ThreadPoolExecutorTest exte
1599       * invokeAll(c) throws NPE if c has null elements
1600       */
1601      public void testInvokeAll3() throws Exception {
1602 <        ExecutorService e =
1602 >        final ExecutorService e =
1603              new ThreadPoolExecutor(2, 2,
1604                                     LONG_DELAY_MS, MILLISECONDS,
1605                                     new ArrayBlockingQueue<Runnable>(10));
1606 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1607 <        l.add(new StringTask());
1608 <        l.add(null);
1609 <        try {
1610 <            e.invokeAll(l);
1611 <            shouldThrow();
1612 <        } catch (NullPointerException success) {
1613 <        } finally {
1553 <            joinPool(e);
1606 >        try (PoolCleaner cleaner = cleaner(e)) {
1607 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1608 >            l.add(new StringTask());
1609 >            l.add(null);
1610 >            try {
1611 >                e.invokeAll(l);
1612 >                shouldThrow();
1613 >            } catch (NullPointerException success) {}
1614          }
1615      }
1616  
# Line 1558 | Line 1618 | public class ThreadPoolExecutorTest exte
1618       * get of element of invokeAll(c) throws exception on failed task
1619       */
1620      public void testInvokeAll4() throws Exception {
1621 <        ExecutorService e =
1621 >        final ExecutorService e =
1622              new ThreadPoolExecutor(2, 2,
1623                                     LONG_DELAY_MS, MILLISECONDS,
1624                                     new ArrayBlockingQueue<Runnable>(10));
1625 <        try {
1625 >        try (PoolCleaner cleaner = cleaner(e)) {
1626              List<Callable<String>> l = new ArrayList<Callable<String>>();
1627              l.add(new NPETask());
1628              List<Future<String>> futures = e.invokeAll(l);
# Line 1573 | Line 1633 | public class ThreadPoolExecutorTest exte
1633              } catch (ExecutionException success) {
1634                  assertTrue(success.getCause() instanceof NullPointerException);
1635              }
1576        } finally {
1577            joinPool(e);
1636          }
1637      }
1638  
# Line 1582 | Line 1640 | public class ThreadPoolExecutorTest exte
1640       * invokeAll(c) returns results of all completed tasks
1641       */
1642      public void testInvokeAll5() throws Exception {
1643 <        ExecutorService e =
1643 >        final ExecutorService e =
1644              new ThreadPoolExecutor(2, 2,
1645                                     LONG_DELAY_MS, MILLISECONDS,
1646                                     new ArrayBlockingQueue<Runnable>(10));
1647 <        try {
1647 >        try (PoolCleaner cleaner = cleaner(e)) {
1648              List<Callable<String>> l = new ArrayList<Callable<String>>();
1649              l.add(new StringTask());
1650              l.add(new StringTask());
# Line 1594 | Line 1652 | public class ThreadPoolExecutorTest exte
1652              assertEquals(2, futures.size());
1653              for (Future<String> future : futures)
1654                  assertSame(TEST_STRING, future.get());
1597        } finally {
1598            joinPool(e);
1655          }
1656      }
1657  
1602
1603
1658      /**
1659       * timed invokeAny(null) throws NPE
1660       */
1661      public void testTimedInvokeAny1() throws Exception {
1662 <        ExecutorService e =
1662 >        final ExecutorService e =
1663              new ThreadPoolExecutor(2, 2,
1664                                     LONG_DELAY_MS, MILLISECONDS,
1665                                     new ArrayBlockingQueue<Runnable>(10));
1666 <        try {
1667 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1668 <            shouldThrow();
1669 <        } catch (NullPointerException success) {
1670 <        } finally {
1617 <            joinPool(e);
1666 >        try (PoolCleaner cleaner = cleaner(e)) {
1667 >            try {
1668 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1669 >                shouldThrow();
1670 >            } catch (NullPointerException success) {}
1671          }
1672      }
1673  
# Line 1622 | Line 1675 | public class ThreadPoolExecutorTest exte
1675       * timed invokeAny(,,null) throws NPE
1676       */
1677      public void testTimedInvokeAnyNullTimeUnit() 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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1683 <        l.add(new StringTask());
1684 <        try {
1685 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1686 <            shouldThrow();
1687 <        } catch (NullPointerException success) {
1688 <        } finally {
1636 <            joinPool(e);
1682 >        try (PoolCleaner cleaner = cleaner(e)) {
1683 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1684 >            l.add(new StringTask());
1685 >            try {
1686 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1687 >                shouldThrow();
1688 >            } catch (NullPointerException success) {}
1689          }
1690      }
1691  
# Line 1641 | Line 1693 | public class ThreadPoolExecutorTest exte
1693       * timed invokeAny(empty collection) throws IAE
1694       */
1695      public void testTimedInvokeAny2() throws Exception {
1696 <        ExecutorService e =
1696 >        final ExecutorService e =
1697              new ThreadPoolExecutor(2, 2,
1698                                     LONG_DELAY_MS, MILLISECONDS,
1699                                     new ArrayBlockingQueue<Runnable>(10));
1700 <        try {
1701 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1702 <            shouldThrow();
1703 <        } catch (IllegalArgumentException success) {
1704 <        } finally {
1705 <            joinPool(e);
1700 >        try (PoolCleaner cleaner = cleaner(e)) {
1701 >            try {
1702 >                e.invokeAny(new ArrayList<Callable<String>>(),
1703 >                            MEDIUM_DELAY_MS, MILLISECONDS);
1704 >                shouldThrow();
1705 >            } catch (IllegalArgumentException success) {}
1706          }
1707      }
1708  
# Line 1663 | Line 1715 | public class ThreadPoolExecutorTest exte
1715              new ThreadPoolExecutor(2, 2,
1716                                     LONG_DELAY_MS, MILLISECONDS,
1717                                     new ArrayBlockingQueue<Runnable>(10));
1718 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1719 <        l.add(latchAwaitingStringTask(latch));
1720 <        l.add(null);
1721 <        try {
1722 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1723 <            shouldThrow();
1724 <        } catch (NullPointerException success) {
1725 <        } finally {
1718 >        try (PoolCleaner cleaner = cleaner(e)) {
1719 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1720 >            l.add(latchAwaitingStringTask(latch));
1721 >            l.add(null);
1722 >            try {
1723 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1724 >                shouldThrow();
1725 >            } catch (NullPointerException success) {}
1726              latch.countDown();
1675            joinPool(e);
1727          }
1728      }
1729  
# Line 1680 | Line 1731 | public class ThreadPoolExecutorTest exte
1731       * timed invokeAny(c) throws ExecutionException if no task completes
1732       */
1733      public void testTimedInvokeAny4() throws Exception {
1734 <        ExecutorService e =
1734 >        final ExecutorService e =
1735              new ThreadPoolExecutor(2, 2,
1736                                     LONG_DELAY_MS, MILLISECONDS,
1737                                     new ArrayBlockingQueue<Runnable>(10));
1738 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1739 <        l.add(new NPETask());
1740 <        try {
1741 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1742 <            shouldThrow();
1743 <        } catch (ExecutionException success) {
1744 <            assertTrue(success.getCause() instanceof NullPointerException);
1745 <        } finally {
1746 <            joinPool(e);
1738 >        try (PoolCleaner cleaner = cleaner(e)) {
1739 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1740 >            l.add(new NPETask());
1741 >            try {
1742 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1743 >                shouldThrow();
1744 >            } catch (ExecutionException success) {
1745 >                assertTrue(success.getCause() instanceof NullPointerException);
1746 >            }
1747          }
1748      }
1749  
# Line 1700 | Line 1751 | public class ThreadPoolExecutorTest exte
1751       * timed invokeAny(c) returns result of some task
1752       */
1753      public void testTimedInvokeAny5() throws Exception {
1754 <        ExecutorService e =
1754 >        final ExecutorService e =
1755              new ThreadPoolExecutor(2, 2,
1756                                     LONG_DELAY_MS, MILLISECONDS,
1757                                     new ArrayBlockingQueue<Runnable>(10));
1758 <        try {
1758 >        try (PoolCleaner cleaner = cleaner(e)) {
1759              List<Callable<String>> l = new ArrayList<Callable<String>>();
1760              l.add(new StringTask());
1761              l.add(new StringTask());
1762              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1763              assertSame(TEST_STRING, result);
1713        } finally {
1714            joinPool(e);
1764          }
1765      }
1766  
# Line 1719 | Line 1768 | public class ThreadPoolExecutorTest exte
1768       * timed invokeAll(null) throws NPE
1769       */
1770      public void testTimedInvokeAll1() throws Exception {
1771 <        ExecutorService e =
1771 >        final ExecutorService e =
1772              new ThreadPoolExecutor(2, 2,
1773                                     LONG_DELAY_MS, MILLISECONDS,
1774                                     new ArrayBlockingQueue<Runnable>(10));
1775 <        try {
1776 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1777 <            shouldThrow();
1778 <        } catch (NullPointerException success) {
1779 <        } finally {
1731 <            joinPool(e);
1775 >        try (PoolCleaner cleaner = cleaner(e)) {
1776 >            try {
1777 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1778 >                shouldThrow();
1779 >            } catch (NullPointerException success) {}
1780          }
1781      }
1782  
# Line 1736 | Line 1784 | public class ThreadPoolExecutorTest exte
1784       * timed invokeAll(,,null) throws NPE
1785       */
1786      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1787 <        ExecutorService e =
1787 >        final ExecutorService e =
1788              new ThreadPoolExecutor(2, 2,
1789                                     LONG_DELAY_MS, MILLISECONDS,
1790                                     new ArrayBlockingQueue<Runnable>(10));
1791 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1792 <        l.add(new StringTask());
1793 <        try {
1794 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1795 <            shouldThrow();
1796 <        } catch (NullPointerException success) {
1797 <        } finally {
1750 <            joinPool(e);
1791 >        try (PoolCleaner cleaner = cleaner(e)) {
1792 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1793 >            l.add(new StringTask());
1794 >            try {
1795 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1796 >                shouldThrow();
1797 >            } catch (NullPointerException success) {}
1798          }
1799      }
1800  
# Line 1755 | Line 1802 | public class ThreadPoolExecutorTest exte
1802       * timed invokeAll(empty collection) returns empty collection
1803       */
1804      public void testTimedInvokeAll2() throws InterruptedException {
1805 <        ExecutorService e =
1805 >        final ExecutorService e =
1806              new ThreadPoolExecutor(2, 2,
1807                                     LONG_DELAY_MS, MILLISECONDS,
1808                                     new ArrayBlockingQueue<Runnable>(10));
1809 <        try {
1810 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1809 >        try (PoolCleaner cleaner = cleaner(e)) {
1810 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1811 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1812              assertTrue(r.isEmpty());
1765        } finally {
1766            joinPool(e);
1813          }
1814      }
1815  
# Line 1771 | Line 1817 | public class ThreadPoolExecutorTest exte
1817       * timed invokeAll(c) throws NPE if c has null elements
1818       */
1819      public void testTimedInvokeAll3() throws Exception {
1820 <        ExecutorService e =
1820 >        final ExecutorService e =
1821              new ThreadPoolExecutor(2, 2,
1822                                     LONG_DELAY_MS, MILLISECONDS,
1823                                     new ArrayBlockingQueue<Runnable>(10));
1824 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1825 <        l.add(new StringTask());
1826 <        l.add(null);
1827 <        try {
1828 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1829 <            shouldThrow();
1830 <        } catch (NullPointerException success) {
1831 <        } finally {
1786 <            joinPool(e);
1824 >        try (PoolCleaner cleaner = cleaner(e)) {
1825 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1826 >            l.add(new StringTask());
1827 >            l.add(null);
1828 >            try {
1829 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1830 >                shouldThrow();
1831 >            } catch (NullPointerException success) {}
1832          }
1833      }
1834  
# Line 1791 | Line 1836 | public class ThreadPoolExecutorTest exte
1836       * get of element of invokeAll(c) throws exception on failed task
1837       */
1838      public void testTimedInvokeAll4() throws Exception {
1839 <        ExecutorService e =
1839 >        final ExecutorService e =
1840              new ThreadPoolExecutor(2, 2,
1841                                     LONG_DELAY_MS, MILLISECONDS,
1842                                     new ArrayBlockingQueue<Runnable>(10));
1843 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1844 <        l.add(new NPETask());
1845 <        List<Future<String>> futures =
1846 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1847 <        assertEquals(1, futures.size());
1848 <        try {
1849 <            futures.get(0).get();
1850 <            shouldThrow();
1851 <        } catch (ExecutionException success) {
1852 <            assertTrue(success.getCause() instanceof NullPointerException);
1853 <        } finally {
1854 <            joinPool(e);
1843 >        try (PoolCleaner cleaner = cleaner(e)) {
1844 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1845 >            l.add(new NPETask());
1846 >            List<Future<String>> futures =
1847 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1848 >            assertEquals(1, futures.size());
1849 >            try {
1850 >                futures.get(0).get();
1851 >                shouldThrow();
1852 >            } catch (ExecutionException success) {
1853 >                assertTrue(success.getCause() instanceof NullPointerException);
1854 >            }
1855          }
1856      }
1857  
# Line 1814 | Line 1859 | public class ThreadPoolExecutorTest exte
1859       * timed invokeAll(c) returns results of all completed tasks
1860       */
1861      public void testTimedInvokeAll5() throws Exception {
1862 <        ExecutorService e =
1862 >        final ExecutorService e =
1863              new ThreadPoolExecutor(2, 2,
1864                                     LONG_DELAY_MS, MILLISECONDS,
1865                                     new ArrayBlockingQueue<Runnable>(10));
1866 <        try {
1866 >        try (PoolCleaner cleaner = cleaner(e)) {
1867              List<Callable<String>> l = new ArrayList<Callable<String>>();
1868              l.add(new StringTask());
1869              l.add(new StringTask());
1870              List<Future<String>> futures =
1871 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1871 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1872              assertEquals(2, futures.size());
1873              for (Future<String> future : futures)
1874                  assertSame(TEST_STRING, future.get());
1830        } finally {
1831            joinPool(e);
1875          }
1876      }
1877  
# Line 1836 | Line 1879 | public class ThreadPoolExecutorTest exte
1879       * timed invokeAll(c) cancels tasks not completed by timeout
1880       */
1881      public void testTimedInvokeAll6() throws Exception {
1882 <        ExecutorService e =
1882 >        final ExecutorService e =
1883              new ThreadPoolExecutor(2, 2,
1884                                     LONG_DELAY_MS, MILLISECONDS,
1885                                     new ArrayBlockingQueue<Runnable>(10));
1886 <        try {
1887 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1888 <            l.add(new StringTask());
1889 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1890 <            l.add(new StringTask());
1891 <            List<Future<String>> futures =
1892 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1893 <            assertEquals(3, futures.size());
1894 <            Iterator<Future<String>> it = futures.iterator();
1895 <            Future<String> f1 = it.next();
1896 <            Future<String> f2 = it.next();
1897 <            Future<String> f3 = it.next();
1898 <            assertTrue(f1.isDone());
1899 <            assertTrue(f2.isDone());
1900 <            assertTrue(f3.isDone());
1901 <            assertFalse(f1.isCancelled());
1902 <            assertTrue(f2.isCancelled());
1903 <        } finally {
1904 <            joinPool(e);
1886 >        try (PoolCleaner cleaner = cleaner(e)) {
1887 >            for (long timeout = timeoutMillis();;) {
1888 >                List<Callable<String>> tasks = new ArrayList<>();
1889 >                tasks.add(new StringTask("0"));
1890 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1891 >                tasks.add(new StringTask("2"));
1892 >                long startTime = System.nanoTime();
1893 >                List<Future<String>> futures =
1894 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1895 >                assertEquals(tasks.size(), futures.size());
1896 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1897 >                for (Future future : futures)
1898 >                    assertTrue(future.isDone());
1899 >                assertTrue(futures.get(1).isCancelled());
1900 >                try {
1901 >                    assertEquals("0", futures.get(0).get());
1902 >                    assertEquals("2", futures.get(2).get());
1903 >                    break;
1904 >                } catch (CancellationException retryWithLongerTimeout) {
1905 >                    timeout *= 2;
1906 >                    if (timeout >= LONG_DELAY_MS / 2)
1907 >                        fail("expected exactly one task to be cancelled");
1908 >                }
1909 >            }
1910          }
1911      }
1912  
# Line 1872 | Line 1920 | public class ThreadPoolExecutorTest exte
1920                                     LONG_DELAY_MS, MILLISECONDS,
1921                                     new LinkedBlockingQueue<Runnable>(),
1922                                     new FailingThreadFactory());
1923 <        try {
1923 >        try (PoolCleaner cleaner = cleaner(e)) {
1924              final int TASKS = 100;
1925              final CountDownLatch done = new CountDownLatch(TASKS);
1926              for (int k = 0; k < TASKS; ++k)
# Line 1881 | Line 1929 | public class ThreadPoolExecutorTest exte
1929                          done.countDown();
1930                      }});
1931              assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1884        } finally {
1885            joinPool(e);
1932          }
1933      }
1934  
# Line 1894 | Line 1940 | public class ThreadPoolExecutorTest exte
1940              new ThreadPoolExecutor(2, 2,
1941                                     1000, MILLISECONDS,
1942                                     new ArrayBlockingQueue<Runnable>(10));
1943 <        assertFalse(p.allowsCoreThreadTimeOut());
1944 <        joinPool(p);
1943 >        try (PoolCleaner cleaner = cleaner(p)) {
1944 >            assertFalse(p.allowsCoreThreadTimeOut());
1945 >        }
1946      }
1947  
1948      /**
1949       * allowCoreThreadTimeOut(true) causes idle threads to time out
1950       */
1951      public void testAllowCoreThreadTimeOut_true() throws Exception {
1952 +        long keepAliveTime = timeoutMillis();
1953          final ThreadPoolExecutor p =
1954              new ThreadPoolExecutor(2, 10,
1955 <                                   SHORT_DELAY_MS, MILLISECONDS,
1955 >                                   keepAliveTime, MILLISECONDS,
1956                                     new ArrayBlockingQueue<Runnable>(10));
1957 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1958 <        try {
1957 >        try (PoolCleaner cleaner = cleaner(p)) {
1958 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1959              p.allowCoreThreadTimeOut(true);
1960              p.execute(new CheckedRunnable() {
1961 <                public void realRun() throws InterruptedException {
1961 >                public void realRun() {
1962                      threadStarted.countDown();
1963                      assertEquals(1, p.getPoolSize());
1964                  }});
1965 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1966 <            for (int i = 0; i < (MEDIUM_DELAY_MS/10); i++) {
1967 <                if (p.getPoolSize() == 0)
1968 <                    break;
1969 <                Thread.sleep(10);
1970 <            }
1965 >            await(threadStarted);
1966 >            delay(keepAliveTime);
1967 >            long startTime = System.nanoTime();
1968 >            while (p.getPoolSize() > 0
1969 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1970 >                Thread.yield();
1971 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1972              assertEquals(0, p.getPoolSize());
1924        } finally {
1925            joinPool(p);
1973          }
1974      }
1975  
# Line 1930 | Line 1977 | public class ThreadPoolExecutorTest exte
1977       * allowCoreThreadTimeOut(false) causes idle threads not to time out
1978       */
1979      public void testAllowCoreThreadTimeOut_false() throws Exception {
1980 +        long keepAliveTime = timeoutMillis();
1981          final ThreadPoolExecutor p =
1982              new ThreadPoolExecutor(2, 10,
1983 <                                   SHORT_DELAY_MS, MILLISECONDS,
1983 >                                   keepAliveTime, MILLISECONDS,
1984                                     new ArrayBlockingQueue<Runnable>(10));
1985 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1986 <        try {
1985 >        try (PoolCleaner cleaner = cleaner(p)) {
1986 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1987              p.allowCoreThreadTimeOut(false);
1988              p.execute(new CheckedRunnable() {
1989                  public void realRun() throws InterruptedException {
1990                      threadStarted.countDown();
1991                      assertTrue(p.getPoolSize() >= 1);
1992                  }});
1993 <            Thread.sleep(SMALL_DELAY_MS);
1993 >            delay(2 * keepAliveTime);
1994              assertTrue(p.getPoolSize() >= 1);
1947        } finally {
1948            joinPool(p);
1995          }
1996      }
1997  
# Line 1961 | Line 2007 | public class ThreadPoolExecutorTest exte
2007                  done.countDown();
2008              }};
2009          final ThreadPoolExecutor p =
2010 <            new ThreadPoolExecutor(1, 30, 60, TimeUnit.SECONDS,
2010 >            new ThreadPoolExecutor(1, 30,
2011 >                                   60, SECONDS,
2012                                     new ArrayBlockingQueue(30));
2013 <        try {
2013 >        try (PoolCleaner cleaner = cleaner(p)) {
2014              for (int i = 0; i < nTasks; ++i) {
2015                  for (;;) {
2016                      try {
# Line 1975 | Line 2022 | public class ThreadPoolExecutorTest exte
2022              }
2023              // enough time to run all tasks
2024              assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
2025 <        } finally {
2026 <            p.shutdown();
2025 >        }
2026 >    }
2027 >
2028 >    /**
2029 >     * get(cancelled task) throws CancellationException
2030 >     */
2031 >    public void testGet_cancelled() throws Exception {
2032 >        final ExecutorService e =
2033 >            new ThreadPoolExecutor(1, 1,
2034 >                                   LONG_DELAY_MS, MILLISECONDS,
2035 >                                   new LinkedBlockingQueue<Runnable>());
2036 >        try (PoolCleaner cleaner = cleaner(e)) {
2037 >            final CountDownLatch blockerStarted = new CountDownLatch(1);
2038 >            final CountDownLatch done = new CountDownLatch(1);
2039 >            final List<Future<?>> futures = new ArrayList<>();
2040 >            for (int i = 0; i < 2; i++) {
2041 >                Runnable r = new CheckedRunnable() { public void realRun()
2042 >                                                         throws Throwable {
2043 >                    blockerStarted.countDown();
2044 >                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
2045 >                }};
2046 >                futures.add(e.submit(r));
2047 >            }
2048 >            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2049 >            for (Future<?> future : futures) future.cancel(false);
2050 >            for (Future<?> future : futures) {
2051 >                try {
2052 >                    future.get();
2053 >                    shouldThrow();
2054 >                } catch (CancellationException success) {}
2055 >                try {
2056 >                    future.get(LONG_DELAY_MS, MILLISECONDS);
2057 >                    shouldThrow();
2058 >                } catch (CancellationException success) {}
2059 >                assertTrue(future.isCancelled());
2060 >                assertTrue(future.isDone());
2061 >            }
2062 >            done.countDown();
2063          }
2064      }
2065  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines