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.45 by jsr166, Sun Oct 4 02:15:08 2015 UTC vs.
Revision 1.46 by jsr166, Sun Oct 4 16:03:12 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 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
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 {
116 <        CustomExecutor p = new CustomExecutor(1);
117 <        final long startTime = System.nanoTime();
118 <        final CountDownLatch done = new CountDownLatch(1);
119 <        try {
116 >        final CustomExecutor p = new CustomExecutor(1);
117 >        try (PoolCleaner cleaner = cleaner(p)) {
118 >            final long startTime = System.nanoTime();
119 >            final CountDownLatch done = new CountDownLatch(1);
120              Callable task = new CheckedCallable<Boolean>() {
121                  public Boolean realCall() {
122                      done.countDown();
# Line 131 | Line 127 | public class ScheduledExecutorSubclassTe
127              assertSame(Boolean.TRUE, f.get());
128              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
129              assertTrue(done.await(0L, MILLISECONDS));
134        } finally {
135            joinPool(p);
130          }
131      }
132  
# Line 140 | Line 134 | public class ScheduledExecutorSubclassTe
134       * delayed schedule of runnable successfully executes after delay
135       */
136      public void testSchedule3() throws Exception {
137 <        CustomExecutor p = new CustomExecutor(1);
138 <        final long startTime = System.nanoTime();
139 <        final CountDownLatch done = new CountDownLatch(1);
140 <        try {
137 >        final CustomExecutor p = new CustomExecutor(1);
138 >        try (PoolCleaner cleaner = cleaner(p)) {
139 >            final long startTime = System.nanoTime();
140 >            final CountDownLatch done = new CountDownLatch(1);
141              Runnable task = new CheckedRunnable() {
142                  public void realRun() {
143                      done.countDown();
# Line 153 | Line 147 | public class ScheduledExecutorSubclassTe
147              await(done);
148              assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
149              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
156        } finally {
157            joinPool(p);
150          }
151      }
152  
# Line 162 | Line 154 | public class ScheduledExecutorSubclassTe
154       * scheduleAtFixedRate executes runnable after given initial delay
155       */
156      public void testSchedule4() throws InterruptedException {
157 <        CustomExecutor p = new CustomExecutor(1);
158 <        final long startTime = System.nanoTime();
159 <        final CountDownLatch done = new CountDownLatch(1);
160 <        try {
157 >        final CustomExecutor p = new CustomExecutor(1);
158 >        try (PoolCleaner cleaner = cleaner(p)) {
159 >            final long startTime = System.nanoTime();
160 >            final CountDownLatch done = new CountDownLatch(1);
161              Runnable task = new CheckedRunnable() {
162                  public void realRun() {
163                      done.countDown();
# Line 177 | Line 169 | public class ScheduledExecutorSubclassTe
169              await(done);
170              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
171              f.cancel(true);
180        } finally {
181            joinPool(p);
172          }
173      }
174  
# Line 186 | Line 176 | public class ScheduledExecutorSubclassTe
176       * scheduleWithFixedDelay executes runnable after given initial delay
177       */
178      public void testSchedule5() throws InterruptedException {
179 <        CustomExecutor p = new CustomExecutor(1);
180 <        final long startTime = System.nanoTime();
181 <        final CountDownLatch done = new CountDownLatch(1);
182 <        try {
179 >        final CustomExecutor p = new CustomExecutor(1);
180 >        try (PoolCleaner cleaner = cleaner(p)) {
181 >            final long startTime = System.nanoTime();
182 >            final CountDownLatch done = new CountDownLatch(1);
183              Runnable task = new CheckedRunnable() {
184                  public void realRun() {
185                      done.countDown();
# Line 201 | Line 191 | public class ScheduledExecutorSubclassTe
191              await(done);
192              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
193              f.cancel(true);
204        } finally {
205            joinPool(p);
194          }
195      }
196  
# Line 215 | Line 203 | public class ScheduledExecutorSubclassTe
203       * scheduleAtFixedRate executes series of tasks at given rate
204       */
205      public void testFixedRateSequence() throws InterruptedException {
206 <        CustomExecutor p = new CustomExecutor(1);
207 <        try {
206 >        final CustomExecutor p = new CustomExecutor(1);
207 >        try (PoolCleaner cleaner = cleaner(p)) {
208              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
209                  long startTime = System.nanoTime();
210                  int cycles = 10;
# Line 234 | Line 222 | public class ScheduledExecutorSubclassTe
222                      return;
223              }
224              throw new AssertionError("unexpected execution rate");
237        } finally {
238            joinPool(p);
225          }
226      }
227  
# Line 243 | Line 229 | public class ScheduledExecutorSubclassTe
229       * scheduleWithFixedDelay executes series of tasks with given period
230       */
231      public void testFixedDelaySequence() throws InterruptedException {
232 <        CustomExecutor p = new CustomExecutor(1);
233 <        try {
232 >        final CustomExecutor p = new CustomExecutor(1);
233 >        try (PoolCleaner cleaner = cleaner(p)) {
234              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
235                  long startTime = System.nanoTime();
236                  int cycles = 10;
# Line 262 | Line 248 | public class ScheduledExecutorSubclassTe
248                      return;
249              }
250              throw new AssertionError("unexpected execution rate");
265        } finally {
266            joinPool(p);
251          }
252      }
253  
# Line 271 | Line 255 | public class ScheduledExecutorSubclassTe
255       * execute(null) throws NPE
256       */
257      public void testExecuteNull() throws InterruptedException {
258 <        CustomExecutor se = new CustomExecutor(1);
259 <        try {
260 <            se.execute(null);
261 <            shouldThrow();
262 <        } catch (NullPointerException success) {}
263 <        joinPool(se);
258 >        final CustomExecutor p = new CustomExecutor(1);
259 >        try (PoolCleaner cleaner = cleaner(p)) {
260 >            try {
261 >                p.execute(null);
262 >                shouldThrow();
263 >            } catch (NullPointerException success) {}
264 >        }
265      }
266  
267      /**
268       * schedule(null) throws NPE
269       */
270      public void testScheduleNull() throws InterruptedException {
271 <        CustomExecutor se = new CustomExecutor(1);
272 <        try {
273 <            TrackedCallable callable = null;
274 <            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
275 <            shouldThrow();
276 <        } catch (NullPointerException success) {}
277 <        joinPool(se);
271 >        final CustomExecutor p = new CustomExecutor(1);
272 >        try (PoolCleaner cleaner = cleaner(p)) {
273 >            try {
274 >                TrackedCallable callable = null;
275 >                Future f = p.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
276 >                shouldThrow();
277 >            } catch (NullPointerException success) {}
278 >        }
279      }
280  
281      /**
282       * execute throws RejectedExecutionException if shutdown
283       */
284      public void testSchedule1_RejectedExecutionException() {
285 <        CustomExecutor se = new CustomExecutor(1);
286 <        try {
287 <            se.shutdown();
288 <            se.schedule(new NoOpRunnable(),
289 <                        MEDIUM_DELAY_MS, MILLISECONDS);
290 <            shouldThrow();
291 <        } catch (RejectedExecutionException success) {
292 <        } catch (SecurityException ok) {
285 >        final CustomExecutor p = new CustomExecutor(1);
286 >        try (PoolCleaner cleaner = cleaner(p)) {
287 >            try {
288 >                p.shutdown();
289 >                p.schedule(new NoOpRunnable(),
290 >                           MEDIUM_DELAY_MS, MILLISECONDS);
291 >                shouldThrow();
292 >            } catch (RejectedExecutionException success) {
293 >            } catch (SecurityException ok) {}
294          }
308
309        joinPool(se);
295      }
296  
297      /**
298       * schedule throws RejectedExecutionException if shutdown
299       */
300      public void testSchedule2_RejectedExecutionException() {
301 <        CustomExecutor se = new CustomExecutor(1);
302 <        try {
303 <            se.shutdown();
304 <            se.schedule(new NoOpCallable(),
305 <                        MEDIUM_DELAY_MS, MILLISECONDS);
306 <            shouldThrow();
307 <        } catch (RejectedExecutionException success) {
308 <        } catch (SecurityException ok) {
301 >        final CustomExecutor p = new CustomExecutor(1);
302 >        try (PoolCleaner cleaner = cleaner(p)) {
303 >            try {
304 >                p.shutdown();
305 >                p.schedule(new NoOpCallable(),
306 >                           MEDIUM_DELAY_MS, MILLISECONDS);
307 >                shouldThrow();
308 >            } catch (RejectedExecutionException success) {
309 >            } catch (SecurityException ok) {}
310          }
325        joinPool(se);
311      }
312  
313      /**
314       * schedule callable throws RejectedExecutionException if shutdown
315       */
316      public void testSchedule3_RejectedExecutionException() {
317 <        CustomExecutor se = new CustomExecutor(1);
318 <        try {
319 <            se.shutdown();
320 <            se.schedule(new NoOpCallable(),
321 <                        MEDIUM_DELAY_MS, MILLISECONDS);
322 <            shouldThrow();
323 <        } catch (RejectedExecutionException success) {
324 <        } catch (SecurityException ok) {
317 >        final CustomExecutor p = new CustomExecutor(1);
318 >        try (PoolCleaner cleaner = cleaner(p)) {
319 >            try {
320 >                p.shutdown();
321 >                p.schedule(new NoOpCallable(),
322 >                           MEDIUM_DELAY_MS, MILLISECONDS);
323 >                shouldThrow();
324 >            } catch (RejectedExecutionException success) {
325 >            } catch (SecurityException ok) {}
326          }
341        joinPool(se);
327      }
328  
329      /**
330       * scheduleAtFixedRate throws RejectedExecutionException if shutdown
331       */
332      public void testScheduleAtFixedRate1_RejectedExecutionException() {
333 <        CustomExecutor se = new CustomExecutor(1);
334 <        try {
335 <            se.shutdown();
336 <            se.scheduleAtFixedRate(new NoOpRunnable(),
337 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
338 <            shouldThrow();
339 <        } catch (RejectedExecutionException success) {
340 <        } catch (SecurityException ok) {
333 >        final CustomExecutor p = new CustomExecutor(1);
334 >        try (PoolCleaner cleaner = cleaner(p)) {
335 >            try {
336 >                p.shutdown();
337 >                p.scheduleAtFixedRate(new NoOpRunnable(),
338 >                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
339 >                shouldThrow();
340 >            } catch (RejectedExecutionException success) {
341 >            } catch (SecurityException ok) {}
342          }
357        joinPool(se);
343      }
344  
345      /**
346       * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
347       */
348      public void testScheduleWithFixedDelay1_RejectedExecutionException() {
349 <        CustomExecutor se = new CustomExecutor(1);
350 <        try {
351 <            se.shutdown();
352 <            se.scheduleWithFixedDelay(new NoOpRunnable(),
353 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
354 <            shouldThrow();
355 <        } catch (RejectedExecutionException success) {
356 <        } catch (SecurityException ok) {
349 >        final CustomExecutor p = new CustomExecutor(1);
350 >        try (PoolCleaner cleaner = cleaner(p)) {
351 >            try {
352 >                p.shutdown();
353 >                p.scheduleWithFixedDelay(new NoOpRunnable(),
354 >                                         MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
355 >                shouldThrow();
356 >            } catch (RejectedExecutionException success) {
357 >            } catch (SecurityException ok) {}
358          }
373        joinPool(se);
359      }
360  
361      /**
# Line 379 | Line 364 | public class ScheduledExecutorSubclassTe
364       */
365      public void testGetActiveCount() throws InterruptedException {
366          final ThreadPoolExecutor p = new CustomExecutor(2);
367 <        final CountDownLatch threadStarted = new CountDownLatch(1);
368 <        final CountDownLatch done = new CountDownLatch(1);
369 <        try {
367 >        try (PoolCleaner cleaner = cleaner(p)) {
368 >            final CountDownLatch threadStarted = new CountDownLatch(1);
369 >            final CountDownLatch done = new CountDownLatch(1);
370              assertEquals(0, p.getActiveCount());
371              p.execute(new CheckedRunnable() {
372                  public void realRun() throws InterruptedException {
# Line 391 | Line 376 | public class ScheduledExecutorSubclassTe
376                  }});
377              assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
378              assertEquals(1, p.getActiveCount());
394        } finally {
379              done.countDown();
396            joinPool(p);
380          }
381      }
382  
# Line 403 | Line 386 | public class ScheduledExecutorSubclassTe
386       */
387      public void testGetCompletedTaskCount() throws InterruptedException {
388          final ThreadPoolExecutor p = new CustomExecutor(2);
389 <        final CountDownLatch threadStarted = new CountDownLatch(1);
390 <        final CountDownLatch threadProceed = new CountDownLatch(1);
391 <        final CountDownLatch threadDone = new CountDownLatch(1);
392 <        try {
389 >        try (PoolCleaner cleaner = cleaner(p)) {
390 >            final CountDownLatch threadStarted = new CountDownLatch(1);
391 >            final CountDownLatch threadProceed = new CountDownLatch(1);
392 >            final CountDownLatch threadDone = new CountDownLatch(1);
393              assertEquals(0, p.getCompletedTaskCount());
394              p.execute(new CheckedRunnable() {
395                  public void realRun() throws InterruptedException {
# Line 425 | Line 408 | public class ScheduledExecutorSubclassTe
408                      fail("timed out");
409                  Thread.yield();
410              }
428        } finally {
429            joinPool(p);
411          }
412      }
413  
# Line 434 | Line 415 | public class ScheduledExecutorSubclassTe
415       * getCorePoolSize returns size given in constructor if not otherwise set
416       */
417      public void testGetCorePoolSize() {
418 <        CustomExecutor p = new CustomExecutor(1);
419 <        assertEquals(1, p.getCorePoolSize());
420 <        joinPool(p);
418 >        final CustomExecutor p = new CustomExecutor(1);
419 >        try (PoolCleaner cleaner = cleaner(p)) {
420 >            assertEquals(1, p.getCorePoolSize());
421 >        }
422      }
423  
424      /**
# Line 446 | Line 428 | public class ScheduledExecutorSubclassTe
428      public void testGetLargestPoolSize() throws InterruptedException {
429          final int THREADS = 3;
430          final ThreadPoolExecutor p = new CustomExecutor(THREADS);
431 <        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
432 <        final CountDownLatch done = new CountDownLatch(1);
433 <        try {
431 >        try (PoolCleaner cleaner = cleaner(p)) {
432 >            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
433 >            final CountDownLatch done = new CountDownLatch(1);
434              assertEquals(0, p.getLargestPoolSize());
435              for (int i = 0; i < THREADS; i++)
436                  p.execute(new CheckedRunnable() {
# Line 459 | Line 441 | public class ScheduledExecutorSubclassTe
441                      }});
442              assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
443              assertEquals(THREADS, p.getLargestPoolSize());
462        } finally {
444              done.countDown();
464            joinPool(p);
465            assertEquals(THREADS, p.getLargestPoolSize());
445          }
446 +        assertEquals(THREADS, p.getLargestPoolSize());
447      }
448  
449      /**
# Line 472 | Line 452 | public class ScheduledExecutorSubclassTe
452       */
453      public void testGetPoolSize() throws InterruptedException {
454          final ThreadPoolExecutor p = new CustomExecutor(1);
455 <        final CountDownLatch threadStarted = new CountDownLatch(1);
456 <        final CountDownLatch done = new CountDownLatch(1);
457 <        try {
455 >        try (PoolCleaner cleaner = cleaner(p)) {
456 >            final CountDownLatch threadStarted = new CountDownLatch(1);
457 >            final CountDownLatch done = new CountDownLatch(1);
458              assertEquals(0, p.getPoolSize());
459              p.execute(new CheckedRunnable() {
460                  public void realRun() throws InterruptedException {
# Line 484 | Line 464 | public class ScheduledExecutorSubclassTe
464                  }});
465              assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
466              assertEquals(1, p.getPoolSize());
487        } finally {
467              done.countDown();
489            joinPool(p);
468          }
469      }
470  
# Line 496 | Line 474 | public class ScheduledExecutorSubclassTe
474       */
475      public void testGetTaskCount() throws InterruptedException {
476          final ThreadPoolExecutor p = new CustomExecutor(1);
477 <        final CountDownLatch threadStarted = new CountDownLatch(1);
478 <        final CountDownLatch done = new CountDownLatch(1);
479 <        final int TASKS = 5;
480 <        try {
477 >        try (PoolCleaner cleaner = cleaner(p)) {
478 >            final CountDownLatch threadStarted = new CountDownLatch(1);
479 >            final CountDownLatch done = new CountDownLatch(1);
480 >            final int TASKS = 5;
481              assertEquals(0, p.getTaskCount());
482              for (int i = 0; i < TASKS; i++)
483                  p.execute(new CheckedRunnable() {
# Line 509 | Line 487 | public class ScheduledExecutorSubclassTe
487                      }});
488              assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
489              assertEquals(TASKS, p.getTaskCount());
512        } finally {
490              done.countDown();
514            joinPool(p);
491          }
492      }
493  
# Line 519 | Line 495 | public class ScheduledExecutorSubclassTe
495       * getThreadFactory returns factory in constructor if not set
496       */
497      public void testGetThreadFactory() {
498 <        ThreadFactory tf = new SimpleThreadFactory();
499 <        CustomExecutor p = new CustomExecutor(1, tf);
500 <        assertSame(tf, p.getThreadFactory());
501 <        joinPool(p);
498 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
499 >        final CustomExecutor p = new CustomExecutor(1, threadFactory);
500 >        try (PoolCleaner cleaner = cleaner(p)) {
501 >            assertSame(threadFactory, p.getThreadFactory());
502 >        }
503      }
504  
505      /**
506       * setThreadFactory sets the thread factory returned by getThreadFactory
507       */
508      public void testSetThreadFactory() {
509 <        ThreadFactory tf = new SimpleThreadFactory();
510 <        CustomExecutor p = new CustomExecutor(1);
511 <        p.setThreadFactory(tf);
512 <        assertSame(tf, p.getThreadFactory());
513 <        joinPool(p);
509 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
510 >        final CustomExecutor p = new CustomExecutor(1);
511 >        try (PoolCleaner cleaner = cleaner(p)) {
512 >            p.setThreadFactory(threadFactory);
513 >            assertSame(threadFactory, p.getThreadFactory());
514 >        }
515      }
516  
517      /**
518       * setThreadFactory(null) throws NPE
519       */
520      public void testSetThreadFactoryNull() {
521 <        CustomExecutor p = new CustomExecutor(1);
522 <        try {
523 <            p.setThreadFactory(null);
524 <            shouldThrow();
525 <        } catch (NullPointerException success) {
526 <        } finally {
549 <            joinPool(p);
521 >        final CustomExecutor p = new CustomExecutor(1);
522 >        try (PoolCleaner cleaner = cleaner(p)) {
523 >            try {
524 >                p.setThreadFactory(null);
525 >                shouldThrow();
526 >            } catch (NullPointerException success) {}
527          }
528      }
529  
# Line 554 | Line 531 | public class ScheduledExecutorSubclassTe
531       * isShutdown is false before shutdown, true after
532       */
533      public void testIsShutdown() {
534 <        CustomExecutor p = new CustomExecutor(1);
535 <        try {
534 >        final CustomExecutor p = new CustomExecutor(1);
535 >        try (PoolCleaner cleaner = cleaner(p)) {
536              assertFalse(p.isShutdown());
560        }
561        finally {
537              try { p.shutdown(); } catch (SecurityException ok) { return; }
538 +            assertTrue(p.isShutdown());
539          }
564        assertTrue(p.isShutdown());
540      }
541  
542      /**
# Line 569 | Line 544 | public class ScheduledExecutorSubclassTe
544       */
545      public void testIsTerminated() throws InterruptedException {
546          final ThreadPoolExecutor p = new CustomExecutor(1);
547 <        final CountDownLatch threadStarted = new CountDownLatch(1);
548 <        final CountDownLatch done = new CountDownLatch(1);
549 <        assertFalse(p.isTerminated());
550 <        try {
547 >        try (PoolCleaner cleaner = cleaner(p)) {
548 >            final CountDownLatch threadStarted = new CountDownLatch(1);
549 >            final CountDownLatch done = new CountDownLatch(1);
550 >            assertFalse(p.isTerminated());
551              p.execute(new CheckedRunnable() {
552                  public void realRun() throws InterruptedException {
553                      assertFalse(p.isTerminated());
# Line 582 | Line 557 | public class ScheduledExecutorSubclassTe
557              assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
558              assertFalse(p.isTerminating());
559              done.countDown();
585        } finally {
560              try { p.shutdown(); } catch (SecurityException ok) { return; }
561 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
562 +            assertTrue(p.isTerminated());
563          }
588        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
589        assertTrue(p.isTerminated());
564      }
565  
566      /**
# Line 594 | Line 568 | public class ScheduledExecutorSubclassTe
568       */
569      public void testIsTerminating() throws InterruptedException {
570          final ThreadPoolExecutor p = new CustomExecutor(1);
571 <        final CountDownLatch threadStarted = new CountDownLatch(1);
572 <        final CountDownLatch done = new CountDownLatch(1);
573 <        try {
571 >        try (PoolCleaner cleaner = cleaner(p)) {
572 >            final CountDownLatch threadStarted = new CountDownLatch(1);
573 >            final CountDownLatch done = new CountDownLatch(1);
574              assertFalse(p.isTerminating());
575              p.execute(new CheckedRunnable() {
576                  public void realRun() throws InterruptedException {
# Line 607 | Line 581 | public class ScheduledExecutorSubclassTe
581              assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
582              assertFalse(p.isTerminating());
583              done.countDown();
610        } finally {
584              try { p.shutdown(); } catch (SecurityException ok) { return; }
585 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
586 +            assertTrue(p.isTerminated());
587 +            assertFalse(p.isTerminating());
588          }
613        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
614        assertTrue(p.isTerminated());
615        assertFalse(p.isTerminating());
589      }
590  
591      /**
592       * getQueue returns the work queue, which contains queued tasks
593       */
594      public void testGetQueue() throws InterruptedException {
595 <        ScheduledThreadPoolExecutor p = new CustomExecutor(1);
596 <        final CountDownLatch threadStarted = new CountDownLatch(1);
597 <        final CountDownLatch done = new CountDownLatch(1);
598 <        try {
595 >        final ScheduledThreadPoolExecutor p = new CustomExecutor(1);
596 >        try (PoolCleaner cleaner = cleaner(p)) {
597 >            final CountDownLatch threadStarted = new CountDownLatch(1);
598 >            final CountDownLatch done = new CountDownLatch(1);
599              ScheduledFuture[] tasks = new ScheduledFuture[5];
600              for (int i = 0; i < tasks.length; i++) {
601                  Runnable r = new CheckedRunnable() {
# Line 636 | Line 609 | public class ScheduledExecutorSubclassTe
609              BlockingQueue<Runnable> q = p.getQueue();
610              assertTrue(q.contains(tasks[tasks.length - 1]));
611              assertFalse(q.contains(tasks[0]));
639        } finally {
612              done.countDown();
641            joinPool(p);
613          }
614      }
615  
# Line 647 | Line 618 | public class ScheduledExecutorSubclassTe
618       */
619      public void testRemove() throws InterruptedException {
620          final ScheduledThreadPoolExecutor p = new CustomExecutor(1);
621 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
622 <        final CountDownLatch threadStarted = new CountDownLatch(1);
623 <        final CountDownLatch done = new CountDownLatch(1);
624 <        try {
621 >        try (PoolCleaner cleaner = cleaner(p)) {
622 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
623 >            final CountDownLatch threadStarted = new CountDownLatch(1);
624 >            final CountDownLatch done = new CountDownLatch(1);
625              for (int i = 0; i < tasks.length; i++) {
626                  Runnable r = new CheckedRunnable() {
627                      public void realRun() throws InterruptedException {
# Line 670 | Line 641 | public class ScheduledExecutorSubclassTe
641              assertTrue(q.contains((Runnable)tasks[3]));
642              assertTrue(p.remove((Runnable)tasks[3]));
643              assertFalse(q.contains((Runnable)tasks[3]));
673        } finally {
644              done.countDown();
675            joinPool(p);
645          }
646      }
647  
# Line 680 | Line 649 | public class ScheduledExecutorSubclassTe
649       * purge removes cancelled tasks from the queue
650       */
651      public void testPurge() throws InterruptedException {
652 <        CustomExecutor p = new CustomExecutor(1);
652 >        final CustomExecutor p = new CustomExecutor(1);
653          ScheduledFuture[] tasks = new ScheduledFuture[5];
654          for (int i = 0; i < tasks.length; i++)
655              tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
# Line 748 | Line 717 | public class ScheduledExecutorSubclassTe
717       * and those tasks are drained from the queue
718       */
719      public void testShutdownNow_delayedTasks() throws InterruptedException {
720 <        CustomExecutor p = new CustomExecutor(1);
720 >        final CustomExecutor p = new CustomExecutor(1);
721          List<ScheduledFuture> tasks = new ArrayList<>();
722          for (int i = 0; i < 3; i++) {
723              Runnable r = new NoOpRunnable();
# Line 875 | Line 844 | public class ScheduledExecutorSubclassTe
844       * completed submit of callable returns result
845       */
846      public void testSubmitCallable() throws Exception {
847 <        ExecutorService e = new CustomExecutor(2);
848 <        try {
847 >        final ExecutorService e = new CustomExecutor(2);
848 >        try (PoolCleaner cleaner = cleaner(e)) {
849              Future<String> future = e.submit(new StringTask());
850              String result = future.get();
851              assertSame(TEST_STRING, result);
883        } finally {
884            joinPool(e);
852          }
853      }
854  
# Line 889 | Line 856 | public class ScheduledExecutorSubclassTe
856       * completed submit of runnable returns successfully
857       */
858      public void testSubmitRunnable() throws Exception {
859 <        ExecutorService e = new CustomExecutor(2);
860 <        try {
859 >        final ExecutorService e = new CustomExecutor(2);
860 >        try (PoolCleaner cleaner = cleaner(e)) {
861              Future<?> future = e.submit(new NoOpRunnable());
862              future.get();
863              assertTrue(future.isDone());
897        } finally {
898            joinPool(e);
864          }
865      }
866  
# Line 903 | Line 868 | public class ScheduledExecutorSubclassTe
868       * completed submit of (runnable, result) returns result
869       */
870      public void testSubmitRunnable2() throws Exception {
871 <        ExecutorService e = new CustomExecutor(2);
872 <        try {
871 >        final ExecutorService e = new CustomExecutor(2);
872 >        try (PoolCleaner cleaner = cleaner(e)) {
873              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
874              String result = future.get();
875              assertSame(TEST_STRING, result);
911        } finally {
912            joinPool(e);
876          }
877      }
878  
# Line 917 | Line 880 | public class ScheduledExecutorSubclassTe
880       * invokeAny(null) throws NPE
881       */
882      public void testInvokeAny1() throws Exception {
883 <        ExecutorService e = new CustomExecutor(2);
884 <        try {
885 <            e.invokeAny(null);
886 <            shouldThrow();
887 <        } catch (NullPointerException success) {
888 <        } finally {
926 <            joinPool(e);
883 >        final ExecutorService e = new CustomExecutor(2);
884 >        try (PoolCleaner cleaner = cleaner(e)) {
885 >            try {
886 >                e.invokeAny(null);
887 >                shouldThrow();
888 >            } catch (NullPointerException success) {}
889          }
890      }
891  
# Line 931 | Line 893 | public class ScheduledExecutorSubclassTe
893       * invokeAny(empty collection) throws IAE
894       */
895      public void testInvokeAny2() throws Exception {
896 <        ExecutorService e = new CustomExecutor(2);
897 <        try {
898 <            e.invokeAny(new ArrayList<Callable<String>>());
899 <            shouldThrow();
900 <        } catch (IllegalArgumentException success) {
901 <        } finally {
940 <            joinPool(e);
896 >        final ExecutorService e = new CustomExecutor(2);
897 >        try (PoolCleaner cleaner = cleaner(e)) {
898 >            try {
899 >                e.invokeAny(new ArrayList<Callable<String>>());
900 >                shouldThrow();
901 >            } catch (IllegalArgumentException success) {}
902          }
903      }
904  
# Line 945 | Line 906 | public class ScheduledExecutorSubclassTe
906       * invokeAny(c) throws NPE if c has null elements
907       */
908      public void testInvokeAny3() throws Exception {
909 <        CountDownLatch latch = new CountDownLatch(1);
910 <        ExecutorService e = new CustomExecutor(2);
911 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
912 <        l.add(latchAwaitingStringTask(latch));
913 <        l.add(null);
914 <        try {
915 <            e.invokeAny(l);
916 <            shouldThrow();
917 <        } catch (NullPointerException success) {
918 <        } finally {
909 >        final CountDownLatch latch = new CountDownLatch(1);
910 >        final ExecutorService e = new CustomExecutor(2);
911 >        try (PoolCleaner cleaner = cleaner(e)) {
912 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
913 >            l.add(latchAwaitingStringTask(latch));
914 >            l.add(null);
915 >            try {
916 >                e.invokeAny(l);
917 >                shouldThrow();
918 >            } catch (NullPointerException success) {}
919              latch.countDown();
959            joinPool(e);
920          }
921      }
922  
# Line 964 | Line 924 | public class ScheduledExecutorSubclassTe
924       * invokeAny(c) throws ExecutionException if no task completes
925       */
926      public void testInvokeAny4() throws Exception {
927 <        ExecutorService e = new CustomExecutor(2);
928 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
929 <        l.add(new NPETask());
930 <        try {
931 <            e.invokeAny(l);
932 <            shouldThrow();
933 <        } catch (ExecutionException success) {
934 <            assertTrue(success.getCause() instanceof NullPointerException);
935 <        } finally {
936 <            joinPool(e);
927 >        final ExecutorService e = new CustomExecutor(2);
928 >        try (PoolCleaner cleaner = cleaner(e)) {
929 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
930 >            l.add(new NPETask());
931 >            try {
932 >                e.invokeAny(l);
933 >                shouldThrow();
934 >            } catch (ExecutionException success) {
935 >                assertTrue(success.getCause() instanceof NullPointerException);
936 >            }
937          }
938      }
939  
# Line 981 | Line 941 | public class ScheduledExecutorSubclassTe
941       * invokeAny(c) returns result of some task
942       */
943      public void testInvokeAny5() throws Exception {
944 <        ExecutorService e = new CustomExecutor(2);
945 <        try {
944 >        final ExecutorService e = new CustomExecutor(2);
945 >        try (PoolCleaner cleaner = cleaner(e)) {
946              List<Callable<String>> l = new ArrayList<Callable<String>>();
947              l.add(new StringTask());
948              l.add(new StringTask());
949              String result = e.invokeAny(l);
950              assertSame(TEST_STRING, result);
991        } finally {
992            joinPool(e);
951          }
952      }
953  
# Line 997 | Line 955 | public class ScheduledExecutorSubclassTe
955       * invokeAll(null) throws NPE
956       */
957      public void testInvokeAll1() throws Exception {
958 <        ExecutorService e = new CustomExecutor(2);
959 <        try {
960 <            e.invokeAll(null);
961 <            shouldThrow();
962 <        } catch (NullPointerException success) {
963 <        } finally {
1006 <            joinPool(e);
958 >        final ExecutorService e = new CustomExecutor(2);
959 >        try (PoolCleaner cleaner = cleaner(e)) {
960 >            try {
961 >                e.invokeAll(null);
962 >                shouldThrow();
963 >            } catch (NullPointerException success) {}
964          }
965      }
966  
# Line 1011 | Line 968 | public class ScheduledExecutorSubclassTe
968       * invokeAll(empty collection) returns empty collection
969       */
970      public void testInvokeAll2() throws Exception {
971 <        ExecutorService e = new CustomExecutor(2);
972 <        try {
971 >        final ExecutorService e = new CustomExecutor(2);
972 >        try (PoolCleaner cleaner = cleaner(e)) {
973              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
974              assertTrue(r.isEmpty());
1018        } finally {
1019            joinPool(e);
975          }
976      }
977  
# Line 1024 | Line 979 | public class ScheduledExecutorSubclassTe
979       * invokeAll(c) throws NPE if c has null elements
980       */
981      public void testInvokeAll3() throws Exception {
982 <        ExecutorService e = new CustomExecutor(2);
983 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
984 <        l.add(new StringTask());
985 <        l.add(null);
986 <        try {
987 <            e.invokeAll(l);
988 <            shouldThrow();
989 <        } catch (NullPointerException success) {
990 <        } finally {
1036 <            joinPool(e);
982 >        final ExecutorService e = new CustomExecutor(2);
983 >        try (PoolCleaner cleaner = cleaner(e)) {
984 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
985 >            l.add(new StringTask());
986 >            l.add(null);
987 >            try {
988 >                e.invokeAll(l);
989 >                shouldThrow();
990 >            } catch (NullPointerException success) {}
991          }
992      }
993  
# Line 1041 | Line 995 | public class ScheduledExecutorSubclassTe
995       * get of invokeAll(c) throws exception on failed task
996       */
997      public void testInvokeAll4() throws Exception {
998 <        ExecutorService e = new CustomExecutor(2);
999 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1000 <        l.add(new NPETask());
1001 <        List<Future<String>> futures = e.invokeAll(l);
1002 <        assertEquals(1, futures.size());
1003 <        try {
1004 <            futures.get(0).get();
1005 <            shouldThrow();
1006 <        } catch (ExecutionException success) {
1007 <            assertTrue(success.getCause() instanceof NullPointerException);
1008 <        } finally {
1009 <            joinPool(e);
998 >        final ExecutorService e = new CustomExecutor(2);
999 >        try (PoolCleaner cleaner = cleaner(e)) {
1000 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1001 >            l.add(new NPETask());
1002 >            List<Future<String>> futures = e.invokeAll(l);
1003 >            assertEquals(1, futures.size());
1004 >            try {
1005 >                futures.get(0).get();
1006 >                shouldThrow();
1007 >            } catch (ExecutionException success) {
1008 >                assertTrue(success.getCause() instanceof NullPointerException);
1009 >            }
1010          }
1011      }
1012  
# Line 1060 | Line 1014 | public class ScheduledExecutorSubclassTe
1014       * invokeAll(c) returns results of all completed tasks
1015       */
1016      public void testInvokeAll5() throws Exception {
1017 <        ExecutorService e = new CustomExecutor(2);
1018 <        try {
1017 >        final ExecutorService e = new CustomExecutor(2);
1018 >        try (PoolCleaner cleaner = cleaner(e)) {
1019              List<Callable<String>> l = new ArrayList<Callable<String>>();
1020              l.add(new StringTask());
1021              l.add(new StringTask());
# Line 1069 | Line 1023 | public class ScheduledExecutorSubclassTe
1023              assertEquals(2, futures.size());
1024              for (Future<String> future : futures)
1025                  assertSame(TEST_STRING, future.get());
1072        } finally {
1073            joinPool(e);
1026          }
1027      }
1028  
# Line 1078 | Line 1030 | public class ScheduledExecutorSubclassTe
1030       * timed invokeAny(null) throws NPE
1031       */
1032      public void testTimedInvokeAny1() throws Exception {
1033 <        ExecutorService e = new CustomExecutor(2);
1034 <        try {
1035 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1036 <            shouldThrow();
1037 <        } catch (NullPointerException success) {
1038 <        } finally {
1087 <            joinPool(e);
1033 >        final ExecutorService e = new CustomExecutor(2);
1034 >        try (PoolCleaner cleaner = cleaner(e)) {
1035 >            try {
1036 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1037 >                shouldThrow();
1038 >            } catch (NullPointerException success) {}
1039          }
1040      }
1041  
# Line 1092 | Line 1043 | public class ScheduledExecutorSubclassTe
1043       * timed invokeAny(,,null) throws NPE
1044       */
1045      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1046 <        ExecutorService e = new CustomExecutor(2);
1047 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1048 <        l.add(new StringTask());
1049 <        try {
1050 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1051 <            shouldThrow();
1052 <        } catch (NullPointerException success) {
1053 <        } finally {
1103 <            joinPool(e);
1046 >        final ExecutorService e = new CustomExecutor(2);
1047 >        try (PoolCleaner cleaner = cleaner(e)) {
1048 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1049 >            l.add(new StringTask());
1050 >            try {
1051 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1052 >                shouldThrow();
1053 >            } catch (NullPointerException success) {}
1054          }
1055      }
1056  
# Line 1108 | Line 1058 | public class ScheduledExecutorSubclassTe
1058       * timed invokeAny(empty collection) throws IAE
1059       */
1060      public void testTimedInvokeAny2() throws Exception {
1061 <        ExecutorService e = new CustomExecutor(2);
1062 <        try {
1063 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1064 <            shouldThrow();
1065 <        } catch (IllegalArgumentException success) {
1066 <        } finally {
1117 <            joinPool(e);
1061 >        final ExecutorService e = new CustomExecutor(2);
1062 >        try (PoolCleaner cleaner = cleaner(e)) {
1063 >            try {
1064 >                e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1065 >                shouldThrow();
1066 >            } catch (IllegalArgumentException success) {}
1067          }
1068      }
1069  
# Line 1123 | Line 1072 | public class ScheduledExecutorSubclassTe
1072       */
1073      public void testTimedInvokeAny3() throws Exception {
1074          CountDownLatch latch = new CountDownLatch(1);
1075 <        ExecutorService e = new CustomExecutor(2);
1076 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1077 <        l.add(latchAwaitingStringTask(latch));
1078 <        l.add(null);
1079 <        try {
1080 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1081 <            shouldThrow();
1082 <        } catch (NullPointerException success) {
1083 <        } finally {
1075 >        final ExecutorService e = new CustomExecutor(2);
1076 >        try (PoolCleaner cleaner = cleaner(e)) {
1077 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1078 >            l.add(latchAwaitingStringTask(latch));
1079 >            l.add(null);
1080 >            try {
1081 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1082 >                shouldThrow();
1083 >            } catch (NullPointerException success) {}
1084              latch.countDown();
1136            joinPool(e);
1085          }
1086      }
1087  
# Line 1141 | Line 1089 | public class ScheduledExecutorSubclassTe
1089       * timed invokeAny(c) throws ExecutionException if no task completes
1090       */
1091      public void testTimedInvokeAny4() throws Exception {
1092 <        ExecutorService e = new CustomExecutor(2);
1093 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1094 <        l.add(new NPETask());
1095 <        try {
1096 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1097 <            shouldThrow();
1098 <        } catch (ExecutionException success) {
1099 <            assertTrue(success.getCause() instanceof NullPointerException);
1100 <        } finally {
1101 <            joinPool(e);
1092 >        final ExecutorService e = new CustomExecutor(2);
1093 >        try (PoolCleaner cleaner = cleaner(e)) {
1094 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1095 >            l.add(new NPETask());
1096 >            try {
1097 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1098 >                shouldThrow();
1099 >            } catch (ExecutionException success) {
1100 >                assertTrue(success.getCause() instanceof NullPointerException);
1101 >            }
1102          }
1103      }
1104  
# Line 1158 | Line 1106 | public class ScheduledExecutorSubclassTe
1106       * timed invokeAny(c) returns result of some task
1107       */
1108      public void testTimedInvokeAny5() throws Exception {
1109 <        ExecutorService e = new CustomExecutor(2);
1110 <        try {
1109 >        final ExecutorService e = new CustomExecutor(2);
1110 >        try (PoolCleaner cleaner = cleaner(e)) {
1111              List<Callable<String>> l = new ArrayList<Callable<String>>();
1112              l.add(new StringTask());
1113              l.add(new StringTask());
1114              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1115              assertSame(TEST_STRING, result);
1168        } finally {
1169            joinPool(e);
1116          }
1117      }
1118  
# Line 1174 | Line 1120 | public class ScheduledExecutorSubclassTe
1120       * timed invokeAll(null) throws NPE
1121       */
1122      public void testTimedInvokeAll1() throws Exception {
1123 <        ExecutorService e = new CustomExecutor(2);
1124 <        try {
1125 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1126 <            shouldThrow();
1127 <        } catch (NullPointerException success) {
1128 <        } finally {
1183 <            joinPool(e);
1123 >        final ExecutorService e = new CustomExecutor(2);
1124 >        try (PoolCleaner cleaner = cleaner(e)) {
1125 >            try {
1126 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1127 >                shouldThrow();
1128 >            } catch (NullPointerException success) {}
1129          }
1130      }
1131  
# Line 1188 | Line 1133 | public class ScheduledExecutorSubclassTe
1133       * timed invokeAll(,,null) throws NPE
1134       */
1135      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1136 <        ExecutorService e = new CustomExecutor(2);
1137 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1138 <        l.add(new StringTask());
1139 <        try {
1140 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1141 <            shouldThrow();
1142 <        } catch (NullPointerException success) {
1143 <        } finally {
1199 <            joinPool(e);
1136 >        final ExecutorService e = new CustomExecutor(2);
1137 >        try (PoolCleaner cleaner = cleaner(e)) {
1138 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1139 >            l.add(new StringTask());
1140 >            try {
1141 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1142 >                shouldThrow();
1143 >            } catch (NullPointerException success) {}
1144          }
1145      }
1146  
# Line 1204 | Line 1148 | public class ScheduledExecutorSubclassTe
1148       * timed invokeAll(empty collection) returns empty collection
1149       */
1150      public void testTimedInvokeAll2() throws Exception {
1151 <        ExecutorService e = new CustomExecutor(2);
1152 <        try {
1151 >        final ExecutorService e = new CustomExecutor(2);
1152 >        try (PoolCleaner cleaner = cleaner(e)) {
1153              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1154              assertTrue(r.isEmpty());
1211        } finally {
1212            joinPool(e);
1155          }
1156      }
1157  
# Line 1217 | Line 1159 | public class ScheduledExecutorSubclassTe
1159       * timed invokeAll(c) throws NPE if c has null elements
1160       */
1161      public void testTimedInvokeAll3() throws Exception {
1162 <        ExecutorService e = new CustomExecutor(2);
1163 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1164 <        l.add(new StringTask());
1165 <        l.add(null);
1166 <        try {
1167 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1168 <            shouldThrow();
1169 <        } catch (NullPointerException success) {
1170 <        } finally {
1229 <            joinPool(e);
1162 >        final ExecutorService e = new CustomExecutor(2);
1163 >        try (PoolCleaner cleaner = cleaner(e)) {
1164 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1165 >            l.add(new StringTask());
1166 >            l.add(null);
1167 >            try {
1168 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1169 >                shouldThrow();
1170 >            } catch (NullPointerException success) {}
1171          }
1172      }
1173  
# Line 1234 | Line 1175 | public class ScheduledExecutorSubclassTe
1175       * get of element of invokeAll(c) throws exception on failed task
1176       */
1177      public void testTimedInvokeAll4() throws Exception {
1178 <        ExecutorService e = new CustomExecutor(2);
1179 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1180 <        l.add(new NPETask());
1181 <        List<Future<String>> futures =
1182 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1183 <        assertEquals(1, futures.size());
1184 <        try {
1185 <            futures.get(0).get();
1186 <            shouldThrow();
1187 <        } catch (ExecutionException success) {
1188 <            assertTrue(success.getCause() instanceof NullPointerException);
1189 <        } finally {
1190 <            joinPool(e);
1178 >        final ExecutorService e = new CustomExecutor(2);
1179 >        try (PoolCleaner cleaner = cleaner(e)) {
1180 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1181 >            l.add(new NPETask());
1182 >            List<Future<String>> futures =
1183 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1184 >            assertEquals(1, futures.size());
1185 >            try {
1186 >                futures.get(0).get();
1187 >                shouldThrow();
1188 >            } catch (ExecutionException success) {
1189 >                assertTrue(success.getCause() instanceof NullPointerException);
1190 >            }
1191          }
1192      }
1193  
# Line 1254 | Line 1195 | public class ScheduledExecutorSubclassTe
1195       * timed invokeAll(c) returns results of all completed tasks
1196       */
1197      public void testTimedInvokeAll5() throws Exception {
1198 <        ExecutorService e = new CustomExecutor(2);
1199 <        try {
1198 >        final ExecutorService e = new CustomExecutor(2);
1199 >        try (PoolCleaner cleaner = cleaner(e)) {
1200              List<Callable<String>> l = new ArrayList<Callable<String>>();
1201              l.add(new StringTask());
1202              l.add(new StringTask());
# Line 1264 | Line 1205 | public class ScheduledExecutorSubclassTe
1205              assertEquals(2, futures.size());
1206              for (Future<String> future : futures)
1207                  assertSame(TEST_STRING, future.get());
1267        } finally {
1268            joinPool(e);
1208          }
1209      }
1210  
# Line 1273 | Line 1212 | public class ScheduledExecutorSubclassTe
1212       * timed invokeAll(c) cancels tasks not completed by timeout
1213       */
1214      public void testTimedInvokeAll6() throws Exception {
1215 <        ExecutorService e = new CustomExecutor(2);
1216 <        try {
1215 >        final ExecutorService e = new CustomExecutor(2);
1216 >        try (PoolCleaner cleaner = cleaner(e)) {
1217              for (long timeout = timeoutMillis();;) {
1218                  List<Callable<String>> tasks = new ArrayList<>();
1219                  tasks.add(new StringTask("0"));
# Line 1298 | Line 1237 | public class ScheduledExecutorSubclassTe
1237                          fail("expected exactly one task to be cancelled");
1238                  }
1239              }
1301        } finally {
1302            joinPool(e);
1240          }
1241      }
1242  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines