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.73 by jsr166, Sun Oct 4 02:49:18 2015 UTC vs.
Revision 1.99 by jsr166, Mon May 29 22:44:27 2017 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;
# 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 272 | Line 272 | public class ThreadPoolExecutorSubclassT
272       * prestartCoreThread starts a thread if under corePoolSize, else doesn't
273       */
274      public void testPrestartCoreThread() {
275 <        ThreadPoolExecutor p =
275 >        final ThreadPoolExecutor p =
276              new CustomTPE(2, 6,
277                            LONG_DELAY_MS, MILLISECONDS,
278                            new ArrayBlockingQueue<Runnable>(10));
# Line 298 | Line 298 | public class ThreadPoolExecutorSubclassT
298       * prestartAllCoreThreads starts all corePoolSize threads
299       */
300      public void testPrestartAllCoreThreads() {
301 <        ThreadPoolExecutor p =
301 >        final ThreadPoolExecutor p =
302              new CustomTPE(2, 6,
303                            LONG_DELAY_MS, MILLISECONDS,
304                            new ArrayBlockingQueue<Runnable>(10));
# Line 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);
650            final CountDownLatch done = new CountDownLatch(1);
663              FutureTask[] tasks = new FutureTask[5];
664              for (int i = 0; i < tasks.length; i++) {
665 <                Callable task = new CheckedCallable<Boolean>() {
665 >                Callable<Boolean> task = new CheckedCallable<Boolean>() {
666                      public Boolean realCall() throws InterruptedException {
667                          threadStarted.countDown();
668                          assertSame(q, p.getQueue());
669 <                        done.await();
669 >                        await(done);
670                          return Boolean.TRUE;
671                      }};
672                  tasks[i] = new FutureTask(task);
673                  p.execute(tasks[i]);
674              }
675 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
675 >            await(threadStarted);
676              assertSame(q, p.getQueue());
677              assertFalse(q.contains(tasks[0]));
678              assertTrue(q.contains(tasks[tasks.length - 1]));
679              assertEquals(tasks.length - 1, q.size());
668            done.countDown();
680          }
681      }
682  
# Line 673 | Line 684 | public class ThreadPoolExecutorSubclassT
684       * remove(task) removes queued task, and fails to remove active task
685       */
686      public void testRemove() throws InterruptedException {
687 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
687 >        final CountDownLatch done = new CountDownLatch(1);
688 >        BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
689          final ThreadPoolExecutor p =
690              new CustomTPE(1, 1,
691                            LONG_DELAY_MS, MILLISECONDS,
692                            q);
693 <        try (PoolCleaner cleaner = cleaner(p)) {
693 >        try (PoolCleaner cleaner = cleaner(p, done)) {
694              Runnable[] tasks = new Runnable[6];
695              final CountDownLatch threadStarted = new CountDownLatch(1);
684            final CountDownLatch done = new CountDownLatch(1);
696              for (int i = 0; i < tasks.length; i++) {
697                  tasks[i] = new CheckedRunnable() {
698                      public void realRun() throws InterruptedException {
699                          threadStarted.countDown();
700 <                        done.await();
700 >                        await(done);
701                      }};
702                  p.execute(tasks[i]);
703              }
704 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
704 >            await(threadStarted);
705              assertFalse(p.remove(tasks[0]));
706              assertTrue(q.contains(tasks[4]));
707              assertTrue(q.contains(tasks[3]));
# Line 700 | Line 711 | public class ThreadPoolExecutorSubclassT
711              assertTrue(q.contains(tasks[3]));
712              assertTrue(p.remove(tasks[3]));
713              assertFalse(q.contains(tasks[3]));
703            done.countDown();
714          }
715      }
716  
# Line 710 | Line 720 | public class ThreadPoolExecutorSubclassT
720      public void testPurge() throws InterruptedException {
721          final CountDownLatch threadStarted = new CountDownLatch(1);
722          final CountDownLatch done = new CountDownLatch(1);
723 <        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
723 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
724          final ThreadPoolExecutor p =
725              new CustomTPE(1, 1,
726                            LONG_DELAY_MS, MILLISECONDS,
727                            q);
728 <        try (PoolCleaner cleaner = cleaner(p)) {
728 >        try (PoolCleaner cleaner = cleaner(p, done)) {
729              FutureTask[] tasks = new FutureTask[5];
730              for (int i = 0; i < tasks.length; i++) {
731 <                Callable task = new CheckedCallable<Boolean>() {
731 >                Callable<Boolean> task = new CheckedCallable<Boolean>() {
732                      public Boolean realCall() throws InterruptedException {
733                          threadStarted.countDown();
734 <                        done.await();
734 >                        await(done);
735                          return Boolean.TRUE;
736                      }};
737                  tasks[i] = new FutureTask(task);
738                  p.execute(tasks[i]);
739              }
740 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
740 >            await(threadStarted);
741              assertEquals(tasks.length, p.getTaskCount());
742              assertEquals(tasks.length - 1, q.size());
743              assertEquals(1L, p.getActiveCount());
# Line 740 | Line 750 | public class ThreadPoolExecutorSubclassT
750              p.purge();         // Nothing to do
751              assertEquals(tasks.length - 3, q.size());
752              assertEquals(tasks.length - 2, p.getTaskCount());
743            done.countDown();
753          }
754      }
755  
# Line 752 | Line 761 | public class ThreadPoolExecutorSubclassT
761          final int poolSize = 2;
762          final int count = 5;
763          final AtomicInteger ran = new AtomicInteger(0);
764 <        ThreadPoolExecutor p =
765 <            new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
764 >        final ThreadPoolExecutor p =
765 >            new CustomTPE(poolSize, poolSize,
766 >                          LONG_DELAY_MS, MILLISECONDS,
767                            new ArrayBlockingQueue<Runnable>(10));
768 <        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
768 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
769          Runnable waiter = new CheckedRunnable() { public void realRun() {
770              threadsStarted.countDown();
771              try {
# Line 765 | Line 775 | public class ThreadPoolExecutorSubclassT
775          }};
776          for (int i = 0; i < count; i++)
777              p.execute(waiter);
778 <        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
778 >        await(threadsStarted);
779          assertEquals(poolSize, p.getActiveCount());
780          assertEquals(0, p.getCompletedTaskCount());
781          final List<Runnable> queuedTasks;
# Line 1124 | Line 1134 | public class ThreadPoolExecutorSubclassT
1134       * execute throws RejectedExecutionException if saturated.
1135       */
1136      public void testSaturatedExecute() {
1137 +        final CountDownLatch done = new CountDownLatch(1);
1138          final ThreadPoolExecutor p =
1139              new CustomTPE(1, 1,
1140                            LONG_DELAY_MS, MILLISECONDS,
1141                            new ArrayBlockingQueue<Runnable>(1));
1142 <        try (PoolCleaner cleaner = cleaner(p)) {
1132 <            final CountDownLatch done = new CountDownLatch(1);
1142 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1143              Runnable task = new CheckedRunnable() {
1144                  public void realRun() throws InterruptedException {
1145 <                    done.await();
1145 >                    await(done);
1146                  }};
1147              for (int i = 0; i < 2; ++i)
1148                  p.execute(task);
# Line 1143 | Line 1153 | public class ThreadPoolExecutorSubclassT
1153                  } catch (RejectedExecutionException success) {}
1154                  assertTrue(p.getTaskCount() <= 2);
1155              }
1146            done.countDown();
1156          }
1157      }
1158  
# Line 1151 | Line 1160 | public class ThreadPoolExecutorSubclassT
1160       * executor using CallerRunsPolicy runs task if saturated.
1161       */
1162      public void testSaturatedExecute2() {
1163 <        RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1164 <        ThreadPoolExecutor p = new CustomTPE(1, 1,
1165 <                                             LONG_DELAY_MS, MILLISECONDS,
1166 <                                             new ArrayBlockingQueue<Runnable>(1),
1167 <                                             h);
1168 <        try {
1163 >        final CountDownLatch done = new CountDownLatch(1);
1164 >        final ThreadPoolExecutor p =
1165 >            new CustomTPE(1, 1,
1166 >                          LONG_DELAY_MS, MILLISECONDS,
1167 >                          new ArrayBlockingQueue<Runnable>(1),
1168 >                          new CustomTPE.CallerRunsPolicy());
1169 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1170 >            Runnable blocker = new CheckedRunnable() {
1171 >                public void realRun() throws InterruptedException {
1172 >                    await(done);
1173 >                }};
1174 >            p.execute(blocker);
1175              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1176 <            for (int i = 0; i < tasks.length; ++i)
1176 >            for (int i = 0; i < tasks.length; i++)
1177                  tasks[i] = new TrackedNoOpRunnable();
1178 <            TrackedLongRunnable mr = new TrackedLongRunnable();
1164 <            p.execute(mr);
1165 <            for (int i = 0; i < tasks.length; ++i)
1178 >            for (int i = 0; i < tasks.length; i++)
1179                  p.execute(tasks[i]);
1180 <            for (int i = 1; i < tasks.length; ++i)
1180 >            for (int i = 1; i < tasks.length; i++)
1181                  assertTrue(tasks[i].done);
1182 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1170 <        } finally {
1171 <            joinPool(p);
1182 >            assertFalse(tasks[0].done); // waiting in queue
1183          }
1184      }
1185  
# Line 1176 | Line 1187 | public class ThreadPoolExecutorSubclassT
1187       * executor using DiscardPolicy drops task if saturated.
1188       */
1189      public void testSaturatedExecute3() {
1190 <        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1191 <        ThreadPoolExecutor p =
1190 >        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1191 >        for (int i = 0; i < tasks.length; ++i)
1192 >            tasks[i] = new TrackedNoOpRunnable();
1193 >        final CountDownLatch done = new CountDownLatch(1);
1194 >        final ThreadPoolExecutor p =
1195              new CustomTPE(1, 1,
1196                            LONG_DELAY_MS, MILLISECONDS,
1197                            new ArrayBlockingQueue<Runnable>(1),
1198 <                          h);
1199 <        try {
1200 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1201 <            for (int i = 0; i < tasks.length; ++i)
1188 <                tasks[i] = new TrackedNoOpRunnable();
1189 <            p.execute(new TrackedLongRunnable());
1198 >                          new CustomTPE.DiscardPolicy());
1199 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1200 >            p.execute(awaiter(done));
1201 >
1202              for (TrackedNoOpRunnable task : tasks)
1203                  p.execute(task);
1204 <            for (TrackedNoOpRunnable task : tasks)
1205 <                assertFalse(task.done);
1194 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1195 <        } finally {
1196 <            joinPool(p);
1204 >            for (int i = 1; i < tasks.length; i++)
1205 >                assertFalse(tasks[i].done);
1206          }
1207 +        for (int i = 1; i < tasks.length; i++)
1208 +            assertFalse(tasks[i].done);
1209 +        assertTrue(tasks[0].done); // was waiting in queue
1210      }
1211  
1212      /**
1213       * executor using DiscardOldestPolicy drops oldest task if saturated.
1214       */
1215      public void testSaturatedExecute4() {
1216 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1217 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1218 <        try {
1219 <            p.execute(new TrackedLongRunnable());
1220 <            TrackedLongRunnable r2 = new TrackedLongRunnable();
1216 >        final CountDownLatch done = new CountDownLatch(1);
1217 >        LatchAwaiter r1 = awaiter(done);
1218 >        LatchAwaiter r2 = awaiter(done);
1219 >        LatchAwaiter r3 = awaiter(done);
1220 >        final ThreadPoolExecutor p =
1221 >            new CustomTPE(1, 1,
1222 >                          LONG_DELAY_MS, MILLISECONDS,
1223 >                          new ArrayBlockingQueue<Runnable>(1),
1224 >                          new CustomTPE.DiscardOldestPolicy());
1225 >        try (PoolCleaner cleaner = cleaner(p, done)) {
1226 >            assertEquals(LatchAwaiter.NEW, r1.state);
1227 >            assertEquals(LatchAwaiter.NEW, r2.state);
1228 >            assertEquals(LatchAwaiter.NEW, r3.state);
1229 >            p.execute(r1);
1230              p.execute(r2);
1231              assertTrue(p.getQueue().contains(r2));
1211            TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1232              p.execute(r3);
1233              assertFalse(p.getQueue().contains(r2));
1234              assertTrue(p.getQueue().contains(r3));
1215            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1216        } finally {
1217            joinPool(p);
1235          }
1236 +        assertEquals(LatchAwaiter.DONE, r1.state);
1237 +        assertEquals(LatchAwaiter.NEW, r2.state);
1238 +        assertEquals(LatchAwaiter.DONE, r3.state);
1239      }
1240  
1241      /**
1242       * execute throws RejectedExecutionException if shutdown
1243       */
1244      public void testRejectedExecutionExceptionOnShutdown() {
1245 <        ThreadPoolExecutor p =
1246 <            new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1245 >        final ThreadPoolExecutor p =
1246 >            new CustomTPE(1, 1,
1247 >                          LONG_DELAY_MS, MILLISECONDS,
1248 >                          new ArrayBlockingQueue<Runnable>(1));
1249          try { p.shutdown(); } catch (SecurityException ok) { return; }
1250 <        try {
1251 <            p.execute(new NoOpRunnable());
1252 <            shouldThrow();
1253 <        } catch (RejectedExecutionException success) {}
1254 <
1255 <        joinPool(p);
1250 >        try (PoolCleaner cleaner = cleaner(p)) {
1251 >            try {
1252 >                p.execute(new NoOpRunnable());
1253 >                shouldThrow();
1254 >            } catch (RejectedExecutionException success) {}
1255 >        }
1256      }
1257  
1258      /**
1259       * execute using CallerRunsPolicy drops task on shutdown
1260       */
1261      public void testCallerRunsOnShutdown() {
1262 <        RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
1263 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1264 <
1262 >        final ThreadPoolExecutor p =
1263 >            new CustomTPE(1, 1,
1264 >                          LONG_DELAY_MS, MILLISECONDS,
1265 >                          new ArrayBlockingQueue<Runnable>(1),
1266 >                          new CustomTPE.CallerRunsPolicy());
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);
1248        } finally {
1249            joinPool(p);
1272          }
1273      }
1274  
# Line 1254 | Line 1276 | public class ThreadPoolExecutorSubclassT
1276       * execute using DiscardPolicy drops task on shutdown
1277       */
1278      public void testDiscardOnShutdown() {
1279 <        RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
1280 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1281 <
1279 >        final ThreadPoolExecutor p =
1280 >            new CustomTPE(1, 1,
1281 >                          LONG_DELAY_MS, MILLISECONDS,
1282 >                          new ArrayBlockingQueue<Runnable>(1),
1283 >                          new CustomTPE.DiscardPolicy());
1284          try { p.shutdown(); } catch (SecurityException ok) { return; }
1285 <        try {
1285 >        try (PoolCleaner cleaner = cleaner(p)) {
1286              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1287              p.execute(r);
1288              assertFalse(r.done);
1265        } finally {
1266            joinPool(p);
1289          }
1290      }
1291  
# Line 1271 | Line 1293 | public class ThreadPoolExecutorSubclassT
1293       * execute using DiscardOldestPolicy drops task on shutdown
1294       */
1295      public void testDiscardOldestOnShutdown() {
1296 <        RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
1297 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1296 >        final ThreadPoolExecutor p =
1297 >            new CustomTPE(1, 1,
1298 >                          LONG_DELAY_MS, MILLISECONDS,
1299 >                          new ArrayBlockingQueue<Runnable>(1),
1300 >                          new CustomTPE.DiscardOldestPolicy());
1301  
1302          try { p.shutdown(); } catch (SecurityException ok) { return; }
1303 <        try {
1303 >        try (PoolCleaner cleaner = cleaner(p)) {
1304              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1305              p.execute(r);
1306              assertFalse(r.done);
1282        } finally {
1283            joinPool(p);
1307          }
1308      }
1309  
# Line 1288 | Line 1311 | public class ThreadPoolExecutorSubclassT
1311       * execute(null) throws NPE
1312       */
1313      public void testExecuteNull() {
1314 <        ThreadPoolExecutor p =
1315 <            new CustomTPE(1, 2, 1L, SECONDS,
1314 >        final ThreadPoolExecutor p =
1315 >            new CustomTPE(1, 2,
1316 >                          1L, SECONDS,
1317                            new ArrayBlockingQueue<Runnable>(10));
1318 <        try {
1319 <            p.execute(null);
1320 <            shouldThrow();
1321 <        } catch (NullPointerException success) {}
1322 <
1323 <        joinPool(p);
1318 >        try (PoolCleaner cleaner = cleaner(p)) {
1319 >            try {
1320 >                p.execute(null);
1321 >                shouldThrow();
1322 >            } catch (NullPointerException success) {}
1323 >        }
1324      }
1325  
1326      /**
1327       * setCorePoolSize of negative value throws IllegalArgumentException
1328       */
1329      public void testCorePoolSizeIllegalArgumentException() {
1330 <        ThreadPoolExecutor p =
1331 <            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1332 <        try {
1333 <            p.setCorePoolSize(-1);
1334 <            shouldThrow();
1335 <        } catch (IllegalArgumentException success) {
1336 <        } finally {
1337 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1330 >        final ThreadPoolExecutor p =
1331 >            new CustomTPE(1, 2,
1332 >                          LONG_DELAY_MS, MILLISECONDS,
1333 >                          new ArrayBlockingQueue<Runnable>(10));
1334 >        try (PoolCleaner cleaner = cleaner(p)) {
1335 >            try {
1336 >                p.setCorePoolSize(-1);
1337 >                shouldThrow();
1338 >            } catch (IllegalArgumentException success) {}
1339          }
1315        joinPool(p);
1340      }
1341  
1342      /**
# Line 1320 | Line 1344 | public class ThreadPoolExecutorSubclassT
1344       * if given a value less the core pool size
1345       */
1346      public void testMaximumPoolSizeIllegalArgumentException() {
1347 <        ThreadPoolExecutor p =
1348 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1349 <        try {
1350 <            p.setMaximumPoolSize(1);
1351 <            shouldThrow();
1352 <        } catch (IllegalArgumentException success) {
1353 <        } finally {
1354 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1347 >        final ThreadPoolExecutor p =
1348 >            new CustomTPE(2, 3,
1349 >                          LONG_DELAY_MS, MILLISECONDS,
1350 >                          new ArrayBlockingQueue<Runnable>(10));
1351 >        try (PoolCleaner cleaner = cleaner(p)) {
1352 >            try {
1353 >                p.setMaximumPoolSize(1);
1354 >                shouldThrow();
1355 >            } catch (IllegalArgumentException success) {}
1356          }
1332        joinPool(p);
1357      }
1358  
1359      /**
# Line 1337 | Line 1361 | public class ThreadPoolExecutorSubclassT
1361       * if given a negative value
1362       */
1363      public void testMaximumPoolSizeIllegalArgumentException2() {
1364 <        ThreadPoolExecutor p =
1365 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1366 <        try {
1367 <            p.setMaximumPoolSize(-1);
1368 <            shouldThrow();
1369 <        } catch (IllegalArgumentException success) {
1370 <        } finally {
1371 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1364 >        final ThreadPoolExecutor p =
1365 >            new CustomTPE(2, 3,
1366 >                          LONG_DELAY_MS,
1367 >                          MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1368 >        try (PoolCleaner cleaner = cleaner(p)) {
1369 >            try {
1370 >                p.setMaximumPoolSize(-1);
1371 >                shouldThrow();
1372 >            } catch (IllegalArgumentException success) {}
1373          }
1349        joinPool(p);
1374      }
1375  
1376      /**
# Line 1354 | Line 1378 | public class ThreadPoolExecutorSubclassT
1378       * when given a negative value
1379       */
1380      public void testKeepAliveTimeIllegalArgumentException() {
1381 <        ThreadPoolExecutor p =
1382 <            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1383 <
1384 <        try {
1385 <            p.setKeepAliveTime(-1,MILLISECONDS);
1386 <            shouldThrow();
1387 <        } catch (IllegalArgumentException success) {
1388 <        } finally {
1389 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
1381 >        final ThreadPoolExecutor p =
1382 >            new CustomTPE(2, 3,
1383 >                          LONG_DELAY_MS, MILLISECONDS,
1384 >                          new ArrayBlockingQueue<Runnable>(10));
1385 >        try (PoolCleaner cleaner = cleaner(p)) {
1386 >            try {
1387 >                p.setKeepAliveTime(-1, MILLISECONDS);
1388 >                shouldThrow();
1389 >            } catch (IllegalArgumentException success) {}
1390          }
1367        joinPool(p);
1391      }
1392  
1393      /**
# Line 1372 | Line 1395 | public class ThreadPoolExecutorSubclassT
1395       */
1396      public void testTerminated() {
1397          CustomTPE p = new CustomTPE();
1398 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
1399 <        assertTrue(p.terminatedCalled());
1400 <        joinPool(p);
1398 >        try (PoolCleaner cleaner = cleaner(p)) {
1399 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1400 >            assertTrue(p.terminatedCalled());
1401 >            assertTrue(p.isShutdown());
1402 >        }
1403      }
1404  
1405      /**
# Line 1382 | Line 1407 | public class ThreadPoolExecutorSubclassT
1407       */
1408      public void testBeforeAfter() throws InterruptedException {
1409          CustomTPE p = new CustomTPE();
1410 <        try {
1410 >        try (PoolCleaner cleaner = cleaner(p)) {
1411              final CountDownLatch done = new CountDownLatch(1);
1412              p.execute(new CheckedRunnable() {
1413                  public void realRun() {
# Line 1392 | Line 1417 | public class ThreadPoolExecutorSubclassT
1417              assertEquals(0, done.getCount());
1418              assertTrue(p.afterCalled());
1419              assertTrue(p.beforeCalled());
1395            try { p.shutdown(); } catch (SecurityException ok) { return; }
1396        } finally {
1397            joinPool(p);
1420          }
1421      }
1422  
# Line 1402 | Line 1424 | public class ThreadPoolExecutorSubclassT
1424       * completed submit of callable returns result
1425       */
1426      public void testSubmitCallable() throws Exception {
1427 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1428 <        try {
1427 >        final ExecutorService e =
1428 >            new CustomTPE(2, 2,
1429 >                          LONG_DELAY_MS, MILLISECONDS,
1430 >                          new ArrayBlockingQueue<Runnable>(10));
1431 >        try (PoolCleaner cleaner = cleaner(e)) {
1432              Future<String> future = e.submit(new StringTask());
1433              String result = future.get();
1434              assertSame(TEST_STRING, result);
1410        } finally {
1411            joinPool(e);
1435          }
1436      }
1437  
# Line 1416 | Line 1439 | public class ThreadPoolExecutorSubclassT
1439       * completed submit of runnable returns successfully
1440       */
1441      public void testSubmitRunnable() throws Exception {
1442 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1443 <        try {
1442 >        final ExecutorService e =
1443 >            new CustomTPE(2, 2,
1444 >                          LONG_DELAY_MS, MILLISECONDS,
1445 >                          new ArrayBlockingQueue<Runnable>(10));
1446 >        try (PoolCleaner cleaner = cleaner(e)) {
1447              Future<?> future = e.submit(new NoOpRunnable());
1448              future.get();
1449              assertTrue(future.isDone());
1424        } finally {
1425            joinPool(e);
1450          }
1451      }
1452  
# Line 1430 | Line 1454 | public class ThreadPoolExecutorSubclassT
1454       * completed submit of (runnable, result) returns result
1455       */
1456      public void testSubmitRunnable2() throws Exception {
1457 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1458 <        try {
1457 >        final ExecutorService e =
1458 >            new CustomTPE(2, 2,
1459 >                          LONG_DELAY_MS, MILLISECONDS,
1460 >                          new ArrayBlockingQueue<Runnable>(10));
1461 >        try (PoolCleaner cleaner = cleaner(e)) {
1462              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1463              String result = future.get();
1464              assertSame(TEST_STRING, result);
1438        } finally {
1439            joinPool(e);
1465          }
1466      }
1467  
1468      /**
1469 <     * invokeAny(null) throws NPE
1469 >     * invokeAny(null) throws NullPointerException
1470       */
1471      public void testInvokeAny1() throws Exception {
1472 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1473 <        try {
1474 <            e.invokeAny(null);
1475 <            shouldThrow();
1476 <        } catch (NullPointerException success) {
1477 <        } finally {
1478 <            joinPool(e);
1472 >        final ExecutorService e =
1473 >            new CustomTPE(2, 2,
1474 >                          LONG_DELAY_MS, MILLISECONDS,
1475 >                          new ArrayBlockingQueue<Runnable>(10));
1476 >        try (PoolCleaner cleaner = cleaner(e)) {
1477 >            try {
1478 >                e.invokeAny(null);
1479 >                shouldThrow();
1480 >            } catch (NullPointerException success) {}
1481          }
1482      }
1483  
1484      /**
1485 <     * invokeAny(empty collection) throws IAE
1485 >     * invokeAny(empty collection) throws IllegalArgumentException
1486       */
1487      public void testInvokeAny2() throws Exception {
1488 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1489 <        try {
1490 <            e.invokeAny(new ArrayList<Callable<String>>());
1491 <            shouldThrow();
1492 <        } catch (IllegalArgumentException success) {
1493 <        } finally {
1494 <            joinPool(e);
1488 >        final ExecutorService e =
1489 >            new CustomTPE(2, 2,
1490 >                          LONG_DELAY_MS, MILLISECONDS,
1491 >                          new ArrayBlockingQueue<Runnable>(10));
1492 >        try (PoolCleaner cleaner = cleaner(e)) {
1493 >            try {
1494 >                e.invokeAny(new ArrayList<Callable<String>>());
1495 >                shouldThrow();
1496 >            } catch (IllegalArgumentException success) {}
1497          }
1498      }
1499  
# Line 1473 | Line 1502 | public class ThreadPoolExecutorSubclassT
1502       */
1503      public void testInvokeAny3() throws Exception {
1504          CountDownLatch latch = new CountDownLatch(1);
1505 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1506 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1507 <        l.add(latchAwaitingStringTask(latch));
1508 <        l.add(null);
1509 <        try {
1510 <            e.invokeAny(l);
1511 <            shouldThrow();
1512 <        } catch (NullPointerException success) {
1513 <        } finally {
1505 >        final ExecutorService e =
1506 >            new CustomTPE(2, 2,
1507 >                          LONG_DELAY_MS, MILLISECONDS,
1508 >                          new ArrayBlockingQueue<Runnable>(10));
1509 >        try (PoolCleaner cleaner = cleaner(e)) {
1510 >            List<Callable<String>> l = new ArrayList<>();
1511 >            l.add(latchAwaitingStringTask(latch));
1512 >            l.add(null);
1513 >            try {
1514 >                e.invokeAny(l);
1515 >                shouldThrow();
1516 >            } catch (NullPointerException success) {}
1517              latch.countDown();
1486            joinPool(e);
1518          }
1519      }
1520  
# Line 1491 | Line 1522 | public class ThreadPoolExecutorSubclassT
1522       * invokeAny(c) throws ExecutionException if no task completes
1523       */
1524      public void testInvokeAny4() throws Exception {
1525 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1526 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1527 <        l.add(new NPETask());
1528 <        try {
1529 <            e.invokeAny(l);
1530 <            shouldThrow();
1531 <        } catch (ExecutionException success) {
1532 <            assertTrue(success.getCause() instanceof NullPointerException);
1533 <        } finally {
1534 <            joinPool(e);
1525 >        final ExecutorService e =
1526 >            new CustomTPE(2, 2,
1527 >                          LONG_DELAY_MS, MILLISECONDS,
1528 >                          new ArrayBlockingQueue<Runnable>(10));
1529 >        try (PoolCleaner cleaner = cleaner(e)) {
1530 >            List<Callable<String>> l = new ArrayList<>();
1531 >            l.add(new NPETask());
1532 >            try {
1533 >                e.invokeAny(l);
1534 >                shouldThrow();
1535 >            } catch (ExecutionException success) {
1536 >                assertTrue(success.getCause() instanceof NullPointerException);
1537 >            }
1538          }
1539      }
1540  
# Line 1508 | Line 1542 | public class ThreadPoolExecutorSubclassT
1542       * invokeAny(c) returns result of some task
1543       */
1544      public void testInvokeAny5() throws Exception {
1545 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1546 <        try {
1547 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1545 >        final ExecutorService e =
1546 >            new CustomTPE(2, 2,
1547 >                          LONG_DELAY_MS, MILLISECONDS,
1548 >                          new ArrayBlockingQueue<Runnable>(10));
1549 >        try (PoolCleaner cleaner = cleaner(e)) {
1550 >            List<Callable<String>> l = new ArrayList<>();
1551              l.add(new StringTask());
1552              l.add(new StringTask());
1553              String result = e.invokeAny(l);
1554              assertSame(TEST_STRING, result);
1518        } finally {
1519            joinPool(e);
1555          }
1556      }
1557  
# Line 1524 | Line 1559 | public class ThreadPoolExecutorSubclassT
1559       * invokeAll(null) throws NPE
1560       */
1561      public void testInvokeAll1() throws Exception {
1562 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1563 <        try {
1564 <            e.invokeAll(null);
1565 <            shouldThrow();
1566 <        } catch (NullPointerException success) {
1567 <        } finally {
1568 <            joinPool(e);
1562 >        final ExecutorService e =
1563 >            new CustomTPE(2, 2,
1564 >                          LONG_DELAY_MS, MILLISECONDS,
1565 >                          new ArrayBlockingQueue<Runnable>(10));
1566 >        try (PoolCleaner cleaner = cleaner(e)) {
1567 >            try {
1568 >                e.invokeAll(null);
1569 >                shouldThrow();
1570 >            } catch (NullPointerException success) {}
1571          }
1572      }
1573  
1574      /**
1575 <     * invokeAll(empty collection) returns empty collection
1575 >     * invokeAll(empty collection) returns empty list
1576       */
1577      public void testInvokeAll2() throws Exception {
1578 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1579 <        try {
1580 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1578 >        final ExecutorService e =
1579 >            new CustomTPE(2, 2,
1580 >                          LONG_DELAY_MS, MILLISECONDS,
1581 >                          new ArrayBlockingQueue<Runnable>(10));
1582 >        final Collection<Callable<String>> emptyCollection
1583 >            = Collections.emptyList();
1584 >        try (PoolCleaner cleaner = cleaner(e)) {
1585 >            List<Future<String>> r = e.invokeAll(emptyCollection);
1586              assertTrue(r.isEmpty());
1545        } finally {
1546            joinPool(e);
1587          }
1588      }
1589  
# Line 1551 | Line 1591 | public class ThreadPoolExecutorSubclassT
1591       * invokeAll(c) throws NPE if c has null elements
1592       */
1593      public void testInvokeAll3() throws Exception {
1594 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1595 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1596 <        l.add(new StringTask());
1597 <        l.add(null);
1598 <        try {
1599 <            e.invokeAll(l);
1600 <            shouldThrow();
1601 <        } catch (NullPointerException success) {
1602 <        } finally {
1603 <            joinPool(e);
1594 >        final ExecutorService e =
1595 >            new CustomTPE(2, 2,
1596 >                          LONG_DELAY_MS, MILLISECONDS,
1597 >                          new ArrayBlockingQueue<Runnable>(10));
1598 >        try (PoolCleaner cleaner = cleaner(e)) {
1599 >            List<Callable<String>> l = new ArrayList<>();
1600 >            l.add(new StringTask());
1601 >            l.add(null);
1602 >            try {
1603 >                e.invokeAll(l);
1604 >                shouldThrow();
1605 >            } catch (NullPointerException success) {}
1606          }
1607      }
1608  
# Line 1568 | Line 1610 | public class ThreadPoolExecutorSubclassT
1610       * get of element of invokeAll(c) throws exception on failed task
1611       */
1612      public void testInvokeAll4() throws Exception {
1613 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1614 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1615 <        l.add(new NPETask());
1616 <        List<Future<String>> futures = e.invokeAll(l);
1617 <        assertEquals(1, futures.size());
1618 <        try {
1619 <            futures.get(0).get();
1620 <            shouldThrow();
1621 <        } catch (ExecutionException success) {
1622 <            assertTrue(success.getCause() instanceof NullPointerException);
1623 <        } finally {
1624 <            joinPool(e);
1613 >        final ExecutorService e =
1614 >            new CustomTPE(2, 2,
1615 >                          LONG_DELAY_MS, MILLISECONDS,
1616 >                          new ArrayBlockingQueue<Runnable>(10));
1617 >        try (PoolCleaner cleaner = cleaner(e)) {
1618 >            List<Callable<String>> l = new ArrayList<>();
1619 >            l.add(new NPETask());
1620 >            List<Future<String>> futures = e.invokeAll(l);
1621 >            assertEquals(1, futures.size());
1622 >            try {
1623 >                futures.get(0).get();
1624 >                shouldThrow();
1625 >            } catch (ExecutionException success) {
1626 >                assertTrue(success.getCause() instanceof NullPointerException);
1627 >            }
1628          }
1629      }
1630  
# Line 1587 | Line 1632 | public class ThreadPoolExecutorSubclassT
1632       * invokeAll(c) returns results of all completed tasks
1633       */
1634      public void testInvokeAll5() throws Exception {
1635 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1636 <        try {
1637 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1635 >        final ExecutorService e =
1636 >            new CustomTPE(2, 2,
1637 >                          LONG_DELAY_MS, MILLISECONDS,
1638 >                          new ArrayBlockingQueue<Runnable>(10));
1639 >        try (PoolCleaner cleaner = cleaner(e)) {
1640 >            List<Callable<String>> l = new ArrayList<>();
1641              l.add(new StringTask());
1642              l.add(new StringTask());
1643              List<Future<String>> futures = e.invokeAll(l);
1644              assertEquals(2, futures.size());
1645              for (Future<String> future : futures)
1646                  assertSame(TEST_STRING, future.get());
1599        } finally {
1600            joinPool(e);
1647          }
1648      }
1649  
# Line 1605 | Line 1651 | public class ThreadPoolExecutorSubclassT
1651       * timed invokeAny(null) throws NPE
1652       */
1653      public void testTimedInvokeAny1() throws Exception {
1654 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1655 <        try {
1656 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1657 <            shouldThrow();
1658 <        } catch (NullPointerException success) {
1659 <        } finally {
1660 <            joinPool(e);
1654 >        final ExecutorService e =
1655 >            new CustomTPE(2, 2,
1656 >                          LONG_DELAY_MS, MILLISECONDS,
1657 >                          new ArrayBlockingQueue<Runnable>(10));
1658 >        try (PoolCleaner cleaner = cleaner(e)) {
1659 >            try {
1660 >                e.invokeAny(null, randomTimeout(), randomTimeUnit());
1661 >                shouldThrow();
1662 >            } catch (NullPointerException success) {}
1663          }
1664      }
1665  
# Line 1619 | Line 1667 | public class ThreadPoolExecutorSubclassT
1667       * timed invokeAny(,,null) throws NPE
1668       */
1669      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1670 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1671 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1672 <        l.add(new StringTask());
1673 <        try {
1674 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1675 <            shouldThrow();
1676 <        } catch (NullPointerException success) {
1677 <        } finally {
1678 <            joinPool(e);
1670 >        final ExecutorService e =
1671 >            new CustomTPE(2, 2,
1672 >                          LONG_DELAY_MS, MILLISECONDS,
1673 >                          new ArrayBlockingQueue<Runnable>(10));
1674 >        try (PoolCleaner cleaner = cleaner(e)) {
1675 >            List<Callable<String>> l = new ArrayList<>();
1676 >            l.add(new StringTask());
1677 >            try {
1678 >                e.invokeAny(l, randomTimeout(), null);
1679 >                shouldThrow();
1680 >            } catch (NullPointerException success) {}
1681          }
1682      }
1683  
1684      /**
1685 <     * timed invokeAny(empty collection) throws IAE
1685 >     * timed invokeAny(empty collection) throws IllegalArgumentException
1686       */
1687      public void testTimedInvokeAny2() throws Exception {
1688 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1689 <        try {
1690 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1691 <            shouldThrow();
1692 <        } catch (IllegalArgumentException success) {
1693 <        } finally {
1694 <            joinPool(e);
1688 >        final ExecutorService e =
1689 >            new CustomTPE(2, 2,
1690 >                          LONG_DELAY_MS, MILLISECONDS,
1691 >                          new ArrayBlockingQueue<Runnable>(10));
1692 >        final Collection<Callable<String>> emptyCollection
1693 >            = Collections.emptyList();
1694 >        try (PoolCleaner cleaner = cleaner(e)) {
1695 >            try {
1696 >                e.invokeAny(emptyCollection, randomTimeout(), randomTimeUnit());
1697 >                shouldThrow();
1698 >            } catch (IllegalArgumentException success) {}
1699          }
1700      }
1701  
# Line 1650 | Line 1704 | public class ThreadPoolExecutorSubclassT
1704       */
1705      public void testTimedInvokeAny3() throws Exception {
1706          CountDownLatch latch = new CountDownLatch(1);
1707 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1708 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1709 <        l.add(latchAwaitingStringTask(latch));
1710 <        l.add(null);
1711 <        try {
1712 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1713 <            shouldThrow();
1714 <        } catch (NullPointerException success) {
1715 <        } finally {
1707 >        final ExecutorService e =
1708 >            new CustomTPE(2, 2,
1709 >                          LONG_DELAY_MS, MILLISECONDS,
1710 >                          new ArrayBlockingQueue<Runnable>(10));
1711 >        try (PoolCleaner cleaner = cleaner(e)) {
1712 >            List<Callable<String>> l = new ArrayList<>();
1713 >            l.add(latchAwaitingStringTask(latch));
1714 >            l.add(null);
1715 >            try {
1716 >                e.invokeAny(l, randomTimeout(), MILLISECONDS);
1717 >                shouldThrow();
1718 >            } catch (NullPointerException success) {}
1719              latch.countDown();
1663            joinPool(e);
1720          }
1721      }
1722  
# Line 1668 | Line 1724 | public class ThreadPoolExecutorSubclassT
1724       * timed invokeAny(c) throws ExecutionException if no task completes
1725       */
1726      public void testTimedInvokeAny4() throws Exception {
1727 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1728 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1729 <        l.add(new NPETask());
1730 <        try {
1731 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1732 <            shouldThrow();
1733 <        } catch (ExecutionException success) {
1734 <            assertTrue(success.getCause() instanceof NullPointerException);
1735 <        } finally {
1736 <            joinPool(e);
1727 >        final ExecutorService e =
1728 >            new CustomTPE(2, 2,
1729 >                          LONG_DELAY_MS, MILLISECONDS,
1730 >                          new ArrayBlockingQueue<Runnable>(10));
1731 >        try (PoolCleaner cleaner = cleaner(e)) {
1732 >            long startTime = System.nanoTime();
1733 >            List<Callable<String>> l = new ArrayList<>();
1734 >            l.add(new NPETask());
1735 >            try {
1736 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1737 >                shouldThrow();
1738 >            } catch (ExecutionException success) {
1739 >                assertTrue(success.getCause() instanceof NullPointerException);
1740 >            }
1741 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1742          }
1743      }
1744  
# Line 1685 | Line 1746 | public class ThreadPoolExecutorSubclassT
1746       * timed invokeAny(c) returns result of some task
1747       */
1748      public void testTimedInvokeAny5() throws Exception {
1749 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1750 <        try {
1751 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1749 >        final ExecutorService e =
1750 >            new CustomTPE(2, 2,
1751 >                          LONG_DELAY_MS, MILLISECONDS,
1752 >                          new ArrayBlockingQueue<Runnable>(10));
1753 >        try (PoolCleaner cleaner = cleaner(e)) {
1754 >            long startTime = System.nanoTime();
1755 >            List<Callable<String>> l = new ArrayList<>();
1756              l.add(new StringTask());
1757              l.add(new StringTask());
1758 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1758 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1759              assertSame(TEST_STRING, result);
1760 <        } finally {
1696 <            joinPool(e);
1760 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1761          }
1762      }
1763  
# Line 1701 | Line 1765 | public class ThreadPoolExecutorSubclassT
1765       * timed invokeAll(null) throws NPE
1766       */
1767      public void testTimedInvokeAll1() throws Exception {
1768 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1769 <        try {
1770 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1771 <            shouldThrow();
1772 <        } catch (NullPointerException success) {
1773 <        } finally {
1774 <            joinPool(e);
1768 >        final ExecutorService e =
1769 >            new CustomTPE(2, 2,
1770 >                          LONG_DELAY_MS, MILLISECONDS,
1771 >                          new ArrayBlockingQueue<Runnable>(10));
1772 >        try (PoolCleaner cleaner = cleaner(e)) {
1773 >            try {
1774 >                e.invokeAll(null, randomTimeout(), randomTimeUnit());
1775 >                shouldThrow();
1776 >            } catch (NullPointerException success) {}
1777          }
1778      }
1779  
# Line 1715 | Line 1781 | public class ThreadPoolExecutorSubclassT
1781       * timed invokeAll(,,null) throws NPE
1782       */
1783      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1784 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1785 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1786 <        l.add(new StringTask());
1787 <        try {
1788 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1789 <            shouldThrow();
1790 <        } catch (NullPointerException success) {
1791 <        } finally {
1792 <            joinPool(e);
1784 >        final ExecutorService e =
1785 >            new CustomTPE(2, 2,
1786 >                          LONG_DELAY_MS, MILLISECONDS,
1787 >                          new ArrayBlockingQueue<Runnable>(10));
1788 >        try (PoolCleaner cleaner = cleaner(e)) {
1789 >            List<Callable<String>> l = new ArrayList<>();
1790 >            l.add(new StringTask());
1791 >            try {
1792 >                e.invokeAll(l, randomTimeout(), null);
1793 >                shouldThrow();
1794 >            } catch (NullPointerException success) {}
1795          }
1796      }
1797  
1798      /**
1799 <     * timed invokeAll(empty collection) returns empty collection
1799 >     * timed invokeAll(empty collection) returns empty list
1800       */
1801      public void testTimedInvokeAll2() throws Exception {
1802 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1803 <        try {
1804 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1802 >        final ExecutorService e =
1803 >            new CustomTPE(2, 2,
1804 >                          LONG_DELAY_MS, MILLISECONDS,
1805 >                          new ArrayBlockingQueue<Runnable>(10));
1806 >        final Collection<Callable<String>> emptyCollection
1807 >            = Collections.emptyList();
1808 >        try (PoolCleaner cleaner = cleaner(e)) {
1809 >            List<Future<String>> r =
1810 >                e.invokeAll(emptyCollection, randomTimeout(), randomTimeUnit());
1811              assertTrue(r.isEmpty());
1738        } finally {
1739            joinPool(e);
1812          }
1813      }
1814  
# Line 1744 | Line 1816 | public class ThreadPoolExecutorSubclassT
1816       * timed invokeAll(c) throws NPE if c has null elements
1817       */
1818      public void testTimedInvokeAll3() throws Exception {
1819 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1820 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1821 <        l.add(new StringTask());
1822 <        l.add(null);
1823 <        try {
1824 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1825 <            shouldThrow();
1826 <        } catch (NullPointerException success) {
1827 <        } finally {
1828 <            joinPool(e);
1819 >        final ExecutorService e =
1820 >            new CustomTPE(2, 2,
1821 >                          LONG_DELAY_MS, MILLISECONDS,
1822 >                          new ArrayBlockingQueue<Runnable>(10));
1823 >        try (PoolCleaner cleaner = cleaner(e)) {
1824 >            List<Callable<String>> l = new ArrayList<>();
1825 >            l.add(new StringTask());
1826 >            l.add(null);
1827 >            try {
1828 >                e.invokeAll(l, randomTimeout(), randomTimeUnit());
1829 >                shouldThrow();
1830 >            } catch (NullPointerException success) {}
1831          }
1832      }
1833  
# Line 1761 | Line 1835 | public class ThreadPoolExecutorSubclassT
1835       * get of element of invokeAll(c) throws exception on failed task
1836       */
1837      public void testTimedInvokeAll4() throws Exception {
1838 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1839 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1840 <        l.add(new NPETask());
1841 <        List<Future<String>> futures =
1842 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1843 <        assertEquals(1, futures.size());
1844 <        try {
1845 <            futures.get(0).get();
1846 <            shouldThrow();
1847 <        } catch (ExecutionException success) {
1848 <            assertTrue(success.getCause() instanceof NullPointerException);
1849 <        } finally {
1850 <            joinPool(e);
1838 >        final ExecutorService e =
1839 >            new CustomTPE(2, 2,
1840 >                          LONG_DELAY_MS, MILLISECONDS,
1841 >                          new ArrayBlockingQueue<Runnable>(10));
1842 >        try (PoolCleaner cleaner = cleaner(e)) {
1843 >            List<Callable<String>> l = new ArrayList<>();
1844 >            l.add(new NPETask());
1845 >            List<Future<String>> futures =
1846 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1847 >            assertEquals(1, futures.size());
1848 >            try {
1849 >                futures.get(0).get();
1850 >                shouldThrow();
1851 >            } catch (ExecutionException success) {
1852 >                assertTrue(success.getCause() instanceof NullPointerException);
1853 >            }
1854          }
1855      }
1856  
# Line 1781 | Line 1858 | public class ThreadPoolExecutorSubclassT
1858       * timed invokeAll(c) returns results of all completed tasks
1859       */
1860      public void testTimedInvokeAll5() throws Exception {
1861 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1862 <        try {
1863 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1861 >        final ExecutorService e =
1862 >            new CustomTPE(2, 2,
1863 >                          LONG_DELAY_MS, MILLISECONDS,
1864 >                          new ArrayBlockingQueue<Runnable>(10));
1865 >        try (PoolCleaner cleaner = cleaner(e)) {
1866 >            List<Callable<String>> l = new ArrayList<>();
1867              l.add(new StringTask());
1868              l.add(new StringTask());
1869              List<Future<String>> futures =
# Line 1791 | Line 1871 | public class ThreadPoolExecutorSubclassT
1871              assertEquals(2, futures.size());
1872              for (Future<String> future : futures)
1873                  assertSame(TEST_STRING, future.get());
1794        } finally {
1795            joinPool(e);
1874          }
1875      }
1876  
# Line 1800 | Line 1878 | public class ThreadPoolExecutorSubclassT
1878       * timed invokeAll(c) cancels tasks not completed by timeout
1879       */
1880      public void testTimedInvokeAll6() throws Exception {
1881 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1882 <        try {
1883 <            for (long timeout = timeoutMillis();;) {
1881 >        for (long timeout = timeoutMillis();;) {
1882 >            final CountDownLatch done = new CountDownLatch(1);
1883 >            final Callable<String> waiter = new CheckedCallable<String>() {
1884 >                public String realCall() {
1885 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1886 >                    catch (InterruptedException ok) {}
1887 >                    return "1"; }};
1888 >            final ExecutorService p =
1889 >                new CustomTPE(2, 2,
1890 >                              LONG_DELAY_MS, MILLISECONDS,
1891 >                              new ArrayBlockingQueue<Runnable>(10));
1892 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1893                  List<Callable<String>> tasks = new ArrayList<>();
1894                  tasks.add(new StringTask("0"));
1895 <                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1895 >                tasks.add(waiter);
1896                  tasks.add(new StringTask("2"));
1897                  long startTime = System.nanoTime();
1898                  List<Future<String>> futures =
1899 <                    e.invokeAll(tasks, timeout, MILLISECONDS);
1899 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1900                  assertEquals(tasks.size(), futures.size());
1901                  assertTrue(millisElapsedSince(startTime) >= timeout);
1902                  for (Future future : futures)
# Line 1825 | Line 1912 | public class ThreadPoolExecutorSubclassT
1912                          fail("expected exactly one task to be cancelled");
1913                  }
1914              }
1828        } finally {
1829            joinPool(e);
1915          }
1916      }
1917  
# Line 1840 | Line 1925 | public class ThreadPoolExecutorSubclassT
1925                            LONG_DELAY_MS, MILLISECONDS,
1926                            new LinkedBlockingQueue<Runnable>(),
1927                            new FailingThreadFactory());
1928 <        try {
1928 >        try (PoolCleaner cleaner = cleaner(e)) {
1929              final int TASKS = 100;
1930              final CountDownLatch done = new CountDownLatch(TASKS);
1931              for (int k = 0; k < TASKS; ++k)
# Line 1848 | Line 1933 | public class ThreadPoolExecutorSubclassT
1933                      public void realRun() {
1934                          done.countDown();
1935                      }});
1936 <            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1852 <        } finally {
1853 <            joinPool(e);
1936 >            await(done);
1937          }
1938      }
1939  
# Line 1858 | Line 1941 | public class ThreadPoolExecutorSubclassT
1941       * allowsCoreThreadTimeOut is by default false.
1942       */
1943      public void testAllowsCoreThreadTimeOut() {
1944 <        ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1945 <        assertFalse(p.allowsCoreThreadTimeOut());
1946 <        joinPool(p);
1944 >        final ThreadPoolExecutor p =
1945 >            new CustomTPE(2, 2,
1946 >                          1000, MILLISECONDS,
1947 >                          new ArrayBlockingQueue<Runnable>(10));
1948 >        try (PoolCleaner cleaner = cleaner(p)) {
1949 >            assertFalse(p.allowsCoreThreadTimeOut());
1950 >        }
1951      }
1952  
1953      /**
# Line 1872 | Line 1959 | public class ThreadPoolExecutorSubclassT
1959              new CustomTPE(2, 10,
1960                            keepAliveTime, MILLISECONDS,
1961                            new ArrayBlockingQueue<Runnable>(10));
1962 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1963 <        try {
1962 >        try (PoolCleaner cleaner = cleaner(p)) {
1963 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1964              p.allowCoreThreadTimeOut(true);
1965              p.execute(new CheckedRunnable() {
1966                  public void realRun() {
# Line 1888 | Line 1975 | public class ThreadPoolExecutorSubclassT
1975                  Thread.yield();
1976              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1977              assertEquals(0, p.getPoolSize());
1891        } finally {
1892            joinPool(p);
1978          }
1979      }
1980  
# Line 1902 | Line 1987 | public class ThreadPoolExecutorSubclassT
1987              new CustomTPE(2, 10,
1988                            keepAliveTime, MILLISECONDS,
1989                            new ArrayBlockingQueue<Runnable>(10));
1990 <        final CountDownLatch threadStarted = new CountDownLatch(1);
1991 <        try {
1990 >        try (PoolCleaner cleaner = cleaner(p)) {
1991 >            final CountDownLatch threadStarted = new CountDownLatch(1);
1992              p.allowCoreThreadTimeOut(false);
1993              p.execute(new CheckedRunnable() {
1994                  public void realRun() throws InterruptedException {
# Line 1912 | Line 1997 | public class ThreadPoolExecutorSubclassT
1997                  }});
1998              delay(2 * keepAliveTime);
1999              assertTrue(p.getPoolSize() >= 1);
1915        } finally {
1916            joinPool(p);
2000          }
2001      }
2002  
# Line 1922 | Line 2005 | public class ThreadPoolExecutorSubclassT
2005       * (in part, a test of CustomTPE itself)
2006       */
2007      public void testGet_cancelled() throws Exception {
2008 +        final CountDownLatch done = new CountDownLatch(1);
2009          final ExecutorService e =
2010              new CustomTPE(1, 1,
2011                            LONG_DELAY_MS, MILLISECONDS,
2012                            new LinkedBlockingQueue<Runnable>());
2013 <        try {
2013 >        try (PoolCleaner cleaner = cleaner(e, done)) {
2014              final CountDownLatch blockerStarted = new CountDownLatch(1);
1931            final CountDownLatch done = new CountDownLatch(1);
2015              final List<Future<?>> futures = new ArrayList<>();
2016              for (int i = 0; i < 2; i++) {
2017                  Runnable r = new CheckedRunnable() { public void realRun()
# Line 1938 | Line 2021 | public class ThreadPoolExecutorSubclassT
2021                  }};
2022                  futures.add(e.submit(r));
2023              }
2024 <            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2024 >            await(blockerStarted);
2025              for (Future<?> future : futures) future.cancel(false);
2026              for (Future<?> future : futures) {
2027                  try {
# Line 1952 | Line 2035 | public class ThreadPoolExecutorSubclassT
2035                  assertTrue(future.isCancelled());
2036                  assertTrue(future.isDone());
2037              }
1955            done.countDown();
1956        } finally {
1957            joinPool(e);
2038          }
2039      }
2040  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines