ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ThreadPoolExecutorTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ThreadPoolExecutorTest.java (file contents):
Revision 1.94 by jsr166, Sun Oct 4 03:52:33 2015 UTC vs.
Revision 1.113 by jsr166, Wed Aug 24 22:22:39 2016 UTC

# Line 28 | Line 28 | import java.util.concurrent.RejectedExec
28   import java.util.concurrent.SynchronousQueue;
29   import java.util.concurrent.ThreadFactory;
30   import java.util.concurrent.ThreadPoolExecutor;
31 import java.util.concurrent.TimeUnit;
31   import java.util.concurrent.atomic.AtomicInteger;
32  
33   import junit.framework.Test;
# Line 101 | Line 100 | public class ThreadPoolExecutorTest exte
100       * thread becomes active
101       */
102      public void testGetActiveCount() throws InterruptedException {
103 +        final CountDownLatch done = new CountDownLatch(1);
104          final ThreadPoolExecutor p =
105              new ThreadPoolExecutor(2, 2,
106                                     LONG_DELAY_MS, MILLISECONDS,
107                                     new ArrayBlockingQueue<Runnable>(10));
108 <        try (PoolCleaner cleaner = cleaner(p)) {
108 >        try (PoolCleaner cleaner = cleaner(p, done)) {
109              final CountDownLatch threadStarted = new CountDownLatch(1);
110            final CountDownLatch done = new CountDownLatch(1);
110              assertEquals(0, p.getActiveCount());
111              p.execute(new CheckedRunnable() {
112                  public void realRun() throws InterruptedException {
113                      threadStarted.countDown();
114                      assertEquals(1, p.getActiveCount());
115 <                    done.await();
115 >                    await(done);
116                  }});
117 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
117 >            await(threadStarted);
118              assertEquals(1, p.getActiveCount());
120            done.countDown();
119          }
120      }
121  
# Line 329 | Line 327 | public class ThreadPoolExecutorTest exte
327       */
328      public void testGetLargestPoolSize() throws InterruptedException {
329          final int THREADS = 3;
330 +        final CountDownLatch done = new CountDownLatch(1);
331          final ThreadPoolExecutor p =
332              new ThreadPoolExecutor(THREADS, THREADS,
333                                     LONG_DELAY_MS, MILLISECONDS,
334                                     new ArrayBlockingQueue<Runnable>(10));
335 <        try (PoolCleaner cleaner = cleaner(p)) {
337 <            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
338 <            final CountDownLatch done = new CountDownLatch(1);
335 >        try (PoolCleaner cleaner = cleaner(p, done)) {
336              assertEquals(0, p.getLargestPoolSize());
337 +            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
338              for (int i = 0; i < THREADS; i++)
339                  p.execute(new CheckedRunnable() {
340                      public void realRun() throws InterruptedException {
341                          threadsStarted.countDown();
342 <                        done.await();
342 >                        await(done);
343                          assertEquals(THREADS, p.getLargestPoolSize());
344                      }});
345 <            assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
345 >            await(threadsStarted);
346              assertEquals(THREADS, p.getLargestPoolSize());
349            done.countDown();   // release pool
347          }
348          assertEquals(THREADS, p.getLargestPoolSize());
349      }
# Line 374 | Line 371 | public class ThreadPoolExecutorTest exte
371       * become active
372       */
373      public void testGetPoolSize() throws InterruptedException {
374 +        final CountDownLatch done = new CountDownLatch(1);
375          final ThreadPoolExecutor p =
376              new ThreadPoolExecutor(1, 1,
377                                     LONG_DELAY_MS, MILLISECONDS,
378                                     new ArrayBlockingQueue<Runnable>(10));
379 <        try (PoolCleaner cleaner = cleaner(p)) {
382 <            final CountDownLatch threadStarted = new CountDownLatch(1);
383 <            final CountDownLatch done = new CountDownLatch(1);
379 >        try (PoolCleaner cleaner = cleaner(p, done)) {
380              assertEquals(0, p.getPoolSize());
381 +            final CountDownLatch threadStarted = new CountDownLatch(1);
382              p.execute(new CheckedRunnable() {
383                  public void realRun() throws InterruptedException {
384                      threadStarted.countDown();
385                      assertEquals(1, p.getPoolSize());
386 <                    done.await();
386 >                    await(done);
387                  }});
388 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
388 >            await(threadStarted);
389              assertEquals(1, p.getPoolSize());
393            done.countDown();   // release pool
390          }
391      }
392  
# Line 398 | Line 394 | public class ThreadPoolExecutorTest exte
394       * getTaskCount increases, but doesn't overestimate, when tasks submitted
395       */
396      public void testGetTaskCount() throws InterruptedException {
397 +        final int TASKS = 3;
398 +        final CountDownLatch done = new CountDownLatch(1);
399          final ThreadPoolExecutor p =
400              new ThreadPoolExecutor(1, 1,
401                                     LONG_DELAY_MS, MILLISECONDS,
402                                     new ArrayBlockingQueue<Runnable>(10));
403 <        try (PoolCleaner cleaner = cleaner(p)) {
403 >        try (PoolCleaner cleaner = cleaner(p, done)) {
404              final CountDownLatch threadStarted = new CountDownLatch(1);
407            final CountDownLatch done = new CountDownLatch(1);
405              assertEquals(0, p.getTaskCount());
406 +            assertEquals(0, p.getCompletedTaskCount());
407              p.execute(new CheckedRunnable() {
408                  public void realRun() throws InterruptedException {
409                      threadStarted.countDown();
410 <                    assertEquals(1, p.getTaskCount());
413 <                    done.await();
410 >                    await(done);
411                  }});
412 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
412 >            await(threadStarted);
413              assertEquals(1, p.getTaskCount());
414 <            done.countDown();
414 >            assertEquals(0, p.getCompletedTaskCount());
415 >            for (int i = 0; i < TASKS; i++) {
416 >                assertEquals(1 + i, p.getTaskCount());
417 >                p.execute(new CheckedRunnable() {
418 >                    public void realRun() throws InterruptedException {
419 >                        threadStarted.countDown();
420 >                        assertEquals(1 + TASKS, p.getTaskCount());
421 >                        await(done);
422 >                    }});
423 >            }
424 >            assertEquals(1 + TASKS, p.getTaskCount());
425 >            assertEquals(0, p.getCompletedTaskCount());
426          }
427 +        assertEquals(1 + TASKS, p.getTaskCount());
428 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
429      }
430  
431      /**
# Line 481 | Line 491 | public class ThreadPoolExecutorTest exte
491                  public void realRun() throws InterruptedException {
492                      assertFalse(p.isTerminating());
493                      threadStarted.countDown();
494 <                    done.await();
494 >                    await(done);
495                  }});
496 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
496 >            await(threadStarted);
497              assertFalse(p.isTerminating());
498              done.countDown();
499              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 509 | Line 519 | public class ThreadPoolExecutorTest exte
519                  public void realRun() throws InterruptedException {
520                      assertFalse(p.isTerminating());
521                      threadStarted.countDown();
522 <                    done.await();
522 >                    await(done);
523                  }});
524 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
524 >            await(threadStarted);
525              assertFalse(p.isTerminating());
526              done.countDown();
527              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 525 | Line 535 | public class ThreadPoolExecutorTest exte
535       * getQueue returns the work queue, which contains queued tasks
536       */
537      public void testGetQueue() throws InterruptedException {
538 +        final CountDownLatch done = new CountDownLatch(1);
539          final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
540          final ThreadPoolExecutor p =
541              new ThreadPoolExecutor(1, 1,
542                                     LONG_DELAY_MS, MILLISECONDS,
543                                     q);
544 <        try (PoolCleaner cleaner = cleaner(p)) {
544 >        try (PoolCleaner cleaner = cleaner(p, done)) {
545              final CountDownLatch threadStarted = new CountDownLatch(1);
535            final CountDownLatch done = new CountDownLatch(1);
546              FutureTask[] tasks = new FutureTask[5];
547              for (int i = 0; i < tasks.length; i++) {
548                  Callable task = new CheckedCallable<Boolean>() {
549                      public Boolean realCall() throws InterruptedException {
550                          threadStarted.countDown();
551                          assertSame(q, p.getQueue());
552 <                        done.await();
552 >                        await(done);
553                          return Boolean.TRUE;
554                      }};
555                  tasks[i] = new FutureTask(task);
556                  p.execute(tasks[i]);
557              }
558 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
558 >            await(threadStarted);
559              assertSame(q, p.getQueue());
560              assertFalse(q.contains(tasks[0]));
561              assertTrue(q.contains(tasks[tasks.length - 1]));
562              assertEquals(tasks.length - 1, q.size());
553            done.countDown();
563          }
564      }
565  
# Line 558 | Line 567 | public class ThreadPoolExecutorTest exte
567       * remove(task) removes queued task, and fails to remove active task
568       */
569      public void testRemove() throws InterruptedException {
570 +        final CountDownLatch done = new CountDownLatch(1);
571          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
572          final ThreadPoolExecutor p =
573              new ThreadPoolExecutor(1, 1,
574                                     LONG_DELAY_MS, MILLISECONDS,
575                                     q);
576 <        try (PoolCleaner cleaner = cleaner(p)) {
576 >        try (PoolCleaner cleaner = cleaner(p, done)) {
577              Runnable[] tasks = new Runnable[6];
578              final CountDownLatch threadStarted = new CountDownLatch(1);
569            final CountDownLatch done = new CountDownLatch(1);
579              for (int i = 0; i < tasks.length; i++) {
580                  tasks[i] = new CheckedRunnable() {
581                      public void realRun() throws InterruptedException {
582                          threadStarted.countDown();
583 <                        done.await();
583 >                        await(done);
584                      }};
585                  p.execute(tasks[i]);
586              }
587 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
587 >            await(threadStarted);
588              assertFalse(p.remove(tasks[0]));
589              assertTrue(q.contains(tasks[4]));
590              assertTrue(q.contains(tasks[3]));
# Line 585 | Line 594 | public class ThreadPoolExecutorTest exte
594              assertTrue(q.contains(tasks[3]));
595              assertTrue(p.remove(tasks[3]));
596              assertFalse(q.contains(tasks[3]));
588            done.countDown();
597          }
598      }
599  
# Line 600 | Line 608 | public class ThreadPoolExecutorTest exte
608              new ThreadPoolExecutor(1, 1,
609                                     LONG_DELAY_MS, MILLISECONDS,
610                                     q);
611 <        try (PoolCleaner cleaner = cleaner(p)) {
611 >        try (PoolCleaner cleaner = cleaner(p, done)) {
612              FutureTask[] tasks = new FutureTask[5];
613              for (int i = 0; i < tasks.length; i++) {
614                  Callable task = new CheckedCallable<Boolean>() {
615                      public Boolean realCall() throws InterruptedException {
616                          threadStarted.countDown();
617 <                        done.await();
617 >                        await(done);
618                          return Boolean.TRUE;
619                      }};
620                  tasks[i] = new FutureTask(task);
621                  p.execute(tasks[i]);
622              }
623 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
623 >            await(threadStarted);
624              assertEquals(tasks.length, p.getTaskCount());
625              assertEquals(tasks.length - 1, q.size());
626              assertEquals(1L, p.getActiveCount());
# Line 625 | Line 633 | public class ThreadPoolExecutorTest exte
633              p.purge();         // Nothing to do
634              assertEquals(tasks.length - 3, q.size());
635              assertEquals(tasks.length - 2, p.getTaskCount());
628            done.countDown();
636          }
637      }
638  
# Line 641 | Line 648 | public class ThreadPoolExecutorTest exte
648              new ThreadPoolExecutor(poolSize, poolSize,
649                                     LONG_DELAY_MS, MILLISECONDS,
650                                     new ArrayBlockingQueue<Runnable>(10));
651 <        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
651 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
652          Runnable waiter = new CheckedRunnable() { public void realRun() {
653              threadsStarted.countDown();
654              try {
# Line 651 | Line 658 | public class ThreadPoolExecutorTest exte
658          }};
659          for (int i = 0; i < count; i++)
660              p.execute(waiter);
661 <        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
661 >        await(threadsStarted);
662          assertEquals(poolSize, p.getActiveCount());
663          assertEquals(0, p.getCompletedTaskCount());
664          final List<Runnable> queuedTasks;
# Line 1013 | Line 1020 | public class ThreadPoolExecutorTest exte
1020       * get of submitted callable throws InterruptedException if interrupted
1021       */
1022      public void testInterruptedSubmit() throws InterruptedException {
1023 +        final CountDownLatch done = new CountDownLatch(1);
1024          final ThreadPoolExecutor p =
1025              new ThreadPoolExecutor(1, 1,
1026                                     60, SECONDS,
1027                                     new ArrayBlockingQueue<Runnable>(10));
1028  
1029 <        try (PoolCleaner cleaner = cleaner(p)) {
1029 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1030              final CountDownLatch threadStarted = new CountDownLatch(1);
1023            final CountDownLatch done = new CountDownLatch(1);
1031              Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1032                  public void realRun() throws Exception {
1033                      Callable task = new CheckedCallable<Boolean>() {
1034                          public Boolean realCall() throws InterruptedException {
1035                              threadStarted.countDown();
1036 <                            done.await();
1036 >                            await(done);
1037                              return Boolean.TRUE;
1038                          }};
1039                      p.submit(task).get();
1040                  }});
1041  
1042 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
1042 >            await(threadStarted);
1043              t.interrupt();
1044 <            awaitTermination(t, MEDIUM_DELAY_MS);
1038 <            done.countDown();
1044 >            awaitTermination(t);
1045          }
1046      }
1047  
# Line 1043 | Line 1049 | public class ThreadPoolExecutorTest exte
1049       * execute throws RejectedExecutionException if saturated.
1050       */
1051      public void testSaturatedExecute() {
1052 +        final CountDownLatch done = new CountDownLatch(1);
1053          final ThreadPoolExecutor p =
1054              new ThreadPoolExecutor(1, 1,
1055                                     LONG_DELAY_MS, MILLISECONDS,
1056                                     new ArrayBlockingQueue<Runnable>(1));
1057 <        try (PoolCleaner cleaner = cleaner(p)) {
1051 <            final CountDownLatch done = new CountDownLatch(1);
1057 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1058              Runnable task = new CheckedRunnable() {
1059                  public void realRun() throws InterruptedException {
1060 <                    done.await();
1060 >                    await(done);
1061                  }};
1062              for (int i = 0; i < 2; ++i)
1063                  p.execute(task);
# Line 1062 | Line 1068 | public class ThreadPoolExecutorTest exte
1068                  } catch (RejectedExecutionException success) {}
1069                  assertTrue(p.getTaskCount() <= 2);
1070              }
1065            done.countDown();
1071          }
1072      }
1073  
# Line 1070 | Line 1075 | public class ThreadPoolExecutorTest exte
1075       * submit(runnable) throws RejectedExecutionException if saturated.
1076       */
1077      public void testSaturatedSubmitRunnable() {
1078 <        ThreadPoolExecutor p =
1078 >        final CountDownLatch done = new CountDownLatch(1);
1079 >        final ThreadPoolExecutor p =
1080              new ThreadPoolExecutor(1, 1,
1081                                     LONG_DELAY_MS, MILLISECONDS,
1082                                     new ArrayBlockingQueue<Runnable>(1));
1083 <        final CountDownLatch done = new CountDownLatch(1);
1078 <        try {
1083 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1084              Runnable task = new CheckedRunnable() {
1085                  public void realRun() throws InterruptedException {
1086 <                    done.await();
1086 >                    await(done);
1087                  }};
1088              for (int i = 0; i < 2; ++i)
1089                  p.submit(task);
# Line 1089 | Line 1094 | public class ThreadPoolExecutorTest exte
1094                  } catch (RejectedExecutionException success) {}
1095                  assertTrue(p.getTaskCount() <= 2);
1096              }
1092        } finally {
1093            done.countDown();
1094            joinPool(p);
1097          }
1098      }
1099  
# Line 1099 | Line 1101 | public class ThreadPoolExecutorTest exte
1101       * submit(callable) throws RejectedExecutionException if saturated.
1102       */
1103      public void testSaturatedSubmitCallable() {
1104 <        ThreadPoolExecutor p =
1104 >        final CountDownLatch done = new CountDownLatch(1);
1105 >        final ThreadPoolExecutor p =
1106              new ThreadPoolExecutor(1, 1,
1107                                     LONG_DELAY_MS, MILLISECONDS,
1108                                     new ArrayBlockingQueue<Runnable>(1));
1109 <        final CountDownLatch done = new CountDownLatch(1);
1107 <        try {
1109 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1110              Runnable task = new CheckedRunnable() {
1111                  public void realRun() throws InterruptedException {
1112 <                    done.await();
1112 >                    await(done);
1113                  }};
1114              for (int i = 0; i < 2; ++i)
1115                  p.submit(Executors.callable(task));
# Line 1118 | Line 1120 | public class ThreadPoolExecutorTest exte
1120                  } catch (RejectedExecutionException success) {}
1121                  assertTrue(p.getTaskCount() <= 2);
1122              }
1121        } finally {
1122            done.countDown();
1123            joinPool(p);
1123          }
1124      }
1125  
# Line 1138 | Line 1137 | public class ThreadPoolExecutorTest exte
1137              final CountDownLatch done = new CountDownLatch(1);
1138              Runnable blocker = new CheckedRunnable() {
1139                  public void realRun() throws InterruptedException {
1140 <                    done.await();
1140 >                    await(done);
1141                  }};
1142              p.execute(blocker);
1143              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
# Line 1157 | Line 1156 | public class ThreadPoolExecutorTest exte
1156       * executor using DiscardPolicy drops task if saturated.
1157       */
1158      public void testSaturatedExecute3() {
1159 +        final CountDownLatch done = new CountDownLatch(1);
1160          final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1161          for (int i = 0; i < tasks.length; ++i)
1162              tasks[i] = new TrackedNoOpRunnable();
# Line 1165 | Line 1165 | public class ThreadPoolExecutorTest exte
1165                            LONG_DELAY_MS, MILLISECONDS,
1166                            new ArrayBlockingQueue<Runnable>(1),
1167                            new ThreadPoolExecutor.DiscardPolicy());
1168 <        try (PoolCleaner cleaner = cleaner(p)) {
1169 <            final CountDownLatch done = new CountDownLatch(1);
1168 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1169              p.execute(awaiter(done));
1170  
1171              for (TrackedNoOpRunnable task : tasks)
1172                  p.execute(task);
1173              for (int i = 1; i < tasks.length; i++)
1174                  assertFalse(tasks[i].done);
1176            done.countDown();
1175          }
1176          for (int i = 1; i < tasks.length; i++)
1177              assertFalse(tasks[i].done);
# Line 1193 | Line 1191 | public class ThreadPoolExecutorTest exte
1191                                     LONG_DELAY_MS, MILLISECONDS,
1192                                     new ArrayBlockingQueue<Runnable>(1),
1193                                     new ThreadPoolExecutor.DiscardOldestPolicy());
1194 <        try (PoolCleaner cleaner = cleaner(p)) {
1194 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1195              assertEquals(LatchAwaiter.NEW, r1.state);
1196              assertEquals(LatchAwaiter.NEW, r2.state);
1197              assertEquals(LatchAwaiter.NEW, r3.state);
# Line 1203 | Line 1201 | public class ThreadPoolExecutorTest exte
1201              p.execute(r3);
1202              assertFalse(p.getQueue().contains(r2));
1203              assertTrue(p.getQueue().contains(r3));
1206            done.countDown();
1204          }
1205          assertEquals(LatchAwaiter.DONE, r1.state);
1206          assertEquals(LatchAwaiter.NEW, r2.state);
# Line 1214 | Line 1211 | public class ThreadPoolExecutorTest exte
1211       * execute throws RejectedExecutionException if shutdown
1212       */
1213      public void testRejectedExecutionExceptionOnShutdown() {
1214 <        ThreadPoolExecutor p =
1214 >        final ThreadPoolExecutor p =
1215              new ThreadPoolExecutor(1, 1,
1216                                     LONG_DELAY_MS, MILLISECONDS,
1217                                     new ArrayBlockingQueue<Runnable>(1));
# Line 1249 | Line 1246 | public class ThreadPoolExecutorTest exte
1246       * execute using DiscardPolicy drops task on shutdown
1247       */
1248      public void testDiscardOnShutdown() {
1249 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1253 <        ThreadPoolExecutor p =
1249 >        final ThreadPoolExecutor p =
1250              new ThreadPoolExecutor(1, 1,
1251                                     LONG_DELAY_MS, MILLISECONDS,
1252                                     new ArrayBlockingQueue<Runnable>(1),
1253 <                                   h);
1253 >                                   new ThreadPoolExecutor.DiscardPolicy());
1254  
1255          try { p.shutdown(); } catch (SecurityException ok) { return; }
1256 <        try {
1256 >        try (PoolCleaner cleaner = cleaner(p)) {
1257              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1258              p.execute(r);
1259              assertFalse(r.done);
1264        } finally {
1265            joinPool(p);
1260          }
1261      }
1262  
# Line 1270 | Line 1264 | public class ThreadPoolExecutorTest exte
1264       * execute using DiscardOldestPolicy drops task on shutdown
1265       */
1266      public void testDiscardOldestOnShutdown() {
1267 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1274 <        ThreadPoolExecutor p =
1267 >        final ThreadPoolExecutor p =
1268              new ThreadPoolExecutor(1, 1,
1269                                     LONG_DELAY_MS, MILLISECONDS,
1270                                     new ArrayBlockingQueue<Runnable>(1),
1271 <                                   h);
1271 >                                   new ThreadPoolExecutor.DiscardOldestPolicy());
1272  
1273          try { p.shutdown(); } catch (SecurityException ok) { return; }
1274 <        try {
1274 >        try (PoolCleaner cleaner = cleaner(p)) {
1275              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1276              p.execute(r);
1277              assertFalse(r.done);
1285        } finally {
1286            joinPool(p);
1278          }
1279      }
1280  
# Line 1291 | Line 1282 | public class ThreadPoolExecutorTest exte
1282       * execute(null) throws NPE
1283       */
1284      public void testExecuteNull() {
1285 <        ThreadPoolExecutor p =
1286 <            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1285 >        final ThreadPoolExecutor p =
1286 >            new ThreadPoolExecutor(1, 2,
1287 >                                   1L, SECONDS,
1288                                     new ArrayBlockingQueue<Runnable>(10));
1289 <        try {
1290 <            p.execute(null);
1291 <            shouldThrow();
1292 <        } catch (NullPointerException success) {}
1293 <
1294 <        joinPool(p);
1289 >        try (PoolCleaner cleaner = cleaner(p)) {
1290 >            try {
1291 >                p.execute(null);
1292 >                shouldThrow();
1293 >            } catch (NullPointerException success) {}
1294 >        }
1295      }
1296  
1297      /**
1298       * setCorePoolSize of negative value throws IllegalArgumentException
1299       */
1300      public void testCorePoolSizeIllegalArgumentException() {
1301 <        ThreadPoolExecutor p =
1301 >        final ThreadPoolExecutor p =
1302              new ThreadPoolExecutor(1, 2,
1303                                     LONG_DELAY_MS, MILLISECONDS,
1304                                     new ArrayBlockingQueue<Runnable>(10));
1305 <        try {
1306 <            p.setCorePoolSize(-1);
1307 <            shouldThrow();
1308 <        } catch (IllegalArgumentException success) {
1309 <        } finally {
1318 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1305 >        try (PoolCleaner cleaner = cleaner(p)) {
1306 >            try {
1307 >                p.setCorePoolSize(-1);
1308 >                shouldThrow();
1309 >            } catch (IllegalArgumentException success) {}
1310          }
1320        joinPool(p);
1311      }
1312  
1313      /**
# Line 1325 | Line 1315 | public class ThreadPoolExecutorTest exte
1315       * given a value less the core pool size
1316       */
1317      public void testMaximumPoolSizeIllegalArgumentException() {
1318 <        ThreadPoolExecutor p =
1318 >        final ThreadPoolExecutor p =
1319              new ThreadPoolExecutor(2, 3,
1320                                     LONG_DELAY_MS, MILLISECONDS,
1321                                     new ArrayBlockingQueue<Runnable>(10));
1322 <        try {
1323 <            p.setMaximumPoolSize(1);
1324 <            shouldThrow();
1325 <        } catch (IllegalArgumentException success) {
1326 <        } finally {
1337 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1322 >        try (PoolCleaner cleaner = cleaner(p)) {
1323 >            try {
1324 >                p.setMaximumPoolSize(1);
1325 >                shouldThrow();
1326 >            } catch (IllegalArgumentException success) {}
1327          }
1339        joinPool(p);
1328      }
1329  
1330      /**
# Line 1344 | Line 1332 | public class ThreadPoolExecutorTest exte
1332       * if given a negative value
1333       */
1334      public void testMaximumPoolSizeIllegalArgumentException2() {
1335 <        ThreadPoolExecutor p =
1335 >        final ThreadPoolExecutor p =
1336              new ThreadPoolExecutor(2, 3,
1337                                     LONG_DELAY_MS, MILLISECONDS,
1338                                     new ArrayBlockingQueue<Runnable>(10));
1339 <        try {
1340 <            p.setMaximumPoolSize(-1);
1341 <            shouldThrow();
1342 <        } catch (IllegalArgumentException success) {
1343 <        } finally {
1356 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1339 >        try (PoolCleaner cleaner = cleaner(p)) {
1340 >            try {
1341 >                p.setMaximumPoolSize(-1);
1342 >                shouldThrow();
1343 >            } catch (IllegalArgumentException success) {}
1344          }
1358        joinPool(p);
1345      }
1346  
1347      /**
# Line 1363 | Line 1349 | public class ThreadPoolExecutorTest exte
1349       * max pool size result in IllegalArgumentException.
1350       */
1351      public void testPoolSizeInvariants() {
1352 <        ThreadPoolExecutor p =
1352 >        final ThreadPoolExecutor p =
1353              new ThreadPoolExecutor(1, 1,
1354                                     LONG_DELAY_MS, MILLISECONDS,
1355                                     new ArrayBlockingQueue<Runnable>(10));
1356 <        for (int s = 1; s < 5; s++) {
1357 <            p.setMaximumPoolSize(s);
1358 <            p.setCorePoolSize(s);
1359 <            try {
1360 <                p.setMaximumPoolSize(s - 1);
1361 <                shouldThrow();
1362 <            } catch (IllegalArgumentException success) {}
1363 <            assertEquals(s, p.getCorePoolSize());
1364 <            assertEquals(s, p.getMaximumPoolSize());
1365 <            try {
1366 <                p.setCorePoolSize(s + 1);
1367 <                shouldThrow();
1368 <            } catch (IllegalArgumentException success) {}
1369 <            assertEquals(s, p.getCorePoolSize());
1370 <            assertEquals(s, p.getMaximumPoolSize());
1356 >        try (PoolCleaner cleaner = cleaner(p)) {
1357 >            for (int s = 1; s < 5; s++) {
1358 >                p.setMaximumPoolSize(s);
1359 >                p.setCorePoolSize(s);
1360 >                try {
1361 >                    p.setMaximumPoolSize(s - 1);
1362 >                    shouldThrow();
1363 >                } catch (IllegalArgumentException success) {}
1364 >                assertEquals(s, p.getCorePoolSize());
1365 >                assertEquals(s, p.getMaximumPoolSize());
1366 >                try {
1367 >                    p.setCorePoolSize(s + 1);
1368 >                    shouldThrow();
1369 >                } catch (IllegalArgumentException success) {}
1370 >                assertEquals(s, p.getCorePoolSize());
1371 >                assertEquals(s, p.getMaximumPoolSize());
1372 >            }
1373          }
1386        joinPool(p);
1374      }
1375  
1376      /**
# Line 1391 | Line 1378 | public class ThreadPoolExecutorTest exte
1378       * when given a negative value
1379       */
1380      public void testKeepAliveTimeIllegalArgumentException() {
1381 <        ThreadPoolExecutor p =
1381 >        final ThreadPoolExecutor p =
1382              new ThreadPoolExecutor(2, 3,
1383                                     LONG_DELAY_MS, MILLISECONDS,
1384                                     new ArrayBlockingQueue<Runnable>(10));
1385 <        try {
1386 <            p.setKeepAliveTime(-1,MILLISECONDS);
1387 <            shouldThrow();
1388 <        } catch (IllegalArgumentException success) {
1389 <        } finally {
1403 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1385 >        try (PoolCleaner cleaner = cleaner(p)) {
1386 >            try {
1387 >                p.setKeepAliveTime(-1, MILLISECONDS);
1388 >                shouldThrow();
1389 >            } catch (IllegalArgumentException success) {}
1390          }
1405        joinPool(p);
1391      }
1392  
1393      /**
# Line 1410 | Line 1395 | public class ThreadPoolExecutorTest exte
1395       */
1396      public void testTerminated() {
1397          ExtendedTPE p = new ExtendedTPE();
1398 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
1399 <        assertTrue(p.terminatedCalled());
1400 <        joinPool(p);
1398 >        try (PoolCleaner cleaner = cleaner(p)) {
1399 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1400 >            assertTrue(p.terminatedCalled());
1401 >            assertTrue(p.isShutdown());
1402 >        }
1403      }
1404  
1405      /**
# Line 1420 | Line 1407 | public class ThreadPoolExecutorTest exte
1407       */
1408      public void testBeforeAfter() throws InterruptedException {
1409          ExtendedTPE p = new ExtendedTPE();
1410 <        try {
1410 >        try (PoolCleaner cleaner = cleaner(p)) {
1411              final CountDownLatch done = new CountDownLatch(1);
1412              p.execute(new CheckedRunnable() {
1413                  public void realRun() {
# Line 1430 | Line 1417 | public class ThreadPoolExecutorTest exte
1417              assertEquals(0, done.getCount());
1418              assertTrue(p.afterCalled());
1419              assertTrue(p.beforeCalled());
1433            try { p.shutdown(); } catch (SecurityException ok) { return; }
1434        } finally {
1435            joinPool(p);
1420          }
1421      }
1422  
# Line 1440 | Line 1424 | public class ThreadPoolExecutorTest exte
1424       * completed submit of callable returns result
1425       */
1426      public void testSubmitCallable() throws Exception {
1427 <        ExecutorService e =
1427 >        final ExecutorService e =
1428              new ThreadPoolExecutor(2, 2,
1429                                     LONG_DELAY_MS, MILLISECONDS,
1430                                     new ArrayBlockingQueue<Runnable>(10));
1431 <        try {
1431 >        try (PoolCleaner cleaner = cleaner(e)) {
1432              Future<String> future = e.submit(new StringTask());
1433              String result = future.get();
1434              assertSame(TEST_STRING, result);
1451        } finally {
1452            joinPool(e);
1435          }
1436      }
1437  
# Line 1457 | Line 1439 | public class ThreadPoolExecutorTest exte
1439       * completed submit of runnable returns successfully
1440       */
1441      public void testSubmitRunnable() throws Exception {
1442 <        ExecutorService e =
1442 >        final ExecutorService e =
1443              new ThreadPoolExecutor(2, 2,
1444                                     LONG_DELAY_MS, MILLISECONDS,
1445                                     new ArrayBlockingQueue<Runnable>(10));
1446 <        try {
1446 >        try (PoolCleaner cleaner = cleaner(e)) {
1447              Future<?> future = e.submit(new NoOpRunnable());
1448              future.get();
1449              assertTrue(future.isDone());
1468        } finally {
1469            joinPool(e);
1450          }
1451      }
1452  
# Line 1474 | Line 1454 | public class ThreadPoolExecutorTest exte
1454       * completed submit of (runnable, result) returns result
1455       */
1456      public void testSubmitRunnable2() throws Exception {
1457 <        ExecutorService e =
1457 >        final ExecutorService e =
1458              new ThreadPoolExecutor(2, 2,
1459                                     LONG_DELAY_MS, MILLISECONDS,
1460                                     new ArrayBlockingQueue<Runnable>(10));
1461 <        try {
1461 >        try (PoolCleaner cleaner = cleaner(e)) {
1462              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1463              String result = future.get();
1464              assertSame(TEST_STRING, result);
1485        } finally {
1486            joinPool(e);
1465          }
1466      }
1467  
# Line 1491 | Line 1469 | public class ThreadPoolExecutorTest exte
1469       * invokeAny(null) throws NPE
1470       */
1471      public void testInvokeAny1() throws Exception {
1472 <        ExecutorService e =
1472 >        final ExecutorService e =
1473              new ThreadPoolExecutor(2, 2,
1474                                     LONG_DELAY_MS, MILLISECONDS,
1475                                     new ArrayBlockingQueue<Runnable>(10));
1476 <        try {
1477 <            e.invokeAny(null);
1478 <            shouldThrow();
1479 <        } catch (NullPointerException success) {
1480 <        } finally {
1503 <            joinPool(e);
1476 >        try (PoolCleaner cleaner = cleaner(e)) {
1477 >            try {
1478 >                e.invokeAny(null);
1479 >                shouldThrow();
1480 >            } catch (NullPointerException success) {}
1481          }
1482      }
1483  
# Line 1508 | Line 1485 | public class ThreadPoolExecutorTest exte
1485       * invokeAny(empty collection) throws IAE
1486       */
1487      public void testInvokeAny2() throws Exception {
1488 <        ExecutorService e =
1488 >        final ExecutorService e =
1489              new ThreadPoolExecutor(2, 2,
1490                                     LONG_DELAY_MS, MILLISECONDS,
1491                                     new ArrayBlockingQueue<Runnable>(10));
1492 <        try {
1493 <            e.invokeAny(new ArrayList<Callable<String>>());
1494 <            shouldThrow();
1495 <        } catch (IllegalArgumentException success) {
1496 <        } finally {
1520 <            joinPool(e);
1492 >        try (PoolCleaner cleaner = cleaner(e)) {
1493 >            try {
1494 >                e.invokeAny(new ArrayList<Callable<String>>());
1495 >                shouldThrow();
1496 >            } catch (IllegalArgumentException success) {}
1497          }
1498      }
1499  
# Line 1530 | Line 1506 | public class ThreadPoolExecutorTest exte
1506              new ThreadPoolExecutor(2, 2,
1507                                     LONG_DELAY_MS, MILLISECONDS,
1508                                     new ArrayBlockingQueue<Runnable>(10));
1509 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1510 <        l.add(latchAwaitingStringTask(latch));
1511 <        l.add(null);
1512 <        try {
1513 <            e.invokeAny(l);
1514 <            shouldThrow();
1515 <        } catch (NullPointerException success) {
1516 <        } finally {
1509 >        try (PoolCleaner cleaner = cleaner(e)) {
1510 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1511 >            l.add(latchAwaitingStringTask(latch));
1512 >            l.add(null);
1513 >            try {
1514 >                e.invokeAny(l);
1515 >                shouldThrow();
1516 >            } catch (NullPointerException success) {}
1517              latch.countDown();
1542            joinPool(e);
1518          }
1519      }
1520  
# Line 1547 | Line 1522 | public class ThreadPoolExecutorTest exte
1522       * invokeAny(c) throws ExecutionException if no task completes
1523       */
1524      public void testInvokeAny4() throws Exception {
1525 <        ExecutorService e =
1525 >        final ExecutorService e =
1526              new ThreadPoolExecutor(2, 2,
1527                                     LONG_DELAY_MS, MILLISECONDS,
1528                                     new ArrayBlockingQueue<Runnable>(10));
1529 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1530 <        l.add(new NPETask());
1531 <        try {
1532 <            e.invokeAny(l);
1533 <            shouldThrow();
1534 <        } catch (ExecutionException success) {
1535 <            assertTrue(success.getCause() instanceof NullPointerException);
1536 <        } finally {
1537 <            joinPool(e);
1529 >        try (PoolCleaner cleaner = cleaner(e)) {
1530 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1531 >            l.add(new NPETask());
1532 >            try {
1533 >                e.invokeAny(l);
1534 >                shouldThrow();
1535 >            } catch (ExecutionException success) {
1536 >                assertTrue(success.getCause() instanceof NullPointerException);
1537 >            }
1538          }
1539      }
1540  
# Line 1567 | Line 1542 | public class ThreadPoolExecutorTest exte
1542       * invokeAny(c) returns result of some task
1543       */
1544      public void testInvokeAny5() throws Exception {
1545 <        ExecutorService e =
1545 >        final ExecutorService e =
1546              new ThreadPoolExecutor(2, 2,
1547                                     LONG_DELAY_MS, MILLISECONDS,
1548                                     new ArrayBlockingQueue<Runnable>(10));
1549 <        try {
1549 >        try (PoolCleaner cleaner = cleaner(e)) {
1550              List<Callable<String>> l = new ArrayList<Callable<String>>();
1551              l.add(new StringTask());
1552              l.add(new StringTask());
1553              String result = e.invokeAny(l);
1554              assertSame(TEST_STRING, result);
1580        } finally {
1581            joinPool(e);
1555          }
1556      }
1557  
# Line 1586 | Line 1559 | public class ThreadPoolExecutorTest exte
1559       * invokeAll(null) throws NPE
1560       */
1561      public void testInvokeAll1() throws Exception {
1562 <        ExecutorService e =
1562 >        final ExecutorService e =
1563              new ThreadPoolExecutor(2, 2,
1564                                     LONG_DELAY_MS, MILLISECONDS,
1565                                     new ArrayBlockingQueue<Runnable>(10));
1566 <        try {
1567 <            e.invokeAll(null);
1568 <            shouldThrow();
1569 <        } catch (NullPointerException success) {
1570 <        } finally {
1598 <            joinPool(e);
1566 >        try (PoolCleaner cleaner = cleaner(e)) {
1567 >            try {
1568 >                e.invokeAll(null);
1569 >                shouldThrow();
1570 >            } catch (NullPointerException success) {}
1571          }
1572      }
1573  
# Line 1603 | Line 1575 | public class ThreadPoolExecutorTest exte
1575       * invokeAll(empty collection) returns empty collection
1576       */
1577      public void testInvokeAll2() throws InterruptedException {
1578 <        ExecutorService e =
1578 >        final ExecutorService e =
1579              new ThreadPoolExecutor(2, 2,
1580                                     LONG_DELAY_MS, MILLISECONDS,
1581                                     new ArrayBlockingQueue<Runnable>(10));
1582 <        try {
1582 >        try (PoolCleaner cleaner = cleaner(e)) {
1583              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1584              assertTrue(r.isEmpty());
1613        } finally {
1614            joinPool(e);
1585          }
1586      }
1587  
# Line 1619 | Line 1589 | public class ThreadPoolExecutorTest exte
1589       * invokeAll(c) throws NPE if c has null elements
1590       */
1591      public void testInvokeAll3() throws Exception {
1592 <        ExecutorService e =
1592 >        final ExecutorService e =
1593              new ThreadPoolExecutor(2, 2,
1594                                     LONG_DELAY_MS, MILLISECONDS,
1595                                     new ArrayBlockingQueue<Runnable>(10));
1596 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1597 <        l.add(new StringTask());
1598 <        l.add(null);
1599 <        try {
1600 <            e.invokeAll(l);
1601 <            shouldThrow();
1602 <        } catch (NullPointerException success) {
1603 <        } finally {
1634 <            joinPool(e);
1596 >        try (PoolCleaner cleaner = cleaner(e)) {
1597 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1598 >            l.add(new StringTask());
1599 >            l.add(null);
1600 >            try {
1601 >                e.invokeAll(l);
1602 >                shouldThrow();
1603 >            } catch (NullPointerException success) {}
1604          }
1605      }
1606  
# Line 1639 | Line 1608 | public class ThreadPoolExecutorTest exte
1608       * get of element of invokeAll(c) throws exception on failed task
1609       */
1610      public void testInvokeAll4() throws Exception {
1611 <        ExecutorService e =
1611 >        final ExecutorService e =
1612              new ThreadPoolExecutor(2, 2,
1613                                     LONG_DELAY_MS, MILLISECONDS,
1614                                     new ArrayBlockingQueue<Runnable>(10));
1615 <        try {
1615 >        try (PoolCleaner cleaner = cleaner(e)) {
1616              List<Callable<String>> l = new ArrayList<Callable<String>>();
1617              l.add(new NPETask());
1618              List<Future<String>> futures = e.invokeAll(l);
# Line 1654 | Line 1623 | public class ThreadPoolExecutorTest exte
1623              } catch (ExecutionException success) {
1624                  assertTrue(success.getCause() instanceof NullPointerException);
1625              }
1657        } finally {
1658            joinPool(e);
1626          }
1627      }
1628  
# Line 1663 | Line 1630 | public class ThreadPoolExecutorTest exte
1630       * invokeAll(c) returns results of all completed tasks
1631       */
1632      public void testInvokeAll5() throws Exception {
1633 <        ExecutorService e =
1633 >        final ExecutorService e =
1634              new ThreadPoolExecutor(2, 2,
1635                                     LONG_DELAY_MS, MILLISECONDS,
1636                                     new ArrayBlockingQueue<Runnable>(10));
1637 <        try {
1637 >        try (PoolCleaner cleaner = cleaner(e)) {
1638              List<Callable<String>> l = new ArrayList<Callable<String>>();
1639              l.add(new StringTask());
1640              l.add(new StringTask());
# Line 1675 | Line 1642 | public class ThreadPoolExecutorTest exte
1642              assertEquals(2, futures.size());
1643              for (Future<String> future : futures)
1644                  assertSame(TEST_STRING, future.get());
1678        } finally {
1679            joinPool(e);
1645          }
1646      }
1647  
# Line 1684 | Line 1649 | public class ThreadPoolExecutorTest exte
1649       * timed invokeAny(null) throws NPE
1650       */
1651      public void testTimedInvokeAny1() throws Exception {
1652 <        ExecutorService e =
1652 >        final ExecutorService e =
1653              new ThreadPoolExecutor(2, 2,
1654                                     LONG_DELAY_MS, MILLISECONDS,
1655                                     new ArrayBlockingQueue<Runnable>(10));
1656 <        try {
1657 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1658 <            shouldThrow();
1659 <        } catch (NullPointerException success) {
1660 <        } finally {
1696 <            joinPool(e);
1656 >        try (PoolCleaner cleaner = cleaner(e)) {
1657 >            try {
1658 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1659 >                shouldThrow();
1660 >            } catch (NullPointerException success) {}
1661          }
1662      }
1663  
# Line 1701 | Line 1665 | public class ThreadPoolExecutorTest exte
1665       * timed invokeAny(,,null) throws NPE
1666       */
1667      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1668 <        ExecutorService e =
1668 >        final ExecutorService e =
1669              new ThreadPoolExecutor(2, 2,
1670                                     LONG_DELAY_MS, MILLISECONDS,
1671                                     new ArrayBlockingQueue<Runnable>(10));
1672 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1673 <        l.add(new StringTask());
1674 <        try {
1675 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1676 <            shouldThrow();
1677 <        } catch (NullPointerException success) {
1678 <        } finally {
1715 <            joinPool(e);
1672 >        try (PoolCleaner cleaner = cleaner(e)) {
1673 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1674 >            l.add(new StringTask());
1675 >            try {
1676 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1677 >                shouldThrow();
1678 >            } catch (NullPointerException success) {}
1679          }
1680      }
1681  
# Line 1720 | Line 1683 | public class ThreadPoolExecutorTest exte
1683       * timed invokeAny(empty collection) throws IAE
1684       */
1685      public void testTimedInvokeAny2() throws Exception {
1686 <        ExecutorService e =
1686 >        final ExecutorService e =
1687              new ThreadPoolExecutor(2, 2,
1688                                     LONG_DELAY_MS, MILLISECONDS,
1689                                     new ArrayBlockingQueue<Runnable>(10));
1690 <        try {
1691 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1692 <            shouldThrow();
1693 <        } catch (IllegalArgumentException success) {
1694 <        } finally {
1695 <            joinPool(e);
1690 >        try (PoolCleaner cleaner = cleaner(e)) {
1691 >            try {
1692 >                e.invokeAny(new ArrayList<Callable<String>>(),
1693 >                            MEDIUM_DELAY_MS, MILLISECONDS);
1694 >                shouldThrow();
1695 >            } catch (IllegalArgumentException success) {}
1696          }
1697      }
1698  
# Line 1742 | Line 1705 | public class ThreadPoolExecutorTest exte
1705              new ThreadPoolExecutor(2, 2,
1706                                     LONG_DELAY_MS, MILLISECONDS,
1707                                     new ArrayBlockingQueue<Runnable>(10));
1708 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1709 <        l.add(latchAwaitingStringTask(latch));
1710 <        l.add(null);
1711 <        try {
1712 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1713 <            shouldThrow();
1714 <        } catch (NullPointerException success) {
1715 <        } finally {
1708 >        try (PoolCleaner cleaner = cleaner(e)) {
1709 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1710 >            l.add(latchAwaitingStringTask(latch));
1711 >            l.add(null);
1712 >            try {
1713 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1714 >                shouldThrow();
1715 >            } catch (NullPointerException success) {}
1716              latch.countDown();
1754            joinPool(e);
1717          }
1718      }
1719  
# Line 1759 | Line 1721 | public class ThreadPoolExecutorTest exte
1721       * timed invokeAny(c) throws ExecutionException if no task completes
1722       */
1723      public void testTimedInvokeAny4() throws Exception {
1724 <        ExecutorService e =
1724 >        final ExecutorService e =
1725              new ThreadPoolExecutor(2, 2,
1726                                     LONG_DELAY_MS, MILLISECONDS,
1727                                     new ArrayBlockingQueue<Runnable>(10));
1728 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1729 <        l.add(new NPETask());
1730 <        try {
1731 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1732 <            shouldThrow();
1733 <        } catch (ExecutionException success) {
1734 <            assertTrue(success.getCause() instanceof NullPointerException);
1735 <        } finally {
1736 <            joinPool(e);
1728 >        try (PoolCleaner cleaner = cleaner(e)) {
1729 >            long startTime = System.nanoTime();
1730 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1731 >            l.add(new NPETask());
1732 >            try {
1733 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1734 >                shouldThrow();
1735 >            } catch (ExecutionException success) {
1736 >                assertTrue(success.getCause() instanceof NullPointerException);
1737 >            }
1738 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1739          }
1740      }
1741  
# Line 1779 | Line 1743 | public class ThreadPoolExecutorTest exte
1743       * timed invokeAny(c) returns result of some task
1744       */
1745      public void testTimedInvokeAny5() throws Exception {
1746 <        ExecutorService e =
1746 >        final ExecutorService e =
1747              new ThreadPoolExecutor(2, 2,
1748                                     LONG_DELAY_MS, MILLISECONDS,
1749                                     new ArrayBlockingQueue<Runnable>(10));
1750 <        try {
1750 >        try (PoolCleaner cleaner = cleaner(e)) {
1751 >            long startTime = System.nanoTime();
1752              List<Callable<String>> l = new ArrayList<Callable<String>>();
1753              l.add(new StringTask());
1754              l.add(new StringTask());
1755 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1755 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1756              assertSame(TEST_STRING, result);
1757 <        } finally {
1793 <            joinPool(e);
1757 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1758          }
1759      }
1760  
# Line 1798 | Line 1762 | public class ThreadPoolExecutorTest exte
1762       * timed invokeAll(null) throws NPE
1763       */
1764      public void testTimedInvokeAll1() throws Exception {
1765 <        ExecutorService e =
1765 >        final ExecutorService e =
1766              new ThreadPoolExecutor(2, 2,
1767                                     LONG_DELAY_MS, MILLISECONDS,
1768                                     new ArrayBlockingQueue<Runnable>(10));
1769 <        try {
1770 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1771 <            shouldThrow();
1772 <        } catch (NullPointerException success) {
1773 <        } finally {
1810 <            joinPool(e);
1769 >        try (PoolCleaner cleaner = cleaner(e)) {
1770 >            try {
1771 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1772 >                shouldThrow();
1773 >            } catch (NullPointerException success) {}
1774          }
1775      }
1776  
# Line 1815 | Line 1778 | public class ThreadPoolExecutorTest exte
1778       * timed invokeAll(,,null) throws NPE
1779       */
1780      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1781 <        ExecutorService e =
1781 >        final ExecutorService e =
1782              new ThreadPoolExecutor(2, 2,
1783                                     LONG_DELAY_MS, MILLISECONDS,
1784                                     new ArrayBlockingQueue<Runnable>(10));
1785 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1786 <        l.add(new StringTask());
1787 <        try {
1788 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1789 <            shouldThrow();
1790 <        } catch (NullPointerException success) {
1791 <        } finally {
1829 <            joinPool(e);
1785 >        try (PoolCleaner cleaner = cleaner(e)) {
1786 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1787 >            l.add(new StringTask());
1788 >            try {
1789 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1790 >                shouldThrow();
1791 >            } catch (NullPointerException success) {}
1792          }
1793      }
1794  
# Line 1834 | Line 1796 | public class ThreadPoolExecutorTest exte
1796       * timed invokeAll(empty collection) returns empty collection
1797       */
1798      public void testTimedInvokeAll2() throws InterruptedException {
1799 <        ExecutorService e =
1799 >        final ExecutorService e =
1800              new ThreadPoolExecutor(2, 2,
1801                                     LONG_DELAY_MS, MILLISECONDS,
1802                                     new ArrayBlockingQueue<Runnable>(10));
1803 <        try {
1804 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1803 >        try (PoolCleaner cleaner = cleaner(e)) {
1804 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1805 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1806              assertTrue(r.isEmpty());
1844        } finally {
1845            joinPool(e);
1807          }
1808      }
1809  
# Line 1850 | Line 1811 | public class ThreadPoolExecutorTest exte
1811       * timed invokeAll(c) throws NPE if c has null elements
1812       */
1813      public void testTimedInvokeAll3() throws Exception {
1814 <        ExecutorService e =
1814 >        final ExecutorService e =
1815              new ThreadPoolExecutor(2, 2,
1816                                     LONG_DELAY_MS, MILLISECONDS,
1817                                     new ArrayBlockingQueue<Runnable>(10));
1818 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1819 <        l.add(new StringTask());
1820 <        l.add(null);
1821 <        try {
1822 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1823 <            shouldThrow();
1824 <        } catch (NullPointerException success) {
1825 <        } finally {
1865 <            joinPool(e);
1818 >        try (PoolCleaner cleaner = cleaner(e)) {
1819 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1820 >            l.add(new StringTask());
1821 >            l.add(null);
1822 >            try {
1823 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1824 >                shouldThrow();
1825 >            } catch (NullPointerException success) {}
1826          }
1827      }
1828  
# Line 1870 | Line 1830 | public class ThreadPoolExecutorTest exte
1830       * get of element of invokeAll(c) throws exception on failed task
1831       */
1832      public void testTimedInvokeAll4() throws Exception {
1833 <        ExecutorService e =
1833 >        final ExecutorService e =
1834              new ThreadPoolExecutor(2, 2,
1835                                     LONG_DELAY_MS, MILLISECONDS,
1836                                     new ArrayBlockingQueue<Runnable>(10));
1837 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1838 <        l.add(new NPETask());
1839 <        List<Future<String>> futures =
1840 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1841 <        assertEquals(1, futures.size());
1842 <        try {
1843 <            futures.get(0).get();
1844 <            shouldThrow();
1845 <        } catch (ExecutionException success) {
1846 <            assertTrue(success.getCause() instanceof NullPointerException);
1847 <        } finally {
1848 <            joinPool(e);
1837 >        try (PoolCleaner cleaner = cleaner(e)) {
1838 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1839 >            l.add(new NPETask());
1840 >            List<Future<String>> futures =
1841 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1842 >            assertEquals(1, futures.size());
1843 >            try {
1844 >                futures.get(0).get();
1845 >                shouldThrow();
1846 >            } catch (ExecutionException success) {
1847 >                assertTrue(success.getCause() instanceof NullPointerException);
1848 >            }
1849          }
1850      }
1851  
# Line 1893 | Line 1853 | public class ThreadPoolExecutorTest exte
1853       * timed invokeAll(c) returns results of all completed tasks
1854       */
1855      public void testTimedInvokeAll5() throws Exception {
1856 <        ExecutorService e =
1856 >        final ExecutorService e =
1857              new ThreadPoolExecutor(2, 2,
1858                                     LONG_DELAY_MS, MILLISECONDS,
1859                                     new ArrayBlockingQueue<Runnable>(10));
1860 <        try {
1860 >        try (PoolCleaner cleaner = cleaner(e)) {
1861              List<Callable<String>> l = new ArrayList<Callable<String>>();
1862              l.add(new StringTask());
1863              l.add(new StringTask());
# Line 1906 | Line 1866 | public class ThreadPoolExecutorTest exte
1866              assertEquals(2, futures.size());
1867              for (Future<String> future : futures)
1868                  assertSame(TEST_STRING, future.get());
1909        } finally {
1910            joinPool(e);
1869          }
1870      }
1871  
# Line 1915 | Line 1873 | public class ThreadPoolExecutorTest exte
1873       * timed invokeAll(c) cancels tasks not completed by timeout
1874       */
1875      public void testTimedInvokeAll6() throws Exception {
1876 <        ExecutorService e =
1877 <            new ThreadPoolExecutor(2, 2,
1878 <                                   LONG_DELAY_MS, MILLISECONDS,
1879 <                                   new ArrayBlockingQueue<Runnable>(10));
1880 <        try {
1881 <            for (long timeout = timeoutMillis();;) {
1876 >        for (long timeout = timeoutMillis();;) {
1877 >            final CountDownLatch done = new CountDownLatch(1);
1878 >            final Callable<String> waiter = new CheckedCallable<String>() {
1879 >                public String realCall() {
1880 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1881 >                    catch (InterruptedException ok) {}
1882 >                    return "1"; }};
1883 >            final ExecutorService p =
1884 >                new ThreadPoolExecutor(2, 2,
1885 >                                       LONG_DELAY_MS, MILLISECONDS,
1886 >                                       new ArrayBlockingQueue<Runnable>(10));
1887 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1888                  List<Callable<String>> tasks = new ArrayList<>();
1889                  tasks.add(new StringTask("0"));
1890 <                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1890 >                tasks.add(waiter);
1891                  tasks.add(new StringTask("2"));
1892                  long startTime = System.nanoTime();
1893                  List<Future<String>> futures =
1894 <                    e.invokeAll(tasks, timeout, MILLISECONDS);
1894 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1895                  assertEquals(tasks.size(), futures.size());
1896                  assertTrue(millisElapsedSince(startTime) >= timeout);
1897                  for (Future future : futures)
# Line 1943 | Line 1907 | public class ThreadPoolExecutorTest exte
1907                          fail("expected exactly one task to be cancelled");
1908                  }
1909              }
1946        } finally {
1947            joinPool(e);
1910          }
1911      }
1912  
# Line 1958 | Line 1920 | public class ThreadPoolExecutorTest exte
1920                                     LONG_DELAY_MS, MILLISECONDS,
1921                                     new LinkedBlockingQueue<Runnable>(),
1922                                     new FailingThreadFactory());
1923 <        try {
1923 >        try (PoolCleaner cleaner = cleaner(e)) {
1924              final int TASKS = 100;
1925              final CountDownLatch done = new CountDownLatch(TASKS);
1926              for (int k = 0; k < TASKS; ++k)
# Line 1967 | Line 1929 | public class ThreadPoolExecutorTest exte
1929                          done.countDown();
1930                      }});
1931              assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1970        } finally {
1971            joinPool(e);
1932          }
1933      }
1934  
# Line 1980 | Line 1940 | public class ThreadPoolExecutorTest exte
1940              new ThreadPoolExecutor(2, 2,
1941                                     1000, MILLISECONDS,
1942                                     new ArrayBlockingQueue<Runnable>(10));
1943 <        assertFalse(p.allowsCoreThreadTimeOut());
1944 <        joinPool(p);
1943 >        try (PoolCleaner cleaner = cleaner(p)) {
1944 >            assertFalse(p.allowsCoreThreadTimeOut());
1945 >        }
1946      }
1947  
1948      /**
# Line 1993 | Line 1954 | public class ThreadPoolExecutorTest exte
1954              new ThreadPoolExecutor(2, 10,
1955                                     keepAliveTime, MILLISECONDS,
1956                                     new ArrayBlockingQueue<Runnable>(10));
1957 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1958 <        try {
1957 >        try (PoolCleaner cleaner = cleaner(p)) {
1958 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1959              p.allowCoreThreadTimeOut(true);
1960              p.execute(new CheckedRunnable() {
1961                  public void realRun() {
# Line 2009 | Line 1970 | public class ThreadPoolExecutorTest exte
1970                  Thread.yield();
1971              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1972              assertEquals(0, p.getPoolSize());
2012        } finally {
2013            joinPool(p);
1973          }
1974      }
1975  
# Line 2023 | Line 1982 | public class ThreadPoolExecutorTest exte
1982              new ThreadPoolExecutor(2, 10,
1983                                     keepAliveTime, MILLISECONDS,
1984                                     new ArrayBlockingQueue<Runnable>(10));
1985 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1986 <        try {
1985 >        try (PoolCleaner cleaner = cleaner(p)) {
1986 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1987              p.allowCoreThreadTimeOut(false);
1988              p.execute(new CheckedRunnable() {
1989                  public void realRun() throws InterruptedException {
# Line 2033 | Line 1992 | public class ThreadPoolExecutorTest exte
1992                  }});
1993              delay(2 * keepAliveTime);
1994              assertTrue(p.getPoolSize() >= 1);
2036        } finally {
2037            joinPool(p);
1995          }
1996      }
1997  
# Line 2053 | Line 2010 | public class ThreadPoolExecutorTest exte
2010              new ThreadPoolExecutor(1, 30,
2011                                     60, SECONDS,
2012                                     new ArrayBlockingQueue(30));
2013 <        try {
2013 >        try (PoolCleaner cleaner = cleaner(p)) {
2014              for (int i = 0; i < nTasks; ++i) {
2015                  for (;;) {
2016                      try {
# Line 2065 | Line 2022 | public class ThreadPoolExecutorTest exte
2022              }
2023              // enough time to run all tasks
2024              assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
2068        } finally {
2069            joinPool(p);
2025          }
2026      }
2027  
# Line 2074 | Line 2029 | public class ThreadPoolExecutorTest exte
2029       * get(cancelled task) throws CancellationException
2030       */
2031      public void testGet_cancelled() throws Exception {
2032 +        final CountDownLatch done = new CountDownLatch(1);
2033          final ExecutorService e =
2034              new ThreadPoolExecutor(1, 1,
2035                                     LONG_DELAY_MS, MILLISECONDS,
2036                                     new LinkedBlockingQueue<Runnable>());
2037 <        try {
2037 >        try (PoolCleaner cleaner = cleaner(e, done)) {
2038              final CountDownLatch blockerStarted = new CountDownLatch(1);
2083            final CountDownLatch done = new CountDownLatch(1);
2039              final List<Future<?>> futures = new ArrayList<>();
2040              for (int i = 0; i < 2; i++) {
2041                  Runnable r = new CheckedRunnable() { public void realRun()
# Line 2090 | Line 2045 | public class ThreadPoolExecutorTest exte
2045                  }};
2046                  futures.add(e.submit(r));
2047              }
2048 <            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2048 >            await(blockerStarted);
2049              for (Future<?> future : futures) future.cancel(false);
2050              for (Future<?> future : futures) {
2051                  try {
# Line 2104 | Line 2059 | public class ThreadPoolExecutorTest exte
2059                  assertTrue(future.isCancelled());
2060                  assertTrue(future.isDone());
2061              }
2107            done.countDown();
2108        } finally {
2109            joinPool(e);
2062          }
2063      }
2064  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines