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

Comparing jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java (file contents):
Revision 1.25 by jsr166, Tue Mar 15 19:47:07 2011 UTC vs.
Revision 1.84 by jsr166, Mon Oct 5 21:42:48 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.util.concurrent.locks.*;
10 > import static java.util.concurrent.TimeUnit.SECONDS;
11  
12 < import junit.framework.*;
13 < import java.util.*;
12 > import java.util.ArrayList;
13 > import java.util.List;
14 > import java.util.concurrent.ArrayBlockingQueue;
15 > import java.util.concurrent.BlockingQueue;
16 > import java.util.concurrent.Callable;
17 > import java.util.concurrent.CancellationException;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.ExecutionException;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.Future;
23 > import java.util.concurrent.FutureTask;
24 > import java.util.concurrent.LinkedBlockingQueue;
25 > import java.util.concurrent.RejectedExecutionException;
26 > import java.util.concurrent.RejectedExecutionHandler;
27 > import java.util.concurrent.RunnableFuture;
28 > import java.util.concurrent.SynchronousQueue;
29 > import java.util.concurrent.ThreadFactory;
30 > import java.util.concurrent.ThreadPoolExecutor;
31 > import java.util.concurrent.TimeoutException;
32 > import java.util.concurrent.TimeUnit;
33 > import java.util.concurrent.atomic.AtomicInteger;
34 > import java.util.concurrent.locks.Condition;
35 > import java.util.concurrent.locks.ReentrantLock;
36 >
37 > import junit.framework.Test;
38 > import junit.framework.TestSuite;
39  
40   public class ThreadPoolExecutorSubclassTest extends JSR166TestCase {
41      public static void main(String[] args) {
42 <        junit.textui.TestRunner.run(suite());
42 >        main(suite(), args);
43      }
44      public static Test suite() {
45          return new TestSuite(ThreadPoolExecutorSubclassTest.class);
# Line 37 | Line 61 | public class ThreadPoolExecutorSubclassT
61          CustomTask(final Runnable r, final V res) {
62              if (r == null) throw new NullPointerException();
63              callable = new Callable<V>() {
64 <            public V call() throws Exception { r.run(); return res; }};
64 >                public V call() throws Exception { r.run(); return res; }};
65          }
66          public boolean isDone() {
67              lock.lock(); try { return done; } finally { lock.unlock() ; }
# Line 77 | Line 101 | public class ThreadPoolExecutorSubclassT
101              }
102              lock.lock();
103              try {
104 <                result = v;
105 <                exception = e;
106 <                done = true;
107 <                thread = null;
108 <                cond.signalAll();
104 >                if (!done) {
105 >                    result = v;
106 >                    exception = e;
107 >                    done = true;
108 >                    thread = null;
109 >                    cond.signalAll();
110 >                }
111              }
112              finally { lock.unlock(); }
113          }
# Line 90 | Line 116 | public class ThreadPoolExecutorSubclassT
116              try {
117                  while (!done)
118                      cond.await();
119 +                if (cancelled)
120 +                    throw new CancellationException();
121                  if (exception != null)
122                      throw new ExecutionException(exception);
123                  return result;
# Line 101 | Line 129 | public class ThreadPoolExecutorSubclassT
129              long nanos = unit.toNanos(timeout);
130              lock.lock();
131              try {
132 <                for (;;) {
133 <                    if (done) break;
106 <                    if (nanos < 0)
132 >                while (!done) {
133 >                    if (nanos <= 0L)
134                          throw new TimeoutException();
135                      nanos = cond.awaitNanos(nanos);
136                  }
137 +                if (cancelled)
138 +                    throw new CancellationException();
139                  if (exception != null)
140                      throw new ExecutionException(exception);
141                  return result;
# Line 115 | Line 144 | public class ThreadPoolExecutorSubclassT
144          }
145      }
146  
118
147      static class CustomTPE extends ThreadPoolExecutor {
148          protected <V> RunnableFuture<V> newTaskFor(Callable<V> c) {
149              return new CustomTask<V>(c);
# Line 162 | Line 190 | public class ThreadPoolExecutorSubclassT
190                workQueue, threadFactory, handler);
191          }
192  
193 <        volatile boolean beforeCalled = false;
194 <        volatile boolean afterCalled = false;
195 <        volatile boolean terminatedCalled = false;
193 >        final CountDownLatch beforeCalled = new CountDownLatch(1);
194 >        final CountDownLatch afterCalled = new CountDownLatch(1);
195 >        final CountDownLatch terminatedCalled = new CountDownLatch(1);
196 >
197          public CustomTPE() {
198              super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
199          }
200          protected void beforeExecute(Thread t, Runnable r) {
201 <            beforeCalled = true;
201 >            beforeCalled.countDown();
202          }
203          protected void afterExecute(Runnable r, Throwable t) {
204 <            afterCalled = true;
204 >            afterCalled.countDown();
205          }
206          protected void terminated() {
207 <            terminatedCalled = true;
207 >            terminatedCalled.countDown();
208          }
209  
210 +        public boolean beforeCalled() {
211 +            return beforeCalled.getCount() == 0;
212 +        }
213 +        public boolean afterCalled() {
214 +            return afterCalled.getCount() == 0;
215 +        }
216 +        public boolean terminatedCalled() {
217 +            return terminatedCalled.getCount() == 0;
218 +        }
219      }
220  
221      static class FailingThreadFactory implements ThreadFactory {
# Line 188 | Line 226 | public class ThreadPoolExecutorSubclassT
226          }
227      }
228  
191
229      /**
230       * execute successfully executes a runnable
231       */
232      public void testExecute() throws InterruptedException {
233          final ThreadPoolExecutor p =
234              new CustomTPE(1, 1,
235 <                          LONG_DELAY_MS, MILLISECONDS,
235 >                          2 * LONG_DELAY_MS, MILLISECONDS,
236                            new ArrayBlockingQueue<Runnable>(10));
237 <        final CountDownLatch done = new CountDownLatch(1);
238 <        final Runnable task = new CheckedRunnable() {
239 <            public void realRun() {
240 <                done.countDown();
204 <            }};
205 <        try {
237 >        try (PoolCleaner cleaner = cleaner(p)) {
238 >            final CountDownLatch done = new CountDownLatch(1);
239 >            final Runnable task = new CheckedRunnable() {
240 >                public void realRun() { done.countDown(); }};
241              p.execute(task);
242 <            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
208 <        } finally {
209 <            joinPool(p);
242 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243          }
244      }
245  
# Line 219 | Line 252 | public class ThreadPoolExecutorSubclassT
252              new CustomTPE(2, 2,
253                            LONG_DELAY_MS, MILLISECONDS,
254                            new ArrayBlockingQueue<Runnable>(10));
255 <        final CountDownLatch threadStarted = new CountDownLatch(1);
256 <        final CountDownLatch done = new CountDownLatch(1);
257 <        try {
255 >        try (PoolCleaner cleaner = cleaner(p)) {
256 >            final CountDownLatch threadStarted = new CountDownLatch(1);
257 >            final CountDownLatch done = new CountDownLatch(1);
258              assertEquals(0, p.getActiveCount());
259              p.execute(new CheckedRunnable() {
260                  public void realRun() throws InterruptedException {
# Line 229 | Line 262 | public class ThreadPoolExecutorSubclassT
262                      assertEquals(1, p.getActiveCount());
263                      done.await();
264                  }});
265 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
265 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
266              assertEquals(1, p.getActiveCount());
234        } finally {
267              done.countDown();
236            joinPool(p);
268          }
269      }
270  
# Line 241 | Line 272 | public class ThreadPoolExecutorSubclassT
272       * prestartCoreThread starts a thread if under corePoolSize, else doesn't
273       */
274      public void testPrestartCoreThread() {
275 <        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
276 <        assertEquals(0, p.getPoolSize());
277 <        assertTrue(p.prestartCoreThread());
278 <        assertEquals(1, p.getPoolSize());
279 <        assertTrue(p.prestartCoreThread());
280 <        assertEquals(2, p.getPoolSize());
281 <        assertFalse(p.prestartCoreThread());
282 <        assertEquals(2, p.getPoolSize());
283 <        joinPool(p);
275 >        final ThreadPoolExecutor p =
276 >            new CustomTPE(2, 6,
277 >                          LONG_DELAY_MS, MILLISECONDS,
278 >                          new ArrayBlockingQueue<Runnable>(10));
279 >        try (PoolCleaner cleaner = cleaner(p)) {
280 >            assertEquals(0, p.getPoolSize());
281 >            assertTrue(p.prestartCoreThread());
282 >            assertEquals(1, p.getPoolSize());
283 >            assertTrue(p.prestartCoreThread());
284 >            assertEquals(2, p.getPoolSize());
285 >            assertFalse(p.prestartCoreThread());
286 >            assertEquals(2, p.getPoolSize());
287 >            p.setCorePoolSize(4);
288 >            assertTrue(p.prestartCoreThread());
289 >            assertEquals(3, p.getPoolSize());
290 >            assertTrue(p.prestartCoreThread());
291 >            assertEquals(4, p.getPoolSize());
292 >            assertFalse(p.prestartCoreThread());
293 >            assertEquals(4, p.getPoolSize());
294 >        }
295      }
296  
297      /**
298       * prestartAllCoreThreads starts all corePoolSize threads
299       */
300      public void testPrestartAllCoreThreads() {
301 <        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
302 <        assertEquals(0, p.getPoolSize());
303 <        p.prestartAllCoreThreads();
304 <        assertEquals(2, p.getPoolSize());
305 <        p.prestartAllCoreThreads();
306 <        assertEquals(2, p.getPoolSize());
307 <        joinPool(p);
301 >        final ThreadPoolExecutor p =
302 >            new CustomTPE(2, 6,
303 >                          LONG_DELAY_MS, MILLISECONDS,
304 >                          new ArrayBlockingQueue<Runnable>(10));
305 >        try (PoolCleaner cleaner = cleaner(p)) {
306 >            assertEquals(0, p.getPoolSize());
307 >            p.prestartAllCoreThreads();
308 >            assertEquals(2, p.getPoolSize());
309 >            p.prestartAllCoreThreads();
310 >            assertEquals(2, p.getPoolSize());
311 >            p.setCorePoolSize(4);
312 >            p.prestartAllCoreThreads();
313 >            assertEquals(4, p.getPoolSize());
314 >            p.prestartAllCoreThreads();
315 >            assertEquals(4, p.getPoolSize());
316 >        }
317      }
318  
319      /**
# Line 274 | Line 325 | public class ThreadPoolExecutorSubclassT
325              new CustomTPE(2, 2,
326                            LONG_DELAY_MS, MILLISECONDS,
327                            new ArrayBlockingQueue<Runnable>(10));
328 <        final CountDownLatch threadStarted = new CountDownLatch(1);
329 <        final CountDownLatch threadProceed = new CountDownLatch(1);
330 <        final CountDownLatch threadDone = new CountDownLatch(1);
331 <        try {
328 >        try (PoolCleaner cleaner = cleaner(p)) {
329 >            final CountDownLatch threadStarted = new CountDownLatch(1);
330 >            final CountDownLatch threadProceed = new CountDownLatch(1);
331 >            final CountDownLatch threadDone = new CountDownLatch(1);
332              assertEquals(0, p.getCompletedTaskCount());
333              p.execute(new CheckedRunnable() {
334                  public void realRun() throws InterruptedException {
# Line 286 | Line 337 | public class ThreadPoolExecutorSubclassT
337                      threadProceed.await();
338                      threadDone.countDown();
339                  }});
340 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
340 >            await(threadStarted);
341              assertEquals(0, p.getCompletedTaskCount());
342              threadProceed.countDown();
343              threadDone.await();
344 <            Thread.sleep(SHORT_DELAY_MS);
345 <            assertEquals(1, p.getCompletedTaskCount());
346 <        } finally {
347 <            joinPool(p);
344 >            long startTime = System.nanoTime();
345 >            while (p.getCompletedTaskCount() != 1) {
346 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
347 >                    fail("timed out");
348 >                Thread.yield();
349 >            }
350          }
351      }
352  
# Line 301 | Line 354 | public class ThreadPoolExecutorSubclassT
354       * getCorePoolSize returns size given in constructor if not otherwise set
355       */
356      public void testGetCorePoolSize() {
357 <        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
358 <        assertEquals(1, p.getCorePoolSize());
359 <        joinPool(p);
357 >        final ThreadPoolExecutor p =
358 >            new CustomTPE(1, 1,
359 >                          LONG_DELAY_MS, MILLISECONDS,
360 >                          new ArrayBlockingQueue<Runnable>(10));
361 >        try (PoolCleaner cleaner = cleaner(p)) {
362 >            assertEquals(1, p.getCorePoolSize());
363 >        }
364      }
365  
366      /**
367       * getKeepAliveTime returns value given in constructor if not otherwise set
368       */
369      public void testGetKeepAliveTime() {
370 <        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
371 <        assertEquals(1, p.getKeepAliveTime(TimeUnit.SECONDS));
372 <        joinPool(p);
370 >        final ThreadPoolExecutor p =
371 >            new CustomTPE(2, 2,
372 >                          1000, MILLISECONDS,
373 >                          new ArrayBlockingQueue<Runnable>(10));
374 >        try (PoolCleaner cleaner = cleaner(p)) {
375 >            assertEquals(1, p.getKeepAliveTime(SECONDS));
376 >        }
377      }
378  
318
379      /**
380       * getThreadFactory returns factory in constructor if not set
381       */
382      public void testGetThreadFactory() {
383 <        ThreadFactory tf = new SimpleThreadFactory();
384 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), tf, new NoOpREHandler());
385 <        assertSame(tf, p.getThreadFactory());
386 <        joinPool(p);
383 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
384 >        final ThreadPoolExecutor p =
385 >            new CustomTPE(1, 2,
386 >                          LONG_DELAY_MS, MILLISECONDS,
387 >                          new ArrayBlockingQueue<Runnable>(10),
388 >                          threadFactory,
389 >                          new NoOpREHandler());
390 >        try (PoolCleaner cleaner = cleaner(p)) {
391 >            assertSame(threadFactory, p.getThreadFactory());
392 >        }
393      }
394  
395      /**
396       * setThreadFactory sets the thread factory returned by getThreadFactory
397       */
398      public void testSetThreadFactory() {
399 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
400 <        ThreadFactory tf = new SimpleThreadFactory();
401 <        p.setThreadFactory(tf);
402 <        assertSame(tf, p.getThreadFactory());
403 <        joinPool(p);
399 >        final ThreadPoolExecutor p =
400 >            new CustomTPE(1, 2,
401 >                          LONG_DELAY_MS, MILLISECONDS,
402 >                          new ArrayBlockingQueue<Runnable>(10));
403 >        try (PoolCleaner cleaner = cleaner(p)) {
404 >            ThreadFactory threadFactory = new SimpleThreadFactory();
405 >            p.setThreadFactory(threadFactory);
406 >            assertSame(threadFactory, p.getThreadFactory());
407 >        }
408      }
409  
340
410      /**
411       * setThreadFactory(null) throws NPE
412       */
413      public void testSetThreadFactoryNull() {
414 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
415 <        try {
416 <            p.setThreadFactory(null);
417 <            shouldThrow();
418 <        } catch (NullPointerException success) {
419 <        } finally {
420 <            joinPool(p);
414 >        final ThreadPoolExecutor p =
415 >            new CustomTPE(1, 2,
416 >                          LONG_DELAY_MS, MILLISECONDS,
417 >                          new ArrayBlockingQueue<Runnable>(10));
418 >        try (PoolCleaner cleaner = cleaner(p)) {
419 >            try {
420 >                p.setThreadFactory(null);
421 >                shouldThrow();
422 >            } catch (NullPointerException success) {}
423          }
424      }
425  
# Line 356 | Line 427 | public class ThreadPoolExecutorSubclassT
427       * getRejectedExecutionHandler returns handler in constructor if not set
428       */
429      public void testGetRejectedExecutionHandler() {
430 <        RejectedExecutionHandler h = new NoOpREHandler();
431 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), h);
432 <        assertSame(h, p.getRejectedExecutionHandler());
433 <        joinPool(p);
430 >        final RejectedExecutionHandler handler = new NoOpREHandler();
431 >        final ThreadPoolExecutor p =
432 >            new CustomTPE(1, 2,
433 >                          LONG_DELAY_MS, MILLISECONDS,
434 >                          new ArrayBlockingQueue<Runnable>(10),
435 >                          handler);
436 >        try (PoolCleaner cleaner = cleaner(p)) {
437 >            assertSame(handler, p.getRejectedExecutionHandler());
438 >        }
439      }
440  
441      /**
# Line 367 | Line 443 | public class ThreadPoolExecutorSubclassT
443       * getRejectedExecutionHandler
444       */
445      public void testSetRejectedExecutionHandler() {
446 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
447 <        RejectedExecutionHandler h = new NoOpREHandler();
448 <        p.setRejectedExecutionHandler(h);
449 <        assertSame(h, p.getRejectedExecutionHandler());
450 <        joinPool(p);
446 >        final ThreadPoolExecutor p =
447 >            new CustomTPE(1, 2,
448 >                          LONG_DELAY_MS, MILLISECONDS,
449 >                          new ArrayBlockingQueue<Runnable>(10));
450 >        try (PoolCleaner cleaner = cleaner(p)) {
451 >            RejectedExecutionHandler handler = new NoOpREHandler();
452 >            p.setRejectedExecutionHandler(handler);
453 >            assertSame(handler, p.getRejectedExecutionHandler());
454 >        }
455      }
456  
377
457      /**
458       * setRejectedExecutionHandler(null) throws NPE
459       */
460      public void testSetRejectedExecutionHandlerNull() {
461 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
462 <        try {
463 <            p.setRejectedExecutionHandler(null);
464 <            shouldThrow();
465 <        } catch (NullPointerException success) {
466 <        } finally {
467 <            joinPool(p);
461 >        final ThreadPoolExecutor p =
462 >            new CustomTPE(1, 2,
463 >                          LONG_DELAY_MS, MILLISECONDS,
464 >                          new ArrayBlockingQueue<Runnable>(10));
465 >        try (PoolCleaner cleaner = cleaner(p)) {
466 >            try {
467 >                p.setRejectedExecutionHandler(null);
468 >                shouldThrow();
469 >            } catch (NullPointerException success) {}
470          }
471      }
472  
392
473      /**
474       * getLargestPoolSize increases, but doesn't overestimate, when
475       * multiple threads active
# Line 400 | Line 480 | public class ThreadPoolExecutorSubclassT
480              new CustomTPE(THREADS, THREADS,
481                            LONG_DELAY_MS, MILLISECONDS,
482                            new ArrayBlockingQueue<Runnable>(10));
483 <        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
484 <        final CountDownLatch done = new CountDownLatch(1);
485 <        try {
483 >        try (PoolCleaner cleaner = cleaner(p)) {
484 >            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
485 >            final CountDownLatch done = new CountDownLatch(1);
486              assertEquals(0, p.getLargestPoolSize());
487              for (int i = 0; i < THREADS; i++)
488                  p.execute(new CheckedRunnable() {
# Line 411 | Line 491 | public class ThreadPoolExecutorSubclassT
491                          done.await();
492                          assertEquals(THREADS, p.getLargestPoolSize());
493                      }});
494 <            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
415 <            assertEquals(THREADS, p.getLargestPoolSize());
416 <        } finally {
417 <            done.countDown();
418 <            joinPool(p);
494 >            assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
495              assertEquals(THREADS, p.getLargestPoolSize());
496 +            done.countDown();   // release pool
497          }
498 +        assertEquals(THREADS, p.getLargestPoolSize());
499      }
500  
501      /**
# Line 425 | Line 503 | public class ThreadPoolExecutorSubclassT
503       * otherwise set
504       */
505      public void testGetMaximumPoolSize() {
506 <        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
507 <        assertEquals(2, p.getMaximumPoolSize());
508 <        joinPool(p);
506 >        final ThreadPoolExecutor p =
507 >            new CustomTPE(2, 3,
508 >                          LONG_DELAY_MS, MILLISECONDS,
509 >                          new ArrayBlockingQueue<Runnable>(10));
510 >        try (PoolCleaner cleaner = cleaner(p)) {
511 >            assertEquals(3, p.getMaximumPoolSize());
512 >            p.setMaximumPoolSize(5);
513 >            assertEquals(5, p.getMaximumPoolSize());
514 >            p.setMaximumPoolSize(4);
515 >            assertEquals(4, p.getMaximumPoolSize());
516 >        }
517      }
518  
519      /**
# Line 439 | Line 525 | public class ThreadPoolExecutorSubclassT
525              new CustomTPE(1, 1,
526                            LONG_DELAY_MS, MILLISECONDS,
527                            new ArrayBlockingQueue<Runnable>(10));
528 <        final CountDownLatch threadStarted = new CountDownLatch(1);
529 <        final CountDownLatch done = new CountDownLatch(1);
530 <        try {
528 >        try (PoolCleaner cleaner = cleaner(p)) {
529 >            final CountDownLatch threadStarted = new CountDownLatch(1);
530 >            final CountDownLatch done = new CountDownLatch(1);
531              assertEquals(0, p.getPoolSize());
532              p.execute(new CheckedRunnable() {
533                  public void realRun() throws InterruptedException {
# Line 449 | Line 535 | public class ThreadPoolExecutorSubclassT
535                      assertEquals(1, p.getPoolSize());
536                      done.await();
537                  }});
538 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
538 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
539              assertEquals(1, p.getPoolSize());
540 <        } finally {
455 <            done.countDown();
456 <            joinPool(p);
540 >            done.countDown();   // release pool
541          }
542      }
543  
# Line 461 | Line 545 | public class ThreadPoolExecutorSubclassT
545       * getTaskCount increases, but doesn't overestimate, when tasks submitted
546       */
547      public void testGetTaskCount() throws InterruptedException {
548 +        final int TASKS = 3;
549 +        final CountDownLatch done = new CountDownLatch(1);
550          final ThreadPoolExecutor p =
551              new CustomTPE(1, 1,
552                            LONG_DELAY_MS, MILLISECONDS,
553                            new ArrayBlockingQueue<Runnable>(10));
554 <        final CountDownLatch threadStarted = new CountDownLatch(1);
555 <        final CountDownLatch done = new CountDownLatch(1);
470 <        try {
554 >        try (PoolCleaner cleaner = cleaner(p, done)) {
555 >            final CountDownLatch threadStarted = new CountDownLatch(1);
556              assertEquals(0, p.getTaskCount());
557 +            assertEquals(0, p.getCompletedTaskCount());
558              p.execute(new CheckedRunnable() {
559                  public void realRun() throws InterruptedException {
560                      threadStarted.countDown();
475                    assertEquals(1, p.getTaskCount());
561                      done.await();
562                  }});
563 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
563 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
564              assertEquals(1, p.getTaskCount());
565 <        } finally {
566 <            done.countDown();
567 <            joinPool(p);
565 >            assertEquals(0, p.getCompletedTaskCount());
566 >            for (int i = 0; i < TASKS; i++) {
567 >                assertEquals(1 + i, p.getTaskCount());
568 >                p.execute(new CheckedRunnable() {
569 >                    public void realRun() throws InterruptedException {
570 >                        threadStarted.countDown();
571 >                        assertEquals(1 + TASKS, p.getTaskCount());
572 >                        done.await();
573 >                    }});
574 >            }
575 >            assertEquals(1 + TASKS, p.getTaskCount());
576 >            assertEquals(0, p.getCompletedTaskCount());
577          }
578 +        assertEquals(1 + TASKS, p.getTaskCount());
579 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
580      }
581  
582      /**
583 <     * isShutDown is false before shutdown, true after
583 >     * isShutdown is false before shutdown, true after
584       */
585      public void testIsShutdown() {
586 <
587 <        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
588 <        assertFalse(p.isShutdown());
589 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
590 <        assertTrue(p.isShutdown());
591 <        joinPool(p);
586 >        final ThreadPoolExecutor p =
587 >            new CustomTPE(1, 1,
588 >                          LONG_DELAY_MS, MILLISECONDS,
589 >                          new ArrayBlockingQueue<Runnable>(10));
590 >        try (PoolCleaner cleaner = cleaner(p)) {
591 >            assertFalse(p.isShutdown());
592 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
593 >            assertTrue(p.isShutdown());
594 >        }
595      }
596  
498
597      /**
598       * isTerminated is false before termination, true after
599       */
# Line 504 | Line 602 | public class ThreadPoolExecutorSubclassT
602              new CustomTPE(1, 1,
603                            LONG_DELAY_MS, MILLISECONDS,
604                            new ArrayBlockingQueue<Runnable>(10));
605 <        final CountDownLatch threadStarted = new CountDownLatch(1);
606 <        final CountDownLatch done = new CountDownLatch(1);
607 <        try {
605 >        try (PoolCleaner cleaner = cleaner(p)) {
606 >            final CountDownLatch threadStarted = new CountDownLatch(1);
607 >            final CountDownLatch done = new CountDownLatch(1);
608              assertFalse(p.isTerminating());
609              p.execute(new CheckedRunnable() {
610                  public void realRun() throws InterruptedException {
# Line 514 | Line 612 | public class ThreadPoolExecutorSubclassT
612                      threadStarted.countDown();
613                      done.await();
614                  }});
615 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
615 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
616              assertFalse(p.isTerminating());
617              done.countDown();
520        } finally {
618              try { p.shutdown(); } catch (SecurityException ok) { return; }
619 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
620 +            assertTrue(p.isTerminated());
621 +            assertFalse(p.isTerminating());
622          }
523        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
524        assertTrue(p.isTerminated());
525        assertFalse(p.isTerminating());
623      }
624  
625      /**
# Line 533 | Line 630 | public class ThreadPoolExecutorSubclassT
630              new CustomTPE(1, 1,
631                            LONG_DELAY_MS, MILLISECONDS,
632                            new ArrayBlockingQueue<Runnable>(10));
633 <        final CountDownLatch threadStarted = new CountDownLatch(1);
634 <        final CountDownLatch done = new CountDownLatch(1);
635 <        try {
633 >        try (PoolCleaner cleaner = cleaner(p)) {
634 >            final CountDownLatch threadStarted = new CountDownLatch(1);
635 >            final CountDownLatch done = new CountDownLatch(1);
636              assertFalse(p.isTerminating());
637              p.execute(new CheckedRunnable() {
638                  public void realRun() throws InterruptedException {
# Line 543 | Line 640 | public class ThreadPoolExecutorSubclassT
640                      threadStarted.countDown();
641                      done.await();
642                  }});
643 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
643 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
644              assertFalse(p.isTerminating());
645              done.countDown();
549        } finally {
646              try { p.shutdown(); } catch (SecurityException ok) { return; }
647 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
648 +            assertTrue(p.isTerminated());
649 +            assertFalse(p.isTerminating());
650          }
552        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
553        assertTrue(p.isTerminated());
554        assertFalse(p.isTerminating());
651      }
652  
653      /**
# Line 563 | Line 659 | public class ThreadPoolExecutorSubclassT
659              new CustomTPE(1, 1,
660                            LONG_DELAY_MS, MILLISECONDS,
661                            q);
662 <        final CountDownLatch threadStarted = new CountDownLatch(1);
663 <        final CountDownLatch done = new CountDownLatch(1);
664 <        try {
662 >        try (PoolCleaner cleaner = cleaner(p)) {
663 >            final CountDownLatch threadStarted = new CountDownLatch(1);
664 >            final CountDownLatch done = new CountDownLatch(1);
665              FutureTask[] tasks = new FutureTask[5];
666              for (int i = 0; i < tasks.length; i++) {
667                  Callable task = new CheckedCallable<Boolean>() {
# Line 578 | Line 674 | public class ThreadPoolExecutorSubclassT
674                  tasks[i] = new FutureTask(task);
675                  p.execute(tasks[i]);
676              }
677 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
677 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
678              assertSame(q, p.getQueue());
679              assertFalse(q.contains(tasks[0]));
680              assertTrue(q.contains(tasks[tasks.length - 1]));
681              assertEquals(tasks.length - 1, q.size());
586        } finally {
682              done.countDown();
588            joinPool(p);
683          }
684      }
685  
# Line 598 | Line 692 | public class ThreadPoolExecutorSubclassT
692              new CustomTPE(1, 1,
693                            LONG_DELAY_MS, MILLISECONDS,
694                            q);
695 <        Runnable[] tasks = new Runnable[6];
696 <        final CountDownLatch threadStarted = new CountDownLatch(1);
697 <        final CountDownLatch done = new CountDownLatch(1);
698 <        try {
695 >        try (PoolCleaner cleaner = cleaner(p)) {
696 >            Runnable[] tasks = new Runnable[6];
697 >            final CountDownLatch threadStarted = new CountDownLatch(1);
698 >            final CountDownLatch done = new CountDownLatch(1);
699              for (int i = 0; i < tasks.length; i++) {
700                  tasks[i] = new CheckedRunnable() {
701 <                        public void realRun() throws InterruptedException {
702 <                            threadStarted.countDown();
703 <                            done.await();
704 <                        }};
701 >                    public void realRun() throws InterruptedException {
702 >                        threadStarted.countDown();
703 >                        done.await();
704 >                    }};
705                  p.execute(tasks[i]);
706              }
707 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
707 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
708              assertFalse(p.remove(tasks[0]));
709              assertTrue(q.contains(tasks[4]));
710              assertTrue(q.contains(tasks[3]));
# Line 620 | Line 714 | public class ThreadPoolExecutorSubclassT
714              assertTrue(q.contains(tasks[3]));
715              assertTrue(p.remove(tasks[3]));
716              assertFalse(q.contains(tasks[3]));
623        } finally {
717              done.countDown();
625            joinPool(p);
718          }
719      }
720  
# Line 637 | Line 729 | public class ThreadPoolExecutorSubclassT
729              new CustomTPE(1, 1,
730                            LONG_DELAY_MS, MILLISECONDS,
731                            q);
732 <        FutureTask[] tasks = new FutureTask[5];
733 <        try {
732 >        try (PoolCleaner cleaner = cleaner(p)) {
733 >            FutureTask[] tasks = new FutureTask[5];
734              for (int i = 0; i < tasks.length; i++) {
735                  Callable task = new CheckedCallable<Boolean>() {
736                      public Boolean realCall() throws InterruptedException {
# Line 649 | Line 741 | public class ThreadPoolExecutorSubclassT
741                  tasks[i] = new FutureTask(task);
742                  p.execute(tasks[i]);
743              }
744 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
744 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
745              assertEquals(tasks.length, p.getTaskCount());
746              assertEquals(tasks.length - 1, q.size());
747              assertEquals(1L, p.getActiveCount());
# Line 662 | Line 754 | public class ThreadPoolExecutorSubclassT
754              p.purge();         // Nothing to do
755              assertEquals(tasks.length - 3, q.size());
756              assertEquals(tasks.length - 2, p.getTaskCount());
665        } finally {
757              done.countDown();
667            joinPool(p);
758          }
759      }
760  
761      /**
762 <     * shutDownNow returns a list containing tasks that were not run
762 >     * shutdownNow returns a list containing tasks that were not run,
763 >     * and those tasks are drained from the queue
764       */
765 <    public void testShutDownNow() {
766 <        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
767 <        List l;
768 <        try {
769 <            for (int i = 0; i < 5; i++)
770 <                p.execute(new MediumPossiblyInterruptedRunnable());
771 <        }
772 <        finally {
765 >    public void testShutdownNow() throws InterruptedException {
766 >        final int poolSize = 2;
767 >        final int count = 5;
768 >        final AtomicInteger ran = new AtomicInteger(0);
769 >        final ThreadPoolExecutor p =
770 >            new CustomTPE(poolSize, poolSize,
771 >                          LONG_DELAY_MS, MILLISECONDS,
772 >                          new ArrayBlockingQueue<Runnable>(10));
773 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
774 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
775 >            threadsStarted.countDown();
776              try {
777 <                l = p.shutdownNow();
778 <            } catch (SecurityException ok) { return; }
777 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
778 >            } catch (InterruptedException success) {}
779 >            ran.getAndIncrement();
780 >        }};
781 >        for (int i = 0; i < count; i++)
782 >            p.execute(waiter);
783 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
784 >        assertEquals(poolSize, p.getActiveCount());
785 >        assertEquals(0, p.getCompletedTaskCount());
786 >        final List<Runnable> queuedTasks;
787 >        try {
788 >            queuedTasks = p.shutdownNow();
789 >        } catch (SecurityException ok) {
790 >            return; // Allowed in case test doesn't have privs
791          }
792          assertTrue(p.isShutdown());
793 <        assertTrue(l.size() <= 4);
793 >        assertTrue(p.getQueue().isEmpty());
794 >        assertEquals(count - poolSize, queuedTasks.size());
795 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
796 >        assertTrue(p.isTerminated());
797 >        assertEquals(poolSize, ran.get());
798 >        assertEquals(poolSize, p.getCompletedTaskCount());
799      }
800  
801      // Exception Tests
802  
692
803      /**
804       * Constructor throws if corePoolSize argument is less than zero
805       */
806      public void testConstructor1() {
807          try {
808 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
808 >            new CustomTPE(-1, 1, 1L, SECONDS,
809 >                          new ArrayBlockingQueue<Runnable>(10));
810              shouldThrow();
811          } catch (IllegalArgumentException success) {}
812      }
# Line 705 | Line 816 | public class ThreadPoolExecutorSubclassT
816       */
817      public void testConstructor2() {
818          try {
819 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
819 >            new CustomTPE(1, -1, 1L, SECONDS,
820 >                          new ArrayBlockingQueue<Runnable>(10));
821              shouldThrow();
822          } catch (IllegalArgumentException success) {}
823      }
# Line 715 | Line 827 | public class ThreadPoolExecutorSubclassT
827       */
828      public void testConstructor3() {
829          try {
830 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
830 >            new CustomTPE(1, 0, 1L, SECONDS,
831 >                          new ArrayBlockingQueue<Runnable>(10));
832              shouldThrow();
833          } catch (IllegalArgumentException success) {}
834      }
# Line 725 | Line 838 | public class ThreadPoolExecutorSubclassT
838       */
839      public void testConstructor4() {
840          try {
841 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
841 >            new CustomTPE(1, 2, -1L, SECONDS,
842 >                          new ArrayBlockingQueue<Runnable>(10));
843              shouldThrow();
844          } catch (IllegalArgumentException success) {}
845      }
# Line 735 | Line 849 | public class ThreadPoolExecutorSubclassT
849       */
850      public void testConstructor5() {
851          try {
852 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
852 >            new CustomTPE(2, 1, 1L, SECONDS,
853 >                          new ArrayBlockingQueue<Runnable>(10));
854              shouldThrow();
855          } catch (IllegalArgumentException success) {}
856      }
# Line 745 | Line 860 | public class ThreadPoolExecutorSubclassT
860       */
861      public void testConstructorNullPointerException() {
862          try {
863 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
863 >            new CustomTPE(1, 2, 1L, SECONDS, null);
864              shouldThrow();
865          } catch (NullPointerException success) {}
866      }
867  
753
754
868      /**
869       * Constructor throws if corePoolSize argument is less than zero
870       */
871      public void testConstructor6() {
872          try {
873 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
873 >            new CustomTPE(-1, 1, 1L, SECONDS,
874 >                          new ArrayBlockingQueue<Runnable>(10),
875 >                          new SimpleThreadFactory());
876              shouldThrow();
877          } catch (IllegalArgumentException success) {}
878      }
# Line 767 | Line 882 | public class ThreadPoolExecutorSubclassT
882       */
883      public void testConstructor7() {
884          try {
885 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
885 >            new CustomTPE(1,-1, 1L, SECONDS,
886 >                          new ArrayBlockingQueue<Runnable>(10),
887 >                          new SimpleThreadFactory());
888              shouldThrow();
889          } catch (IllegalArgumentException success) {}
890      }
# Line 777 | Line 894 | public class ThreadPoolExecutorSubclassT
894       */
895      public void testConstructor8() {
896          try {
897 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
897 >            new CustomTPE(1, 0, 1L, SECONDS,
898 >                          new ArrayBlockingQueue<Runnable>(10),
899 >                          new SimpleThreadFactory());
900              shouldThrow();
901          } catch (IllegalArgumentException success) {}
902      }
# Line 787 | Line 906 | public class ThreadPoolExecutorSubclassT
906       */
907      public void testConstructor9() {
908          try {
909 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
909 >            new CustomTPE(1, 2, -1L, SECONDS,
910 >                          new ArrayBlockingQueue<Runnable>(10),
911 >                          new SimpleThreadFactory());
912              shouldThrow();
913          } catch (IllegalArgumentException success) {}
914      }
# Line 797 | Line 918 | public class ThreadPoolExecutorSubclassT
918       */
919      public void testConstructor10() {
920          try {
921 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
921 >            new CustomTPE(2, 1, 1L, SECONDS,
922 >                          new ArrayBlockingQueue<Runnable>(10),
923 >                          new SimpleThreadFactory());
924              shouldThrow();
925          } catch (IllegalArgumentException success) {}
926      }
# Line 807 | Line 930 | public class ThreadPoolExecutorSubclassT
930       */
931      public void testConstructorNullPointerException2() {
932          try {
933 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
933 >            new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
934              shouldThrow();
935          } catch (NullPointerException success) {}
936      }
# Line 817 | Line 940 | public class ThreadPoolExecutorSubclassT
940       */
941      public void testConstructorNullPointerException3() {
942          try {
943 <            ThreadFactory f = null;
944 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
943 >            new CustomTPE(1, 2, 1L, SECONDS,
944 >                          new ArrayBlockingQueue<Runnable>(10),
945 >                          (ThreadFactory) null);
946              shouldThrow();
947          } catch (NullPointerException success) {}
948      }
949  
826
950      /**
951       * Constructor throws if corePoolSize argument is less than zero
952       */
953      public void testConstructor11() {
954          try {
955 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
955 >            new CustomTPE(-1, 1, 1L, SECONDS,
956 >                          new ArrayBlockingQueue<Runnable>(10),
957 >                          new NoOpREHandler());
958              shouldThrow();
959          } catch (IllegalArgumentException success) {}
960      }
# Line 839 | Line 964 | public class ThreadPoolExecutorSubclassT
964       */
965      public void testConstructor12() {
966          try {
967 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
967 >            new CustomTPE(1, -1, 1L, SECONDS,
968 >                          new ArrayBlockingQueue<Runnable>(10),
969 >                          new NoOpREHandler());
970              shouldThrow();
971          } catch (IllegalArgumentException success) {}
972      }
# Line 849 | Line 976 | public class ThreadPoolExecutorSubclassT
976       */
977      public void testConstructor13() {
978          try {
979 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
979 >            new CustomTPE(1, 0, 1L, SECONDS,
980 >                          new ArrayBlockingQueue<Runnable>(10),
981 >                          new NoOpREHandler());
982              shouldThrow();
983          } catch (IllegalArgumentException success) {}
984      }
# Line 859 | Line 988 | public class ThreadPoolExecutorSubclassT
988       */
989      public void testConstructor14() {
990          try {
991 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
991 >            new CustomTPE(1, 2, -1L, SECONDS,
992 >                          new ArrayBlockingQueue<Runnable>(10),
993 >                          new NoOpREHandler());
994              shouldThrow();
995          } catch (IllegalArgumentException success) {}
996      }
# Line 869 | Line 1000 | public class ThreadPoolExecutorSubclassT
1000       */
1001      public void testConstructor15() {
1002          try {
1003 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
1003 >            new CustomTPE(2, 1, 1L, SECONDS,
1004 >                          new ArrayBlockingQueue<Runnable>(10),
1005 >                          new NoOpREHandler());
1006              shouldThrow();
1007          } catch (IllegalArgumentException success) {}
1008      }
# Line 879 | Line 1012 | public class ThreadPoolExecutorSubclassT
1012       */
1013      public void testConstructorNullPointerException4() {
1014          try {
1015 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
1015 >            new CustomTPE(1, 2, 1L, SECONDS,
1016 >                          null,
1017 >                          new NoOpREHandler());
1018              shouldThrow();
1019          } catch (NullPointerException success) {}
1020      }
# Line 889 | Line 1024 | public class ThreadPoolExecutorSubclassT
1024       */
1025      public void testConstructorNullPointerException5() {
1026          try {
1027 <            RejectedExecutionHandler r = null;
1028 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
1027 >            new CustomTPE(1, 2, 1L, SECONDS,
1028 >                          new ArrayBlockingQueue<Runnable>(10),
1029 >                          (RejectedExecutionHandler) null);
1030              shouldThrow();
1031          } catch (NullPointerException success) {}
1032      }
1033  
898
1034      /**
1035       * Constructor throws if corePoolSize argument is less than zero
1036       */
1037      public void testConstructor16() {
1038          try {
1039 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1039 >            new CustomTPE(-1, 1, 1L, SECONDS,
1040 >                          new ArrayBlockingQueue<Runnable>(10),
1041 >                          new SimpleThreadFactory(),
1042 >                          new NoOpREHandler());
1043              shouldThrow();
1044          } catch (IllegalArgumentException success) {}
1045      }
# Line 911 | Line 1049 | public class ThreadPoolExecutorSubclassT
1049       */
1050      public void testConstructor17() {
1051          try {
1052 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1052 >            new CustomTPE(1, -1, 1L, SECONDS,
1053 >                          new ArrayBlockingQueue<Runnable>(10),
1054 >                          new SimpleThreadFactory(),
1055 >                          new NoOpREHandler());
1056              shouldThrow();
1057          } catch (IllegalArgumentException success) {}
1058      }
# Line 921 | Line 1062 | public class ThreadPoolExecutorSubclassT
1062       */
1063      public void testConstructor18() {
1064          try {
1065 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1065 >            new CustomTPE(1, 0, 1L, SECONDS,
1066 >                          new ArrayBlockingQueue<Runnable>(10),
1067 >                          new SimpleThreadFactory(),
1068 >                          new NoOpREHandler());
1069              shouldThrow();
1070          } catch (IllegalArgumentException success) {}
1071      }
# Line 931 | Line 1075 | public class ThreadPoolExecutorSubclassT
1075       */
1076      public void testConstructor19() {
1077          try {
1078 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1078 >            new CustomTPE(1, 2, -1L, SECONDS,
1079 >                          new ArrayBlockingQueue<Runnable>(10),
1080 >                          new SimpleThreadFactory(),
1081 >                          new NoOpREHandler());
1082              shouldThrow();
1083          } catch (IllegalArgumentException success) {}
1084      }
# Line 941 | Line 1088 | public class ThreadPoolExecutorSubclassT
1088       */
1089      public void testConstructor20() {
1090          try {
1091 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1091 >            new CustomTPE(2, 1, 1L, SECONDS,
1092 >                          new ArrayBlockingQueue<Runnable>(10),
1093 >                          new SimpleThreadFactory(),
1094 >                          new NoOpREHandler());
1095              shouldThrow();
1096          } catch (IllegalArgumentException success) {}
1097      }
# Line 951 | Line 1101 | public class ThreadPoolExecutorSubclassT
1101       */
1102      public void testConstructorNullPointerException6() {
1103          try {
1104 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1104 >            new CustomTPE(1, 2, 1L, SECONDS,
1105 >                          null,
1106 >                          new SimpleThreadFactory(),
1107 >                          new NoOpREHandler());
1108              shouldThrow();
1109          } catch (NullPointerException success) {}
1110      }
# Line 961 | Line 1114 | public class ThreadPoolExecutorSubclassT
1114       */
1115      public void testConstructorNullPointerException7() {
1116          try {
1117 <            RejectedExecutionHandler r = null;
1118 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1117 >            new CustomTPE(1, 2, 1L, SECONDS,
1118 >                          new ArrayBlockingQueue<Runnable>(10),
1119 >                          new SimpleThreadFactory(),
1120 >                          (RejectedExecutionHandler) null);
1121              shouldThrow();
1122          } catch (NullPointerException success) {}
1123      }
# Line 972 | Line 1127 | public class ThreadPoolExecutorSubclassT
1127       */
1128      public void testConstructorNullPointerException8() {
1129          try {
1130 <            new CustomTPE(1, 2,
976 <                          LONG_DELAY_MS, MILLISECONDS,
1130 >            new CustomTPE(1, 2, 1L, SECONDS,
1131                            new ArrayBlockingQueue<Runnable>(10),
1132                            (ThreadFactory) null,
1133                            new NoOpREHandler());
# Line 981 | Line 1135 | public class ThreadPoolExecutorSubclassT
1135          } catch (NullPointerException success) {}
1136      }
1137  
984
1138      /**
1139       * execute throws RejectedExecutionException if saturated.
1140       */
1141      public void testSaturatedExecute() {
1142 <        ThreadPoolExecutor p =
1142 >        final ThreadPoolExecutor p =
1143              new CustomTPE(1, 1,
1144                            LONG_DELAY_MS, MILLISECONDS,
1145                            new ArrayBlockingQueue<Runnable>(1));
1146 <        final CountDownLatch done = new CountDownLatch(1);
1147 <        try {
1146 >        try (PoolCleaner cleaner = cleaner(p)) {
1147 >            final CountDownLatch done = new CountDownLatch(1);
1148              Runnable task = new CheckedRunnable() {
1149                  public void realRun() throws InterruptedException {
1150                      done.await();
# Line 1005 | Line 1158 | public class ThreadPoolExecutorSubclassT
1158                  } catch (RejectedExecutionException success) {}
1159                  assertTrue(p.getTaskCount() <= 2);
1160              }
1008        } finally {
1161              done.countDown();
1010            joinPool(p);
1162          }
1163      }
1164  
# Line 1015 | Line 1166 | public class ThreadPoolExecutorSubclassT
1166       * executor using CallerRunsPolicy runs task if saturated.
1167       */
1168      public void testSaturatedExecute2() {
1169 <        RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1170 <        ThreadPoolExecutor p = new CustomTPE(1, 1,
1171 <                                             LONG_DELAY_MS, MILLISECONDS,
1172 <                                             new ArrayBlockingQueue<Runnable>(1),
1173 <                                             h);
1174 <        try {
1169 >        final ThreadPoolExecutor p =
1170 >            new CustomTPE(1, 1,
1171 >                          LONG_DELAY_MS, MILLISECONDS,
1172 >                          new ArrayBlockingQueue<Runnable>(1),
1173 >                          new CustomTPE.CallerRunsPolicy());
1174 >        try (PoolCleaner cleaner = cleaner(p)) {
1175 >            final CountDownLatch done = new CountDownLatch(1);
1176 >            Runnable blocker = new CheckedRunnable() {
1177 >                public void realRun() throws InterruptedException {
1178 >                    done.await();
1179 >                }};
1180 >            p.execute(blocker);
1181              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1182 <            for (int i = 0; i < tasks.length; ++i)
1182 >            for (int i = 0; i < tasks.length; i++)
1183                  tasks[i] = new TrackedNoOpRunnable();
1184 <            TrackedLongRunnable mr = new TrackedLongRunnable();
1028 <            p.execute(mr);
1029 <            for (int i = 0; i < tasks.length; ++i)
1184 >            for (int i = 0; i < tasks.length; i++)
1185                  p.execute(tasks[i]);
1186 <            for (int i = 1; i < tasks.length; ++i)
1186 >            for (int i = 1; i < tasks.length; i++)
1187                  assertTrue(tasks[i].done);
1188 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1189 <        } finally {
1035 <            joinPool(p);
1188 >            assertFalse(tasks[0].done); // waiting in queue
1189 >            done.countDown();
1190          }
1191      }
1192  
# Line 1040 | Line 1194 | public class ThreadPoolExecutorSubclassT
1194       * executor using DiscardPolicy drops task if saturated.
1195       */
1196      public void testSaturatedExecute3() {
1197 <        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1198 <        ThreadPoolExecutor p =
1197 >        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1198 >        for (int i = 0; i < tasks.length; ++i)
1199 >            tasks[i] = new TrackedNoOpRunnable();
1200 >        final ThreadPoolExecutor p =
1201              new CustomTPE(1, 1,
1202                            LONG_DELAY_MS, MILLISECONDS,
1203                            new ArrayBlockingQueue<Runnable>(1),
1204 <                          h);
1205 <        try {
1206 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1207 <            for (int i = 0; i < tasks.length; ++i)
1208 <                tasks[i] = new TrackedNoOpRunnable();
1053 <            p.execute(new TrackedLongRunnable());
1204 >                          new CustomTPE.DiscardPolicy());
1205 >        try (PoolCleaner cleaner = cleaner(p)) {
1206 >            final CountDownLatch done = new CountDownLatch(1);
1207 >            p.execute(awaiter(done));
1208 >
1209              for (TrackedNoOpRunnable task : tasks)
1210                  p.execute(task);
1211 <            for (TrackedNoOpRunnable task : tasks)
1212 <                assertFalse(task.done);
1213 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1059 <        } finally {
1060 <            joinPool(p);
1211 >            for (int i = 1; i < tasks.length; i++)
1212 >                assertFalse(tasks[i].done);
1213 >            done.countDown();
1214          }
1215 +        for (int i = 1; i < tasks.length; i++)
1216 +            assertFalse(tasks[i].done);
1217 +        assertTrue(tasks[0].done); // was waiting in queue
1218      }
1219  
1220      /**
1221       * executor using DiscardOldestPolicy drops oldest task if saturated.
1222       */
1223      public void testSaturatedExecute4() {
1224 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1225 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1226 <        try {
1227 <            p.execute(new TrackedLongRunnable());
1228 <            TrackedLongRunnable r2 = new TrackedLongRunnable();
1224 >        final CountDownLatch done = new CountDownLatch(1);
1225 >        LatchAwaiter r1 = awaiter(done);
1226 >        LatchAwaiter r2 = awaiter(done);
1227 >        LatchAwaiter r3 = awaiter(done);
1228 >        final ThreadPoolExecutor p =
1229 >            new CustomTPE(1, 1,
1230 >                          LONG_DELAY_MS, MILLISECONDS,
1231 >                          new ArrayBlockingQueue<Runnable>(1),
1232 >                          new CustomTPE.DiscardOldestPolicy());
1233 >        try (PoolCleaner cleaner = cleaner(p)) {
1234 >            assertEquals(LatchAwaiter.NEW, r1.state);
1235 >            assertEquals(LatchAwaiter.NEW, r2.state);
1236 >            assertEquals(LatchAwaiter.NEW, r3.state);
1237 >            p.execute(r1);
1238              p.execute(r2);
1239              assertTrue(p.getQueue().contains(r2));
1075            TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1240              p.execute(r3);
1241              assertFalse(p.getQueue().contains(r2));
1242              assertTrue(p.getQueue().contains(r3));
1243 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1080 <        } finally {
1081 <            joinPool(p);
1243 >            done.countDown();
1244          }
1245 +        assertEquals(LatchAwaiter.DONE, r1.state);
1246 +        assertEquals(LatchAwaiter.NEW, r2.state);
1247 +        assertEquals(LatchAwaiter.DONE, r3.state);
1248      }
1249  
1250      /**
1251       * execute throws RejectedExecutionException if shutdown
1252       */
1253      public void testRejectedExecutionExceptionOnShutdown() {
1254 <        ThreadPoolExecutor p =
1255 <            new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1254 >        final ThreadPoolExecutor p =
1255 >            new CustomTPE(1, 1,
1256 >                          LONG_DELAY_MS, MILLISECONDS,
1257 >                          new ArrayBlockingQueue<Runnable>(1));
1258          try { p.shutdown(); } catch (SecurityException ok) { return; }
1259 <        try {
1260 <            p.execute(new NoOpRunnable());
1261 <            shouldThrow();
1262 <        } catch (RejectedExecutionException success) {}
1263 <
1264 <        joinPool(p);
1259 >        try (PoolCleaner cleaner = cleaner(p)) {
1260 >            try {
1261 >                p.execute(new NoOpRunnable());
1262 >                shouldThrow();
1263 >            } catch (RejectedExecutionException success) {}
1264 >        }
1265      }
1266  
1267      /**
1268       * execute using CallerRunsPolicy drops task on shutdown
1269       */
1270      public void testCallerRunsOnShutdown() {
1271 <        RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1272 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1273 <
1271 >        final ThreadPoolExecutor p =
1272 >            new CustomTPE(1, 1,
1273 >                          LONG_DELAY_MS, MILLISECONDS,
1274 >                          new ArrayBlockingQueue<Runnable>(1),
1275 >                          new CustomTPE.CallerRunsPolicy());
1276          try { p.shutdown(); } catch (SecurityException ok) { return; }
1277 <        try {
1277 >        try (PoolCleaner cleaner = cleaner(p)) {
1278              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1279              p.execute(r);
1280              assertFalse(r.done);
1112        } finally {
1113            joinPool(p);
1281          }
1282      }
1283  
# Line 1118 | Line 1285 | public class ThreadPoolExecutorSubclassT
1285       * execute using DiscardPolicy drops task on shutdown
1286       */
1287      public void testDiscardOnShutdown() {
1288 <        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1289 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1290 <
1288 >        final ThreadPoolExecutor p =
1289 >            new CustomTPE(1, 1,
1290 >                          LONG_DELAY_MS, MILLISECONDS,
1291 >                          new ArrayBlockingQueue<Runnable>(1),
1292 >                          new CustomTPE.DiscardPolicy());
1293          try { p.shutdown(); } catch (SecurityException ok) { return; }
1294 <        try {
1294 >        try (PoolCleaner cleaner = cleaner(p)) {
1295              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1296              p.execute(r);
1297              assertFalse(r.done);
1129        } finally {
1130            joinPool(p);
1298          }
1299      }
1300  
1134
1301      /**
1302       * execute using DiscardOldestPolicy drops task on shutdown
1303       */
1304      public void testDiscardOldestOnShutdown() {
1305 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1306 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1305 >        final ThreadPoolExecutor p =
1306 >            new CustomTPE(1, 1,
1307 >                          LONG_DELAY_MS, MILLISECONDS,
1308 >                          new ArrayBlockingQueue<Runnable>(1),
1309 >                          new CustomTPE.DiscardOldestPolicy());
1310  
1311          try { p.shutdown(); } catch (SecurityException ok) { return; }
1312 <        try {
1312 >        try (PoolCleaner cleaner = cleaner(p)) {
1313              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1314              p.execute(r);
1315              assertFalse(r.done);
1147        } finally {
1148            joinPool(p);
1316          }
1317      }
1318  
1152
1319      /**
1320       * execute(null) throws NPE
1321       */
1322      public void testExecuteNull() {
1323 <        ThreadPoolExecutor p = null;
1324 <        try {
1325 <            p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1326 <            p.execute(null);
1327 <            shouldThrow();
1328 <        } catch (NullPointerException success) {}
1329 <
1330 <        joinPool(p);
1323 >        final ThreadPoolExecutor p =
1324 >            new CustomTPE(1, 2,
1325 >                          1L, SECONDS,
1326 >                          new ArrayBlockingQueue<Runnable>(10));
1327 >        try (PoolCleaner cleaner = cleaner(p)) {
1328 >            try {
1329 >                p.execute(null);
1330 >                shouldThrow();
1331 >            } catch (NullPointerException success) {}
1332 >        }
1333      }
1334  
1335      /**
1336       * setCorePoolSize of negative value throws IllegalArgumentException
1337       */
1338      public void testCorePoolSizeIllegalArgumentException() {
1339 <        ThreadPoolExecutor p =
1340 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1341 <        try {
1342 <            p.setCorePoolSize(-1);
1343 <            shouldThrow();
1344 <        } catch (IllegalArgumentException success) {
1345 <        } finally {
1346 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1339 >        final ThreadPoolExecutor p =
1340 >            new CustomTPE(1, 2,
1341 >                          LONG_DELAY_MS, MILLISECONDS,
1342 >                          new ArrayBlockingQueue<Runnable>(10));
1343 >        try (PoolCleaner cleaner = cleaner(p)) {
1344 >            try {
1345 >                p.setCorePoolSize(-1);
1346 >                shouldThrow();
1347 >            } catch (IllegalArgumentException success) {}
1348          }
1180        joinPool(p);
1349      }
1350  
1351      /**
# Line 1185 | Line 1353 | public class ThreadPoolExecutorSubclassT
1353       * if given a value less the core pool size
1354       */
1355      public void testMaximumPoolSizeIllegalArgumentException() {
1356 <        ThreadPoolExecutor p =
1357 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1358 <        try {
1359 <            p.setMaximumPoolSize(1);
1360 <            shouldThrow();
1361 <        } catch (IllegalArgumentException success) {
1362 <        } finally {
1363 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1356 >        final ThreadPoolExecutor p =
1357 >            new CustomTPE(2, 3,
1358 >                          LONG_DELAY_MS, MILLISECONDS,
1359 >                          new ArrayBlockingQueue<Runnable>(10));
1360 >        try (PoolCleaner cleaner = cleaner(p)) {
1361 >            try {
1362 >                p.setMaximumPoolSize(1);
1363 >                shouldThrow();
1364 >            } catch (IllegalArgumentException success) {}
1365          }
1197        joinPool(p);
1366      }
1367  
1368      /**
# Line 1202 | Line 1370 | public class ThreadPoolExecutorSubclassT
1370       * if given a negative value
1371       */
1372      public void testMaximumPoolSizeIllegalArgumentException2() {
1373 <        ThreadPoolExecutor p =
1374 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1375 <        try {
1376 <            p.setMaximumPoolSize(-1);
1377 <            shouldThrow();
1378 <        } catch (IllegalArgumentException success) {
1379 <        } finally {
1380 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1373 >        final ThreadPoolExecutor p =
1374 >            new CustomTPE(2, 3,
1375 >                          LONG_DELAY_MS,
1376 >                          MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1377 >        try (PoolCleaner cleaner = cleaner(p)) {
1378 >            try {
1379 >                p.setMaximumPoolSize(-1);
1380 >                shouldThrow();
1381 >            } catch (IllegalArgumentException success) {}
1382          }
1214        joinPool(p);
1383      }
1384  
1217
1385      /**
1386       * setKeepAliveTime throws IllegalArgumentException
1387       * when given a negative value
1388       */
1389      public void testKeepAliveTimeIllegalArgumentException() {
1390 <        ThreadPoolExecutor p =
1391 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1392 <
1393 <        try {
1394 <            p.setKeepAliveTime(-1,MILLISECONDS);
1395 <            shouldThrow();
1396 <        } catch (IllegalArgumentException success) {
1397 <        } finally {
1398 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1390 >        final ThreadPoolExecutor p =
1391 >            new CustomTPE(2, 3,
1392 >                          LONG_DELAY_MS, MILLISECONDS,
1393 >                          new ArrayBlockingQueue<Runnable>(10));
1394 >        try (PoolCleaner cleaner = cleaner(p)) {
1395 >            try {
1396 >                p.setKeepAliveTime(-1, MILLISECONDS);
1397 >                shouldThrow();
1398 >            } catch (IllegalArgumentException success) {}
1399          }
1233        joinPool(p);
1400      }
1401  
1402      /**
# Line 1238 | Line 1404 | public class ThreadPoolExecutorSubclassT
1404       */
1405      public void testTerminated() {
1406          CustomTPE p = new CustomTPE();
1407 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
1408 <        assertTrue(p.terminatedCalled);
1409 <        joinPool(p);
1407 >        try (PoolCleaner cleaner = cleaner(p)) {
1408 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1409 >            assertTrue(p.terminatedCalled());
1410 >            assertTrue(p.isShutdown());
1411 >        }
1412      }
1413  
1414      /**
# Line 1248 | Line 1416 | public class ThreadPoolExecutorSubclassT
1416       */
1417      public void testBeforeAfter() throws InterruptedException {
1418          CustomTPE p = new CustomTPE();
1419 <        try {
1420 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1421 <            p.execute(r);
1422 <            Thread.sleep(SHORT_DELAY_MS);
1423 <            assertTrue(r.done);
1424 <            assertTrue(p.beforeCalled);
1425 <            assertTrue(p.afterCalled);
1426 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1427 <        } finally {
1428 <            joinPool(p);
1419 >        try (PoolCleaner cleaner = cleaner(p)) {
1420 >            final CountDownLatch done = new CountDownLatch(1);
1421 >            p.execute(new CheckedRunnable() {
1422 >                public void realRun() {
1423 >                    done.countDown();
1424 >                }});
1425 >            await(p.afterCalled);
1426 >            assertEquals(0, done.getCount());
1427 >            assertTrue(p.afterCalled());
1428 >            assertTrue(p.beforeCalled());
1429          }
1430      }
1431  
# Line 1265 | Line 1433 | public class ThreadPoolExecutorSubclassT
1433       * completed submit of callable returns result
1434       */
1435      public void testSubmitCallable() throws Exception {
1436 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1437 <        try {
1436 >        final ExecutorService e =
1437 >            new CustomTPE(2, 2,
1438 >                          LONG_DELAY_MS, MILLISECONDS,
1439 >                          new ArrayBlockingQueue<Runnable>(10));
1440 >        try (PoolCleaner cleaner = cleaner(e)) {
1441              Future<String> future = e.submit(new StringTask());
1442              String result = future.get();
1443              assertSame(TEST_STRING, result);
1273        } finally {
1274            joinPool(e);
1444          }
1445      }
1446  
# Line 1279 | Line 1448 | public class ThreadPoolExecutorSubclassT
1448       * completed submit of runnable returns successfully
1449       */
1450      public void testSubmitRunnable() throws Exception {
1451 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1452 <        try {
1451 >        final ExecutorService e =
1452 >            new CustomTPE(2, 2,
1453 >                          LONG_DELAY_MS, MILLISECONDS,
1454 >                          new ArrayBlockingQueue<Runnable>(10));
1455 >        try (PoolCleaner cleaner = cleaner(e)) {
1456              Future<?> future = e.submit(new NoOpRunnable());
1457              future.get();
1458              assertTrue(future.isDone());
1287        } finally {
1288            joinPool(e);
1459          }
1460      }
1461  
# Line 1293 | Line 1463 | public class ThreadPoolExecutorSubclassT
1463       * completed submit of (runnable, result) returns result
1464       */
1465      public void testSubmitRunnable2() throws Exception {
1466 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1467 <        try {
1466 >        final ExecutorService e =
1467 >            new CustomTPE(2, 2,
1468 >                          LONG_DELAY_MS, MILLISECONDS,
1469 >                          new ArrayBlockingQueue<Runnable>(10));
1470 >        try (PoolCleaner cleaner = cleaner(e)) {
1471              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1472              String result = future.get();
1473              assertSame(TEST_STRING, result);
1301        } finally {
1302            joinPool(e);
1474          }
1475      }
1476  
1306
1477      /**
1478       * invokeAny(null) throws NPE
1479       */
1480      public void testInvokeAny1() throws Exception {
1481 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1482 <        try {
1483 <            e.invokeAny(null);
1484 <            shouldThrow();
1485 <        } catch (NullPointerException success) {
1486 <        } finally {
1487 <            joinPool(e);
1481 >        final ExecutorService e =
1482 >            new CustomTPE(2, 2,
1483 >                          LONG_DELAY_MS, MILLISECONDS,
1484 >                          new ArrayBlockingQueue<Runnable>(10));
1485 >        try (PoolCleaner cleaner = cleaner(e)) {
1486 >            try {
1487 >                e.invokeAny(null);
1488 >                shouldThrow();
1489 >            } catch (NullPointerException success) {}
1490          }
1491      }
1492  
# Line 1322 | Line 1494 | public class ThreadPoolExecutorSubclassT
1494       * invokeAny(empty collection) throws IAE
1495       */
1496      public void testInvokeAny2() throws Exception {
1497 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1498 <        try {
1499 <            e.invokeAny(new ArrayList<Callable<String>>());
1500 <            shouldThrow();
1501 <        } catch (IllegalArgumentException success) {
1502 <        } finally {
1503 <            joinPool(e);
1497 >        final ExecutorService e =
1498 >            new CustomTPE(2, 2,
1499 >                          LONG_DELAY_MS, MILLISECONDS,
1500 >                          new ArrayBlockingQueue<Runnable>(10));
1501 >        try (PoolCleaner cleaner = cleaner(e)) {
1502 >            try {
1503 >                e.invokeAny(new ArrayList<Callable<String>>());
1504 >                shouldThrow();
1505 >            } catch (IllegalArgumentException success) {}
1506          }
1507      }
1508  
# Line 1337 | Line 1511 | public class ThreadPoolExecutorSubclassT
1511       */
1512      public void testInvokeAny3() throws Exception {
1513          CountDownLatch latch = new CountDownLatch(1);
1514 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1515 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1516 <        l.add(latchAwaitingStringTask(latch));
1517 <        l.add(null);
1518 <        try {
1519 <            e.invokeAny(l);
1520 <            shouldThrow();
1521 <        } catch (NullPointerException success) {
1522 <        } finally {
1514 >        final ExecutorService e =
1515 >            new CustomTPE(2, 2,
1516 >                          LONG_DELAY_MS, MILLISECONDS,
1517 >                          new ArrayBlockingQueue<Runnable>(10));
1518 >        try (PoolCleaner cleaner = cleaner(e)) {
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              latch.countDown();
1350            joinPool(e);
1527          }
1528      }
1529  
# Line 1355 | Line 1531 | public class ThreadPoolExecutorSubclassT
1531       * invokeAny(c) throws ExecutionException if no task completes
1532       */
1533      public void testInvokeAny4() throws Exception {
1534 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1535 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1536 <        l.add(new NPETask());
1537 <        try {
1538 <            e.invokeAny(l);
1539 <            shouldThrow();
1540 <        } catch (ExecutionException success) {
1541 <            assertTrue(success.getCause() instanceof NullPointerException);
1542 <        } finally {
1543 <            joinPool(e);
1534 >        final ExecutorService e =
1535 >            new CustomTPE(2, 2,
1536 >                          LONG_DELAY_MS, MILLISECONDS,
1537 >                          new ArrayBlockingQueue<Runnable>(10));
1538 >        try (PoolCleaner cleaner = cleaner(e)) {
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 >            }
1547          }
1548      }
1549  
# Line 1372 | Line 1551 | public class ThreadPoolExecutorSubclassT
1551       * invokeAny(c) returns result of some task
1552       */
1553      public void testInvokeAny5() throws Exception {
1554 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1555 <        try {
1554 >        final ExecutorService e =
1555 >            new CustomTPE(2, 2,
1556 >                          LONG_DELAY_MS, MILLISECONDS,
1557 >                          new ArrayBlockingQueue<Runnable>(10));
1558 >        try (PoolCleaner cleaner = cleaner(e)) {
1559              List<Callable<String>> l = new ArrayList<Callable<String>>();
1560              l.add(new StringTask());
1561              l.add(new StringTask());
1562              String result = e.invokeAny(l);
1563              assertSame(TEST_STRING, result);
1382        } finally {
1383            joinPool(e);
1564          }
1565      }
1566  
# Line 1388 | Line 1568 | public class ThreadPoolExecutorSubclassT
1568       * invokeAll(null) throws NPE
1569       */
1570      public void testInvokeAll1() throws Exception {
1571 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1572 <        try {
1573 <            e.invokeAll(null);
1574 <            shouldThrow();
1575 <        } catch (NullPointerException success) {
1576 <        } finally {
1577 <            joinPool(e);
1571 >        final ExecutorService e =
1572 >            new CustomTPE(2, 2,
1573 >                          LONG_DELAY_MS, MILLISECONDS,
1574 >                          new ArrayBlockingQueue<Runnable>(10));
1575 >        try (PoolCleaner cleaner = cleaner(e)) {
1576 >            try {
1577 >                e.invokeAll(null);
1578 >                shouldThrow();
1579 >            } catch (NullPointerException success) {}
1580          }
1581      }
1582  
# Line 1402 | Line 1584 | public class ThreadPoolExecutorSubclassT
1584       * invokeAll(empty collection) returns empty collection
1585       */
1586      public void testInvokeAll2() throws Exception {
1587 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1588 <        try {
1587 >        final ExecutorService e =
1588 >            new CustomTPE(2, 2,
1589 >                          LONG_DELAY_MS, MILLISECONDS,
1590 >                          new ArrayBlockingQueue<Runnable>(10));
1591 >        try (PoolCleaner cleaner = cleaner(e)) {
1592              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1593              assertTrue(r.isEmpty());
1409        } finally {
1410            joinPool(e);
1594          }
1595      }
1596  
# Line 1415 | Line 1598 | public class ThreadPoolExecutorSubclassT
1598       * invokeAll(c) throws NPE if c has null elements
1599       */
1600      public void testInvokeAll3() throws Exception {
1601 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1602 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1603 <        l.add(new StringTask());
1604 <        l.add(null);
1605 <        try {
1606 <            e.invokeAll(l);
1607 <            shouldThrow();
1608 <        } catch (NullPointerException success) {
1609 <        } finally {
1610 <            joinPool(e);
1601 >        final ExecutorService e =
1602 >            new CustomTPE(2, 2,
1603 >                          LONG_DELAY_MS, MILLISECONDS,
1604 >                          new ArrayBlockingQueue<Runnable>(10));
1605 >        try (PoolCleaner cleaner = cleaner(e)) {
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          }
1614      }
1615  
# Line 1432 | Line 1617 | public class ThreadPoolExecutorSubclassT
1617       * get of element of invokeAll(c) throws exception on failed task
1618       */
1619      public void testInvokeAll4() throws Exception {
1620 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1621 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1622 <        l.add(new NPETask());
1623 <        List<Future<String>> futures = e.invokeAll(l);
1624 <        assertEquals(1, futures.size());
1625 <        try {
1626 <            futures.get(0).get();
1627 <            shouldThrow();
1628 <        } catch (ExecutionException success) {
1629 <            assertTrue(success.getCause() instanceof NullPointerException);
1630 <        } finally {
1631 <            joinPool(e);
1620 >        final ExecutorService e =
1621 >            new CustomTPE(2, 2,
1622 >                          LONG_DELAY_MS, MILLISECONDS,
1623 >                          new ArrayBlockingQueue<Runnable>(10));
1624 >        try (PoolCleaner cleaner = cleaner(e)) {
1625 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1626 >            l.add(new NPETask());
1627 >            List<Future<String>> futures = e.invokeAll(l);
1628 >            assertEquals(1, futures.size());
1629 >            try {
1630 >                futures.get(0).get();
1631 >                shouldThrow();
1632 >            } catch (ExecutionException success) {
1633 >                assertTrue(success.getCause() instanceof NullPointerException);
1634 >            }
1635          }
1636      }
1637  
# Line 1451 | Line 1639 | public class ThreadPoolExecutorSubclassT
1639       * invokeAll(c) returns results of all completed tasks
1640       */
1641      public void testInvokeAll5() throws Exception {
1642 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1643 <        try {
1642 >        final ExecutorService e =
1643 >            new CustomTPE(2, 2,
1644 >                          LONG_DELAY_MS, MILLISECONDS,
1645 >                          new ArrayBlockingQueue<Runnable>(10));
1646 >        try (PoolCleaner cleaner = cleaner(e)) {
1647              List<Callable<String>> l = new ArrayList<Callable<String>>();
1648              l.add(new StringTask());
1649              l.add(new StringTask());
# Line 1460 | Line 1651 | public class ThreadPoolExecutorSubclassT
1651              assertEquals(2, futures.size());
1652              for (Future<String> future : futures)
1653                  assertSame(TEST_STRING, future.get());
1463        } finally {
1464            joinPool(e);
1654          }
1655      }
1656  
1468
1469
1657      /**
1658       * timed invokeAny(null) throws NPE
1659       */
1660      public void testTimedInvokeAny1() throws Exception {
1661 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1662 <        try {
1663 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1664 <            shouldThrow();
1665 <        } catch (NullPointerException success) {
1666 <        } finally {
1667 <            joinPool(e);
1661 >        final ExecutorService e =
1662 >            new CustomTPE(2, 2,
1663 >                          LONG_DELAY_MS, MILLISECONDS,
1664 >                          new ArrayBlockingQueue<Runnable>(10));
1665 >        try (PoolCleaner cleaner = cleaner(e)) {
1666 >            try {
1667 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1668 >                shouldThrow();
1669 >            } catch (NullPointerException success) {}
1670          }
1671      }
1672  
# Line 1485 | Line 1674 | public class ThreadPoolExecutorSubclassT
1674       * timed invokeAny(,,null) throws NPE
1675       */
1676      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1677 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1678 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1679 <        l.add(new StringTask());
1680 <        try {
1681 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1682 <            shouldThrow();
1683 <        } catch (NullPointerException success) {
1684 <        } finally {
1685 <            joinPool(e);
1677 >        final ExecutorService e =
1678 >            new CustomTPE(2, 2,
1679 >                          LONG_DELAY_MS, MILLISECONDS,
1680 >                          new ArrayBlockingQueue<Runnable>(10));
1681 >        try (PoolCleaner cleaner = cleaner(e)) {
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          }
1689      }
1690  
# Line 1501 | Line 1692 | public class ThreadPoolExecutorSubclassT
1692       * timed invokeAny(empty collection) throws IAE
1693       */
1694      public void testTimedInvokeAny2() throws Exception {
1695 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1696 <        try {
1697 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1698 <            shouldThrow();
1699 <        } catch (IllegalArgumentException success) {
1700 <        } finally {
1701 <            joinPool(e);
1695 >        final ExecutorService e =
1696 >            new CustomTPE(2, 2,
1697 >                          LONG_DELAY_MS, MILLISECONDS,
1698 >                          new ArrayBlockingQueue<Runnable>(10));
1699 >        try (PoolCleaner cleaner = cleaner(e)) {
1700 >            try {
1701 >                e.invokeAny(new ArrayList<Callable<String>>(),
1702 >                            MEDIUM_DELAY_MS, MILLISECONDS);
1703 >                shouldThrow();
1704 >            } catch (IllegalArgumentException success) {}
1705          }
1706      }
1707  
# Line 1516 | Line 1710 | public class ThreadPoolExecutorSubclassT
1710       */
1711      public void testTimedInvokeAny3() throws Exception {
1712          CountDownLatch latch = new CountDownLatch(1);
1713 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1714 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1715 <        l.add(latchAwaitingStringTask(latch));
1716 <        l.add(null);
1717 <        try {
1718 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1719 <            shouldThrow();
1720 <        } catch (NullPointerException success) {
1721 <        } finally {
1713 >        final ExecutorService e =
1714 >            new CustomTPE(2, 2,
1715 >                          LONG_DELAY_MS, MILLISECONDS,
1716 >                          new ArrayBlockingQueue<Runnable>(10));
1717 >        try (PoolCleaner cleaner = cleaner(e)) {
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              latch.countDown();
1529            joinPool(e);
1726          }
1727      }
1728  
# Line 1534 | Line 1730 | public class ThreadPoolExecutorSubclassT
1730       * timed invokeAny(c) throws ExecutionException if no task completes
1731       */
1732      public void testTimedInvokeAny4() throws Exception {
1733 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1734 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1735 <        l.add(new NPETask());
1736 <        try {
1737 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1738 <            shouldThrow();
1739 <        } catch (ExecutionException success) {
1740 <            assertTrue(success.getCause() instanceof NullPointerException);
1741 <        } finally {
1742 <            joinPool(e);
1733 >        final ExecutorService e =
1734 >            new CustomTPE(2, 2,
1735 >                          LONG_DELAY_MS, MILLISECONDS,
1736 >                          new ArrayBlockingQueue<Runnable>(10));
1737 >        try (PoolCleaner cleaner = cleaner(e)) {
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 >            }
1746          }
1747      }
1748  
# Line 1551 | Line 1750 | public class ThreadPoolExecutorSubclassT
1750       * timed invokeAny(c) returns result of some task
1751       */
1752      public void testTimedInvokeAny5() throws Exception {
1753 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1754 <        try {
1753 >        final ExecutorService e =
1754 >            new CustomTPE(2, 2,
1755 >                          LONG_DELAY_MS, MILLISECONDS,
1756 >                          new ArrayBlockingQueue<Runnable>(10));
1757 >        try (PoolCleaner cleaner = cleaner(e)) {
1758              List<Callable<String>> l = new ArrayList<Callable<String>>();
1759              l.add(new StringTask());
1760              l.add(new StringTask());
1761              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1762              assertSame(TEST_STRING, result);
1561        } finally {
1562            joinPool(e);
1763          }
1764      }
1765  
# Line 1567 | Line 1767 | public class ThreadPoolExecutorSubclassT
1767       * timed invokeAll(null) throws NPE
1768       */
1769      public void testTimedInvokeAll1() throws Exception {
1770 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1771 <        try {
1772 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1773 <            shouldThrow();
1774 <        } catch (NullPointerException success) {
1775 <        } finally {
1776 <            joinPool(e);
1770 >        final ExecutorService e =
1771 >            new CustomTPE(2, 2,
1772 >                          LONG_DELAY_MS, MILLISECONDS,
1773 >                          new ArrayBlockingQueue<Runnable>(10));
1774 >        try (PoolCleaner cleaner = cleaner(e)) {
1775 >            try {
1776 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1777 >                shouldThrow();
1778 >            } catch (NullPointerException success) {}
1779          }
1780      }
1781  
# Line 1581 | Line 1783 | public class ThreadPoolExecutorSubclassT
1783       * timed invokeAll(,,null) throws NPE
1784       */
1785      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1786 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1787 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1788 <        l.add(new StringTask());
1789 <        try {
1790 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1791 <            shouldThrow();
1792 <        } catch (NullPointerException success) {
1793 <        } finally {
1794 <            joinPool(e);
1786 >        final ExecutorService e =
1787 >            new CustomTPE(2, 2,
1788 >                          LONG_DELAY_MS, MILLISECONDS,
1789 >                          new ArrayBlockingQueue<Runnable>(10));
1790 >        try (PoolCleaner cleaner = cleaner(e)) {
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          }
1798      }
1799  
# Line 1597 | Line 1801 | public class ThreadPoolExecutorSubclassT
1801       * timed invokeAll(empty collection) returns empty collection
1802       */
1803      public void testTimedInvokeAll2() throws Exception {
1804 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1805 <        try {
1806 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1804 >        final ExecutorService e =
1805 >            new CustomTPE(2, 2,
1806 >                          LONG_DELAY_MS, MILLISECONDS,
1807 >                          new ArrayBlockingQueue<Runnable>(10));
1808 >        try (PoolCleaner cleaner = cleaner(e)) {
1809 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1810 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1811              assertTrue(r.isEmpty());
1604        } finally {
1605            joinPool(e);
1812          }
1813      }
1814  
# Line 1610 | Line 1816 | public class ThreadPoolExecutorSubclassT
1816       * timed invokeAll(c) throws NPE if c has null elements
1817       */
1818      public void testTimedInvokeAll3() throws Exception {
1819 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1820 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1821 <        l.add(new StringTask());
1822 <        l.add(null);
1823 <        try {
1824 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1825 <            shouldThrow();
1826 <        } catch (NullPointerException success) {
1827 <        } finally {
1828 <            joinPool(e);
1819 >        final ExecutorService e =
1820 >            new CustomTPE(2, 2,
1821 >                          LONG_DELAY_MS, MILLISECONDS,
1822 >                          new ArrayBlockingQueue<Runnable>(10));
1823 >        try (PoolCleaner cleaner = cleaner(e)) {
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          }
1832      }
1833  
# Line 1627 | Line 1835 | public class ThreadPoolExecutorSubclassT
1835       * get of element of invokeAll(c) throws exception on failed task
1836       */
1837      public void testTimedInvokeAll4() throws Exception {
1838 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1839 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1840 <        l.add(new NPETask());
1841 <        List<Future<String>> futures =
1842 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1843 <        assertEquals(1, futures.size());
1844 <        try {
1845 <            futures.get(0).get();
1846 <            shouldThrow();
1847 <        } catch (ExecutionException success) {
1848 <            assertTrue(success.getCause() instanceof NullPointerException);
1849 <        } finally {
1850 <            joinPool(e);
1838 >        final ExecutorService e =
1839 >            new CustomTPE(2, 2,
1840 >                          LONG_DELAY_MS, MILLISECONDS,
1841 >                          new ArrayBlockingQueue<Runnable>(10));
1842 >        try (PoolCleaner cleaner = cleaner(e)) {
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 >            }
1854          }
1855      }
1856  
# Line 1647 | Line 1858 | public class ThreadPoolExecutorSubclassT
1858       * timed invokeAll(c) returns results of all completed tasks
1859       */
1860      public void testTimedInvokeAll5() throws Exception {
1861 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1862 <        try {
1861 >        final ExecutorService e =
1862 >            new CustomTPE(2, 2,
1863 >                          LONG_DELAY_MS, MILLISECONDS,
1864 >                          new ArrayBlockingQueue<Runnable>(10));
1865 >        try (PoolCleaner cleaner = cleaner(e)) {
1866              List<Callable<String>> l = new ArrayList<Callable<String>>();
1867              l.add(new StringTask());
1868              l.add(new StringTask());
1869              List<Future<String>> futures =
1870 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1870 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1871              assertEquals(2, futures.size());
1872              for (Future<String> future : futures)
1873                  assertSame(TEST_STRING, future.get());
1660        } finally {
1661            joinPool(e);
1874          }
1875      }
1876  
# Line 1666 | Line 1878 | public class ThreadPoolExecutorSubclassT
1878       * timed invokeAll(c) cancels tasks not completed by timeout
1879       */
1880      public void testTimedInvokeAll6() throws Exception {
1881 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1882 <        try {
1883 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1884 <            l.add(new StringTask());
1885 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1886 <            l.add(new StringTask());
1887 <            List<Future<String>> futures =
1888 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1889 <            assertEquals(3, futures.size());
1890 <            Iterator<Future<String>> it = futures.iterator();
1891 <            Future<String> f1 = it.next();
1892 <            Future<String> f2 = it.next();
1893 <            Future<String> f3 = it.next();
1894 <            assertTrue(f1.isDone());
1895 <            assertTrue(f2.isDone());
1896 <            assertTrue(f3.isDone());
1897 <            assertFalse(f1.isCancelled());
1898 <            assertTrue(f2.isCancelled());
1899 <        } finally {
1900 <            joinPool(e);
1881 >        final ExecutorService e =
1882 >            new CustomTPE(2, 2,
1883 >                          LONG_DELAY_MS, MILLISECONDS,
1884 >                          new ArrayBlockingQueue<Runnable>(10));
1885 >        try (PoolCleaner cleaner = cleaner(e)) {
1886 >            for (long timeout = timeoutMillis();;) {
1887 >                List<Callable<String>> tasks = new ArrayList<>();
1888 >                tasks.add(new StringTask("0"));
1889 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1890 >                tasks.add(new StringTask("2"));
1891 >                long startTime = System.nanoTime();
1892 >                List<Future<String>> futures =
1893 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1894 >                assertEquals(tasks.size(), futures.size());
1895 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1896 >                for (Future future : futures)
1897 >                    assertTrue(future.isDone());
1898 >                assertTrue(futures.get(1).isCancelled());
1899 >                try {
1900 >                    assertEquals("0", futures.get(0).get());
1901 >                    assertEquals("2", futures.get(2).get());
1902 >                    break;
1903 >                } catch (CancellationException retryWithLongerTimeout) {
1904 >                    timeout *= 2;
1905 >                    if (timeout >= LONG_DELAY_MS / 2)
1906 >                        fail("expected exactly one task to be cancelled");
1907 >                }
1908 >            }
1909          }
1910      }
1911  
# Line 1699 | Line 1919 | public class ThreadPoolExecutorSubclassT
1919                            LONG_DELAY_MS, MILLISECONDS,
1920                            new LinkedBlockingQueue<Runnable>(),
1921                            new FailingThreadFactory());
1922 <        try {
1922 >        try (PoolCleaner cleaner = cleaner(e)) {
1923              final int TASKS = 100;
1924              final CountDownLatch done = new CountDownLatch(TASKS);
1925              for (int k = 0; k < TASKS; ++k)
# Line 1708 | Line 1928 | public class ThreadPoolExecutorSubclassT
1928                          done.countDown();
1929                      }});
1930              assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1711        } finally {
1712            joinPool(e);
1931          }
1932      }
1933  
# Line 1717 | Line 1935 | public class ThreadPoolExecutorSubclassT
1935       * allowsCoreThreadTimeOut is by default false.
1936       */
1937      public void testAllowsCoreThreadTimeOut() {
1938 <        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1939 <        assertFalse(p.allowsCoreThreadTimeOut());
1940 <        joinPool(p);
1938 >        final ThreadPoolExecutor p =
1939 >            new CustomTPE(2, 2,
1940 >                          1000, MILLISECONDS,
1941 >                          new ArrayBlockingQueue<Runnable>(10));
1942 >        try (PoolCleaner cleaner = cleaner(p)) {
1943 >            assertFalse(p.allowsCoreThreadTimeOut());
1944 >        }
1945      }
1946  
1947      /**
1948       * allowCoreThreadTimeOut(true) causes idle threads to time out
1949       */
1950      public void testAllowCoreThreadTimeOut_true() throws Exception {
1951 +        long keepAliveTime = timeoutMillis();
1952          final ThreadPoolExecutor p =
1953              new CustomTPE(2, 10,
1954 <                          SHORT_DELAY_MS, MILLISECONDS,
1954 >                          keepAliveTime, MILLISECONDS,
1955                            new ArrayBlockingQueue<Runnable>(10));
1956 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1957 <        try {
1956 >        try (PoolCleaner cleaner = cleaner(p)) {
1957 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1958              p.allowCoreThreadTimeOut(true);
1959              p.execute(new CheckedRunnable() {
1960 <                public void realRun() throws InterruptedException {
1960 >                public void realRun() {
1961                      threadStarted.countDown();
1962                      assertEquals(1, p.getPoolSize());
1963                  }});
1964 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1965 <            for (int i = 0; i < (MEDIUM_DELAY_MS/10); i++) {
1966 <                if (p.getPoolSize() == 0)
1967 <                    break;
1968 <                Thread.sleep(10);
1969 <            }
1964 >            await(threadStarted);
1965 >            delay(keepAliveTime);
1966 >            long startTime = System.nanoTime();
1967 >            while (p.getPoolSize() > 0
1968 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1969 >                Thread.yield();
1970 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1971              assertEquals(0, p.getPoolSize());
1748        } finally {
1749            joinPool(p);
1972          }
1973      }
1974  
# Line 1754 | Line 1976 | public class ThreadPoolExecutorSubclassT
1976       * allowCoreThreadTimeOut(false) causes idle threads not to time out
1977       */
1978      public void testAllowCoreThreadTimeOut_false() throws Exception {
1979 +        long keepAliveTime = timeoutMillis();
1980          final ThreadPoolExecutor p =
1981              new CustomTPE(2, 10,
1982 <                          SHORT_DELAY_MS, MILLISECONDS,
1982 >                          keepAliveTime, MILLISECONDS,
1983                            new ArrayBlockingQueue<Runnable>(10));
1984 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1985 <        try {
1984 >        try (PoolCleaner cleaner = cleaner(p)) {
1985 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1986              p.allowCoreThreadTimeOut(false);
1987              p.execute(new CheckedRunnable() {
1988                  public void realRun() throws InterruptedException {
1989                      threadStarted.countDown();
1990                      assertTrue(p.getPoolSize() >= 1);
1991                  }});
1992 <            Thread.sleep(SMALL_DELAY_MS);
1992 >            delay(2 * keepAliveTime);
1993              assertTrue(p.getPoolSize() >= 1);
1994 <        } finally {
1995 <            joinPool(p);
1994 >        }
1995 >    }
1996 >
1997 >    /**
1998 >     * get(cancelled task) throws CancellationException
1999 >     * (in part, a test of CustomTPE itself)
2000 >     */
2001 >    public void testGet_cancelled() throws Exception {
2002 >        final ExecutorService e =
2003 >            new CustomTPE(1, 1,
2004 >                          LONG_DELAY_MS, MILLISECONDS,
2005 >                          new LinkedBlockingQueue<Runnable>());
2006 >        try (PoolCleaner cleaner = cleaner(e)) {
2007 >            final CountDownLatch blockerStarted = new CountDownLatch(1);
2008 >            final CountDownLatch done = new CountDownLatch(1);
2009 >            final List<Future<?>> futures = new ArrayList<>();
2010 >            for (int i = 0; i < 2; i++) {
2011 >                Runnable r = new CheckedRunnable() { public void realRun()
2012 >                                                         throws Throwable {
2013 >                    blockerStarted.countDown();
2014 >                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
2015 >                }};
2016 >                futures.add(e.submit(r));
2017 >            }
2018 >            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2019 >            for (Future<?> future : futures) future.cancel(false);
2020 >            for (Future<?> future : futures) {
2021 >                try {
2022 >                    future.get();
2023 >                    shouldThrow();
2024 >                } catch (CancellationException success) {}
2025 >                try {
2026 >                    future.get(LONG_DELAY_MS, MILLISECONDS);
2027 >                    shouldThrow();
2028 >                } catch (CancellationException success) {}
2029 >                assertTrue(future.isCancelled());
2030 >                assertTrue(future.isDone());
2031 >            }
2032 >            done.countDown();
2033          }
2034      }
2035  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines