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.72 by jsr166, Sun Oct 4 02:38:45 2015 UTC vs.
Revision 1.84 by jsr166, Mon Oct 5 21:42:48 2015 UTC

# 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 =
301 >        final ThreadPoolExecutor p =
302              new CustomTPE(2, 6,
303                            LONG_DELAY_MS, MILLISECONDS,
304                            new ArrayBlockingQueue<Runnable>(10));
# Line 545 | Line 545 | public class ThreadPoolExecutorSubclassT
545       * getTaskCount increases, but doesn't overestimate, when tasks submitted
546       */
547      public void testGetTaskCount() throws InterruptedException {
548 +        final int TASKS = 3;
549 +        final CountDownLatch done = new CountDownLatch(1);
550          final ThreadPoolExecutor p =
551              new CustomTPE(1, 1,
552                            LONG_DELAY_MS, MILLISECONDS,
553                            new ArrayBlockingQueue<Runnable>(10));
554 <        try (PoolCleaner cleaner = cleaner(p)) {
554 >        try (PoolCleaner cleaner = cleaner(p, done)) {
555              final CountDownLatch threadStarted = new CountDownLatch(1);
554            final CountDownLatch done = new CountDownLatch(1);
556              assertEquals(0, p.getTaskCount());
557 +            assertEquals(0, p.getCompletedTaskCount());
558              p.execute(new CheckedRunnable() {
559                  public void realRun() throws InterruptedException {
560                      threadStarted.countDown();
559                    assertEquals(1, p.getTaskCount());
561                      done.await();
562                  }});
563 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
563 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
564              assertEquals(1, p.getTaskCount());
565 <            done.countDown();
565 >            assertEquals(0, p.getCompletedTaskCount());
566 >            for (int i = 0; i < TASKS; i++) {
567 >                assertEquals(1 + i, p.getTaskCount());
568 >                p.execute(new CheckedRunnable() {
569 >                    public void realRun() throws InterruptedException {
570 >                        threadStarted.countDown();
571 >                        assertEquals(1 + TASKS, p.getTaskCount());
572 >                        done.await();
573 >                    }});
574 >            }
575 >            assertEquals(1 + TASKS, p.getTaskCount());
576 >            assertEquals(0, p.getCompletedTaskCount());
577          }
578 +        assertEquals(1 + TASKS, p.getTaskCount());
579 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
580      }
581  
582      /**
# Line 752 | Line 766 | public class ThreadPoolExecutorSubclassT
766          final int poolSize = 2;
767          final int count = 5;
768          final AtomicInteger ran = new AtomicInteger(0);
769 <        ThreadPoolExecutor p =
770 <            new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
769 >        final ThreadPoolExecutor p =
770 >            new CustomTPE(poolSize, poolSize,
771 >                          LONG_DELAY_MS, MILLISECONDS,
772                            new ArrayBlockingQueue<Runnable>(10));
773 <        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
773 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
774          Runnable waiter = new CheckedRunnable() { public void realRun() {
775              threadsStarted.countDown();
776              try {
# Line 1124 | Line 1139 | public class ThreadPoolExecutorSubclassT
1139       * execute throws RejectedExecutionException if saturated.
1140       */
1141      public void testSaturatedExecute() {
1142 <        ThreadPoolExecutor p =
1142 >        final ThreadPoolExecutor p =
1143              new CustomTPE(1, 1,
1144                            LONG_DELAY_MS, MILLISECONDS,
1145                            new ArrayBlockingQueue<Runnable>(1));
1146 <        final CountDownLatch done = new CountDownLatch(1);
1147 <        try {
1146 >        try (PoolCleaner cleaner = cleaner(p)) {
1147 >            final CountDownLatch done = new CountDownLatch(1);
1148              Runnable task = new CheckedRunnable() {
1149                  public void realRun() throws InterruptedException {
1150                      done.await();
# Line 1143 | Line 1158 | public class ThreadPoolExecutorSubclassT
1158                  } catch (RejectedExecutionException success) {}
1159                  assertTrue(p.getTaskCount() <= 2);
1160              }
1146        } finally {
1161              done.countDown();
1148            joinPool(p);
1162          }
1163      }
1164  
# Line 1153 | Line 1166 | public class ThreadPoolExecutorSubclassT
1166       * executor using CallerRunsPolicy runs task if saturated.
1167       */
1168      public void testSaturatedExecute2() {
1169 <        RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1170 <        ThreadPoolExecutor p = new CustomTPE(1, 1,
1171 <                                             LONG_DELAY_MS, MILLISECONDS,
1172 <                                             new ArrayBlockingQueue<Runnable>(1),
1173 <                                             h);
1174 <        try {
1169 >        final ThreadPoolExecutor p =
1170 >            new CustomTPE(1, 1,
1171 >                          LONG_DELAY_MS, MILLISECONDS,
1172 >                          new ArrayBlockingQueue<Runnable>(1),
1173 >                          new CustomTPE.CallerRunsPolicy());
1174 >        try (PoolCleaner cleaner = cleaner(p)) {
1175 >            final CountDownLatch done = new CountDownLatch(1);
1176 >            Runnable blocker = new CheckedRunnable() {
1177 >                public void realRun() throws InterruptedException {
1178 >                    done.await();
1179 >                }};
1180 >            p.execute(blocker);
1181              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1182 <            for (int i = 0; i < tasks.length; ++i)
1182 >            for (int i = 0; i < tasks.length; i++)
1183                  tasks[i] = new TrackedNoOpRunnable();
1184 <            TrackedLongRunnable mr = new TrackedLongRunnable();
1166 <            p.execute(mr);
1167 <            for (int i = 0; i < tasks.length; ++i)
1184 >            for (int i = 0; i < tasks.length; i++)
1185                  p.execute(tasks[i]);
1186 <            for (int i = 1; i < tasks.length; ++i)
1186 >            for (int i = 1; i < tasks.length; i++)
1187                  assertTrue(tasks[i].done);
1188 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1189 <        } finally {
1173 <            joinPool(p);
1188 >            assertFalse(tasks[0].done); // waiting in queue
1189 >            done.countDown();
1190          }
1191      }
1192  
# Line 1178 | Line 1194 | public class ThreadPoolExecutorSubclassT
1194       * executor using DiscardPolicy drops task if saturated.
1195       */
1196      public void testSaturatedExecute3() {
1197 <        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1198 <        ThreadPoolExecutor p =
1197 >        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1198 >        for (int i = 0; i < tasks.length; ++i)
1199 >            tasks[i] = new TrackedNoOpRunnable();
1200 >        final ThreadPoolExecutor p =
1201              new CustomTPE(1, 1,
1202                            LONG_DELAY_MS, MILLISECONDS,
1203                            new ArrayBlockingQueue<Runnable>(1),
1204 <                          h);
1205 <        try {
1206 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1207 <            for (int i = 0; i < tasks.length; ++i)
1208 <                tasks[i] = new TrackedNoOpRunnable();
1191 <            p.execute(new TrackedLongRunnable());
1204 >                          new CustomTPE.DiscardPolicy());
1205 >        try (PoolCleaner cleaner = cleaner(p)) {
1206 >            final CountDownLatch done = new CountDownLatch(1);
1207 >            p.execute(awaiter(done));
1208 >
1209              for (TrackedNoOpRunnable task : tasks)
1210                  p.execute(task);
1211 <            for (TrackedNoOpRunnable task : tasks)
1212 <                assertFalse(task.done);
1213 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1197 <        } finally {
1198 <            joinPool(p);
1211 >            for (int i = 1; i < tasks.length; i++)
1212 >                assertFalse(tasks[i].done);
1213 >            done.countDown();
1214          }
1215 +        for (int i = 1; i < tasks.length; i++)
1216 +            assertFalse(tasks[i].done);
1217 +        assertTrue(tasks[0].done); // was waiting in queue
1218      }
1219  
1220      /**
1221       * executor using DiscardOldestPolicy drops oldest task if saturated.
1222       */
1223      public void testSaturatedExecute4() {
1224 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1225 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1226 <        try {
1227 <            p.execute(new TrackedLongRunnable());
1228 <            TrackedLongRunnable r2 = new TrackedLongRunnable();
1224 >        final CountDownLatch done = new CountDownLatch(1);
1225 >        LatchAwaiter r1 = awaiter(done);
1226 >        LatchAwaiter r2 = awaiter(done);
1227 >        LatchAwaiter r3 = awaiter(done);
1228 >        final ThreadPoolExecutor p =
1229 >            new CustomTPE(1, 1,
1230 >                          LONG_DELAY_MS, MILLISECONDS,
1231 >                          new ArrayBlockingQueue<Runnable>(1),
1232 >                          new CustomTPE.DiscardOldestPolicy());
1233 >        try (PoolCleaner cleaner = cleaner(p)) {
1234 >            assertEquals(LatchAwaiter.NEW, r1.state);
1235 >            assertEquals(LatchAwaiter.NEW, r2.state);
1236 >            assertEquals(LatchAwaiter.NEW, r3.state);
1237 >            p.execute(r1);
1238              p.execute(r2);
1239              assertTrue(p.getQueue().contains(r2));
1213            TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1240              p.execute(r3);
1241              assertFalse(p.getQueue().contains(r2));
1242              assertTrue(p.getQueue().contains(r3));
1243 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1218 <        } finally {
1219 <            joinPool(p);
1243 >            done.countDown();
1244          }
1245 +        assertEquals(LatchAwaiter.DONE, r1.state);
1246 +        assertEquals(LatchAwaiter.NEW, r2.state);
1247 +        assertEquals(LatchAwaiter.DONE, r3.state);
1248      }
1249  
1250      /**
1251       * execute throws RejectedExecutionException if shutdown
1252       */
1253      public void testRejectedExecutionExceptionOnShutdown() {
1254 <        ThreadPoolExecutor p =
1255 <            new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1254 >        final ThreadPoolExecutor p =
1255 >            new CustomTPE(1, 1,
1256 >                          LONG_DELAY_MS, MILLISECONDS,
1257 >                          new ArrayBlockingQueue<Runnable>(1));
1258          try { p.shutdown(); } catch (SecurityException ok) { return; }
1259 <        try {
1260 <            p.execute(new NoOpRunnable());
1261 <            shouldThrow();
1262 <        } catch (RejectedExecutionException success) {}
1263 <
1264 <        joinPool(p);
1259 >        try (PoolCleaner cleaner = cleaner(p)) {
1260 >            try {
1261 >                p.execute(new NoOpRunnable());
1262 >                shouldThrow();
1263 >            } catch (RejectedExecutionException success) {}
1264 >        }
1265      }
1266  
1267      /**
1268       * execute using CallerRunsPolicy drops task on shutdown
1269       */
1270      public void testCallerRunsOnShutdown() {
1271 <        RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1272 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1273 <
1271 >        final ThreadPoolExecutor p =
1272 >            new CustomTPE(1, 1,
1273 >                          LONG_DELAY_MS, MILLISECONDS,
1274 >                          new ArrayBlockingQueue<Runnable>(1),
1275 >                          new CustomTPE.CallerRunsPolicy());
1276          try { p.shutdown(); } catch (SecurityException ok) { return; }
1277 <        try {
1277 >        try (PoolCleaner cleaner = cleaner(p)) {
1278              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1279              p.execute(r);
1280              assertFalse(r.done);
1250        } finally {
1251            joinPool(p);
1281          }
1282      }
1283  
# Line 1256 | Line 1285 | public class ThreadPoolExecutorSubclassT
1285       * execute using DiscardPolicy drops task on shutdown
1286       */
1287      public void testDiscardOnShutdown() {
1288 <        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1289 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1290 <
1288 >        final ThreadPoolExecutor p =
1289 >            new CustomTPE(1, 1,
1290 >                          LONG_DELAY_MS, MILLISECONDS,
1291 >                          new ArrayBlockingQueue<Runnable>(1),
1292 >                          new CustomTPE.DiscardPolicy());
1293          try { p.shutdown(); } catch (SecurityException ok) { return; }
1294 <        try {
1294 >        try (PoolCleaner cleaner = cleaner(p)) {
1295              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1296              p.execute(r);
1297              assertFalse(r.done);
1267        } finally {
1268            joinPool(p);
1298          }
1299      }
1300  
# Line 1273 | Line 1302 | public class ThreadPoolExecutorSubclassT
1302       * execute using DiscardOldestPolicy drops task on shutdown
1303       */
1304      public void testDiscardOldestOnShutdown() {
1305 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1306 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1305 >        final ThreadPoolExecutor p =
1306 >            new CustomTPE(1, 1,
1307 >                          LONG_DELAY_MS, MILLISECONDS,
1308 >                          new ArrayBlockingQueue<Runnable>(1),
1309 >                          new CustomTPE.DiscardOldestPolicy());
1310  
1311          try { p.shutdown(); } catch (SecurityException ok) { return; }
1312 <        try {
1312 >        try (PoolCleaner cleaner = cleaner(p)) {
1313              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1314              p.execute(r);
1315              assertFalse(r.done);
1284        } finally {
1285            joinPool(p);
1316          }
1317      }
1318  
# Line 1290 | Line 1320 | public class ThreadPoolExecutorSubclassT
1320       * execute(null) throws NPE
1321       */
1322      public void testExecuteNull() {
1323 <        ThreadPoolExecutor p =
1324 <            new CustomTPE(1, 2, 1L, SECONDS,
1323 >        final ThreadPoolExecutor p =
1324 >            new CustomTPE(1, 2,
1325 >                          1L, SECONDS,
1326                            new ArrayBlockingQueue<Runnable>(10));
1327 <        try {
1328 <            p.execute(null);
1329 <            shouldThrow();
1330 <        } catch (NullPointerException success) {}
1331 <
1332 <        joinPool(p);
1327 >        try (PoolCleaner cleaner = cleaner(p)) {
1328 >            try {
1329 >                p.execute(null);
1330 >                shouldThrow();
1331 >            } catch (NullPointerException success) {}
1332 >        }
1333      }
1334  
1335      /**
1336       * setCorePoolSize of negative value throws IllegalArgumentException
1337       */
1338      public void testCorePoolSizeIllegalArgumentException() {
1339 <        ThreadPoolExecutor p =
1340 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1341 <        try {
1342 <            p.setCorePoolSize(-1);
1343 <            shouldThrow();
1344 <        } catch (IllegalArgumentException success) {
1345 <        } finally {
1346 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1339 >        final ThreadPoolExecutor p =
1340 >            new CustomTPE(1, 2,
1341 >                          LONG_DELAY_MS, MILLISECONDS,
1342 >                          new ArrayBlockingQueue<Runnable>(10));
1343 >        try (PoolCleaner cleaner = cleaner(p)) {
1344 >            try {
1345 >                p.setCorePoolSize(-1);
1346 >                shouldThrow();
1347 >            } catch (IllegalArgumentException success) {}
1348          }
1317        joinPool(p);
1349      }
1350  
1351      /**
# Line 1322 | Line 1353 | public class ThreadPoolExecutorSubclassT
1353       * if given a value less the core pool size
1354       */
1355      public void testMaximumPoolSizeIllegalArgumentException() {
1356 <        ThreadPoolExecutor p =
1357 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1358 <        try {
1359 <            p.setMaximumPoolSize(1);
1360 <            shouldThrow();
1361 <        } catch (IllegalArgumentException success) {
1362 <        } finally {
1363 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1356 >        final ThreadPoolExecutor p =
1357 >            new CustomTPE(2, 3,
1358 >                          LONG_DELAY_MS, MILLISECONDS,
1359 >                          new ArrayBlockingQueue<Runnable>(10));
1360 >        try (PoolCleaner cleaner = cleaner(p)) {
1361 >            try {
1362 >                p.setMaximumPoolSize(1);
1363 >                shouldThrow();
1364 >            } catch (IllegalArgumentException success) {}
1365          }
1334        joinPool(p);
1366      }
1367  
1368      /**
# Line 1339 | Line 1370 | public class ThreadPoolExecutorSubclassT
1370       * if given a negative value
1371       */
1372      public void testMaximumPoolSizeIllegalArgumentException2() {
1373 <        ThreadPoolExecutor p =
1374 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1375 <        try {
1376 <            p.setMaximumPoolSize(-1);
1377 <            shouldThrow();
1378 <        } catch (IllegalArgumentException success) {
1379 <        } finally {
1380 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1373 >        final ThreadPoolExecutor p =
1374 >            new CustomTPE(2, 3,
1375 >                          LONG_DELAY_MS,
1376 >                          MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1377 >        try (PoolCleaner cleaner = cleaner(p)) {
1378 >            try {
1379 >                p.setMaximumPoolSize(-1);
1380 >                shouldThrow();
1381 >            } catch (IllegalArgumentException success) {}
1382          }
1351        joinPool(p);
1383      }
1384  
1385      /**
# Line 1356 | Line 1387 | public class ThreadPoolExecutorSubclassT
1387       * when given a negative value
1388       */
1389      public void testKeepAliveTimeIllegalArgumentException() {
1390 <        ThreadPoolExecutor p =
1391 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1392 <
1393 <        try {
1394 <            p.setKeepAliveTime(-1,MILLISECONDS);
1395 <            shouldThrow();
1396 <        } catch (IllegalArgumentException success) {
1397 <        } finally {
1398 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1390 >        final ThreadPoolExecutor p =
1391 >            new CustomTPE(2, 3,
1392 >                          LONG_DELAY_MS, MILLISECONDS,
1393 >                          new ArrayBlockingQueue<Runnable>(10));
1394 >        try (PoolCleaner cleaner = cleaner(p)) {
1395 >            try {
1396 >                p.setKeepAliveTime(-1, MILLISECONDS);
1397 >                shouldThrow();
1398 >            } catch (IllegalArgumentException success) {}
1399          }
1369        joinPool(p);
1400      }
1401  
1402      /**
# Line 1374 | Line 1404 | public class ThreadPoolExecutorSubclassT
1404       */
1405      public void testTerminated() {
1406          CustomTPE p = new CustomTPE();
1407 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
1408 <        assertTrue(p.terminatedCalled());
1409 <        joinPool(p);
1407 >        try (PoolCleaner cleaner = cleaner(p)) {
1408 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1409 >            assertTrue(p.terminatedCalled());
1410 >            assertTrue(p.isShutdown());
1411 >        }
1412      }
1413  
1414      /**
# Line 1384 | Line 1416 | public class ThreadPoolExecutorSubclassT
1416       */
1417      public void testBeforeAfter() throws InterruptedException {
1418          CustomTPE p = new CustomTPE();
1419 <        try {
1419 >        try (PoolCleaner cleaner = cleaner(p)) {
1420              final CountDownLatch done = new CountDownLatch(1);
1421              p.execute(new CheckedRunnable() {
1422                  public void realRun() {
# Line 1394 | Line 1426 | public class ThreadPoolExecutorSubclassT
1426              assertEquals(0, done.getCount());
1427              assertTrue(p.afterCalled());
1428              assertTrue(p.beforeCalled());
1397            try { p.shutdown(); } catch (SecurityException ok) { return; }
1398        } finally {
1399            joinPool(p);
1429          }
1430      }
1431  
# Line 1404 | Line 1433 | public class ThreadPoolExecutorSubclassT
1433       * completed submit of callable returns result
1434       */
1435      public void testSubmitCallable() throws Exception {
1436 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1437 <        try {
1436 >        final ExecutorService e =
1437 >            new CustomTPE(2, 2,
1438 >                          LONG_DELAY_MS, MILLISECONDS,
1439 >                          new ArrayBlockingQueue<Runnable>(10));
1440 >        try (PoolCleaner cleaner = cleaner(e)) {
1441              Future<String> future = e.submit(new StringTask());
1442              String result = future.get();
1443              assertSame(TEST_STRING, result);
1412        } finally {
1413            joinPool(e);
1444          }
1445      }
1446  
# Line 1418 | Line 1448 | public class ThreadPoolExecutorSubclassT
1448       * completed submit of runnable returns successfully
1449       */
1450      public void testSubmitRunnable() throws Exception {
1451 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1452 <        try {
1451 >        final ExecutorService e =
1452 >            new CustomTPE(2, 2,
1453 >                          LONG_DELAY_MS, MILLISECONDS,
1454 >                          new ArrayBlockingQueue<Runnable>(10));
1455 >        try (PoolCleaner cleaner = cleaner(e)) {
1456              Future<?> future = e.submit(new NoOpRunnable());
1457              future.get();
1458              assertTrue(future.isDone());
1426        } finally {
1427            joinPool(e);
1459          }
1460      }
1461  
# Line 1432 | Line 1463 | public class ThreadPoolExecutorSubclassT
1463       * completed submit of (runnable, result) returns result
1464       */
1465      public void testSubmitRunnable2() throws Exception {
1466 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1467 <        try {
1466 >        final ExecutorService e =
1467 >            new CustomTPE(2, 2,
1468 >                          LONG_DELAY_MS, MILLISECONDS,
1469 >                          new ArrayBlockingQueue<Runnable>(10));
1470 >        try (PoolCleaner cleaner = cleaner(e)) {
1471              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1472              String result = future.get();
1473              assertSame(TEST_STRING, result);
1440        } finally {
1441            joinPool(e);
1474          }
1475      }
1476  
# Line 1446 | Line 1478 | public class ThreadPoolExecutorSubclassT
1478       * invokeAny(null) throws NPE
1479       */
1480      public void testInvokeAny1() throws Exception {
1481 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1482 <        try {
1483 <            e.invokeAny(null);
1484 <            shouldThrow();
1485 <        } catch (NullPointerException success) {
1486 <        } finally {
1487 <            joinPool(e);
1481 >        final ExecutorService e =
1482 >            new CustomTPE(2, 2,
1483 >                          LONG_DELAY_MS, MILLISECONDS,
1484 >                          new ArrayBlockingQueue<Runnable>(10));
1485 >        try (PoolCleaner cleaner = cleaner(e)) {
1486 >            try {
1487 >                e.invokeAny(null);
1488 >                shouldThrow();
1489 >            } catch (NullPointerException success) {}
1490          }
1491      }
1492  
# Line 1460 | Line 1494 | public class ThreadPoolExecutorSubclassT
1494       * invokeAny(empty collection) throws IAE
1495       */
1496      public void testInvokeAny2() throws Exception {
1497 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1498 <        try {
1499 <            e.invokeAny(new ArrayList<Callable<String>>());
1500 <            shouldThrow();
1501 <        } catch (IllegalArgumentException success) {
1502 <        } finally {
1503 <            joinPool(e);
1497 >        final ExecutorService e =
1498 >            new CustomTPE(2, 2,
1499 >                          LONG_DELAY_MS, MILLISECONDS,
1500 >                          new ArrayBlockingQueue<Runnable>(10));
1501 >        try (PoolCleaner cleaner = cleaner(e)) {
1502 >            try {
1503 >                e.invokeAny(new ArrayList<Callable<String>>());
1504 >                shouldThrow();
1505 >            } catch (IllegalArgumentException success) {}
1506          }
1507      }
1508  
# Line 1475 | Line 1511 | public class ThreadPoolExecutorSubclassT
1511       */
1512      public void testInvokeAny3() throws Exception {
1513          CountDownLatch latch = new CountDownLatch(1);
1514 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1515 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1516 <        l.add(latchAwaitingStringTask(latch));
1517 <        l.add(null);
1518 <        try {
1519 <            e.invokeAny(l);
1520 <            shouldThrow();
1521 <        } catch (NullPointerException success) {
1522 <        } finally {
1514 >        final ExecutorService e =
1515 >            new CustomTPE(2, 2,
1516 >                          LONG_DELAY_MS, MILLISECONDS,
1517 >                          new ArrayBlockingQueue<Runnable>(10));
1518 >        try (PoolCleaner cleaner = cleaner(e)) {
1519 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1520 >            l.add(latchAwaitingStringTask(latch));
1521 >            l.add(null);
1522 >            try {
1523 >                e.invokeAny(l);
1524 >                shouldThrow();
1525 >            } catch (NullPointerException success) {}
1526              latch.countDown();
1488            joinPool(e);
1527          }
1528      }
1529  
# Line 1493 | Line 1531 | public class ThreadPoolExecutorSubclassT
1531       * invokeAny(c) throws ExecutionException if no task completes
1532       */
1533      public void testInvokeAny4() throws Exception {
1534 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1535 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1536 <        l.add(new NPETask());
1537 <        try {
1538 <            e.invokeAny(l);
1539 <            shouldThrow();
1540 <        } catch (ExecutionException success) {
1541 <            assertTrue(success.getCause() instanceof NullPointerException);
1542 <        } finally {
1543 <            joinPool(e);
1534 >        final ExecutorService e =
1535 >            new CustomTPE(2, 2,
1536 >                          LONG_DELAY_MS, MILLISECONDS,
1537 >                          new ArrayBlockingQueue<Runnable>(10));
1538 >        try (PoolCleaner cleaner = cleaner(e)) {
1539 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1540 >            l.add(new NPETask());
1541 >            try {
1542 >                e.invokeAny(l);
1543 >                shouldThrow();
1544 >            } catch (ExecutionException success) {
1545 >                assertTrue(success.getCause() instanceof NullPointerException);
1546 >            }
1547          }
1548      }
1549  
# Line 1510 | Line 1551 | public class ThreadPoolExecutorSubclassT
1551       * invokeAny(c) returns result of some task
1552       */
1553      public void testInvokeAny5() throws Exception {
1554 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1555 <        try {
1554 >        final ExecutorService e =
1555 >            new CustomTPE(2, 2,
1556 >                          LONG_DELAY_MS, MILLISECONDS,
1557 >                          new ArrayBlockingQueue<Runnable>(10));
1558 >        try (PoolCleaner cleaner = cleaner(e)) {
1559              List<Callable<String>> l = new ArrayList<Callable<String>>();
1560              l.add(new StringTask());
1561              l.add(new StringTask());
1562              String result = e.invokeAny(l);
1563              assertSame(TEST_STRING, result);
1520        } finally {
1521            joinPool(e);
1564          }
1565      }
1566  
# Line 1526 | Line 1568 | public class ThreadPoolExecutorSubclassT
1568       * invokeAll(null) throws NPE
1569       */
1570      public void testInvokeAll1() throws Exception {
1571 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1572 <        try {
1573 <            e.invokeAll(null);
1574 <            shouldThrow();
1575 <        } catch (NullPointerException success) {
1576 <        } finally {
1577 <            joinPool(e);
1571 >        final ExecutorService e =
1572 >            new CustomTPE(2, 2,
1573 >                          LONG_DELAY_MS, MILLISECONDS,
1574 >                          new ArrayBlockingQueue<Runnable>(10));
1575 >        try (PoolCleaner cleaner = cleaner(e)) {
1576 >            try {
1577 >                e.invokeAll(null);
1578 >                shouldThrow();
1579 >            } catch (NullPointerException success) {}
1580          }
1581      }
1582  
# Line 1540 | Line 1584 | public class ThreadPoolExecutorSubclassT
1584       * invokeAll(empty collection) returns empty collection
1585       */
1586      public void testInvokeAll2() throws Exception {
1587 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1588 <        try {
1587 >        final ExecutorService e =
1588 >            new CustomTPE(2, 2,
1589 >                          LONG_DELAY_MS, MILLISECONDS,
1590 >                          new ArrayBlockingQueue<Runnable>(10));
1591 >        try (PoolCleaner cleaner = cleaner(e)) {
1592              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1593              assertTrue(r.isEmpty());
1547        } finally {
1548            joinPool(e);
1594          }
1595      }
1596  
# Line 1553 | Line 1598 | public class ThreadPoolExecutorSubclassT
1598       * invokeAll(c) throws NPE if c has null elements
1599       */
1600      public void testInvokeAll3() throws Exception {
1601 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1602 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1603 <        l.add(new StringTask());
1604 <        l.add(null);
1605 <        try {
1606 <            e.invokeAll(l);
1607 <            shouldThrow();
1608 <        } catch (NullPointerException success) {
1609 <        } finally {
1610 <            joinPool(e);
1601 >        final ExecutorService e =
1602 >            new CustomTPE(2, 2,
1603 >                          LONG_DELAY_MS, MILLISECONDS,
1604 >                          new ArrayBlockingQueue<Runnable>(10));
1605 >        try (PoolCleaner cleaner = cleaner(e)) {
1606 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1607 >            l.add(new StringTask());
1608 >            l.add(null);
1609 >            try {
1610 >                e.invokeAll(l);
1611 >                shouldThrow();
1612 >            } catch (NullPointerException success) {}
1613          }
1614      }
1615  
# Line 1570 | Line 1617 | public class ThreadPoolExecutorSubclassT
1617       * get of element of invokeAll(c) throws exception on failed task
1618       */
1619      public void testInvokeAll4() throws Exception {
1620 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1621 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1622 <        l.add(new NPETask());
1623 <        List<Future<String>> futures = e.invokeAll(l);
1624 <        assertEquals(1, futures.size());
1625 <        try {
1626 <            futures.get(0).get();
1627 <            shouldThrow();
1628 <        } catch (ExecutionException success) {
1629 <            assertTrue(success.getCause() instanceof NullPointerException);
1630 <        } finally {
1631 <            joinPool(e);
1620 >        final ExecutorService e =
1621 >            new CustomTPE(2, 2,
1622 >                          LONG_DELAY_MS, MILLISECONDS,
1623 >                          new ArrayBlockingQueue<Runnable>(10));
1624 >        try (PoolCleaner cleaner = cleaner(e)) {
1625 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1626 >            l.add(new NPETask());
1627 >            List<Future<String>> futures = e.invokeAll(l);
1628 >            assertEquals(1, futures.size());
1629 >            try {
1630 >                futures.get(0).get();
1631 >                shouldThrow();
1632 >            } catch (ExecutionException success) {
1633 >                assertTrue(success.getCause() instanceof NullPointerException);
1634 >            }
1635          }
1636      }
1637  
# Line 1589 | Line 1639 | public class ThreadPoolExecutorSubclassT
1639       * invokeAll(c) returns results of all completed tasks
1640       */
1641      public void testInvokeAll5() throws Exception {
1642 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1643 <        try {
1642 >        final ExecutorService e =
1643 >            new CustomTPE(2, 2,
1644 >                          LONG_DELAY_MS, MILLISECONDS,
1645 >                          new ArrayBlockingQueue<Runnable>(10));
1646 >        try (PoolCleaner cleaner = cleaner(e)) {
1647              List<Callable<String>> l = new ArrayList<Callable<String>>();
1648              l.add(new StringTask());
1649              l.add(new StringTask());
# Line 1598 | Line 1651 | public class ThreadPoolExecutorSubclassT
1651              assertEquals(2, futures.size());
1652              for (Future<String> future : futures)
1653                  assertSame(TEST_STRING, future.get());
1601        } finally {
1602            joinPool(e);
1654          }
1655      }
1656  
# Line 1607 | Line 1658 | public class ThreadPoolExecutorSubclassT
1658       * timed invokeAny(null) throws NPE
1659       */
1660      public void testTimedInvokeAny1() throws Exception {
1661 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1662 <        try {
1663 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1664 <            shouldThrow();
1665 <        } catch (NullPointerException success) {
1666 <        } finally {
1667 <            joinPool(e);
1661 >        final ExecutorService e =
1662 >            new CustomTPE(2, 2,
1663 >                          LONG_DELAY_MS, MILLISECONDS,
1664 >                          new ArrayBlockingQueue<Runnable>(10));
1665 >        try (PoolCleaner cleaner = cleaner(e)) {
1666 >            try {
1667 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1668 >                shouldThrow();
1669 >            } catch (NullPointerException success) {}
1670          }
1671      }
1672  
# Line 1621 | Line 1674 | public class ThreadPoolExecutorSubclassT
1674       * timed invokeAny(,,null) throws NPE
1675       */
1676      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1677 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1678 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1679 <        l.add(new StringTask());
1680 <        try {
1681 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1682 <            shouldThrow();
1683 <        } catch (NullPointerException success) {
1684 <        } finally {
1685 <            joinPool(e);
1677 >        final ExecutorService e =
1678 >            new CustomTPE(2, 2,
1679 >                          LONG_DELAY_MS, MILLISECONDS,
1680 >                          new ArrayBlockingQueue<Runnable>(10));
1681 >        try (PoolCleaner cleaner = cleaner(e)) {
1682 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1683 >            l.add(new StringTask());
1684 >            try {
1685 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1686 >                shouldThrow();
1687 >            } catch (NullPointerException success) {}
1688          }
1689      }
1690  
# Line 1637 | Line 1692 | public class ThreadPoolExecutorSubclassT
1692       * timed invokeAny(empty collection) throws IAE
1693       */
1694      public void testTimedInvokeAny2() throws Exception {
1695 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1696 <        try {
1697 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1698 <            shouldThrow();
1699 <        } catch (IllegalArgumentException success) {
1700 <        } finally {
1701 <            joinPool(e);
1695 >        final ExecutorService e =
1696 >            new CustomTPE(2, 2,
1697 >                          LONG_DELAY_MS, MILLISECONDS,
1698 >                          new ArrayBlockingQueue<Runnable>(10));
1699 >        try (PoolCleaner cleaner = cleaner(e)) {
1700 >            try {
1701 >                e.invokeAny(new ArrayList<Callable<String>>(),
1702 >                            MEDIUM_DELAY_MS, MILLISECONDS);
1703 >                shouldThrow();
1704 >            } catch (IllegalArgumentException success) {}
1705          }
1706      }
1707  
# Line 1652 | Line 1710 | public class ThreadPoolExecutorSubclassT
1710       */
1711      public void testTimedInvokeAny3() throws Exception {
1712          CountDownLatch latch = new CountDownLatch(1);
1713 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1714 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1715 <        l.add(latchAwaitingStringTask(latch));
1716 <        l.add(null);
1717 <        try {
1718 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1719 <            shouldThrow();
1720 <        } catch (NullPointerException success) {
1721 <        } finally {
1713 >        final ExecutorService e =
1714 >            new CustomTPE(2, 2,
1715 >                          LONG_DELAY_MS, MILLISECONDS,
1716 >                          new ArrayBlockingQueue<Runnable>(10));
1717 >        try (PoolCleaner cleaner = cleaner(e)) {
1718 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1719 >            l.add(latchAwaitingStringTask(latch));
1720 >            l.add(null);
1721 >            try {
1722 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1723 >                shouldThrow();
1724 >            } catch (NullPointerException success) {}
1725              latch.countDown();
1665            joinPool(e);
1726          }
1727      }
1728  
# Line 1670 | Line 1730 | public class ThreadPoolExecutorSubclassT
1730       * timed invokeAny(c) throws ExecutionException if no task completes
1731       */
1732      public void testTimedInvokeAny4() throws Exception {
1733 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1734 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1735 <        l.add(new NPETask());
1736 <        try {
1737 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1738 <            shouldThrow();
1739 <        } catch (ExecutionException success) {
1740 <            assertTrue(success.getCause() instanceof NullPointerException);
1741 <        } finally {
1742 <            joinPool(e);
1733 >        final ExecutorService e =
1734 >            new CustomTPE(2, 2,
1735 >                          LONG_DELAY_MS, MILLISECONDS,
1736 >                          new ArrayBlockingQueue<Runnable>(10));
1737 >        try (PoolCleaner cleaner = cleaner(e)) {
1738 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1739 >            l.add(new NPETask());
1740 >            try {
1741 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1742 >                shouldThrow();
1743 >            } catch (ExecutionException success) {
1744 >                assertTrue(success.getCause() instanceof NullPointerException);
1745 >            }
1746          }
1747      }
1748  
# Line 1687 | Line 1750 | public class ThreadPoolExecutorSubclassT
1750       * timed invokeAny(c) returns result of some task
1751       */
1752      public void testTimedInvokeAny5() throws Exception {
1753 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1754 <        try {
1753 >        final ExecutorService e =
1754 >            new CustomTPE(2, 2,
1755 >                          LONG_DELAY_MS, MILLISECONDS,
1756 >                          new ArrayBlockingQueue<Runnable>(10));
1757 >        try (PoolCleaner cleaner = cleaner(e)) {
1758              List<Callable<String>> l = new ArrayList<Callable<String>>();
1759              l.add(new StringTask());
1760              l.add(new StringTask());
1761              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1762              assertSame(TEST_STRING, result);
1697        } finally {
1698            joinPool(e);
1763          }
1764      }
1765  
# Line 1703 | Line 1767 | public class ThreadPoolExecutorSubclassT
1767       * timed invokeAll(null) throws NPE
1768       */
1769      public void testTimedInvokeAll1() throws Exception {
1770 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1771 <        try {
1772 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1773 <            shouldThrow();
1774 <        } catch (NullPointerException success) {
1775 <        } finally {
1776 <            joinPool(e);
1770 >        final ExecutorService e =
1771 >            new CustomTPE(2, 2,
1772 >                          LONG_DELAY_MS, MILLISECONDS,
1773 >                          new ArrayBlockingQueue<Runnable>(10));
1774 >        try (PoolCleaner cleaner = cleaner(e)) {
1775 >            try {
1776 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1777 >                shouldThrow();
1778 >            } catch (NullPointerException success) {}
1779          }
1780      }
1781  
# Line 1717 | Line 1783 | public class ThreadPoolExecutorSubclassT
1783       * timed invokeAll(,,null) throws NPE
1784       */
1785      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1786 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1787 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1788 <        l.add(new StringTask());
1789 <        try {
1790 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1791 <            shouldThrow();
1792 <        } catch (NullPointerException success) {
1793 <        } finally {
1794 <            joinPool(e);
1786 >        final ExecutorService e =
1787 >            new CustomTPE(2, 2,
1788 >                          LONG_DELAY_MS, MILLISECONDS,
1789 >                          new ArrayBlockingQueue<Runnable>(10));
1790 >        try (PoolCleaner cleaner = cleaner(e)) {
1791 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1792 >            l.add(new StringTask());
1793 >            try {
1794 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1795 >                shouldThrow();
1796 >            } catch (NullPointerException success) {}
1797          }
1798      }
1799  
# Line 1733 | Line 1801 | public class ThreadPoolExecutorSubclassT
1801       * timed invokeAll(empty collection) returns empty collection
1802       */
1803      public void testTimedInvokeAll2() throws Exception {
1804 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1805 <        try {
1806 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1804 >        final ExecutorService e =
1805 >            new CustomTPE(2, 2,
1806 >                          LONG_DELAY_MS, MILLISECONDS,
1807 >                          new ArrayBlockingQueue<Runnable>(10));
1808 >        try (PoolCleaner cleaner = cleaner(e)) {
1809 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1810 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1811              assertTrue(r.isEmpty());
1740        } finally {
1741            joinPool(e);
1812          }
1813      }
1814  
# Line 1746 | Line 1816 | public class ThreadPoolExecutorSubclassT
1816       * timed invokeAll(c) throws NPE if c has null elements
1817       */
1818      public void testTimedInvokeAll3() throws Exception {
1819 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1820 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1821 <        l.add(new StringTask());
1822 <        l.add(null);
1823 <        try {
1824 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1825 <            shouldThrow();
1826 <        } catch (NullPointerException success) {
1827 <        } finally {
1828 <            joinPool(e);
1819 >        final ExecutorService e =
1820 >            new CustomTPE(2, 2,
1821 >                          LONG_DELAY_MS, MILLISECONDS,
1822 >                          new ArrayBlockingQueue<Runnable>(10));
1823 >        try (PoolCleaner cleaner = cleaner(e)) {
1824 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1825 >            l.add(new StringTask());
1826 >            l.add(null);
1827 >            try {
1828 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1829 >                shouldThrow();
1830 >            } catch (NullPointerException success) {}
1831          }
1832      }
1833  
# Line 1763 | Line 1835 | public class ThreadPoolExecutorSubclassT
1835       * get of element of invokeAll(c) throws exception on failed task
1836       */
1837      public void testTimedInvokeAll4() throws Exception {
1838 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1839 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1840 <        l.add(new NPETask());
1841 <        List<Future<String>> futures =
1842 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1843 <        assertEquals(1, futures.size());
1844 <        try {
1845 <            futures.get(0).get();
1846 <            shouldThrow();
1847 <        } catch (ExecutionException success) {
1848 <            assertTrue(success.getCause() instanceof NullPointerException);
1849 <        } finally {
1850 <            joinPool(e);
1838 >        final ExecutorService e =
1839 >            new CustomTPE(2, 2,
1840 >                          LONG_DELAY_MS, MILLISECONDS,
1841 >                          new ArrayBlockingQueue<Runnable>(10));
1842 >        try (PoolCleaner cleaner = cleaner(e)) {
1843 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1844 >            l.add(new NPETask());
1845 >            List<Future<String>> futures =
1846 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1847 >            assertEquals(1, futures.size());
1848 >            try {
1849 >                futures.get(0).get();
1850 >                shouldThrow();
1851 >            } catch (ExecutionException success) {
1852 >                assertTrue(success.getCause() instanceof NullPointerException);
1853 >            }
1854          }
1855      }
1856  
# Line 1783 | Line 1858 | public class ThreadPoolExecutorSubclassT
1858       * timed invokeAll(c) returns results of all completed tasks
1859       */
1860      public void testTimedInvokeAll5() throws Exception {
1861 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1862 <        try {
1861 >        final ExecutorService e =
1862 >            new CustomTPE(2, 2,
1863 >                          LONG_DELAY_MS, MILLISECONDS,
1864 >                          new ArrayBlockingQueue<Runnable>(10));
1865 >        try (PoolCleaner cleaner = cleaner(e)) {
1866              List<Callable<String>> l = new ArrayList<Callable<String>>();
1867              l.add(new StringTask());
1868              l.add(new StringTask());
# Line 1793 | Line 1871 | public class ThreadPoolExecutorSubclassT
1871              assertEquals(2, futures.size());
1872              for (Future<String> future : futures)
1873                  assertSame(TEST_STRING, future.get());
1796        } finally {
1797            joinPool(e);
1874          }
1875      }
1876  
# Line 1802 | Line 1878 | public class ThreadPoolExecutorSubclassT
1878       * timed invokeAll(c) cancels tasks not completed by timeout
1879       */
1880      public void testTimedInvokeAll6() throws Exception {
1881 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1882 <        try {
1881 >        final ExecutorService e =
1882 >            new CustomTPE(2, 2,
1883 >                          LONG_DELAY_MS, MILLISECONDS,
1884 >                          new ArrayBlockingQueue<Runnable>(10));
1885 >        try (PoolCleaner cleaner = cleaner(e)) {
1886              for (long timeout = timeoutMillis();;) {
1887                  List<Callable<String>> tasks = new ArrayList<>();
1888                  tasks.add(new StringTask("0"));
# Line 1827 | Line 1906 | public class ThreadPoolExecutorSubclassT
1906                          fail("expected exactly one task to be cancelled");
1907                  }
1908              }
1830        } finally {
1831            joinPool(e);
1909          }
1910      }
1911  
# Line 1842 | Line 1919 | public class ThreadPoolExecutorSubclassT
1919                            LONG_DELAY_MS, MILLISECONDS,
1920                            new LinkedBlockingQueue<Runnable>(),
1921                            new FailingThreadFactory());
1922 <        try {
1922 >        try (PoolCleaner cleaner = cleaner(e)) {
1923              final int TASKS = 100;
1924              final CountDownLatch done = new CountDownLatch(TASKS);
1925              for (int k = 0; k < TASKS; ++k)
# Line 1851 | Line 1928 | public class ThreadPoolExecutorSubclassT
1928                          done.countDown();
1929                      }});
1930              assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1854        } finally {
1855            joinPool(e);
1931          }
1932      }
1933  
# Line 1860 | Line 1935 | public class ThreadPoolExecutorSubclassT
1935       * allowsCoreThreadTimeOut is by default false.
1936       */
1937      public void testAllowsCoreThreadTimeOut() {
1938 <        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1939 <        assertFalse(p.allowsCoreThreadTimeOut());
1940 <        joinPool(p);
1938 >        final ThreadPoolExecutor p =
1939 >            new CustomTPE(2, 2,
1940 >                          1000, MILLISECONDS,
1941 >                          new ArrayBlockingQueue<Runnable>(10));
1942 >        try (PoolCleaner cleaner = cleaner(p)) {
1943 >            assertFalse(p.allowsCoreThreadTimeOut());
1944 >        }
1945      }
1946  
1947      /**
# Line 1874 | Line 1953 | public class ThreadPoolExecutorSubclassT
1953              new CustomTPE(2, 10,
1954                            keepAliveTime, MILLISECONDS,
1955                            new ArrayBlockingQueue<Runnable>(10));
1956 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1957 <        try {
1956 >        try (PoolCleaner cleaner = cleaner(p)) {
1957 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1958              p.allowCoreThreadTimeOut(true);
1959              p.execute(new CheckedRunnable() {
1960                  public void realRun() {
# Line 1890 | Line 1969 | public class ThreadPoolExecutorSubclassT
1969                  Thread.yield();
1970              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1971              assertEquals(0, p.getPoolSize());
1893        } finally {
1894            joinPool(p);
1972          }
1973      }
1974  
# Line 1904 | Line 1981 | public class ThreadPoolExecutorSubclassT
1981              new CustomTPE(2, 10,
1982                            keepAliveTime, MILLISECONDS,
1983                            new ArrayBlockingQueue<Runnable>(10));
1984 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1985 <        try {
1984 >        try (PoolCleaner cleaner = cleaner(p)) {
1985 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1986              p.allowCoreThreadTimeOut(false);
1987              p.execute(new CheckedRunnable() {
1988                  public void realRun() throws InterruptedException {
# Line 1914 | Line 1991 | public class ThreadPoolExecutorSubclassT
1991                  }});
1992              delay(2 * keepAliveTime);
1993              assertTrue(p.getPoolSize() >= 1);
1917        } finally {
1918            joinPool(p);
1994          }
1995      }
1996  
# Line 1928 | Line 2003 | public class ThreadPoolExecutorSubclassT
2003              new CustomTPE(1, 1,
2004                            LONG_DELAY_MS, MILLISECONDS,
2005                            new LinkedBlockingQueue<Runnable>());
2006 <        try {
2006 >        try (PoolCleaner cleaner = cleaner(e)) {
2007              final CountDownLatch blockerStarted = new CountDownLatch(1);
2008              final CountDownLatch done = new CountDownLatch(1);
2009              final List<Future<?>> futures = new ArrayList<>();
# Line 1955 | Line 2030 | public class ThreadPoolExecutorSubclassT
2030                  assertTrue(future.isDone());
2031              }
2032              done.countDown();
1958        } finally {
1959            joinPool(e);
2033          }
2034      }
2035  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines