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.9 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.30 by jsr166, Sun May 29 07:01:17 2011 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   */
# Line 60 | Line 60 | public class ThreadPoolExecutorSubclassT
60              finally { lock.unlock() ; }
61          }
62          public void run() {
63            boolean runme;
63              lock.lock();
64              try {
65 <                runme = !done;
66 <                if (!runme)
67 <                    thread = Thread.currentThread();
65 >                if (done)
66 >                    return;
67 >                thread = Thread.currentThread();
68              }
69              finally { lock.unlock() ; }
71            if (!runme) return;
70              V v = null;
71              Exception e = null;
72              try {
# Line 117 | Line 115 | public class ThreadPoolExecutorSubclassT
115          }
116      }
117  
120
118      static class CustomTPE extends ThreadPoolExecutor {
119          protected <V> RunnableFuture<V> newTaskFor(Callable<V> c) {
120              return new CustomTask<V>(c);
# Line 164 | Line 161 | public class ThreadPoolExecutorSubclassT
161                workQueue, threadFactory, handler);
162          }
163  
164 <        volatile boolean beforeCalled = false;
165 <        volatile boolean afterCalled = false;
166 <        volatile boolean terminatedCalled = false;
164 >        final CountDownLatch beforeCalled = new CountDownLatch(1);
165 >        final CountDownLatch afterCalled = new CountDownLatch(1);
166 >        final CountDownLatch terminatedCalled = new CountDownLatch(1);
167 >
168          public CustomTPE() {
169              super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
170          }
171          protected void beforeExecute(Thread t, Runnable r) {
172 <            beforeCalled = true;
172 >            beforeCalled.countDown();
173          }
174          protected void afterExecute(Runnable r, Throwable t) {
175 <            afterCalled = true;
175 >            afterCalled.countDown();
176          }
177          protected void terminated() {
178 <            terminatedCalled = true;
178 >            terminatedCalled.countDown();
179          }
180  
181 +        public boolean beforeCalled() {
182 +            return beforeCalled.getCount() == 0;
183 +        }
184 +        public boolean afterCalled() {
185 +            return afterCalled.getCount() == 0;
186 +        }
187 +        public boolean terminatedCalled() {
188 +            return terminatedCalled.getCount() == 0;
189 +        }
190      }
191  
192      static class FailingThreadFactory implements ThreadFactory {
# Line 190 | Line 197 | public class ThreadPoolExecutorSubclassT
197          }
198      }
199  
193
200      /**
201 <     *  execute successfully executes a runnable
201 >     * execute successfully executes a runnable
202       */
203      public void testExecute() throws InterruptedException {
204 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
204 >        final ThreadPoolExecutor p =
205 >            new CustomTPE(1, 1,
206 >                          LONG_DELAY_MS, MILLISECONDS,
207 >                          new ArrayBlockingQueue<Runnable>(10));
208 >        final CountDownLatch done = new CountDownLatch(1);
209 >        final Runnable task = new CheckedRunnable() {
210 >            public void realRun() {
211 >                done.countDown();
212 >            }};
213          try {
214 <            p1.execute(new ShortRunnable());
215 <            Thread.sleep(SMALL_DELAY_MS);
214 >            p.execute(task);
215 >            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
216          } finally {
217 <            joinPool(p1);
217 >            joinPool(p);
218          }
219      }
220  
221      /**
222 <     *  getActiveCount increases but doesn't overestimate, when a
223 <     *  thread becomes active
222 >     * getActiveCount increases but doesn't overestimate, when a
223 >     * thread becomes active
224       */
225      public void testGetActiveCount() throws InterruptedException {
226 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
227 <        assertEquals(0, p2.getActiveCount());
228 <        p2.execute(new MediumRunnable());
229 <        Thread.sleep(SHORT_DELAY_MS);
230 <        assertEquals(1, p2.getActiveCount());
231 <        joinPool(p2);
226 >        final ThreadPoolExecutor p =
227 >            new CustomTPE(2, 2,
228 >                          LONG_DELAY_MS, MILLISECONDS,
229 >                          new ArrayBlockingQueue<Runnable>(10));
230 >        final CountDownLatch threadStarted = new CountDownLatch(1);
231 >        final CountDownLatch done = new CountDownLatch(1);
232 >        try {
233 >            assertEquals(0, p.getActiveCount());
234 >            p.execute(new CheckedRunnable() {
235 >                public void realRun() throws InterruptedException {
236 >                    threadStarted.countDown();
237 >                    assertEquals(1, p.getActiveCount());
238 >                    done.await();
239 >                }});
240 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
241 >            assertEquals(1, p.getActiveCount());
242 >        } finally {
243 >            done.countDown();
244 >            joinPool(p);
245 >        }
246      }
247  
248      /**
249 <     *  prestartCoreThread starts a thread if under corePoolSize, else doesn't
249 >     * prestartCoreThread starts a thread if under corePoolSize, else doesn't
250       */
251      public void testPrestartCoreThread() {
252 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
253 <        assertEquals(0, p2.getPoolSize());
254 <        assertTrue(p2.prestartCoreThread());
255 <        assertEquals(1, p2.getPoolSize());
256 <        assertTrue(p2.prestartCoreThread());
257 <        assertEquals(2, p2.getPoolSize());
258 <        assertFalse(p2.prestartCoreThread());
259 <        assertEquals(2, p2.getPoolSize());
260 <        joinPool(p2);
252 >        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
253 >        assertEquals(0, p.getPoolSize());
254 >        assertTrue(p.prestartCoreThread());
255 >        assertEquals(1, p.getPoolSize());
256 >        assertTrue(p.prestartCoreThread());
257 >        assertEquals(2, p.getPoolSize());
258 >        assertFalse(p.prestartCoreThread());
259 >        assertEquals(2, p.getPoolSize());
260 >        joinPool(p);
261      }
262  
263      /**
264 <     *  prestartAllCoreThreads starts all corePoolSize threads
264 >     * prestartAllCoreThreads starts all corePoolSize threads
265       */
266      public void testPrestartAllCoreThreads() {
267 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
268 <        assertEquals(0, p2.getPoolSize());
269 <        p2.prestartAllCoreThreads();
270 <        assertEquals(2, p2.getPoolSize());
271 <        p2.prestartAllCoreThreads();
272 <        assertEquals(2, p2.getPoolSize());
273 <        joinPool(p2);
267 >        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
268 >        assertEquals(0, p.getPoolSize());
269 >        p.prestartAllCoreThreads();
270 >        assertEquals(2, p.getPoolSize());
271 >        p.prestartAllCoreThreads();
272 >        assertEquals(2, p.getPoolSize());
273 >        joinPool(p);
274      }
275  
276      /**
277 <     *   getCompletedTaskCount increases, but doesn't overestimate,
278 <     *   when tasks complete
277 >     * getCompletedTaskCount increases, but doesn't overestimate,
278 >     * when tasks complete
279       */
280      public void testGetCompletedTaskCount() throws InterruptedException {
281 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
282 <        assertEquals(0, p2.getCompletedTaskCount());
283 <        p2.execute(new ShortRunnable());
284 <        Thread.sleep(SMALL_DELAY_MS);
285 <        assertEquals(1, p2.getCompletedTaskCount());
286 <        try { p2.shutdown(); } catch (SecurityException ok) { return; }
287 <        joinPool(p2);
281 >        final ThreadPoolExecutor p =
282 >            new CustomTPE(2, 2,
283 >                          LONG_DELAY_MS, MILLISECONDS,
284 >                          new ArrayBlockingQueue<Runnable>(10));
285 >        final CountDownLatch threadStarted = new CountDownLatch(1);
286 >        final CountDownLatch threadProceed = new CountDownLatch(1);
287 >        final CountDownLatch threadDone = new CountDownLatch(1);
288 >        try {
289 >            assertEquals(0, p.getCompletedTaskCount());
290 >            p.execute(new CheckedRunnable() {
291 >                public void realRun() throws InterruptedException {
292 >                    threadStarted.countDown();
293 >                    assertEquals(0, p.getCompletedTaskCount());
294 >                    threadProceed.await();
295 >                    threadDone.countDown();
296 >                }});
297 >            await(threadStarted);
298 >            assertEquals(0, p.getCompletedTaskCount());
299 >            threadProceed.countDown();
300 >            threadDone.await();
301 >            long startTime = System.nanoTime();
302 >            while (p.getCompletedTaskCount() != 1) {
303 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
304 >                    fail("timed out");
305 >                Thread.yield();
306 >            }
307 >        } finally {
308 >            joinPool(p);
309 >        }
310      }
311  
312      /**
313 <     *   getCorePoolSize returns size given in constructor if not otherwise set
313 >     * getCorePoolSize returns size given in constructor if not otherwise set
314       */
315      public void testGetCorePoolSize() {
316 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
317 <        assertEquals(1, p1.getCorePoolSize());
318 <        joinPool(p1);
316 >        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
317 >        assertEquals(1, p.getCorePoolSize());
318 >        joinPool(p);
319      }
320  
321      /**
322 <     *   getKeepAliveTime returns value given in constructor if not otherwise set
322 >     * getKeepAliveTime returns value given in constructor if not otherwise set
323       */
324      public void testGetKeepAliveTime() {
325 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
326 <        assertEquals(1, p2.getKeepAliveTime(TimeUnit.SECONDS));
327 <        joinPool(p2);
325 >        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
326 >        assertEquals(1, p.getKeepAliveTime(TimeUnit.SECONDS));
327 >        joinPool(p);
328      }
329  
280
330      /**
331       * getThreadFactory returns factory in constructor if not set
332       */
# Line 299 | Line 348 | public class ThreadPoolExecutorSubclassT
348          joinPool(p);
349      }
350  
302
351      /**
352       * setThreadFactory(null) throws NPE
353       */
# Line 336 | Line 384 | public class ThreadPoolExecutorSubclassT
384          joinPool(p);
385      }
386  
339
387      /**
388       * setRejectedExecutionHandler(null) throws NPE
389       */
# Line 351 | Line 398 | public class ThreadPoolExecutorSubclassT
398          }
399      }
400  
354
401      /**
402 <     *   getLargestPoolSize increases, but doesn't overestimate, when
403 <     *   multiple threads active
402 >     * getLargestPoolSize increases, but doesn't overestimate, when
403 >     * multiple threads active
404       */
405      public void testGetLargestPoolSize() throws InterruptedException {
406 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
407 <        assertEquals(0, p2.getLargestPoolSize());
408 <        p2.execute(new MediumRunnable());
409 <        p2.execute(new MediumRunnable());
410 <        Thread.sleep(SHORT_DELAY_MS);
411 <        assertEquals(2, p2.getLargestPoolSize());
412 <        joinPool(p2);
406 >        final int THREADS = 3;
407 >        final ThreadPoolExecutor p =
408 >            new CustomTPE(THREADS, THREADS,
409 >                          LONG_DELAY_MS, MILLISECONDS,
410 >                          new ArrayBlockingQueue<Runnable>(10));
411 >        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
412 >        final CountDownLatch done = new CountDownLatch(1);
413 >        try {
414 >            assertEquals(0, p.getLargestPoolSize());
415 >            for (int i = 0; i < THREADS; i++)
416 >                p.execute(new CheckedRunnable() {
417 >                    public void realRun() throws InterruptedException {
418 >                        threadsStarted.countDown();
419 >                        done.await();
420 >                        assertEquals(THREADS, p.getLargestPoolSize());
421 >                    }});
422 >            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
423 >            assertEquals(THREADS, p.getLargestPoolSize());
424 >        } finally {
425 >            done.countDown();
426 >            joinPool(p);
427 >            assertEquals(THREADS, p.getLargestPoolSize());
428 >        }
429      }
430  
431      /**
432 <     *   getMaximumPoolSize returns value given in constructor if not
433 <     *   otherwise set
432 >     * getMaximumPoolSize returns value given in constructor if not
433 >     * otherwise set
434       */
435      public void testGetMaximumPoolSize() {
436 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
437 <        assertEquals(2, p2.getMaximumPoolSize());
438 <        joinPool(p2);
436 >        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
437 >        assertEquals(2, p.getMaximumPoolSize());
438 >        joinPool(p);
439      }
440  
441      /**
442 <     *   getPoolSize increases, but doesn't overestimate, when threads
443 <     *   become active
442 >     * getPoolSize increases, but doesn't overestimate, when threads
443 >     * become active
444       */
445 <    public void testGetPoolSize() {
446 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
447 <        assertEquals(0, p1.getPoolSize());
448 <        p1.execute(new MediumRunnable());
449 <        assertEquals(1, p1.getPoolSize());
450 <        joinPool(p1);
445 >    public void testGetPoolSize() throws InterruptedException {
446 >        final ThreadPoolExecutor p =
447 >            new CustomTPE(1, 1,
448 >                          LONG_DELAY_MS, MILLISECONDS,
449 >                          new ArrayBlockingQueue<Runnable>(10));
450 >        final CountDownLatch threadStarted = new CountDownLatch(1);
451 >        final CountDownLatch done = new CountDownLatch(1);
452 >        try {
453 >            assertEquals(0, p.getPoolSize());
454 >            p.execute(new CheckedRunnable() {
455 >                public void realRun() throws InterruptedException {
456 >                    threadStarted.countDown();
457 >                    assertEquals(1, p.getPoolSize());
458 >                    done.await();
459 >                }});
460 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
461 >            assertEquals(1, p.getPoolSize());
462 >        } finally {
463 >            done.countDown();
464 >            joinPool(p);
465 >        }
466      }
467  
468      /**
469 <     *  getTaskCount increases, but doesn't overestimate, when tasks submitted
469 >     * getTaskCount increases, but doesn't overestimate, when tasks submitted
470       */
471      public void testGetTaskCount() throws InterruptedException {
472 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
473 <        assertEquals(0, p1.getTaskCount());
474 <        p1.execute(new MediumRunnable());
475 <        Thread.sleep(SHORT_DELAY_MS);
476 <        assertEquals(1, p1.getTaskCount());
477 <        joinPool(p1);
472 >        final ThreadPoolExecutor p =
473 >            new CustomTPE(1, 1,
474 >                          LONG_DELAY_MS, MILLISECONDS,
475 >                          new ArrayBlockingQueue<Runnable>(10));
476 >        final CountDownLatch threadStarted = new CountDownLatch(1);
477 >        final CountDownLatch done = new CountDownLatch(1);
478 >        try {
479 >            assertEquals(0, p.getTaskCount());
480 >            p.execute(new CheckedRunnable() {
481 >                public void realRun() throws InterruptedException {
482 >                    threadStarted.countDown();
483 >                    assertEquals(1, p.getTaskCount());
484 >                    done.await();
485 >                }});
486 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
487 >            assertEquals(1, p.getTaskCount());
488 >        } finally {
489 >            done.countDown();
490 >            joinPool(p);
491 >        }
492      }
493  
494      /**
495 <     *   isShutDown is false before shutdown, true after
495 >     * isShutdown is false before shutdown, true after
496       */
497      public void testIsShutdown() {
498  
499 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
500 <        assertFalse(p1.isShutdown());
501 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
502 <        assertTrue(p1.isShutdown());
503 <        joinPool(p1);
499 >        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
500 >        assertFalse(p.isShutdown());
501 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
502 >        assertTrue(p.isShutdown());
503 >        joinPool(p);
504      }
505  
415
506      /**
507 <     *  isTerminated is false before termination, true after
507 >     * isTerminated is false before termination, true after
508       */
509      public void testIsTerminated() throws InterruptedException {
510 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
511 <        assertFalse(p1.isTerminated());
512 <        try {
513 <            p1.execute(new MediumRunnable());
514 <        } finally {
515 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
516 <        }
517 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
518 <        assertTrue(p1.isTerminated());
510 >        final ThreadPoolExecutor p =
511 >            new CustomTPE(1, 1,
512 >                          LONG_DELAY_MS, MILLISECONDS,
513 >                          new ArrayBlockingQueue<Runnable>(10));
514 >        final CountDownLatch threadStarted = new CountDownLatch(1);
515 >        final CountDownLatch done = new CountDownLatch(1);
516 >        try {
517 >            assertFalse(p.isTerminating());
518 >            p.execute(new CheckedRunnable() {
519 >                public void realRun() throws InterruptedException {
520 >                    assertFalse(p.isTerminating());
521 >                    threadStarted.countDown();
522 >                    done.await();
523 >                }});
524 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
525 >            assertFalse(p.isTerminating());
526 >            done.countDown();
527 >        } finally {
528 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
529 >        }
530 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
531 >        assertTrue(p.isTerminated());
532 >        assertFalse(p.isTerminating());
533      }
534  
535      /**
536 <     *  isTerminating is not true when running or when terminated
536 >     * isTerminating is not true when running or when terminated
537       */
538      public void testIsTerminating() throws InterruptedException {
539 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
540 <        assertFalse(p1.isTerminating());
541 <        try {
542 <            p1.execute(new SmallRunnable());
543 <            assertFalse(p1.isTerminating());
544 <        } finally {
545 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
546 <        }
547 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
548 <        assertTrue(p1.isTerminated());
549 <        assertFalse(p1.isTerminating());
539 >        final ThreadPoolExecutor p =
540 >            new CustomTPE(1, 1,
541 >                          LONG_DELAY_MS, MILLISECONDS,
542 >                          new ArrayBlockingQueue<Runnable>(10));
543 >        final CountDownLatch threadStarted = new CountDownLatch(1);
544 >        final CountDownLatch done = new CountDownLatch(1);
545 >        try {
546 >            assertFalse(p.isTerminating());
547 >            p.execute(new CheckedRunnable() {
548 >                public void realRun() throws InterruptedException {
549 >                    assertFalse(p.isTerminating());
550 >                    threadStarted.countDown();
551 >                    done.await();
552 >                }});
553 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
554 >            assertFalse(p.isTerminating());
555 >            done.countDown();
556 >        } finally {
557 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
558 >        }
559 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
560 >        assertTrue(p.isTerminated());
561 >        assertFalse(p.isTerminating());
562      }
563  
564      /**
565       * getQueue returns the work queue, which contains queued tasks
566       */
567      public void testGetQueue() throws InterruptedException {
568 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
569 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
570 <        FutureTask[] tasks = new FutureTask[5];
571 <        for (int i = 0; i < 5; i++) {
572 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
573 <            p1.execute(tasks[i]);
574 <        }
575 <        try {
576 <            Thread.sleep(SHORT_DELAY_MS);
577 <            BlockingQueue<Runnable> wq = p1.getQueue();
578 <            assertSame(q, wq);
579 <            assertFalse(wq.contains(tasks[0]));
580 <            assertTrue(wq.contains(tasks[4]));
581 <            for (int i = 1; i < 5; ++i)
582 <                tasks[i].cancel(true);
583 <            p1.shutdownNow();
568 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
569 >        final ThreadPoolExecutor p =
570 >            new CustomTPE(1, 1,
571 >                          LONG_DELAY_MS, MILLISECONDS,
572 >                          q);
573 >        final CountDownLatch threadStarted = new CountDownLatch(1);
574 >        final CountDownLatch done = new CountDownLatch(1);
575 >        try {
576 >            FutureTask[] tasks = new FutureTask[5];
577 >            for (int i = 0; i < tasks.length; i++) {
578 >                Callable task = new CheckedCallable<Boolean>() {
579 >                    public Boolean realCall() throws InterruptedException {
580 >                        threadStarted.countDown();
581 >                        assertSame(q, p.getQueue());
582 >                        done.await();
583 >                        return Boolean.TRUE;
584 >                    }};
585 >                tasks[i] = new FutureTask(task);
586 >                p.execute(tasks[i]);
587 >            }
588 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
589 >            assertSame(q, p.getQueue());
590 >            assertFalse(q.contains(tasks[0]));
591 >            assertTrue(q.contains(tasks[tasks.length - 1]));
592 >            assertEquals(tasks.length - 1, q.size());
593          } finally {
594 <            joinPool(p1);
594 >            done.countDown();
595 >            joinPool(p);
596          }
597      }
598  
# Line 475 | Line 601 | public class ThreadPoolExecutorSubclassT
601       */
602      public void testRemove() throws InterruptedException {
603          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
604 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
605 <        FutureTask[] tasks = new FutureTask[5];
606 <        for (int i = 0; i < 5; i++) {
607 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
608 <            p1.execute(tasks[i]);
609 <        }
610 <        try {
611 <            Thread.sleep(SHORT_DELAY_MS);
612 <            assertFalse(p1.remove(tasks[0]));
604 >        final ThreadPoolExecutor p =
605 >            new CustomTPE(1, 1,
606 >                          LONG_DELAY_MS, MILLISECONDS,
607 >                          q);
608 >        Runnable[] tasks = new Runnable[6];
609 >        final CountDownLatch threadStarted = new CountDownLatch(1);
610 >        final CountDownLatch done = new CountDownLatch(1);
611 >        try {
612 >            for (int i = 0; i < tasks.length; i++) {
613 >                tasks[i] = new CheckedRunnable() {
614 >                        public void realRun() throws InterruptedException {
615 >                            threadStarted.countDown();
616 >                            done.await();
617 >                        }};
618 >                p.execute(tasks[i]);
619 >            }
620 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
621 >            assertFalse(p.remove(tasks[0]));
622              assertTrue(q.contains(tasks[4]));
623              assertTrue(q.contains(tasks[3]));
624 <            assertTrue(p1.remove(tasks[4]));
625 <            assertFalse(p1.remove(tasks[4]));
624 >            assertTrue(p.remove(tasks[4]));
625 >            assertFalse(p.remove(tasks[4]));
626              assertFalse(q.contains(tasks[4]));
627              assertTrue(q.contains(tasks[3]));
628 <            assertTrue(p1.remove(tasks[3]));
628 >            assertTrue(p.remove(tasks[3]));
629              assertFalse(q.contains(tasks[3]));
630          } finally {
631 <            joinPool(p1);
631 >            done.countDown();
632 >            joinPool(p);
633          }
634      }
635  
636      /**
637 <     *   purge removes cancelled tasks from the queue
637 >     * purge removes cancelled tasks from the queue
638       */
639 <    public void testPurge() {
640 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
639 >    public void testPurge() throws InterruptedException {
640 >        final CountDownLatch threadStarted = new CountDownLatch(1);
641 >        final CountDownLatch done = new CountDownLatch(1);
642 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
643 >        final ThreadPoolExecutor p =
644 >            new CustomTPE(1, 1,
645 >                          LONG_DELAY_MS, MILLISECONDS,
646 >                          q);
647          FutureTask[] tasks = new FutureTask[5];
648 <        for (int i = 0; i < 5; i++) {
649 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
650 <            p1.execute(tasks[i]);
648 >        try {
649 >            for (int i = 0; i < tasks.length; i++) {
650 >                Callable task = new CheckedCallable<Boolean>() {
651 >                    public Boolean realCall() throws InterruptedException {
652 >                        threadStarted.countDown();
653 >                        done.await();
654 >                        return Boolean.TRUE;
655 >                    }};
656 >                tasks[i] = new FutureTask(task);
657 >                p.execute(tasks[i]);
658 >            }
659 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
660 >            assertEquals(tasks.length, p.getTaskCount());
661 >            assertEquals(tasks.length - 1, q.size());
662 >            assertEquals(1L, p.getActiveCount());
663 >            assertEquals(0L, p.getCompletedTaskCount());
664 >            tasks[4].cancel(true);
665 >            tasks[3].cancel(false);
666 >            p.purge();
667 >            assertEquals(tasks.length - 3, q.size());
668 >            assertEquals(tasks.length - 2, p.getTaskCount());
669 >            p.purge();         // Nothing to do
670 >            assertEquals(tasks.length - 3, q.size());
671 >            assertEquals(tasks.length - 2, p.getTaskCount());
672 >        } finally {
673 >            done.countDown();
674 >            joinPool(p);
675          }
510        tasks[4].cancel(true);
511        tasks[3].cancel(true);
512        p1.purge();
513        long count = p1.getTaskCount();
514        assertTrue(count >= 2 && count < 5);
515        joinPool(p1);
676      }
677  
678      /**
679 <     *  shutDownNow returns a list containing tasks that were not run
679 >     * shutdownNow returns a list containing tasks that were not run
680       */
681 <    public void testShutDownNow() {
682 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
681 >    public void testShutdownNow() {
682 >        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
683          List l;
684          try {
685              for (int i = 0; i < 5; i++)
686 <                p1.execute(new MediumPossiblyInterruptedRunnable());
686 >                p.execute(new MediumPossiblyInterruptedRunnable());
687          }
688          finally {
689              try {
690 <                l = p1.shutdownNow();
690 >                l = p.shutdownNow();
691              } catch (SecurityException ok) { return; }
532
692          }
693 <        assertTrue(p1.isShutdown());
693 >        assertTrue(p.isShutdown());
694          assertTrue(l.size() <= 4);
695      }
696  
697      // Exception Tests
698  
540
699      /**
700       * Constructor throws if corePoolSize argument is less than zero
701       */
# Line 598 | Line 756 | public class ThreadPoolExecutorSubclassT
756          } catch (NullPointerException success) {}
757      }
758  
601
602
759      /**
760       * Constructor throws if corePoolSize argument is less than zero
761       */
# Line 671 | Line 827 | public class ThreadPoolExecutorSubclassT
827          } catch (NullPointerException success) {}
828      }
829  
674
830      /**
831       * Constructor throws if corePoolSize argument is less than zero
832       */
# Line 743 | Line 898 | public class ThreadPoolExecutorSubclassT
898          } catch (NullPointerException success) {}
899      }
900  
746
901      /**
902       * Constructor throws if corePoolSize argument is less than zero
903       */
# Line 795 | Line 949 | public class ThreadPoolExecutorSubclassT
949      }
950  
951      /**
952 <     * Constructor throws if workQueue is set to null
952 >     * Constructor throws if workQueue is null
953       */
954      public void testConstructorNullPointerException6() {
955          try {
# Line 805 | Line 959 | public class ThreadPoolExecutorSubclassT
959      }
960  
961      /**
962 <     * Constructor throws if handler is set to null
962 >     * Constructor throws if handler is null
963       */
964      public void testConstructorNullPointerException7() {
965          try {
# Line 816 | Line 970 | public class ThreadPoolExecutorSubclassT
970      }
971  
972      /**
973 <     * Constructor throws if ThreadFactory is set top null
973 >     * Constructor throws if ThreadFactory is null
974       */
975      public void testConstructorNullPointerException8() {
976          try {
977 <            ThreadFactory f = null;
978 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new NoOpREHandler());
977 >            new CustomTPE(1, 2,
978 >                          LONG_DELAY_MS, MILLISECONDS,
979 >                          new ArrayBlockingQueue<Runnable>(10),
980 >                          (ThreadFactory) null,
981 >                          new NoOpREHandler());
982              shouldThrow();
983          } catch (NullPointerException success) {}
984      }
985  
829
986      /**
987 <     *  execute throws RejectedExecutionException
832 <     *  if saturated.
987 >     * execute throws RejectedExecutionException if saturated.
988       */
989      public void testSaturatedExecute() {
990 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
991 <        try {
992 <
993 <            for (int i = 0; i < 5; ++i) {
994 <                p.execute(new MediumRunnable());
990 >        ThreadPoolExecutor p =
991 >            new CustomTPE(1, 1,
992 >                          LONG_DELAY_MS, MILLISECONDS,
993 >                          new ArrayBlockingQueue<Runnable>(1));
994 >        final CountDownLatch done = new CountDownLatch(1);
995 >        try {
996 >            Runnable task = new CheckedRunnable() {
997 >                public void realRun() throws InterruptedException {
998 >                    done.await();
999 >                }};
1000 >            for (int i = 0; i < 2; ++i)
1001 >                p.execute(task);
1002 >            for (int i = 0; i < 2; ++i) {
1003 >                try {
1004 >                    p.execute(task);
1005 >                    shouldThrow();
1006 >                } catch (RejectedExecutionException success) {}
1007 >                assertTrue(p.getTaskCount() <= 2);
1008              }
1009 <            shouldThrow();
1010 <        } catch (RejectedExecutionException success) {}
1011 <        joinPool(p);
1009 >        } finally {
1010 >            done.countDown();
1011 >            joinPool(p);
1012 >        }
1013      }
1014  
1015      /**
1016 <     *  executor using CallerRunsPolicy runs task if saturated.
1016 >     * executor using CallerRunsPolicy runs task if saturated.
1017       */
1018      public void testSaturatedExecute2() {
1019          RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1020 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1020 >        ThreadPoolExecutor p = new CustomTPE(1, 1,
1021 >                                             LONG_DELAY_MS, MILLISECONDS,
1022 >                                             new ArrayBlockingQueue<Runnable>(1),
1023 >                                             h);
1024          try {
853
1025              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1026 <            for (int i = 0; i < 5; ++i) {
1026 >            for (int i = 0; i < tasks.length; ++i)
1027                  tasks[i] = new TrackedNoOpRunnable();
857            }
1028              TrackedLongRunnable mr = new TrackedLongRunnable();
1029              p.execute(mr);
1030 <            for (int i = 0; i < 5; ++i) {
1030 >            for (int i = 0; i < tasks.length; ++i)
1031                  p.execute(tasks[i]);
1032 <            }
863 <            for (int i = 1; i < 5; ++i) {
1032 >            for (int i = 1; i < tasks.length; ++i)
1033                  assertTrue(tasks[i].done);
865            }
1034              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1035          } finally {
1036              joinPool(p);
# Line 870 | Line 1038 | public class ThreadPoolExecutorSubclassT
1038      }
1039  
1040      /**
1041 <     *  executor using DiscardPolicy drops task if saturated.
1041 >     * executor using DiscardPolicy drops task if saturated.
1042       */
1043      public void testSaturatedExecute3() {
1044          RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1045 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1045 >        ThreadPoolExecutor p =
1046 >            new CustomTPE(1, 1,
1047 >                          LONG_DELAY_MS, MILLISECONDS,
1048 >                          new ArrayBlockingQueue<Runnable>(1),
1049 >                          h);
1050          try {
879
1051              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1052 <            for (int i = 0; i < 5; ++i) {
1052 >            for (int i = 0; i < tasks.length; ++i)
1053                  tasks[i] = new TrackedNoOpRunnable();
883            }
1054              p.execute(new TrackedLongRunnable());
1055 <            for (int i = 0; i < 5; ++i) {
1056 <                p.execute(tasks[i]);
1057 <            }
1058 <            for (int i = 0; i < 5; ++i) {
889 <                assertFalse(tasks[i].done);
890 <            }
1055 >            for (TrackedNoOpRunnable task : tasks)
1056 >                p.execute(task);
1057 >            for (TrackedNoOpRunnable task : tasks)
1058 >                assertFalse(task.done);
1059              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1060          } finally {
1061              joinPool(p);
# Line 895 | Line 1063 | public class ThreadPoolExecutorSubclassT
1063      }
1064  
1065      /**
1066 <     *  executor using DiscardOldestPolicy drops oldest task if saturated.
1066 >     * executor using DiscardOldestPolicy drops oldest task if saturated.
1067       */
1068      public void testSaturatedExecute4() {
1069          RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
# Line 916 | Line 1084 | public class ThreadPoolExecutorSubclassT
1084      }
1085  
1086      /**
1087 <     *  execute throws RejectedExecutionException if shutdown
1087 >     * execute throws RejectedExecutionException if shutdown
1088       */
1089      public void testRejectedExecutionExceptionOnShutdown() {
1090 <        ThreadPoolExecutor tpe =
1090 >        ThreadPoolExecutor p =
1091              new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1092 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1092 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1093          try {
1094 <            tpe.execute(new NoOpRunnable());
1094 >            p.execute(new NoOpRunnable());
1095              shouldThrow();
1096          } catch (RejectedExecutionException success) {}
1097  
1098 <        joinPool(tpe);
1098 >        joinPool(p);
1099      }
1100  
1101      /**
1102 <     *  execute using CallerRunsPolicy drops task on shutdown
1102 >     * execute using CallerRunsPolicy drops task on shutdown
1103       */
1104      public void testCallerRunsOnShutdown() {
1105          RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
# Line 948 | Line 1116 | public class ThreadPoolExecutorSubclassT
1116      }
1117  
1118      /**
1119 <     *  execute using DiscardPolicy drops task on shutdown
1119 >     * execute using DiscardPolicy drops task on shutdown
1120       */
1121      public void testDiscardOnShutdown() {
1122          RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
# Line 964 | Line 1132 | public class ThreadPoolExecutorSubclassT
1132          }
1133      }
1134  
967
1135      /**
1136 <     *  execute using DiscardOldestPolicy drops task on shutdown
1136 >     * execute using DiscardOldestPolicy drops task on shutdown
1137       */
1138      public void testDiscardOldestOnShutdown() {
1139          RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
# Line 982 | Line 1149 | public class ThreadPoolExecutorSubclassT
1149          }
1150      }
1151  
985
1152      /**
1153 <     *  execute (null) throws NPE
1153 >     * execute(null) throws NPE
1154       */
1155      public void testExecuteNull() {
1156 <        ThreadPoolExecutor tpe = null;
1156 >        ThreadPoolExecutor p = null;
1157          try {
1158 <            tpe = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1159 <            tpe.execute(null);
1158 >            p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1159 >            p.execute(null);
1160              shouldThrow();
1161          } catch (NullPointerException success) {}
1162  
1163 <        joinPool(tpe);
1163 >        joinPool(p);
1164      }
1165  
1166      /**
1167 <     *  setCorePoolSize of negative value throws IllegalArgumentException
1167 >     * setCorePoolSize of negative value throws IllegalArgumentException
1168       */
1169      public void testCorePoolSizeIllegalArgumentException() {
1170 <        ThreadPoolExecutor tpe =
1170 >        ThreadPoolExecutor p =
1171              new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1172          try {
1173 <            tpe.setCorePoolSize(-1);
1173 >            p.setCorePoolSize(-1);
1174              shouldThrow();
1175          } catch (IllegalArgumentException success) {
1176          } finally {
1177 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1177 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1178          }
1179 <        joinPool(tpe);
1179 >        joinPool(p);
1180      }
1181  
1182      /**
1183 <     *  setMaximumPoolSize(int) throws IllegalArgumentException if
1184 <     *  given a value less the core pool size
1183 >     * setMaximumPoolSize(int) throws IllegalArgumentException
1184 >     * if given a value less the core pool size
1185       */
1186      public void testMaximumPoolSizeIllegalArgumentException() {
1187 <        ThreadPoolExecutor tpe = null;
1188 <        try {
1023 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1024 <        } catch (Exception e) {}
1187 >        ThreadPoolExecutor p =
1188 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1189          try {
1190 <            tpe.setMaximumPoolSize(1);
1190 >            p.setMaximumPoolSize(1);
1191              shouldThrow();
1192          } catch (IllegalArgumentException success) {
1193          } finally {
1194 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1194 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1195          }
1196 <        joinPool(tpe);
1196 >        joinPool(p);
1197      }
1198  
1199      /**
1200 <     *  setMaximumPoolSize throws IllegalArgumentException
1201 <     *  if given a negative value
1200 >     * setMaximumPoolSize throws IllegalArgumentException
1201 >     * if given a negative value
1202       */
1203      public void testMaximumPoolSizeIllegalArgumentException2() {
1204 <        ThreadPoolExecutor tpe = null;
1205 <        try {
1042 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1043 <        } catch (Exception e) {}
1204 >        ThreadPoolExecutor p =
1205 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1206          try {
1207 <            tpe.setMaximumPoolSize(-1);
1207 >            p.setMaximumPoolSize(-1);
1208              shouldThrow();
1209          } catch (IllegalArgumentException success) {
1210          } finally {
1211 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1211 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1212          }
1213 <        joinPool(tpe);
1213 >        joinPool(p);
1214      }
1215  
1054
1216      /**
1217 <     *  setKeepAliveTime  throws IllegalArgumentException
1218 <     *  when given a negative value
1217 >     * setKeepAliveTime throws IllegalArgumentException
1218 >     * when given a negative value
1219       */
1220      public void testKeepAliveTimeIllegalArgumentException() {
1221 <        ThreadPoolExecutor tpe = null;
1222 <        try {
1062 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1063 <        } catch (Exception e) {}
1221 >        ThreadPoolExecutor p =
1222 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1223  
1224          try {
1225 <            tpe.setKeepAliveTime(-1,MILLISECONDS);
1225 >            p.setKeepAliveTime(-1,MILLISECONDS);
1226              shouldThrow();
1227          } catch (IllegalArgumentException success) {
1228          } finally {
1229 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1229 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1230          }
1231 <        joinPool(tpe);
1231 >        joinPool(p);
1232      }
1233  
1234      /**
1235       * terminated() is called on termination
1236       */
1237      public void testTerminated() {
1238 <        CustomTPE tpe = new CustomTPE();
1239 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1240 <        assertTrue(tpe.terminatedCalled);
1241 <        joinPool(tpe);
1238 >        CustomTPE p = new CustomTPE();
1239 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1240 >        assertTrue(p.terminatedCalled());
1241 >        joinPool(p);
1242      }
1243  
1244      /**
1245       * beforeExecute and afterExecute are called when executing task
1246       */
1247      public void testBeforeAfter() throws InterruptedException {
1248 <        CustomTPE tpe = new CustomTPE();
1248 >        CustomTPE p = new CustomTPE();
1249          try {
1250 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1251 <            tpe.execute(r);
1252 <            Thread.sleep(SHORT_DELAY_MS);
1253 <            assertTrue(r.done);
1254 <            assertTrue(tpe.beforeCalled);
1255 <            assertTrue(tpe.afterCalled);
1256 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1250 >            final CountDownLatch done = new CountDownLatch(1);
1251 >            final CheckedRunnable task = new CheckedRunnable() {
1252 >                public void realRun() {
1253 >                    done.countDown();
1254 >                }};
1255 >            p.execute(task);
1256 >            await(p.afterCalled);
1257 >            assertEquals(0, done.getCount());
1258 >            assertTrue(p.afterCalled());
1259 >            assertTrue(p.beforeCalled());
1260 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1261          } finally {
1262 <            joinPool(tpe);
1262 >            joinPool(p);
1263          }
1264      }
1265  
# Line 1142 | Line 1305 | public class ThreadPoolExecutorSubclassT
1305          }
1306      }
1307  
1145
1308      /**
1309       * invokeAny(null) throws NPE
1310       */
# Line 1175 | Line 1337 | public class ThreadPoolExecutorSubclassT
1337       * invokeAny(c) throws NPE if c has null elements
1338       */
1339      public void testInvokeAny3() throws Exception {
1340 <        final CountDownLatch latch = new CountDownLatch(1);
1340 >        CountDownLatch latch = new CountDownLatch(1);
1341          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1342 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1343 +        l.add(latchAwaitingStringTask(latch));
1344 +        l.add(null);
1345          try {
1181            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1182            l.add(new Callable<String>() {
1183                      public String call() {
1184                          try {
1185                              latch.await();
1186                          } catch (InterruptedException ok) {}
1187                          return TEST_STRING;
1188                      }});
1189            l.add(null);
1346              e.invokeAny(l);
1347              shouldThrow();
1348          } catch (NullPointerException success) {
# Line 1201 | Line 1357 | public class ThreadPoolExecutorSubclassT
1357       */
1358      public void testInvokeAny4() throws Exception {
1359          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1360 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1361 +        l.add(new NPETask());
1362          try {
1205            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1206            l.add(new NPETask());
1363              e.invokeAny(l);
1364              shouldThrow();
1365          } catch (ExecutionException success) {
1366 +            assertTrue(success.getCause() instanceof NullPointerException);
1367          } finally {
1368              joinPool(e);
1369          }
# Line 1218 | Line 1375 | public class ThreadPoolExecutorSubclassT
1375      public void testInvokeAny5() throws Exception {
1376          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1377          try {
1378 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1378 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1379              l.add(new StringTask());
1380              l.add(new StringTask());
1381              String result = e.invokeAny(l);
# Line 1260 | Line 1417 | public class ThreadPoolExecutorSubclassT
1417       */
1418      public void testInvokeAll3() throws Exception {
1419          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1420 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1421 +        l.add(new StringTask());
1422 +        l.add(null);
1423          try {
1264            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1265            l.add(new StringTask());
1266            l.add(null);
1424              e.invokeAll(l);
1425              shouldThrow();
1426          } catch (NullPointerException success) {
# Line 1277 | Line 1434 | public class ThreadPoolExecutorSubclassT
1434       */
1435      public void testInvokeAll4() throws Exception {
1436          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1437 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1438 +        l.add(new NPETask());
1439 +        List<Future<String>> futures = e.invokeAll(l);
1440 +        assertEquals(1, futures.size());
1441          try {
1442 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1282 <            l.add(new NPETask());
1283 <            List<Future<String>> result = e.invokeAll(l);
1284 <            assertEquals(1, result.size());
1285 <            for (Future<String> future : result)
1286 <                future.get();
1442 >            futures.get(0).get();
1443              shouldThrow();
1444          } catch (ExecutionException success) {
1445 +            assertTrue(success.getCause() instanceof NullPointerException);
1446          } finally {
1447              joinPool(e);
1448          }
# Line 1297 | Line 1454 | public class ThreadPoolExecutorSubclassT
1454      public void testInvokeAll5() throws Exception {
1455          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1456          try {
1457 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1457 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1458              l.add(new StringTask());
1459              l.add(new StringTask());
1460 <            List<Future<String>> result = e.invokeAll(l);
1461 <            assertEquals(2, result.size());
1462 <            for (Future<String> future : result)
1460 >            List<Future<String>> futures = e.invokeAll(l);
1461 >            assertEquals(2, futures.size());
1462 >            for (Future<String> future : futures)
1463                  assertSame(TEST_STRING, future.get());
1464          } finally {
1465              joinPool(e);
1466          }
1467      }
1468  
1312
1313
1469      /**
1470       * timed invokeAny(null) throws NPE
1471       */
# Line 1330 | Line 1485 | public class ThreadPoolExecutorSubclassT
1485       */
1486      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1487          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1488 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1489 +        l.add(new StringTask());
1490          try {
1334            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1335            l.add(new StringTask());
1491              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1492              shouldThrow();
1493          } catch (NullPointerException success) {
# Line 1359 | Line 1514 | public class ThreadPoolExecutorSubclassT
1514       * timed invokeAny(c) throws NPE if c has null elements
1515       */
1516      public void testTimedInvokeAny3() throws Exception {
1517 +        CountDownLatch latch = new CountDownLatch(1);
1518          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1519 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1520 +        l.add(latchAwaitingStringTask(latch));
1521 +        l.add(null);
1522          try {
1364            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1365            l.add(new StringTask());
1366            l.add(null);
1523              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1524              shouldThrow();
1525          } catch (NullPointerException success) {
1526          } finally {
1527 +            latch.countDown();
1528              joinPool(e);
1529          }
1530      }
# Line 1377 | Line 1534 | public class ThreadPoolExecutorSubclassT
1534       */
1535      public void testTimedInvokeAny4() throws Exception {
1536          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1537 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1538 +        l.add(new NPETask());
1539          try {
1381            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1382            l.add(new NPETask());
1540              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1541              shouldThrow();
1542          } catch (ExecutionException success) {
1543 +            assertTrue(success.getCause() instanceof NullPointerException);
1544          } finally {
1545              joinPool(e);
1546          }
# Line 1394 | Line 1552 | public class ThreadPoolExecutorSubclassT
1552      public void testTimedInvokeAny5() throws Exception {
1553          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1554          try {
1555 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1555 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1556              l.add(new StringTask());
1557              l.add(new StringTask());
1558              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 1423 | Line 1581 | public class ThreadPoolExecutorSubclassT
1581       */
1582      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1583          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1584 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1585 +        l.add(new StringTask());
1586          try {
1427            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1428            l.add(new StringTask());
1587              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1588              shouldThrow();
1589          } catch (NullPointerException success) {
# Line 1452 | Line 1610 | public class ThreadPoolExecutorSubclassT
1610       */
1611      public void testTimedInvokeAll3() throws Exception {
1612          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1613 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1614 +        l.add(new StringTask());
1615 +        l.add(null);
1616          try {
1456            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1457            l.add(new StringTask());
1458            l.add(null);
1617              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1618              shouldThrow();
1619          } catch (NullPointerException success) {
# Line 1469 | Line 1627 | public class ThreadPoolExecutorSubclassT
1627       */
1628      public void testTimedInvokeAll4() throws Exception {
1629          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1630 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1631 +        l.add(new NPETask());
1632 +        List<Future<String>> futures =
1633 +            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1634 +        assertEquals(1, futures.size());
1635          try {
1636 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1474 <            l.add(new NPETask());
1475 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1476 <            assertEquals(1, result.size());
1477 <            for (Future<String> future : result)
1478 <                future.get();
1636 >            futures.get(0).get();
1637              shouldThrow();
1638          } catch (ExecutionException success) {
1639              assertTrue(success.getCause() instanceof NullPointerException);
# Line 1490 | Line 1648 | public class ThreadPoolExecutorSubclassT
1648      public void testTimedInvokeAll5() throws Exception {
1649          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1650          try {
1651 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1651 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1652              l.add(new StringTask());
1653              l.add(new StringTask());
1654 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1655 <            assertEquals(2, result.size());
1656 <            for (Future<String> future : result)
1654 >            List<Future<String>> futures =
1655 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1656 >            assertEquals(2, futures.size());
1657 >            for (Future<String> future : futures)
1658                  assertSame(TEST_STRING, future.get());
1500        } catch (ExecutionException success) {
1659          } finally {
1660              joinPool(e);
1661          }
# Line 1509 | Line 1667 | public class ThreadPoolExecutorSubclassT
1667      public void testTimedInvokeAll6() throws Exception {
1668          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1669          try {
1670 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1670 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1671              l.add(new StringTask());
1672              l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1673              l.add(new StringTask());
1674 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1675 <            assertEquals(3, result.size());
1676 <            Iterator<Future<String>> it = result.iterator();
1677 <            Future<String> f1 = it.next();
1678 <            Future<String> f2 = it.next();
1679 <            Future<String> f3 = it.next();
1680 <            assertTrue(f1.isDone());
1523 <            assertTrue(f2.isDone());
1524 <            assertTrue(f3.isDone());
1525 <            assertFalse(f1.isCancelled());
1526 <            assertTrue(f2.isCancelled());
1674 >            List<Future<String>> futures =
1675 >                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1676 >            assertEquals(l.size(), futures.size());
1677 >            for (Future future : futures)
1678 >                assertTrue(future.isDone());
1679 >            assertFalse(futures.get(0).isCancelled());
1680 >            assertTrue(futures.get(1).isCancelled());
1681          } finally {
1682              joinPool(e);
1683          }
# Line 1534 | Line 1688 | public class ThreadPoolExecutorSubclassT
1688       * thread factory fails to create more
1689       */
1690      public void testFailingThreadFactory() throws InterruptedException {
1691 <        ExecutorService e = new CustomTPE(100, 100, LONG_DELAY_MS, MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
1692 <        try {
1693 <            for (int k = 0; k < 100; ++k) {
1694 <                e.execute(new NoOpRunnable());
1695 <            }
1696 <            Thread.sleep(LONG_DELAY_MS);
1691 >        final ExecutorService e =
1692 >            new CustomTPE(100, 100,
1693 >                          LONG_DELAY_MS, MILLISECONDS,
1694 >                          new LinkedBlockingQueue<Runnable>(),
1695 >                          new FailingThreadFactory());
1696 >        try {
1697 >            final int TASKS = 100;
1698 >            final CountDownLatch done = new CountDownLatch(TASKS);
1699 >            for (int k = 0; k < TASKS; ++k)
1700 >                e.execute(new CheckedRunnable() {
1701 >                    public void realRun() {
1702 >                        done.countDown();
1703 >                    }});
1704 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1705          } finally {
1706              joinPool(e);
1707          }
# Line 1549 | Line 1711 | public class ThreadPoolExecutorSubclassT
1711       * allowsCoreThreadTimeOut is by default false.
1712       */
1713      public void testAllowsCoreThreadTimeOut() {
1714 <        ThreadPoolExecutor tpe = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1715 <        assertFalse(tpe.allowsCoreThreadTimeOut());
1716 <        joinPool(tpe);
1714 >        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1715 >        assertFalse(p.allowsCoreThreadTimeOut());
1716 >        joinPool(p);
1717      }
1718  
1719      /**
1720       * allowCoreThreadTimeOut(true) causes idle threads to time out
1721       */
1722 <    public void testAllowCoreThreadTimeOut_true() throws InterruptedException {
1723 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1724 <        tpe.allowCoreThreadTimeOut(true);
1725 <        tpe.execute(new NoOpRunnable());
1726 <        try {
1727 <            Thread.sleep(MEDIUM_DELAY_MS);
1728 <            assertEquals(0, tpe.getPoolSize());
1722 >    public void testAllowCoreThreadTimeOut_true() throws Exception {
1723 >        long coreThreadTimeOut = SHORT_DELAY_MS;
1724 >        final ThreadPoolExecutor p =
1725 >            new CustomTPE(2, 10,
1726 >                          coreThreadTimeOut, MILLISECONDS,
1727 >                          new ArrayBlockingQueue<Runnable>(10));
1728 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1729 >        try {
1730 >            p.allowCoreThreadTimeOut(true);
1731 >            p.execute(new CheckedRunnable() {
1732 >                public void realRun() throws InterruptedException {
1733 >                    threadStarted.countDown();
1734 >                    assertEquals(1, p.getPoolSize());
1735 >                }});
1736 >            await(threadStarted);
1737 >            delay(coreThreadTimeOut);
1738 >            long startTime = System.nanoTime();
1739 >            while (p.getPoolSize() > 0
1740 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1741 >                Thread.yield();
1742 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1743 >            assertEquals(0, p.getPoolSize());
1744          } finally {
1745 <            joinPool(tpe);
1745 >            joinPool(p);
1746          }
1747      }
1748  
1749      /**
1750       * allowCoreThreadTimeOut(false) causes idle threads not to time out
1751       */
1752 <    public void testAllowCoreThreadTimeOut_false() throws InterruptedException {
1753 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1754 <        tpe.allowCoreThreadTimeOut(false);
1755 <        tpe.execute(new NoOpRunnable());
1756 <        try {
1757 <            Thread.sleep(MEDIUM_DELAY_MS);
1758 <            assertTrue(tpe.getPoolSize() >= 1);
1752 >    public void testAllowCoreThreadTimeOut_false() throws Exception {
1753 >        long coreThreadTimeOut = SHORT_DELAY_MS;
1754 >        final ThreadPoolExecutor p =
1755 >            new CustomTPE(2, 10,
1756 >                          coreThreadTimeOut, MILLISECONDS,
1757 >                          new ArrayBlockingQueue<Runnable>(10));
1758 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1759 >        try {
1760 >            p.allowCoreThreadTimeOut(false);
1761 >            p.execute(new CheckedRunnable() {
1762 >                public void realRun() throws InterruptedException {
1763 >                    threadStarted.countDown();
1764 >                    assertTrue(p.getPoolSize() >= 1);
1765 >                }});
1766 >            delay(2 * coreThreadTimeOut);
1767 >            assertTrue(p.getPoolSize() >= 1);
1768          } finally {
1769 <            joinPool(tpe);
1769 >            joinPool(p);
1770          }
1771      }
1772  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines