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.92 by jsr166, Sun Oct 4 03:49:33 2015 UTC vs.
Revision 1.101 by jsr166, Mon Oct 5 21:54:33 2015 UTC

# Line 398 | Line 398 | public class ThreadPoolExecutorTest exte
398       * getTaskCount increases, but doesn't overestimate, when tasks submitted
399       */
400      public void testGetTaskCount() throws InterruptedException {
401 +        final int TASKS = 3;
402 +        final CountDownLatch done = new CountDownLatch(1);
403          final ThreadPoolExecutor p =
404              new ThreadPoolExecutor(1, 1,
405                                     LONG_DELAY_MS, MILLISECONDS,
406                                     new ArrayBlockingQueue<Runnable>(10));
407 <        try (PoolCleaner cleaner = cleaner(p)) {
407 >        try (PoolCleaner cleaner = cleaner(p, done)) {
408              final CountDownLatch threadStarted = new CountDownLatch(1);
407            final CountDownLatch done = new CountDownLatch(1);
409              assertEquals(0, p.getTaskCount());
410 +            assertEquals(0, p.getCompletedTaskCount());
411              p.execute(new CheckedRunnable() {
412                  public void realRun() throws InterruptedException {
413                      threadStarted.countDown();
412                    assertEquals(1, p.getTaskCount());
414                      done.await();
415                  }});
416 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
416 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
417              assertEquals(1, p.getTaskCount());
418 <            done.countDown();
418 >            assertEquals(0, p.getCompletedTaskCount());
419 >            for (int i = 0; i < TASKS; i++) {
420 >                assertEquals(1 + i, p.getTaskCount());
421 >                p.execute(new CheckedRunnable() {
422 >                    public void realRun() throws InterruptedException {
423 >                        threadStarted.countDown();
424 >                        assertEquals(1 + TASKS, p.getTaskCount());
425 >                        done.await();
426 >                    }});
427 >            }
428 >            assertEquals(1 + TASKS, p.getTaskCount());
429 >            assertEquals(0, p.getCompletedTaskCount());
430          }
431 +        assertEquals(1 + TASKS, p.getTaskCount());
432 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
433      }
434  
435      /**
# Line 600 | Line 614 | public class ThreadPoolExecutorTest exte
614              new ThreadPoolExecutor(1, 1,
615                                     LONG_DELAY_MS, MILLISECONDS,
616                                     q);
617 <        try (PoolCleaner cleaner = cleaner(p)) {
617 >        try (PoolCleaner cleaner = cleaner(p, done)) {
618              FutureTask[] tasks = new FutureTask[5];
619              for (int i = 0; i < tasks.length; i++) {
620                  Callable task = new CheckedCallable<Boolean>() {
# Line 612 | Line 626 | public class ThreadPoolExecutorTest exte
626                  tasks[i] = new FutureTask(task);
627                  p.execute(tasks[i]);
628              }
629 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
629 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
630              assertEquals(tasks.length, p.getTaskCount());
631              assertEquals(tasks.length - 1, q.size());
632              assertEquals(1L, p.getActiveCount());
# Line 625 | Line 639 | public class ThreadPoolExecutorTest exte
639              p.purge();         // Nothing to do
640              assertEquals(tasks.length - 3, q.size());
641              assertEquals(tasks.length - 2, p.getTaskCount());
628            done.countDown();
642          }
643      }
644  
# Line 641 | Line 654 | public class ThreadPoolExecutorTest exte
654              new ThreadPoolExecutor(poolSize, poolSize,
655                                     LONG_DELAY_MS, MILLISECONDS,
656                                     new ArrayBlockingQueue<Runnable>(10));
657 <        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
657 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
658          Runnable waiter = new CheckedRunnable() { public void realRun() {
659              threadsStarted.countDown();
660              try {
# Line 1070 | Line 1083 | public class ThreadPoolExecutorTest exte
1083       * submit(runnable) throws RejectedExecutionException if saturated.
1084       */
1085      public void testSaturatedSubmitRunnable() {
1086 <        ThreadPoolExecutor p =
1086 >        final ThreadPoolExecutor p =
1087              new ThreadPoolExecutor(1, 1,
1088                                     LONG_DELAY_MS, MILLISECONDS,
1089                                     new ArrayBlockingQueue<Runnable>(1));
1090 <        final CountDownLatch done = new CountDownLatch(1);
1091 <        try {
1090 >        try (PoolCleaner cleaner = cleaner(p)) {
1091 >            final CountDownLatch done = new CountDownLatch(1);
1092              Runnable task = new CheckedRunnable() {
1093                  public void realRun() throws InterruptedException {
1094                      done.await();
# Line 1089 | Line 1102 | public class ThreadPoolExecutorTest exte
1102                  } catch (RejectedExecutionException success) {}
1103                  assertTrue(p.getTaskCount() <= 2);
1104              }
1092        } finally {
1105              done.countDown();
1094            joinPool(p);
1106          }
1107      }
1108  
# Line 1099 | Line 1110 | public class ThreadPoolExecutorTest exte
1110       * submit(callable) throws RejectedExecutionException if saturated.
1111       */
1112      public void testSaturatedSubmitCallable() {
1113 <        ThreadPoolExecutor p =
1113 >        final ThreadPoolExecutor p =
1114              new ThreadPoolExecutor(1, 1,
1115                                     LONG_DELAY_MS, MILLISECONDS,
1116                                     new ArrayBlockingQueue<Runnable>(1));
1117 <        final CountDownLatch done = new CountDownLatch(1);
1118 <        try {
1117 >        try (PoolCleaner cleaner = cleaner(p)) {
1118 >            final CountDownLatch done = new CountDownLatch(1);
1119              Runnable task = new CheckedRunnable() {
1120                  public void realRun() throws InterruptedException {
1121                      done.await();
# Line 1118 | Line 1129 | public class ThreadPoolExecutorTest exte
1129                  } catch (RejectedExecutionException success) {}
1130                  assertTrue(p.getTaskCount() <= 2);
1131              }
1121        } finally {
1132              done.countDown();
1123            joinPool(p);
1133          }
1134      }
1135  
# Line 1214 | Line 1223 | public class ThreadPoolExecutorTest exte
1223       * execute throws RejectedExecutionException if shutdown
1224       */
1225      public void testRejectedExecutionExceptionOnShutdown() {
1226 <        ThreadPoolExecutor p =
1226 >        final ThreadPoolExecutor p =
1227              new ThreadPoolExecutor(1, 1,
1228                                     LONG_DELAY_MS, MILLISECONDS,
1229                                     new ArrayBlockingQueue<Runnable>(1));
1230          try { p.shutdown(); } catch (SecurityException ok) { return; }
1231 <        try {
1232 <            p.execute(new NoOpRunnable());
1233 <            shouldThrow();
1234 <        } catch (RejectedExecutionException success) {}
1235 <
1236 <        joinPool(p);
1231 >        try (PoolCleaner cleaner = cleaner(p)) {
1232 >            try {
1233 >                p.execute(new NoOpRunnable());
1234 >                shouldThrow();
1235 >            } catch (RejectedExecutionException success) {}
1236 >        }
1237      }
1238  
1239      /**
# Line 1238 | Line 1247 | public class ThreadPoolExecutorTest exte
1247                                     new ArrayBlockingQueue<Runnable>(1), h);
1248  
1249          try { p.shutdown(); } catch (SecurityException ok) { return; }
1250 <        try {
1250 >        try (PoolCleaner cleaner = cleaner(p)) {
1251              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1252              p.execute(r);
1253              assertFalse(r.done);
1245        } finally {
1246            joinPool(p);
1254          }
1255      }
1256  
# Line 1251 | Line 1258 | public class ThreadPoolExecutorTest exte
1258       * execute using DiscardPolicy drops task on shutdown
1259       */
1260      public void testDiscardOnShutdown() {
1261 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1255 <        ThreadPoolExecutor p =
1261 >        final ThreadPoolExecutor p =
1262              new ThreadPoolExecutor(1, 1,
1263                                     LONG_DELAY_MS, MILLISECONDS,
1264                                     new ArrayBlockingQueue<Runnable>(1),
1265 <                                   h);
1265 >                                   new ThreadPoolExecutor.DiscardPolicy());
1266  
1267          try { p.shutdown(); } catch (SecurityException ok) { return; }
1268 <        try {
1268 >        try (PoolCleaner cleaner = cleaner(p)) {
1269              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1270              p.execute(r);
1271              assertFalse(r.done);
1266        } finally {
1267            joinPool(p);
1272          }
1273      }
1274  
# Line 1272 | Line 1276 | public class ThreadPoolExecutorTest exte
1276       * execute using DiscardOldestPolicy drops task on shutdown
1277       */
1278      public void testDiscardOldestOnShutdown() {
1279 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1276 <        ThreadPoolExecutor p =
1279 >        final ThreadPoolExecutor p =
1280              new ThreadPoolExecutor(1, 1,
1281                                     LONG_DELAY_MS, MILLISECONDS,
1282                                     new ArrayBlockingQueue<Runnable>(1),
1283 <                                   h);
1283 >                                   new ThreadPoolExecutor.DiscardOldestPolicy());
1284  
1285          try { p.shutdown(); } catch (SecurityException ok) { return; }
1286 <        try {
1286 >        try (PoolCleaner cleaner = cleaner(p)) {
1287              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1288              p.execute(r);
1289              assertFalse(r.done);
1287        } finally {
1288            joinPool(p);
1290          }
1291      }
1292  
# Line 1293 | Line 1294 | public class ThreadPoolExecutorTest exte
1294       * execute(null) throws NPE
1295       */
1296      public void testExecuteNull() {
1297 <        ThreadPoolExecutor p =
1298 <            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1297 >        final ThreadPoolExecutor p =
1298 >            new ThreadPoolExecutor(1, 2,
1299 >                                   1L, SECONDS,
1300                                     new ArrayBlockingQueue<Runnable>(10));
1301 <        try {
1302 <            p.execute(null);
1303 <            shouldThrow();
1304 <        } catch (NullPointerException success) {}
1305 <
1306 <        joinPool(p);
1301 >        try (PoolCleaner cleaner = cleaner(p)) {
1302 >            try {
1303 >                p.execute(null);
1304 >                shouldThrow();
1305 >            } catch (NullPointerException success) {}
1306 >        }
1307      }
1308  
1309      /**
1310       * setCorePoolSize of negative value throws IllegalArgumentException
1311       */
1312      public void testCorePoolSizeIllegalArgumentException() {
1313 <        ThreadPoolExecutor p =
1313 >        final ThreadPoolExecutor p =
1314              new ThreadPoolExecutor(1, 2,
1315                                     LONG_DELAY_MS, MILLISECONDS,
1316                                     new ArrayBlockingQueue<Runnable>(10));
1317 <        try {
1318 <            p.setCorePoolSize(-1);
1319 <            shouldThrow();
1320 <        } catch (IllegalArgumentException success) {
1321 <        } finally {
1320 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1317 >        try (PoolCleaner cleaner = cleaner(p)) {
1318 >            try {
1319 >                p.setCorePoolSize(-1);
1320 >                shouldThrow();
1321 >            } catch (IllegalArgumentException success) {}
1322          }
1322        joinPool(p);
1323      }
1324  
1325      /**
# Line 1327 | Line 1327 | public class ThreadPoolExecutorTest exte
1327       * given a value less the core pool size
1328       */
1329      public void testMaximumPoolSizeIllegalArgumentException() {
1330 <        ThreadPoolExecutor p =
1330 >        final ThreadPoolExecutor p =
1331              new ThreadPoolExecutor(2, 3,
1332                                     LONG_DELAY_MS, MILLISECONDS,
1333                                     new ArrayBlockingQueue<Runnable>(10));
1334 <        try {
1335 <            p.setMaximumPoolSize(1);
1336 <            shouldThrow();
1337 <        } catch (IllegalArgumentException success) {
1338 <        } finally {
1339 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1334 >        try (PoolCleaner cleaner = cleaner(p)) {
1335 >            try {
1336 >                p.setMaximumPoolSize(1);
1337 >                shouldThrow();
1338 >            } catch (IllegalArgumentException success) {}
1339          }
1341        joinPool(p);
1340      }
1341  
1342      /**
# Line 1346 | Line 1344 | public class ThreadPoolExecutorTest exte
1344       * if given a negative value
1345       */
1346      public void testMaximumPoolSizeIllegalArgumentException2() {
1347 <        ThreadPoolExecutor p =
1347 >        final ThreadPoolExecutor p =
1348              new ThreadPoolExecutor(2, 3,
1349                                     LONG_DELAY_MS, MILLISECONDS,
1350                                     new ArrayBlockingQueue<Runnable>(10));
1351 <        try {
1352 <            p.setMaximumPoolSize(-1);
1353 <            shouldThrow();
1354 <        } catch (IllegalArgumentException success) {
1355 <        } finally {
1358 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1351 >        try (PoolCleaner cleaner = cleaner(p)) {
1352 >            try {
1353 >                p.setMaximumPoolSize(-1);
1354 >                shouldThrow();
1355 >            } catch (IllegalArgumentException success) {}
1356          }
1360        joinPool(p);
1357      }
1358  
1359      /**
# Line 1365 | Line 1361 | public class ThreadPoolExecutorTest exte
1361       * max pool size result in IllegalArgumentException.
1362       */
1363      public void testPoolSizeInvariants() {
1364 <        ThreadPoolExecutor p =
1364 >        final ThreadPoolExecutor p =
1365              new ThreadPoolExecutor(1, 1,
1366                                     LONG_DELAY_MS, MILLISECONDS,
1367                                     new ArrayBlockingQueue<Runnable>(10));
1368 <        for (int s = 1; s < 5; s++) {
1369 <            p.setMaximumPoolSize(s);
1370 <            p.setCorePoolSize(s);
1371 <            try {
1372 <                p.setMaximumPoolSize(s - 1);
1373 <                shouldThrow();
1374 <            } catch (IllegalArgumentException success) {}
1375 <            assertEquals(s, p.getCorePoolSize());
1376 <            assertEquals(s, p.getMaximumPoolSize());
1377 <            try {
1378 <                p.setCorePoolSize(s + 1);
1379 <                shouldThrow();
1380 <            } catch (IllegalArgumentException success) {}
1381 <            assertEquals(s, p.getCorePoolSize());
1382 <            assertEquals(s, p.getMaximumPoolSize());
1368 >        try (PoolCleaner cleaner = cleaner(p)) {
1369 >            for (int s = 1; s < 5; s++) {
1370 >                p.setMaximumPoolSize(s);
1371 >                p.setCorePoolSize(s);
1372 >                try {
1373 >                    p.setMaximumPoolSize(s - 1);
1374 >                    shouldThrow();
1375 >                } catch (IllegalArgumentException success) {}
1376 >                assertEquals(s, p.getCorePoolSize());
1377 >                assertEquals(s, p.getMaximumPoolSize());
1378 >                try {
1379 >                    p.setCorePoolSize(s + 1);
1380 >                    shouldThrow();
1381 >                } catch (IllegalArgumentException success) {}
1382 >                assertEquals(s, p.getCorePoolSize());
1383 >                assertEquals(s, p.getMaximumPoolSize());
1384 >            }
1385          }
1388        joinPool(p);
1386      }
1387  
1388      /**
# Line 1393 | Line 1390 | public class ThreadPoolExecutorTest exte
1390       * when given a negative value
1391       */
1392      public void testKeepAliveTimeIllegalArgumentException() {
1393 <        ThreadPoolExecutor p =
1393 >        final ThreadPoolExecutor p =
1394              new ThreadPoolExecutor(2, 3,
1395                                     LONG_DELAY_MS, MILLISECONDS,
1396                                     new ArrayBlockingQueue<Runnable>(10));
1397 <        try {
1398 <            p.setKeepAliveTime(-1,MILLISECONDS);
1399 <            shouldThrow();
1400 <        } catch (IllegalArgumentException success) {
1401 <        } finally {
1405 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1397 >        try (PoolCleaner cleaner = cleaner(p)) {
1398 >            try {
1399 >                p.setKeepAliveTime(-1, MILLISECONDS);
1400 >                shouldThrow();
1401 >            } catch (IllegalArgumentException success) {}
1402          }
1407        joinPool(p);
1403      }
1404  
1405      /**
# Line 1412 | Line 1407 | public class ThreadPoolExecutorTest exte
1407       */
1408      public void testTerminated() {
1409          ExtendedTPE p = new ExtendedTPE();
1410 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
1411 <        assertTrue(p.terminatedCalled());
1412 <        joinPool(p);
1410 >        try (PoolCleaner cleaner = cleaner(p)) {
1411 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1412 >            assertTrue(p.terminatedCalled());
1413 >            assertTrue(p.isShutdown());
1414 >        }
1415      }
1416  
1417      /**
# Line 1422 | Line 1419 | public class ThreadPoolExecutorTest exte
1419       */
1420      public void testBeforeAfter() throws InterruptedException {
1421          ExtendedTPE p = new ExtendedTPE();
1422 <        try {
1422 >        try (PoolCleaner cleaner = cleaner(p)) {
1423              final CountDownLatch done = new CountDownLatch(1);
1424              p.execute(new CheckedRunnable() {
1425                  public void realRun() {
# Line 1432 | Line 1429 | public class ThreadPoolExecutorTest exte
1429              assertEquals(0, done.getCount());
1430              assertTrue(p.afterCalled());
1431              assertTrue(p.beforeCalled());
1435            try { p.shutdown(); } catch (SecurityException ok) { return; }
1436        } finally {
1437            joinPool(p);
1432          }
1433      }
1434  
# Line 1442 | Line 1436 | public class ThreadPoolExecutorTest exte
1436       * completed submit of callable returns result
1437       */
1438      public void testSubmitCallable() throws Exception {
1439 <        ExecutorService e =
1439 >        final ExecutorService e =
1440              new ThreadPoolExecutor(2, 2,
1441                                     LONG_DELAY_MS, MILLISECONDS,
1442                                     new ArrayBlockingQueue<Runnable>(10));
1443 <        try {
1443 >        try (PoolCleaner cleaner = cleaner(e)) {
1444              Future<String> future = e.submit(new StringTask());
1445              String result = future.get();
1446              assertSame(TEST_STRING, result);
1453        } finally {
1454            joinPool(e);
1447          }
1448      }
1449  
# Line 1459 | Line 1451 | public class ThreadPoolExecutorTest exte
1451       * completed submit of runnable returns successfully
1452       */
1453      public void testSubmitRunnable() throws Exception {
1454 <        ExecutorService e =
1454 >        final ExecutorService e =
1455              new ThreadPoolExecutor(2, 2,
1456                                     LONG_DELAY_MS, MILLISECONDS,
1457                                     new ArrayBlockingQueue<Runnable>(10));
1458 <        try {
1458 >        try (PoolCleaner cleaner = cleaner(e)) {
1459              Future<?> future = e.submit(new NoOpRunnable());
1460              future.get();
1461              assertTrue(future.isDone());
1470        } finally {
1471            joinPool(e);
1462          }
1463      }
1464  
# Line 1476 | Line 1466 | public class ThreadPoolExecutorTest exte
1466       * completed submit of (runnable, result) returns result
1467       */
1468      public void testSubmitRunnable2() throws Exception {
1469 <        ExecutorService e =
1469 >        final ExecutorService e =
1470              new ThreadPoolExecutor(2, 2,
1471                                     LONG_DELAY_MS, MILLISECONDS,
1472                                     new ArrayBlockingQueue<Runnable>(10));
1473 <        try {
1473 >        try (PoolCleaner cleaner = cleaner(e)) {
1474              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1475              String result = future.get();
1476              assertSame(TEST_STRING, result);
1487        } finally {
1488            joinPool(e);
1477          }
1478      }
1479  
# Line 1493 | Line 1481 | public class ThreadPoolExecutorTest exte
1481       * invokeAny(null) throws NPE
1482       */
1483      public void testInvokeAny1() throws Exception {
1484 <        ExecutorService e =
1484 >        final ExecutorService e =
1485              new ThreadPoolExecutor(2, 2,
1486                                     LONG_DELAY_MS, MILLISECONDS,
1487                                     new ArrayBlockingQueue<Runnable>(10));
1488 <        try {
1489 <            e.invokeAny(null);
1490 <            shouldThrow();
1491 <        } catch (NullPointerException success) {
1492 <        } finally {
1505 <            joinPool(e);
1488 >        try (PoolCleaner cleaner = cleaner(e)) {
1489 >            try {
1490 >                e.invokeAny(null);
1491 >                shouldThrow();
1492 >            } catch (NullPointerException success) {}
1493          }
1494      }
1495  
# Line 1510 | Line 1497 | public class ThreadPoolExecutorTest exte
1497       * invokeAny(empty collection) throws IAE
1498       */
1499      public void testInvokeAny2() throws Exception {
1500 <        ExecutorService e =
1500 >        final ExecutorService e =
1501              new ThreadPoolExecutor(2, 2,
1502                                     LONG_DELAY_MS, MILLISECONDS,
1503                                     new ArrayBlockingQueue<Runnable>(10));
1504 <        try {
1505 <            e.invokeAny(new ArrayList<Callable<String>>());
1506 <            shouldThrow();
1507 <        } catch (IllegalArgumentException success) {
1508 <        } finally {
1522 <            joinPool(e);
1504 >        try (PoolCleaner cleaner = cleaner(e)) {
1505 >            try {
1506 >                e.invokeAny(new ArrayList<Callable<String>>());
1507 >                shouldThrow();
1508 >            } catch (IllegalArgumentException success) {}
1509          }
1510      }
1511  
# Line 1532 | Line 1518 | public class ThreadPoolExecutorTest exte
1518              new ThreadPoolExecutor(2, 2,
1519                                     LONG_DELAY_MS, MILLISECONDS,
1520                                     new ArrayBlockingQueue<Runnable>(10));
1521 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1522 <        l.add(latchAwaitingStringTask(latch));
1523 <        l.add(null);
1524 <        try {
1525 <            e.invokeAny(l);
1526 <            shouldThrow();
1527 <        } catch (NullPointerException success) {
1528 <        } finally {
1521 >        try (PoolCleaner cleaner = cleaner(e)) {
1522 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1523 >            l.add(latchAwaitingStringTask(latch));
1524 >            l.add(null);
1525 >            try {
1526 >                e.invokeAny(l);
1527 >                shouldThrow();
1528 >            } catch (NullPointerException success) {}
1529              latch.countDown();
1544            joinPool(e);
1530          }
1531      }
1532  
# Line 1549 | Line 1534 | public class ThreadPoolExecutorTest exte
1534       * invokeAny(c) throws ExecutionException if no task completes
1535       */
1536      public void testInvokeAny4() throws Exception {
1537 <        ExecutorService e =
1537 >        final ExecutorService e =
1538              new ThreadPoolExecutor(2, 2,
1539                                     LONG_DELAY_MS, MILLISECONDS,
1540                                     new ArrayBlockingQueue<Runnable>(10));
1541 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1542 <        l.add(new NPETask());
1543 <        try {
1544 <            e.invokeAny(l);
1545 <            shouldThrow();
1546 <        } catch (ExecutionException success) {
1547 <            assertTrue(success.getCause() instanceof NullPointerException);
1548 <        } finally {
1549 <            joinPool(e);
1541 >        try (PoolCleaner cleaner = cleaner(e)) {
1542 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1543 >            l.add(new NPETask());
1544 >            try {
1545 >                e.invokeAny(l);
1546 >                shouldThrow();
1547 >            } catch (ExecutionException success) {
1548 >                assertTrue(success.getCause() instanceof NullPointerException);
1549 >            }
1550          }
1551      }
1552  
# Line 1569 | Line 1554 | public class ThreadPoolExecutorTest exte
1554       * invokeAny(c) returns result of some task
1555       */
1556      public void testInvokeAny5() throws Exception {
1557 <        ExecutorService e =
1557 >        final ExecutorService e =
1558              new ThreadPoolExecutor(2, 2,
1559                                     LONG_DELAY_MS, MILLISECONDS,
1560                                     new ArrayBlockingQueue<Runnable>(10));
1561 <        try {
1561 >        try (PoolCleaner cleaner = cleaner(e)) {
1562              List<Callable<String>> l = new ArrayList<Callable<String>>();
1563              l.add(new StringTask());
1564              l.add(new StringTask());
1565              String result = e.invokeAny(l);
1566              assertSame(TEST_STRING, result);
1582        } finally {
1583            joinPool(e);
1567          }
1568      }
1569  
# Line 1588 | Line 1571 | public class ThreadPoolExecutorTest exte
1571       * invokeAll(null) throws NPE
1572       */
1573      public void testInvokeAll1() throws Exception {
1574 <        ExecutorService e =
1574 >        final ExecutorService e =
1575              new ThreadPoolExecutor(2, 2,
1576                                     LONG_DELAY_MS, MILLISECONDS,
1577                                     new ArrayBlockingQueue<Runnable>(10));
1578 <        try {
1579 <            e.invokeAll(null);
1580 <            shouldThrow();
1581 <        } catch (NullPointerException success) {
1582 <        } finally {
1600 <            joinPool(e);
1578 >        try (PoolCleaner cleaner = cleaner(e)) {
1579 >            try {
1580 >                e.invokeAll(null);
1581 >                shouldThrow();
1582 >            } catch (NullPointerException success) {}
1583          }
1584      }
1585  
# Line 1605 | Line 1587 | public class ThreadPoolExecutorTest exte
1587       * invokeAll(empty collection) returns empty collection
1588       */
1589      public void testInvokeAll2() throws InterruptedException {
1590 <        ExecutorService e =
1590 >        final ExecutorService e =
1591              new ThreadPoolExecutor(2, 2,
1592                                     LONG_DELAY_MS, MILLISECONDS,
1593                                     new ArrayBlockingQueue<Runnable>(10));
1594 <        try {
1594 >        try (PoolCleaner cleaner = cleaner(e)) {
1595              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1596              assertTrue(r.isEmpty());
1615        } finally {
1616            joinPool(e);
1597          }
1598      }
1599  
# Line 1621 | Line 1601 | public class ThreadPoolExecutorTest exte
1601       * invokeAll(c) throws NPE if c has null elements
1602       */
1603      public void testInvokeAll3() throws Exception {
1604 <        ExecutorService e =
1604 >        final ExecutorService e =
1605              new ThreadPoolExecutor(2, 2,
1606                                     LONG_DELAY_MS, MILLISECONDS,
1607                                     new ArrayBlockingQueue<Runnable>(10));
1608 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1609 <        l.add(new StringTask());
1610 <        l.add(null);
1611 <        try {
1612 <            e.invokeAll(l);
1613 <            shouldThrow();
1614 <        } catch (NullPointerException success) {
1615 <        } finally {
1636 <            joinPool(e);
1608 >        try (PoolCleaner cleaner = cleaner(e)) {
1609 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1610 >            l.add(new StringTask());
1611 >            l.add(null);
1612 >            try {
1613 >                e.invokeAll(l);
1614 >                shouldThrow();
1615 >            } catch (NullPointerException success) {}
1616          }
1617      }
1618  
# Line 1641 | Line 1620 | public class ThreadPoolExecutorTest exte
1620       * get of element of invokeAll(c) throws exception on failed task
1621       */
1622      public void testInvokeAll4() throws Exception {
1623 <        ExecutorService e =
1623 >        final ExecutorService e =
1624              new ThreadPoolExecutor(2, 2,
1625                                     LONG_DELAY_MS, MILLISECONDS,
1626                                     new ArrayBlockingQueue<Runnable>(10));
1627 <        try {
1627 >        try (PoolCleaner cleaner = cleaner(e)) {
1628              List<Callable<String>> l = new ArrayList<Callable<String>>();
1629              l.add(new NPETask());
1630              List<Future<String>> futures = e.invokeAll(l);
# Line 1656 | Line 1635 | public class ThreadPoolExecutorTest exte
1635              } catch (ExecutionException success) {
1636                  assertTrue(success.getCause() instanceof NullPointerException);
1637              }
1659        } finally {
1660            joinPool(e);
1638          }
1639      }
1640  
# Line 1665 | Line 1642 | public class ThreadPoolExecutorTest exte
1642       * invokeAll(c) returns results of all completed tasks
1643       */
1644      public void testInvokeAll5() throws Exception {
1645 <        ExecutorService e =
1645 >        final ExecutorService e =
1646              new ThreadPoolExecutor(2, 2,
1647                                     LONG_DELAY_MS, MILLISECONDS,
1648                                     new ArrayBlockingQueue<Runnable>(10));
1649 <        try {
1649 >        try (PoolCleaner cleaner = cleaner(e)) {
1650              List<Callable<String>> l = new ArrayList<Callable<String>>();
1651              l.add(new StringTask());
1652              l.add(new StringTask());
# Line 1677 | Line 1654 | public class ThreadPoolExecutorTest exte
1654              assertEquals(2, futures.size());
1655              for (Future<String> future : futures)
1656                  assertSame(TEST_STRING, future.get());
1680        } finally {
1681            joinPool(e);
1657          }
1658      }
1659  
# Line 1686 | Line 1661 | public class ThreadPoolExecutorTest exte
1661       * timed invokeAny(null) throws NPE
1662       */
1663      public void testTimedInvokeAny1() throws Exception {
1664 <        ExecutorService e =
1664 >        final ExecutorService e =
1665              new ThreadPoolExecutor(2, 2,
1666                                     LONG_DELAY_MS, MILLISECONDS,
1667                                     new ArrayBlockingQueue<Runnable>(10));
1668 <        try {
1669 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1670 <            shouldThrow();
1671 <        } catch (NullPointerException success) {
1672 <        } finally {
1698 <            joinPool(e);
1668 >        try (PoolCleaner cleaner = cleaner(e)) {
1669 >            try {
1670 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1671 >                shouldThrow();
1672 >            } catch (NullPointerException success) {}
1673          }
1674      }
1675  
# Line 1703 | Line 1677 | public class ThreadPoolExecutorTest exte
1677       * timed invokeAny(,,null) throws NPE
1678       */
1679      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1680 <        ExecutorService e =
1680 >        final ExecutorService e =
1681              new ThreadPoolExecutor(2, 2,
1682                                     LONG_DELAY_MS, MILLISECONDS,
1683                                     new ArrayBlockingQueue<Runnable>(10));
1684 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1685 <        l.add(new StringTask());
1686 <        try {
1687 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1688 <            shouldThrow();
1689 <        } catch (NullPointerException success) {
1690 <        } finally {
1717 <            joinPool(e);
1684 >        try (PoolCleaner cleaner = cleaner(e)) {
1685 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1686 >            l.add(new StringTask());
1687 >            try {
1688 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1689 >                shouldThrow();
1690 >            } catch (NullPointerException success) {}
1691          }
1692      }
1693  
# Line 1722 | Line 1695 | public class ThreadPoolExecutorTest exte
1695       * timed invokeAny(empty collection) throws IAE
1696       */
1697      public void testTimedInvokeAny2() throws Exception {
1698 <        ExecutorService e =
1698 >        final ExecutorService e =
1699              new ThreadPoolExecutor(2, 2,
1700                                     LONG_DELAY_MS, MILLISECONDS,
1701                                     new ArrayBlockingQueue<Runnable>(10));
1702 <        try {
1703 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1704 <            shouldThrow();
1705 <        } catch (IllegalArgumentException success) {
1706 <        } finally {
1707 <            joinPool(e);
1702 >        try (PoolCleaner cleaner = cleaner(e)) {
1703 >            try {
1704 >                e.invokeAny(new ArrayList<Callable<String>>(),
1705 >                            MEDIUM_DELAY_MS, MILLISECONDS);
1706 >                shouldThrow();
1707 >            } catch (IllegalArgumentException success) {}
1708          }
1709      }
1710  
# Line 1744 | Line 1717 | public class ThreadPoolExecutorTest exte
1717              new ThreadPoolExecutor(2, 2,
1718                                     LONG_DELAY_MS, MILLISECONDS,
1719                                     new ArrayBlockingQueue<Runnable>(10));
1720 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1721 <        l.add(latchAwaitingStringTask(latch));
1722 <        l.add(null);
1723 <        try {
1724 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1725 <            shouldThrow();
1726 <        } catch (NullPointerException success) {
1727 <        } finally {
1720 >        try (PoolCleaner cleaner = cleaner(e)) {
1721 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1722 >            l.add(latchAwaitingStringTask(latch));
1723 >            l.add(null);
1724 >            try {
1725 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1726 >                shouldThrow();
1727 >            } catch (NullPointerException success) {}
1728              latch.countDown();
1756            joinPool(e);
1729          }
1730      }
1731  
# Line 1761 | Line 1733 | public class ThreadPoolExecutorTest exte
1733       * timed invokeAny(c) throws ExecutionException if no task completes
1734       */
1735      public void testTimedInvokeAny4() throws Exception {
1736 <        ExecutorService e =
1736 >        final ExecutorService e =
1737              new ThreadPoolExecutor(2, 2,
1738                                     LONG_DELAY_MS, MILLISECONDS,
1739                                     new ArrayBlockingQueue<Runnable>(10));
1740 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1741 <        l.add(new NPETask());
1742 <        try {
1743 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1744 <            shouldThrow();
1745 <        } catch (ExecutionException success) {
1746 <            assertTrue(success.getCause() instanceof NullPointerException);
1747 <        } finally {
1748 <            joinPool(e);
1740 >        try (PoolCleaner cleaner = cleaner(e)) {
1741 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1742 >            l.add(new NPETask());
1743 >            try {
1744 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1745 >                shouldThrow();
1746 >            } catch (ExecutionException success) {
1747 >                assertTrue(success.getCause() instanceof NullPointerException);
1748 >            }
1749          }
1750      }
1751  
# Line 1781 | Line 1753 | public class ThreadPoolExecutorTest exte
1753       * timed invokeAny(c) returns result of some task
1754       */
1755      public void testTimedInvokeAny5() throws Exception {
1756 <        ExecutorService e =
1756 >        final ExecutorService e =
1757              new ThreadPoolExecutor(2, 2,
1758                                     LONG_DELAY_MS, MILLISECONDS,
1759                                     new ArrayBlockingQueue<Runnable>(10));
1760 <        try {
1760 >        try (PoolCleaner cleaner = cleaner(e)) {
1761              List<Callable<String>> l = new ArrayList<Callable<String>>();
1762              l.add(new StringTask());
1763              l.add(new StringTask());
1764              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1765              assertSame(TEST_STRING, result);
1794        } finally {
1795            joinPool(e);
1766          }
1767      }
1768  
# Line 1800 | Line 1770 | public class ThreadPoolExecutorTest exte
1770       * timed invokeAll(null) throws NPE
1771       */
1772      public void testTimedInvokeAll1() throws Exception {
1773 <        ExecutorService e =
1773 >        final ExecutorService e =
1774              new ThreadPoolExecutor(2, 2,
1775                                     LONG_DELAY_MS, MILLISECONDS,
1776                                     new ArrayBlockingQueue<Runnable>(10));
1777 <        try {
1778 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1779 <            shouldThrow();
1780 <        } catch (NullPointerException success) {
1781 <        } finally {
1812 <            joinPool(e);
1777 >        try (PoolCleaner cleaner = cleaner(e)) {
1778 >            try {
1779 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1780 >                shouldThrow();
1781 >            } catch (NullPointerException success) {}
1782          }
1783      }
1784  
# Line 1817 | Line 1786 | public class ThreadPoolExecutorTest exte
1786       * timed invokeAll(,,null) throws NPE
1787       */
1788      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1789 <        ExecutorService e =
1789 >        final ExecutorService e =
1790              new ThreadPoolExecutor(2, 2,
1791                                     LONG_DELAY_MS, MILLISECONDS,
1792                                     new ArrayBlockingQueue<Runnable>(10));
1793 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1794 <        l.add(new StringTask());
1795 <        try {
1796 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1797 <            shouldThrow();
1798 <        } catch (NullPointerException success) {
1799 <        } finally {
1831 <            joinPool(e);
1793 >        try (PoolCleaner cleaner = cleaner(e)) {
1794 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1795 >            l.add(new StringTask());
1796 >            try {
1797 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1798 >                shouldThrow();
1799 >            } catch (NullPointerException success) {}
1800          }
1801      }
1802  
# Line 1836 | Line 1804 | public class ThreadPoolExecutorTest exte
1804       * timed invokeAll(empty collection) returns empty collection
1805       */
1806      public void testTimedInvokeAll2() throws InterruptedException {
1807 <        ExecutorService e =
1807 >        final ExecutorService e =
1808              new ThreadPoolExecutor(2, 2,
1809                                     LONG_DELAY_MS, MILLISECONDS,
1810                                     new ArrayBlockingQueue<Runnable>(10));
1811 <        try {
1812 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1811 >        try (PoolCleaner cleaner = cleaner(e)) {
1812 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1813 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1814              assertTrue(r.isEmpty());
1846        } finally {
1847            joinPool(e);
1815          }
1816      }
1817  
# Line 1852 | Line 1819 | public class ThreadPoolExecutorTest exte
1819       * timed invokeAll(c) throws NPE if c has null elements
1820       */
1821      public void testTimedInvokeAll3() throws Exception {
1822 <        ExecutorService e =
1822 >        final ExecutorService e =
1823              new ThreadPoolExecutor(2, 2,
1824                                     LONG_DELAY_MS, MILLISECONDS,
1825                                     new ArrayBlockingQueue<Runnable>(10));
1826 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1827 <        l.add(new StringTask());
1828 <        l.add(null);
1829 <        try {
1830 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1831 <            shouldThrow();
1832 <        } catch (NullPointerException success) {
1833 <        } finally {
1867 <            joinPool(e);
1826 >        try (PoolCleaner cleaner = cleaner(e)) {
1827 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1828 >            l.add(new StringTask());
1829 >            l.add(null);
1830 >            try {
1831 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1832 >                shouldThrow();
1833 >            } catch (NullPointerException success) {}
1834          }
1835      }
1836  
# Line 1872 | Line 1838 | public class ThreadPoolExecutorTest exte
1838       * get of element of invokeAll(c) throws exception on failed task
1839       */
1840      public void testTimedInvokeAll4() throws Exception {
1841 <        ExecutorService e =
1841 >        final ExecutorService e =
1842              new ThreadPoolExecutor(2, 2,
1843                                     LONG_DELAY_MS, MILLISECONDS,
1844                                     new ArrayBlockingQueue<Runnable>(10));
1845 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1846 <        l.add(new NPETask());
1847 <        List<Future<String>> futures =
1848 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1849 <        assertEquals(1, futures.size());
1850 <        try {
1851 <            futures.get(0).get();
1852 <            shouldThrow();
1853 <        } catch (ExecutionException success) {
1854 <            assertTrue(success.getCause() instanceof NullPointerException);
1855 <        } finally {
1856 <            joinPool(e);
1845 >        try (PoolCleaner cleaner = cleaner(e)) {
1846 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1847 >            l.add(new NPETask());
1848 >            List<Future<String>> futures =
1849 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1850 >            assertEquals(1, futures.size());
1851 >            try {
1852 >                futures.get(0).get();
1853 >                shouldThrow();
1854 >            } catch (ExecutionException success) {
1855 >                assertTrue(success.getCause() instanceof NullPointerException);
1856 >            }
1857          }
1858      }
1859  
# Line 1895 | Line 1861 | public class ThreadPoolExecutorTest exte
1861       * timed invokeAll(c) returns results of all completed tasks
1862       */
1863      public void testTimedInvokeAll5() throws Exception {
1864 <        ExecutorService e =
1864 >        final ExecutorService e =
1865              new ThreadPoolExecutor(2, 2,
1866                                     LONG_DELAY_MS, MILLISECONDS,
1867                                     new ArrayBlockingQueue<Runnable>(10));
1868 <        try {
1868 >        try (PoolCleaner cleaner = cleaner(e)) {
1869              List<Callable<String>> l = new ArrayList<Callable<String>>();
1870              l.add(new StringTask());
1871              l.add(new StringTask());
# Line 1908 | Line 1874 | public class ThreadPoolExecutorTest exte
1874              assertEquals(2, futures.size());
1875              for (Future<String> future : futures)
1876                  assertSame(TEST_STRING, future.get());
1911        } finally {
1912            joinPool(e);
1877          }
1878      }
1879  
# Line 1917 | Line 1881 | public class ThreadPoolExecutorTest exte
1881       * timed invokeAll(c) cancels tasks not completed by timeout
1882       */
1883      public void testTimedInvokeAll6() throws Exception {
1884 <        ExecutorService e =
1884 >        final ExecutorService e =
1885              new ThreadPoolExecutor(2, 2,
1886                                     LONG_DELAY_MS, MILLISECONDS,
1887                                     new ArrayBlockingQueue<Runnable>(10));
1888 <        try {
1888 >        try (PoolCleaner cleaner = cleaner(e)) {
1889              for (long timeout = timeoutMillis();;) {
1890                  List<Callable<String>> tasks = new ArrayList<>();
1891                  tasks.add(new StringTask("0"));
# Line 1945 | Line 1909 | public class ThreadPoolExecutorTest exte
1909                          fail("expected exactly one task to be cancelled");
1910                  }
1911              }
1948        } finally {
1949            joinPool(e);
1912          }
1913      }
1914  
# Line 1960 | Line 1922 | public class ThreadPoolExecutorTest exte
1922                                     LONG_DELAY_MS, MILLISECONDS,
1923                                     new LinkedBlockingQueue<Runnable>(),
1924                                     new FailingThreadFactory());
1925 <        try {
1925 >        try (PoolCleaner cleaner = cleaner(e)) {
1926              final int TASKS = 100;
1927              final CountDownLatch done = new CountDownLatch(TASKS);
1928              for (int k = 0; k < TASKS; ++k)
# Line 1969 | Line 1931 | public class ThreadPoolExecutorTest exte
1931                          done.countDown();
1932                      }});
1933              assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1972        } finally {
1973            joinPool(e);
1934          }
1935      }
1936  
# Line 1982 | Line 1942 | public class ThreadPoolExecutorTest exte
1942              new ThreadPoolExecutor(2, 2,
1943                                     1000, MILLISECONDS,
1944                                     new ArrayBlockingQueue<Runnable>(10));
1945 <        assertFalse(p.allowsCoreThreadTimeOut());
1946 <        joinPool(p);
1945 >        try (PoolCleaner cleaner = cleaner(p)) {
1946 >            assertFalse(p.allowsCoreThreadTimeOut());
1947 >        }
1948      }
1949  
1950      /**
# Line 1995 | Line 1956 | public class ThreadPoolExecutorTest exte
1956              new ThreadPoolExecutor(2, 10,
1957                                     keepAliveTime, MILLISECONDS,
1958                                     new ArrayBlockingQueue<Runnable>(10));
1959 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1960 <        try {
1959 >        try (PoolCleaner cleaner = cleaner(p)) {
1960 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1961              p.allowCoreThreadTimeOut(true);
1962              p.execute(new CheckedRunnable() {
1963                  public void realRun() {
# Line 2011 | Line 1972 | public class ThreadPoolExecutorTest exte
1972                  Thread.yield();
1973              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1974              assertEquals(0, p.getPoolSize());
2014        } finally {
2015            joinPool(p);
1975          }
1976      }
1977  
# Line 2025 | Line 1984 | public class ThreadPoolExecutorTest exte
1984              new ThreadPoolExecutor(2, 10,
1985                                     keepAliveTime, MILLISECONDS,
1986                                     new ArrayBlockingQueue<Runnable>(10));
1987 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1988 <        try {
1987 >        try (PoolCleaner cleaner = cleaner(p)) {
1988 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1989              p.allowCoreThreadTimeOut(false);
1990              p.execute(new CheckedRunnable() {
1991                  public void realRun() throws InterruptedException {
# Line 2035 | Line 1994 | public class ThreadPoolExecutorTest exte
1994                  }});
1995              delay(2 * keepAliveTime);
1996              assertTrue(p.getPoolSize() >= 1);
2038        } finally {
2039            joinPool(p);
1997          }
1998      }
1999  
# Line 2055 | Line 2012 | public class ThreadPoolExecutorTest exte
2012              new ThreadPoolExecutor(1, 30,
2013                                     60, SECONDS,
2014                                     new ArrayBlockingQueue(30));
2015 <        try {
2015 >        try (PoolCleaner cleaner = cleaner(p)) {
2016              for (int i = 0; i < nTasks; ++i) {
2017                  for (;;) {
2018                      try {
# Line 2067 | Line 2024 | public class ThreadPoolExecutorTest exte
2024              }
2025              // enough time to run all tasks
2026              assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
2070        } finally {
2071            joinPool(p);
2027          }
2028      }
2029  
# Line 2080 | Line 2035 | public class ThreadPoolExecutorTest exte
2035              new ThreadPoolExecutor(1, 1,
2036                                     LONG_DELAY_MS, MILLISECONDS,
2037                                     new LinkedBlockingQueue<Runnable>());
2038 <        try {
2038 >        try (PoolCleaner cleaner = cleaner(e)) {
2039              final CountDownLatch blockerStarted = new CountDownLatch(1);
2040              final CountDownLatch done = new CountDownLatch(1);
2041              final List<Future<?>> futures = new ArrayList<>();
# Line 2107 | Line 2062 | public class ThreadPoolExecutorTest exte
2062                  assertTrue(future.isDone());
2063              }
2064              done.countDown();
2110        } finally {
2111            joinPool(e);
2065          }
2066      }
2067  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines