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

Comparing jsr166/src/test/tck/ScheduledExecutorSubclassTest.java (file contents):
Revision 1.44 by jsr166, Sun Oct 4 02:11:44 2015 UTC vs.
Revision 1.53 by jsr166, Tue Oct 6 05:22:25 2015 UTC

# Line 99 | Line 99 | public class ScheduledExecutorSubclassTe
99       * execute successfully executes a runnable
100       */
101      public void testExecute() throws InterruptedException {
102 <        CustomExecutor p = new CustomExecutor(1);
103 <        final CountDownLatch done = new CountDownLatch(1);
104 <        final Runnable task = new CheckedRunnable() {
105 <            public void realRun() {
106 <                done.countDown();
107 <            }};
108 <        try {
102 >        final CustomExecutor p = new CustomExecutor(1);
103 >        try (PoolCleaner cleaner = cleaner(p)) {
104 >            final CountDownLatch done = new CountDownLatch(1);
105 >            final Runnable task = new CheckedRunnable() {
106 >                public void realRun() { done.countDown(); }};
107              p.execute(task);
108 <            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
111 <        } finally {
112 <            joinPool(p);
108 >            await(done);
109          }
110      }
111  
# Line 117 | Line 113 | public class ScheduledExecutorSubclassTe
113       * delayed schedule of callable successfully executes after delay
114       */
115      public void testSchedule1() throws Exception {
120        CustomExecutor p = new CustomExecutor(1);
121        final long startTime = System.nanoTime();
116          final CountDownLatch done = new CountDownLatch(1);
117 <        try {
117 >        final CustomExecutor p = new CustomExecutor(1);
118 >        try (PoolCleaner cleaner = cleaner(p, done)) {
119 >            final long startTime = System.nanoTime();
120              Callable task = new CheckedCallable<Boolean>() {
121                  public Boolean realCall() {
122                      done.countDown();
# Line 130 | Line 126 | public class ScheduledExecutorSubclassTe
126              Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
127              assertSame(Boolean.TRUE, f.get());
128              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
133            assertTrue(done.await(0L, MILLISECONDS));
134        } finally {
135            joinPool(p);
129          }
130      }
131  
# Line 140 | Line 133 | public class ScheduledExecutorSubclassTe
133       * delayed schedule of runnable successfully executes after delay
134       */
135      public void testSchedule3() throws Exception {
136 <        CustomExecutor p = new CustomExecutor(1);
137 <        final long startTime = System.nanoTime();
138 <        final CountDownLatch done = new CountDownLatch(1);
139 <        try {
136 >        final CustomExecutor p = new CustomExecutor(1);
137 >        try (PoolCleaner cleaner = cleaner(p)) {
138 >            final long startTime = System.nanoTime();
139 >            final CountDownLatch done = new CountDownLatch(1);
140              Runnable task = new CheckedRunnable() {
141                  public void realRun() {
142                      done.countDown();
# Line 153 | Line 146 | public class ScheduledExecutorSubclassTe
146              await(done);
147              assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
148              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
156        } finally {
157            joinPool(p);
149          }
150      }
151  
# Line 162 | Line 153 | public class ScheduledExecutorSubclassTe
153       * scheduleAtFixedRate executes runnable after given initial delay
154       */
155      public void testSchedule4() throws InterruptedException {
156 <        CustomExecutor p = new CustomExecutor(1);
157 <        final long startTime = System.nanoTime();
158 <        final CountDownLatch done = new CountDownLatch(1);
159 <        try {
156 >        final CustomExecutor p = new CustomExecutor(1);
157 >        try (PoolCleaner cleaner = cleaner(p)) {
158 >            final long startTime = System.nanoTime();
159 >            final CountDownLatch done = new CountDownLatch(1);
160              Runnable task = new CheckedRunnable() {
161                  public void realRun() {
162                      done.countDown();
# Line 177 | Line 168 | public class ScheduledExecutorSubclassTe
168              await(done);
169              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
170              f.cancel(true);
180        } finally {
181            joinPool(p);
171          }
172      }
173  
# Line 186 | Line 175 | public class ScheduledExecutorSubclassTe
175       * scheduleWithFixedDelay executes runnable after given initial delay
176       */
177      public void testSchedule5() throws InterruptedException {
178 <        CustomExecutor p = new CustomExecutor(1);
179 <        final long startTime = System.nanoTime();
180 <        final CountDownLatch done = new CountDownLatch(1);
181 <        try {
178 >        final CustomExecutor p = new CustomExecutor(1);
179 >        try (PoolCleaner cleaner = cleaner(p)) {
180 >            final long startTime = System.nanoTime();
181 >            final CountDownLatch done = new CountDownLatch(1);
182              Runnable task = new CheckedRunnable() {
183                  public void realRun() {
184                      done.countDown();
# Line 201 | Line 190 | public class ScheduledExecutorSubclassTe
190              await(done);
191              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
192              f.cancel(true);
204        } finally {
205            joinPool(p);
193          }
194      }
195  
# Line 215 | Line 202 | public class ScheduledExecutorSubclassTe
202       * scheduleAtFixedRate executes series of tasks at given rate
203       */
204      public void testFixedRateSequence() throws InterruptedException {
205 <        CustomExecutor p = new CustomExecutor(1);
206 <        try {
205 >        final CustomExecutor p = new CustomExecutor(1);
206 >        try (PoolCleaner cleaner = cleaner(p)) {
207              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
208                  long startTime = System.nanoTime();
209                  int cycles = 10;
# Line 225 | Line 212 | public class ScheduledExecutorSubclassTe
212                      public void realRun() { done.countDown(); }};
213                  ScheduledFuture h =
214                      p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
215 <                done.await();
215 >                await(done);
216                  h.cancel(true);
217                  double normalizedTime =
218                      (double) millisElapsedSince(startTime) / delay;
# Line 234 | Line 221 | public class ScheduledExecutorSubclassTe
221                      return;
222              }
223              throw new AssertionError("unexpected execution rate");
237        } finally {
238            joinPool(p);
224          }
225      }
226  
# Line 243 | Line 228 | public class ScheduledExecutorSubclassTe
228       * scheduleWithFixedDelay executes series of tasks with given period
229       */
230      public void testFixedDelaySequence() throws InterruptedException {
231 <        CustomExecutor p = new CustomExecutor(1);
232 <        try {
231 >        final CustomExecutor p = new CustomExecutor(1);
232 >        try (PoolCleaner cleaner = cleaner(p)) {
233              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
234                  long startTime = System.nanoTime();
235                  int cycles = 10;
# Line 253 | Line 238 | public class ScheduledExecutorSubclassTe
238                      public void realRun() { done.countDown(); }};
239                  ScheduledFuture h =
240                      p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
241 <                done.await();
241 >                await(done);
242                  h.cancel(true);
243                  double normalizedTime =
244                      (double) millisElapsedSince(startTime) / delay;
# Line 262 | Line 247 | public class ScheduledExecutorSubclassTe
247                      return;
248              }
249              throw new AssertionError("unexpected execution rate");
265        } finally {
266            joinPool(p);
250          }
251      }
252  
# Line 271 | Line 254 | public class ScheduledExecutorSubclassTe
254       * execute(null) throws NPE
255       */
256      public void testExecuteNull() throws InterruptedException {
257 <        CustomExecutor se = new CustomExecutor(1);
258 <        try {
259 <            se.execute(null);
260 <            shouldThrow();
261 <        } catch (NullPointerException success) {}
262 <        joinPool(se);
257 >        final CustomExecutor p = new CustomExecutor(1);
258 >        try (PoolCleaner cleaner = cleaner(p)) {
259 >            try {
260 >                p.execute(null);
261 >                shouldThrow();
262 >            } catch (NullPointerException success) {}
263 >        }
264      }
265  
266      /**
267       * schedule(null) throws NPE
268       */
269      public void testScheduleNull() throws InterruptedException {
270 <        CustomExecutor se = new CustomExecutor(1);
271 <        try {
272 <            TrackedCallable callable = null;
273 <            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
274 <            shouldThrow();
275 <        } catch (NullPointerException success) {}
276 <        joinPool(se);
270 >        final CustomExecutor p = new CustomExecutor(1);
271 >        try (PoolCleaner cleaner = cleaner(p)) {
272 >            try {
273 >                TrackedCallable callable = null;
274 >                Future f = p.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
275 >                shouldThrow();
276 >            } catch (NullPointerException success) {}
277 >        }
278      }
279  
280      /**
281       * execute throws RejectedExecutionException if shutdown
282       */
283      public void testSchedule1_RejectedExecutionException() {
284 <        CustomExecutor se = new CustomExecutor(1);
285 <        try {
286 <            se.shutdown();
287 <            se.schedule(new NoOpRunnable(),
288 <                        MEDIUM_DELAY_MS, MILLISECONDS);
289 <            shouldThrow();
290 <        } catch (RejectedExecutionException success) {
291 <        } catch (SecurityException ok) {
284 >        final CustomExecutor p = new CustomExecutor(1);
285 >        try (PoolCleaner cleaner = cleaner(p)) {
286 >            try {
287 >                p.shutdown();
288 >                p.schedule(new NoOpRunnable(),
289 >                           MEDIUM_DELAY_MS, MILLISECONDS);
290 >                shouldThrow();
291 >            } catch (RejectedExecutionException success) {
292 >            } catch (SecurityException ok) {}
293          }
308
309        joinPool(se);
294      }
295  
296      /**
297       * schedule throws RejectedExecutionException if shutdown
298       */
299      public void testSchedule2_RejectedExecutionException() {
300 <        CustomExecutor se = new CustomExecutor(1);
301 <        try {
302 <            se.shutdown();
303 <            se.schedule(new NoOpCallable(),
304 <                        MEDIUM_DELAY_MS, MILLISECONDS);
305 <            shouldThrow();
306 <        } catch (RejectedExecutionException success) {
307 <        } catch (SecurityException ok) {
300 >        final CustomExecutor p = new CustomExecutor(1);
301 >        try (PoolCleaner cleaner = cleaner(p)) {
302 >            try {
303 >                p.shutdown();
304 >                p.schedule(new NoOpCallable(),
305 >                           MEDIUM_DELAY_MS, MILLISECONDS);
306 >                shouldThrow();
307 >            } catch (RejectedExecutionException success) {
308 >            } catch (SecurityException ok) {}
309          }
325        joinPool(se);
310      }
311  
312      /**
313       * schedule callable throws RejectedExecutionException if shutdown
314       */
315      public void testSchedule3_RejectedExecutionException() {
316 <        CustomExecutor se = new CustomExecutor(1);
317 <        try {
318 <            se.shutdown();
319 <            se.schedule(new NoOpCallable(),
320 <                        MEDIUM_DELAY_MS, MILLISECONDS);
321 <            shouldThrow();
322 <        } catch (RejectedExecutionException success) {
323 <        } catch (SecurityException ok) {
316 >        final CustomExecutor p = new CustomExecutor(1);
317 >        try (PoolCleaner cleaner = cleaner(p)) {
318 >            try {
319 >                p.shutdown();
320 >                p.schedule(new NoOpCallable(),
321 >                           MEDIUM_DELAY_MS, MILLISECONDS);
322 >                shouldThrow();
323 >            } catch (RejectedExecutionException success) {
324 >            } catch (SecurityException ok) {}
325          }
341        joinPool(se);
326      }
327  
328      /**
329       * scheduleAtFixedRate throws RejectedExecutionException if shutdown
330       */
331      public void testScheduleAtFixedRate1_RejectedExecutionException() {
332 <        CustomExecutor se = new CustomExecutor(1);
333 <        try {
334 <            se.shutdown();
335 <            se.scheduleAtFixedRate(new NoOpRunnable(),
336 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
337 <            shouldThrow();
338 <        } catch (RejectedExecutionException success) {
339 <        } catch (SecurityException ok) {
332 >        final CustomExecutor p = new CustomExecutor(1);
333 >        try (PoolCleaner cleaner = cleaner(p)) {
334 >            try {
335 >                p.shutdown();
336 >                p.scheduleAtFixedRate(new NoOpRunnable(),
337 >                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
338 >                shouldThrow();
339 >            } catch (RejectedExecutionException success) {
340 >            } catch (SecurityException ok) {}
341          }
357        joinPool(se);
342      }
343  
344      /**
345       * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
346       */
347      public void testScheduleWithFixedDelay1_RejectedExecutionException() {
348 <        CustomExecutor se = new CustomExecutor(1);
349 <        try {
350 <            se.shutdown();
351 <            se.scheduleWithFixedDelay(new NoOpRunnable(),
352 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
353 <            shouldThrow();
354 <        } catch (RejectedExecutionException success) {
355 <        } catch (SecurityException ok) {
348 >        final CustomExecutor p = new CustomExecutor(1);
349 >        try (PoolCleaner cleaner = cleaner(p)) {
350 >            try {
351 >                p.shutdown();
352 >                p.scheduleWithFixedDelay(new NoOpRunnable(),
353 >                                         MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
354 >                shouldThrow();
355 >            } catch (RejectedExecutionException success) {
356 >            } catch (SecurityException ok) {}
357          }
373        joinPool(se);
358      }
359  
360      /**
# Line 378 | Line 362 | public class ScheduledExecutorSubclassTe
362       * thread becomes active
363       */
364      public void testGetActiveCount() throws InterruptedException {
381        final ThreadPoolExecutor p = new CustomExecutor(2);
382        final CountDownLatch threadStarted = new CountDownLatch(1);
365          final CountDownLatch done = new CountDownLatch(1);
366 <        try {
366 >        final ThreadPoolExecutor p = new CustomExecutor(2);
367 >        try (PoolCleaner cleaner = cleaner(p, done)) {
368 >            final CountDownLatch threadStarted = new CountDownLatch(1);
369              assertEquals(0, p.getActiveCount());
370              p.execute(new CheckedRunnable() {
371                  public void realRun() throws InterruptedException {
372                      threadStarted.countDown();
373                      assertEquals(1, p.getActiveCount());
374 <                    done.await();
374 >                    await(done);
375                  }});
376 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
376 >            await(threadStarted);
377              assertEquals(1, p.getActiveCount());
394        } finally {
395            done.countDown();
396            joinPool(p);
378          }
379      }
380  
# Line 403 | Line 384 | public class ScheduledExecutorSubclassTe
384       */
385      public void testGetCompletedTaskCount() throws InterruptedException {
386          final ThreadPoolExecutor p = new CustomExecutor(2);
387 <        final CountDownLatch threadStarted = new CountDownLatch(1);
388 <        final CountDownLatch threadProceed = new CountDownLatch(1);
389 <        final CountDownLatch threadDone = new CountDownLatch(1);
390 <        try {
387 >        try (PoolCleaner cleaner = cleaner(p)) {
388 >            final CountDownLatch threadStarted = new CountDownLatch(1);
389 >            final CountDownLatch threadProceed = new CountDownLatch(1);
390 >            final CountDownLatch threadDone = new CountDownLatch(1);
391              assertEquals(0, p.getCompletedTaskCount());
392              p.execute(new CheckedRunnable() {
393                  public void realRun() throws InterruptedException {
# Line 425 | Line 406 | public class ScheduledExecutorSubclassTe
406                      fail("timed out");
407                  Thread.yield();
408              }
428        } finally {
429            joinPool(p);
409          }
410      }
411  
# Line 434 | Line 413 | public class ScheduledExecutorSubclassTe
413       * getCorePoolSize returns size given in constructor if not otherwise set
414       */
415      public void testGetCorePoolSize() {
416 <        CustomExecutor p = new CustomExecutor(1);
417 <        assertEquals(1, p.getCorePoolSize());
418 <        joinPool(p);
416 >        final CustomExecutor p = new CustomExecutor(1);
417 >        try (PoolCleaner cleaner = cleaner(p)) {
418 >            assertEquals(1, p.getCorePoolSize());
419 >        }
420      }
421  
422      /**
# Line 445 | Line 425 | public class ScheduledExecutorSubclassTe
425       */
426      public void testGetLargestPoolSize() throws InterruptedException {
427          final int THREADS = 3;
448        final ThreadPoolExecutor p = new CustomExecutor(THREADS);
449        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
428          final CountDownLatch done = new CountDownLatch(1);
429 <        try {
429 >        final ThreadPoolExecutor p = new CustomExecutor(THREADS);
430 >        try (PoolCleaner cleaner = cleaner(p, done)) {
431 >            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
432              assertEquals(0, p.getLargestPoolSize());
433              for (int i = 0; i < THREADS; i++)
434                  p.execute(new CheckedRunnable() {
435                      public void realRun() throws InterruptedException {
436                          threadsStarted.countDown();
437 <                        done.await();
437 >                        await(done);
438                          assertEquals(THREADS, p.getLargestPoolSize());
439                      }});
440 <            assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
461 <            assertEquals(THREADS, p.getLargestPoolSize());
462 <        } finally {
463 <            done.countDown();
464 <            joinPool(p);
440 >            await(threadsStarted);
441              assertEquals(THREADS, p.getLargestPoolSize());
442          }
443 +        assertEquals(THREADS, p.getLargestPoolSize());
444      }
445  
446      /**
# Line 471 | Line 448 | public class ScheduledExecutorSubclassTe
448       * become active
449       */
450      public void testGetPoolSize() throws InterruptedException {
474        final ThreadPoolExecutor p = new CustomExecutor(1);
475        final CountDownLatch threadStarted = new CountDownLatch(1);
451          final CountDownLatch done = new CountDownLatch(1);
452 <        try {
452 >        final ThreadPoolExecutor p = new CustomExecutor(1);
453 >        try (PoolCleaner cleaner = cleaner(p, done)) {
454 >            final CountDownLatch threadStarted = new CountDownLatch(1);
455              assertEquals(0, p.getPoolSize());
456              p.execute(new CheckedRunnable() {
457                  public void realRun() throws InterruptedException {
458                      threadStarted.countDown();
459                      assertEquals(1, p.getPoolSize());
460 <                    done.await();
460 >                    await(done);
461                  }});
462 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
462 >            await(threadStarted);
463              assertEquals(1, p.getPoolSize());
487        } finally {
488            done.countDown();
489            joinPool(p);
464          }
465      }
466  
# Line 495 | Line 469 | public class ScheduledExecutorSubclassTe
469       * submitted
470       */
471      public void testGetTaskCount() throws InterruptedException {
472 <        final ThreadPoolExecutor p = new CustomExecutor(1);
499 <        final CountDownLatch threadStarted = new CountDownLatch(1);
472 >        final int TASKS = 3;
473          final CountDownLatch done = new CountDownLatch(1);
474 <        final int TASKS = 5;
475 <        try {
474 >        final ThreadPoolExecutor p = new CustomExecutor(1);
475 >        try (PoolCleaner cleaner = cleaner(p, done)) {
476 >            final CountDownLatch threadStarted = new CountDownLatch(1);
477              assertEquals(0, p.getTaskCount());
478 <            for (int i = 0; i < TASKS; i++)
478 >            assertEquals(0, p.getCompletedTaskCount());
479 >            p.execute(new CheckedRunnable() {
480 >                public void realRun() throws InterruptedException {
481 >                    threadStarted.countDown();
482 >                    await(done);
483 >                }});
484 >            await(threadStarted);
485 >            assertEquals(1, p.getTaskCount());
486 >            assertEquals(0, p.getCompletedTaskCount());
487 >            for (int i = 0; i < TASKS; i++) {
488 >                assertEquals(1 + i, p.getTaskCount());
489                  p.execute(new CheckedRunnable() {
490                      public void realRun() throws InterruptedException {
491                          threadStarted.countDown();
492 <                        done.await();
492 >                        assertEquals(1 + TASKS, p.getTaskCount());
493 >                        await(done);
494                      }});
495 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
496 <            assertEquals(TASKS, p.getTaskCount());
497 <        } finally {
513 <            done.countDown();
514 <            joinPool(p);
495 >            }
496 >            assertEquals(1 + TASKS, p.getTaskCount());
497 >            assertEquals(0, p.getCompletedTaskCount());
498          }
499 +        assertEquals(1 + TASKS, p.getTaskCount());
500 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
501      }
502  
503      /**
504       * getThreadFactory returns factory in constructor if not set
505       */
506      public void testGetThreadFactory() {
507 <        ThreadFactory tf = new SimpleThreadFactory();
508 <        CustomExecutor p = new CustomExecutor(1, tf);
509 <        assertSame(tf, p.getThreadFactory());
510 <        joinPool(p);
507 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
508 >        final CustomExecutor p = new CustomExecutor(1, threadFactory);
509 >        try (PoolCleaner cleaner = cleaner(p)) {
510 >            assertSame(threadFactory, p.getThreadFactory());
511 >        }
512      }
513  
514      /**
515       * setThreadFactory sets the thread factory returned by getThreadFactory
516       */
517      public void testSetThreadFactory() {
518 <        ThreadFactory tf = new SimpleThreadFactory();
519 <        CustomExecutor p = new CustomExecutor(1);
520 <        p.setThreadFactory(tf);
521 <        assertSame(tf, p.getThreadFactory());
522 <        joinPool(p);
518 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
519 >        final CustomExecutor p = new CustomExecutor(1);
520 >        try (PoolCleaner cleaner = cleaner(p)) {
521 >            p.setThreadFactory(threadFactory);
522 >            assertSame(threadFactory, p.getThreadFactory());
523 >        }
524      }
525  
526      /**
527       * setThreadFactory(null) throws NPE
528       */
529      public void testSetThreadFactoryNull() {
530 <        CustomExecutor p = new CustomExecutor(1);
531 <        try {
532 <            p.setThreadFactory(null);
533 <            shouldThrow();
534 <        } catch (NullPointerException success) {
535 <        } finally {
549 <            joinPool(p);
530 >        final CustomExecutor p = new CustomExecutor(1);
531 >        try (PoolCleaner cleaner = cleaner(p)) {
532 >            try {
533 >                p.setThreadFactory(null);
534 >                shouldThrow();
535 >            } catch (NullPointerException success) {}
536          }
537      }
538  
# Line 554 | Line 540 | public class ScheduledExecutorSubclassTe
540       * isShutdown is false before shutdown, true after
541       */
542      public void testIsShutdown() {
543 <        CustomExecutor p = new CustomExecutor(1);
544 <        try {
543 >        final CustomExecutor p = new CustomExecutor(1);
544 >        try (PoolCleaner cleaner = cleaner(p)) {
545              assertFalse(p.isShutdown());
560        }
561        finally {
546              try { p.shutdown(); } catch (SecurityException ok) { return; }
547 +            assertTrue(p.isShutdown());
548          }
564        assertTrue(p.isShutdown());
549      }
550  
551      /**
552       * isTerminated is false before termination, true after
553       */
554      public void testIsTerminated() throws InterruptedException {
571        final ThreadPoolExecutor p = new CustomExecutor(1);
572        final CountDownLatch threadStarted = new CountDownLatch(1);
555          final CountDownLatch done = new CountDownLatch(1);
556 <        assertFalse(p.isTerminated());
557 <        try {
556 >        final ThreadPoolExecutor p = new CustomExecutor(1);
557 >        try (PoolCleaner cleaner = cleaner(p)) {
558 >            final CountDownLatch threadStarted = new CountDownLatch(1);
559              p.execute(new CheckedRunnable() {
560                  public void realRun() throws InterruptedException {
561                      assertFalse(p.isTerminated());
562                      threadStarted.countDown();
563 <                    done.await();
563 >                    await(done);
564                  }});
565 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
565 >            await(threadStarted);
566 >            assertFalse(p.isTerminated());
567              assertFalse(p.isTerminating());
568              done.countDown();
585        } finally {
569              try { p.shutdown(); } catch (SecurityException ok) { return; }
570 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
571 +            assertTrue(p.isTerminated());
572          }
588        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
589        assertTrue(p.isTerminated());
573      }
574  
575      /**
576       * isTerminating is not true when running or when terminated
577       */
578      public void testIsTerminating() throws InterruptedException {
596        final ThreadPoolExecutor p = new CustomExecutor(1);
597        final CountDownLatch threadStarted = new CountDownLatch(1);
579          final CountDownLatch done = new CountDownLatch(1);
580 <        try {
580 >        final ThreadPoolExecutor p = new CustomExecutor(1);
581 >        try (PoolCleaner cleaner = cleaner(p)) {
582 >            final CountDownLatch threadStarted = new CountDownLatch(1);
583              assertFalse(p.isTerminating());
584              p.execute(new CheckedRunnable() {
585                  public void realRun() throws InterruptedException {
586                      assertFalse(p.isTerminating());
587                      threadStarted.countDown();
588 <                    done.await();
588 >                    await(done);
589                  }});
590 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
590 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
591              assertFalse(p.isTerminating());
592              done.countDown();
610        } finally {
593              try { p.shutdown(); } catch (SecurityException ok) { return; }
594 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
595 +            assertTrue(p.isTerminated());
596 +            assertFalse(p.isTerminating());
597          }
613        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
614        assertTrue(p.isTerminated());
615        assertFalse(p.isTerminating());
598      }
599  
600      /**
601       * getQueue returns the work queue, which contains queued tasks
602       */
603      public void testGetQueue() throws InterruptedException {
604 <        ScheduledThreadPoolExecutor p = new CustomExecutor(1);
605 <        final CountDownLatch threadStarted = new CountDownLatch(1);
606 <        final CountDownLatch done = new CountDownLatch(1);
607 <        try {
604 >        final ScheduledThreadPoolExecutor p = new CustomExecutor(1);
605 >        try (PoolCleaner cleaner = cleaner(p)) {
606 >            final CountDownLatch threadStarted = new CountDownLatch(1);
607 >            final CountDownLatch done = new CountDownLatch(1);
608              ScheduledFuture[] tasks = new ScheduledFuture[5];
609              for (int i = 0; i < tasks.length; i++) {
610                  Runnable r = new CheckedRunnable() {
611                      public void realRun() throws InterruptedException {
612                          threadStarted.countDown();
613 <                        done.await();
613 >                        await(done);
614                      }};
615                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
616              }
617 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
617 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
618              BlockingQueue<Runnable> q = p.getQueue();
619              assertTrue(q.contains(tasks[tasks.length - 1]));
620              assertFalse(q.contains(tasks[0]));
639        } finally {
621              done.countDown();
641            joinPool(p);
622          }
623      }
624  
# Line 647 | Line 627 | public class ScheduledExecutorSubclassTe
627       */
628      public void testRemove() throws InterruptedException {
629          final ScheduledThreadPoolExecutor p = new CustomExecutor(1);
630 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
631 <        final CountDownLatch threadStarted = new CountDownLatch(1);
632 <        final CountDownLatch done = new CountDownLatch(1);
633 <        try {
630 >        try (PoolCleaner cleaner = cleaner(p)) {
631 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
632 >            final CountDownLatch threadStarted = new CountDownLatch(1);
633 >            final CountDownLatch done = new CountDownLatch(1);
634              for (int i = 0; i < tasks.length; i++) {
635                  Runnable r = new CheckedRunnable() {
636                      public void realRun() throws InterruptedException {
637                          threadStarted.countDown();
638 <                        done.await();
638 >                        await(done);
639                      }};
640                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
641              }
642 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
642 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
643              BlockingQueue<Runnable> q = p.getQueue();
644              assertFalse(p.remove((Runnable)tasks[0]));
645              assertTrue(q.contains((Runnable)tasks[4]));
# Line 670 | Line 650 | public class ScheduledExecutorSubclassTe
650              assertTrue(q.contains((Runnable)tasks[3]));
651              assertTrue(p.remove((Runnable)tasks[3]));
652              assertFalse(q.contains((Runnable)tasks[3]));
673        } finally {
653              done.countDown();
675            joinPool(p);
654          }
655      }
656  
# Line 680 | Line 658 | public class ScheduledExecutorSubclassTe
658       * purge removes cancelled tasks from the queue
659       */
660      public void testPurge() throws InterruptedException {
661 <        CustomExecutor p = new CustomExecutor(1);
662 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
663 <        for (int i = 0; i < tasks.length; i++)
664 <            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
665 <                                  LONG_DELAY_MS, MILLISECONDS);
666 <        try {
661 >        final ScheduledFuture[] tasks = new ScheduledFuture[5];
662 >        final Runnable releaser = new Runnable() { public void run() {
663 >            for (ScheduledFuture task : tasks)
664 >                if (task != null) task.cancel(true); }};
665 >        final CustomExecutor p = new CustomExecutor(1);
666 >        try (PoolCleaner cleaner = cleaner(p, releaser)) {
667 >            for (int i = 0; i < tasks.length; i++)
668 >                tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
669 >                                      LONG_DELAY_MS, MILLISECONDS);
670              int max = tasks.length;
671              if (tasks[4].cancel(true)) --max;
672              if (tasks[3].cancel(true)) --max;
# Line 697 | Line 678 | public class ScheduledExecutorSubclassTe
678                  long count = p.getTaskCount();
679                  if (count == max)
680                      return;
681 <            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
681 >            } while (millisElapsedSince(startTime) < LONG_DELAY_MS);
682              fail("Purge failed to remove cancelled tasks");
702        } finally {
703            for (ScheduledFuture task : tasks)
704                task.cancel(true);
705            joinPool(p);
683          }
684      }
685  
# Line 715 | Line 692 | public class ScheduledExecutorSubclassTe
692          final int count = 5;
693          final AtomicInteger ran = new AtomicInteger(0);
694          final CustomExecutor p = new CustomExecutor(poolSize);
695 <        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
695 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
696          Runnable waiter = new CheckedRunnable() { public void realRun() {
697              threadsStarted.countDown();
698              try {
# Line 725 | Line 702 | public class ScheduledExecutorSubclassTe
702          }};
703          for (int i = 0; i < count; i++)
704              p.execute(waiter);
705 <        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
705 >        await(threadsStarted);
706          assertEquals(poolSize, p.getActiveCount());
707          assertEquals(0, p.getCompletedTaskCount());
708          final List<Runnable> queuedTasks;
# Line 748 | Line 725 | public class ScheduledExecutorSubclassTe
725       * and those tasks are drained from the queue
726       */
727      public void testShutdownNow_delayedTasks() throws InterruptedException {
728 <        CustomExecutor p = new CustomExecutor(1);
728 >        final CustomExecutor p = new CustomExecutor(1);
729          List<ScheduledFuture> tasks = new ArrayList<>();
730          for (int i = 0; i < 3; i++) {
731              Runnable r = new NoOpRunnable();
# Line 875 | Line 852 | public class ScheduledExecutorSubclassTe
852       * completed submit of callable returns result
853       */
854      public void testSubmitCallable() throws Exception {
855 <        ExecutorService e = new CustomExecutor(2);
856 <        try {
855 >        final ExecutorService e = new CustomExecutor(2);
856 >        try (PoolCleaner cleaner = cleaner(e)) {
857              Future<String> future = e.submit(new StringTask());
858              String result = future.get();
859              assertSame(TEST_STRING, result);
883        } finally {
884            joinPool(e);
860          }
861      }
862  
# Line 889 | Line 864 | public class ScheduledExecutorSubclassTe
864       * completed submit of runnable returns successfully
865       */
866      public void testSubmitRunnable() throws Exception {
867 <        ExecutorService e = new CustomExecutor(2);
868 <        try {
867 >        final ExecutorService e = new CustomExecutor(2);
868 >        try (PoolCleaner cleaner = cleaner(e)) {
869              Future<?> future = e.submit(new NoOpRunnable());
870              future.get();
871              assertTrue(future.isDone());
897        } finally {
898            joinPool(e);
872          }
873      }
874  
# Line 903 | Line 876 | public class ScheduledExecutorSubclassTe
876       * completed submit of (runnable, result) returns result
877       */
878      public void testSubmitRunnable2() throws Exception {
879 <        ExecutorService e = new CustomExecutor(2);
880 <        try {
879 >        final ExecutorService e = new CustomExecutor(2);
880 >        try (PoolCleaner cleaner = cleaner(e)) {
881              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
882              String result = future.get();
883              assertSame(TEST_STRING, result);
911        } finally {
912            joinPool(e);
884          }
885      }
886  
# Line 917 | Line 888 | public class ScheduledExecutorSubclassTe
888       * invokeAny(null) throws NPE
889       */
890      public void testInvokeAny1() throws Exception {
891 <        ExecutorService e = new CustomExecutor(2);
892 <        try {
893 <            e.invokeAny(null);
894 <            shouldThrow();
895 <        } catch (NullPointerException success) {
896 <        } finally {
926 <            joinPool(e);
891 >        final ExecutorService e = new CustomExecutor(2);
892 >        try (PoolCleaner cleaner = cleaner(e)) {
893 >            try {
894 >                e.invokeAny(null);
895 >                shouldThrow();
896 >            } catch (NullPointerException success) {}
897          }
898      }
899  
# Line 931 | Line 901 | public class ScheduledExecutorSubclassTe
901       * invokeAny(empty collection) throws IAE
902       */
903      public void testInvokeAny2() throws Exception {
904 <        ExecutorService e = new CustomExecutor(2);
905 <        try {
906 <            e.invokeAny(new ArrayList<Callable<String>>());
907 <            shouldThrow();
908 <        } catch (IllegalArgumentException success) {
909 <        } finally {
940 <            joinPool(e);
904 >        final ExecutorService e = new CustomExecutor(2);
905 >        try (PoolCleaner cleaner = cleaner(e)) {
906 >            try {
907 >                e.invokeAny(new ArrayList<Callable<String>>());
908 >                shouldThrow();
909 >            } catch (IllegalArgumentException success) {}
910          }
911      }
912  
# Line 945 | Line 914 | public class ScheduledExecutorSubclassTe
914       * invokeAny(c) throws NPE if c has null elements
915       */
916      public void testInvokeAny3() throws Exception {
917 <        CountDownLatch latch = new CountDownLatch(1);
918 <        ExecutorService e = new CustomExecutor(2);
919 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
920 <        l.add(latchAwaitingStringTask(latch));
921 <        l.add(null);
922 <        try {
923 <            e.invokeAny(l);
924 <            shouldThrow();
925 <        } catch (NullPointerException success) {
926 <        } finally {
917 >        final CountDownLatch latch = new CountDownLatch(1);
918 >        final ExecutorService e = new CustomExecutor(2);
919 >        try (PoolCleaner cleaner = cleaner(e)) {
920 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
921 >            l.add(latchAwaitingStringTask(latch));
922 >            l.add(null);
923 >            try {
924 >                e.invokeAny(l);
925 >                shouldThrow();
926 >            } catch (NullPointerException success) {}
927              latch.countDown();
959            joinPool(e);
928          }
929      }
930  
# Line 964 | Line 932 | public class ScheduledExecutorSubclassTe
932       * invokeAny(c) throws ExecutionException if no task completes
933       */
934      public void testInvokeAny4() throws Exception {
935 <        ExecutorService e = new CustomExecutor(2);
936 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
937 <        l.add(new NPETask());
938 <        try {
939 <            e.invokeAny(l);
940 <            shouldThrow();
941 <        } catch (ExecutionException success) {
942 <            assertTrue(success.getCause() instanceof NullPointerException);
943 <        } finally {
944 <            joinPool(e);
935 >        final ExecutorService e = new CustomExecutor(2);
936 >        try (PoolCleaner cleaner = cleaner(e)) {
937 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
938 >            l.add(new NPETask());
939 >            try {
940 >                e.invokeAny(l);
941 >                shouldThrow();
942 >            } catch (ExecutionException success) {
943 >                assertTrue(success.getCause() instanceof NullPointerException);
944 >            }
945          }
946      }
947  
# Line 981 | Line 949 | public class ScheduledExecutorSubclassTe
949       * invokeAny(c) returns result of some task
950       */
951      public void testInvokeAny5() throws Exception {
952 <        ExecutorService e = new CustomExecutor(2);
953 <        try {
952 >        final ExecutorService e = new CustomExecutor(2);
953 >        try (PoolCleaner cleaner = cleaner(e)) {
954              List<Callable<String>> l = new ArrayList<Callable<String>>();
955              l.add(new StringTask());
956              l.add(new StringTask());
957              String result = e.invokeAny(l);
958              assertSame(TEST_STRING, result);
991        } finally {
992            joinPool(e);
959          }
960      }
961  
# Line 997 | Line 963 | public class ScheduledExecutorSubclassTe
963       * invokeAll(null) throws NPE
964       */
965      public void testInvokeAll1() throws Exception {
966 <        ExecutorService e = new CustomExecutor(2);
967 <        try {
968 <            e.invokeAll(null);
969 <            shouldThrow();
970 <        } catch (NullPointerException success) {
971 <        } finally {
1006 <            joinPool(e);
966 >        final ExecutorService e = new CustomExecutor(2);
967 >        try (PoolCleaner cleaner = cleaner(e)) {
968 >            try {
969 >                e.invokeAll(null);
970 >                shouldThrow();
971 >            } catch (NullPointerException success) {}
972          }
973      }
974  
# Line 1011 | Line 976 | public class ScheduledExecutorSubclassTe
976       * invokeAll(empty collection) returns empty collection
977       */
978      public void testInvokeAll2() throws Exception {
979 <        ExecutorService e = new CustomExecutor(2);
980 <        try {
979 >        final ExecutorService e = new CustomExecutor(2);
980 >        try (PoolCleaner cleaner = cleaner(e)) {
981              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
982              assertTrue(r.isEmpty());
1018        } finally {
1019            joinPool(e);
983          }
984      }
985  
# Line 1024 | Line 987 | public class ScheduledExecutorSubclassTe
987       * invokeAll(c) throws NPE if c has null elements
988       */
989      public void testInvokeAll3() throws Exception {
990 <        ExecutorService e = new CustomExecutor(2);
991 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
992 <        l.add(new StringTask());
993 <        l.add(null);
994 <        try {
995 <            e.invokeAll(l);
996 <            shouldThrow();
997 <        } catch (NullPointerException success) {
998 <        } finally {
1036 <            joinPool(e);
990 >        final ExecutorService e = new CustomExecutor(2);
991 >        try (PoolCleaner cleaner = cleaner(e)) {
992 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
993 >            l.add(new StringTask());
994 >            l.add(null);
995 >            try {
996 >                e.invokeAll(l);
997 >                shouldThrow();
998 >            } catch (NullPointerException success) {}
999          }
1000      }
1001  
# Line 1041 | Line 1003 | public class ScheduledExecutorSubclassTe
1003       * get of invokeAll(c) throws exception on failed task
1004       */
1005      public void testInvokeAll4() throws Exception {
1006 <        ExecutorService e = new CustomExecutor(2);
1007 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1008 <        l.add(new NPETask());
1009 <        List<Future<String>> futures = e.invokeAll(l);
1010 <        assertEquals(1, futures.size());
1011 <        try {
1012 <            futures.get(0).get();
1013 <            shouldThrow();
1014 <        } catch (ExecutionException success) {
1015 <            assertTrue(success.getCause() instanceof NullPointerException);
1016 <        } finally {
1017 <            joinPool(e);
1006 >        final ExecutorService e = new CustomExecutor(2);
1007 >        try (PoolCleaner cleaner = cleaner(e)) {
1008 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1009 >            l.add(new NPETask());
1010 >            List<Future<String>> futures = e.invokeAll(l);
1011 >            assertEquals(1, futures.size());
1012 >            try {
1013 >                futures.get(0).get();
1014 >                shouldThrow();
1015 >            } catch (ExecutionException success) {
1016 >                assertTrue(success.getCause() instanceof NullPointerException);
1017 >            }
1018          }
1019      }
1020  
# Line 1060 | Line 1022 | public class ScheduledExecutorSubclassTe
1022       * invokeAll(c) returns results of all completed tasks
1023       */
1024      public void testInvokeAll5() throws Exception {
1025 <        ExecutorService e = new CustomExecutor(2);
1026 <        try {
1025 >        final ExecutorService e = new CustomExecutor(2);
1026 >        try (PoolCleaner cleaner = cleaner(e)) {
1027              List<Callable<String>> l = new ArrayList<Callable<String>>();
1028              l.add(new StringTask());
1029              l.add(new StringTask());
# Line 1069 | Line 1031 | public class ScheduledExecutorSubclassTe
1031              assertEquals(2, futures.size());
1032              for (Future<String> future : futures)
1033                  assertSame(TEST_STRING, future.get());
1072        } finally {
1073            joinPool(e);
1034          }
1035      }
1036  
# Line 1078 | Line 1038 | public class ScheduledExecutorSubclassTe
1038       * timed invokeAny(null) throws NPE
1039       */
1040      public void testTimedInvokeAny1() throws Exception {
1041 <        ExecutorService e = new CustomExecutor(2);
1042 <        try {
1043 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1044 <            shouldThrow();
1045 <        } catch (NullPointerException success) {
1046 <        } finally {
1087 <            joinPool(e);
1041 >        final ExecutorService e = new CustomExecutor(2);
1042 >        try (PoolCleaner cleaner = cleaner(e)) {
1043 >            try {
1044 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1045 >                shouldThrow();
1046 >            } catch (NullPointerException success) {}
1047          }
1048      }
1049  
# Line 1092 | Line 1051 | public class ScheduledExecutorSubclassTe
1051       * timed invokeAny(,,null) throws NPE
1052       */
1053      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1054 <        ExecutorService e = new CustomExecutor(2);
1055 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1056 <        l.add(new StringTask());
1057 <        try {
1058 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1059 <            shouldThrow();
1060 <        } catch (NullPointerException success) {
1061 <        } finally {
1103 <            joinPool(e);
1054 >        final ExecutorService e = new CustomExecutor(2);
1055 >        try (PoolCleaner cleaner = cleaner(e)) {
1056 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1057 >            l.add(new StringTask());
1058 >            try {
1059 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1060 >                shouldThrow();
1061 >            } catch (NullPointerException success) {}
1062          }
1063      }
1064  
# Line 1108 | Line 1066 | public class ScheduledExecutorSubclassTe
1066       * timed invokeAny(empty collection) throws IAE
1067       */
1068      public void testTimedInvokeAny2() throws Exception {
1069 <        ExecutorService e = new CustomExecutor(2);
1070 <        try {
1071 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1072 <            shouldThrow();
1073 <        } catch (IllegalArgumentException success) {
1074 <        } finally {
1117 <            joinPool(e);
1069 >        final ExecutorService e = new CustomExecutor(2);
1070 >        try (PoolCleaner cleaner = cleaner(e)) {
1071 >            try {
1072 >                e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1073 >                shouldThrow();
1074 >            } catch (IllegalArgumentException success) {}
1075          }
1076      }
1077  
# Line 1123 | Line 1080 | public class ScheduledExecutorSubclassTe
1080       */
1081      public void testTimedInvokeAny3() throws Exception {
1082          CountDownLatch latch = new CountDownLatch(1);
1083 <        ExecutorService e = new CustomExecutor(2);
1084 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1085 <        l.add(latchAwaitingStringTask(latch));
1086 <        l.add(null);
1087 <        try {
1088 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1089 <            shouldThrow();
1090 <        } catch (NullPointerException success) {
1091 <        } finally {
1083 >        final ExecutorService e = new CustomExecutor(2);
1084 >        try (PoolCleaner cleaner = cleaner(e)) {
1085 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1086 >            l.add(latchAwaitingStringTask(latch));
1087 >            l.add(null);
1088 >            try {
1089 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1090 >                shouldThrow();
1091 >            } catch (NullPointerException success) {}
1092              latch.countDown();
1136            joinPool(e);
1093          }
1094      }
1095  
# Line 1141 | Line 1097 | public class ScheduledExecutorSubclassTe
1097       * timed invokeAny(c) throws ExecutionException if no task completes
1098       */
1099      public void testTimedInvokeAny4() throws Exception {
1100 <        ExecutorService e = new CustomExecutor(2);
1101 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1102 <        l.add(new NPETask());
1103 <        try {
1104 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1105 <            shouldThrow();
1106 <        } catch (ExecutionException success) {
1107 <            assertTrue(success.getCause() instanceof NullPointerException);
1108 <        } finally {
1109 <            joinPool(e);
1100 >        final ExecutorService e = new CustomExecutor(2);
1101 >        try (PoolCleaner cleaner = cleaner(e)) {
1102 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1103 >            l.add(new NPETask());
1104 >            try {
1105 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1106 >                shouldThrow();
1107 >            } catch (ExecutionException success) {
1108 >                assertTrue(success.getCause() instanceof NullPointerException);
1109 >            }
1110          }
1111      }
1112  
# Line 1158 | Line 1114 | public class ScheduledExecutorSubclassTe
1114       * timed invokeAny(c) returns result of some task
1115       */
1116      public void testTimedInvokeAny5() throws Exception {
1117 <        ExecutorService e = new CustomExecutor(2);
1118 <        try {
1117 >        final ExecutorService e = new CustomExecutor(2);
1118 >        try (PoolCleaner cleaner = cleaner(e)) {
1119              List<Callable<String>> l = new ArrayList<Callable<String>>();
1120              l.add(new StringTask());
1121              l.add(new StringTask());
1122              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1123              assertSame(TEST_STRING, result);
1168        } finally {
1169            joinPool(e);
1124          }
1125      }
1126  
# Line 1174 | Line 1128 | public class ScheduledExecutorSubclassTe
1128       * timed invokeAll(null) throws NPE
1129       */
1130      public void testTimedInvokeAll1() throws Exception {
1131 <        ExecutorService e = new CustomExecutor(2);
1132 <        try {
1133 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1134 <            shouldThrow();
1135 <        } catch (NullPointerException success) {
1136 <        } finally {
1183 <            joinPool(e);
1131 >        final ExecutorService e = new CustomExecutor(2);
1132 >        try (PoolCleaner cleaner = cleaner(e)) {
1133 >            try {
1134 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1135 >                shouldThrow();
1136 >            } catch (NullPointerException success) {}
1137          }
1138      }
1139  
# Line 1188 | Line 1141 | public class ScheduledExecutorSubclassTe
1141       * timed invokeAll(,,null) throws NPE
1142       */
1143      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1144 <        ExecutorService e = new CustomExecutor(2);
1145 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1146 <        l.add(new StringTask());
1147 <        try {
1148 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1149 <            shouldThrow();
1150 <        } catch (NullPointerException success) {
1151 <        } finally {
1199 <            joinPool(e);
1144 >        final ExecutorService e = new CustomExecutor(2);
1145 >        try (PoolCleaner cleaner = cleaner(e)) {
1146 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1147 >            l.add(new StringTask());
1148 >            try {
1149 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1150 >                shouldThrow();
1151 >            } catch (NullPointerException success) {}
1152          }
1153      }
1154  
# Line 1204 | Line 1156 | public class ScheduledExecutorSubclassTe
1156       * timed invokeAll(empty collection) returns empty collection
1157       */
1158      public void testTimedInvokeAll2() throws Exception {
1159 <        ExecutorService e = new CustomExecutor(2);
1160 <        try {
1159 >        final ExecutorService e = new CustomExecutor(2);
1160 >        try (PoolCleaner cleaner = cleaner(e)) {
1161              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1162              assertTrue(r.isEmpty());
1211        } finally {
1212            joinPool(e);
1163          }
1164      }
1165  
# Line 1217 | Line 1167 | public class ScheduledExecutorSubclassTe
1167       * timed invokeAll(c) throws NPE if c has null elements
1168       */
1169      public void testTimedInvokeAll3() throws Exception {
1170 <        ExecutorService e = new CustomExecutor(2);
1171 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1172 <        l.add(new StringTask());
1173 <        l.add(null);
1174 <        try {
1175 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1176 <            shouldThrow();
1177 <        } catch (NullPointerException success) {
1178 <        } finally {
1229 <            joinPool(e);
1170 >        final ExecutorService e = new CustomExecutor(2);
1171 >        try (PoolCleaner cleaner = cleaner(e)) {
1172 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1173 >            l.add(new StringTask());
1174 >            l.add(null);
1175 >            try {
1176 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1177 >                shouldThrow();
1178 >            } catch (NullPointerException success) {}
1179          }
1180      }
1181  
# Line 1234 | Line 1183 | public class ScheduledExecutorSubclassTe
1183       * get of element of invokeAll(c) throws exception on failed task
1184       */
1185      public void testTimedInvokeAll4() throws Exception {
1186 <        ExecutorService e = new CustomExecutor(2);
1187 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1188 <        l.add(new NPETask());
1189 <        List<Future<String>> futures =
1190 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1191 <        assertEquals(1, futures.size());
1192 <        try {
1193 <            futures.get(0).get();
1194 <            shouldThrow();
1195 <        } catch (ExecutionException success) {
1196 <            assertTrue(success.getCause() instanceof NullPointerException);
1197 <        } finally {
1198 <            joinPool(e);
1186 >        final ExecutorService e = new CustomExecutor(2);
1187 >        try (PoolCleaner cleaner = cleaner(e)) {
1188 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1189 >            l.add(new NPETask());
1190 >            List<Future<String>> futures =
1191 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1192 >            assertEquals(1, futures.size());
1193 >            try {
1194 >                futures.get(0).get();
1195 >                shouldThrow();
1196 >            } catch (ExecutionException success) {
1197 >                assertTrue(success.getCause() instanceof NullPointerException);
1198 >            }
1199          }
1200      }
1201  
# Line 1254 | Line 1203 | public class ScheduledExecutorSubclassTe
1203       * timed invokeAll(c) returns results of all completed tasks
1204       */
1205      public void testTimedInvokeAll5() throws Exception {
1206 <        ExecutorService e = new CustomExecutor(2);
1207 <        try {
1206 >        final ExecutorService e = new CustomExecutor(2);
1207 >        try (PoolCleaner cleaner = cleaner(e)) {
1208              List<Callable<String>> l = new ArrayList<Callable<String>>();
1209              l.add(new StringTask());
1210              l.add(new StringTask());
# Line 1264 | Line 1213 | public class ScheduledExecutorSubclassTe
1213              assertEquals(2, futures.size());
1214              for (Future<String> future : futures)
1215                  assertSame(TEST_STRING, future.get());
1267        } finally {
1268            joinPool(e);
1216          }
1217      }
1218  
# Line 1273 | Line 1220 | public class ScheduledExecutorSubclassTe
1220       * timed invokeAll(c) cancels tasks not completed by timeout
1221       */
1222      public void testTimedInvokeAll6() throws Exception {
1223 <        ExecutorService e = new CustomExecutor(2);
1224 <        try {
1223 >        final ExecutorService e = new CustomExecutor(2);
1224 >        try (PoolCleaner cleaner = cleaner(e)) {
1225              for (long timeout = timeoutMillis();;) {
1226                  List<Callable<String>> tasks = new ArrayList<>();
1227                  tasks.add(new StringTask("0"));
# Line 1298 | Line 1245 | public class ScheduledExecutorSubclassTe
1245                          fail("expected exactly one task to be cancelled");
1246                  }
1247              }
1301        } finally {
1302            joinPool(e);
1248          }
1249      }
1250  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines