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.52 by jsr166, Sun Oct 4 01:18:25 2015 UTC vs.
Revision 1.80 by jsr166, Sun Oct 4 06:39:13 2015 UTC

# Line 252 | Line 252 | public class ThreadPoolExecutorSubclassT
252              new CustomTPE(2, 2,
253                            LONG_DELAY_MS, MILLISECONDS,
254                            new ArrayBlockingQueue<Runnable>(10));
255        final CountDownLatch threadStarted = new CountDownLatch(1);
256        final CountDownLatch done = new CountDownLatch(1);
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 {
# Line 262 | Line 262 | public class ThreadPoolExecutorSubclassT
262                      assertEquals(1, p.getActiveCount());
263                      done.await();
264                  }});
265 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
265 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
266              assertEquals(1, p.getActiveCount());
267              done.countDown();
268          }
# Line 272 | Line 272 | public class ThreadPoolExecutorSubclassT
272       * prestartCoreThread starts a thread if under corePoolSize, else doesn't
273       */
274      public void testPrestartCoreThread() {
275 <        ThreadPoolExecutor p =
275 >        final ThreadPoolExecutor p =
276              new CustomTPE(2, 6,
277                            LONG_DELAY_MS, MILLISECONDS,
278                            new ArrayBlockingQueue<Runnable>(10));
# Line 298 | Line 298 | public class ThreadPoolExecutorSubclassT
298       * prestartAllCoreThreads starts all corePoolSize threads
299       */
300      public void testPrestartAllCoreThreads() {
301 <        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
302 <        assertEquals(0, p.getPoolSize());
303 <        p.prestartAllCoreThreads();
304 <        assertEquals(2, p.getPoolSize());
305 <        p.prestartAllCoreThreads();
306 <        assertEquals(2, p.getPoolSize());
307 <        joinPool(p);
301 >        final ThreadPoolExecutor p =
302 >            new CustomTPE(2, 6,
303 >                          LONG_DELAY_MS, MILLISECONDS,
304 >                          new ArrayBlockingQueue<Runnable>(10));
305 >        try (PoolCleaner cleaner = cleaner(p)) {
306 >            assertEquals(0, p.getPoolSize());
307 >            p.prestartAllCoreThreads();
308 >            assertEquals(2, p.getPoolSize());
309 >            p.prestartAllCoreThreads();
310 >            assertEquals(2, p.getPoolSize());
311 >            p.setCorePoolSize(4);
312 >            p.prestartAllCoreThreads();
313 >            assertEquals(4, p.getPoolSize());
314 >            p.prestartAllCoreThreads();
315 >            assertEquals(4, p.getPoolSize());
316 >        }
317      }
318  
319      /**
# Line 316 | Line 325 | public class ThreadPoolExecutorSubclassT
325              new CustomTPE(2, 2,
326                            LONG_DELAY_MS, MILLISECONDS,
327                            new ArrayBlockingQueue<Runnable>(10));
328 <        final CountDownLatch threadStarted = new CountDownLatch(1);
329 <        final CountDownLatch threadProceed = new CountDownLatch(1);
330 <        final CountDownLatch threadDone = new CountDownLatch(1);
331 <        try {
328 >        try (PoolCleaner cleaner = cleaner(p)) {
329 >            final CountDownLatch threadStarted = new CountDownLatch(1);
330 >            final CountDownLatch threadProceed = new CountDownLatch(1);
331 >            final CountDownLatch threadDone = new CountDownLatch(1);
332              assertEquals(0, p.getCompletedTaskCount());
333              p.execute(new CheckedRunnable() {
334                  public void realRun() throws InterruptedException {
# Line 338 | Line 347 | public class ThreadPoolExecutorSubclassT
347                      fail("timed out");
348                  Thread.yield();
349              }
341        } finally {
342            joinPool(p);
350          }
351      }
352  
# Line 347 | Line 354 | public class ThreadPoolExecutorSubclassT
354       * getCorePoolSize returns size given in constructor if not otherwise set
355       */
356      public void testGetCorePoolSize() {
357 <        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
358 <        assertEquals(1, p.getCorePoolSize());
359 <        joinPool(p);
357 >        final ThreadPoolExecutor p =
358 >            new CustomTPE(1, 1,
359 >                          LONG_DELAY_MS, MILLISECONDS,
360 >                          new ArrayBlockingQueue<Runnable>(10));
361 >        try (PoolCleaner cleaner = cleaner(p)) {
362 >            assertEquals(1, p.getCorePoolSize());
363 >        }
364      }
365  
366      /**
367       * getKeepAliveTime returns value given in constructor if not otherwise set
368       */
369      public void testGetKeepAliveTime() {
370 <        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
371 <        assertEquals(1, p.getKeepAliveTime(SECONDS));
372 <        joinPool(p);
370 >        final ThreadPoolExecutor p =
371 >            new CustomTPE(2, 2,
372 >                          1000, MILLISECONDS,
373 >                          new ArrayBlockingQueue<Runnable>(10));
374 >        try (PoolCleaner cleaner = cleaner(p)) {
375 >            assertEquals(1, p.getKeepAliveTime(SECONDS));
376 >        }
377      }
378  
379      /**
380       * getThreadFactory returns factory in constructor if not set
381       */
382      public void testGetThreadFactory() {
383 <        ThreadFactory tf = new SimpleThreadFactory();
384 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), tf, new NoOpREHandler());
385 <        assertSame(tf, p.getThreadFactory());
386 <        joinPool(p);
383 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
384 >        final ThreadPoolExecutor p =
385 >            new CustomTPE(1, 2,
386 >                          LONG_DELAY_MS, MILLISECONDS,
387 >                          new ArrayBlockingQueue<Runnable>(10),
388 >                          threadFactory,
389 >                          new NoOpREHandler());
390 >        try (PoolCleaner cleaner = cleaner(p)) {
391 >            assertSame(threadFactory, p.getThreadFactory());
392 >        }
393      }
394  
395      /**
396       * setThreadFactory sets the thread factory returned by getThreadFactory
397       */
398      public void testSetThreadFactory() {
399 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
400 <        ThreadFactory tf = new SimpleThreadFactory();
401 <        p.setThreadFactory(tf);
402 <        assertSame(tf, p.getThreadFactory());
403 <        joinPool(p);
399 >        final ThreadPoolExecutor p =
400 >            new CustomTPE(1, 2,
401 >                          LONG_DELAY_MS, MILLISECONDS,
402 >                          new ArrayBlockingQueue<Runnable>(10));
403 >        try (PoolCleaner cleaner = cleaner(p)) {
404 >            ThreadFactory threadFactory = new SimpleThreadFactory();
405 >            p.setThreadFactory(threadFactory);
406 >            assertSame(threadFactory, p.getThreadFactory());
407 >        }
408      }
409  
410      /**
411       * setThreadFactory(null) throws NPE
412       */
413      public void testSetThreadFactoryNull() {
414 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
415 <        try {
416 <            p.setThreadFactory(null);
417 <            shouldThrow();
418 <        } catch (NullPointerException success) {
419 <        } finally {
420 <            joinPool(p);
414 >        final ThreadPoolExecutor p =
415 >            new CustomTPE(1, 2,
416 >                          LONG_DELAY_MS, MILLISECONDS,
417 >                          new ArrayBlockingQueue<Runnable>(10));
418 >        try (PoolCleaner cleaner = cleaner(p)) {
419 >            try {
420 >                p.setThreadFactory(null);
421 >                shouldThrow();
422 >            } catch (NullPointerException success) {}
423          }
424      }
425  
# Line 400 | Line 427 | public class ThreadPoolExecutorSubclassT
427       * getRejectedExecutionHandler returns handler in constructor if not set
428       */
429      public void testGetRejectedExecutionHandler() {
430 <        RejectedExecutionHandler h = new NoOpREHandler();
431 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), h);
432 <        assertSame(h, p.getRejectedExecutionHandler());
433 <        joinPool(p);
430 >        final RejectedExecutionHandler handler = new NoOpREHandler();
431 >        final ThreadPoolExecutor p =
432 >            new CustomTPE(1, 2,
433 >                          LONG_DELAY_MS, MILLISECONDS,
434 >                          new ArrayBlockingQueue<Runnable>(10),
435 >                          handler);
436 >        try (PoolCleaner cleaner = cleaner(p)) {
437 >            assertSame(handler, p.getRejectedExecutionHandler());
438 >        }
439      }
440  
441      /**
# Line 411 | Line 443 | public class ThreadPoolExecutorSubclassT
443       * getRejectedExecutionHandler
444       */
445      public void testSetRejectedExecutionHandler() {
446 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
447 <        RejectedExecutionHandler h = new NoOpREHandler();
448 <        p.setRejectedExecutionHandler(h);
449 <        assertSame(h, p.getRejectedExecutionHandler());
450 <        joinPool(p);
446 >        final ThreadPoolExecutor p =
447 >            new CustomTPE(1, 2,
448 >                          LONG_DELAY_MS, MILLISECONDS,
449 >                          new ArrayBlockingQueue<Runnable>(10));
450 >        try (PoolCleaner cleaner = cleaner(p)) {
451 >            RejectedExecutionHandler handler = new NoOpREHandler();
452 >            p.setRejectedExecutionHandler(handler);
453 >            assertSame(handler, p.getRejectedExecutionHandler());
454 >        }
455      }
456  
457      /**
458       * setRejectedExecutionHandler(null) throws NPE
459       */
460      public void testSetRejectedExecutionHandlerNull() {
461 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
462 <        try {
463 <            p.setRejectedExecutionHandler(null);
464 <            shouldThrow();
465 <        } catch (NullPointerException success) {
466 <        } finally {
467 <            joinPool(p);
461 >        final ThreadPoolExecutor p =
462 >            new CustomTPE(1, 2,
463 >                          LONG_DELAY_MS, MILLISECONDS,
464 >                          new ArrayBlockingQueue<Runnable>(10));
465 >        try (PoolCleaner cleaner = cleaner(p)) {
466 >            try {
467 >                p.setRejectedExecutionHandler(null);
468 >                shouldThrow();
469 >            } catch (NullPointerException success) {}
470          }
471      }
472  
# Line 442 | Line 480 | public class ThreadPoolExecutorSubclassT
480              new CustomTPE(THREADS, THREADS,
481                            LONG_DELAY_MS, MILLISECONDS,
482                            new ArrayBlockingQueue<Runnable>(10));
483 <        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
484 <        final CountDownLatch done = new CountDownLatch(1);
485 <        try {
483 >        try (PoolCleaner cleaner = cleaner(p)) {
484 >            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
485 >            final CountDownLatch done = new CountDownLatch(1);
486              assertEquals(0, p.getLargestPoolSize());
487              for (int i = 0; i < THREADS; i++)
488                  p.execute(new CheckedRunnable() {
# Line 453 | Line 491 | public class ThreadPoolExecutorSubclassT
491                          done.await();
492                          assertEquals(THREADS, p.getLargestPoolSize());
493                      }});
494 <            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
457 <            assertEquals(THREADS, p.getLargestPoolSize());
458 <        } finally {
459 <            done.countDown();
460 <            joinPool(p);
494 >            assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
495              assertEquals(THREADS, p.getLargestPoolSize());
496 +            done.countDown();   // release pool
497          }
498 +        assertEquals(THREADS, p.getLargestPoolSize());
499      }
500  
501      /**
# Line 467 | Line 503 | public class ThreadPoolExecutorSubclassT
503       * otherwise set
504       */
505      public void testGetMaximumPoolSize() {
506 <        ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
507 <        assertEquals(2, p.getMaximumPoolSize());
508 <        joinPool(p);
506 >        final ThreadPoolExecutor p =
507 >            new CustomTPE(2, 3,
508 >                          LONG_DELAY_MS, MILLISECONDS,
509 >                          new ArrayBlockingQueue<Runnable>(10));
510 >        try (PoolCleaner cleaner = cleaner(p)) {
511 >            assertEquals(3, p.getMaximumPoolSize());
512 >            p.setMaximumPoolSize(5);
513 >            assertEquals(5, p.getMaximumPoolSize());
514 >            p.setMaximumPoolSize(4);
515 >            assertEquals(4, p.getMaximumPoolSize());
516 >        }
517      }
518  
519      /**
# Line 481 | Line 525 | public class ThreadPoolExecutorSubclassT
525              new CustomTPE(1, 1,
526                            LONG_DELAY_MS, MILLISECONDS,
527                            new ArrayBlockingQueue<Runnable>(10));
528 <        final CountDownLatch threadStarted = new CountDownLatch(1);
529 <        final CountDownLatch done = new CountDownLatch(1);
530 <        try {
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 {
# Line 491 | Line 535 | public class ThreadPoolExecutorSubclassT
535                      assertEquals(1, p.getPoolSize());
536                      done.await();
537                  }});
538 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
538 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
539              assertEquals(1, p.getPoolSize());
540 <        } finally {
497 <            done.countDown();
498 <            joinPool(p);
540 >            done.countDown();   // release pool
541          }
542      }
543  
# Line 507 | Line 549 | public class ThreadPoolExecutorSubclassT
549              new CustomTPE(1, 1,
550                            LONG_DELAY_MS, MILLISECONDS,
551                            new ArrayBlockingQueue<Runnable>(10));
552 <        final CountDownLatch threadStarted = new CountDownLatch(1);
553 <        final CountDownLatch done = new CountDownLatch(1);
554 <        try {
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 {
# Line 517 | Line 559 | public class ThreadPoolExecutorSubclassT
559                      assertEquals(1, p.getTaskCount());
560                      done.await();
561                  }});
562 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
562 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
563              assertEquals(1, p.getTaskCount());
522        } finally {
564              done.countDown();
524            joinPool(p);
565          }
566      }
567  
# Line 529 | Line 569 | public class ThreadPoolExecutorSubclassT
569       * isShutdown is false before shutdown, true after
570       */
571      public void testIsShutdown() {
572 <
573 <        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
574 <        assertFalse(p.isShutdown());
575 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
576 <        assertTrue(p.isShutdown());
577 <        joinPool(p);
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  
583      /**
# Line 545 | Line 588 | public class ThreadPoolExecutorSubclassT
588              new CustomTPE(1, 1,
589                            LONG_DELAY_MS, MILLISECONDS,
590                            new ArrayBlockingQueue<Runnable>(10));
591 <        final CountDownLatch threadStarted = new CountDownLatch(1);
592 <        final CountDownLatch done = new CountDownLatch(1);
593 <        try {
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 {
# Line 555 | Line 598 | public class ThreadPoolExecutorSubclassT
598                      threadStarted.countDown();
599                      done.await();
600                  }});
601 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
601 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
602              assertFalse(p.isTerminating());
603              done.countDown();
561        } finally {
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          }
564        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
565        assertTrue(p.isTerminated());
566        assertFalse(p.isTerminating());
609      }
610  
611      /**
# Line 574 | Line 616 | public class ThreadPoolExecutorSubclassT
616              new CustomTPE(1, 1,
617                            LONG_DELAY_MS, MILLISECONDS,
618                            new ArrayBlockingQueue<Runnable>(10));
619 <        final CountDownLatch threadStarted = new CountDownLatch(1);
620 <        final CountDownLatch done = new CountDownLatch(1);
621 <        try {
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 {
# Line 584 | Line 626 | public class ThreadPoolExecutorSubclassT
626                      threadStarted.countDown();
627                      done.await();
628                  }});
629 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
629 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
630              assertFalse(p.isTerminating());
631              done.countDown();
590        } finally {
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          }
593        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
594        assertTrue(p.isTerminated());
595        assertFalse(p.isTerminating());
637      }
638  
639      /**
# Line 604 | Line 645 | public class ThreadPoolExecutorSubclassT
645              new CustomTPE(1, 1,
646                            LONG_DELAY_MS, MILLISECONDS,
647                            q);
648 <        final CountDownLatch threadStarted = new CountDownLatch(1);
649 <        final CountDownLatch done = new CountDownLatch(1);
650 <        try {
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>() {
# Line 619 | Line 660 | public class ThreadPoolExecutorSubclassT
660                  tasks[i] = new FutureTask(task);
661                  p.execute(tasks[i]);
662              }
663 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
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());
627        } finally {
668              done.countDown();
629            joinPool(p);
669          }
670      }
671  
# Line 639 | Line 678 | public class ThreadPoolExecutorSubclassT
678              new CustomTPE(1, 1,
679                            LONG_DELAY_MS, MILLISECONDS,
680                            q);
681 <        Runnable[] tasks = new Runnable[6];
682 <        final CountDownLatch threadStarted = new CountDownLatch(1);
683 <        final CountDownLatch done = new CountDownLatch(1);
684 <        try {
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 <                        }};
687 >                    public void realRun() throws InterruptedException {
688 >                        threadStarted.countDown();
689 >                        done.await();
690 >                    }};
691                  p.execute(tasks[i]);
692              }
693 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
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]));
# Line 661 | Line 700 | public class ThreadPoolExecutorSubclassT
700              assertTrue(q.contains(tasks[3]));
701              assertTrue(p.remove(tasks[3]));
702              assertFalse(q.contains(tasks[3]));
664        } finally {
703              done.countDown();
666            joinPool(p);
704          }
705      }
706  
# Line 678 | Line 715 | public class ThreadPoolExecutorSubclassT
715              new CustomTPE(1, 1,
716                            LONG_DELAY_MS, MILLISECONDS,
717                            q);
718 <        FutureTask[] tasks = new FutureTask[5];
719 <        try {
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 {
# Line 690 | Line 727 | public class ThreadPoolExecutorSubclassT
727                  tasks[i] = new FutureTask(task);
728                  p.execute(tasks[i]);
729              }
730 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
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());
# Line 703 | Line 740 | public class ThreadPoolExecutorSubclassT
740              p.purge();         // Nothing to do
741              assertEquals(tasks.length - 3, q.size());
742              assertEquals(tasks.length - 2, p.getTaskCount());
706        } finally {
743              done.countDown();
708            joinPool(p);
744          }
745      }
746  
# Line 717 | Line 752 | public class ThreadPoolExecutorSubclassT
752          final int poolSize = 2;
753          final int count = 5;
754          final AtomicInteger ran = new AtomicInteger(0);
755 <        ThreadPoolExecutor p =
755 >        final ThreadPoolExecutor p =
756              new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
757                            new ArrayBlockingQueue<Runnable>(10));
758          CountDownLatch threadsStarted = new CountDownLatch(poolSize);
# Line 1089 | Line 1124 | public class ThreadPoolExecutorSubclassT
1124       * execute throws RejectedExecutionException if saturated.
1125       */
1126      public void testSaturatedExecute() {
1127 <        ThreadPoolExecutor p =
1127 >        final ThreadPoolExecutor p =
1128              new CustomTPE(1, 1,
1129                            LONG_DELAY_MS, MILLISECONDS,
1130                            new ArrayBlockingQueue<Runnable>(1));
1131 <        final CountDownLatch done = new CountDownLatch(1);
1132 <        try {
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();
# Line 1108 | Line 1143 | public class ThreadPoolExecutorSubclassT
1143                  } catch (RejectedExecutionException success) {}
1144                  assertTrue(p.getTaskCount() <= 2);
1145              }
1111        } finally {
1146              done.countDown();
1113            joinPool(p);
1147          }
1148      }
1149  
# Line 1118 | Line 1151 | public class ThreadPoolExecutorSubclassT
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,
1156 <                                             LONG_DELAY_MS, MILLISECONDS,
1157 <                                             new ArrayBlockingQueue<Runnable>(1),
1158 <                                             h);
1159 <        try {
1154 >        final ThreadPoolExecutor p =
1155 >            new CustomTPE(1, 1,
1156 >                          LONG_DELAY_MS, MILLISECONDS,
1157 >                          new ArrayBlockingQueue<Runnable>(1),
1158 >                          new CustomTPE.CallerRunsPolicy());
1159 >        try (PoolCleaner cleaner = cleaner(p)) {
1160 >            final CountDownLatch done = new CountDownLatch(1);
1161 >            Runnable blocker = new CheckedRunnable() {
1162 >                public void realRun() throws InterruptedException {
1163 >                    done.await();
1164 >                }};
1165 >            p.execute(blocker);
1166              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1167 <            for (int i = 0; i < tasks.length; ++i)
1167 >            for (int i = 0; i < tasks.length; i++)
1168                  tasks[i] = new TrackedNoOpRunnable();
1169 <            TrackedLongRunnable mr = new TrackedLongRunnable();
1131 <            p.execute(mr);
1132 <            for (int i = 0; i < tasks.length; ++i)
1169 >            for (int i = 0; i < tasks.length; i++)
1170                  p.execute(tasks[i]);
1171 <            for (int i = 1; i < tasks.length; ++i)
1171 >            for (int i = 1; i < tasks.length; i++)
1172                  assertTrue(tasks[i].done);
1173 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1174 <        } finally {
1138 <            joinPool(p);
1173 >            assertFalse(tasks[0].done); // waiting in queue
1174 >            done.countDown();
1175          }
1176      }
1177  
# Line 1143 | Line 1179 | public class ThreadPoolExecutorSubclassT
1179       * executor using DiscardPolicy drops task if saturated.
1180       */
1181      public void testSaturatedExecute3() {
1182 <        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1183 <        ThreadPoolExecutor p =
1182 >        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1183 >        for (int i = 0; i < tasks.length; ++i)
1184 >            tasks[i] = new TrackedNoOpRunnable();
1185 >        final ThreadPoolExecutor p =
1186              new CustomTPE(1, 1,
1187                            LONG_DELAY_MS, MILLISECONDS,
1188                            new ArrayBlockingQueue<Runnable>(1),
1189 <                          h);
1190 <        try {
1191 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1192 <            for (int i = 0; i < tasks.length; ++i)
1193 <                tasks[i] = new TrackedNoOpRunnable();
1156 <            p.execute(new TrackedLongRunnable());
1189 >                          new CustomTPE.DiscardPolicy());
1190 >        try (PoolCleaner cleaner = cleaner(p)) {
1191 >            final CountDownLatch done = new CountDownLatch(1);
1192 >            p.execute(awaiter(done));
1193 >
1194              for (TrackedNoOpRunnable task : tasks)
1195                  p.execute(task);
1196 <            for (TrackedNoOpRunnable task : tasks)
1197 <                assertFalse(task.done);
1198 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1162 <        } finally {
1163 <            joinPool(p);
1196 >            for (int i = 1; i < tasks.length; i++)
1197 >                assertFalse(tasks[i].done);
1198 >            done.countDown();
1199          }
1200 +        for (int i = 1; i < tasks.length; i++)
1201 +            assertFalse(tasks[i].done);
1202 +        assertTrue(tasks[0].done); // was waiting in queue
1203      }
1204  
1205      /**
1206       * executor using DiscardOldestPolicy drops oldest task if saturated.
1207       */
1208      public void testSaturatedExecute4() {
1209 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1210 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1211 <        try {
1212 <            p.execute(new TrackedLongRunnable());
1213 <            TrackedLongRunnable r2 = new TrackedLongRunnable();
1209 >        final CountDownLatch done = new CountDownLatch(1);
1210 >        LatchAwaiter r1 = awaiter(done);
1211 >        LatchAwaiter r2 = awaiter(done);
1212 >        LatchAwaiter r3 = awaiter(done);
1213 >        final ThreadPoolExecutor p =
1214 >            new CustomTPE(1, 1,
1215 >                          LONG_DELAY_MS, MILLISECONDS,
1216 >                          new ArrayBlockingQueue<Runnable>(1),
1217 >                          new CustomTPE.DiscardOldestPolicy());
1218 >        try (PoolCleaner cleaner = cleaner(p)) {
1219 >            assertEquals(LatchAwaiter.NEW, r1.state);
1220 >            assertEquals(LatchAwaiter.NEW, r2.state);
1221 >            assertEquals(LatchAwaiter.NEW, r3.state);
1222 >            p.execute(r1);
1223              p.execute(r2);
1224              assertTrue(p.getQueue().contains(r2));
1178            TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1225              p.execute(r3);
1226              assertFalse(p.getQueue().contains(r2));
1227              assertTrue(p.getQueue().contains(r3));
1228 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1183 <        } finally {
1184 <            joinPool(p);
1228 >            done.countDown();
1229          }
1230 +        assertEquals(LatchAwaiter.DONE, r1.state);
1231 +        assertEquals(LatchAwaiter.NEW, r2.state);
1232 +        assertEquals(LatchAwaiter.DONE, r3.state);
1233      }
1234  
1235      /**
1236       * execute throws RejectedExecutionException if shutdown
1237       */
1238      public void testRejectedExecutionExceptionOnShutdown() {
1239 <        ThreadPoolExecutor p =
1240 <            new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1239 >        final ThreadPoolExecutor p =
1240 >            new CustomTPE(1, 1,
1241 >                          LONG_DELAY_MS, MILLISECONDS,
1242 >                          new ArrayBlockingQueue<Runnable>(1));
1243          try { p.shutdown(); } catch (SecurityException ok) { return; }
1244 <        try {
1245 <            p.execute(new NoOpRunnable());
1246 <            shouldThrow();
1247 <        } catch (RejectedExecutionException success) {}
1248 <
1249 <        joinPool(p);
1244 >        try (PoolCleaner cleaner = cleaner(p)) {
1245 >            try {
1246 >                p.execute(new NoOpRunnable());
1247 >                shouldThrow();
1248 >            } catch (RejectedExecutionException success) {}
1249 >        }
1250      }
1251  
1252      /**
1253       * execute using CallerRunsPolicy drops task on shutdown
1254       */
1255      public void testCallerRunsOnShutdown() {
1256 <        RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1257 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1258 <
1256 >        final ThreadPoolExecutor p =
1257 >            new CustomTPE(1, 1,
1258 >                          LONG_DELAY_MS, MILLISECONDS,
1259 >                          new ArrayBlockingQueue<Runnable>(1),
1260 >                          new CustomTPE.CallerRunsPolicy());
1261          try { p.shutdown(); } catch (SecurityException ok) { return; }
1262 <        try {
1262 >        try (PoolCleaner cleaner = cleaner(p)) {
1263              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1264              p.execute(r);
1265              assertFalse(r.done);
1215        } finally {
1216            joinPool(p);
1266          }
1267      }
1268  
# Line 1221 | Line 1270 | public class ThreadPoolExecutorSubclassT
1270       * execute using DiscardPolicy drops task on shutdown
1271       */
1272      public void testDiscardOnShutdown() {
1273 <        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1274 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1275 <
1273 >        final ThreadPoolExecutor p =
1274 >            new CustomTPE(1, 1,
1275 >                          LONG_DELAY_MS, MILLISECONDS,
1276 >                          new ArrayBlockingQueue<Runnable>(1),
1277 >                          new CustomTPE.DiscardPolicy());
1278          try { p.shutdown(); } catch (SecurityException ok) { return; }
1279 <        try {
1279 >        try (PoolCleaner cleaner = cleaner(p)) {
1280              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1281              p.execute(r);
1282              assertFalse(r.done);
1232        } finally {
1233            joinPool(p);
1283          }
1284      }
1285  
# Line 1238 | Line 1287 | public class ThreadPoolExecutorSubclassT
1287       * execute using DiscardOldestPolicy drops task on shutdown
1288       */
1289      public void testDiscardOldestOnShutdown() {
1290 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1291 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1290 >        final ThreadPoolExecutor p =
1291 >            new CustomTPE(1, 1,
1292 >                          LONG_DELAY_MS, MILLISECONDS,
1293 >                          new ArrayBlockingQueue<Runnable>(1),
1294 >                          new CustomTPE.DiscardOldestPolicy());
1295  
1296          try { p.shutdown(); } catch (SecurityException ok) { return; }
1297 <        try {
1297 >        try (PoolCleaner cleaner = cleaner(p)) {
1298              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1299              p.execute(r);
1300              assertFalse(r.done);
1249        } finally {
1250            joinPool(p);
1301          }
1302      }
1303  
# Line 1255 | Line 1305 | public class ThreadPoolExecutorSubclassT
1305       * execute(null) throws NPE
1306       */
1307      public void testExecuteNull() {
1308 <        ThreadPoolExecutor p =
1309 <            new CustomTPE(1, 2, 1L, SECONDS,
1308 >        final ThreadPoolExecutor p =
1309 >            new CustomTPE(1, 2,
1310 >                          1L, SECONDS,
1311                            new ArrayBlockingQueue<Runnable>(10));
1312 <        try {
1313 <            p.execute(null);
1314 <            shouldThrow();
1315 <        } catch (NullPointerException success) {}
1316 <
1317 <        joinPool(p);
1312 >        try (PoolCleaner cleaner = cleaner(p)) {
1313 >            try {
1314 >                p.execute(null);
1315 >                shouldThrow();
1316 >            } catch (NullPointerException success) {}
1317 >        }
1318      }
1319  
1320      /**
1321       * setCorePoolSize of negative value throws IllegalArgumentException
1322       */
1323      public void testCorePoolSizeIllegalArgumentException() {
1324 <        ThreadPoolExecutor p =
1324 >        final ThreadPoolExecutor p =
1325              new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1326          try {
1327              p.setCorePoolSize(-1);
# Line 1287 | Line 1338 | public class ThreadPoolExecutorSubclassT
1338       * if given a value less the core pool size
1339       */
1340      public void testMaximumPoolSizeIllegalArgumentException() {
1341 <        ThreadPoolExecutor p =
1341 >        final ThreadPoolExecutor p =
1342              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1343          try {
1344              p.setMaximumPoolSize(1);
# Line 1304 | Line 1355 | public class ThreadPoolExecutorSubclassT
1355       * if given a negative value
1356       */
1357      public void testMaximumPoolSizeIllegalArgumentException2() {
1358 <        ThreadPoolExecutor p =
1358 >        final ThreadPoolExecutor p =
1359              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1360          try {
1361              p.setMaximumPoolSize(-1);
# Line 1321 | Line 1372 | public class ThreadPoolExecutorSubclassT
1372       * when given a negative value
1373       */
1374      public void testKeepAliveTimeIllegalArgumentException() {
1375 <        ThreadPoolExecutor p =
1375 >        final ThreadPoolExecutor p =
1376              new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1377  
1378          try {
# Line 1369 | Line 1420 | public class ThreadPoolExecutorSubclassT
1420       * completed submit of callable returns result
1421       */
1422      public void testSubmitCallable() throws Exception {
1423 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1423 >        final ExecutorService e =
1424 >            new CustomTPE(2, 2,
1425 >                          LONG_DELAY_MS, MILLISECONDS,
1426 >                          new ArrayBlockingQueue<Runnable>(10));
1427          try {
1428              Future<String> future = e.submit(new StringTask());
1429              String result = future.get();
# Line 1383 | Line 1437 | public class ThreadPoolExecutorSubclassT
1437       * completed submit of runnable returns successfully
1438       */
1439      public void testSubmitRunnable() throws Exception {
1440 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1440 >        final ExecutorService e =
1441 >            new CustomTPE(2, 2,
1442 >                          LONG_DELAY_MS, MILLISECONDS,
1443 >                          new ArrayBlockingQueue<Runnable>(10));
1444          try {
1445              Future<?> future = e.submit(new NoOpRunnable());
1446              future.get();
# Line 1397 | Line 1454 | public class ThreadPoolExecutorSubclassT
1454       * completed submit of (runnable, result) returns result
1455       */
1456      public void testSubmitRunnable2() throws Exception {
1457 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1457 >        final ExecutorService e =
1458 >            new CustomTPE(2, 2,
1459 >                          LONG_DELAY_MS, MILLISECONDS,
1460 >                          new ArrayBlockingQueue<Runnable>(10));
1461          try {
1462              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1463              String result = future.get();
# Line 1411 | Line 1471 | public class ThreadPoolExecutorSubclassT
1471       * invokeAny(null) throws NPE
1472       */
1473      public void testInvokeAny1() throws Exception {
1474 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1474 >        final ExecutorService e =
1475 >            new CustomTPE(2, 2,
1476 >                          LONG_DELAY_MS, MILLISECONDS,
1477 >                          new ArrayBlockingQueue<Runnable>(10));
1478          try {
1479              e.invokeAny(null);
1480              shouldThrow();
# Line 1425 | Line 1488 | public class ThreadPoolExecutorSubclassT
1488       * invokeAny(empty collection) throws IAE
1489       */
1490      public void testInvokeAny2() throws Exception {
1491 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1491 >        final ExecutorService e =
1492 >            new CustomTPE(2, 2,
1493 >                          LONG_DELAY_MS, MILLISECONDS,
1494 >                          new ArrayBlockingQueue<Runnable>(10));
1495          try {
1496              e.invokeAny(new ArrayList<Callable<String>>());
1497              shouldThrow();
# Line 1440 | Line 1506 | public class ThreadPoolExecutorSubclassT
1506       */
1507      public void testInvokeAny3() throws Exception {
1508          CountDownLatch latch = new CountDownLatch(1);
1509 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1509 >        final ExecutorService e =
1510 >            new CustomTPE(2, 2,
1511 >                          LONG_DELAY_MS, MILLISECONDS,
1512 >                          new ArrayBlockingQueue<Runnable>(10));
1513          List<Callable<String>> l = new ArrayList<Callable<String>>();
1514          l.add(latchAwaitingStringTask(latch));
1515          l.add(null);
# Line 1458 | Line 1527 | public class ThreadPoolExecutorSubclassT
1527       * invokeAny(c) throws ExecutionException if no task completes
1528       */
1529      public void testInvokeAny4() throws Exception {
1530 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1530 >        final ExecutorService e =
1531 >            new CustomTPE(2, 2,
1532 >                          LONG_DELAY_MS, MILLISECONDS,
1533 >                          new ArrayBlockingQueue<Runnable>(10));
1534          List<Callable<String>> l = new ArrayList<Callable<String>>();
1535          l.add(new NPETask());
1536          try {
# Line 1475 | Line 1547 | public class ThreadPoolExecutorSubclassT
1547       * invokeAny(c) returns result of some task
1548       */
1549      public void testInvokeAny5() throws Exception {
1550 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1550 >        final ExecutorService e =
1551 >            new CustomTPE(2, 2,
1552 >                          LONG_DELAY_MS, MILLISECONDS,
1553 >                          new ArrayBlockingQueue<Runnable>(10));
1554          try {
1555              List<Callable<String>> l = new ArrayList<Callable<String>>();
1556              l.add(new StringTask());
# Line 1491 | Line 1566 | public class ThreadPoolExecutorSubclassT
1566       * invokeAll(null) throws NPE
1567       */
1568      public void testInvokeAll1() throws Exception {
1569 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1569 >        final ExecutorService e =
1570 >            new CustomTPE(2, 2,
1571 >                          LONG_DELAY_MS, MILLISECONDS,
1572 >                          new ArrayBlockingQueue<Runnable>(10));
1573          try {
1574              e.invokeAll(null);
1575              shouldThrow();
# Line 1505 | Line 1583 | public class ThreadPoolExecutorSubclassT
1583       * invokeAll(empty collection) returns empty collection
1584       */
1585      public void testInvokeAll2() throws Exception {
1586 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1586 >        final ExecutorService e =
1587 >            new CustomTPE(2, 2,
1588 >                          LONG_DELAY_MS, MILLISECONDS,
1589 >                          new ArrayBlockingQueue<Runnable>(10));
1590          try {
1591              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1592              assertTrue(r.isEmpty());
# Line 1518 | Line 1599 | public class ThreadPoolExecutorSubclassT
1599       * invokeAll(c) throws NPE if c has null elements
1600       */
1601      public void testInvokeAll3() throws Exception {
1602 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1602 >        final ExecutorService e =
1603 >            new CustomTPE(2, 2,
1604 >                          LONG_DELAY_MS, MILLISECONDS,
1605 >                          new ArrayBlockingQueue<Runnable>(10));
1606          List<Callable<String>> l = new ArrayList<Callable<String>>();
1607          l.add(new StringTask());
1608          l.add(null);
# Line 1535 | Line 1619 | public class ThreadPoolExecutorSubclassT
1619       * get of element of invokeAll(c) throws exception on failed task
1620       */
1621      public void testInvokeAll4() throws Exception {
1622 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1622 >        final ExecutorService e =
1623 >            new CustomTPE(2, 2,
1624 >                          LONG_DELAY_MS, MILLISECONDS,
1625 >                          new ArrayBlockingQueue<Runnable>(10));
1626          List<Callable<String>> l = new ArrayList<Callable<String>>();
1627          l.add(new NPETask());
1628          List<Future<String>> futures = e.invokeAll(l);
# Line 1554 | Line 1641 | public class ThreadPoolExecutorSubclassT
1641       * invokeAll(c) returns results of all completed tasks
1642       */
1643      public void testInvokeAll5() throws Exception {
1644 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1644 >        final ExecutorService e =
1645 >            new CustomTPE(2, 2,
1646 >                          LONG_DELAY_MS, MILLISECONDS,
1647 >                          new ArrayBlockingQueue<Runnable>(10));
1648          try {
1649              List<Callable<String>> l = new ArrayList<Callable<String>>();
1650              l.add(new StringTask());
# Line 1572 | Line 1662 | public class ThreadPoolExecutorSubclassT
1662       * timed invokeAny(null) throws NPE
1663       */
1664      public void testTimedInvokeAny1() throws Exception {
1665 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1665 >        final ExecutorService e =
1666 >            new CustomTPE(2, 2,
1667 >                          LONG_DELAY_MS, MILLISECONDS,
1668 >                          new ArrayBlockingQueue<Runnable>(10));
1669          try {
1670              e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1671              shouldThrow();
# Line 1586 | Line 1679 | public class ThreadPoolExecutorSubclassT
1679       * timed invokeAny(,,null) throws NPE
1680       */
1681      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1682 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1682 >        final ExecutorService e =
1683 >            new CustomTPE(2, 2,
1684 >                          LONG_DELAY_MS, MILLISECONDS,
1685 >                          new ArrayBlockingQueue<Runnable>(10));
1686          List<Callable<String>> l = new ArrayList<Callable<String>>();
1687          l.add(new StringTask());
1688          try {
# Line 1602 | Line 1698 | public class ThreadPoolExecutorSubclassT
1698       * timed invokeAny(empty collection) throws IAE
1699       */
1700      public void testTimedInvokeAny2() throws Exception {
1701 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1701 >        final ExecutorService e =
1702 >            new CustomTPE(2, 2,
1703 >                          LONG_DELAY_MS, MILLISECONDS,
1704 >                          new ArrayBlockingQueue<Runnable>(10));
1705          try {
1706              e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1707              shouldThrow();
# Line 1617 | Line 1716 | public class ThreadPoolExecutorSubclassT
1716       */
1717      public void testTimedInvokeAny3() throws Exception {
1718          CountDownLatch latch = new CountDownLatch(1);
1719 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1719 >        final ExecutorService e =
1720 >            new CustomTPE(2, 2,
1721 >                          LONG_DELAY_MS, MILLISECONDS,
1722 >                          new ArrayBlockingQueue<Runnable>(10));
1723          List<Callable<String>> l = new ArrayList<Callable<String>>();
1724          l.add(latchAwaitingStringTask(latch));
1725          l.add(null);
# Line 1635 | Line 1737 | public class ThreadPoolExecutorSubclassT
1737       * timed invokeAny(c) throws ExecutionException if no task completes
1738       */
1739      public void testTimedInvokeAny4() throws Exception {
1740 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1740 >        final ExecutorService e =
1741 >            new CustomTPE(2, 2,
1742 >                          LONG_DELAY_MS, MILLISECONDS,
1743 >                          new ArrayBlockingQueue<Runnable>(10));
1744          List<Callable<String>> l = new ArrayList<Callable<String>>();
1745          l.add(new NPETask());
1746          try {
# Line 1652 | Line 1757 | public class ThreadPoolExecutorSubclassT
1757       * timed invokeAny(c) returns result of some task
1758       */
1759      public void testTimedInvokeAny5() throws Exception {
1760 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1760 >        final ExecutorService e =
1761 >            new CustomTPE(2, 2,
1762 >                          LONG_DELAY_MS, MILLISECONDS,
1763 >                          new ArrayBlockingQueue<Runnable>(10));
1764          try {
1765              List<Callable<String>> l = new ArrayList<Callable<String>>();
1766              l.add(new StringTask());
# Line 1668 | Line 1776 | public class ThreadPoolExecutorSubclassT
1776       * timed invokeAll(null) throws NPE
1777       */
1778      public void testTimedInvokeAll1() throws Exception {
1779 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1779 >        final ExecutorService e =
1780 >            new CustomTPE(2, 2,
1781 >                          LONG_DELAY_MS, MILLISECONDS,
1782 >                          new ArrayBlockingQueue<Runnable>(10));
1783          try {
1784              e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1785              shouldThrow();
# Line 1682 | Line 1793 | public class ThreadPoolExecutorSubclassT
1793       * timed invokeAll(,,null) throws NPE
1794       */
1795      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1796 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1796 >        final ExecutorService e =
1797 >            new CustomTPE(2, 2,
1798 >                          LONG_DELAY_MS, MILLISECONDS,
1799 >                          new ArrayBlockingQueue<Runnable>(10));
1800          List<Callable<String>> l = new ArrayList<Callable<String>>();
1801          l.add(new StringTask());
1802          try {
# Line 1698 | Line 1812 | public class ThreadPoolExecutorSubclassT
1812       * timed invokeAll(empty collection) returns empty collection
1813       */
1814      public void testTimedInvokeAll2() throws Exception {
1815 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1815 >        final ExecutorService e =
1816 >            new CustomTPE(2, 2,
1817 >                          LONG_DELAY_MS, MILLISECONDS,
1818 >                          new ArrayBlockingQueue<Runnable>(10));
1819          try {
1820              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1821              assertTrue(r.isEmpty());
# Line 1711 | Line 1828 | public class ThreadPoolExecutorSubclassT
1828       * timed invokeAll(c) throws NPE if c has null elements
1829       */
1830      public void testTimedInvokeAll3() throws Exception {
1831 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1831 >        final ExecutorService e =
1832 >            new CustomTPE(2, 2,
1833 >                          LONG_DELAY_MS, MILLISECONDS,
1834 >                          new ArrayBlockingQueue<Runnable>(10));
1835          List<Callable<String>> l = new ArrayList<Callable<String>>();
1836          l.add(new StringTask());
1837          l.add(null);
# Line 1728 | Line 1848 | public class ThreadPoolExecutorSubclassT
1848       * get of element of invokeAll(c) throws exception on failed task
1849       */
1850      public void testTimedInvokeAll4() throws Exception {
1851 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1851 >        final ExecutorService e =
1852 >            new CustomTPE(2, 2,
1853 >                          LONG_DELAY_MS, MILLISECONDS,
1854 >                          new ArrayBlockingQueue<Runnable>(10));
1855          List<Callable<String>> l = new ArrayList<Callable<String>>();
1856          l.add(new NPETask());
1857          List<Future<String>> futures =
# Line 1748 | Line 1871 | public class ThreadPoolExecutorSubclassT
1871       * timed invokeAll(c) returns results of all completed tasks
1872       */
1873      public void testTimedInvokeAll5() throws Exception {
1874 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1874 >        final ExecutorService e =
1875 >            new CustomTPE(2, 2,
1876 >                          LONG_DELAY_MS, MILLISECONDS,
1877 >                          new ArrayBlockingQueue<Runnable>(10));
1878          try {
1879              List<Callable<String>> l = new ArrayList<Callable<String>>();
1880              l.add(new StringTask());
# Line 1767 | Line 1893 | public class ThreadPoolExecutorSubclassT
1893       * timed invokeAll(c) cancels tasks not completed by timeout
1894       */
1895      public void testTimedInvokeAll6() throws Exception {
1896 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1896 >        final ExecutorService e =
1897 >            new CustomTPE(2, 2,
1898 >                          LONG_DELAY_MS, MILLISECONDS,
1899 >                          new ArrayBlockingQueue<Runnable>(10));
1900          try {
1901              for (long timeout = timeoutMillis();;) {
1902                  List<Callable<String>> tasks = new ArrayList<>();
# Line 1825 | Line 1954 | public class ThreadPoolExecutorSubclassT
1954       * allowsCoreThreadTimeOut is by default false.
1955       */
1956      public void testAllowsCoreThreadTimeOut() {
1957 <        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1957 >        final ThreadPoolExecutor p =
1958 >            new CustomTPE(2, 2,
1959 >                          1000, MILLISECONDS,
1960 >                          new ArrayBlockingQueue<Runnable>(10));
1961          assertFalse(p.allowsCoreThreadTimeOut());
1962          joinPool(p);
1963      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines