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.28 by jsr166, Sat May 7 19:49:37 2011 UTC vs.
Revision 1.63 by jsr166, Sun Oct 4 02:07:32 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 221 | Line 254 | public class ThreadPoolExecutorSubclassT
254                            new ArrayBlockingQueue<Runnable>(10));
255          final CountDownLatch threadStarted = new CountDownLatch(1);
256          final CountDownLatch done = new CountDownLatch(1);
257 <        try {
257 >        try (PoolCleaner cleaner = cleaner(p)) {
258              assertEquals(0, p.getActiveCount());
259              p.execute(new CheckedRunnable() {
260                  public void realRun() throws InterruptedException {
# Line 231 | Line 264 | public class ThreadPoolExecutorSubclassT
264                  }});
265              assertTrue(threadStarted.await(SMALL_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 >        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 >        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 <            delay(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 495 | Line 581 | public class ThreadPoolExecutorSubclassT
581          joinPool(p);
582      }
583  
498
584      /**
585       * isTerminated is false before termination, true after
586       */
# Line 669 | Line 754 | public class ThreadPoolExecutorSubclassT
754      }
755  
756      /**
757 <     * shutdownNow returns a list containing tasks that were not run
757 >     * shutdownNow returns a list containing tasks that were not run,
758 >     * and those tasks are drained from the queue
759       */
760 <    public void testShutdownNow() {
761 <        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
762 <        List l;
763 <        try {
764 <            for (int i = 0; i < 5; i++)
765 <                p.execute(new MediumPossiblyInterruptedRunnable());
766 <        }
767 <        finally {
760 >    public void testShutdownNow() throws InterruptedException {
761 >        final int poolSize = 2;
762 >        final int count = 5;
763 >        final AtomicInteger ran = new AtomicInteger(0);
764 >        ThreadPoolExecutor p =
765 >            new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
766 >                          new ArrayBlockingQueue<Runnable>(10));
767 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
768 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
769 >            threadsStarted.countDown();
770              try {
771 <                l = p.shutdownNow();
772 <            } catch (SecurityException ok) { return; }
771 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
772 >            } catch (InterruptedException success) {}
773 >            ran.getAndIncrement();
774 >        }};
775 >        for (int i = 0; i < count; i++)
776 >            p.execute(waiter);
777 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
778 >        assertEquals(poolSize, p.getActiveCount());
779 >        assertEquals(0, p.getCompletedTaskCount());
780 >        final List<Runnable> queuedTasks;
781 >        try {
782 >            queuedTasks = p.shutdownNow();
783 >        } catch (SecurityException ok) {
784 >            return; // Allowed in case test doesn't have privs
785          }
786          assertTrue(p.isShutdown());
787 <        assertTrue(l.size() <= 4);
787 >        assertTrue(p.getQueue().isEmpty());
788 >        assertEquals(count - poolSize, queuedTasks.size());
789 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
790 >        assertTrue(p.isTerminated());
791 >        assertEquals(poolSize, ran.get());
792 >        assertEquals(poolSize, p.getCompletedTaskCount());
793      }
794  
795      // Exception Tests
796  
692
797      /**
798       * Constructor throws if corePoolSize argument is less than zero
799       */
800      public void testConstructor1() {
801          try {
802 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
802 >            new CustomTPE(-1, 1, 1L, SECONDS,
803 >                          new ArrayBlockingQueue<Runnable>(10));
804              shouldThrow();
805          } catch (IllegalArgumentException success) {}
806      }
# Line 705 | Line 810 | public class ThreadPoolExecutorSubclassT
810       */
811      public void testConstructor2() {
812          try {
813 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
813 >            new CustomTPE(1, -1, 1L, SECONDS,
814 >                          new ArrayBlockingQueue<Runnable>(10));
815              shouldThrow();
816          } catch (IllegalArgumentException success) {}
817      }
# Line 715 | Line 821 | public class ThreadPoolExecutorSubclassT
821       */
822      public void testConstructor3() {
823          try {
824 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
824 >            new CustomTPE(1, 0, 1L, SECONDS,
825 >                          new ArrayBlockingQueue<Runnable>(10));
826              shouldThrow();
827          } catch (IllegalArgumentException success) {}
828      }
# Line 725 | Line 832 | public class ThreadPoolExecutorSubclassT
832       */
833      public void testConstructor4() {
834          try {
835 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
835 >            new CustomTPE(1, 2, -1L, SECONDS,
836 >                          new ArrayBlockingQueue<Runnable>(10));
837              shouldThrow();
838          } catch (IllegalArgumentException success) {}
839      }
# Line 735 | Line 843 | public class ThreadPoolExecutorSubclassT
843       */
844      public void testConstructor5() {
845          try {
846 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
846 >            new CustomTPE(2, 1, 1L, SECONDS,
847 >                          new ArrayBlockingQueue<Runnable>(10));
848              shouldThrow();
849          } catch (IllegalArgumentException success) {}
850      }
# Line 745 | Line 854 | public class ThreadPoolExecutorSubclassT
854       */
855      public void testConstructorNullPointerException() {
856          try {
857 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
857 >            new CustomTPE(1, 2, 1L, SECONDS, null);
858              shouldThrow();
859          } catch (NullPointerException success) {}
860      }
861  
753
754
862      /**
863       * Constructor throws if corePoolSize argument is less than zero
864       */
865      public void testConstructor6() {
866          try {
867 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
867 >            new CustomTPE(-1, 1, 1L, SECONDS,
868 >                          new ArrayBlockingQueue<Runnable>(10),
869 >                          new SimpleThreadFactory());
870              shouldThrow();
871          } catch (IllegalArgumentException success) {}
872      }
# Line 767 | Line 876 | public class ThreadPoolExecutorSubclassT
876       */
877      public void testConstructor7() {
878          try {
879 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
879 >            new CustomTPE(1,-1, 1L, SECONDS,
880 >                          new ArrayBlockingQueue<Runnable>(10),
881 >                          new SimpleThreadFactory());
882              shouldThrow();
883          } catch (IllegalArgumentException success) {}
884      }
# Line 777 | Line 888 | public class ThreadPoolExecutorSubclassT
888       */
889      public void testConstructor8() {
890          try {
891 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
891 >            new CustomTPE(1, 0, 1L, SECONDS,
892 >                          new ArrayBlockingQueue<Runnable>(10),
893 >                          new SimpleThreadFactory());
894              shouldThrow();
895          } catch (IllegalArgumentException success) {}
896      }
# Line 787 | Line 900 | public class ThreadPoolExecutorSubclassT
900       */
901      public void testConstructor9() {
902          try {
903 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
903 >            new CustomTPE(1, 2, -1L, SECONDS,
904 >                          new ArrayBlockingQueue<Runnable>(10),
905 >                          new SimpleThreadFactory());
906              shouldThrow();
907          } catch (IllegalArgumentException success) {}
908      }
# Line 797 | Line 912 | public class ThreadPoolExecutorSubclassT
912       */
913      public void testConstructor10() {
914          try {
915 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
915 >            new CustomTPE(2, 1, 1L, SECONDS,
916 >                          new ArrayBlockingQueue<Runnable>(10),
917 >                          new SimpleThreadFactory());
918              shouldThrow();
919          } catch (IllegalArgumentException success) {}
920      }
# Line 807 | Line 924 | public class ThreadPoolExecutorSubclassT
924       */
925      public void testConstructorNullPointerException2() {
926          try {
927 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
927 >            new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
928              shouldThrow();
929          } catch (NullPointerException success) {}
930      }
# Line 817 | Line 934 | public class ThreadPoolExecutorSubclassT
934       */
935      public void testConstructorNullPointerException3() {
936          try {
937 <            ThreadFactory f = null;
938 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
937 >            new CustomTPE(1, 2, 1L, SECONDS,
938 >                          new ArrayBlockingQueue<Runnable>(10),
939 >                          (ThreadFactory) null);
940              shouldThrow();
941          } catch (NullPointerException success) {}
942      }
943  
826
944      /**
945       * Constructor throws if corePoolSize argument is less than zero
946       */
947      public void testConstructor11() {
948          try {
949 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
949 >            new CustomTPE(-1, 1, 1L, SECONDS,
950 >                          new ArrayBlockingQueue<Runnable>(10),
951 >                          new NoOpREHandler());
952              shouldThrow();
953          } catch (IllegalArgumentException success) {}
954      }
# Line 839 | Line 958 | public class ThreadPoolExecutorSubclassT
958       */
959      public void testConstructor12() {
960          try {
961 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
961 >            new CustomTPE(1, -1, 1L, SECONDS,
962 >                          new ArrayBlockingQueue<Runnable>(10),
963 >                          new NoOpREHandler());
964              shouldThrow();
965          } catch (IllegalArgumentException success) {}
966      }
# Line 849 | Line 970 | public class ThreadPoolExecutorSubclassT
970       */
971      public void testConstructor13() {
972          try {
973 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
973 >            new CustomTPE(1, 0, 1L, SECONDS,
974 >                          new ArrayBlockingQueue<Runnable>(10),
975 >                          new NoOpREHandler());
976              shouldThrow();
977          } catch (IllegalArgumentException success) {}
978      }
# Line 859 | Line 982 | public class ThreadPoolExecutorSubclassT
982       */
983      public void testConstructor14() {
984          try {
985 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
985 >            new CustomTPE(1, 2, -1L, SECONDS,
986 >                          new ArrayBlockingQueue<Runnable>(10),
987 >                          new NoOpREHandler());
988              shouldThrow();
989          } catch (IllegalArgumentException success) {}
990      }
# Line 869 | Line 994 | public class ThreadPoolExecutorSubclassT
994       */
995      public void testConstructor15() {
996          try {
997 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
997 >            new CustomTPE(2, 1, 1L, SECONDS,
998 >                          new ArrayBlockingQueue<Runnable>(10),
999 >                          new NoOpREHandler());
1000              shouldThrow();
1001          } catch (IllegalArgumentException success) {}
1002      }
# Line 879 | Line 1006 | public class ThreadPoolExecutorSubclassT
1006       */
1007      public void testConstructorNullPointerException4() {
1008          try {
1009 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
1009 >            new CustomTPE(1, 2, 1L, SECONDS,
1010 >                          null,
1011 >                          new NoOpREHandler());
1012              shouldThrow();
1013          } catch (NullPointerException success) {}
1014      }
# Line 889 | Line 1018 | public class ThreadPoolExecutorSubclassT
1018       */
1019      public void testConstructorNullPointerException5() {
1020          try {
1021 <            RejectedExecutionHandler r = null;
1022 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
1021 >            new CustomTPE(1, 2, 1L, SECONDS,
1022 >                          new ArrayBlockingQueue<Runnable>(10),
1023 >                          (RejectedExecutionHandler) null);
1024              shouldThrow();
1025          } catch (NullPointerException success) {}
1026      }
1027  
898
1028      /**
1029       * Constructor throws if corePoolSize argument is less than zero
1030       */
1031      public void testConstructor16() {
1032          try {
1033 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1033 >            new CustomTPE(-1, 1, 1L, SECONDS,
1034 >                          new ArrayBlockingQueue<Runnable>(10),
1035 >                          new SimpleThreadFactory(),
1036 >                          new NoOpREHandler());
1037              shouldThrow();
1038          } catch (IllegalArgumentException success) {}
1039      }
# Line 911 | Line 1043 | public class ThreadPoolExecutorSubclassT
1043       */
1044      public void testConstructor17() {
1045          try {
1046 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1046 >            new CustomTPE(1, -1, 1L, SECONDS,
1047 >                          new ArrayBlockingQueue<Runnable>(10),
1048 >                          new SimpleThreadFactory(),
1049 >                          new NoOpREHandler());
1050              shouldThrow();
1051          } catch (IllegalArgumentException success) {}
1052      }
# Line 921 | Line 1056 | public class ThreadPoolExecutorSubclassT
1056       */
1057      public void testConstructor18() {
1058          try {
1059 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1059 >            new CustomTPE(1, 0, 1L, SECONDS,
1060 >                          new ArrayBlockingQueue<Runnable>(10),
1061 >                          new SimpleThreadFactory(),
1062 >                          new NoOpREHandler());
1063              shouldThrow();
1064          } catch (IllegalArgumentException success) {}
1065      }
# Line 931 | Line 1069 | public class ThreadPoolExecutorSubclassT
1069       */
1070      public void testConstructor19() {
1071          try {
1072 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1072 >            new CustomTPE(1, 2, -1L, SECONDS,
1073 >                          new ArrayBlockingQueue<Runnable>(10),
1074 >                          new SimpleThreadFactory(),
1075 >                          new NoOpREHandler());
1076              shouldThrow();
1077          } catch (IllegalArgumentException success) {}
1078      }
# Line 941 | Line 1082 | public class ThreadPoolExecutorSubclassT
1082       */
1083      public void testConstructor20() {
1084          try {
1085 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1085 >            new CustomTPE(2, 1, 1L, SECONDS,
1086 >                          new ArrayBlockingQueue<Runnable>(10),
1087 >                          new SimpleThreadFactory(),
1088 >                          new NoOpREHandler());
1089              shouldThrow();
1090          } catch (IllegalArgumentException success) {}
1091      }
# Line 951 | Line 1095 | public class ThreadPoolExecutorSubclassT
1095       */
1096      public void testConstructorNullPointerException6() {
1097          try {
1098 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1098 >            new CustomTPE(1, 2, 1L, SECONDS,
1099 >                          null,
1100 >                          new SimpleThreadFactory(),
1101 >                          new NoOpREHandler());
1102              shouldThrow();
1103          } catch (NullPointerException success) {}
1104      }
# Line 961 | Line 1108 | public class ThreadPoolExecutorSubclassT
1108       */
1109      public void testConstructorNullPointerException7() {
1110          try {
1111 <            RejectedExecutionHandler r = null;
1112 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1111 >            new CustomTPE(1, 2, 1L, SECONDS,
1112 >                          new ArrayBlockingQueue<Runnable>(10),
1113 >                          new SimpleThreadFactory(),
1114 >                          (RejectedExecutionHandler) null);
1115              shouldThrow();
1116          } catch (NullPointerException success) {}
1117      }
# Line 972 | Line 1121 | public class ThreadPoolExecutorSubclassT
1121       */
1122      public void testConstructorNullPointerException8() {
1123          try {
1124 <            new CustomTPE(1, 2,
976 <                          LONG_DELAY_MS, MILLISECONDS,
1124 >            new CustomTPE(1, 2, 1L, SECONDS,
1125                            new ArrayBlockingQueue<Runnable>(10),
1126                            (ThreadFactory) null,
1127                            new NoOpREHandler());
# Line 981 | Line 1129 | public class ThreadPoolExecutorSubclassT
1129          } catch (NullPointerException success) {}
1130      }
1131  
984
1132      /**
1133       * execute throws RejectedExecutionException if saturated.
1134       */
# Line 1131 | Line 1278 | public class ThreadPoolExecutorSubclassT
1278          }
1279      }
1280  
1134
1281      /**
1282       * execute using DiscardOldestPolicy drops task on shutdown
1283       */
# Line 1149 | Line 1295 | public class ThreadPoolExecutorSubclassT
1295          }
1296      }
1297  
1152
1298      /**
1299       * execute(null) throws NPE
1300       */
1301      public void testExecuteNull() {
1302 <        ThreadPoolExecutor p = null;
1302 >        ThreadPoolExecutor p =
1303 >            new CustomTPE(1, 2, 1L, SECONDS,
1304 >                          new ArrayBlockingQueue<Runnable>(10));
1305          try {
1159            p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1306              p.execute(null);
1307              shouldThrow();
1308          } catch (NullPointerException success) {}
# Line 1214 | Line 1360 | public class ThreadPoolExecutorSubclassT
1360          joinPool(p);
1361      }
1362  
1217
1363      /**
1364       * setKeepAliveTime throws IllegalArgumentException
1365       * when given a negative value
# Line 1239 | Line 1384 | public class ThreadPoolExecutorSubclassT
1384      public void testTerminated() {
1385          CustomTPE p = new CustomTPE();
1386          try { p.shutdown(); } catch (SecurityException ok) { return; }
1387 <        assertTrue(p.terminatedCalled);
1387 >        assertTrue(p.terminatedCalled());
1388          joinPool(p);
1389      }
1390  
# Line 1249 | Line 1394 | public class ThreadPoolExecutorSubclassT
1394      public void testBeforeAfter() throws InterruptedException {
1395          CustomTPE p = new CustomTPE();
1396          try {
1397 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1398 <            p.execute(r);
1399 <            delay(SHORT_DELAY_MS);
1400 <            assertTrue(r.done);
1401 <            assertTrue(p.beforeCalled);
1402 <            assertTrue(p.afterCalled);
1397 >            final CountDownLatch done = new CountDownLatch(1);
1398 >            p.execute(new CheckedRunnable() {
1399 >                public void realRun() {
1400 >                    done.countDown();
1401 >                }});
1402 >            await(p.afterCalled);
1403 >            assertEquals(0, done.getCount());
1404 >            assertTrue(p.afterCalled());
1405 >            assertTrue(p.beforeCalled());
1406              try { p.shutdown(); } catch (SecurityException ok) { return; }
1407          } finally {
1408              joinPool(p);
# Line 1303 | Line 1451 | public class ThreadPoolExecutorSubclassT
1451          }
1452      }
1453  
1306
1454      /**
1455       * invokeAny(null) throws NPE
1456       */
# Line 1465 | Line 1612 | public class ThreadPoolExecutorSubclassT
1612          }
1613      }
1614  
1468
1469
1615      /**
1616       * timed invokeAny(null) throws NPE
1617       */
# Line 1653 | Line 1798 | public class ThreadPoolExecutorSubclassT
1798              l.add(new StringTask());
1799              l.add(new StringTask());
1800              List<Future<String>> futures =
1801 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1801 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1802              assertEquals(2, futures.size());
1803              for (Future<String> future : futures)
1804                  assertSame(TEST_STRING, future.get());
# Line 1668 | Line 1813 | public class ThreadPoolExecutorSubclassT
1813      public void testTimedInvokeAll6() throws Exception {
1814          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1815          try {
1816 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1817 <            l.add(new StringTask());
1818 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1819 <            l.add(new StringTask());
1820 <            List<Future<String>> futures =
1821 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1822 <            assertEquals(3, futures.size());
1823 <            Iterator<Future<String>> it = futures.iterator();
1824 <            Future<String> f1 = it.next();
1825 <            Future<String> f2 = it.next();
1826 <            Future<String> f3 = it.next();
1827 <            assertTrue(f1.isDone());
1828 <            assertTrue(f2.isDone());
1829 <            assertTrue(f3.isDone());
1830 <            assertFalse(f1.isCancelled());
1831 <            assertTrue(f2.isCancelled());
1816 >            for (long timeout = timeoutMillis();;) {
1817 >                List<Callable<String>> tasks = new ArrayList<>();
1818 >                tasks.add(new StringTask("0"));
1819 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1820 >                tasks.add(new StringTask("2"));
1821 >                long startTime = System.nanoTime();
1822 >                List<Future<String>> futures =
1823 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1824 >                assertEquals(tasks.size(), futures.size());
1825 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1826 >                for (Future future : futures)
1827 >                    assertTrue(future.isDone());
1828 >                assertTrue(futures.get(1).isCancelled());
1829 >                try {
1830 >                    assertEquals("0", futures.get(0).get());
1831 >                    assertEquals("2", futures.get(2).get());
1832 >                    break;
1833 >                } catch (CancellationException retryWithLongerTimeout) {
1834 >                    timeout *= 2;
1835 >                    if (timeout >= LONG_DELAY_MS / 2)
1836 >                        fail("expected exactly one task to be cancelled");
1837 >                }
1838 >            }
1839          } finally {
1840              joinPool(e);
1841          }
# Line 1726 | Line 1878 | public class ThreadPoolExecutorSubclassT
1878       * allowCoreThreadTimeOut(true) causes idle threads to time out
1879       */
1880      public void testAllowCoreThreadTimeOut_true() throws Exception {
1881 +        long keepAliveTime = timeoutMillis();
1882          final ThreadPoolExecutor p =
1883              new CustomTPE(2, 10,
1884 <                          SHORT_DELAY_MS, MILLISECONDS,
1884 >                          keepAliveTime, MILLISECONDS,
1885                            new ArrayBlockingQueue<Runnable>(10));
1886          final CountDownLatch threadStarted = new CountDownLatch(1);
1887          try {
1888              p.allowCoreThreadTimeOut(true);
1889              p.execute(new CheckedRunnable() {
1890 <                public void realRun() throws InterruptedException {
1890 >                public void realRun() {
1891                      threadStarted.countDown();
1892                      assertEquals(1, p.getPoolSize());
1893                  }});
1894 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1895 <            for (int i = 0; i < (MEDIUM_DELAY_MS/10); i++) {
1896 <                if (p.getPoolSize() == 0)
1897 <                    break;
1898 <                delay(10);
1899 <            }
1894 >            await(threadStarted);
1895 >            delay(keepAliveTime);
1896 >            long startTime = System.nanoTime();
1897 >            while (p.getPoolSize() > 0
1898 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1899 >                Thread.yield();
1900 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1901              assertEquals(0, p.getPoolSize());
1902          } finally {
1903              joinPool(p);
# Line 1754 | Line 1908 | public class ThreadPoolExecutorSubclassT
1908       * allowCoreThreadTimeOut(false) causes idle threads not to time out
1909       */
1910      public void testAllowCoreThreadTimeOut_false() throws Exception {
1911 +        long keepAliveTime = timeoutMillis();
1912          final ThreadPoolExecutor p =
1913              new CustomTPE(2, 10,
1914 <                          SHORT_DELAY_MS, MILLISECONDS,
1914 >                          keepAliveTime, MILLISECONDS,
1915                            new ArrayBlockingQueue<Runnable>(10));
1916          final CountDownLatch threadStarted = new CountDownLatch(1);
1917          try {
# Line 1766 | Line 1921 | public class ThreadPoolExecutorSubclassT
1921                      threadStarted.countDown();
1922                      assertTrue(p.getPoolSize() >= 1);
1923                  }});
1924 <            delay(SMALL_DELAY_MS);
1924 >            delay(2 * keepAliveTime);
1925              assertTrue(p.getPoolSize() >= 1);
1926          } finally {
1927              joinPool(p);
1928          }
1929      }
1930  
1931 +    /**
1932 +     * get(cancelled task) throws CancellationException
1933 +     * (in part, a test of CustomTPE itself)
1934 +     */
1935 +    public void testGet_cancelled() throws Exception {
1936 +        final ExecutorService e =
1937 +            new CustomTPE(1, 1,
1938 +                          LONG_DELAY_MS, MILLISECONDS,
1939 +                          new LinkedBlockingQueue<Runnable>());
1940 +        try {
1941 +            final CountDownLatch blockerStarted = new CountDownLatch(1);
1942 +            final CountDownLatch done = new CountDownLatch(1);
1943 +            final List<Future<?>> futures = new ArrayList<>();
1944 +            for (int i = 0; i < 2; i++) {
1945 +                Runnable r = new CheckedRunnable() { public void realRun()
1946 +                                                         throws Throwable {
1947 +                    blockerStarted.countDown();
1948 +                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1949 +                }};
1950 +                futures.add(e.submit(r));
1951 +            }
1952 +            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1953 +            for (Future<?> future : futures) future.cancel(false);
1954 +            for (Future<?> future : futures) {
1955 +                try {
1956 +                    future.get();
1957 +                    shouldThrow();
1958 +                } catch (CancellationException success) {}
1959 +                try {
1960 +                    future.get(LONG_DELAY_MS, MILLISECONDS);
1961 +                    shouldThrow();
1962 +                } catch (CancellationException success) {}
1963 +                assertTrue(future.isCancelled());
1964 +                assertTrue(future.isDone());
1965 +            }
1966 +            done.countDown();
1967 +        } finally {
1968 +            joinPool(e);
1969 +        }
1970 +    }
1971 +
1972   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines