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.5 by jsr166, Wed Nov 18 16:51:26 2009 UTC vs.
Revision 1.73 by jsr166, Sun Oct 4 02:49:18 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.*;
10 < import java.util.concurrent.locks.*;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
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(ThreadPoolExecutorTest.class);
45 >        return new TestSuite(ThreadPoolExecutorSubclassTest.class);
46      }
47  
48      static class CustomTask<V> implements RunnableFuture<V> {
# Line 29 | Line 54 | public class ThreadPoolExecutorSubclassT
54          V result;
55          Thread thread;
56          Exception exception;
57 <        CustomTask(Callable<V> c) { callable = c; }
58 <        CustomTask(final Runnable r, final V res) { callable = new Callable<V>() {
59 <            public V call() throws Exception { r.run(); return res; }};
57 >        CustomTask(Callable<V> c) {
58 >            if (c == null) throw new NullPointerException();
59 >            callable = c;
60 >        }
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; }};
65          }
66          public boolean isDone() {
67              lock.lock(); try { return done; } finally { lock.unlock() ; }
# Line 54 | Line 84 | public class ThreadPoolExecutorSubclassT
84              finally { lock.unlock() ; }
85          }
86          public void run() {
57            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() ; }
65            if (!runme) return;
94              V v = null;
95              Exception e = null;
96              try {
# Line 73 | 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 86 | 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 97 | Line 129 | public class ThreadPoolExecutorSubclassT
129              long nanos = unit.toNanos(timeout);
130              lock.lock();
131              try {
132 <                for (;;) {
133 <                    if (done) break;
102 <                    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 111 | Line 144 | public class ThreadPoolExecutorSubclassT
144          }
145      }
146  
114
147      static class CustomTPE extends ThreadPoolExecutor {
148          protected <V> RunnableFuture<V> newTaskFor(Callable<V> c) {
149              return new CustomTask<V>(c);
# Line 158 | 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, TimeUnit.MILLISECONDS, new SynchronousQueue<Runnable>());
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 184 | Line 226 | public class ThreadPoolExecutorSubclassT
226          }
227      }
228  
187
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, TimeUnit.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, TimeUnit.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, TimeUnit.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, TimeUnit.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, TimeUnit.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, TimeUnit.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, TimeUnit.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  
274
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, TimeUnit.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, TimeUnit.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  
296
410      /**
411       * setThreadFactory(null) throws NPE
412       */
413      public void testSetThreadFactoryNull() {
414 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.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 312 | 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, TimeUnit.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 323 | Line 443 | public class ThreadPoolExecutorSubclassT
443       * getRejectedExecutionHandler
444       */
445      public void testSetRejectedExecutionHandler() {
446 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.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  
333
457      /**
458       * setRejectedExecutionHandler(null) throws NPE
459       */
460      public void testSetRejectedExecutionHandlerNull() {
461 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.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  
348
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, TimeUnit.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, TimeUnit.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, TimeUnit.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, TimeUnit.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, TimeUnit.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  
409
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, TimeUnit.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; }
587 >        final ThreadPoolExecutor p =
588 >            new CustomTPE(1, 1,
589 >                          LONG_DELAY_MS, MILLISECONDS,
590 >                          new ArrayBlockingQueue<Runnable>(10));
591 >        try (PoolCleaner cleaner = cleaner(p)) {
592 >            final CountDownLatch threadStarted = new CountDownLatch(1);
593 >            final CountDownLatch done = new CountDownLatch(1);
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 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
605 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
606 >            assertTrue(p.isTerminated());
607 >            assertFalse(p.isTerminating());
608          }
421        assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
422        assertTrue(p1.isTerminated());
609      }
610  
611      /**
612 <     *  isTerminating is not true when running or when terminated
612 >     * isTerminating is not true when running or when terminated
613       */
614      public void testIsTerminating() throws InterruptedException {
615 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
616 <        assertFalse(p1.isTerminating());
617 <        try {
618 <            p1.execute(new SmallRunnable());
619 <            assertFalse(p1.isTerminating());
620 <        } finally {
621 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
615 >        final ThreadPoolExecutor p =
616 >            new CustomTPE(1, 1,
617 >                          LONG_DELAY_MS, MILLISECONDS,
618 >                          new ArrayBlockingQueue<Runnable>(10));
619 >        try (PoolCleaner cleaner = cleaner(p)) {
620 >            final CountDownLatch threadStarted = new CountDownLatch(1);
621 >            final CountDownLatch done = new CountDownLatch(1);
622 >            assertFalse(p.isTerminating());
623 >            p.execute(new CheckedRunnable() {
624 >                public void realRun() throws InterruptedException {
625 >                    assertFalse(p.isTerminating());
626 >                    threadStarted.countDown();
627 >                    done.await();
628 >                }});
629 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
630 >            assertFalse(p.isTerminating());
631 >            done.countDown();
632 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
633 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
634 >            assertTrue(p.isTerminated());
635 >            assertFalse(p.isTerminating());
636          }
437        assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
438        assertTrue(p1.isTerminated());
439        assertFalse(p1.isTerminating());
637      }
638  
639      /**
640       * getQueue returns the work queue, which contains queued tasks
641       */
642      public void testGetQueue() throws InterruptedException {
643 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
644 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, q);
645 <        FutureTask[] tasks = new FutureTask[5];
646 <        for (int i = 0; i < 5; i++) {
647 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
648 <            p1.execute(tasks[i]);
649 <        }
650 <        try {
651 <            Thread.sleep(SHORT_DELAY_MS);
652 <            BlockingQueue<Runnable> wq = p1.getQueue();
653 <            assertSame(q, wq);
654 <            assertFalse(wq.contains(tasks[0]));
655 <            assertTrue(wq.contains(tasks[4]));
656 <            for (int i = 1; i < 5; ++i)
657 <                tasks[i].cancel(true);
658 <            p1.shutdownNow();
659 <        } finally {
660 <            joinPool(p1);
643 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
644 >        final ThreadPoolExecutor p =
645 >            new CustomTPE(1, 1,
646 >                          LONG_DELAY_MS, MILLISECONDS,
647 >                          q);
648 >        try (PoolCleaner cleaner = cleaner(p)) {
649 >            final CountDownLatch threadStarted = new CountDownLatch(1);
650 >            final CountDownLatch done = new CountDownLatch(1);
651 >            FutureTask[] tasks = new FutureTask[5];
652 >            for (int i = 0; i < tasks.length; i++) {
653 >                Callable task = new CheckedCallable<Boolean>() {
654 >                    public Boolean realCall() throws InterruptedException {
655 >                        threadStarted.countDown();
656 >                        assertSame(q, p.getQueue());
657 >                        done.await();
658 >                        return Boolean.TRUE;
659 >                    }};
660 >                tasks[i] = new FutureTask(task);
661 >                p.execute(tasks[i]);
662 >            }
663 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
664 >            assertSame(q, p.getQueue());
665 >            assertFalse(q.contains(tasks[0]));
666 >            assertTrue(q.contains(tasks[tasks.length - 1]));
667 >            assertEquals(tasks.length - 1, q.size());
668 >            done.countDown();
669          }
670      }
671  
# Line 469 | Line 674 | public class ThreadPoolExecutorSubclassT
674       */
675      public void testRemove() throws InterruptedException {
676          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
677 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, q);
678 <        FutureTask[] tasks = new FutureTask[5];
679 <        for (int i = 0; i < 5; i++) {
680 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
681 <            p1.execute(tasks[i]);
682 <        }
683 <        try {
684 <            Thread.sleep(SHORT_DELAY_MS);
685 <            assertFalse(p1.remove(tasks[0]));
677 >        final ThreadPoolExecutor p =
678 >            new CustomTPE(1, 1,
679 >                          LONG_DELAY_MS, MILLISECONDS,
680 >                          q);
681 >        try (PoolCleaner cleaner = cleaner(p)) {
682 >            Runnable[] tasks = new Runnable[6];
683 >            final CountDownLatch threadStarted = new CountDownLatch(1);
684 >            final CountDownLatch done = new CountDownLatch(1);
685 >            for (int i = 0; i < tasks.length; i++) {
686 >                tasks[i] = new CheckedRunnable() {
687 >                    public void realRun() throws InterruptedException {
688 >                        threadStarted.countDown();
689 >                        done.await();
690 >                    }};
691 >                p.execute(tasks[i]);
692 >            }
693 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
694 >            assertFalse(p.remove(tasks[0]));
695              assertTrue(q.contains(tasks[4]));
696              assertTrue(q.contains(tasks[3]));
697 <            assertTrue(p1.remove(tasks[4]));
698 <            assertFalse(p1.remove(tasks[4]));
697 >            assertTrue(p.remove(tasks[4]));
698 >            assertFalse(p.remove(tasks[4]));
699              assertFalse(q.contains(tasks[4]));
700              assertTrue(q.contains(tasks[3]));
701 <            assertTrue(p1.remove(tasks[3]));
701 >            assertTrue(p.remove(tasks[3]));
702              assertFalse(q.contains(tasks[3]));
703 <        } finally {
490 <            joinPool(p1);
703 >            done.countDown();
704          }
705      }
706  
707      /**
708 <     *   purge removes cancelled tasks from the queue
708 >     * purge removes cancelled tasks from the queue
709       */
710 <    public void testPurge() {
711 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
712 <        FutureTask[] tasks = new FutureTask[5];
713 <        for (int i = 0; i < 5; i++) {
714 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
715 <            p1.execute(tasks[i]);
710 >    public void testPurge() throws InterruptedException {
711 >        final CountDownLatch threadStarted = new CountDownLatch(1);
712 >        final CountDownLatch done = new CountDownLatch(1);
713 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
714 >        final ThreadPoolExecutor p =
715 >            new CustomTPE(1, 1,
716 >                          LONG_DELAY_MS, MILLISECONDS,
717 >                          q);
718 >        try (PoolCleaner cleaner = cleaner(p)) {
719 >            FutureTask[] tasks = new FutureTask[5];
720 >            for (int i = 0; i < tasks.length; i++) {
721 >                Callable task = new CheckedCallable<Boolean>() {
722 >                    public Boolean realCall() throws InterruptedException {
723 >                        threadStarted.countDown();
724 >                        done.await();
725 >                        return Boolean.TRUE;
726 >                    }};
727 >                tasks[i] = new FutureTask(task);
728 >                p.execute(tasks[i]);
729 >            }
730 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
731 >            assertEquals(tasks.length, p.getTaskCount());
732 >            assertEquals(tasks.length - 1, q.size());
733 >            assertEquals(1L, p.getActiveCount());
734 >            assertEquals(0L, p.getCompletedTaskCount());
735 >            tasks[4].cancel(true);
736 >            tasks[3].cancel(false);
737 >            p.purge();
738 >            assertEquals(tasks.length - 3, q.size());
739 >            assertEquals(tasks.length - 2, p.getTaskCount());
740 >            p.purge();         // Nothing to do
741 >            assertEquals(tasks.length - 3, q.size());
742 >            assertEquals(tasks.length - 2, p.getTaskCount());
743 >            done.countDown();
744          }
504        tasks[4].cancel(true);
505        tasks[3].cancel(true);
506        p1.purge();
507        long count = p1.getTaskCount();
508        assertTrue(count >= 2 && count < 5);
509        joinPool(p1);
745      }
746  
747      /**
748 <     *  shutDownNow returns a list containing tasks that were not run
749 <     */
750 <    public void testShutDownNow() {
751 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
752 <        List l;
753 <        try {
754 <            for (int i = 0; i < 5; i++)
755 <                p1.execute(new MediumPossiblyInterruptedRunnable());
756 <        }
757 <        finally {
748 >     * shutdownNow returns a list containing tasks that were not run,
749 >     * and those tasks are drained from the queue
750 >     */
751 >    public void testShutdownNow() throws InterruptedException {
752 >        final int poolSize = 2;
753 >        final int count = 5;
754 >        final AtomicInteger ran = new AtomicInteger(0);
755 >        ThreadPoolExecutor p =
756 >            new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
757 >                          new ArrayBlockingQueue<Runnable>(10));
758 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
759 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
760 >            threadsStarted.countDown();
761              try {
762 <                l = p1.shutdownNow();
763 <            } catch (SecurityException ok) { return; }
764 <
765 <        }
766 <        assertTrue(p1.isShutdown());
767 <        assertTrue(l.size() <= 4);
762 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
763 >            } catch (InterruptedException success) {}
764 >            ran.getAndIncrement();
765 >        }};
766 >        for (int i = 0; i < count; i++)
767 >            p.execute(waiter);
768 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
769 >        assertEquals(poolSize, p.getActiveCount());
770 >        assertEquals(0, p.getCompletedTaskCount());
771 >        final List<Runnable> queuedTasks;
772 >        try {
773 >            queuedTasks = p.shutdownNow();
774 >        } catch (SecurityException ok) {
775 >            return; // Allowed in case test doesn't have privs
776 >        }
777 >        assertTrue(p.isShutdown());
778 >        assertTrue(p.getQueue().isEmpty());
779 >        assertEquals(count - poolSize, queuedTasks.size());
780 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
781 >        assertTrue(p.isTerminated());
782 >        assertEquals(poolSize, ran.get());
783 >        assertEquals(poolSize, p.getCompletedTaskCount());
784      }
785  
786      // Exception Tests
787  
534
788      /**
789       * Constructor throws if corePoolSize argument is less than zero
790       */
791      public void testConstructor1() {
792          try {
793 <            new CustomTPE(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
793 >            new CustomTPE(-1, 1, 1L, SECONDS,
794 >                          new ArrayBlockingQueue<Runnable>(10));
795              shouldThrow();
796          } catch (IllegalArgumentException success) {}
797      }
# Line 547 | Line 801 | public class ThreadPoolExecutorSubclassT
801       */
802      public void testConstructor2() {
803          try {
804 <            new CustomTPE(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
804 >            new CustomTPE(1, -1, 1L, SECONDS,
805 >                          new ArrayBlockingQueue<Runnable>(10));
806              shouldThrow();
807          } catch (IllegalArgumentException success) {}
808      }
# Line 557 | Line 812 | public class ThreadPoolExecutorSubclassT
812       */
813      public void testConstructor3() {
814          try {
815 <            new CustomTPE(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
815 >            new CustomTPE(1, 0, 1L, SECONDS,
816 >                          new ArrayBlockingQueue<Runnable>(10));
817              shouldThrow();
818          } catch (IllegalArgumentException success) {}
819      }
# Line 567 | Line 823 | public class ThreadPoolExecutorSubclassT
823       */
824      public void testConstructor4() {
825          try {
826 <            new CustomTPE(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
826 >            new CustomTPE(1, 2, -1L, SECONDS,
827 >                          new ArrayBlockingQueue<Runnable>(10));
828              shouldThrow();
829          } catch (IllegalArgumentException success) {}
830      }
# Line 577 | Line 834 | public class ThreadPoolExecutorSubclassT
834       */
835      public void testConstructor5() {
836          try {
837 <            new CustomTPE(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
837 >            new CustomTPE(2, 1, 1L, SECONDS,
838 >                          new ArrayBlockingQueue<Runnable>(10));
839              shouldThrow();
840          } catch (IllegalArgumentException success) {}
841      }
# Line 587 | Line 845 | public class ThreadPoolExecutorSubclassT
845       */
846      public void testConstructorNullPointerException() {
847          try {
848 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null);
848 >            new CustomTPE(1, 2, 1L, SECONDS, null);
849              shouldThrow();
850          } catch (NullPointerException success) {}
851      }
852  
595
596
853      /**
854       * Constructor throws if corePoolSize argument is less than zero
855       */
856      public void testConstructor6() {
857          try {
858 <            new CustomTPE(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
858 >            new CustomTPE(-1, 1, 1L, SECONDS,
859 >                          new ArrayBlockingQueue<Runnable>(10),
860 >                          new SimpleThreadFactory());
861              shouldThrow();
862          } catch (IllegalArgumentException success) {}
863      }
# Line 609 | Line 867 | public class ThreadPoolExecutorSubclassT
867       */
868      public void testConstructor7() {
869          try {
870 <            new CustomTPE(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
870 >            new CustomTPE(1,-1, 1L, SECONDS,
871 >                          new ArrayBlockingQueue<Runnable>(10),
872 >                          new SimpleThreadFactory());
873              shouldThrow();
874          } catch (IllegalArgumentException success) {}
875      }
# Line 619 | Line 879 | public class ThreadPoolExecutorSubclassT
879       */
880      public void testConstructor8() {
881          try {
882 <            new CustomTPE(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
882 >            new CustomTPE(1, 0, 1L, SECONDS,
883 >                          new ArrayBlockingQueue<Runnable>(10),
884 >                          new SimpleThreadFactory());
885              shouldThrow();
886          } catch (IllegalArgumentException success) {}
887      }
# Line 629 | Line 891 | public class ThreadPoolExecutorSubclassT
891       */
892      public void testConstructor9() {
893          try {
894 <            new CustomTPE(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
894 >            new CustomTPE(1, 2, -1L, SECONDS,
895 >                          new ArrayBlockingQueue<Runnable>(10),
896 >                          new SimpleThreadFactory());
897              shouldThrow();
898          } catch (IllegalArgumentException success) {}
899      }
# Line 639 | Line 903 | public class ThreadPoolExecutorSubclassT
903       */
904      public void testConstructor10() {
905          try {
906 <            new CustomTPE(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
906 >            new CustomTPE(2, 1, 1L, SECONDS,
907 >                          new ArrayBlockingQueue<Runnable>(10),
908 >                          new SimpleThreadFactory());
909              shouldThrow();
910          } catch (IllegalArgumentException success) {}
911      }
# Line 649 | Line 915 | public class ThreadPoolExecutorSubclassT
915       */
916      public void testConstructorNullPointerException2() {
917          try {
918 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new SimpleThreadFactory());
918 >            new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
919              shouldThrow();
920          } catch (NullPointerException success) {}
921      }
# Line 659 | Line 925 | public class ThreadPoolExecutorSubclassT
925       */
926      public void testConstructorNullPointerException3() {
927          try {
928 <            ThreadFactory f = null;
929 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
928 >            new CustomTPE(1, 2, 1L, SECONDS,
929 >                          new ArrayBlockingQueue<Runnable>(10),
930 >                          (ThreadFactory) null);
931              shouldThrow();
932          } catch (NullPointerException success) {}
933      }
934  
668
935      /**
936       * Constructor throws if corePoolSize argument is less than zero
937       */
938      public void testConstructor11() {
939          try {
940 <            new CustomTPE(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
940 >            new CustomTPE(-1, 1, 1L, SECONDS,
941 >                          new ArrayBlockingQueue<Runnable>(10),
942 >                          new NoOpREHandler());
943              shouldThrow();
944          } catch (IllegalArgumentException success) {}
945      }
# Line 681 | Line 949 | public class ThreadPoolExecutorSubclassT
949       */
950      public void testConstructor12() {
951          try {
952 <            new CustomTPE(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
952 >            new CustomTPE(1, -1, 1L, SECONDS,
953 >                          new ArrayBlockingQueue<Runnable>(10),
954 >                          new NoOpREHandler());
955              shouldThrow();
956          } catch (IllegalArgumentException success) {}
957      }
# Line 691 | Line 961 | public class ThreadPoolExecutorSubclassT
961       */
962      public void testConstructor13() {
963          try {
964 <            new CustomTPE(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
964 >            new CustomTPE(1, 0, 1L, SECONDS,
965 >                          new ArrayBlockingQueue<Runnable>(10),
966 >                          new NoOpREHandler());
967              shouldThrow();
968          } catch (IllegalArgumentException success) {}
969      }
# Line 701 | Line 973 | public class ThreadPoolExecutorSubclassT
973       */
974      public void testConstructor14() {
975          try {
976 <            new CustomTPE(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
976 >            new CustomTPE(1, 2, -1L, SECONDS,
977 >                          new ArrayBlockingQueue<Runnable>(10),
978 >                          new NoOpREHandler());
979              shouldThrow();
980          } catch (IllegalArgumentException success) {}
981      }
# Line 711 | Line 985 | public class ThreadPoolExecutorSubclassT
985       */
986      public void testConstructor15() {
987          try {
988 <            new CustomTPE(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
988 >            new CustomTPE(2, 1, 1L, SECONDS,
989 >                          new ArrayBlockingQueue<Runnable>(10),
990 >                          new NoOpREHandler());
991              shouldThrow();
992          } catch (IllegalArgumentException success) {}
993      }
# Line 721 | Line 997 | public class ThreadPoolExecutorSubclassT
997       */
998      public void testConstructorNullPointerException4() {
999          try {
1000 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new NoOpREHandler());
1000 >            new CustomTPE(1, 2, 1L, SECONDS,
1001 >                          null,
1002 >                          new NoOpREHandler());
1003              shouldThrow();
1004          } catch (NullPointerException success) {}
1005      }
# Line 731 | Line 1009 | public class ThreadPoolExecutorSubclassT
1009       */
1010      public void testConstructorNullPointerException5() {
1011          try {
1012 <            RejectedExecutionHandler r = null;
1013 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
1012 >            new CustomTPE(1, 2, 1L, SECONDS,
1013 >                          new ArrayBlockingQueue<Runnable>(10),
1014 >                          (RejectedExecutionHandler) null);
1015              shouldThrow();
1016          } catch (NullPointerException success) {}
1017      }
1018  
740
1019      /**
1020       * Constructor throws if corePoolSize argument is less than zero
1021       */
1022      public void testConstructor16() {
1023          try {
1024 <            new CustomTPE(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1024 >            new CustomTPE(-1, 1, 1L, SECONDS,
1025 >                          new ArrayBlockingQueue<Runnable>(10),
1026 >                          new SimpleThreadFactory(),
1027 >                          new NoOpREHandler());
1028              shouldThrow();
1029          } catch (IllegalArgumentException success) {}
1030      }
# Line 753 | Line 1034 | public class ThreadPoolExecutorSubclassT
1034       */
1035      public void testConstructor17() {
1036          try {
1037 <            new CustomTPE(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1037 >            new CustomTPE(1, -1, 1L, SECONDS,
1038 >                          new ArrayBlockingQueue<Runnable>(10),
1039 >                          new SimpleThreadFactory(),
1040 >                          new NoOpREHandler());
1041              shouldThrow();
1042          } catch (IllegalArgumentException success) {}
1043      }
# Line 763 | Line 1047 | public class ThreadPoolExecutorSubclassT
1047       */
1048      public void testConstructor18() {
1049          try {
1050 <            new CustomTPE(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1050 >            new CustomTPE(1, 0, 1L, SECONDS,
1051 >                          new ArrayBlockingQueue<Runnable>(10),
1052 >                          new SimpleThreadFactory(),
1053 >                          new NoOpREHandler());
1054              shouldThrow();
1055          } catch (IllegalArgumentException success) {}
1056      }
# Line 773 | Line 1060 | public class ThreadPoolExecutorSubclassT
1060       */
1061      public void testConstructor19() {
1062          try {
1063 <            new CustomTPE(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1063 >            new CustomTPE(1, 2, -1L, SECONDS,
1064 >                          new ArrayBlockingQueue<Runnable>(10),
1065 >                          new SimpleThreadFactory(),
1066 >                          new NoOpREHandler());
1067              shouldThrow();
1068          } catch (IllegalArgumentException success) {}
1069      }
# Line 783 | Line 1073 | public class ThreadPoolExecutorSubclassT
1073       */
1074      public void testConstructor20() {
1075          try {
1076 <            new CustomTPE(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1076 >            new CustomTPE(2, 1, 1L, SECONDS,
1077 >                          new ArrayBlockingQueue<Runnable>(10),
1078 >                          new SimpleThreadFactory(),
1079 >                          new NoOpREHandler());
1080              shouldThrow();
1081          } catch (IllegalArgumentException success) {}
1082      }
1083  
1084      /**
1085 <     * Constructor throws if workQueue is set to null
1085 >     * Constructor throws if workQueue is null
1086       */
1087      public void testConstructorNullPointerException6() {
1088          try {
1089 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1089 >            new CustomTPE(1, 2, 1L, SECONDS,
1090 >                          null,
1091 >                          new SimpleThreadFactory(),
1092 >                          new NoOpREHandler());
1093              shouldThrow();
1094          } catch (NullPointerException success) {}
1095      }
1096  
1097      /**
1098 <     * Constructor throws if handler is set to null
1098 >     * Constructor throws if handler is null
1099       */
1100      public void testConstructorNullPointerException7() {
1101          try {
1102 <            RejectedExecutionHandler r = null;
1103 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1102 >            new CustomTPE(1, 2, 1L, SECONDS,
1103 >                          new ArrayBlockingQueue<Runnable>(10),
1104 >                          new SimpleThreadFactory(),
1105 >                          (RejectedExecutionHandler) null);
1106              shouldThrow();
1107          } catch (NullPointerException success) {}
1108      }
1109  
1110      /**
1111 <     * Constructor throws if ThreadFactory is set top null
1111 >     * Constructor throws if ThreadFactory is null
1112       */
1113      public void testConstructorNullPointerException8() {
1114          try {
1115 <            ThreadFactory f = null;
1116 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new NoOpREHandler());
1115 >            new CustomTPE(1, 2, 1L, SECONDS,
1116 >                          new ArrayBlockingQueue<Runnable>(10),
1117 >                          (ThreadFactory) null,
1118 >                          new NoOpREHandler());
1119              shouldThrow();
1120          } catch (NullPointerException success) {}
1121      }
1122  
823
1123      /**
1124 <     *  execute throws RejectedExecutionException
826 <     *  if saturated.
1124 >     * execute throws RejectedExecutionException if saturated.
1125       */
1126      public void testSaturatedExecute() {
1127 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
1128 <        try {
1129 <
1130 <            for (int i = 0; i < 5; ++i) {
1131 <                p.execute(new MediumRunnable());
1127 >        final ThreadPoolExecutor p =
1128 >            new CustomTPE(1, 1,
1129 >                          LONG_DELAY_MS, MILLISECONDS,
1130 >                          new ArrayBlockingQueue<Runnable>(1));
1131 >        try (PoolCleaner cleaner = cleaner(p)) {
1132 >            final CountDownLatch done = new CountDownLatch(1);
1133 >            Runnable task = new CheckedRunnable() {
1134 >                public void realRun() throws InterruptedException {
1135 >                    done.await();
1136 >                }};
1137 >            for (int i = 0; i < 2; ++i)
1138 >                p.execute(task);
1139 >            for (int i = 0; i < 2; ++i) {
1140 >                try {
1141 >                    p.execute(task);
1142 >                    shouldThrow();
1143 >                } catch (RejectedExecutionException success) {}
1144 >                assertTrue(p.getTaskCount() <= 2);
1145              }
1146 <            shouldThrow();
1147 <        } catch (RejectedExecutionException success) {}
837 <        joinPool(p);
1146 >            done.countDown();
1147 >        }
1148      }
1149  
1150      /**
1151 <     *  executor using CallerRunsPolicy runs task if saturated.
1151 >     * executor using CallerRunsPolicy runs task if saturated.
1152       */
1153      public void testSaturatedExecute2() {
1154          RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1155 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1155 >        ThreadPoolExecutor p = new CustomTPE(1, 1,
1156 >                                             LONG_DELAY_MS, MILLISECONDS,
1157 >                                             new ArrayBlockingQueue<Runnable>(1),
1158 >                                             h);
1159          try {
847
1160              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1161 <            for (int i = 0; i < 5; ++i) {
1161 >            for (int i = 0; i < tasks.length; ++i)
1162                  tasks[i] = new TrackedNoOpRunnable();
851            }
1163              TrackedLongRunnable mr = new TrackedLongRunnable();
1164              p.execute(mr);
1165 <            for (int i = 0; i < 5; ++i) {
1165 >            for (int i = 0; i < tasks.length; ++i)
1166                  p.execute(tasks[i]);
1167 <            }
857 <            for (int i = 1; i < 5; ++i) {
1167 >            for (int i = 1; i < tasks.length; ++i)
1168                  assertTrue(tasks[i].done);
859            }
1169              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1170          } finally {
1171              joinPool(p);
# Line 864 | Line 1173 | public class ThreadPoolExecutorSubclassT
1173      }
1174  
1175      /**
1176 <     *  executor using DiscardPolicy drops task if saturated.
1176 >     * executor using DiscardPolicy drops task if saturated.
1177       */
1178      public void testSaturatedExecute3() {
1179          RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1180 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1180 >        ThreadPoolExecutor p =
1181 >            new CustomTPE(1, 1,
1182 >                          LONG_DELAY_MS, MILLISECONDS,
1183 >                          new ArrayBlockingQueue<Runnable>(1),
1184 >                          h);
1185          try {
873
1186              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1187 <            for (int i = 0; i < 5; ++i) {
1187 >            for (int i = 0; i < tasks.length; ++i)
1188                  tasks[i] = new TrackedNoOpRunnable();
877            }
1189              p.execute(new TrackedLongRunnable());
1190 <            for (int i = 0; i < 5; ++i) {
1191 <                p.execute(tasks[i]);
1192 <            }
1193 <            for (int i = 0; i < 5; ++i) {
883 <                assertFalse(tasks[i].done);
884 <            }
1190 >            for (TrackedNoOpRunnable task : tasks)
1191 >                p.execute(task);
1192 >            for (TrackedNoOpRunnable task : tasks)
1193 >                assertFalse(task.done);
1194              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1195          } finally {
1196              joinPool(p);
# Line 889 | Line 1198 | public class ThreadPoolExecutorSubclassT
1198      }
1199  
1200      /**
1201 <     *  executor using DiscardOldestPolicy drops oldest task if saturated.
1201 >     * executor using DiscardOldestPolicy drops oldest task if saturated.
1202       */
1203      public void testSaturatedExecute4() {
1204          RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1205 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1205 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1206          try {
1207              p.execute(new TrackedLongRunnable());
1208              TrackedLongRunnable r2 = new TrackedLongRunnable();
# Line 910 | Line 1219 | public class ThreadPoolExecutorSubclassT
1219      }
1220  
1221      /**
1222 <     *  execute throws RejectedExecutionException if shutdown
1222 >     * execute throws RejectedExecutionException if shutdown
1223       */
1224      public void testRejectedExecutionExceptionOnShutdown() {
1225 <        ThreadPoolExecutor tpe =
1226 <            new CustomTPE(1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1227 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1228 <        try {
1229 <            tpe.execute(new NoOpRunnable());
1230 <            shouldThrow();
1231 <        } catch (RejectedExecutionException success) {}
1225 >        ThreadPoolExecutor p =
1226 >            new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1227 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1228 >        try {
1229 >            p.execute(new NoOpRunnable());
1230 >            shouldThrow();
1231 >        } catch (RejectedExecutionException success) {}
1232  
1233 <        joinPool(tpe);
1233 >        joinPool(p);
1234      }
1235  
1236      /**
1237 <     *  execute using CallerRunsPolicy drops task on shutdown
1237 >     * execute using CallerRunsPolicy drops task on shutdown
1238       */
1239      public void testCallerRunsOnShutdown() {
1240          RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1241 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1241 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1242  
1243          try { p.shutdown(); } catch (SecurityException ok) { return; }
1244 <        try {
1244 >        try {
1245              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1246 <            p.execute(r);
1246 >            p.execute(r);
1247              assertFalse(r.done);
1248          } finally {
1249              joinPool(p);
# Line 942 | Line 1251 | public class ThreadPoolExecutorSubclassT
1251      }
1252  
1253      /**
1254 <     *  execute using DiscardPolicy drops task on shutdown
1254 >     * execute using DiscardPolicy drops task on shutdown
1255       */
1256      public void testDiscardOnShutdown() {
1257          RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1258 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1258 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1259  
1260          try { p.shutdown(); } catch (SecurityException ok) { return; }
1261 <        try {
1261 >        try {
1262              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1263 <            p.execute(r);
1263 >            p.execute(r);
1264              assertFalse(r.done);
1265          } finally {
1266              joinPool(p);
1267          }
1268      }
1269  
961
1270      /**
1271 <     *  execute using DiscardOldestPolicy drops task on shutdown
1271 >     * execute using DiscardOldestPolicy drops task on shutdown
1272       */
1273      public void testDiscardOldestOnShutdown() {
1274          RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1275 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1275 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1276  
1277          try { p.shutdown(); } catch (SecurityException ok) { return; }
1278 <        try {
1278 >        try {
1279              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1280 <            p.execute(r);
1280 >            p.execute(r);
1281              assertFalse(r.done);
1282          } finally {
1283              joinPool(p);
1284          }
1285      }
1286  
979
1287      /**
1288 <     *  execute (null) throws NPE
1288 >     * execute(null) throws NPE
1289       */
1290      public void testExecuteNull() {
1291 <        ThreadPoolExecutor tpe = null;
1291 >        ThreadPoolExecutor p =
1292 >            new CustomTPE(1, 2, 1L, SECONDS,
1293 >                          new ArrayBlockingQueue<Runnable>(10));
1294          try {
1295 <            tpe = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
987 <            tpe.execute(null);
1295 >            p.execute(null);
1296              shouldThrow();
1297 <        } catch (NullPointerException success) {}
1297 >        } catch (NullPointerException success) {}
1298  
1299 <        joinPool(tpe);
1299 >        joinPool(p);
1300      }
1301  
1302      /**
1303 <     *  setCorePoolSize of negative value throws IllegalArgumentException
1303 >     * setCorePoolSize of negative value throws IllegalArgumentException
1304       */
1305      public void testCorePoolSizeIllegalArgumentException() {
1306 <        ThreadPoolExecutor tpe = null;
1307 <        try {
1308 <            tpe = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1309 <        } catch (Exception e) {}
1310 <        try {
1311 <            tpe.setCorePoolSize(-1);
1004 <            shouldThrow();
1005 <        } catch (IllegalArgumentException success) {
1306 >        ThreadPoolExecutor p =
1307 >            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1308 >        try {
1309 >            p.setCorePoolSize(-1);
1310 >            shouldThrow();
1311 >        } catch (IllegalArgumentException success) {
1312          } finally {
1313 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1313 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1314          }
1315 <        joinPool(tpe);
1315 >        joinPool(p);
1316      }
1317  
1318      /**
1319 <     *  setMaximumPoolSize(int) throws IllegalArgumentException if
1320 <     *  given a value less the core pool size
1319 >     * setMaximumPoolSize(int) throws IllegalArgumentException
1320 >     * if given a value less the core pool size
1321       */
1322      public void testMaximumPoolSizeIllegalArgumentException() {
1323 <        ThreadPoolExecutor tpe = null;
1324 <        try {
1019 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1020 <        } catch (Exception e) {}
1323 >        ThreadPoolExecutor p =
1324 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1325          try {
1326 <            tpe.setMaximumPoolSize(1);
1326 >            p.setMaximumPoolSize(1);
1327              shouldThrow();
1328          } catch (IllegalArgumentException success) {
1329          } finally {
1330 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1330 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1331          }
1332 <        joinPool(tpe);
1332 >        joinPool(p);
1333      }
1334  
1335      /**
1336 <     *  setMaximumPoolSize throws IllegalArgumentException
1337 <     *  if given a negative value
1336 >     * setMaximumPoolSize throws IllegalArgumentException
1337 >     * if given a negative value
1338       */
1339      public void testMaximumPoolSizeIllegalArgumentException2() {
1340 <        ThreadPoolExecutor tpe = null;
1340 >        ThreadPoolExecutor p =
1341 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1342          try {
1343 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1039 <        } catch (Exception e) {}
1040 <        try {
1041 <            tpe.setMaximumPoolSize(-1);
1343 >            p.setMaximumPoolSize(-1);
1344              shouldThrow();
1345          } catch (IllegalArgumentException success) {
1346          } finally {
1347 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1347 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1348          }
1349 <        joinPool(tpe);
1349 >        joinPool(p);
1350      }
1351  
1050
1352      /**
1353 <     *  setKeepAliveTime  throws IllegalArgumentException
1354 <     *  when given a negative value
1353 >     * setKeepAliveTime throws IllegalArgumentException
1354 >     * when given a negative value
1355       */
1356      public void testKeepAliveTimeIllegalArgumentException() {
1357 <        ThreadPoolExecutor tpe = null;
1358 <        try {
1058 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1059 <        } catch (Exception e) {}
1357 >        ThreadPoolExecutor p =
1358 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1359  
1360 <        try {
1361 <            tpe.setKeepAliveTime(-1,TimeUnit.MILLISECONDS);
1360 >        try {
1361 >            p.setKeepAliveTime(-1,MILLISECONDS);
1362              shouldThrow();
1363          } catch (IllegalArgumentException success) {
1364          } finally {
1365 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1365 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1366          }
1367 <        joinPool(tpe);
1367 >        joinPool(p);
1368      }
1369  
1370      /**
1371       * terminated() is called on termination
1372       */
1373      public void testTerminated() {
1374 <        CustomTPE tpe = new CustomTPE();
1375 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1376 <        assertTrue(tpe.terminatedCalled);
1377 <        joinPool(tpe);
1374 >        CustomTPE p = new CustomTPE();
1375 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1376 >        assertTrue(p.terminatedCalled());
1377 >        joinPool(p);
1378      }
1379  
1380      /**
1381       * beforeExecute and afterExecute are called when executing task
1382       */
1383      public void testBeforeAfter() throws InterruptedException {
1384 <        CustomTPE tpe = new CustomTPE();
1384 >        CustomTPE p = new CustomTPE();
1385          try {
1386 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1387 <            tpe.execute(r);
1388 <            Thread.sleep(SHORT_DELAY_MS);
1389 <            assertTrue(r.done);
1390 <            assertTrue(tpe.beforeCalled);
1391 <            assertTrue(tpe.afterCalled);
1392 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1386 >            final CountDownLatch done = new CountDownLatch(1);
1387 >            p.execute(new CheckedRunnable() {
1388 >                public void realRun() {
1389 >                    done.countDown();
1390 >                }});
1391 >            await(p.afterCalled);
1392 >            assertEquals(0, done.getCount());
1393 >            assertTrue(p.afterCalled());
1394 >            assertTrue(p.beforeCalled());
1395 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1396          } finally {
1397 <            joinPool(tpe);
1397 >            joinPool(p);
1398          }
1399      }
1400  
# Line 1100 | Line 1402 | public class ThreadPoolExecutorSubclassT
1402       * completed submit of callable returns result
1403       */
1404      public void testSubmitCallable() throws Exception {
1405 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1405 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1406          try {
1407              Future<String> future = e.submit(new StringTask());
1408              String result = future.get();
# Line 1114 | Line 1416 | public class ThreadPoolExecutorSubclassT
1416       * completed submit of runnable returns successfully
1417       */
1418      public void testSubmitRunnable() throws Exception {
1419 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1419 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1420          try {
1421              Future<?> future = e.submit(new NoOpRunnable());
1422              future.get();
# Line 1128 | Line 1430 | public class ThreadPoolExecutorSubclassT
1430       * completed submit of (runnable, result) returns result
1431       */
1432      public void testSubmitRunnable2() throws Exception {
1433 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1433 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1434          try {
1435              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1436              String result = future.get();
# Line 1138 | Line 1440 | public class ThreadPoolExecutorSubclassT
1440          }
1441      }
1442  
1141
1443      /**
1444       * invokeAny(null) throws NPE
1445       */
1446      public void testInvokeAny1() throws Exception {
1447 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1447 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1448          try {
1449              e.invokeAny(null);
1450              shouldThrow();
# Line 1157 | Line 1458 | public class ThreadPoolExecutorSubclassT
1458       * invokeAny(empty collection) throws IAE
1459       */
1460      public void testInvokeAny2() throws Exception {
1461 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1461 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1462          try {
1463              e.invokeAny(new ArrayList<Callable<String>>());
1464              shouldThrow();
# Line 1171 | Line 1472 | public class ThreadPoolExecutorSubclassT
1472       * invokeAny(c) throws NPE if c has null elements
1473       */
1474      public void testInvokeAny3() throws Exception {
1475 <        final CountDownLatch latch = new CountDownLatch(1);
1476 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1475 >        CountDownLatch latch = new CountDownLatch(1);
1476 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1477 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1478 >        l.add(latchAwaitingStringTask(latch));
1479 >        l.add(null);
1480          try {
1177            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1178            l.add(new CheckedCallable<String>() {
1179                      public String realCall() throws InterruptedException {
1180                          latch.await();
1181                          return TEST_STRING;
1182                      }});
1183            l.add(null);
1481              e.invokeAny(l);
1482              shouldThrow();
1483          } catch (NullPointerException success) {
# Line 1194 | Line 1491 | public class ThreadPoolExecutorSubclassT
1491       * invokeAny(c) throws ExecutionException if no task completes
1492       */
1493      public void testInvokeAny4() throws Exception {
1494 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1494 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1495 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1496 >        l.add(new NPETask());
1497          try {
1199            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1200            l.add(new NPETask());
1498              e.invokeAny(l);
1499              shouldThrow();
1500          } catch (ExecutionException success) {
1501 +            assertTrue(success.getCause() instanceof NullPointerException);
1502          } finally {
1503              joinPool(e);
1504          }
# Line 1210 | Line 1508 | public class ThreadPoolExecutorSubclassT
1508       * invokeAny(c) returns result of some task
1509       */
1510      public void testInvokeAny5() throws Exception {
1511 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1511 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1512          try {
1513 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1513 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1514              l.add(new StringTask());
1515              l.add(new StringTask());
1516              String result = e.invokeAny(l);
# Line 1226 | Line 1524 | public class ThreadPoolExecutorSubclassT
1524       * invokeAll(null) throws NPE
1525       */
1526      public void testInvokeAll1() throws Exception {
1527 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1527 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1528          try {
1529              e.invokeAll(null);
1530              shouldThrow();
# Line 1240 | Line 1538 | public class ThreadPoolExecutorSubclassT
1538       * invokeAll(empty collection) returns empty collection
1539       */
1540      public void testInvokeAll2() throws Exception {
1541 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1541 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1542          try {
1543              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1544              assertTrue(r.isEmpty());
# Line 1253 | Line 1551 | public class ThreadPoolExecutorSubclassT
1551       * invokeAll(c) throws NPE if c has null elements
1552       */
1553      public void testInvokeAll3() throws Exception {
1554 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1554 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1555 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1556 >        l.add(new StringTask());
1557 >        l.add(null);
1558          try {
1258            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1259            l.add(new StringTask());
1260            l.add(null);
1559              e.invokeAll(l);
1560              shouldThrow();
1561          } catch (NullPointerException success) {
# Line 1270 | Line 1568 | public class ThreadPoolExecutorSubclassT
1568       * get of element of invokeAll(c) throws exception on failed task
1569       */
1570      public void testInvokeAll4() throws Exception {
1571 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1571 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1572 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1573 >        l.add(new NPETask());
1574 >        List<Future<String>> futures = e.invokeAll(l);
1575 >        assertEquals(1, futures.size());
1576          try {
1577 <            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 (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1280 <                it.next().get();
1577 >            futures.get(0).get();
1578              shouldThrow();
1579          } catch (ExecutionException success) {
1580 +            assertTrue(success.getCause() instanceof NullPointerException);
1581          } finally {
1582              joinPool(e);
1583          }
# Line 1289 | Line 1587 | public class ThreadPoolExecutorSubclassT
1587       * invokeAll(c) returns results of all completed tasks
1588       */
1589      public void testInvokeAll5() throws Exception {
1590 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1590 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1591          try {
1592 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1592 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1593              l.add(new StringTask());
1594              l.add(new StringTask());
1595 <            List<Future<String>> result = e.invokeAll(l);
1596 <            assertEquals(2, result.size());
1597 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1598 <                assertSame(TEST_STRING, it.next().get());
1301 <            shouldThrow();
1302 <        } catch (ExecutionException success) {
1595 >            List<Future<String>> futures = e.invokeAll(l);
1596 >            assertEquals(2, futures.size());
1597 >            for (Future<String> future : futures)
1598 >                assertSame(TEST_STRING, future.get());
1599          } finally {
1600              joinPool(e);
1601          }
1602      }
1603  
1308
1309
1604      /**
1605       * timed invokeAny(null) throws NPE
1606       */
1607      public void testTimedInvokeAny1() throws Exception {
1608 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1608 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1609          try {
1610 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1610 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1611              shouldThrow();
1612          } catch (NullPointerException success) {
1613          } finally {
# Line 1325 | Line 1619 | public class ThreadPoolExecutorSubclassT
1619       * timed invokeAny(,,null) throws NPE
1620       */
1621      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1622 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1622 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1623 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1624 >        l.add(new StringTask());
1625          try {
1330            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1331            l.add(new StringTask());
1626              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1627              shouldThrow();
1628          } catch (NullPointerException success) {
# Line 1341 | Line 1635 | public class ThreadPoolExecutorSubclassT
1635       * timed invokeAny(empty collection) throws IAE
1636       */
1637      public void testTimedInvokeAny2() throws Exception {
1638 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1638 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1639          try {
1640 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1640 >            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1641              shouldThrow();
1642          } catch (IllegalArgumentException success) {
1643          } finally {
# Line 1355 | Line 1649 | public class ThreadPoolExecutorSubclassT
1649       * timed invokeAny(c) throws NPE if c has null elements
1650       */
1651      public void testTimedInvokeAny3() throws Exception {
1652 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1652 >        CountDownLatch latch = new CountDownLatch(1);
1653 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1654 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1655 >        l.add(latchAwaitingStringTask(latch));
1656 >        l.add(null);
1657          try {
1658 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1361 <            l.add(new StringTask());
1362 <            l.add(null);
1363 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1658 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1659              shouldThrow();
1660          } catch (NullPointerException success) {
1661          } finally {
1662 +            latch.countDown();
1663              joinPool(e);
1664          }
1665      }
# Line 1372 | Line 1668 | public class ThreadPoolExecutorSubclassT
1668       * timed invokeAny(c) throws ExecutionException if no task completes
1669       */
1670      public void testTimedInvokeAny4() throws Exception {
1671 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1671 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1672 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1673 >        l.add(new NPETask());
1674          try {
1675 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1378 <            l.add(new NPETask());
1379 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1675 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1676              shouldThrow();
1677          } catch (ExecutionException success) {
1678 +            assertTrue(success.getCause() instanceof NullPointerException);
1679          } finally {
1680              joinPool(e);
1681          }
# Line 1388 | Line 1685 | public class ThreadPoolExecutorSubclassT
1685       * timed invokeAny(c) returns result of some task
1686       */
1687      public void testTimedInvokeAny5() throws Exception {
1688 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1688 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1689          try {
1690 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1690 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1691              l.add(new StringTask());
1692              l.add(new StringTask());
1693 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1693 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1694              assertSame(TEST_STRING, result);
1398            shouldThrow();
1399        } catch (ExecutionException success) {
1695          } finally {
1696              joinPool(e);
1697          }
# Line 1406 | Line 1701 | public class ThreadPoolExecutorSubclassT
1701       * timed invokeAll(null) throws NPE
1702       */
1703      public void testTimedInvokeAll1() throws Exception {
1704 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1704 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1705          try {
1706 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1706 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1707              shouldThrow();
1708          } catch (NullPointerException success) {
1709          } finally {
# Line 1420 | Line 1715 | public class ThreadPoolExecutorSubclassT
1715       * timed invokeAll(,,null) throws NPE
1716       */
1717      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1718 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1718 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1719 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1720 >        l.add(new StringTask());
1721          try {
1425            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1426            l.add(new StringTask());
1722              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1723              shouldThrow();
1724          } catch (NullPointerException success) {
# Line 1436 | Line 1731 | public class ThreadPoolExecutorSubclassT
1731       * timed invokeAll(empty collection) returns empty collection
1732       */
1733      public void testTimedInvokeAll2() throws Exception {
1734 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1734 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1735          try {
1736 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1736 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1737              assertTrue(r.isEmpty());
1738          } finally {
1739              joinPool(e);
# Line 1449 | Line 1744 | public class ThreadPoolExecutorSubclassT
1744       * timed invokeAll(c) throws NPE if c has null elements
1745       */
1746      public void testTimedInvokeAll3() throws Exception {
1747 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1747 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1748 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1749 >        l.add(new StringTask());
1750 >        l.add(null);
1751          try {
1752 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1455 <            l.add(new StringTask());
1456 <            l.add(null);
1457 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1752 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1753              shouldThrow();
1754          } catch (NullPointerException success) {
1755          } finally {
# Line 1466 | Line 1761 | public class ThreadPoolExecutorSubclassT
1761       * get of element of invokeAll(c) throws exception on failed task
1762       */
1763      public void testTimedInvokeAll4() throws Exception {
1764 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1764 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1765 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1766 >        l.add(new NPETask());
1767 >        List<Future<String>> futures =
1768 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1769 >        assertEquals(1, futures.size());
1770          try {
1771 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1472 <            l.add(new NPETask());
1473 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1474 <            assertEquals(1, result.size());
1475 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1476 <                it.next().get();
1771 >            futures.get(0).get();
1772              shouldThrow();
1773          } catch (ExecutionException success) {
1774 +            assertTrue(success.getCause() instanceof NullPointerException);
1775          } finally {
1776              joinPool(e);
1777          }
# Line 1485 | Line 1781 | public class ThreadPoolExecutorSubclassT
1781       * timed invokeAll(c) returns results of all completed tasks
1782       */
1783      public void testTimedInvokeAll5() throws Exception {
1784 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1784 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1785          try {
1786 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1786 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1787              l.add(new StringTask());
1788              l.add(new StringTask());
1789 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1790 <            assertEquals(2, result.size());
1791 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1792 <                assertSame(TEST_STRING, it.next().get());
1793 <            shouldThrow();
1498 <        } catch (ExecutionException success) {
1789 >            List<Future<String>> futures =
1790 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1791 >            assertEquals(2, futures.size());
1792 >            for (Future<String> future : futures)
1793 >                assertSame(TEST_STRING, future.get());
1794          } finally {
1795              joinPool(e);
1796          }
# Line 1505 | Line 1800 | public class ThreadPoolExecutorSubclassT
1800       * timed invokeAll(c) cancels tasks not completed by timeout
1801       */
1802      public void testTimedInvokeAll6() throws Exception {
1803 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1803 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1804          try {
1805 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1806 <            l.add(new StringTask());
1807 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1808 <            l.add(new StringTask());
1809 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
1810 <            assertEquals(3, result.size());
1811 <            Iterator<Future<String>> it = result.iterator();
1812 <            Future<String> f1 = it.next();
1813 <            Future<String> f2 = it.next();
1814 <            Future<String> f3 = it.next();
1815 <            assertTrue(f1.isDone());
1816 <            assertTrue(f2.isDone());
1817 <            assertTrue(f3.isDone());
1818 <            assertFalse(f1.isCancelled());
1819 <            assertTrue(f2.isCancelled());
1805 >            for (long timeout = timeoutMillis();;) {
1806 >                List<Callable<String>> tasks = new ArrayList<>();
1807 >                tasks.add(new StringTask("0"));
1808 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1809 >                tasks.add(new StringTask("2"));
1810 >                long startTime = System.nanoTime();
1811 >                List<Future<String>> futures =
1812 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1813 >                assertEquals(tasks.size(), futures.size());
1814 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1815 >                for (Future future : futures)
1816 >                    assertTrue(future.isDone());
1817 >                assertTrue(futures.get(1).isCancelled());
1818 >                try {
1819 >                    assertEquals("0", futures.get(0).get());
1820 >                    assertEquals("2", futures.get(2).get());
1821 >                    break;
1822 >                } catch (CancellationException retryWithLongerTimeout) {
1823 >                    timeout *= 2;
1824 >                    if (timeout >= LONG_DELAY_MS / 2)
1825 >                        fail("expected exactly one task to be cancelled");
1826 >                }
1827 >            }
1828          } finally {
1829              joinPool(e);
1830          }
# Line 1532 | Line 1835 | public class ThreadPoolExecutorSubclassT
1835       * thread factory fails to create more
1836       */
1837      public void testFailingThreadFactory() throws InterruptedException {
1838 <        ExecutorService e = new CustomTPE(100, 100, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
1839 <        try {
1840 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1841 <            for (int k = 0; k < 100; ++k) {
1842 <                e.execute(new NoOpRunnable());
1843 <            }
1844 <            Thread.sleep(LONG_DELAY_MS);
1838 >        final ExecutorService e =
1839 >            new CustomTPE(100, 100,
1840 >                          LONG_DELAY_MS, MILLISECONDS,
1841 >                          new LinkedBlockingQueue<Runnable>(),
1842 >                          new FailingThreadFactory());
1843 >        try {
1844 >            final int TASKS = 100;
1845 >            final CountDownLatch done = new CountDownLatch(TASKS);
1846 >            for (int k = 0; k < TASKS; ++k)
1847 >                e.execute(new CheckedRunnable() {
1848 >                    public void realRun() {
1849 >                        done.countDown();
1850 >                    }});
1851 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1852          } finally {
1853              joinPool(e);
1854          }
# Line 1548 | Line 1858 | public class ThreadPoolExecutorSubclassT
1858       * allowsCoreThreadTimeOut is by default false.
1859       */
1860      public void testAllowsCoreThreadTimeOut() {
1861 <        ThreadPoolExecutor tpe = new CustomTPE(2, 2, 1000, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1862 <        assertFalse(tpe.allowsCoreThreadTimeOut());
1863 <        joinPool(tpe);
1861 >        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1862 >        assertFalse(p.allowsCoreThreadTimeOut());
1863 >        joinPool(p);
1864      }
1865  
1866      /**
1867       * allowCoreThreadTimeOut(true) causes idle threads to time out
1868       */
1869 <    public void testAllowCoreThreadTimeOut_true() throws InterruptedException {
1870 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1871 <        tpe.allowCoreThreadTimeOut(true);
1872 <        tpe.execute(new NoOpRunnable());
1873 <        try {
1874 <            Thread.sleep(MEDIUM_DELAY_MS);
1875 <            assertEquals(0, tpe.getPoolSize());
1869 >    public void testAllowCoreThreadTimeOut_true() throws Exception {
1870 >        long keepAliveTime = timeoutMillis();
1871 >        final ThreadPoolExecutor p =
1872 >            new CustomTPE(2, 10,
1873 >                          keepAliveTime, MILLISECONDS,
1874 >                          new ArrayBlockingQueue<Runnable>(10));
1875 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1876 >        try {
1877 >            p.allowCoreThreadTimeOut(true);
1878 >            p.execute(new CheckedRunnable() {
1879 >                public void realRun() {
1880 >                    threadStarted.countDown();
1881 >                    assertEquals(1, p.getPoolSize());
1882 >                }});
1883 >            await(threadStarted);
1884 >            delay(keepAliveTime);
1885 >            long startTime = System.nanoTime();
1886 >            while (p.getPoolSize() > 0
1887 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1888 >                Thread.yield();
1889 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1890 >            assertEquals(0, p.getPoolSize());
1891          } finally {
1892 <            joinPool(tpe);
1892 >            joinPool(p);
1893          }
1894      }
1895  
1896      /**
1897       * allowCoreThreadTimeOut(false) causes idle threads not to time out
1898       */
1899 <    public void testAllowCoreThreadTimeOut_false() throws InterruptedException {
1900 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1901 <        tpe.allowCoreThreadTimeOut(false);
1902 <        tpe.execute(new NoOpRunnable());
1903 <        try {
1904 <            Thread.sleep(MEDIUM_DELAY_MS);
1905 <            assertTrue(tpe.getPoolSize() >= 1);
1899 >    public void testAllowCoreThreadTimeOut_false() throws Exception {
1900 >        long keepAliveTime = timeoutMillis();
1901 >        final ThreadPoolExecutor p =
1902 >            new CustomTPE(2, 10,
1903 >                          keepAliveTime, MILLISECONDS,
1904 >                          new ArrayBlockingQueue<Runnable>(10));
1905 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1906 >        try {
1907 >            p.allowCoreThreadTimeOut(false);
1908 >            p.execute(new CheckedRunnable() {
1909 >                public void realRun() throws InterruptedException {
1910 >                    threadStarted.countDown();
1911 >                    assertTrue(p.getPoolSize() >= 1);
1912 >                }});
1913 >            delay(2 * keepAliveTime);
1914 >            assertTrue(p.getPoolSize() >= 1);
1915          } finally {
1916 <            joinPool(tpe);
1916 >            joinPool(p);
1917 >        }
1918 >    }
1919 >
1920 >    /**
1921 >     * get(cancelled task) throws CancellationException
1922 >     * (in part, a test of CustomTPE itself)
1923 >     */
1924 >    public void testGet_cancelled() throws Exception {
1925 >        final ExecutorService e =
1926 >            new CustomTPE(1, 1,
1927 >                          LONG_DELAY_MS, MILLISECONDS,
1928 >                          new LinkedBlockingQueue<Runnable>());
1929 >        try {
1930 >            final CountDownLatch blockerStarted = new CountDownLatch(1);
1931 >            final CountDownLatch done = new CountDownLatch(1);
1932 >            final List<Future<?>> futures = new ArrayList<>();
1933 >            for (int i = 0; i < 2; i++) {
1934 >                Runnable r = new CheckedRunnable() { public void realRun()
1935 >                                                         throws Throwable {
1936 >                    blockerStarted.countDown();
1937 >                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1938 >                }};
1939 >                futures.add(e.submit(r));
1940 >            }
1941 >            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1942 >            for (Future<?> future : futures) future.cancel(false);
1943 >            for (Future<?> future : futures) {
1944 >                try {
1945 >                    future.get();
1946 >                    shouldThrow();
1947 >                } catch (CancellationException success) {}
1948 >                try {
1949 >                    future.get(LONG_DELAY_MS, MILLISECONDS);
1950 >                    shouldThrow();
1951 >                } catch (CancellationException success) {}
1952 >                assertTrue(future.isCancelled());
1953 >                assertTrue(future.isDone());
1954 >            }
1955 >            done.countDown();
1956 >        } finally {
1957 >            joinPool(e);
1958          }
1959      }
1960  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines