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.80 by jsr166, Sun Oct 4 06:39:13 2015 UTC vs.
Revision 1.107 by dl, Tue Mar 22 21:29:24 2022 UTC

# Line 10 | Line 10 | import static java.util.concurrent.TimeU
10   import static java.util.concurrent.TimeUnit.SECONDS;
11  
12   import java.util.ArrayList;
13 + import java.util.Collection;
14 + import java.util.Collections;
15   import java.util.List;
16   import java.util.concurrent.ArrayBlockingQueue;
17   import java.util.concurrent.BlockingQueue;
# Line 17 | Line 19 | import java.util.concurrent.Callable;
19   import java.util.concurrent.CancellationException;
20   import java.util.concurrent.CountDownLatch;
21   import java.util.concurrent.ExecutionException;
20 import java.util.concurrent.Executors;
22   import java.util.concurrent.ExecutorService;
23   import java.util.concurrent.Future;
24   import java.util.concurrent.FutureTask;
25   import java.util.concurrent.LinkedBlockingQueue;
25 import java.util.concurrent.RejectedExecutionException;
26   import java.util.concurrent.RejectedExecutionHandler;
27   import java.util.concurrent.RunnableFuture;
28   import java.util.concurrent.SynchronousQueue;
29   import java.util.concurrent.ThreadFactory;
30 + import java.util.concurrent.ThreadLocalRandom;
31   import java.util.concurrent.ThreadPoolExecutor;
32   import java.util.concurrent.TimeoutException;
33   import java.util.concurrent.TimeUnit;
# Line 239 | Line 240 | public class ThreadPoolExecutorSubclassT
240              final Runnable task = new CheckedRunnable() {
241                  public void realRun() { done.countDown(); }};
242              p.execute(task);
243 <            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243 >            await(done);
244          }
245      }
246  
# Line 248 | Line 249 | public class ThreadPoolExecutorSubclassT
249       * thread becomes active
250       */
251      public void testGetActiveCount() throws InterruptedException {
252 +        final CountDownLatch done = new CountDownLatch(1);
253          final ThreadPoolExecutor p =
254              new CustomTPE(2, 2,
255                            LONG_DELAY_MS, MILLISECONDS,
256                            new ArrayBlockingQueue<Runnable>(10));
257 <        try (PoolCleaner cleaner = cleaner(p)) {
257 >        try (PoolCleaner cleaner = cleaner(p, done)) {
258              final CountDownLatch threadStarted = new CountDownLatch(1);
257            final CountDownLatch done = new CountDownLatch(1);
259              assertEquals(0, p.getActiveCount());
260              p.execute(new CheckedRunnable() {
261                  public void realRun() throws InterruptedException {
262                      threadStarted.countDown();
263                      assertEquals(1, p.getActiveCount());
264 <                    done.await();
264 >                    await(done);
265                  }});
266 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
266 >            await(threadStarted);
267              assertEquals(1, p.getActiveCount());
267            done.countDown();
268          }
269      }
270  
# Line 334 | Line 334 | public class ThreadPoolExecutorSubclassT
334                  public void realRun() throws InterruptedException {
335                      threadStarted.countDown();
336                      assertEquals(0, p.getCompletedTaskCount());
337 <                    threadProceed.await();
337 >                    await(threadProceed);
338                      threadDone.countDown();
339                  }});
340              await(threadStarted);
341              assertEquals(0, p.getCompletedTaskCount());
342              threadProceed.countDown();
343 <            threadDone.await();
343 >            await(threadDone);
344              long startTime = System.nanoTime();
345              while (p.getCompletedTaskCount() != 1) {
346                  if (millisElapsedSince(startTime) > LONG_DELAY_MS)
# Line 476 | Line 476 | public class ThreadPoolExecutorSubclassT
476       */
477      public void testGetLargestPoolSize() throws InterruptedException {
478          final int THREADS = 3;
479 +        final CountDownLatch done = new CountDownLatch(1);
480          final ThreadPoolExecutor p =
481              new CustomTPE(THREADS, THREADS,
482                            LONG_DELAY_MS, MILLISECONDS,
483                            new ArrayBlockingQueue<Runnable>(10));
484 <        try (PoolCleaner cleaner = cleaner(p)) {
484 <            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
485 <            final CountDownLatch done = new CountDownLatch(1);
484 >        try (PoolCleaner cleaner = cleaner(p, done)) {
485              assertEquals(0, p.getLargestPoolSize());
486 +            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
487              for (int i = 0; i < THREADS; i++)
488                  p.execute(new CheckedRunnable() {
489                      public void realRun() throws InterruptedException {
490                          threadsStarted.countDown();
491 <                        done.await();
491 >                        await(done);
492                          assertEquals(THREADS, p.getLargestPoolSize());
493                      }});
494 <            assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
494 >            await(threadsStarted);
495              assertEquals(THREADS, p.getLargestPoolSize());
496            done.countDown();   // release pool
496          }
497          assertEquals(THREADS, p.getLargestPoolSize());
498      }
# Line 521 | Line 520 | public class ThreadPoolExecutorSubclassT
520       * become active
521       */
522      public void testGetPoolSize() throws InterruptedException {
523 +        final CountDownLatch done = new CountDownLatch(1);
524          final ThreadPoolExecutor p =
525              new CustomTPE(1, 1,
526                            LONG_DELAY_MS, MILLISECONDS,
527                            new ArrayBlockingQueue<Runnable>(10));
528 <        try (PoolCleaner cleaner = cleaner(p)) {
529 <            final CountDownLatch threadStarted = new CountDownLatch(1);
530 <            final CountDownLatch done = new CountDownLatch(1);
528 >        try (PoolCleaner cleaner = cleaner(p, done)) {
529              assertEquals(0, p.getPoolSize());
530 +            final CountDownLatch threadStarted = new CountDownLatch(1);
531              p.execute(new CheckedRunnable() {
532                  public void realRun() throws InterruptedException {
533                      threadStarted.countDown();
534                      assertEquals(1, p.getPoolSize());
535 <                    done.await();
535 >                    await(done);
536                  }});
537 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
537 >            await(threadStarted);
538              assertEquals(1, p.getPoolSize());
540            done.countDown();   // release pool
539          }
540      }
541  
# Line 545 | Line 543 | public class ThreadPoolExecutorSubclassT
543       * getTaskCount increases, but doesn't overestimate, when tasks submitted
544       */
545      public void testGetTaskCount() throws InterruptedException {
546 +        final int TASKS = 3;
547 +        final CountDownLatch done = new CountDownLatch(1);
548          final ThreadPoolExecutor p =
549              new CustomTPE(1, 1,
550                            LONG_DELAY_MS, MILLISECONDS,
551                            new ArrayBlockingQueue<Runnable>(10));
552 <        try (PoolCleaner cleaner = cleaner(p)) {
552 >        try (PoolCleaner cleaner = cleaner(p, done)) {
553              final CountDownLatch threadStarted = new CountDownLatch(1);
554            final CountDownLatch done = new CountDownLatch(1);
554              assertEquals(0, p.getTaskCount());
555 +            assertEquals(0, p.getCompletedTaskCount());
556              p.execute(new CheckedRunnable() {
557                  public void realRun() throws InterruptedException {
558                      threadStarted.countDown();
559 <                    assertEquals(1, p.getTaskCount());
560 <                    done.await();
559 >                    await(done);
560                  }});
561 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
561 >            await(threadStarted);
562              assertEquals(1, p.getTaskCount());
563 <            done.countDown();
563 >            assertEquals(0, p.getCompletedTaskCount());
564 >            for (int i = 0; i < TASKS; i++) {
565 >                assertEquals(1 + i, p.getTaskCount());
566 >                p.execute(new CheckedRunnable() {
567 >                    public void realRun() throws InterruptedException {
568 >                        threadStarted.countDown();
569 >                        assertEquals(1 + TASKS, p.getTaskCount());
570 >                        await(done);
571 >                    }});
572 >            }
573 >            assertEquals(1 + TASKS, p.getTaskCount());
574 >            assertEquals(0, p.getCompletedTaskCount());
575          }
576 +        assertEquals(1 + TASKS, p.getTaskCount());
577 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
578      }
579  
580      /**
# Line 596 | Line 608 | public class ThreadPoolExecutorSubclassT
608                  public void realRun() throws InterruptedException {
609                      assertFalse(p.isTerminating());
610                      threadStarted.countDown();
611 <                    done.await();
611 >                    await(done);
612                  }});
613 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
613 >            await(threadStarted);
614              assertFalse(p.isTerminating());
615              done.countDown();
616              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 624 | Line 636 | public class ThreadPoolExecutorSubclassT
636                  public void realRun() throws InterruptedException {
637                      assertFalse(p.isTerminating());
638                      threadStarted.countDown();
639 <                    done.await();
639 >                    await(done);
640                  }});
641 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
641 >            await(threadStarted);
642              assertFalse(p.isTerminating());
643              done.countDown();
644              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 640 | Line 652 | public class ThreadPoolExecutorSubclassT
652       * getQueue returns the work queue, which contains queued tasks
653       */
654      public void testGetQueue() throws InterruptedException {
655 <        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
655 >        final CountDownLatch done = new CountDownLatch(1);
656 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
657          final ThreadPoolExecutor p =
658              new CustomTPE(1, 1,
659                            LONG_DELAY_MS, MILLISECONDS,
660                            q);
661 <        try (PoolCleaner cleaner = cleaner(p)) {
661 >        try (PoolCleaner cleaner = cleaner(p, done)) {
662              final CountDownLatch threadStarted = new CountDownLatch(1);
663 <            final CountDownLatch done = new CountDownLatch(1);
664 <            FutureTask[] tasks = new FutureTask[5];
663 >            FutureTask[] rtasks = new FutureTask[5];
664 >            @SuppressWarnings("unchecked")
665 >            FutureTask<Boolean>[] tasks = (FutureTask<Boolean>[])rtasks;
666              for (int i = 0; i < tasks.length; i++) {
667 <                Callable task = new CheckedCallable<Boolean>() {
667 >                Callable<Boolean> task = new CheckedCallable<>() {
668                      public Boolean realCall() throws InterruptedException {
669                          threadStarted.countDown();
670                          assertSame(q, p.getQueue());
671 <                        done.await();
671 >                        await(done);
672                          return Boolean.TRUE;
673                      }};
674 <                tasks[i] = new FutureTask(task);
674 >                tasks[i] = new FutureTask<>(task);
675                  p.execute(tasks[i]);
676              }
677 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
677 >            await(threadStarted);
678              assertSame(q, p.getQueue());
679              assertFalse(q.contains(tasks[0]));
680              assertTrue(q.contains(tasks[tasks.length - 1]));
681              assertEquals(tasks.length - 1, q.size());
668            done.countDown();
682          }
683      }
684  
# Line 673 | Line 686 | public class ThreadPoolExecutorSubclassT
686       * remove(task) removes queued task, and fails to remove active task
687       */
688      public void testRemove() throws InterruptedException {
689 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
689 >        final CountDownLatch done = new CountDownLatch(1);
690 >        BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
691          final ThreadPoolExecutor p =
692              new CustomTPE(1, 1,
693                            LONG_DELAY_MS, MILLISECONDS,
694                            q);
695 <        try (PoolCleaner cleaner = cleaner(p)) {
695 >        try (PoolCleaner cleaner = cleaner(p, done)) {
696              Runnable[] tasks = new Runnable[6];
697              final CountDownLatch threadStarted = new CountDownLatch(1);
684            final CountDownLatch done = new CountDownLatch(1);
698              for (int i = 0; i < tasks.length; i++) {
699                  tasks[i] = new CheckedRunnable() {
700                      public void realRun() throws InterruptedException {
701                          threadStarted.countDown();
702 <                        done.await();
702 >                        await(done);
703                      }};
704                  p.execute(tasks[i]);
705              }
706 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
706 >            await(threadStarted);
707              assertFalse(p.remove(tasks[0]));
708              assertTrue(q.contains(tasks[4]));
709              assertTrue(q.contains(tasks[3]));
# Line 700 | Line 713 | public class ThreadPoolExecutorSubclassT
713              assertTrue(q.contains(tasks[3]));
714              assertTrue(p.remove(tasks[3]));
715              assertFalse(q.contains(tasks[3]));
703            done.countDown();
716          }
717      }
718  
# Line 710 | Line 722 | public class ThreadPoolExecutorSubclassT
722      public void testPurge() throws InterruptedException {
723          final CountDownLatch threadStarted = new CountDownLatch(1);
724          final CountDownLatch done = new CountDownLatch(1);
725 <        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
725 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
726          final ThreadPoolExecutor p =
727              new CustomTPE(1, 1,
728                            LONG_DELAY_MS, MILLISECONDS,
729                            q);
730 <        try (PoolCleaner cleaner = cleaner(p)) {
731 <            FutureTask[] tasks = new FutureTask[5];
730 >        try (PoolCleaner cleaner = cleaner(p, done)) {
731 >            FutureTask[] rtasks = new FutureTask[5];
732 >            @SuppressWarnings("unchecked")
733 >            FutureTask<Boolean>[] tasks = (FutureTask<Boolean>[])rtasks;
734              for (int i = 0; i < tasks.length; i++) {
735 <                Callable task = new CheckedCallable<Boolean>() {
735 >                Callable<Boolean> task = new CheckedCallable<>() {
736                      public Boolean realCall() throws InterruptedException {
737                          threadStarted.countDown();
738 <                        done.await();
738 >                        await(done);
739                          return Boolean.TRUE;
740                      }};
741 <                tasks[i] = new FutureTask(task);
741 >                tasks[i] = new FutureTask<>(task);
742                  p.execute(tasks[i]);
743              }
744 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
744 >            await(threadStarted);
745              assertEquals(tasks.length, p.getTaskCount());
746              assertEquals(tasks.length - 1, q.size());
747              assertEquals(1L, p.getActiveCount());
# Line 740 | Line 754 | public class ThreadPoolExecutorSubclassT
754              p.purge();         // Nothing to do
755              assertEquals(tasks.length - 3, q.size());
756              assertEquals(tasks.length - 2, p.getTaskCount());
743            done.countDown();
757          }
758      }
759  
# Line 753 | Line 766 | public class ThreadPoolExecutorSubclassT
766          final int count = 5;
767          final AtomicInteger ran = new AtomicInteger(0);
768          final ThreadPoolExecutor p =
769 <            new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
769 >            new CustomTPE(poolSize, poolSize,
770 >                          LONG_DELAY_MS, MILLISECONDS,
771                            new ArrayBlockingQueue<Runnable>(10));
772 <        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
772 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
773          Runnable waiter = new CheckedRunnable() { public void realRun() {
774              threadsStarted.countDown();
775              try {
776 <                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
776 >                MILLISECONDS.sleep(LONGER_DELAY_MS);
777              } catch (InterruptedException success) {}
778              ran.getAndIncrement();
779          }};
780          for (int i = 0; i < count; i++)
781              p.execute(waiter);
782 <        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
782 >        await(threadsStarted);
783          assertEquals(poolSize, p.getActiveCount());
784          assertEquals(0, p.getCompletedTaskCount());
785          final List<Runnable> queuedTasks;
# Line 1121 | Line 1135 | public class ThreadPoolExecutorSubclassT
1135      }
1136  
1137      /**
1138 <     * execute throws RejectedExecutionException if saturated.
1138 >     * Submitted tasks are rejected when saturated or shutdown
1139       */
1140 <    public void testSaturatedExecute() {
1140 >    public void testSubmittedTasksRejectedWhenSaturatedOrShutdown() throws InterruptedException {
1141          final ThreadPoolExecutor p =
1142              new CustomTPE(1, 1,
1143                            LONG_DELAY_MS, MILLISECONDS,
1144                            new ArrayBlockingQueue<Runnable>(1));
1145 <        try (PoolCleaner cleaner = cleaner(p)) {
1146 <            final CountDownLatch done = new CountDownLatch(1);
1147 <            Runnable task = new CheckedRunnable() {
1148 <                public void realRun() throws InterruptedException {
1145 >        final int saturatedSize = saturatedSize(p);
1146 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
1147 >        final CountDownLatch threadsStarted = new CountDownLatch(p.getMaximumPoolSize());
1148 >        final CountDownLatch done = new CountDownLatch(1);
1149 >        final Runnable r = () -> {
1150 >            threadsStarted.countDown();
1151 >            for (;;) {
1152 >                try {
1153                      done.await();
1154 <                }};
1155 <            for (int i = 0; i < 2; ++i)
1156 <                p.execute(task);
1157 <            for (int i = 0; i < 2; ++i) {
1154 >                    return;
1155 >                } catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
1156 >            }};
1157 >        final Callable<Boolean> c = () -> {
1158 >            threadsStarted.countDown();
1159 >            for (;;) {
1160                  try {
1161 <                    p.execute(task);
1162 <                    shouldThrow();
1163 <                } catch (RejectedExecutionException success) {}
1164 <                assertTrue(p.getTaskCount() <= 2);
1161 >                    done.await();
1162 >                    return Boolean.TRUE;
1163 >                } catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
1164 >            }};
1165 >        final boolean shutdownNow = rnd.nextBoolean();
1166 >
1167 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1168 >            // saturate
1169 >            for (int i = saturatedSize; i--> 0; ) {
1170 >                switch (rnd.nextInt(4)) {
1171 >                case 0: p.execute(r); break;
1172 >                case 1: assertFalse(p.submit(r).isDone()); break;
1173 >                case 2: assertFalse(p.submit(r, Boolean.TRUE).isDone()); break;
1174 >                case 3: assertFalse(p.submit(c).isDone()); break;
1175 >                }
1176              }
1146            done.countDown();
1147        }
1148    }
1177  
1178 <    /**
1179 <     * executor using CallerRunsPolicy runs task if saturated.
1152 <     */
1153 <    public void testSaturatedExecute2() {
1154 <        final ThreadPoolExecutor p =
1155 <            new CustomTPE(1, 1,
1156 <                          LONG_DELAY_MS, MILLISECONDS,
1157 <                          new ArrayBlockingQueue<Runnable>(1),
1158 <                          new CustomTPE.CallerRunsPolicy());
1159 <        try (PoolCleaner cleaner = cleaner(p)) {
1160 <            final CountDownLatch done = new CountDownLatch(1);
1161 <            Runnable blocker = new CheckedRunnable() {
1162 <                public void realRun() throws InterruptedException {
1163 <                    done.await();
1164 <                }};
1165 <            p.execute(blocker);
1166 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1167 <            for (int i = 0; i < tasks.length; i++)
1168 <                tasks[i] = new TrackedNoOpRunnable();
1169 <            for (int i = 0; i < tasks.length; i++)
1170 <                p.execute(tasks[i]);
1171 <            for (int i = 1; i < tasks.length; i++)
1172 <                assertTrue(tasks[i].done);
1173 <            assertFalse(tasks[0].done); // waiting in queue
1174 <            done.countDown();
1175 <        }
1176 <    }
1178 >            await(threadsStarted);
1179 >            assertTaskSubmissionsAreRejected(p);
1180  
1181 <    /**
1182 <     * executor using DiscardPolicy drops task if saturated.
1183 <     */
1184 <    public void testSaturatedExecute3() {
1185 <        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1186 <        for (int i = 0; i < tasks.length; ++i)
1187 <            tasks[i] = new TrackedNoOpRunnable();
1185 <        final ThreadPoolExecutor p =
1186 <            new CustomTPE(1, 1,
1187 <                          LONG_DELAY_MS, MILLISECONDS,
1188 <                          new ArrayBlockingQueue<Runnable>(1),
1189 <                          new CustomTPE.DiscardPolicy());
1190 <        try (PoolCleaner cleaner = cleaner(p)) {
1191 <            final CountDownLatch done = new CountDownLatch(1);
1192 <            p.execute(awaiter(done));
1181 >            if (shutdownNow)
1182 >                p.shutdownNow();
1183 >            else
1184 >                p.shutdown();
1185 >            // Pool is shutdown, but not yet terminated
1186 >            assertTaskSubmissionsAreRejected(p);
1187 >            assertFalse(p.isTerminated());
1188  
1189 <            for (TrackedNoOpRunnable task : tasks)
1190 <                p.execute(task);
1191 <            for (int i = 1; i < tasks.length; i++)
1192 <                assertFalse(tasks[i].done);
1198 <            done.countDown();
1189 >            done.countDown();   // release blocking tasks
1190 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
1191 >
1192 >            assertTaskSubmissionsAreRejected(p);
1193          }
1194 <        for (int i = 1; i < tasks.length; i++)
1195 <            assertFalse(tasks[i].done);
1196 <        assertTrue(tasks[0].done); // was waiting in queue
1194 >        assertEquals(saturatedSize(p)
1195 >                     - (shutdownNow ? p.getQueue().remainingCapacity() : 0),
1196 >                     p.getCompletedTaskCount());
1197      }
1198  
1199      /**
1200       * executor using DiscardOldestPolicy drops oldest task if saturated.
1201       */
1202 <    public void testSaturatedExecute4() {
1202 >    public void testSaturatedExecute_DiscardOldestPolicy() {
1203          final CountDownLatch done = new CountDownLatch(1);
1204          LatchAwaiter r1 = awaiter(done);
1205          LatchAwaiter r2 = awaiter(done);
# Line 1214 | Line 1208 | public class ThreadPoolExecutorSubclassT
1208              new CustomTPE(1, 1,
1209                            LONG_DELAY_MS, MILLISECONDS,
1210                            new ArrayBlockingQueue<Runnable>(1),
1211 <                          new CustomTPE.DiscardOldestPolicy());
1212 <        try (PoolCleaner cleaner = cleaner(p)) {
1211 >                          new ThreadPoolExecutor.DiscardOldestPolicy());
1212 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1213              assertEquals(LatchAwaiter.NEW, r1.state);
1214              assertEquals(LatchAwaiter.NEW, r2.state);
1215              assertEquals(LatchAwaiter.NEW, r3.state);
# Line 1225 | Line 1219 | public class ThreadPoolExecutorSubclassT
1219              p.execute(r3);
1220              assertFalse(p.getQueue().contains(r2));
1221              assertTrue(p.getQueue().contains(r3));
1228            done.countDown();
1222          }
1223          assertEquals(LatchAwaiter.DONE, r1.state);
1224          assertEquals(LatchAwaiter.NEW, r2.state);
# Line 1233 | Line 1226 | public class ThreadPoolExecutorSubclassT
1226      }
1227  
1228      /**
1236     * execute throws RejectedExecutionException if shutdown
1237     */
1238    public void testRejectedExecutionExceptionOnShutdown() {
1239        final ThreadPoolExecutor p =
1240            new CustomTPE(1, 1,
1241                          LONG_DELAY_MS, MILLISECONDS,
1242                          new ArrayBlockingQueue<Runnable>(1));
1243        try { p.shutdown(); } catch (SecurityException ok) { return; }
1244        try (PoolCleaner cleaner = cleaner(p)) {
1245            try {
1246                p.execute(new NoOpRunnable());
1247                shouldThrow();
1248            } catch (RejectedExecutionException success) {}
1249        }
1250    }
1251
1252    /**
1253     * execute using CallerRunsPolicy drops task on shutdown
1254     */
1255    public void testCallerRunsOnShutdown() {
1256        final ThreadPoolExecutor p =
1257            new CustomTPE(1, 1,
1258                          LONG_DELAY_MS, MILLISECONDS,
1259                          new ArrayBlockingQueue<Runnable>(1),
1260                          new CustomTPE.CallerRunsPolicy());
1261        try { p.shutdown(); } catch (SecurityException ok) { return; }
1262        try (PoolCleaner cleaner = cleaner(p)) {
1263            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1264            p.execute(r);
1265            assertFalse(r.done);
1266        }
1267    }
1268
1269    /**
1270     * execute using DiscardPolicy drops task on shutdown
1271     */
1272    public void testDiscardOnShutdown() {
1273        final ThreadPoolExecutor p =
1274            new CustomTPE(1, 1,
1275                          LONG_DELAY_MS, MILLISECONDS,
1276                          new ArrayBlockingQueue<Runnable>(1),
1277                          new CustomTPE.DiscardPolicy());
1278        try { p.shutdown(); } catch (SecurityException ok) { return; }
1279        try (PoolCleaner cleaner = cleaner(p)) {
1280            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1281            p.execute(r);
1282            assertFalse(r.done);
1283        }
1284    }
1285
1286    /**
1229       * execute using DiscardOldestPolicy drops task on shutdown
1230       */
1231      public void testDiscardOldestOnShutdown() {
# Line 1291 | Line 1233 | public class ThreadPoolExecutorSubclassT
1233              new CustomTPE(1, 1,
1234                            LONG_DELAY_MS, MILLISECONDS,
1235                            new ArrayBlockingQueue<Runnable>(1),
1236 <                          new CustomTPE.DiscardOldestPolicy());
1236 >                          new ThreadPoolExecutor.DiscardOldestPolicy());
1237  
1238          try { p.shutdown(); } catch (SecurityException ok) { return; }
1239          try (PoolCleaner cleaner = cleaner(p)) {
# Line 1302 | Line 1244 | public class ThreadPoolExecutorSubclassT
1244      }
1245  
1246      /**
1247 <     * execute(null) throws NPE
1247 >     * Submitting null tasks throws NullPointerException
1248       */
1249 <    public void testExecuteNull() {
1249 >    public void testNullTaskSubmission() {
1250          final ThreadPoolExecutor p =
1251              new CustomTPE(1, 2,
1252                            1L, SECONDS,
1253                            new ArrayBlockingQueue<Runnable>(10));
1254          try (PoolCleaner cleaner = cleaner(p)) {
1255 <            try {
1314 <                p.execute(null);
1315 <                shouldThrow();
1316 <            } catch (NullPointerException success) {}
1255 >            assertNullTaskSubmissionThrowsNullPointerException(p);
1256          }
1257      }
1258  
# Line 1322 | Line 1261 | public class ThreadPoolExecutorSubclassT
1261       */
1262      public void testCorePoolSizeIllegalArgumentException() {
1263          final ThreadPoolExecutor p =
1264 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1265 <        try {
1266 <            p.setCorePoolSize(-1);
1267 <            shouldThrow();
1268 <        } catch (IllegalArgumentException success) {
1269 <        } finally {
1270 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1264 >            new CustomTPE(1, 2,
1265 >                          LONG_DELAY_MS, MILLISECONDS,
1266 >                          new ArrayBlockingQueue<Runnable>(10));
1267 >        try (PoolCleaner cleaner = cleaner(p)) {
1268 >            try {
1269 >                p.setCorePoolSize(-1);
1270 >                shouldThrow();
1271 >            } catch (IllegalArgumentException success) {}
1272          }
1333        joinPool(p);
1273      }
1274  
1275      /**
# Line 1339 | Line 1278 | public class ThreadPoolExecutorSubclassT
1278       */
1279      public void testMaximumPoolSizeIllegalArgumentException() {
1280          final ThreadPoolExecutor p =
1281 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1282 <        try {
1283 <            p.setMaximumPoolSize(1);
1284 <            shouldThrow();
1285 <        } catch (IllegalArgumentException success) {
1286 <        } finally {
1287 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1281 >            new CustomTPE(2, 3,
1282 >                          LONG_DELAY_MS, MILLISECONDS,
1283 >                          new ArrayBlockingQueue<Runnable>(10));
1284 >        try (PoolCleaner cleaner = cleaner(p)) {
1285 >            try {
1286 >                p.setMaximumPoolSize(1);
1287 >                shouldThrow();
1288 >            } catch (IllegalArgumentException success) {}
1289          }
1350        joinPool(p);
1290      }
1291  
1292      /**
# Line 1356 | Line 1295 | public class ThreadPoolExecutorSubclassT
1295       */
1296      public void testMaximumPoolSizeIllegalArgumentException2() {
1297          final ThreadPoolExecutor p =
1298 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1299 <        try {
1300 <            p.setMaximumPoolSize(-1);
1301 <            shouldThrow();
1302 <        } catch (IllegalArgumentException success) {
1303 <        } finally {
1304 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1298 >            new CustomTPE(2, 3,
1299 >                          LONG_DELAY_MS, MILLISECONDS,
1300 >                          new ArrayBlockingQueue<Runnable>(10));
1301 >        try (PoolCleaner cleaner = cleaner(p)) {
1302 >            try {
1303 >                p.setMaximumPoolSize(-1);
1304 >                shouldThrow();
1305 >            } catch (IllegalArgumentException success) {}
1306          }
1367        joinPool(p);
1307      }
1308  
1309      /**
# Line 1373 | Line 1312 | public class ThreadPoolExecutorSubclassT
1312       */
1313      public void testKeepAliveTimeIllegalArgumentException() {
1314          final ThreadPoolExecutor p =
1315 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1316 <
1317 <        try {
1318 <            p.setKeepAliveTime(-1,MILLISECONDS);
1319 <            shouldThrow();
1320 <        } catch (IllegalArgumentException success) {
1321 <        } finally {
1322 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1315 >            new CustomTPE(2, 3,
1316 >                          LONG_DELAY_MS, MILLISECONDS,
1317 >                          new ArrayBlockingQueue<Runnable>(10));
1318 >        try (PoolCleaner cleaner = cleaner(p)) {
1319 >            try {
1320 >                p.setKeepAliveTime(-1, MILLISECONDS);
1321 >                shouldThrow();
1322 >            } catch (IllegalArgumentException success) {}
1323          }
1385        joinPool(p);
1324      }
1325  
1326      /**
# Line 1390 | Line 1328 | public class ThreadPoolExecutorSubclassT
1328       */
1329      public void testTerminated() {
1330          CustomTPE p = new CustomTPE();
1331 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
1332 <        assertTrue(p.terminatedCalled());
1333 <        joinPool(p);
1331 >        try (PoolCleaner cleaner = cleaner(p)) {
1332 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1333 >            assertTrue(p.terminatedCalled());
1334 >            assertTrue(p.isShutdown());
1335 >        }
1336      }
1337  
1338      /**
# Line 1400 | Line 1340 | public class ThreadPoolExecutorSubclassT
1340       */
1341      public void testBeforeAfter() throws InterruptedException {
1342          CustomTPE p = new CustomTPE();
1343 <        try {
1343 >        try (PoolCleaner cleaner = cleaner(p)) {
1344              final CountDownLatch done = new CountDownLatch(1);
1345              p.execute(new CheckedRunnable() {
1346                  public void realRun() {
# Line 1410 | Line 1350 | public class ThreadPoolExecutorSubclassT
1350              assertEquals(0, done.getCount());
1351              assertTrue(p.afterCalled());
1352              assertTrue(p.beforeCalled());
1413            try { p.shutdown(); } catch (SecurityException ok) { return; }
1414        } finally {
1415            joinPool(p);
1353          }
1354      }
1355  
# Line 1424 | Line 1361 | public class ThreadPoolExecutorSubclassT
1361              new CustomTPE(2, 2,
1362                            LONG_DELAY_MS, MILLISECONDS,
1363                            new ArrayBlockingQueue<Runnable>(10));
1364 <        try {
1364 >        try (PoolCleaner cleaner = cleaner(e)) {
1365              Future<String> future = e.submit(new StringTask());
1366              String result = future.get();
1367              assertSame(TEST_STRING, result);
1431        } finally {
1432            joinPool(e);
1368          }
1369      }
1370  
# Line 1441 | Line 1376 | public class ThreadPoolExecutorSubclassT
1376              new CustomTPE(2, 2,
1377                            LONG_DELAY_MS, MILLISECONDS,
1378                            new ArrayBlockingQueue<Runnable>(10));
1379 <        try {
1379 >        try (PoolCleaner cleaner = cleaner(e)) {
1380              Future<?> future = e.submit(new NoOpRunnable());
1381              future.get();
1382              assertTrue(future.isDone());
1448        } finally {
1449            joinPool(e);
1383          }
1384      }
1385  
# Line 1458 | Line 1391 | public class ThreadPoolExecutorSubclassT
1391              new CustomTPE(2, 2,
1392                            LONG_DELAY_MS, MILLISECONDS,
1393                            new ArrayBlockingQueue<Runnable>(10));
1394 <        try {
1394 >        try (PoolCleaner cleaner = cleaner(e)) {
1395              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1396              String result = future.get();
1397              assertSame(TEST_STRING, result);
1465        } finally {
1466            joinPool(e);
1398          }
1399      }
1400  
1401      /**
1402 <     * invokeAny(null) throws NPE
1402 >     * invokeAny(null) throws NullPointerException
1403       */
1404      public void testInvokeAny1() throws Exception {
1405          final ExecutorService e =
1406              new CustomTPE(2, 2,
1407                            LONG_DELAY_MS, MILLISECONDS,
1408                            new ArrayBlockingQueue<Runnable>(10));
1409 <        try {
1410 <            e.invokeAny(null);
1411 <            shouldThrow();
1412 <        } catch (NullPointerException success) {
1413 <        } finally {
1483 <            joinPool(e);
1409 >        try (PoolCleaner cleaner = cleaner(e)) {
1410 >            try {
1411 >                e.invokeAny(null);
1412 >                shouldThrow();
1413 >            } catch (NullPointerException success) {}
1414          }
1415      }
1416  
1417      /**
1418 <     * invokeAny(empty collection) throws IAE
1418 >     * invokeAny(empty collection) throws IllegalArgumentException
1419       */
1420      public void testInvokeAny2() throws Exception {
1421          final ExecutorService e =
1422              new CustomTPE(2, 2,
1423                            LONG_DELAY_MS, MILLISECONDS,
1424                            new ArrayBlockingQueue<Runnable>(10));
1425 <        try {
1426 <            e.invokeAny(new ArrayList<Callable<String>>());
1427 <            shouldThrow();
1428 <        } catch (IllegalArgumentException success) {
1429 <        } finally {
1500 <            joinPool(e);
1425 >        try (PoolCleaner cleaner = cleaner(e)) {
1426 >            try {
1427 >                e.invokeAny(new ArrayList<Callable<String>>());
1428 >                shouldThrow();
1429 >            } catch (IllegalArgumentException success) {}
1430          }
1431      }
1432  
# Line 1510 | Line 1439 | public class ThreadPoolExecutorSubclassT
1439              new CustomTPE(2, 2,
1440                            LONG_DELAY_MS, MILLISECONDS,
1441                            new ArrayBlockingQueue<Runnable>(10));
1442 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1443 <        l.add(latchAwaitingStringTask(latch));
1444 <        l.add(null);
1445 <        try {
1446 <            e.invokeAny(l);
1447 <            shouldThrow();
1448 <        } catch (NullPointerException success) {
1449 <        } finally {
1442 >        try (PoolCleaner cleaner = cleaner(e)) {
1443 >            List<Callable<String>> l = new ArrayList<>();
1444 >            l.add(latchAwaitingStringTask(latch));
1445 >            l.add(null);
1446 >            try {
1447 >                e.invokeAny(l);
1448 >                shouldThrow();
1449 >            } catch (NullPointerException success) {}
1450              latch.countDown();
1522            joinPool(e);
1451          }
1452      }
1453  
# Line 1531 | Line 1459 | public class ThreadPoolExecutorSubclassT
1459              new CustomTPE(2, 2,
1460                            LONG_DELAY_MS, MILLISECONDS,
1461                            new ArrayBlockingQueue<Runnable>(10));
1462 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1463 <        l.add(new NPETask());
1464 <        try {
1465 <            e.invokeAny(l);
1466 <            shouldThrow();
1467 <        } catch (ExecutionException success) {
1468 <            assertTrue(success.getCause() instanceof NullPointerException);
1469 <        } finally {
1470 <            joinPool(e);
1462 >        try (PoolCleaner cleaner = cleaner(e)) {
1463 >            List<Callable<String>> l = new ArrayList<>();
1464 >            l.add(new NPETask());
1465 >            try {
1466 >                e.invokeAny(l);
1467 >                shouldThrow();
1468 >            } catch (ExecutionException success) {
1469 >                assertTrue(success.getCause() instanceof NullPointerException);
1470 >            }
1471          }
1472      }
1473  
# Line 1551 | Line 1479 | public class ThreadPoolExecutorSubclassT
1479              new CustomTPE(2, 2,
1480                            LONG_DELAY_MS, MILLISECONDS,
1481                            new ArrayBlockingQueue<Runnable>(10));
1482 <        try {
1483 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1482 >        try (PoolCleaner cleaner = cleaner(e)) {
1483 >            List<Callable<String>> l = new ArrayList<>();
1484              l.add(new StringTask());
1485              l.add(new StringTask());
1486              String result = e.invokeAny(l);
1487              assertSame(TEST_STRING, result);
1560        } finally {
1561            joinPool(e);
1488          }
1489      }
1490  
# Line 1570 | Line 1496 | public class ThreadPoolExecutorSubclassT
1496              new CustomTPE(2, 2,
1497                            LONG_DELAY_MS, MILLISECONDS,
1498                            new ArrayBlockingQueue<Runnable>(10));
1499 <        try {
1500 <            e.invokeAll(null);
1501 <            shouldThrow();
1502 <        } catch (NullPointerException success) {
1503 <        } finally {
1578 <            joinPool(e);
1499 >        try (PoolCleaner cleaner = cleaner(e)) {
1500 >            try {
1501 >                e.invokeAll(null);
1502 >                shouldThrow();
1503 >            } catch (NullPointerException success) {}
1504          }
1505      }
1506  
1507      /**
1508 <     * invokeAll(empty collection) returns empty collection
1508 >     * invokeAll(empty collection) returns empty list
1509       */
1510      public void testInvokeAll2() throws Exception {
1511          final ExecutorService e =
1512              new CustomTPE(2, 2,
1513                            LONG_DELAY_MS, MILLISECONDS,
1514                            new ArrayBlockingQueue<Runnable>(10));
1515 <        try {
1516 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1515 >        final Collection<Callable<String>> emptyCollection
1516 >            = Collections.emptyList();
1517 >        try (PoolCleaner cleaner = cleaner(e)) {
1518 >            List<Future<String>> r = e.invokeAll(emptyCollection);
1519              assertTrue(r.isEmpty());
1593        } finally {
1594            joinPool(e);
1520          }
1521      }
1522  
# Line 1603 | Line 1528 | public class ThreadPoolExecutorSubclassT
1528              new CustomTPE(2, 2,
1529                            LONG_DELAY_MS, MILLISECONDS,
1530                            new ArrayBlockingQueue<Runnable>(10));
1531 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1532 <        l.add(new StringTask());
1533 <        l.add(null);
1534 <        try {
1535 <            e.invokeAll(l);
1536 <            shouldThrow();
1537 <        } catch (NullPointerException success) {
1538 <        } finally {
1614 <            joinPool(e);
1531 >        try (PoolCleaner cleaner = cleaner(e)) {
1532 >            List<Callable<String>> l = new ArrayList<>();
1533 >            l.add(new StringTask());
1534 >            l.add(null);
1535 >            try {
1536 >                e.invokeAll(l);
1537 >                shouldThrow();
1538 >            } catch (NullPointerException success) {}
1539          }
1540      }
1541  
# Line 1623 | Line 1547 | public class ThreadPoolExecutorSubclassT
1547              new CustomTPE(2, 2,
1548                            LONG_DELAY_MS, MILLISECONDS,
1549                            new ArrayBlockingQueue<Runnable>(10));
1550 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1551 <        l.add(new NPETask());
1552 <        List<Future<String>> futures = e.invokeAll(l);
1553 <        assertEquals(1, futures.size());
1554 <        try {
1555 <            futures.get(0).get();
1556 <            shouldThrow();
1557 <        } catch (ExecutionException success) {
1558 <            assertTrue(success.getCause() instanceof NullPointerException);
1559 <        } finally {
1560 <            joinPool(e);
1550 >        try (PoolCleaner cleaner = cleaner(e)) {
1551 >            List<Callable<String>> l = new ArrayList<>();
1552 >            l.add(new NPETask());
1553 >            List<Future<String>> futures = e.invokeAll(l);
1554 >            assertEquals(1, futures.size());
1555 >            try {
1556 >                futures.get(0).get();
1557 >                shouldThrow();
1558 >            } catch (ExecutionException success) {
1559 >                assertTrue(success.getCause() instanceof NullPointerException);
1560 >            }
1561          }
1562      }
1563  
# Line 1645 | Line 1569 | public class ThreadPoolExecutorSubclassT
1569              new CustomTPE(2, 2,
1570                            LONG_DELAY_MS, MILLISECONDS,
1571                            new ArrayBlockingQueue<Runnable>(10));
1572 <        try {
1573 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1572 >        try (PoolCleaner cleaner = cleaner(e)) {
1573 >            List<Callable<String>> l = new ArrayList<>();
1574              l.add(new StringTask());
1575              l.add(new StringTask());
1576              List<Future<String>> futures = e.invokeAll(l);
1577              assertEquals(2, futures.size());
1578              for (Future<String> future : futures)
1579                  assertSame(TEST_STRING, future.get());
1656        } finally {
1657            joinPool(e);
1580          }
1581      }
1582  
# Line 1666 | Line 1588 | public class ThreadPoolExecutorSubclassT
1588              new CustomTPE(2, 2,
1589                            LONG_DELAY_MS, MILLISECONDS,
1590                            new ArrayBlockingQueue<Runnable>(10));
1591 <        try {
1592 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1593 <            shouldThrow();
1594 <        } catch (NullPointerException success) {
1595 <        } finally {
1674 <            joinPool(e);
1591 >        try (PoolCleaner cleaner = cleaner(e)) {
1592 >            try {
1593 >                e.invokeAny(null, randomTimeout(), randomTimeUnit());
1594 >                shouldThrow();
1595 >            } catch (NullPointerException success) {}
1596          }
1597      }
1598  
# Line 1683 | Line 1604 | public class ThreadPoolExecutorSubclassT
1604              new CustomTPE(2, 2,
1605                            LONG_DELAY_MS, MILLISECONDS,
1606                            new ArrayBlockingQueue<Runnable>(10));
1607 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1608 <        l.add(new StringTask());
1609 <        try {
1610 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1611 <            shouldThrow();
1612 <        } catch (NullPointerException success) {
1613 <        } finally {
1693 <            joinPool(e);
1607 >        try (PoolCleaner cleaner = cleaner(e)) {
1608 >            List<Callable<String>> l = new ArrayList<>();
1609 >            l.add(new StringTask());
1610 >            try {
1611 >                e.invokeAny(l, randomTimeout(), null);
1612 >                shouldThrow();
1613 >            } catch (NullPointerException success) {}
1614          }
1615      }
1616  
1617      /**
1618 <     * timed invokeAny(empty collection) throws IAE
1618 >     * timed invokeAny(empty collection) throws IllegalArgumentException
1619       */
1620      public void testTimedInvokeAny2() throws Exception {
1621          final ExecutorService e =
1622              new CustomTPE(2, 2,
1623                            LONG_DELAY_MS, MILLISECONDS,
1624                            new ArrayBlockingQueue<Runnable>(10));
1625 <        try {
1626 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1627 <            shouldThrow();
1628 <        } catch (IllegalArgumentException success) {
1629 <        } finally {
1630 <            joinPool(e);
1625 >        final Collection<Callable<String>> emptyCollection
1626 >            = Collections.emptyList();
1627 >        try (PoolCleaner cleaner = cleaner(e)) {
1628 >            try {
1629 >                e.invokeAny(emptyCollection, randomTimeout(), randomTimeUnit());
1630 >                shouldThrow();
1631 >            } catch (IllegalArgumentException success) {}
1632          }
1633      }
1634  
# Line 1720 | Line 1641 | public class ThreadPoolExecutorSubclassT
1641              new CustomTPE(2, 2,
1642                            LONG_DELAY_MS, MILLISECONDS,
1643                            new ArrayBlockingQueue<Runnable>(10));
1644 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1645 <        l.add(latchAwaitingStringTask(latch));
1646 <        l.add(null);
1647 <        try {
1648 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1649 <            shouldThrow();
1650 <        } catch (NullPointerException success) {
1651 <        } finally {
1644 >        try (PoolCleaner cleaner = cleaner(e)) {
1645 >            List<Callable<String>> l = new ArrayList<>();
1646 >            l.add(latchAwaitingStringTask(latch));
1647 >            l.add(null);
1648 >            try {
1649 >                e.invokeAny(l, randomTimeout(), randomTimeUnit());
1650 >                shouldThrow();
1651 >            } catch (NullPointerException success) {}
1652              latch.countDown();
1732            joinPool(e);
1653          }
1654      }
1655  
# Line 1741 | Line 1661 | public class ThreadPoolExecutorSubclassT
1661              new CustomTPE(2, 2,
1662                            LONG_DELAY_MS, MILLISECONDS,
1663                            new ArrayBlockingQueue<Runnable>(10));
1664 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1665 <        l.add(new NPETask());
1666 <        try {
1667 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1668 <            shouldThrow();
1669 <        } catch (ExecutionException success) {
1670 <            assertTrue(success.getCause() instanceof NullPointerException);
1671 <        } finally {
1672 <            joinPool(e);
1664 >        try (PoolCleaner cleaner = cleaner(e)) {
1665 >            long startTime = System.nanoTime();
1666 >            List<Callable<String>> l = new ArrayList<>();
1667 >            l.add(new NPETask());
1668 >            try {
1669 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1670 >                shouldThrow();
1671 >            } catch (ExecutionException success) {
1672 >                assertTrue(success.getCause() instanceof NullPointerException);
1673 >            }
1674 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1675          }
1676      }
1677  
# Line 1761 | Line 1683 | public class ThreadPoolExecutorSubclassT
1683              new CustomTPE(2, 2,
1684                            LONG_DELAY_MS, MILLISECONDS,
1685                            new ArrayBlockingQueue<Runnable>(10));
1686 <        try {
1687 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1686 >        try (PoolCleaner cleaner = cleaner(e)) {
1687 >            long startTime = System.nanoTime();
1688 >            List<Callable<String>> l = new ArrayList<>();
1689              l.add(new StringTask());
1690              l.add(new StringTask());
1691 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1691 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1692              assertSame(TEST_STRING, result);
1693 <        } finally {
1771 <            joinPool(e);
1693 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1694          }
1695      }
1696  
# Line 1780 | Line 1702 | public class ThreadPoolExecutorSubclassT
1702              new CustomTPE(2, 2,
1703                            LONG_DELAY_MS, MILLISECONDS,
1704                            new ArrayBlockingQueue<Runnable>(10));
1705 <        try {
1706 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1707 <            shouldThrow();
1708 <        } catch (NullPointerException success) {
1709 <        } finally {
1788 <            joinPool(e);
1705 >        try (PoolCleaner cleaner = cleaner(e)) {
1706 >            try {
1707 >                e.invokeAll(null, randomTimeout(), randomTimeUnit());
1708 >                shouldThrow();
1709 >            } catch (NullPointerException success) {}
1710          }
1711      }
1712  
# Line 1797 | Line 1718 | public class ThreadPoolExecutorSubclassT
1718              new CustomTPE(2, 2,
1719                            LONG_DELAY_MS, MILLISECONDS,
1720                            new ArrayBlockingQueue<Runnable>(10));
1721 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1722 <        l.add(new StringTask());
1723 <        try {
1724 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1725 <            shouldThrow();
1726 <        } catch (NullPointerException success) {
1727 <        } finally {
1807 <            joinPool(e);
1721 >        try (PoolCleaner cleaner = cleaner(e)) {
1722 >            List<Callable<String>> l = new ArrayList<>();
1723 >            l.add(new StringTask());
1724 >            try {
1725 >                e.invokeAll(l, randomTimeout(), null);
1726 >                shouldThrow();
1727 >            } catch (NullPointerException success) {}
1728          }
1729      }
1730  
1731      /**
1732 <     * timed invokeAll(empty collection) returns empty collection
1732 >     * timed invokeAll(empty collection) returns empty list
1733       */
1734      public void testTimedInvokeAll2() throws Exception {
1735          final ExecutorService e =
1736              new CustomTPE(2, 2,
1737                            LONG_DELAY_MS, MILLISECONDS,
1738                            new ArrayBlockingQueue<Runnable>(10));
1739 <        try {
1740 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1739 >        final Collection<Callable<String>> emptyCollection
1740 >            = Collections.emptyList();
1741 >        try (PoolCleaner cleaner = cleaner(e)) {
1742 >            List<Future<String>> r =
1743 >                e.invokeAll(emptyCollection, randomTimeout(), randomTimeUnit());
1744              assertTrue(r.isEmpty());
1822        } finally {
1823            joinPool(e);
1745          }
1746      }
1747  
# Line 1832 | Line 1753 | public class ThreadPoolExecutorSubclassT
1753              new CustomTPE(2, 2,
1754                            LONG_DELAY_MS, MILLISECONDS,
1755                            new ArrayBlockingQueue<Runnable>(10));
1756 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1757 <        l.add(new StringTask());
1758 <        l.add(null);
1759 <        try {
1760 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1761 <            shouldThrow();
1762 <        } catch (NullPointerException success) {
1763 <        } finally {
1843 <            joinPool(e);
1756 >        try (PoolCleaner cleaner = cleaner(e)) {
1757 >            List<Callable<String>> l = new ArrayList<>();
1758 >            l.add(new StringTask());
1759 >            l.add(null);
1760 >            try {
1761 >                e.invokeAll(l, randomTimeout(), randomTimeUnit());
1762 >                shouldThrow();
1763 >            } catch (NullPointerException success) {}
1764          }
1765      }
1766  
# Line 1852 | Line 1772 | public class ThreadPoolExecutorSubclassT
1772              new CustomTPE(2, 2,
1773                            LONG_DELAY_MS, MILLISECONDS,
1774                            new ArrayBlockingQueue<Runnable>(10));
1775 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1776 <        l.add(new NPETask());
1777 <        List<Future<String>> futures =
1778 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1779 <        assertEquals(1, futures.size());
1780 <        try {
1781 <            futures.get(0).get();
1782 <            shouldThrow();
1783 <        } catch (ExecutionException success) {
1784 <            assertTrue(success.getCause() instanceof NullPointerException);
1785 <        } finally {
1786 <            joinPool(e);
1775 >        try (PoolCleaner cleaner = cleaner(e)) {
1776 >            List<Callable<String>> l = new ArrayList<>();
1777 >            l.add(new NPETask());
1778 >            List<Future<String>> futures =
1779 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1780 >            assertEquals(1, futures.size());
1781 >            try {
1782 >                futures.get(0).get();
1783 >                shouldThrow();
1784 >            } catch (ExecutionException success) {
1785 >                assertTrue(success.getCause() instanceof NullPointerException);
1786 >            }
1787          }
1788      }
1789  
# Line 1875 | Line 1795 | public class ThreadPoolExecutorSubclassT
1795              new CustomTPE(2, 2,
1796                            LONG_DELAY_MS, MILLISECONDS,
1797                            new ArrayBlockingQueue<Runnable>(10));
1798 <        try {
1799 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1798 >        try (PoolCleaner cleaner = cleaner(e)) {
1799 >            List<Callable<String>> l = new ArrayList<>();
1800              l.add(new StringTask());
1801              l.add(new StringTask());
1802              List<Future<String>> futures =
# Line 1884 | Line 1804 | public class ThreadPoolExecutorSubclassT
1804              assertEquals(2, futures.size());
1805              for (Future<String> future : futures)
1806                  assertSame(TEST_STRING, future.get());
1887        } finally {
1888            joinPool(e);
1807          }
1808      }
1809  
# Line 1893 | Line 1811 | public class ThreadPoolExecutorSubclassT
1811       * timed invokeAll(c) cancels tasks not completed by timeout
1812       */
1813      public void testTimedInvokeAll6() throws Exception {
1814 <        final ExecutorService e =
1815 <            new CustomTPE(2, 2,
1816 <                          LONG_DELAY_MS, MILLISECONDS,
1817 <                          new ArrayBlockingQueue<Runnable>(10));
1818 <        try {
1819 <            for (long timeout = timeoutMillis();;) {
1814 >        for (long timeout = timeoutMillis();;) {
1815 >            final CountDownLatch done = new CountDownLatch(1);
1816 >            final Callable<String> waiter = new CheckedCallable<>() {
1817 >                public String realCall() {
1818 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1819 >                    catch (InterruptedException ok) {}
1820 >                    return "1"; }};
1821 >            final ExecutorService p =
1822 >                new CustomTPE(2, 2,
1823 >                              LONG_DELAY_MS, MILLISECONDS,
1824 >                              new ArrayBlockingQueue<Runnable>(10));
1825 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1826                  List<Callable<String>> tasks = new ArrayList<>();
1827                  tasks.add(new StringTask("0"));
1828 <                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1828 >                tasks.add(waiter);
1829                  tasks.add(new StringTask("2"));
1830                  long startTime = System.nanoTime();
1831                  List<Future<String>> futures =
1832 <                    e.invokeAll(tasks, timeout, MILLISECONDS);
1832 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1833                  assertEquals(tasks.size(), futures.size());
1834                  assertTrue(millisElapsedSince(startTime) >= timeout);
1835 <                for (Future future : futures)
1835 >                for (Future<?> future : futures)
1836                      assertTrue(future.isDone());
1837                  assertTrue(futures.get(1).isCancelled());
1838                  try {
# Line 1921 | Line 1845 | public class ThreadPoolExecutorSubclassT
1845                          fail("expected exactly one task to be cancelled");
1846                  }
1847              }
1924        } finally {
1925            joinPool(e);
1848          }
1849      }
1850  
# Line 1936 | Line 1858 | public class ThreadPoolExecutorSubclassT
1858                            LONG_DELAY_MS, MILLISECONDS,
1859                            new LinkedBlockingQueue<Runnable>(),
1860                            new FailingThreadFactory());
1861 <        try {
1861 >        try (PoolCleaner cleaner = cleaner(e)) {
1862              final int TASKS = 100;
1863              final CountDownLatch done = new CountDownLatch(TASKS);
1864              for (int k = 0; k < TASKS; ++k)
# Line 1944 | Line 1866 | public class ThreadPoolExecutorSubclassT
1866                      public void realRun() {
1867                          done.countDown();
1868                      }});
1869 <            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1948 <        } finally {
1949 <            joinPool(e);
1869 >            await(done);
1870          }
1871      }
1872  
# Line 1958 | Line 1878 | public class ThreadPoolExecutorSubclassT
1878              new CustomTPE(2, 2,
1879                            1000, MILLISECONDS,
1880                            new ArrayBlockingQueue<Runnable>(10));
1881 <        assertFalse(p.allowsCoreThreadTimeOut());
1882 <        joinPool(p);
1881 >        try (PoolCleaner cleaner = cleaner(p)) {
1882 >            assertFalse(p.allowsCoreThreadTimeOut());
1883 >        }
1884      }
1885  
1886      /**
# Line 1971 | Line 1892 | public class ThreadPoolExecutorSubclassT
1892              new CustomTPE(2, 10,
1893                            keepAliveTime, MILLISECONDS,
1894                            new ArrayBlockingQueue<Runnable>(10));
1895 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1896 <        try {
1895 >        try (PoolCleaner cleaner = cleaner(p)) {
1896 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1897              p.allowCoreThreadTimeOut(true);
1898              p.execute(new CheckedRunnable() {
1899                  public void realRun() {
# Line 1987 | Line 1908 | public class ThreadPoolExecutorSubclassT
1908                  Thread.yield();
1909              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1910              assertEquals(0, p.getPoolSize());
1990        } finally {
1991            joinPool(p);
1911          }
1912      }
1913  
# Line 2001 | Line 1920 | public class ThreadPoolExecutorSubclassT
1920              new CustomTPE(2, 10,
1921                            keepAliveTime, MILLISECONDS,
1922                            new ArrayBlockingQueue<Runnable>(10));
1923 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1924 <        try {
1923 >        try (PoolCleaner cleaner = cleaner(p)) {
1924 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1925              p.allowCoreThreadTimeOut(false);
1926              p.execute(new CheckedRunnable() {
1927                  public void realRun() throws InterruptedException {
# Line 2011 | Line 1930 | public class ThreadPoolExecutorSubclassT
1930                  }});
1931              delay(2 * keepAliveTime);
1932              assertTrue(p.getPoolSize() >= 1);
2014        } finally {
2015            joinPool(p);
1933          }
1934      }
1935  
# Line 2021 | Line 1938 | public class ThreadPoolExecutorSubclassT
1938       * (in part, a test of CustomTPE itself)
1939       */
1940      public void testGet_cancelled() throws Exception {
1941 +        final CountDownLatch done = new CountDownLatch(1);
1942          final ExecutorService e =
1943              new CustomTPE(1, 1,
1944                            LONG_DELAY_MS, MILLISECONDS,
1945                            new LinkedBlockingQueue<Runnable>());
1946 <        try {
1946 >        try (PoolCleaner cleaner = cleaner(e, done)) {
1947              final CountDownLatch blockerStarted = new CountDownLatch(1);
2030            final CountDownLatch done = new CountDownLatch(1);
1948              final List<Future<?>> futures = new ArrayList<>();
1949              for (int i = 0; i < 2; i++) {
1950                  Runnable r = new CheckedRunnable() { public void realRun()
# Line 2037 | Line 1954 | public class ThreadPoolExecutorSubclassT
1954                  }};
1955                  futures.add(e.submit(r));
1956              }
1957 <            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1957 >            await(blockerStarted);
1958              for (Future<?> future : futures) future.cancel(false);
1959              for (Future<?> future : futures) {
1960                  try {
# Line 2051 | Line 1968 | public class ThreadPoolExecutorSubclassT
1968                  assertTrue(future.isCancelled());
1969                  assertTrue(future.isDone());
1970              }
2054            done.countDown();
2055        } finally {
2056            joinPool(e);
1971          }
1972      }
1973 +    @SuppressWarnings("removal")
1974 +    public void testFinalizeMethodCallsSuperFinalize() {
1975 +        new CustomTPE(1, 1,
1976 +                      LONG_DELAY_MS, MILLISECONDS,
1977 +                      new LinkedBlockingQueue<Runnable>()) {
1978 +
1979 +            /**
1980 +             * A finalize method without "throws Throwable", that
1981 +             * calls super.finalize().
1982 +             */
1983 +            protected void finalize() {
1984 +                super.finalize();
1985 +            }
1986 +        }.shutdown();
1987 +    }
1988  
1989   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines