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.16 by jsr166, Tue Dec 1 09:48:12 2009 UTC vs.
Revision 1.68 by jsr166, Sun Oct 4 02:26:47 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
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 >        final ThreadPoolExecutor p =
234 >            new CustomTPE(1, 1,
235 >                          2 * LONG_DELAY_MS, MILLISECONDS,
236 >                          new ArrayBlockingQueue<Runnable>(10));
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(LONG_DELAY_MS, MILLISECONDS));
243          }
244      }
245  
246      /**
247 <     *  getActiveCount increases but doesn't overestimate, when a
248 <     *  thread becomes active
247 >     * getActiveCount increases but doesn't overestimate, when a
248 >     * thread becomes active
249       */
250      public void testGetActiveCount() throws InterruptedException {
251 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
252 <        assertEquals(0, p2.getActiveCount());
253 <        p2.execute(new MediumRunnable());
254 <        Thread.sleep(SHORT_DELAY_MS);
255 <        assertEquals(1, p2.getActiveCount());
256 <        joinPool(p2);
251 >        final ThreadPoolExecutor p =
252 >            new CustomTPE(2, 2,
253 >                          LONG_DELAY_MS, MILLISECONDS,
254 >                          new ArrayBlockingQueue<Runnable>(10));
255 >        try (PoolCleaner cleaner = cleaner(p)) {
256 >            final CountDownLatch threadStarted = new CountDownLatch(1);
257 >            final CountDownLatch done = new CountDownLatch(1);
258 >            assertEquals(0, p.getActiveCount());
259 >            p.execute(new CheckedRunnable() {
260 >                public void realRun() throws InterruptedException {
261 >                    threadStarted.countDown();
262 >                    assertEquals(1, p.getActiveCount());
263 >                    done.await();
264 >                }});
265 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
266 >            assertEquals(1, p.getActiveCount());
267 >            done.countDown();
268 >        }
269      }
270  
271      /**
272 <     *  prestartCoreThread starts a thread if under corePoolSize, else doesn't
272 >     * prestartCoreThread starts a thread if under corePoolSize, else doesn't
273       */
274      public void testPrestartCoreThread() {
275 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
276 <        assertEquals(0, p2.getPoolSize());
277 <        assertTrue(p2.prestartCoreThread());
278 <        assertEquals(1, p2.getPoolSize());
279 <        assertTrue(p2.prestartCoreThread());
280 <        assertEquals(2, p2.getPoolSize());
281 <        assertFalse(p2.prestartCoreThread());
282 <        assertEquals(2, p2.getPoolSize());
283 <        joinPool(p2);
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
298 >     * prestartAllCoreThreads starts all corePoolSize threads
299       */
300      public void testPrestartAllCoreThreads() {
301 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
302 <        assertEquals(0, p2.getPoolSize());
303 <        p2.prestartAllCoreThreads();
304 <        assertEquals(2, p2.getPoolSize());
305 <        p2.prestartAllCoreThreads();
306 <        assertEquals(2, p2.getPoolSize());
307 <        joinPool(p2);
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      /**
320 <     *   getCompletedTaskCount increases, but doesn't overestimate,
321 <     *   when tasks complete
320 >     * getCompletedTaskCount increases, but doesn't overestimate,
321 >     * when tasks complete
322       */
323      public void testGetCompletedTaskCount() throws InterruptedException {
324 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
325 <        assertEquals(0, p2.getCompletedTaskCount());
326 <        p2.execute(new ShortRunnable());
327 <        Thread.sleep(SMALL_DELAY_MS);
328 <        assertEquals(1, p2.getCompletedTaskCount());
329 <        try { p2.shutdown(); } catch (SecurityException ok) { return; }
330 <        joinPool(p2);
324 >        final ThreadPoolExecutor p =
325 >            new CustomTPE(2, 2,
326 >                          LONG_DELAY_MS, MILLISECONDS,
327 >                          new ArrayBlockingQueue<Runnable>(10));
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 {
335 >                    threadStarted.countDown();
336 >                    assertEquals(0, p.getCompletedTaskCount());
337 >                    threadProceed.await();
338 >                    threadDone.countDown();
339 >                }});
340 >            await(threadStarted);
341 >            assertEquals(0, p.getCompletedTaskCount());
342 >            threadProceed.countDown();
343 >            threadDone.await();
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  
353      /**
354 <     *   getCorePoolSize returns size given in constructor if not otherwise set
354 >     * getCorePoolSize returns size given in constructor if not otherwise set
355       */
356      public void testGetCorePoolSize() {
357 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
358 <        assertEquals(1, p1.getCorePoolSize());
359 <        joinPool(p1);
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
367 >     * getKeepAliveTime returns value given in constructor if not otherwise set
368       */
369      public void testGetKeepAliveTime() {
370 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
371 <        assertEquals(1, p2.getKeepAliveTime(TimeUnit.SECONDS));
372 <        joinPool(p2);
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  
280
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  
302
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 318 | 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 329 | 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  
339
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  
354
473      /**
474 <     *   getLargestPoolSize increases, but doesn't overestimate, when
475 <     *   multiple threads active
474 >     * getLargestPoolSize increases, but doesn't overestimate, when
475 >     * multiple threads active
476       */
477      public void testGetLargestPoolSize() throws InterruptedException {
478 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
479 <        assertEquals(0, p2.getLargestPoolSize());
480 <        p2.execute(new MediumRunnable());
481 <        p2.execute(new MediumRunnable());
482 <        Thread.sleep(SHORT_DELAY_MS);
483 <        assertEquals(2, p2.getLargestPoolSize());
484 <        joinPool(p2);
478 >        final int THREADS = 3;
479 >        final ThreadPoolExecutor p =
480 >            new CustomTPE(THREADS, THREADS,
481 >                          LONG_DELAY_MS, MILLISECONDS,
482 >                          new ArrayBlockingQueue<Runnable>(10));
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() {
489 >                    public void realRun() throws InterruptedException {
490 >                        threadsStarted.countDown();
491 >                        done.await();
492 >                        assertEquals(THREADS, p.getLargestPoolSize());
493 >                    }});
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      /**
502 <     *   getMaximumPoolSize returns value given in constructor if not
503 <     *   otherwise set
502 >     * getMaximumPoolSize returns value given in constructor if not
503 >     * otherwise set
504       */
505      public void testGetMaximumPoolSize() {
506 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
507 <        assertEquals(2, p2.getMaximumPoolSize());
508 <        joinPool(p2);
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      /**
520 <     *   getPoolSize increases, but doesn't overestimate, when threads
521 <     *   become active
522 <     */
523 <    public void testGetPoolSize() {
524 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
525 <        assertEquals(0, p1.getPoolSize());
526 <        p1.execute(new MediumRunnable());
527 <        assertEquals(1, p1.getPoolSize());
528 <        joinPool(p1);
520 >     * getPoolSize increases, but doesn't overestimate, when threads
521 >     * become active
522 >     */
523 >    public void testGetPoolSize() throws InterruptedException {
524 >        final ThreadPoolExecutor p =
525 >            new CustomTPE(1, 1,
526 >                          LONG_DELAY_MS, MILLISECONDS,
527 >                          new ArrayBlockingQueue<Runnable>(10));
528 >        try (PoolCleaner cleaner = cleaner(p)) {
529 >            final CountDownLatch threadStarted = new CountDownLatch(1);
530 >            final CountDownLatch done = new CountDownLatch(1);
531 >            assertEquals(0, p.getPoolSize());
532 >            p.execute(new CheckedRunnable() {
533 >                public void realRun() throws InterruptedException {
534 >                    threadStarted.countDown();
535 >                    assertEquals(1, p.getPoolSize());
536 >                    done.await();
537 >                }});
538 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
539 >            assertEquals(1, p.getPoolSize());
540 >            done.countDown();   // release pool
541 >        }
542      }
543  
544      /**
545 <     *  getTaskCount increases, but doesn't overestimate, when tasks submitted
545 >     * getTaskCount increases, but doesn't overestimate, when tasks submitted
546       */
547      public void testGetTaskCount() throws InterruptedException {
548 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
549 <        assertEquals(0, p1.getTaskCount());
550 <        p1.execute(new MediumRunnable());
551 <        Thread.sleep(SHORT_DELAY_MS);
552 <        assertEquals(1, p1.getTaskCount());
553 <        joinPool(p1);
548 >        final ThreadPoolExecutor p =
549 >            new CustomTPE(1, 1,
550 >                          LONG_DELAY_MS, MILLISECONDS,
551 >                          new ArrayBlockingQueue<Runnable>(10));
552 >        try (PoolCleaner cleaner = cleaner(p)) {
553 >            final CountDownLatch threadStarted = new CountDownLatch(1);
554 >            final CountDownLatch done = new CountDownLatch(1);
555 >            assertEquals(0, p.getTaskCount());
556 >            p.execute(new CheckedRunnable() {
557 >                public void realRun() throws InterruptedException {
558 >                    threadStarted.countDown();
559 >                    assertEquals(1, p.getTaskCount());
560 >                    done.await();
561 >                }});
562 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
563 >            assertEquals(1, p.getTaskCount());
564 >            done.countDown();
565 >        }
566      }
567  
568      /**
569 <     *   isShutDown is false before shutdown, true after
569 >     * isShutdown is false before shutdown, true after
570       */
571      public void testIsShutdown() {
572 <
573 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
574 <        assertFalse(p1.isShutdown());
575 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
576 <        assertTrue(p1.isShutdown());
577 <        joinPool(p1);
572 >        final ThreadPoolExecutor p =
573 >            new CustomTPE(1, 1,
574 >                          LONG_DELAY_MS, MILLISECONDS,
575 >                          new ArrayBlockingQueue<Runnable>(10));
576 >        try (PoolCleaner cleaner = cleaner(p)) {
577 >            assertFalse(p.isShutdown());
578 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
579 >            assertTrue(p.isShutdown());
580 >        }
581      }
582  
415
583      /**
584 <     *  isTerminated is false before termination, true after
584 >     * isTerminated is false before termination, true after
585       */
586      public void testIsTerminated() throws InterruptedException {
587 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
588 <        assertFalse(p1.isTerminated());
589 <        try {
590 <            p1.execute(new MediumRunnable());
591 <        } finally {
592 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
593 <        }
594 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
595 <        assertTrue(p1.isTerminated());
587 >        final ThreadPoolExecutor p =
588 >            new CustomTPE(1, 1,
589 >                          LONG_DELAY_MS, MILLISECONDS,
590 >                          new ArrayBlockingQueue<Runnable>(10));
591 >        final CountDownLatch threadStarted = new CountDownLatch(1);
592 >        final CountDownLatch done = new CountDownLatch(1);
593 >        try {
594 >            assertFalse(p.isTerminating());
595 >            p.execute(new CheckedRunnable() {
596 >                public void realRun() throws InterruptedException {
597 >                    assertFalse(p.isTerminating());
598 >                    threadStarted.countDown();
599 >                    done.await();
600 >                }});
601 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
602 >            assertFalse(p.isTerminating());
603 >            done.countDown();
604 >        } finally {
605 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
606 >        }
607 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
608 >        assertTrue(p.isTerminated());
609 >        assertFalse(p.isTerminating());
610      }
611  
612      /**
613 <     *  isTerminating is not true when running or when terminated
613 >     * isTerminating is not true when running or when terminated
614       */
615      public void testIsTerminating() throws InterruptedException {
616 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
617 <        assertFalse(p1.isTerminating());
618 <        try {
619 <            p1.execute(new SmallRunnable());
620 <            assertFalse(p1.isTerminating());
621 <        } finally {
622 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
623 <        }
624 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
625 <        assertTrue(p1.isTerminated());
626 <        assertFalse(p1.isTerminating());
616 >        final ThreadPoolExecutor p =
617 >            new CustomTPE(1, 1,
618 >                          LONG_DELAY_MS, MILLISECONDS,
619 >                          new ArrayBlockingQueue<Runnable>(10));
620 >        final CountDownLatch threadStarted = new CountDownLatch(1);
621 >        final CountDownLatch done = new CountDownLatch(1);
622 >        try {
623 >            assertFalse(p.isTerminating());
624 >            p.execute(new CheckedRunnable() {
625 >                public void realRun() throws InterruptedException {
626 >                    assertFalse(p.isTerminating());
627 >                    threadStarted.countDown();
628 >                    done.await();
629 >                }});
630 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
631 >            assertFalse(p.isTerminating());
632 >            done.countDown();
633 >        } finally {
634 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
635 >        }
636 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
637 >        assertTrue(p.isTerminated());
638 >        assertFalse(p.isTerminating());
639      }
640  
641      /**
642       * getQueue returns the work queue, which contains queued tasks
643       */
644      public void testGetQueue() throws InterruptedException {
645 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
646 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
647 <        FutureTask[] tasks = new FutureTask[5];
648 <        for (int i = 0; i < 5; i++) {
649 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
650 <            p1.execute(tasks[i]);
651 <        }
652 <        try {
653 <            Thread.sleep(SHORT_DELAY_MS);
654 <            BlockingQueue<Runnable> wq = p1.getQueue();
655 <            assertSame(q, wq);
656 <            assertFalse(wq.contains(tasks[0]));
657 <            assertTrue(wq.contains(tasks[4]));
658 <            for (int i = 1; i < 5; ++i)
659 <                tasks[i].cancel(true);
660 <            p1.shutdownNow();
645 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
646 >        final ThreadPoolExecutor p =
647 >            new CustomTPE(1, 1,
648 >                          LONG_DELAY_MS, MILLISECONDS,
649 >                          q);
650 >        final CountDownLatch threadStarted = new CountDownLatch(1);
651 >        final CountDownLatch done = new CountDownLatch(1);
652 >        try {
653 >            FutureTask[] tasks = new FutureTask[5];
654 >            for (int i = 0; i < tasks.length; i++) {
655 >                Callable task = new CheckedCallable<Boolean>() {
656 >                    public Boolean realCall() throws InterruptedException {
657 >                        threadStarted.countDown();
658 >                        assertSame(q, p.getQueue());
659 >                        done.await();
660 >                        return Boolean.TRUE;
661 >                    }};
662 >                tasks[i] = new FutureTask(task);
663 >                p.execute(tasks[i]);
664 >            }
665 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
666 >            assertSame(q, p.getQueue());
667 >            assertFalse(q.contains(tasks[0]));
668 >            assertTrue(q.contains(tasks[tasks.length - 1]));
669 >            assertEquals(tasks.length - 1, q.size());
670          } finally {
671 <            joinPool(p1);
671 >            done.countDown();
672 >            joinPool(p);
673          }
674      }
675  
# Line 475 | Line 678 | public class ThreadPoolExecutorSubclassT
678       */
679      public void testRemove() throws InterruptedException {
680          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
681 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
682 <        FutureTask[] tasks = new FutureTask[5];
683 <        for (int i = 0; i < 5; i++) {
684 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
685 <            p1.execute(tasks[i]);
686 <        }
687 <        try {
688 <            Thread.sleep(SHORT_DELAY_MS);
689 <            assertFalse(p1.remove(tasks[0]));
681 >        final ThreadPoolExecutor p =
682 >            new CustomTPE(1, 1,
683 >                          LONG_DELAY_MS, MILLISECONDS,
684 >                          q);
685 >        Runnable[] tasks = new Runnable[6];
686 >        final CountDownLatch threadStarted = new CountDownLatch(1);
687 >        final CountDownLatch done = new CountDownLatch(1);
688 >        try {
689 >            for (int i = 0; i < tasks.length; i++) {
690 >                tasks[i] = new CheckedRunnable() {
691 >                        public void realRun() throws InterruptedException {
692 >                            threadStarted.countDown();
693 >                            done.await();
694 >                        }};
695 >                p.execute(tasks[i]);
696 >            }
697 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
698 >            assertFalse(p.remove(tasks[0]));
699              assertTrue(q.contains(tasks[4]));
700              assertTrue(q.contains(tasks[3]));
701 <            assertTrue(p1.remove(tasks[4]));
702 <            assertFalse(p1.remove(tasks[4]));
701 >            assertTrue(p.remove(tasks[4]));
702 >            assertFalse(p.remove(tasks[4]));
703              assertFalse(q.contains(tasks[4]));
704              assertTrue(q.contains(tasks[3]));
705 <            assertTrue(p1.remove(tasks[3]));
705 >            assertTrue(p.remove(tasks[3]));
706              assertFalse(q.contains(tasks[3]));
707          } finally {
708 <            joinPool(p1);
708 >            done.countDown();
709 >            joinPool(p);
710          }
711      }
712  
713      /**
714 <     *   purge removes cancelled tasks from the queue
714 >     * purge removes cancelled tasks from the queue
715       */
716 <    public void testPurge() {
717 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
716 >    public void testPurge() throws InterruptedException {
717 >        final CountDownLatch threadStarted = new CountDownLatch(1);
718 >        final CountDownLatch done = new CountDownLatch(1);
719 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
720 >        final ThreadPoolExecutor p =
721 >            new CustomTPE(1, 1,
722 >                          LONG_DELAY_MS, MILLISECONDS,
723 >                          q);
724          FutureTask[] tasks = new FutureTask[5];
725 <        for (int i = 0; i < 5; i++) {
726 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
727 <            p1.execute(tasks[i]);
725 >        try {
726 >            for (int i = 0; i < tasks.length; i++) {
727 >                Callable task = new CheckedCallable<Boolean>() {
728 >                    public Boolean realCall() throws InterruptedException {
729 >                        threadStarted.countDown();
730 >                        done.await();
731 >                        return Boolean.TRUE;
732 >                    }};
733 >                tasks[i] = new FutureTask(task);
734 >                p.execute(tasks[i]);
735 >            }
736 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
737 >            assertEquals(tasks.length, p.getTaskCount());
738 >            assertEquals(tasks.length - 1, q.size());
739 >            assertEquals(1L, p.getActiveCount());
740 >            assertEquals(0L, p.getCompletedTaskCount());
741 >            tasks[4].cancel(true);
742 >            tasks[3].cancel(false);
743 >            p.purge();
744 >            assertEquals(tasks.length - 3, q.size());
745 >            assertEquals(tasks.length - 2, p.getTaskCount());
746 >            p.purge();         // Nothing to do
747 >            assertEquals(tasks.length - 3, q.size());
748 >            assertEquals(tasks.length - 2, p.getTaskCount());
749 >        } finally {
750 >            done.countDown();
751 >            joinPool(p);
752          }
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);
753      }
754  
755      /**
756 <     *  shutDownNow returns a list containing tasks that were not run
756 >     * shutdownNow returns a list containing tasks that were not run,
757 >     * and those tasks are drained from the queue
758       */
759 <    public void testShutDownNow() {
760 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
761 <        List l;
762 <        try {
763 <            for (int i = 0; i < 5; i++)
764 <                p1.execute(new MediumPossiblyInterruptedRunnable());
765 <        }
766 <        finally {
759 >    public void testShutdownNow() throws InterruptedException {
760 >        final int poolSize = 2;
761 >        final int count = 5;
762 >        final AtomicInteger ran = new AtomicInteger(0);
763 >        ThreadPoolExecutor p =
764 >            new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
765 >                          new ArrayBlockingQueue<Runnable>(10));
766 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
767 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
768 >            threadsStarted.countDown();
769              try {
770 <                l = p1.shutdownNow();
771 <            } catch (SecurityException ok) { return; }
772 <        }
773 <        assertTrue(p1.isShutdown());
774 <        assertTrue(l.size() <= 4);
770 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
771 >            } catch (InterruptedException success) {}
772 >            ran.getAndIncrement();
773 >        }};
774 >        for (int i = 0; i < count; i++)
775 >            p.execute(waiter);
776 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
777 >        assertEquals(poolSize, p.getActiveCount());
778 >        assertEquals(0, p.getCompletedTaskCount());
779 >        final List<Runnable> queuedTasks;
780 >        try {
781 >            queuedTasks = p.shutdownNow();
782 >        } catch (SecurityException ok) {
783 >            return; // Allowed in case test doesn't have privs
784 >        }
785 >        assertTrue(p.isShutdown());
786 >        assertTrue(p.getQueue().isEmpty());
787 >        assertEquals(count - poolSize, queuedTasks.size());
788 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
789 >        assertTrue(p.isTerminated());
790 >        assertEquals(poolSize, ran.get());
791 >        assertEquals(poolSize, p.getCompletedTaskCount());
792      }
793  
794      // Exception Tests
795  
539
796      /**
797       * Constructor throws if corePoolSize argument is less than zero
798       */
799      public void testConstructor1() {
800          try {
801 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
801 >            new CustomTPE(-1, 1, 1L, SECONDS,
802 >                          new ArrayBlockingQueue<Runnable>(10));
803              shouldThrow();
804          } catch (IllegalArgumentException success) {}
805      }
# Line 552 | Line 809 | public class ThreadPoolExecutorSubclassT
809       */
810      public void testConstructor2() {
811          try {
812 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
812 >            new CustomTPE(1, -1, 1L, SECONDS,
813 >                          new ArrayBlockingQueue<Runnable>(10));
814              shouldThrow();
815          } catch (IllegalArgumentException success) {}
816      }
# Line 562 | Line 820 | public class ThreadPoolExecutorSubclassT
820       */
821      public void testConstructor3() {
822          try {
823 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
823 >            new CustomTPE(1, 0, 1L, SECONDS,
824 >                          new ArrayBlockingQueue<Runnable>(10));
825              shouldThrow();
826          } catch (IllegalArgumentException success) {}
827      }
# Line 572 | Line 831 | public class ThreadPoolExecutorSubclassT
831       */
832      public void testConstructor4() {
833          try {
834 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
834 >            new CustomTPE(1, 2, -1L, SECONDS,
835 >                          new ArrayBlockingQueue<Runnable>(10));
836              shouldThrow();
837          } catch (IllegalArgumentException success) {}
838      }
# Line 582 | Line 842 | public class ThreadPoolExecutorSubclassT
842       */
843      public void testConstructor5() {
844          try {
845 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
845 >            new CustomTPE(2, 1, 1L, SECONDS,
846 >                          new ArrayBlockingQueue<Runnable>(10));
847              shouldThrow();
848          } catch (IllegalArgumentException success) {}
849      }
# Line 592 | Line 853 | public class ThreadPoolExecutorSubclassT
853       */
854      public void testConstructorNullPointerException() {
855          try {
856 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
856 >            new CustomTPE(1, 2, 1L, SECONDS, null);
857              shouldThrow();
858          } catch (NullPointerException success) {}
859      }
860  
600
601
861      /**
862       * Constructor throws if corePoolSize argument is less than zero
863       */
864      public void testConstructor6() {
865          try {
866 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
866 >            new CustomTPE(-1, 1, 1L, SECONDS,
867 >                          new ArrayBlockingQueue<Runnable>(10),
868 >                          new SimpleThreadFactory());
869              shouldThrow();
870          } catch (IllegalArgumentException success) {}
871      }
# Line 614 | Line 875 | public class ThreadPoolExecutorSubclassT
875       */
876      public void testConstructor7() {
877          try {
878 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
878 >            new CustomTPE(1,-1, 1L, SECONDS,
879 >                          new ArrayBlockingQueue<Runnable>(10),
880 >                          new SimpleThreadFactory());
881              shouldThrow();
882          } catch (IllegalArgumentException success) {}
883      }
# Line 624 | Line 887 | public class ThreadPoolExecutorSubclassT
887       */
888      public void testConstructor8() {
889          try {
890 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
890 >            new CustomTPE(1, 0, 1L, SECONDS,
891 >                          new ArrayBlockingQueue<Runnable>(10),
892 >                          new SimpleThreadFactory());
893              shouldThrow();
894          } catch (IllegalArgumentException success) {}
895      }
# Line 634 | Line 899 | public class ThreadPoolExecutorSubclassT
899       */
900      public void testConstructor9() {
901          try {
902 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
902 >            new CustomTPE(1, 2, -1L, SECONDS,
903 >                          new ArrayBlockingQueue<Runnable>(10),
904 >                          new SimpleThreadFactory());
905              shouldThrow();
906          } catch (IllegalArgumentException success) {}
907      }
# Line 644 | Line 911 | public class ThreadPoolExecutorSubclassT
911       */
912      public void testConstructor10() {
913          try {
914 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
914 >            new CustomTPE(2, 1, 1L, SECONDS,
915 >                          new ArrayBlockingQueue<Runnable>(10),
916 >                          new SimpleThreadFactory());
917              shouldThrow();
918          } catch (IllegalArgumentException success) {}
919      }
# Line 654 | Line 923 | public class ThreadPoolExecutorSubclassT
923       */
924      public void testConstructorNullPointerException2() {
925          try {
926 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
926 >            new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
927              shouldThrow();
928          } catch (NullPointerException success) {}
929      }
# Line 664 | Line 933 | public class ThreadPoolExecutorSubclassT
933       */
934      public void testConstructorNullPointerException3() {
935          try {
936 <            ThreadFactory f = null;
937 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
936 >            new CustomTPE(1, 2, 1L, SECONDS,
937 >                          new ArrayBlockingQueue<Runnable>(10),
938 >                          (ThreadFactory) null);
939              shouldThrow();
940          } catch (NullPointerException success) {}
941      }
942  
673
943      /**
944       * Constructor throws if corePoolSize argument is less than zero
945       */
946      public void testConstructor11() {
947          try {
948 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
948 >            new CustomTPE(-1, 1, 1L, SECONDS,
949 >                          new ArrayBlockingQueue<Runnable>(10),
950 >                          new NoOpREHandler());
951              shouldThrow();
952          } catch (IllegalArgumentException success) {}
953      }
# Line 686 | Line 957 | public class ThreadPoolExecutorSubclassT
957       */
958      public void testConstructor12() {
959          try {
960 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
960 >            new CustomTPE(1, -1, 1L, SECONDS,
961 >                          new ArrayBlockingQueue<Runnable>(10),
962 >                          new NoOpREHandler());
963              shouldThrow();
964          } catch (IllegalArgumentException success) {}
965      }
# Line 696 | Line 969 | public class ThreadPoolExecutorSubclassT
969       */
970      public void testConstructor13() {
971          try {
972 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
972 >            new CustomTPE(1, 0, 1L, SECONDS,
973 >                          new ArrayBlockingQueue<Runnable>(10),
974 >                          new NoOpREHandler());
975              shouldThrow();
976          } catch (IllegalArgumentException success) {}
977      }
# Line 706 | Line 981 | public class ThreadPoolExecutorSubclassT
981       */
982      public void testConstructor14() {
983          try {
984 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
984 >            new CustomTPE(1, 2, -1L, SECONDS,
985 >                          new ArrayBlockingQueue<Runnable>(10),
986 >                          new NoOpREHandler());
987              shouldThrow();
988          } catch (IllegalArgumentException success) {}
989      }
# Line 716 | Line 993 | public class ThreadPoolExecutorSubclassT
993       */
994      public void testConstructor15() {
995          try {
996 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
996 >            new CustomTPE(2, 1, 1L, SECONDS,
997 >                          new ArrayBlockingQueue<Runnable>(10),
998 >                          new NoOpREHandler());
999              shouldThrow();
1000          } catch (IllegalArgumentException success) {}
1001      }
# Line 726 | Line 1005 | public class ThreadPoolExecutorSubclassT
1005       */
1006      public void testConstructorNullPointerException4() {
1007          try {
1008 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
1008 >            new CustomTPE(1, 2, 1L, SECONDS,
1009 >                          null,
1010 >                          new NoOpREHandler());
1011              shouldThrow();
1012          } catch (NullPointerException success) {}
1013      }
# Line 736 | Line 1017 | public class ThreadPoolExecutorSubclassT
1017       */
1018      public void testConstructorNullPointerException5() {
1019          try {
1020 <            RejectedExecutionHandler r = null;
1021 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
1020 >            new CustomTPE(1, 2, 1L, SECONDS,
1021 >                          new ArrayBlockingQueue<Runnable>(10),
1022 >                          (RejectedExecutionHandler) null);
1023              shouldThrow();
1024          } catch (NullPointerException success) {}
1025      }
1026  
745
1027      /**
1028       * Constructor throws if corePoolSize argument is less than zero
1029       */
1030      public void testConstructor16() {
1031          try {
1032 <            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1032 >            new CustomTPE(-1, 1, 1L, SECONDS,
1033 >                          new ArrayBlockingQueue<Runnable>(10),
1034 >                          new SimpleThreadFactory(),
1035 >                          new NoOpREHandler());
1036              shouldThrow();
1037          } catch (IllegalArgumentException success) {}
1038      }
# Line 758 | Line 1042 | public class ThreadPoolExecutorSubclassT
1042       */
1043      public void testConstructor17() {
1044          try {
1045 <            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1045 >            new CustomTPE(1, -1, 1L, SECONDS,
1046 >                          new ArrayBlockingQueue<Runnable>(10),
1047 >                          new SimpleThreadFactory(),
1048 >                          new NoOpREHandler());
1049              shouldThrow();
1050          } catch (IllegalArgumentException success) {}
1051      }
# Line 768 | Line 1055 | public class ThreadPoolExecutorSubclassT
1055       */
1056      public void testConstructor18() {
1057          try {
1058 <            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1058 >            new CustomTPE(1, 0, 1L, SECONDS,
1059 >                          new ArrayBlockingQueue<Runnable>(10),
1060 >                          new SimpleThreadFactory(),
1061 >                          new NoOpREHandler());
1062              shouldThrow();
1063          } catch (IllegalArgumentException success) {}
1064      }
# Line 778 | Line 1068 | public class ThreadPoolExecutorSubclassT
1068       */
1069      public void testConstructor19() {
1070          try {
1071 <            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1071 >            new CustomTPE(1, 2, -1L, SECONDS,
1072 >                          new ArrayBlockingQueue<Runnable>(10),
1073 >                          new SimpleThreadFactory(),
1074 >                          new NoOpREHandler());
1075              shouldThrow();
1076          } catch (IllegalArgumentException success) {}
1077      }
# Line 788 | Line 1081 | public class ThreadPoolExecutorSubclassT
1081       */
1082      public void testConstructor20() {
1083          try {
1084 <            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1084 >            new CustomTPE(2, 1, 1L, SECONDS,
1085 >                          new ArrayBlockingQueue<Runnable>(10),
1086 >                          new SimpleThreadFactory(),
1087 >                          new NoOpREHandler());
1088              shouldThrow();
1089          } catch (IllegalArgumentException success) {}
1090      }
1091  
1092      /**
1093 <     * Constructor throws if workQueue is set to null
1093 >     * Constructor throws if workQueue is null
1094       */
1095      public void testConstructorNullPointerException6() {
1096          try {
1097 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1097 >            new CustomTPE(1, 2, 1L, SECONDS,
1098 >                          null,
1099 >                          new SimpleThreadFactory(),
1100 >                          new NoOpREHandler());
1101              shouldThrow();
1102          } catch (NullPointerException success) {}
1103      }
1104  
1105      /**
1106 <     * Constructor throws if handler is set to null
1106 >     * Constructor throws if handler is null
1107       */
1108      public void testConstructorNullPointerException7() {
1109          try {
1110 <            RejectedExecutionHandler r = null;
1111 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1110 >            new CustomTPE(1, 2, 1L, SECONDS,
1111 >                          new ArrayBlockingQueue<Runnable>(10),
1112 >                          new SimpleThreadFactory(),
1113 >                          (RejectedExecutionHandler) null);
1114              shouldThrow();
1115          } catch (NullPointerException success) {}
1116      }
1117  
1118      /**
1119 <     * Constructor throws if ThreadFactory is set top null
1119 >     * Constructor throws if ThreadFactory is null
1120       */
1121      public void testConstructorNullPointerException8() {
1122          try {
1123 <            ThreadFactory f = null;
1124 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new NoOpREHandler());
1123 >            new CustomTPE(1, 2, 1L, SECONDS,
1124 >                          new ArrayBlockingQueue<Runnable>(10),
1125 >                          (ThreadFactory) null,
1126 >                          new NoOpREHandler());
1127              shouldThrow();
1128          } catch (NullPointerException success) {}
1129      }
1130  
828
1131      /**
1132 <     *  execute throws RejectedExecutionException
831 <     *  if saturated.
1132 >     * execute throws RejectedExecutionException if saturated.
1133       */
1134      public void testSaturatedExecute() {
1135 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
1136 <        try {
1137 <
1138 <            for (int i = 0; i < 5; ++i) {
1139 <                p.execute(new MediumRunnable());
1135 >        ThreadPoolExecutor p =
1136 >            new CustomTPE(1, 1,
1137 >                          LONG_DELAY_MS, MILLISECONDS,
1138 >                          new ArrayBlockingQueue<Runnable>(1));
1139 >        final CountDownLatch done = new CountDownLatch(1);
1140 >        try {
1141 >            Runnable task = new CheckedRunnable() {
1142 >                public void realRun() throws InterruptedException {
1143 >                    done.await();
1144 >                }};
1145 >            for (int i = 0; i < 2; ++i)
1146 >                p.execute(task);
1147 >            for (int i = 0; i < 2; ++i) {
1148 >                try {
1149 >                    p.execute(task);
1150 >                    shouldThrow();
1151 >                } catch (RejectedExecutionException success) {}
1152 >                assertTrue(p.getTaskCount() <= 2);
1153              }
1154 <            shouldThrow();
1155 <        } catch (RejectedExecutionException success) {}
1156 <        joinPool(p);
1154 >        } finally {
1155 >            done.countDown();
1156 >            joinPool(p);
1157 >        }
1158      }
1159  
1160      /**
1161 <     *  executor using CallerRunsPolicy runs task if saturated.
1161 >     * executor using CallerRunsPolicy runs task if saturated.
1162       */
1163      public void testSaturatedExecute2() {
1164          RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1165 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1165 >        ThreadPoolExecutor p = new CustomTPE(1, 1,
1166 >                                             LONG_DELAY_MS, MILLISECONDS,
1167 >                                             new ArrayBlockingQueue<Runnable>(1),
1168 >                                             h);
1169          try {
852
1170              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1171 <            for (int i = 0; i < 5; ++i) {
1171 >            for (int i = 0; i < tasks.length; ++i)
1172                  tasks[i] = new TrackedNoOpRunnable();
856            }
1173              TrackedLongRunnable mr = new TrackedLongRunnable();
1174              p.execute(mr);
1175 <            for (int i = 0; i < 5; ++i) {
1175 >            for (int i = 0; i < tasks.length; ++i)
1176                  p.execute(tasks[i]);
1177 <            }
862 <            for (int i = 1; i < 5; ++i) {
1177 >            for (int i = 1; i < tasks.length; ++i)
1178                  assertTrue(tasks[i].done);
864            }
1179              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1180          } finally {
1181              joinPool(p);
# Line 869 | Line 1183 | public class ThreadPoolExecutorSubclassT
1183      }
1184  
1185      /**
1186 <     *  executor using DiscardPolicy drops task if saturated.
1186 >     * executor using DiscardPolicy drops task if saturated.
1187       */
1188      public void testSaturatedExecute3() {
1189          RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1190 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1190 >        ThreadPoolExecutor p =
1191 >            new CustomTPE(1, 1,
1192 >                          LONG_DELAY_MS, MILLISECONDS,
1193 >                          new ArrayBlockingQueue<Runnable>(1),
1194 >                          h);
1195          try {
878
1196              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1197 <            for (int i = 0; i < 5; ++i) {
1197 >            for (int i = 0; i < tasks.length; ++i)
1198                  tasks[i] = new TrackedNoOpRunnable();
882            }
1199              p.execute(new TrackedLongRunnable());
1200 <            for (int i = 0; i < 5; ++i) {
1201 <                p.execute(tasks[i]);
1202 <            }
1203 <            for (int i = 0; i < 5; ++i) {
888 <                assertFalse(tasks[i].done);
889 <            }
1200 >            for (TrackedNoOpRunnable task : tasks)
1201 >                p.execute(task);
1202 >            for (TrackedNoOpRunnable task : tasks)
1203 >                assertFalse(task.done);
1204              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1205          } finally {
1206              joinPool(p);
# Line 894 | Line 1208 | public class ThreadPoolExecutorSubclassT
1208      }
1209  
1210      /**
1211 <     *  executor using DiscardOldestPolicy drops oldest task if saturated.
1211 >     * executor using DiscardOldestPolicy drops oldest task if saturated.
1212       */
1213      public void testSaturatedExecute4() {
1214          RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
# Line 915 | Line 1229 | public class ThreadPoolExecutorSubclassT
1229      }
1230  
1231      /**
1232 <     *  execute throws RejectedExecutionException if shutdown
1232 >     * execute throws RejectedExecutionException if shutdown
1233       */
1234      public void testRejectedExecutionExceptionOnShutdown() {
1235 <        ThreadPoolExecutor tpe =
1235 >        ThreadPoolExecutor p =
1236              new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1237 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1237 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1238          try {
1239 <            tpe.execute(new NoOpRunnable());
1239 >            p.execute(new NoOpRunnable());
1240              shouldThrow();
1241          } catch (RejectedExecutionException success) {}
1242  
1243 <        joinPool(tpe);
1243 >        joinPool(p);
1244      }
1245  
1246      /**
1247 <     *  execute using CallerRunsPolicy drops task on shutdown
1247 >     * execute using CallerRunsPolicy drops task on shutdown
1248       */
1249      public void testCallerRunsOnShutdown() {
1250          RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
# Line 947 | Line 1261 | public class ThreadPoolExecutorSubclassT
1261      }
1262  
1263      /**
1264 <     *  execute using DiscardPolicy drops task on shutdown
1264 >     * execute using DiscardPolicy drops task on shutdown
1265       */
1266      public void testDiscardOnShutdown() {
1267          RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
# Line 963 | Line 1277 | public class ThreadPoolExecutorSubclassT
1277          }
1278      }
1279  
966
1280      /**
1281 <     *  execute using DiscardOldestPolicy drops task on shutdown
1281 >     * execute using DiscardOldestPolicy drops task on shutdown
1282       */
1283      public void testDiscardOldestOnShutdown() {
1284          RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
# Line 981 | Line 1294 | public class ThreadPoolExecutorSubclassT
1294          }
1295      }
1296  
984
1297      /**
1298 <     *  execute (null) throws NPE
1298 >     * execute(null) throws NPE
1299       */
1300      public void testExecuteNull() {
1301 <        ThreadPoolExecutor tpe = null;
1301 >        ThreadPoolExecutor p =
1302 >            new CustomTPE(1, 2, 1L, SECONDS,
1303 >                          new ArrayBlockingQueue<Runnable>(10));
1304          try {
1305 <            tpe = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
992 <            tpe.execute(null);
1305 >            p.execute(null);
1306              shouldThrow();
1307          } catch (NullPointerException success) {}
1308  
1309 <        joinPool(tpe);
1309 >        joinPool(p);
1310      }
1311  
1312      /**
1313 <     *  setCorePoolSize of negative value throws IllegalArgumentException
1313 >     * setCorePoolSize of negative value throws IllegalArgumentException
1314       */
1315      public void testCorePoolSizeIllegalArgumentException() {
1316 <        ThreadPoolExecutor tpe =
1316 >        ThreadPoolExecutor p =
1317              new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1318          try {
1319 <            tpe.setCorePoolSize(-1);
1319 >            p.setCorePoolSize(-1);
1320              shouldThrow();
1321          } catch (IllegalArgumentException success) {
1322          } finally {
1323 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1323 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1324          }
1325 <        joinPool(tpe);
1325 >        joinPool(p);
1326      }
1327  
1328      /**
1329 <     *  setMaximumPoolSize(int) throws IllegalArgumentException if
1330 <     *  given a value less the core pool size
1329 >     * setMaximumPoolSize(int) throws IllegalArgumentException
1330 >     * if given a value less the core pool size
1331       */
1332      public void testMaximumPoolSizeIllegalArgumentException() {
1333 <        ThreadPoolExecutor tpe =
1333 >        ThreadPoolExecutor p =
1334              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1335          try {
1336 <            tpe.setMaximumPoolSize(1);
1336 >            p.setMaximumPoolSize(1);
1337              shouldThrow();
1338          } catch (IllegalArgumentException success) {
1339          } finally {
1340 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1340 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1341          }
1342 <        joinPool(tpe);
1342 >        joinPool(p);
1343      }
1344  
1345      /**
1346 <     *  setMaximumPoolSize throws IllegalArgumentException
1347 <     *  if given a negative value
1346 >     * setMaximumPoolSize throws IllegalArgumentException
1347 >     * if given a negative value
1348       */
1349      public void testMaximumPoolSizeIllegalArgumentException2() {
1350 <        ThreadPoolExecutor tpe =
1350 >        ThreadPoolExecutor p =
1351              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1352          try {
1353 <            tpe.setMaximumPoolSize(-1);
1353 >            p.setMaximumPoolSize(-1);
1354              shouldThrow();
1355          } catch (IllegalArgumentException success) {
1356          } finally {
1357 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1357 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1358          }
1359 <        joinPool(tpe);
1359 >        joinPool(p);
1360      }
1361  
1049
1362      /**
1363 <     *  setKeepAliveTime  throws IllegalArgumentException
1364 <     *  when given a negative value
1363 >     * setKeepAliveTime throws IllegalArgumentException
1364 >     * when given a negative value
1365       */
1366      public void testKeepAliveTimeIllegalArgumentException() {
1367 <        ThreadPoolExecutor tpe =
1367 >        ThreadPoolExecutor p =
1368              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1369  
1370          try {
1371 <            tpe.setKeepAliveTime(-1,MILLISECONDS);
1371 >            p.setKeepAliveTime(-1,MILLISECONDS);
1372              shouldThrow();
1373          } catch (IllegalArgumentException success) {
1374          } finally {
1375 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1375 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1376          }
1377 <        joinPool(tpe);
1377 >        joinPool(p);
1378      }
1379  
1380      /**
1381       * terminated() is called on termination
1382       */
1383      public void testTerminated() {
1384 <        CustomTPE tpe = new CustomTPE();
1385 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1386 <        assertTrue(tpe.terminatedCalled);
1387 <        joinPool(tpe);
1384 >        CustomTPE p = new CustomTPE();
1385 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1386 >        assertTrue(p.terminatedCalled());
1387 >        joinPool(p);
1388      }
1389  
1390      /**
1391       * beforeExecute and afterExecute are called when executing task
1392       */
1393      public void testBeforeAfter() throws InterruptedException {
1394 <        CustomTPE tpe = new CustomTPE();
1394 >        CustomTPE p = new CustomTPE();
1395          try {
1396 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1397 <            tpe.execute(r);
1398 <            Thread.sleep(SHORT_DELAY_MS);
1399 <            assertTrue(r.done);
1400 <            assertTrue(tpe.beforeCalled);
1401 <            assertTrue(tpe.afterCalled);
1402 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1396 >            final CountDownLatch done = new CountDownLatch(1);
1397 >            p.execute(new CheckedRunnable() {
1398 >                public void realRun() {
1399 >                    done.countDown();
1400 >                }});
1401 >            await(p.afterCalled);
1402 >            assertEquals(0, done.getCount());
1403 >            assertTrue(p.afterCalled());
1404 >            assertTrue(p.beforeCalled());
1405 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1406          } finally {
1407 <            joinPool(tpe);
1407 >            joinPool(p);
1408          }
1409      }
1410  
# Line 1135 | Line 1450 | public class ThreadPoolExecutorSubclassT
1450          }
1451      }
1452  
1138
1453      /**
1454       * invokeAny(null) throws NPE
1455       */
# Line 1168 | Line 1482 | public class ThreadPoolExecutorSubclassT
1482       * invokeAny(c) throws NPE if c has null elements
1483       */
1484      public void testInvokeAny3() throws Exception {
1485 <        final CountDownLatch latch = new CountDownLatch(1);
1485 >        CountDownLatch latch = new CountDownLatch(1);
1486          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1487 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1488 +        l.add(latchAwaitingStringTask(latch));
1489 +        l.add(null);
1490          try {
1174            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1175            l.add(new Callable<String>() {
1176                      public String call() {
1177                          try {
1178                              latch.await();
1179                          } catch (InterruptedException ok) {}
1180                          return TEST_STRING;
1181                      }});
1182            l.add(null);
1491              e.invokeAny(l);
1492              shouldThrow();
1493          } catch (NullPointerException success) {
# Line 1194 | Line 1502 | public class ThreadPoolExecutorSubclassT
1502       */
1503      public void testInvokeAny4() throws Exception {
1504          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1505 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1506 +        l.add(new NPETask());
1507          try {
1198            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1199            l.add(new NPETask());
1508              e.invokeAny(l);
1509              shouldThrow();
1510          } catch (ExecutionException success) {
# Line 1212 | Line 1520 | public class ThreadPoolExecutorSubclassT
1520      public void testInvokeAny5() throws Exception {
1521          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1522          try {
1523 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1523 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1524              l.add(new StringTask());
1525              l.add(new StringTask());
1526              String result = e.invokeAny(l);
# Line 1254 | Line 1562 | public class ThreadPoolExecutorSubclassT
1562       */
1563      public void testInvokeAll3() throws Exception {
1564          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1565 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1566 +        l.add(new StringTask());
1567 +        l.add(null);
1568          try {
1258            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1259            l.add(new StringTask());
1260            l.add(null);
1569              e.invokeAll(l);
1570              shouldThrow();
1571          } catch (NullPointerException success) {
# Line 1271 | Line 1579 | public class ThreadPoolExecutorSubclassT
1579       */
1580      public void testInvokeAll4() throws Exception {
1581          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1582 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1583 +        l.add(new NPETask());
1584 +        List<Future<String>> futures = e.invokeAll(l);
1585 +        assertEquals(1, futures.size());
1586          try {
1587 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1276 <            l.add(new NPETask());
1277 <            List<Future<String>> result = e.invokeAll(l);
1278 <            assertEquals(1, result.size());
1279 <            for (Future<String> future : result)
1280 <                future.get();
1587 >            futures.get(0).get();
1588              shouldThrow();
1589          } catch (ExecutionException success) {
1590              assertTrue(success.getCause() instanceof NullPointerException);
# Line 1292 | Line 1599 | public class ThreadPoolExecutorSubclassT
1599      public void testInvokeAll5() throws Exception {
1600          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1601          try {
1602 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1602 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1603              l.add(new StringTask());
1604              l.add(new StringTask());
1605 <            List<Future<String>> result = e.invokeAll(l);
1606 <            assertEquals(2, result.size());
1607 <            for (Future<String> future : result)
1605 >            List<Future<String>> futures = e.invokeAll(l);
1606 >            assertEquals(2, futures.size());
1607 >            for (Future<String> future : futures)
1608                  assertSame(TEST_STRING, future.get());
1609          } finally {
1610              joinPool(e);
1611          }
1612      }
1613  
1307
1308
1614      /**
1615       * timed invokeAny(null) throws NPE
1616       */
# Line 1325 | Line 1630 | public class ThreadPoolExecutorSubclassT
1630       */
1631      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1632          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1633 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1634 +        l.add(new StringTask());
1635          try {
1329            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1330            l.add(new StringTask());
1636              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1637              shouldThrow();
1638          } catch (NullPointerException success) {
# Line 1354 | Line 1659 | public class ThreadPoolExecutorSubclassT
1659       * timed invokeAny(c) throws NPE if c has null elements
1660       */
1661      public void testTimedInvokeAny3() throws Exception {
1662 <        final CountDownLatch latch = new CountDownLatch(1);
1662 >        CountDownLatch latch = new CountDownLatch(1);
1663          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1664 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1665 +        l.add(latchAwaitingStringTask(latch));
1666 +        l.add(null);
1667          try {
1360            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1361            l.add(new Callable<String>() {
1362                      public String call() {
1363                          try {
1364                              latch.await();
1365                          } catch (InterruptedException ok) {}
1366                          return TEST_STRING;
1367                      }});
1368            l.add(null);
1668              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1669              shouldThrow();
1670          } catch (NullPointerException success) {
# Line 1380 | Line 1679 | public class ThreadPoolExecutorSubclassT
1679       */
1680      public void testTimedInvokeAny4() throws Exception {
1681          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1682 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1683 +        l.add(new NPETask());
1684          try {
1384            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1385            l.add(new NPETask());
1685              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1686              shouldThrow();
1687          } catch (ExecutionException success) {
# Line 1398 | Line 1697 | public class ThreadPoolExecutorSubclassT
1697      public void testTimedInvokeAny5() throws Exception {
1698          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1699          try {
1700 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1700 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1701              l.add(new StringTask());
1702              l.add(new StringTask());
1703              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 1427 | Line 1726 | public class ThreadPoolExecutorSubclassT
1726       */
1727      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1728          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1729 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1730 +        l.add(new StringTask());
1731          try {
1431            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1432            l.add(new StringTask());
1732              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1733              shouldThrow();
1734          } catch (NullPointerException success) {
# Line 1456 | Line 1755 | public class ThreadPoolExecutorSubclassT
1755       */
1756      public void testTimedInvokeAll3() throws Exception {
1757          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1758 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1759 +        l.add(new StringTask());
1760 +        l.add(null);
1761          try {
1460            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1461            l.add(new StringTask());
1462            l.add(null);
1762              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1763              shouldThrow();
1764          } catch (NullPointerException success) {
# Line 1473 | Line 1772 | public class ThreadPoolExecutorSubclassT
1772       */
1773      public void testTimedInvokeAll4() throws Exception {
1774          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1775 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1776 +        l.add(new NPETask());
1777 +        List<Future<String>> futures =
1778 +            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1779 +        assertEquals(1, futures.size());
1780          try {
1781 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1478 <            l.add(new NPETask());
1479 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1480 <            assertEquals(1, result.size());
1481 <            for (Future<String> future : result)
1482 <                future.get();
1781 >            futures.get(0).get();
1782              shouldThrow();
1783          } catch (ExecutionException success) {
1784              assertTrue(success.getCause() instanceof NullPointerException);
# Line 1494 | Line 1793 | public class ThreadPoolExecutorSubclassT
1793      public void testTimedInvokeAll5() throws Exception {
1794          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1795          try {
1796 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1796 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1797              l.add(new StringTask());
1798              l.add(new StringTask());
1799 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1800 <            assertEquals(2, result.size());
1801 <            for (Future<String> future : result)
1799 >            List<Future<String>> futures =
1800 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1801 >            assertEquals(2, futures.size());
1802 >            for (Future<String> future : futures)
1803                  assertSame(TEST_STRING, future.get());
1804          } finally {
1805              joinPool(e);
# Line 1512 | Line 1812 | public class ThreadPoolExecutorSubclassT
1812      public void testTimedInvokeAll6() throws Exception {
1813          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1814          try {
1815 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1816 <            l.add(new StringTask());
1817 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1818 <            l.add(new StringTask());
1819 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1820 <            assertEquals(3, result.size());
1821 <            Iterator<Future<String>> it = result.iterator();
1822 <            Future<String> f1 = it.next();
1823 <            Future<String> f2 = it.next();
1824 <            Future<String> f3 = it.next();
1825 <            assertTrue(f1.isDone());
1826 <            assertTrue(f2.isDone());
1827 <            assertTrue(f3.isDone());
1828 <            assertFalse(f1.isCancelled());
1829 <            assertTrue(f2.isCancelled());
1815 >            for (long timeout = timeoutMillis();;) {
1816 >                List<Callable<String>> tasks = new ArrayList<>();
1817 >                tasks.add(new StringTask("0"));
1818 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1819 >                tasks.add(new StringTask("2"));
1820 >                long startTime = System.nanoTime();
1821 >                List<Future<String>> futures =
1822 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1823 >                assertEquals(tasks.size(), futures.size());
1824 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1825 >                for (Future future : futures)
1826 >                    assertTrue(future.isDone());
1827 >                assertTrue(futures.get(1).isCancelled());
1828 >                try {
1829 >                    assertEquals("0", futures.get(0).get());
1830 >                    assertEquals("2", futures.get(2).get());
1831 >                    break;
1832 >                } catch (CancellationException retryWithLongerTimeout) {
1833 >                    timeout *= 2;
1834 >                    if (timeout >= LONG_DELAY_MS / 2)
1835 >                        fail("expected exactly one task to be cancelled");
1836 >                }
1837 >            }
1838          } finally {
1839              joinPool(e);
1840          }
# Line 1537 | Line 1845 | public class ThreadPoolExecutorSubclassT
1845       * thread factory fails to create more
1846       */
1847      public void testFailingThreadFactory() throws InterruptedException {
1848 <        ExecutorService e = new CustomTPE(100, 100, LONG_DELAY_MS, MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
1849 <        try {
1850 <            for (int k = 0; k < 100; ++k) {
1851 <                e.execute(new NoOpRunnable());
1852 <            }
1853 <            Thread.sleep(LONG_DELAY_MS);
1848 >        final ExecutorService e =
1849 >            new CustomTPE(100, 100,
1850 >                          LONG_DELAY_MS, MILLISECONDS,
1851 >                          new LinkedBlockingQueue<Runnable>(),
1852 >                          new FailingThreadFactory());
1853 >        try {
1854 >            final int TASKS = 100;
1855 >            final CountDownLatch done = new CountDownLatch(TASKS);
1856 >            for (int k = 0; k < TASKS; ++k)
1857 >                e.execute(new CheckedRunnable() {
1858 >                    public void realRun() {
1859 >                        done.countDown();
1860 >                    }});
1861 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1862          } finally {
1863              joinPool(e);
1864          }
# Line 1552 | Line 1868 | public class ThreadPoolExecutorSubclassT
1868       * allowsCoreThreadTimeOut is by default false.
1869       */
1870      public void testAllowsCoreThreadTimeOut() {
1871 <        ThreadPoolExecutor tpe = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1872 <        assertFalse(tpe.allowsCoreThreadTimeOut());
1873 <        joinPool(tpe);
1871 >        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1872 >        assertFalse(p.allowsCoreThreadTimeOut());
1873 >        joinPool(p);
1874      }
1875  
1876      /**
1877       * allowCoreThreadTimeOut(true) causes idle threads to time out
1878       */
1879 <    public void testAllowCoreThreadTimeOut_true() throws InterruptedException {
1880 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1881 <        tpe.allowCoreThreadTimeOut(true);
1882 <        tpe.execute(new NoOpRunnable());
1883 <        try {
1884 <            Thread.sleep(MEDIUM_DELAY_MS);
1885 <            assertEquals(0, tpe.getPoolSize());
1879 >    public void testAllowCoreThreadTimeOut_true() throws Exception {
1880 >        long keepAliveTime = timeoutMillis();
1881 >        final ThreadPoolExecutor p =
1882 >            new CustomTPE(2, 10,
1883 >                          keepAliveTime, MILLISECONDS,
1884 >                          new ArrayBlockingQueue<Runnable>(10));
1885 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1886 >        try {
1887 >            p.allowCoreThreadTimeOut(true);
1888 >            p.execute(new CheckedRunnable() {
1889 >                public void realRun() {
1890 >                    threadStarted.countDown();
1891 >                    assertEquals(1, p.getPoolSize());
1892 >                }});
1893 >            await(threadStarted);
1894 >            delay(keepAliveTime);
1895 >            long startTime = System.nanoTime();
1896 >            while (p.getPoolSize() > 0
1897 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1898 >                Thread.yield();
1899 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1900 >            assertEquals(0, p.getPoolSize());
1901          } finally {
1902 <            joinPool(tpe);
1902 >            joinPool(p);
1903          }
1904      }
1905  
1906      /**
1907       * allowCoreThreadTimeOut(false) causes idle threads not to time out
1908       */
1909 <    public void testAllowCoreThreadTimeOut_false() throws InterruptedException {
1910 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1911 <        tpe.allowCoreThreadTimeOut(false);
1912 <        tpe.execute(new NoOpRunnable());
1913 <        try {
1914 <            Thread.sleep(MEDIUM_DELAY_MS);
1915 <            assertTrue(tpe.getPoolSize() >= 1);
1909 >    public void testAllowCoreThreadTimeOut_false() throws Exception {
1910 >        long keepAliveTime = timeoutMillis();
1911 >        final ThreadPoolExecutor p =
1912 >            new CustomTPE(2, 10,
1913 >                          keepAliveTime, MILLISECONDS,
1914 >                          new ArrayBlockingQueue<Runnable>(10));
1915 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1916 >        try {
1917 >            p.allowCoreThreadTimeOut(false);
1918 >            p.execute(new CheckedRunnable() {
1919 >                public void realRun() throws InterruptedException {
1920 >                    threadStarted.countDown();
1921 >                    assertTrue(p.getPoolSize() >= 1);
1922 >                }});
1923 >            delay(2 * keepAliveTime);
1924 >            assertTrue(p.getPoolSize() >= 1);
1925 >        } finally {
1926 >            joinPool(p);
1927 >        }
1928 >    }
1929 >
1930 >    /**
1931 >     * get(cancelled task) throws CancellationException
1932 >     * (in part, a test of CustomTPE itself)
1933 >     */
1934 >    public void testGet_cancelled() throws Exception {
1935 >        final ExecutorService e =
1936 >            new CustomTPE(1, 1,
1937 >                          LONG_DELAY_MS, MILLISECONDS,
1938 >                          new LinkedBlockingQueue<Runnable>());
1939 >        try {
1940 >            final CountDownLatch blockerStarted = new CountDownLatch(1);
1941 >            final CountDownLatch done = new CountDownLatch(1);
1942 >            final List<Future<?>> futures = new ArrayList<>();
1943 >            for (int i = 0; i < 2; i++) {
1944 >                Runnable r = new CheckedRunnable() { public void realRun()
1945 >                                                         throws Throwable {
1946 >                    blockerStarted.countDown();
1947 >                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1948 >                }};
1949 >                futures.add(e.submit(r));
1950 >            }
1951 >            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1952 >            for (Future<?> future : futures) future.cancel(false);
1953 >            for (Future<?> future : futures) {
1954 >                try {
1955 >                    future.get();
1956 >                    shouldThrow();
1957 >                } catch (CancellationException success) {}
1958 >                try {
1959 >                    future.get(LONG_DELAY_MS, MILLISECONDS);
1960 >                    shouldThrow();
1961 >                } catch (CancellationException success) {}
1962 >                assertTrue(future.isCancelled());
1963 >                assertTrue(future.isDone());
1964 >            }
1965 >            done.countDown();
1966          } finally {
1967 <            joinPool(tpe);
1967 >            joinPool(e);
1968          }
1969      }
1970  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines