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.19 by jsr166, Sat Oct 9 19:30:35 2010 UTC vs.
Revision 1.49 by jsr166, Sun Oct 4 00:30:50 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.util.concurrent.locks.*;
10 > import static java.util.concurrent.TimeUnit.SECONDS;
11  
12 < import junit.framework.*;
13 < import java.util.*;
12 > import java.util.ArrayList;
13 > import java.util.List;
14 > import java.util.concurrent.ArrayBlockingQueue;
15 > import java.util.concurrent.BlockingQueue;
16 > import java.util.concurrent.Callable;
17 > import java.util.concurrent.CancellationException;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.ExecutionException;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.Future;
23 > import java.util.concurrent.FutureTask;
24 > import java.util.concurrent.LinkedBlockingQueue;
25 > import java.util.concurrent.RejectedExecutionException;
26 > import java.util.concurrent.RejectedExecutionHandler;
27 > import java.util.concurrent.RunnableFuture;
28 > import java.util.concurrent.SynchronousQueue;
29 > import java.util.concurrent.ThreadFactory;
30 > import java.util.concurrent.ThreadPoolExecutor;
31 > import java.util.concurrent.TimeoutException;
32 > import java.util.concurrent.TimeUnit;
33 > import java.util.concurrent.atomic.AtomicInteger;
34 > import java.util.concurrent.locks.Condition;
35 > import java.util.concurrent.locks.ReentrantLock;
36 >
37 > import junit.framework.Test;
38 > import junit.framework.TestSuite;
39  
40   public class ThreadPoolExecutorSubclassTest extends JSR166TestCase {
41      public static void main(String[] args) {
42 <        junit.textui.TestRunner.run(suite());
42 >        main(suite(), args);
43      }
44      public static Test suite() {
45          return new TestSuite(ThreadPoolExecutorSubclassTest.class);
# Line 37 | Line 61 | public class ThreadPoolExecutorSubclassT
61          CustomTask(final Runnable r, final V res) {
62              if (r == null) throw new NullPointerException();
63              callable = new Callable<V>() {
64 <            public V call() throws Exception { r.run(); return res; }};
64 >                public V call() throws Exception { r.run(); return res; }};
65          }
66          public boolean isDone() {
67              lock.lock(); try { return done; } finally { lock.unlock() ; }
# Line 60 | Line 84 | public class ThreadPoolExecutorSubclassT
84              finally { lock.unlock() ; }
85          }
86          public void run() {
63            boolean runme;
87              lock.lock();
88              try {
89 <                runme = !done;
90 <                if (!runme)
91 <                    thread = Thread.currentThread();
89 >                if (done)
90 >                    return;
91 >                thread = Thread.currentThread();
92              }
93              finally { lock.unlock() ; }
71            if (!runme) return;
94              V v = null;
95              Exception e = null;
96              try {
# Line 79 | Line 101 | public class ThreadPoolExecutorSubclassT
101              }
102              lock.lock();
103              try {
104 <                result = v;
105 <                exception = e;
106 <                done = true;
107 <                thread = null;
108 <                cond.signalAll();
104 >                if (!done) {
105 >                    result = v;
106 >                    exception = e;
107 >                    done = true;
108 >                    thread = null;
109 >                    cond.signalAll();
110 >                }
111              }
112              finally { lock.unlock(); }
113          }
# Line 92 | Line 116 | public class ThreadPoolExecutorSubclassT
116              try {
117                  while (!done)
118                      cond.await();
119 +                if (cancelled)
120 +                    throw new CancellationException();
121                  if (exception != null)
122                      throw new ExecutionException(exception);
123                  return result;
# Line 103 | Line 129 | public class ThreadPoolExecutorSubclassT
129              long nanos = unit.toNanos(timeout);
130              lock.lock();
131              try {
132 <                for (;;) {
133 <                    if (done) break;
108 <                    if (nanos < 0)
132 >                while (!done) {
133 >                    if (nanos <= 0L)
134                          throw new TimeoutException();
135                      nanos = cond.awaitNanos(nanos);
136                  }
137 +                if (cancelled)
138 +                    throw new CancellationException();
139                  if (exception != null)
140                      throw new ExecutionException(exception);
141                  return result;
# Line 117 | Line 144 | public class ThreadPoolExecutorSubclassT
144          }
145      }
146  
120
147      static class CustomTPE extends ThreadPoolExecutor {
148          protected <V> RunnableFuture<V> newTaskFor(Callable<V> c) {
149              return new CustomTask<V>(c);
# Line 164 | Line 190 | public class ThreadPoolExecutorSubclassT
190                workQueue, threadFactory, handler);
191          }
192  
193 <        volatile boolean beforeCalled = false;
194 <        volatile boolean afterCalled = false;
195 <        volatile boolean terminatedCalled = false;
193 >        final CountDownLatch beforeCalled = new CountDownLatch(1);
194 >        final CountDownLatch afterCalled = new CountDownLatch(1);
195 >        final CountDownLatch terminatedCalled = new CountDownLatch(1);
196 >
197          public CustomTPE() {
198              super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
199          }
200          protected void beforeExecute(Thread t, Runnable r) {
201 <            beforeCalled = true;
201 >            beforeCalled.countDown();
202          }
203          protected void afterExecute(Runnable r, Throwable t) {
204 <            afterCalled = true;
204 >            afterCalled.countDown();
205          }
206          protected void terminated() {
207 <            terminatedCalled = true;
207 >            terminatedCalled.countDown();
208          }
209  
210 +        public boolean beforeCalled() {
211 +            return beforeCalled.getCount() == 0;
212 +        }
213 +        public boolean afterCalled() {
214 +            return afterCalled.getCount() == 0;
215 +        }
216 +        public boolean terminatedCalled() {
217 +            return terminatedCalled.getCount() == 0;
218 +        }
219      }
220  
221      static class FailingThreadFactory implements ThreadFactory {
# Line 190 | Line 226 | public class ThreadPoolExecutorSubclassT
226          }
227      }
228  
193
229      /**
230       * execute successfully executes a runnable
231       */
232      public void testExecute() throws InterruptedException {
233 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
234 <        try {
235 <            p1.execute(new ShortRunnable());
236 <            Thread.sleep(SMALL_DELAY_MS);
237 <        } finally {
238 <            joinPool(p1);
233 >        try (PoolCleaner<CustomTPE> cleaner =
234 >             cleaner(new CustomTPE(1, 1,
235 >                                   2 * LONG_DELAY_MS, MILLISECONDS,
236 >                                   new ArrayBlockingQueue<Runnable>(10)))) {
237 >            final ThreadPoolExecutor p = cleaner.pool;
238 >            final CountDownLatch done = new CountDownLatch(1);
239 >            final Runnable task = new CheckedRunnable() {
240 >                public void realRun() { done.countDown();
241 >                }};
242 >            p.execute(task);
243 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
244          }
245      }
246  
# Line 209 | Line 249 | public class ThreadPoolExecutorSubclassT
249       * thread becomes active
250       */
251      public void testGetActiveCount() throws InterruptedException {
252 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
253 <        assertEquals(0, p2.getActiveCount());
254 <        p2.execute(new MediumRunnable());
255 <        Thread.sleep(SHORT_DELAY_MS);
256 <        assertEquals(1, p2.getActiveCount());
257 <        joinPool(p2);
252 >        final ThreadPoolExecutor p =
253 >            new CustomTPE(2, 2,
254 >                          LONG_DELAY_MS, MILLISECONDS,
255 >                          new ArrayBlockingQueue<Runnable>(10));
256 >        final CountDownLatch threadStarted = new CountDownLatch(1);
257 >        final CountDownLatch done = new CountDownLatch(1);
258 >        try {
259 >            assertEquals(0, p.getActiveCount());
260 >            p.execute(new CheckedRunnable() {
261 >                public void realRun() throws InterruptedException {
262 >                    threadStarted.countDown();
263 >                    assertEquals(1, p.getActiveCount());
264 >                    done.await();
265 >                }});
266 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
267 >            assertEquals(1, p.getActiveCount());
268 >        } finally {
269 >            done.countDown();
270 >            joinPool(p);
271 >        }
272      }
273  
274      /**
275       * prestartCoreThread starts a thread if under corePoolSize, else doesn't
276       */
277      public void testPrestartCoreThread() {
278 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
279 <        assertEquals(0, p2.getPoolSize());
280 <        assertTrue(p2.prestartCoreThread());
281 <        assertEquals(1, p2.getPoolSize());
282 <        assertTrue(p2.prestartCoreThread());
283 <        assertEquals(2, p2.getPoolSize());
284 <        assertFalse(p2.prestartCoreThread());
285 <        assertEquals(2, p2.getPoolSize());
286 <        joinPool(p2);
278 >        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
279 >        assertEquals(0, p.getPoolSize());
280 >        assertTrue(p.prestartCoreThread());
281 >        assertEquals(1, p.getPoolSize());
282 >        assertTrue(p.prestartCoreThread());
283 >        assertEquals(2, p.getPoolSize());
284 >        assertFalse(p.prestartCoreThread());
285 >        assertEquals(2, p.getPoolSize());
286 >        joinPool(p);
287      }
288  
289      /**
290       * prestartAllCoreThreads starts all corePoolSize threads
291       */
292      public void testPrestartAllCoreThreads() {
293 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
294 <        assertEquals(0, p2.getPoolSize());
295 <        p2.prestartAllCoreThreads();
296 <        assertEquals(2, p2.getPoolSize());
297 <        p2.prestartAllCoreThreads();
298 <        assertEquals(2, p2.getPoolSize());
299 <        joinPool(p2);
293 >        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
294 >        assertEquals(0, p.getPoolSize());
295 >        p.prestartAllCoreThreads();
296 >        assertEquals(2, p.getPoolSize());
297 >        p.prestartAllCoreThreads();
298 >        assertEquals(2, p.getPoolSize());
299 >        joinPool(p);
300      }
301  
302      /**
# Line 250 | Line 304 | public class ThreadPoolExecutorSubclassT
304       * when tasks complete
305       */
306      public void testGetCompletedTaskCount() throws InterruptedException {
307 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
308 <        assertEquals(0, p2.getCompletedTaskCount());
309 <        p2.execute(new ShortRunnable());
310 <        Thread.sleep(SMALL_DELAY_MS);
311 <        assertEquals(1, p2.getCompletedTaskCount());
312 <        try { p2.shutdown(); } catch (SecurityException ok) { return; }
313 <        joinPool(p2);
307 >        final ThreadPoolExecutor p =
308 >            new CustomTPE(2, 2,
309 >                          LONG_DELAY_MS, MILLISECONDS,
310 >                          new ArrayBlockingQueue<Runnable>(10));
311 >        final CountDownLatch threadStarted = new CountDownLatch(1);
312 >        final CountDownLatch threadProceed = new CountDownLatch(1);
313 >        final CountDownLatch threadDone = new CountDownLatch(1);
314 >        try {
315 >            assertEquals(0, p.getCompletedTaskCount());
316 >            p.execute(new CheckedRunnable() {
317 >                public void realRun() throws InterruptedException {
318 >                    threadStarted.countDown();
319 >                    assertEquals(0, p.getCompletedTaskCount());
320 >                    threadProceed.await();
321 >                    threadDone.countDown();
322 >                }});
323 >            await(threadStarted);
324 >            assertEquals(0, p.getCompletedTaskCount());
325 >            threadProceed.countDown();
326 >            threadDone.await();
327 >            long startTime = System.nanoTime();
328 >            while (p.getCompletedTaskCount() != 1) {
329 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
330 >                    fail("timed out");
331 >                Thread.yield();
332 >            }
333 >        } finally {
334 >            joinPool(p);
335 >        }
336      }
337  
338      /**
339       * getCorePoolSize returns size given in constructor if not otherwise set
340       */
341      public void testGetCorePoolSize() {
342 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
343 <        assertEquals(1, p1.getCorePoolSize());
344 <        joinPool(p1);
342 >        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
343 >        assertEquals(1, p.getCorePoolSize());
344 >        joinPool(p);
345      }
346  
347      /**
348       * getKeepAliveTime returns value given in constructor if not otherwise set
349       */
350      public void testGetKeepAliveTime() {
351 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
352 <        assertEquals(1, p2.getKeepAliveTime(TimeUnit.SECONDS));
353 <        joinPool(p2);
351 >        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
352 >        assertEquals(1, p.getKeepAliveTime(SECONDS));
353 >        joinPool(p);
354      }
355  
280
356      /**
357       * getThreadFactory returns factory in constructor if not set
358       */
# Line 299 | Line 374 | public class ThreadPoolExecutorSubclassT
374          joinPool(p);
375      }
376  
302
377      /**
378       * setThreadFactory(null) throws NPE
379       */
# Line 336 | Line 410 | public class ThreadPoolExecutorSubclassT
410          joinPool(p);
411      }
412  
339
413      /**
414       * setRejectedExecutionHandler(null) throws NPE
415       */
# Line 351 | Line 424 | public class ThreadPoolExecutorSubclassT
424          }
425      }
426  
354
427      /**
428       * getLargestPoolSize increases, but doesn't overestimate, when
429       * multiple threads active
430       */
431      public void testGetLargestPoolSize() throws InterruptedException {
432 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
433 <        assertEquals(0, p2.getLargestPoolSize());
434 <        p2.execute(new MediumRunnable());
435 <        p2.execute(new MediumRunnable());
436 <        Thread.sleep(SHORT_DELAY_MS);
437 <        assertEquals(2, p2.getLargestPoolSize());
438 <        joinPool(p2);
432 >        final int THREADS = 3;
433 >        final ThreadPoolExecutor p =
434 >            new CustomTPE(THREADS, THREADS,
435 >                          LONG_DELAY_MS, MILLISECONDS,
436 >                          new ArrayBlockingQueue<Runnable>(10));
437 >        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
438 >        final CountDownLatch done = new CountDownLatch(1);
439 >        try {
440 >            assertEquals(0, p.getLargestPoolSize());
441 >            for (int i = 0; i < THREADS; i++)
442 >                p.execute(new CheckedRunnable() {
443 >                    public void realRun() throws InterruptedException {
444 >                        threadsStarted.countDown();
445 >                        done.await();
446 >                        assertEquals(THREADS, p.getLargestPoolSize());
447 >                    }});
448 >            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
449 >            assertEquals(THREADS, p.getLargestPoolSize());
450 >        } finally {
451 >            done.countDown();
452 >            joinPool(p);
453 >            assertEquals(THREADS, p.getLargestPoolSize());
454 >        }
455      }
456  
457      /**
# Line 371 | Line 459 | public class ThreadPoolExecutorSubclassT
459       * otherwise set
460       */
461      public void testGetMaximumPoolSize() {
462 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
463 <        assertEquals(2, p2.getMaximumPoolSize());
464 <        joinPool(p2);
462 >        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
463 >        assertEquals(2, p.getMaximumPoolSize());
464 >        joinPool(p);
465      }
466  
467      /**
468       * getPoolSize increases, but doesn't overestimate, when threads
469       * become active
470       */
471 <    public void testGetPoolSize() {
472 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
473 <        assertEquals(0, p1.getPoolSize());
474 <        p1.execute(new MediumRunnable());
475 <        assertEquals(1, p1.getPoolSize());
476 <        joinPool(p1);
471 >    public void testGetPoolSize() throws InterruptedException {
472 >        final ThreadPoolExecutor p =
473 >            new CustomTPE(1, 1,
474 >                          LONG_DELAY_MS, MILLISECONDS,
475 >                          new ArrayBlockingQueue<Runnable>(10));
476 >        final CountDownLatch threadStarted = new CountDownLatch(1);
477 >        final CountDownLatch done = new CountDownLatch(1);
478 >        try {
479 >            assertEquals(0, p.getPoolSize());
480 >            p.execute(new CheckedRunnable() {
481 >                public void realRun() throws InterruptedException {
482 >                    threadStarted.countDown();
483 >                    assertEquals(1, p.getPoolSize());
484 >                    done.await();
485 >                }});
486 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
487 >            assertEquals(1, p.getPoolSize());
488 >        } finally {
489 >            done.countDown();
490 >            joinPool(p);
491 >        }
492      }
493  
494      /**
495       * getTaskCount increases, but doesn't overestimate, when tasks submitted
496       */
497      public void testGetTaskCount() throws InterruptedException {
498 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
499 <        assertEquals(0, p1.getTaskCount());
500 <        p1.execute(new MediumRunnable());
501 <        Thread.sleep(SHORT_DELAY_MS);
502 <        assertEquals(1, p1.getTaskCount());
503 <        joinPool(p1);
498 >        final ThreadPoolExecutor p =
499 >            new CustomTPE(1, 1,
500 >                          LONG_DELAY_MS, MILLISECONDS,
501 >                          new ArrayBlockingQueue<Runnable>(10));
502 >        final CountDownLatch threadStarted = new CountDownLatch(1);
503 >        final CountDownLatch done = new CountDownLatch(1);
504 >        try {
505 >            assertEquals(0, p.getTaskCount());
506 >            p.execute(new CheckedRunnable() {
507 >                public void realRun() throws InterruptedException {
508 >                    threadStarted.countDown();
509 >                    assertEquals(1, p.getTaskCount());
510 >                    done.await();
511 >                }});
512 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
513 >            assertEquals(1, p.getTaskCount());
514 >        } finally {
515 >            done.countDown();
516 >            joinPool(p);
517 >        }
518      }
519  
520      /**
521 <     * isShutDown is false before shutdown, true after
521 >     * isShutdown is false before shutdown, true after
522       */
523      public void testIsShutdown() {
524  
525 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
526 <        assertFalse(p1.isShutdown());
527 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
528 <        assertTrue(p1.isShutdown());
529 <        joinPool(p1);
525 >        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
526 >        assertFalse(p.isShutdown());
527 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
528 >        assertTrue(p.isShutdown());
529 >        joinPool(p);
530      }
531  
415
532      /**
533       * isTerminated is false before termination, true after
534       */
535      public void testIsTerminated() throws InterruptedException {
536 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
537 <        assertFalse(p1.isTerminated());
538 <        try {
539 <            p1.execute(new MediumRunnable());
540 <        } finally {
541 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
542 <        }
543 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
544 <        assertTrue(p1.isTerminated());
536 >        final ThreadPoolExecutor p =
537 >            new CustomTPE(1, 1,
538 >                          LONG_DELAY_MS, MILLISECONDS,
539 >                          new ArrayBlockingQueue<Runnable>(10));
540 >        final CountDownLatch threadStarted = new CountDownLatch(1);
541 >        final CountDownLatch done = new CountDownLatch(1);
542 >        try {
543 >            assertFalse(p.isTerminating());
544 >            p.execute(new CheckedRunnable() {
545 >                public void realRun() throws InterruptedException {
546 >                    assertFalse(p.isTerminating());
547 >                    threadStarted.countDown();
548 >                    done.await();
549 >                }});
550 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
551 >            assertFalse(p.isTerminating());
552 >            done.countDown();
553 >        } finally {
554 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
555 >        }
556 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
557 >        assertTrue(p.isTerminated());
558 >        assertFalse(p.isTerminating());
559      }
560  
561      /**
562       * isTerminating is not true when running or when terminated
563       */
564      public void testIsTerminating() throws InterruptedException {
565 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
566 <        assertFalse(p1.isTerminating());
567 <        try {
568 <            p1.execute(new SmallRunnable());
569 <            assertFalse(p1.isTerminating());
570 <        } finally {
571 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
572 <        }
573 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
574 <        assertTrue(p1.isTerminated());
575 <        assertFalse(p1.isTerminating());
565 >        final ThreadPoolExecutor p =
566 >            new CustomTPE(1, 1,
567 >                          LONG_DELAY_MS, MILLISECONDS,
568 >                          new ArrayBlockingQueue<Runnable>(10));
569 >        final CountDownLatch threadStarted = new CountDownLatch(1);
570 >        final CountDownLatch done = new CountDownLatch(1);
571 >        try {
572 >            assertFalse(p.isTerminating());
573 >            p.execute(new CheckedRunnable() {
574 >                public void realRun() throws InterruptedException {
575 >                    assertFalse(p.isTerminating());
576 >                    threadStarted.countDown();
577 >                    done.await();
578 >                }});
579 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
580 >            assertFalse(p.isTerminating());
581 >            done.countDown();
582 >        } finally {
583 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
584 >        }
585 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
586 >        assertTrue(p.isTerminated());
587 >        assertFalse(p.isTerminating());
588      }
589  
590      /**
591       * getQueue returns the work queue, which contains queued tasks
592       */
593      public void testGetQueue() throws InterruptedException {
594 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
595 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
596 <        FutureTask[] tasks = new FutureTask[5];
597 <        for (int i = 0; i < 5; i++) {
598 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
599 <            p1.execute(tasks[i]);
600 <        }
601 <        try {
602 <            Thread.sleep(SHORT_DELAY_MS);
603 <            BlockingQueue<Runnable> wq = p1.getQueue();
604 <            assertSame(q, wq);
605 <            assertFalse(wq.contains(tasks[0]));
606 <            assertTrue(wq.contains(tasks[4]));
607 <            for (int i = 1; i < 5; ++i)
608 <                tasks[i].cancel(true);
609 <            p1.shutdownNow();
594 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
595 >        final ThreadPoolExecutor p =
596 >            new CustomTPE(1, 1,
597 >                          LONG_DELAY_MS, MILLISECONDS,
598 >                          q);
599 >        final CountDownLatch threadStarted = new CountDownLatch(1);
600 >        final CountDownLatch done = new CountDownLatch(1);
601 >        try {
602 >            FutureTask[] tasks = new FutureTask[5];
603 >            for (int i = 0; i < tasks.length; i++) {
604 >                Callable task = new CheckedCallable<Boolean>() {
605 >                    public Boolean realCall() throws InterruptedException {
606 >                        threadStarted.countDown();
607 >                        assertSame(q, p.getQueue());
608 >                        done.await();
609 >                        return Boolean.TRUE;
610 >                    }};
611 >                tasks[i] = new FutureTask(task);
612 >                p.execute(tasks[i]);
613 >            }
614 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
615 >            assertSame(q, p.getQueue());
616 >            assertFalse(q.contains(tasks[0]));
617 >            assertTrue(q.contains(tasks[tasks.length - 1]));
618 >            assertEquals(tasks.length - 1, q.size());
619          } finally {
620 <            joinPool(p1);
620 >            done.countDown();
621 >            joinPool(p);
622          }
623      }
624  
# Line 475 | Line 627 | public class ThreadPoolExecutorSubclassT
627       */
628      public void testRemove() throws InterruptedException {
629          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
630 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
631 <        FutureTask[] tasks = new FutureTask[5];
632 <        for (int i = 0; i < 5; i++) {
633 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
634 <            p1.execute(tasks[i]);
635 <        }
636 <        try {
637 <            Thread.sleep(SHORT_DELAY_MS);
638 <            assertFalse(p1.remove(tasks[0]));
630 >        final ThreadPoolExecutor p =
631 >            new CustomTPE(1, 1,
632 >                          LONG_DELAY_MS, MILLISECONDS,
633 >                          q);
634 >        Runnable[] tasks = new Runnable[6];
635 >        final CountDownLatch threadStarted = new CountDownLatch(1);
636 >        final CountDownLatch done = new CountDownLatch(1);
637 >        try {
638 >            for (int i = 0; i < tasks.length; i++) {
639 >                tasks[i] = new CheckedRunnable() {
640 >                        public void realRun() throws InterruptedException {
641 >                            threadStarted.countDown();
642 >                            done.await();
643 >                        }};
644 >                p.execute(tasks[i]);
645 >            }
646 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
647 >            assertFalse(p.remove(tasks[0]));
648              assertTrue(q.contains(tasks[4]));
649              assertTrue(q.contains(tasks[3]));
650 <            assertTrue(p1.remove(tasks[4]));
651 <            assertFalse(p1.remove(tasks[4]));
650 >            assertTrue(p.remove(tasks[4]));
651 >            assertFalse(p.remove(tasks[4]));
652              assertFalse(q.contains(tasks[4]));
653              assertTrue(q.contains(tasks[3]));
654 <            assertTrue(p1.remove(tasks[3]));
654 >            assertTrue(p.remove(tasks[3]));
655              assertFalse(q.contains(tasks[3]));
656          } finally {
657 <            joinPool(p1);
657 >            done.countDown();
658 >            joinPool(p);
659          }
660      }
661  
662      /**
663       * purge removes cancelled tasks from the queue
664       */
665 <    public void testPurge() {
666 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
665 >    public void testPurge() throws InterruptedException {
666 >        final CountDownLatch threadStarted = new CountDownLatch(1);
667 >        final CountDownLatch done = new CountDownLatch(1);
668 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
669 >        final ThreadPoolExecutor p =
670 >            new CustomTPE(1, 1,
671 >                          LONG_DELAY_MS, MILLISECONDS,
672 >                          q);
673          FutureTask[] tasks = new FutureTask[5];
674 <        for (int i = 0; i < 5; i++) {
675 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
676 <            p1.execute(tasks[i]);
674 >        try {
675 >            for (int i = 0; i < tasks.length; i++) {
676 >                Callable task = new CheckedCallable<Boolean>() {
677 >                    public Boolean realCall() throws InterruptedException {
678 >                        threadStarted.countDown();
679 >                        done.await();
680 >                        return Boolean.TRUE;
681 >                    }};
682 >                tasks[i] = new FutureTask(task);
683 >                p.execute(tasks[i]);
684 >            }
685 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
686 >            assertEquals(tasks.length, p.getTaskCount());
687 >            assertEquals(tasks.length - 1, q.size());
688 >            assertEquals(1L, p.getActiveCount());
689 >            assertEquals(0L, p.getCompletedTaskCount());
690 >            tasks[4].cancel(true);
691 >            tasks[3].cancel(false);
692 >            p.purge();
693 >            assertEquals(tasks.length - 3, q.size());
694 >            assertEquals(tasks.length - 2, p.getTaskCount());
695 >            p.purge();         // Nothing to do
696 >            assertEquals(tasks.length - 3, q.size());
697 >            assertEquals(tasks.length - 2, p.getTaskCount());
698 >        } finally {
699 >            done.countDown();
700 >            joinPool(p);
701          }
510        tasks[4].cancel(true);
511        tasks[3].cancel(true);
512        p1.purge();
513        long count = p1.getTaskCount();
514        assertTrue(count >= 2 && count < 5);
515        joinPool(p1);
702      }
703  
704      /**
705 <     * shutDownNow returns a list containing tasks that were not run
705 >     * shutdownNow returns a list containing tasks that were not run,
706 >     * and those tasks are drained from the queue
707       */
708 <    public void testShutDownNow() {
709 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
710 <        List l;
711 <        try {
712 <            for (int i = 0; i < 5; i++)
713 <                p1.execute(new MediumPossiblyInterruptedRunnable());
714 <        }
715 <        finally {
708 >    public void testShutdownNow() throws InterruptedException {
709 >        final int poolSize = 2;
710 >        final int count = 5;
711 >        final AtomicInteger ran = new AtomicInteger(0);
712 >        ThreadPoolExecutor p =
713 >            new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
714 >                          new ArrayBlockingQueue<Runnable>(10));
715 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
716 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
717 >            threadsStarted.countDown();
718              try {
719 <                l = p1.shutdownNow();
720 <            } catch (SecurityException ok) { return; }
721 <        }
722 <        assertTrue(p1.isShutdown());
723 <        assertTrue(l.size() <= 4);
719 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
720 >            } catch (InterruptedException success) {}
721 >            ran.getAndIncrement();
722 >        }};
723 >        for (int i = 0; i < count; i++)
724 >            p.execute(waiter);
725 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
726 >        assertEquals(poolSize, p.getActiveCount());
727 >        assertEquals(0, p.getCompletedTaskCount());
728 >        final List<Runnable> queuedTasks;
729 >        try {
730 >            queuedTasks = p.shutdownNow();
731 >        } catch (SecurityException ok) {
732 >            return; // Allowed in case test doesn't have privs
733 >        }
734 >        assertTrue(p.isShutdown());
735 >        assertTrue(p.getQueue().isEmpty());
736 >        assertEquals(count - poolSize, queuedTasks.size());
737 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
738 >        assertTrue(p.isTerminated());
739 >        assertEquals(poolSize, ran.get());
740 >        assertEquals(poolSize, p.getCompletedTaskCount());
741      }
742  
743      // Exception Tests
744  
539
745      /**
746       * Constructor throws if corePoolSize argument is less than zero
747       */
748      public void testConstructor1() {
749          try {
750 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
750 >            new CustomTPE(-1, 1, 1L, SECONDS,
751 >                          new ArrayBlockingQueue<Runnable>(10));
752              shouldThrow();
753          } catch (IllegalArgumentException success) {}
754      }
# Line 552 | Line 758 | public class ThreadPoolExecutorSubclassT
758       */
759      public void testConstructor2() {
760          try {
761 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
761 >            new CustomTPE(1, -1, 1L, SECONDS,
762 >                          new ArrayBlockingQueue<Runnable>(10));
763              shouldThrow();
764          } catch (IllegalArgumentException success) {}
765      }
# Line 562 | Line 769 | public class ThreadPoolExecutorSubclassT
769       */
770      public void testConstructor3() {
771          try {
772 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
772 >            new CustomTPE(1, 0, 1L, SECONDS,
773 >                          new ArrayBlockingQueue<Runnable>(10));
774              shouldThrow();
775          } catch (IllegalArgumentException success) {}
776      }
# Line 572 | Line 780 | public class ThreadPoolExecutorSubclassT
780       */
781      public void testConstructor4() {
782          try {
783 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
783 >            new CustomTPE(1, 2, -1L, SECONDS,
784 >                          new ArrayBlockingQueue<Runnable>(10));
785              shouldThrow();
786          } catch (IllegalArgumentException success) {}
787      }
# Line 582 | Line 791 | public class ThreadPoolExecutorSubclassT
791       */
792      public void testConstructor5() {
793          try {
794 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
794 >            new CustomTPE(2, 1, 1L, SECONDS,
795 >                          new ArrayBlockingQueue<Runnable>(10));
796              shouldThrow();
797          } catch (IllegalArgumentException success) {}
798      }
# Line 592 | Line 802 | public class ThreadPoolExecutorSubclassT
802       */
803      public void testConstructorNullPointerException() {
804          try {
805 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
805 >            new CustomTPE(1, 2, 1L, SECONDS, null);
806              shouldThrow();
807          } catch (NullPointerException success) {}
808      }
809  
600
601
810      /**
811       * Constructor throws if corePoolSize argument is less than zero
812       */
813      public void testConstructor6() {
814          try {
815 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
815 >            new CustomTPE(-1, 1, 1L, SECONDS,
816 >                          new ArrayBlockingQueue<Runnable>(10),
817 >                          new SimpleThreadFactory());
818              shouldThrow();
819          } catch (IllegalArgumentException success) {}
820      }
# Line 614 | Line 824 | public class ThreadPoolExecutorSubclassT
824       */
825      public void testConstructor7() {
826          try {
827 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
827 >            new CustomTPE(1,-1, 1L, SECONDS,
828 >                          new ArrayBlockingQueue<Runnable>(10),
829 >                          new SimpleThreadFactory());
830              shouldThrow();
831          } catch (IllegalArgumentException success) {}
832      }
# Line 624 | Line 836 | public class ThreadPoolExecutorSubclassT
836       */
837      public void testConstructor8() {
838          try {
839 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
839 >            new CustomTPE(1, 0, 1L, SECONDS,
840 >                          new ArrayBlockingQueue<Runnable>(10),
841 >                          new SimpleThreadFactory());
842              shouldThrow();
843          } catch (IllegalArgumentException success) {}
844      }
# Line 634 | Line 848 | public class ThreadPoolExecutorSubclassT
848       */
849      public void testConstructor9() {
850          try {
851 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
851 >            new CustomTPE(1, 2, -1L, SECONDS,
852 >                          new ArrayBlockingQueue<Runnable>(10),
853 >                          new SimpleThreadFactory());
854              shouldThrow();
855          } catch (IllegalArgumentException success) {}
856      }
# Line 644 | Line 860 | public class ThreadPoolExecutorSubclassT
860       */
861      public void testConstructor10() {
862          try {
863 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
863 >            new CustomTPE(2, 1, 1L, SECONDS,
864 >                          new ArrayBlockingQueue<Runnable>(10),
865 >                          new SimpleThreadFactory());
866              shouldThrow();
867          } catch (IllegalArgumentException success) {}
868      }
# Line 654 | Line 872 | public class ThreadPoolExecutorSubclassT
872       */
873      public void testConstructorNullPointerException2() {
874          try {
875 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
875 >            new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
876              shouldThrow();
877          } catch (NullPointerException success) {}
878      }
# Line 664 | Line 882 | public class ThreadPoolExecutorSubclassT
882       */
883      public void testConstructorNullPointerException3() {
884          try {
885 <            ThreadFactory f = null;
886 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
885 >            new CustomTPE(1, 2, 1L, SECONDS,
886 >                          new ArrayBlockingQueue<Runnable>(10),
887 >                          (ThreadFactory) null);
888              shouldThrow();
889          } catch (NullPointerException success) {}
890      }
891  
673
892      /**
893       * Constructor throws if corePoolSize argument is less than zero
894       */
895      public void testConstructor11() {
896          try {
897 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
897 >            new CustomTPE(-1, 1, 1L, SECONDS,
898 >                          new ArrayBlockingQueue<Runnable>(10),
899 >                          new NoOpREHandler());
900              shouldThrow();
901          } catch (IllegalArgumentException success) {}
902      }
# Line 686 | Line 906 | public class ThreadPoolExecutorSubclassT
906       */
907      public void testConstructor12() {
908          try {
909 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
909 >            new CustomTPE(1, -1, 1L, SECONDS,
910 >                          new ArrayBlockingQueue<Runnable>(10),
911 >                          new NoOpREHandler());
912              shouldThrow();
913          } catch (IllegalArgumentException success) {}
914      }
# Line 696 | Line 918 | public class ThreadPoolExecutorSubclassT
918       */
919      public void testConstructor13() {
920          try {
921 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
921 >            new CustomTPE(1, 0, 1L, SECONDS,
922 >                          new ArrayBlockingQueue<Runnable>(10),
923 >                          new NoOpREHandler());
924              shouldThrow();
925          } catch (IllegalArgumentException success) {}
926      }
# Line 706 | Line 930 | public class ThreadPoolExecutorSubclassT
930       */
931      public void testConstructor14() {
932          try {
933 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
933 >            new CustomTPE(1, 2, -1L, SECONDS,
934 >                          new ArrayBlockingQueue<Runnable>(10),
935 >                          new NoOpREHandler());
936              shouldThrow();
937          } catch (IllegalArgumentException success) {}
938      }
# Line 716 | Line 942 | public class ThreadPoolExecutorSubclassT
942       */
943      public void testConstructor15() {
944          try {
945 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
945 >            new CustomTPE(2, 1, 1L, SECONDS,
946 >                          new ArrayBlockingQueue<Runnable>(10),
947 >                          new NoOpREHandler());
948              shouldThrow();
949          } catch (IllegalArgumentException success) {}
950      }
# Line 726 | Line 954 | public class ThreadPoolExecutorSubclassT
954       */
955      public void testConstructorNullPointerException4() {
956          try {
957 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
957 >            new CustomTPE(1, 2, 1L, SECONDS,
958 >                          null,
959 >                          new NoOpREHandler());
960              shouldThrow();
961          } catch (NullPointerException success) {}
962      }
# Line 736 | Line 966 | public class ThreadPoolExecutorSubclassT
966       */
967      public void testConstructorNullPointerException5() {
968          try {
969 <            RejectedExecutionHandler r = null;
970 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
969 >            new CustomTPE(1, 2, 1L, SECONDS,
970 >                          new ArrayBlockingQueue<Runnable>(10),
971 >                          (RejectedExecutionHandler) null);
972              shouldThrow();
973          } catch (NullPointerException success) {}
974      }
975  
745
976      /**
977       * Constructor throws if corePoolSize argument is less than zero
978       */
979      public void testConstructor16() {
980          try {
981 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
981 >            new CustomTPE(-1, 1, 1L, SECONDS,
982 >                          new ArrayBlockingQueue<Runnable>(10),
983 >                          new SimpleThreadFactory(),
984 >                          new NoOpREHandler());
985              shouldThrow();
986          } catch (IllegalArgumentException success) {}
987      }
# Line 758 | Line 991 | public class ThreadPoolExecutorSubclassT
991       */
992      public void testConstructor17() {
993          try {
994 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
994 >            new CustomTPE(1, -1, 1L, SECONDS,
995 >                          new ArrayBlockingQueue<Runnable>(10),
996 >                          new SimpleThreadFactory(),
997 >                          new NoOpREHandler());
998              shouldThrow();
999          } catch (IllegalArgumentException success) {}
1000      }
# Line 768 | Line 1004 | public class ThreadPoolExecutorSubclassT
1004       */
1005      public void testConstructor18() {
1006          try {
1007 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1007 >            new CustomTPE(1, 0, 1L, SECONDS,
1008 >                          new ArrayBlockingQueue<Runnable>(10),
1009 >                          new SimpleThreadFactory(),
1010 >                          new NoOpREHandler());
1011              shouldThrow();
1012          } catch (IllegalArgumentException success) {}
1013      }
# Line 778 | Line 1017 | public class ThreadPoolExecutorSubclassT
1017       */
1018      public void testConstructor19() {
1019          try {
1020 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1020 >            new CustomTPE(1, 2, -1L, SECONDS,
1021 >                          new ArrayBlockingQueue<Runnable>(10),
1022 >                          new SimpleThreadFactory(),
1023 >                          new NoOpREHandler());
1024              shouldThrow();
1025          } catch (IllegalArgumentException success) {}
1026      }
# Line 788 | Line 1030 | public class ThreadPoolExecutorSubclassT
1030       */
1031      public void testConstructor20() {
1032          try {
1033 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1033 >            new CustomTPE(2, 1, 1L, SECONDS,
1034 >                          new ArrayBlockingQueue<Runnable>(10),
1035 >                          new SimpleThreadFactory(),
1036 >                          new NoOpREHandler());
1037              shouldThrow();
1038          } catch (IllegalArgumentException success) {}
1039      }
1040  
1041      /**
1042 <     * Constructor throws if workQueue is set to null
1042 >     * Constructor throws if workQueue is null
1043       */
1044      public void testConstructorNullPointerException6() {
1045          try {
1046 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1046 >            new CustomTPE(1, 2, 1L, SECONDS,
1047 >                          null,
1048 >                          new SimpleThreadFactory(),
1049 >                          new NoOpREHandler());
1050              shouldThrow();
1051          } catch (NullPointerException success) {}
1052      }
1053  
1054      /**
1055 <     * Constructor throws if handler is set to null
1055 >     * Constructor throws if handler is null
1056       */
1057      public void testConstructorNullPointerException7() {
1058          try {
1059 <            RejectedExecutionHandler r = null;
1060 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1059 >            new CustomTPE(1, 2, 1L, SECONDS,
1060 >                          new ArrayBlockingQueue<Runnable>(10),
1061 >                          new SimpleThreadFactory(),
1062 >                          (RejectedExecutionHandler) null);
1063              shouldThrow();
1064          } catch (NullPointerException success) {}
1065      }
1066  
1067      /**
1068 <     * Constructor throws if ThreadFactory is set top null
1068 >     * Constructor throws if ThreadFactory is null
1069       */
1070      public void testConstructorNullPointerException8() {
1071          try {
1072 <            ThreadFactory f = null;
1073 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new NoOpREHandler());
1072 >            new CustomTPE(1, 2, 1L, SECONDS,
1073 >                          new ArrayBlockingQueue<Runnable>(10),
1074 >                          (ThreadFactory) null,
1075 >                          new NoOpREHandler());
1076              shouldThrow();
1077          } catch (NullPointerException success) {}
1078      }
1079  
828
1080      /**
1081       * execute throws RejectedExecutionException if saturated.
1082       */
1083      public void testSaturatedExecute() {
1084 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
1085 <        try {
1086 <
1087 <            for (int i = 0; i < 5; ++i) {
1088 <                p.execute(new MediumRunnable());
1084 >        ThreadPoolExecutor p =
1085 >            new CustomTPE(1, 1,
1086 >                          LONG_DELAY_MS, MILLISECONDS,
1087 >                          new ArrayBlockingQueue<Runnable>(1));
1088 >        final CountDownLatch done = new CountDownLatch(1);
1089 >        try {
1090 >            Runnable task = new CheckedRunnable() {
1091 >                public void realRun() throws InterruptedException {
1092 >                    done.await();
1093 >                }};
1094 >            for (int i = 0; i < 2; ++i)
1095 >                p.execute(task);
1096 >            for (int i = 0; i < 2; ++i) {
1097 >                try {
1098 >                    p.execute(task);
1099 >                    shouldThrow();
1100 >                } catch (RejectedExecutionException success) {}
1101 >                assertTrue(p.getTaskCount() <= 2);
1102              }
1103 <            shouldThrow();
1104 <        } catch (RejectedExecutionException success) {}
1105 <        joinPool(p);
1103 >        } finally {
1104 >            done.countDown();
1105 >            joinPool(p);
1106 >        }
1107      }
1108  
1109      /**
# Line 846 | Line 1111 | public class ThreadPoolExecutorSubclassT
1111       */
1112      public void testSaturatedExecute2() {
1113          RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1114 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1114 >        ThreadPoolExecutor p = new CustomTPE(1, 1,
1115 >                                             LONG_DELAY_MS, MILLISECONDS,
1116 >                                             new ArrayBlockingQueue<Runnable>(1),
1117 >                                             h);
1118          try {
851
1119              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1120 <            for (int i = 0; i < 5; ++i) {
1120 >            for (int i = 0; i < tasks.length; ++i)
1121                  tasks[i] = new TrackedNoOpRunnable();
855            }
1122              TrackedLongRunnable mr = new TrackedLongRunnable();
1123              p.execute(mr);
1124 <            for (int i = 0; i < 5; ++i) {
1124 >            for (int i = 0; i < tasks.length; ++i)
1125                  p.execute(tasks[i]);
1126 <            }
861 <            for (int i = 1; i < 5; ++i) {
1126 >            for (int i = 1; i < tasks.length; ++i)
1127                  assertTrue(tasks[i].done);
863            }
1128              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1129          } finally {
1130              joinPool(p);
# Line 872 | Line 1136 | public class ThreadPoolExecutorSubclassT
1136       */
1137      public void testSaturatedExecute3() {
1138          RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1139 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1139 >        ThreadPoolExecutor p =
1140 >            new CustomTPE(1, 1,
1141 >                          LONG_DELAY_MS, MILLISECONDS,
1142 >                          new ArrayBlockingQueue<Runnable>(1),
1143 >                          h);
1144          try {
877
1145              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1146 <            for (int i = 0; i < 5; ++i) {
1146 >            for (int i = 0; i < tasks.length; ++i)
1147                  tasks[i] = new TrackedNoOpRunnable();
881            }
1148              p.execute(new TrackedLongRunnable());
1149 <            for (int i = 0; i < 5; ++i) {
1150 <                p.execute(tasks[i]);
1151 <            }
1152 <            for (int i = 0; i < 5; ++i) {
887 <                assertFalse(tasks[i].done);
888 <            }
1149 >            for (TrackedNoOpRunnable task : tasks)
1150 >                p.execute(task);
1151 >            for (TrackedNoOpRunnable task : tasks)
1152 >                assertFalse(task.done);
1153              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1154          } finally {
1155              joinPool(p);
# Line 917 | Line 1181 | public class ThreadPoolExecutorSubclassT
1181       * execute throws RejectedExecutionException if shutdown
1182       */
1183      public void testRejectedExecutionExceptionOnShutdown() {
1184 <        ThreadPoolExecutor tpe =
1184 >        ThreadPoolExecutor p =
1185              new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1186 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1186 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1187          try {
1188 <            tpe.execute(new NoOpRunnable());
1188 >            p.execute(new NoOpRunnable());
1189              shouldThrow();
1190          } catch (RejectedExecutionException success) {}
1191  
1192 <        joinPool(tpe);
1192 >        joinPool(p);
1193      }
1194  
1195      /**
# Line 962 | Line 1226 | public class ThreadPoolExecutorSubclassT
1226          }
1227      }
1228  
965
1229      /**
1230       * execute using DiscardOldestPolicy drops task on shutdown
1231       */
# Line 980 | Line 1243 | public class ThreadPoolExecutorSubclassT
1243          }
1244      }
1245  
983
1246      /**
1247       * execute(null) throws NPE
1248       */
1249      public void testExecuteNull() {
1250 <        ThreadPoolExecutor tpe = null;
1250 >        ThreadPoolExecutor p =
1251 >            new CustomTPE(1, 2, 1L, SECONDS,
1252 >                          new ArrayBlockingQueue<Runnable>(10));
1253          try {
1254 <            tpe = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
991 <            tpe.execute(null);
1254 >            p.execute(null);
1255              shouldThrow();
1256          } catch (NullPointerException success) {}
1257  
1258 <        joinPool(tpe);
1258 >        joinPool(p);
1259      }
1260  
1261      /**
1262       * setCorePoolSize of negative value throws IllegalArgumentException
1263       */
1264      public void testCorePoolSizeIllegalArgumentException() {
1265 <        ThreadPoolExecutor tpe =
1265 >        ThreadPoolExecutor p =
1266              new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1267          try {
1268 <            tpe.setCorePoolSize(-1);
1268 >            p.setCorePoolSize(-1);
1269              shouldThrow();
1270          } catch (IllegalArgumentException success) {
1271          } finally {
1272 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1272 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1273          }
1274 <        joinPool(tpe);
1274 >        joinPool(p);
1275      }
1276  
1277      /**
# Line 1016 | Line 1279 | public class ThreadPoolExecutorSubclassT
1279       * if given a value less the core pool size
1280       */
1281      public void testMaximumPoolSizeIllegalArgumentException() {
1282 <        ThreadPoolExecutor tpe =
1282 >        ThreadPoolExecutor p =
1283              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1284          try {
1285 <            tpe.setMaximumPoolSize(1);
1285 >            p.setMaximumPoolSize(1);
1286              shouldThrow();
1287          } catch (IllegalArgumentException success) {
1288          } finally {
1289 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1289 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1290          }
1291 <        joinPool(tpe);
1291 >        joinPool(p);
1292      }
1293  
1294      /**
# Line 1033 | Line 1296 | public class ThreadPoolExecutorSubclassT
1296       * if given a negative value
1297       */
1298      public void testMaximumPoolSizeIllegalArgumentException2() {
1299 <        ThreadPoolExecutor tpe =
1299 >        ThreadPoolExecutor p =
1300              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1301          try {
1302 <            tpe.setMaximumPoolSize(-1);
1302 >            p.setMaximumPoolSize(-1);
1303              shouldThrow();
1304          } catch (IllegalArgumentException success) {
1305          } finally {
1306 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1306 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1307          }
1308 <        joinPool(tpe);
1308 >        joinPool(p);
1309      }
1310  
1048
1311      /**
1312       * setKeepAliveTime throws IllegalArgumentException
1313       * when given a negative value
1314       */
1315      public void testKeepAliveTimeIllegalArgumentException() {
1316 <        ThreadPoolExecutor tpe =
1316 >        ThreadPoolExecutor p =
1317              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1318  
1319          try {
1320 <            tpe.setKeepAliveTime(-1,MILLISECONDS);
1320 >            p.setKeepAliveTime(-1,MILLISECONDS);
1321              shouldThrow();
1322          } catch (IllegalArgumentException success) {
1323          } finally {
1324 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1324 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1325          }
1326 <        joinPool(tpe);
1326 >        joinPool(p);
1327      }
1328  
1329      /**
1330       * terminated() is called on termination
1331       */
1332      public void testTerminated() {
1333 <        CustomTPE tpe = new CustomTPE();
1334 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1335 <        assertTrue(tpe.terminatedCalled);
1336 <        joinPool(tpe);
1333 >        CustomTPE p = new CustomTPE();
1334 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1335 >        assertTrue(p.terminatedCalled());
1336 >        joinPool(p);
1337      }
1338  
1339      /**
1340       * beforeExecute and afterExecute are called when executing task
1341       */
1342      public void testBeforeAfter() throws InterruptedException {
1343 <        CustomTPE tpe = new CustomTPE();
1343 >        CustomTPE p = new CustomTPE();
1344          try {
1345 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1346 <            tpe.execute(r);
1347 <            Thread.sleep(SHORT_DELAY_MS);
1348 <            assertTrue(r.done);
1349 <            assertTrue(tpe.beforeCalled);
1350 <            assertTrue(tpe.afterCalled);
1351 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1345 >            final CountDownLatch done = new CountDownLatch(1);
1346 >            p.execute(new CheckedRunnable() {
1347 >                public void realRun() {
1348 >                    done.countDown();
1349 >                }});
1350 >            await(p.afterCalled);
1351 >            assertEquals(0, done.getCount());
1352 >            assertTrue(p.afterCalled());
1353 >            assertTrue(p.beforeCalled());
1354 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1355          } finally {
1356 <            joinPool(tpe);
1356 >            joinPool(p);
1357          }
1358      }
1359  
# Line 1134 | Line 1399 | public class ThreadPoolExecutorSubclassT
1399          }
1400      }
1401  
1137
1402      /**
1403       * invokeAny(null) throws NPE
1404       */
# Line 1296 | Line 1560 | public class ThreadPoolExecutorSubclassT
1560          }
1561      }
1562  
1299
1300
1563      /**
1564       * timed invokeAny(null) throws NPE
1565       */
# Line 1484 | Line 1746 | public class ThreadPoolExecutorSubclassT
1746              l.add(new StringTask());
1747              l.add(new StringTask());
1748              List<Future<String>> futures =
1749 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1749 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1750              assertEquals(2, futures.size());
1751              for (Future<String> future : futures)
1752                  assertSame(TEST_STRING, future.get());
# Line 1499 | Line 1761 | public class ThreadPoolExecutorSubclassT
1761      public void testTimedInvokeAll6() throws Exception {
1762          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1763          try {
1764 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1765 <            l.add(new StringTask());
1766 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1767 <            l.add(new StringTask());
1768 <            List<Future<String>> futures =
1769 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1770 <            assertEquals(3, futures.size());
1771 <            Iterator<Future<String>> it = futures.iterator();
1772 <            Future<String> f1 = it.next();
1773 <            Future<String> f2 = it.next();
1774 <            Future<String> f3 = it.next();
1775 <            assertTrue(f1.isDone());
1776 <            assertTrue(f2.isDone());
1777 <            assertTrue(f3.isDone());
1778 <            assertFalse(f1.isCancelled());
1779 <            assertTrue(f2.isCancelled());
1764 >            for (long timeout = timeoutMillis();;) {
1765 >                List<Callable<String>> tasks = new ArrayList<>();
1766 >                tasks.add(new StringTask("0"));
1767 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1768 >                tasks.add(new StringTask("2"));
1769 >                long startTime = System.nanoTime();
1770 >                List<Future<String>> futures =
1771 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1772 >                assertEquals(tasks.size(), futures.size());
1773 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1774 >                for (Future future : futures)
1775 >                    assertTrue(future.isDone());
1776 >                assertTrue(futures.get(1).isCancelled());
1777 >                try {
1778 >                    assertEquals("0", futures.get(0).get());
1779 >                    assertEquals("2", futures.get(2).get());
1780 >                    break;
1781 >                } catch (CancellationException retryWithLongerTimeout) {
1782 >                    timeout *= 2;
1783 >                    if (timeout >= LONG_DELAY_MS / 2)
1784 >                        fail("expected exactly one task to be cancelled");
1785 >                }
1786 >            }
1787          } finally {
1788              joinPool(e);
1789          }
# Line 1525 | Line 1794 | public class ThreadPoolExecutorSubclassT
1794       * thread factory fails to create more
1795       */
1796      public void testFailingThreadFactory() throws InterruptedException {
1797 <        ExecutorService e = new CustomTPE(100, 100, LONG_DELAY_MS, MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
1798 <        try {
1799 <            for (int k = 0; k < 100; ++k) {
1800 <                e.execute(new NoOpRunnable());
1801 <            }
1802 <            Thread.sleep(LONG_DELAY_MS);
1797 >        final ExecutorService e =
1798 >            new CustomTPE(100, 100,
1799 >                          LONG_DELAY_MS, MILLISECONDS,
1800 >                          new LinkedBlockingQueue<Runnable>(),
1801 >                          new FailingThreadFactory());
1802 >        try {
1803 >            final int TASKS = 100;
1804 >            final CountDownLatch done = new CountDownLatch(TASKS);
1805 >            for (int k = 0; k < TASKS; ++k)
1806 >                e.execute(new CheckedRunnable() {
1807 >                    public void realRun() {
1808 >                        done.countDown();
1809 >                    }});
1810 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1811          } finally {
1812              joinPool(e);
1813          }
# Line 1540 | Line 1817 | public class ThreadPoolExecutorSubclassT
1817       * allowsCoreThreadTimeOut is by default false.
1818       */
1819      public void testAllowsCoreThreadTimeOut() {
1820 <        ThreadPoolExecutor tpe = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1821 <        assertFalse(tpe.allowsCoreThreadTimeOut());
1822 <        joinPool(tpe);
1820 >        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1821 >        assertFalse(p.allowsCoreThreadTimeOut());
1822 >        joinPool(p);
1823      }
1824  
1825      /**
1826       * allowCoreThreadTimeOut(true) causes idle threads to time out
1827       */
1828 <    public void testAllowCoreThreadTimeOut_true() throws InterruptedException {
1829 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1830 <        tpe.allowCoreThreadTimeOut(true);
1831 <        tpe.execute(new NoOpRunnable());
1832 <        try {
1833 <            Thread.sleep(MEDIUM_DELAY_MS);
1834 <            assertEquals(0, tpe.getPoolSize());
1828 >    public void testAllowCoreThreadTimeOut_true() throws Exception {
1829 >        long keepAliveTime = timeoutMillis();
1830 >        final ThreadPoolExecutor p =
1831 >            new CustomTPE(2, 10,
1832 >                          keepAliveTime, MILLISECONDS,
1833 >                          new ArrayBlockingQueue<Runnable>(10));
1834 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1835 >        try {
1836 >            p.allowCoreThreadTimeOut(true);
1837 >            p.execute(new CheckedRunnable() {
1838 >                public void realRun() {
1839 >                    threadStarted.countDown();
1840 >                    assertEquals(1, p.getPoolSize());
1841 >                }});
1842 >            await(threadStarted);
1843 >            delay(keepAliveTime);
1844 >            long startTime = System.nanoTime();
1845 >            while (p.getPoolSize() > 0
1846 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1847 >                Thread.yield();
1848 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1849 >            assertEquals(0, p.getPoolSize());
1850          } finally {
1851 <            joinPool(tpe);
1851 >            joinPool(p);
1852          }
1853      }
1854  
1855      /**
1856       * allowCoreThreadTimeOut(false) causes idle threads not to time out
1857       */
1858 <    public void testAllowCoreThreadTimeOut_false() throws InterruptedException {
1859 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1860 <        tpe.allowCoreThreadTimeOut(false);
1861 <        tpe.execute(new NoOpRunnable());
1862 <        try {
1863 <            Thread.sleep(MEDIUM_DELAY_MS);
1864 <            assertTrue(tpe.getPoolSize() >= 1);
1858 >    public void testAllowCoreThreadTimeOut_false() throws Exception {
1859 >        long keepAliveTime = timeoutMillis();
1860 >        final ThreadPoolExecutor p =
1861 >            new CustomTPE(2, 10,
1862 >                          keepAliveTime, MILLISECONDS,
1863 >                          new ArrayBlockingQueue<Runnable>(10));
1864 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1865 >        try {
1866 >            p.allowCoreThreadTimeOut(false);
1867 >            p.execute(new CheckedRunnable() {
1868 >                public void realRun() throws InterruptedException {
1869 >                    threadStarted.countDown();
1870 >                    assertTrue(p.getPoolSize() >= 1);
1871 >                }});
1872 >            delay(2 * keepAliveTime);
1873 >            assertTrue(p.getPoolSize() >= 1);
1874 >        } finally {
1875 >            joinPool(p);
1876 >        }
1877 >    }
1878 >
1879 >    /**
1880 >     * get(cancelled task) throws CancellationException
1881 >     * (in part, a test of CustomTPE itself)
1882 >     */
1883 >    public void testGet_cancelled() throws Exception {
1884 >        final ExecutorService e =
1885 >            new CustomTPE(1, 1,
1886 >                          LONG_DELAY_MS, MILLISECONDS,
1887 >                          new LinkedBlockingQueue<Runnable>());
1888 >        try {
1889 >            final CountDownLatch blockerStarted = new CountDownLatch(1);
1890 >            final CountDownLatch done = new CountDownLatch(1);
1891 >            final List<Future<?>> futures = new ArrayList<>();
1892 >            for (int i = 0; i < 2; i++) {
1893 >                Runnable r = new CheckedRunnable() { public void realRun()
1894 >                                                         throws Throwable {
1895 >                    blockerStarted.countDown();
1896 >                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1897 >                }};
1898 >                futures.add(e.submit(r));
1899 >            }
1900 >            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1901 >            for (Future<?> future : futures) future.cancel(false);
1902 >            for (Future<?> future : futures) {
1903 >                try {
1904 >                    future.get();
1905 >                    shouldThrow();
1906 >                } catch (CancellationException success) {}
1907 >                try {
1908 >                    future.get(LONG_DELAY_MS, MILLISECONDS);
1909 >                    shouldThrow();
1910 >                } catch (CancellationException success) {}
1911 >                assertTrue(future.isCancelled());
1912 >                assertTrue(future.isDone());
1913 >            }
1914 >            done.countDown();
1915          } finally {
1916 <            joinPool(tpe);
1916 >            joinPool(e);
1917          }
1918      }
1919  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines