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

Comparing jsr166/src/test/tck/ScheduledExecutorTest.java (file contents):
Revision 1.60 by jsr166, Sun Oct 4 02:11:44 2015 UTC vs.
Revision 1.66 by jsr166, Mon Oct 5 21:54:33 2015 UTC

# Line 43 | Line 43 | public class ScheduledExecutorTest exten
43       */
44      public void testExecute() throws InterruptedException {
45          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
46 <        final CountDownLatch done = new CountDownLatch(1);
47 <        final Runnable task = new CheckedRunnable() {
48 <            public void realRun() {
49 <                done.countDown();
50 <            }};
51 <        try {
46 >        try (PoolCleaner cleaner = cleaner(p)) {
47 >            final CountDownLatch done = new CountDownLatch(1);
48 >            final Runnable task = new CheckedRunnable() {
49 >                public void realRun() { done.countDown(); }};
50              p.execute(task);
51              assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
54        } finally {
55            joinPool(p);
52          }
53      }
54  
# Line 61 | Line 57 | public class ScheduledExecutorTest exten
57       */
58      public void testSchedule1() throws Exception {
59          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
60 <        final long startTime = System.nanoTime();
61 <        final CountDownLatch done = new CountDownLatch(1);
62 <        try {
60 >        try (PoolCleaner cleaner = cleaner(p)) {
61 >            final long startTime = System.nanoTime();
62 >            final CountDownLatch done = new CountDownLatch(1);
63              Callable task = new CheckedCallable<Boolean>() {
64                  public Boolean realCall() {
65                      done.countDown();
# Line 74 | Line 70 | public class ScheduledExecutorTest exten
70              assertSame(Boolean.TRUE, f.get());
71              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
72              assertTrue(done.await(0L, MILLISECONDS));
77        } finally {
78            joinPool(p);
73          }
74      }
75  
# Line 84 | Line 78 | public class ScheduledExecutorTest exten
78       */
79      public void testSchedule3() throws Exception {
80          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
81 <        final long startTime = System.nanoTime();
82 <        final CountDownLatch done = new CountDownLatch(1);
83 <        try {
81 >        try (PoolCleaner cleaner = cleaner(p)) {
82 >            final long startTime = System.nanoTime();
83 >            final CountDownLatch done = new CountDownLatch(1);
84              Runnable task = new CheckedRunnable() {
85                  public void realRun() {
86                      done.countDown();
# Line 96 | Line 90 | public class ScheduledExecutorTest exten
90              await(done);
91              assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
92              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
99        } finally {
100            joinPool(p);
93          }
94      }
95  
# Line 106 | Line 98 | public class ScheduledExecutorTest exten
98       */
99      public void testSchedule4() throws Exception {
100          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
101 <        final long startTime = System.nanoTime();
102 <        final CountDownLatch done = new CountDownLatch(1);
103 <        try {
101 >        try (PoolCleaner cleaner = cleaner(p)) {
102 >            final long startTime = System.nanoTime();
103 >            final CountDownLatch done = new CountDownLatch(1);
104              Runnable task = new CheckedRunnable() {
105                  public void realRun() {
106                      done.countDown();
# Line 120 | Line 112 | public class ScheduledExecutorTest exten
112              await(done);
113              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
114              f.cancel(true);
123        } finally {
124            joinPool(p);
115          }
116      }
117  
# Line 130 | Line 120 | public class ScheduledExecutorTest exten
120       */
121      public void testSchedule5() throws Exception {
122          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
123 <        final long startTime = System.nanoTime();
124 <        final CountDownLatch done = new CountDownLatch(1);
125 <        try {
123 >        try (PoolCleaner cleaner = cleaner(p)) {
124 >            final long startTime = System.nanoTime();
125 >            final CountDownLatch done = new CountDownLatch(1);
126              Runnable task = new CheckedRunnable() {
127                  public void realRun() {
128                      done.countDown();
# Line 144 | Line 134 | public class ScheduledExecutorTest exten
134              await(done);
135              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
136              f.cancel(true);
147        } finally {
148            joinPool(p);
137          }
138      }
139  
# Line 159 | Line 147 | public class ScheduledExecutorTest exten
147       */
148      public void testFixedRateSequence() throws InterruptedException {
149          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
150 <        try {
150 >        try (PoolCleaner cleaner = cleaner(p)) {
151              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
152                  long startTime = System.nanoTime();
153                  int cycles = 10;
# Line 177 | Line 165 | public class ScheduledExecutorTest exten
165                      return;
166              }
167              throw new AssertionError("unexpected execution rate");
180        } finally {
181            joinPool(p);
168          }
169      }
170  
# Line 187 | Line 173 | public class ScheduledExecutorTest exten
173       */
174      public void testFixedDelaySequence() throws InterruptedException {
175          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
176 <        try {
176 >        try (PoolCleaner cleaner = cleaner(p)) {
177              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
178                  long startTime = System.nanoTime();
179                  int cycles = 10;
# Line 205 | Line 191 | public class ScheduledExecutorTest exten
191                      return;
192              }
193              throw new AssertionError("unexpected execution rate");
208        } finally {
209            joinPool(p);
194          }
195      }
196  
# Line 214 | Line 198 | public class ScheduledExecutorTest exten
198       * execute(null) throws NPE
199       */
200      public void testExecuteNull() throws InterruptedException {
201 <        ScheduledThreadPoolExecutor se = null;
202 <        try {
203 <            se = new ScheduledThreadPoolExecutor(1);
204 <            se.execute(null);
205 <            shouldThrow();
206 <        } catch (NullPointerException success) {}
207 <
224 <        joinPool(se);
201 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
202 >        try (PoolCleaner cleaner = cleaner(p)) {
203 >            try {
204 >                p.execute(null);
205 >                shouldThrow();
206 >            } catch (NullPointerException success) {}
207 >        }
208      }
209  
210      /**
211       * schedule(null) throws NPE
212       */
213      public void testScheduleNull() throws InterruptedException {
214 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
215 <        try {
216 <            TrackedCallable callable = null;
217 <            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
218 <            shouldThrow();
219 <        } catch (NullPointerException success) {}
220 <        joinPool(se);
214 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
215 >        try (PoolCleaner cleaner = cleaner(p)) {
216 >            try {
217 >                TrackedCallable callable = null;
218 >                Future f = p.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
219 >                shouldThrow();
220 >            } catch (NullPointerException success) {}
221 >        }
222      }
223  
224      /**
225       * execute throws RejectedExecutionException if shutdown
226       */
227      public void testSchedule1_RejectedExecutionException() throws InterruptedException {
228 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
229 <        try {
230 <            se.shutdown();
231 <            se.schedule(new NoOpRunnable(),
232 <                        MEDIUM_DELAY_MS, MILLISECONDS);
233 <            shouldThrow();
234 <        } catch (RejectedExecutionException success) {
235 <        } catch (SecurityException ok) {
228 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
229 >        try (PoolCleaner cleaner = cleaner(p)) {
230 >            try {
231 >                p.shutdown();
232 >                p.schedule(new NoOpRunnable(),
233 >                           MEDIUM_DELAY_MS, MILLISECONDS);
234 >                shouldThrow();
235 >            } catch (RejectedExecutionException success) {
236 >            } catch (SecurityException ok) {}
237          }
253
254        joinPool(se);
238      }
239  
240      /**
241       * schedule throws RejectedExecutionException if shutdown
242       */
243      public void testSchedule2_RejectedExecutionException() throws InterruptedException {
244 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
245 <        try {
246 <            se.shutdown();
247 <            se.schedule(new NoOpCallable(),
248 <                        MEDIUM_DELAY_MS, MILLISECONDS);
249 <            shouldThrow();
250 <        } catch (RejectedExecutionException success) {
251 <        } catch (SecurityException ok) {
244 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
245 >        try (PoolCleaner cleaner = cleaner(p)) {
246 >            try {
247 >                p.shutdown();
248 >                p.schedule(new NoOpCallable(),
249 >                           MEDIUM_DELAY_MS, MILLISECONDS);
250 >                shouldThrow();
251 >            } catch (RejectedExecutionException success) {
252 >            } catch (SecurityException ok) {}
253          }
270        joinPool(se);
254      }
255  
256      /**
257       * schedule callable throws RejectedExecutionException if shutdown
258       */
259      public void testSchedule3_RejectedExecutionException() throws InterruptedException {
260 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
261 <        try {
262 <            se.shutdown();
263 <            se.schedule(new NoOpCallable(),
264 <                        MEDIUM_DELAY_MS, MILLISECONDS);
265 <            shouldThrow();
266 <        } catch (RejectedExecutionException success) {
267 <        } catch (SecurityException ok) {
260 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
261 >        try (PoolCleaner cleaner = cleaner(p)) {
262 >            try {
263 >                p.shutdown();
264 >                p.schedule(new NoOpCallable(),
265 >                           MEDIUM_DELAY_MS, MILLISECONDS);
266 >                shouldThrow();
267 >            } catch (RejectedExecutionException success) {
268 >            } catch (SecurityException ok) {}
269          }
286        joinPool(se);
270      }
271  
272      /**
273       * scheduleAtFixedRate throws RejectedExecutionException if shutdown
274       */
275      public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
276 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
277 <        try {
278 <            se.shutdown();
279 <            se.scheduleAtFixedRate(new NoOpRunnable(),
280 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
281 <            shouldThrow();
282 <        } catch (RejectedExecutionException success) {
283 <        } catch (SecurityException ok) {
276 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
277 >        try (PoolCleaner cleaner = cleaner(p)) {
278 >            try {
279 >                p.shutdown();
280 >                p.scheduleAtFixedRate(new NoOpRunnable(),
281 >                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
282 >                shouldThrow();
283 >            } catch (RejectedExecutionException success) {
284 >            } catch (SecurityException ok) {}
285          }
302        joinPool(se);
286      }
287  
288      /**
289       * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
290       */
291      public void testScheduleWithFixedDelay1_RejectedExecutionException() throws InterruptedException {
292 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
293 <        try {
294 <            se.shutdown();
295 <            se.scheduleWithFixedDelay(new NoOpRunnable(),
296 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
297 <            shouldThrow();
298 <        } catch (RejectedExecutionException success) {
299 <        } catch (SecurityException ok) {
292 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
293 >        try (PoolCleaner cleaner = cleaner(p)) {
294 >            try {
295 >                p.shutdown();
296 >                p.scheduleWithFixedDelay(new NoOpRunnable(),
297 >                                         MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
298 >                shouldThrow();
299 >            } catch (RejectedExecutionException success) {
300 >            } catch (SecurityException ok) {}
301          }
318        joinPool(se);
302      }
303  
304      /**
# Line 324 | Line 307 | public class ScheduledExecutorTest exten
307       */
308      public void testGetActiveCount() throws InterruptedException {
309          final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
310 <        final CountDownLatch threadStarted = new CountDownLatch(1);
311 <        final CountDownLatch done = new CountDownLatch(1);
312 <        try {
310 >        try (PoolCleaner cleaner = cleaner(p)) {
311 >            final CountDownLatch threadStarted = new CountDownLatch(1);
312 >            final CountDownLatch done = new CountDownLatch(1);
313              assertEquals(0, p.getActiveCount());
314              p.execute(new CheckedRunnable() {
315                  public void realRun() throws InterruptedException {
# Line 334 | Line 317 | public class ScheduledExecutorTest exten
317                      assertEquals(1, p.getActiveCount());
318                      done.await();
319                  }});
320 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
320 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
321              assertEquals(1, p.getActiveCount());
339        } finally {
322              done.countDown();
341            joinPool(p);
323          }
324      }
325  
# Line 348 | Line 329 | public class ScheduledExecutorTest exten
329       */
330      public void testGetCompletedTaskCount() throws InterruptedException {
331          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
332 <        final CountDownLatch threadStarted = new CountDownLatch(1);
333 <        final CountDownLatch threadProceed = new CountDownLatch(1);
334 <        final CountDownLatch threadDone = new CountDownLatch(1);
335 <        try {
332 >        try (PoolCleaner cleaner = cleaner(p)) {
333 >            final CountDownLatch threadStarted = new CountDownLatch(1);
334 >            final CountDownLatch threadProceed = new CountDownLatch(1);
335 >            final CountDownLatch threadDone = new CountDownLatch(1);
336              assertEquals(0, p.getCompletedTaskCount());
337              p.execute(new CheckedRunnable() {
338                  public void realRun() throws InterruptedException {
# Line 370 | Line 351 | public class ScheduledExecutorTest exten
351                      fail("timed out");
352                  Thread.yield();
353              }
373        } finally {
374            joinPool(p);
354          }
355      }
356  
# Line 380 | Line 359 | public class ScheduledExecutorTest exten
359       */
360      public void testGetCorePoolSize() throws InterruptedException {
361          ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
362 <        assertEquals(1, p.getCorePoolSize());
363 <        joinPool(p);
362 >        try (PoolCleaner cleaner = cleaner(p)) {
363 >            assertEquals(1, p.getCorePoolSize());
364 >        }
365      }
366  
367      /**
# Line 393 | Line 373 | public class ScheduledExecutorTest exten
373          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
374          final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
375          final CountDownLatch done = new CountDownLatch(1);
376 <        try {
376 >        try (PoolCleaner cleaner = cleaner(p)) {
377              assertEquals(0, p.getLargestPoolSize());
378              for (int i = 0; i < THREADS; i++)
379                  p.execute(new CheckedRunnable() {
# Line 404 | Line 384 | public class ScheduledExecutorTest exten
384                      }});
385              assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
386              assertEquals(THREADS, p.getLargestPoolSize());
407        } finally {
387              done.countDown();
409            joinPool(p);
410            assertEquals(THREADS, p.getLargestPoolSize());
388          }
389 +        assertEquals(THREADS, p.getLargestPoolSize());
390      }
391  
392      /**
# Line 419 | Line 397 | public class ScheduledExecutorTest exten
397          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
398          final CountDownLatch threadStarted = new CountDownLatch(1);
399          final CountDownLatch done = new CountDownLatch(1);
400 <        try {
400 >        try (PoolCleaner cleaner = cleaner(p)) {
401              assertEquals(0, p.getPoolSize());
402              p.execute(new CheckedRunnable() {
403                  public void realRun() throws InterruptedException {
# Line 427 | Line 405 | public class ScheduledExecutorTest exten
405                      assertEquals(1, p.getPoolSize());
406                      done.await();
407                  }});
408 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
408 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
409              assertEquals(1, p.getPoolSize());
432        } finally {
410              done.countDown();
434            joinPool(p);
411          }
412      }
413  
# Line 440 | Line 416 | public class ScheduledExecutorTest exten
416       * submitted
417       */
418      public void testGetTaskCount() throws InterruptedException {
419 <        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
444 <        final CountDownLatch threadStarted = new CountDownLatch(1);
419 >        final int TASKS = 3;
420          final CountDownLatch done = new CountDownLatch(1);
421 <        final int TASKS = 5;
422 <        try {
421 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
422 >        try (PoolCleaner cleaner = cleaner(p, done)) {
423 >            final CountDownLatch threadStarted = new CountDownLatch(1);
424              assertEquals(0, p.getTaskCount());
425 <            for (int i = 0; i < TASKS; i++)
425 >            assertEquals(0, p.getCompletedTaskCount());
426 >            p.execute(new CheckedRunnable() {
427 >                public void realRun() throws InterruptedException {
428 >                    threadStarted.countDown();
429 >                    done.await();
430 >                }});
431 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
432 >            assertEquals(1, p.getTaskCount());
433 >            assertEquals(0, p.getCompletedTaskCount());
434 >            for (int i = 0; i < TASKS; i++) {
435 >                assertEquals(1 + i, p.getTaskCount());
436                  p.execute(new CheckedRunnable() {
437                      public void realRun() throws InterruptedException {
438                          threadStarted.countDown();
439 +                        assertEquals(1 + TASKS, p.getTaskCount());
440                          done.await();
441                      }});
442 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
443 <            assertEquals(TASKS, p.getTaskCount());
444 <        } finally {
458 <            done.countDown();
459 <            joinPool(p);
442 >            }
443 >            assertEquals(1 + TASKS, p.getTaskCount());
444 >            assertEquals(0, p.getCompletedTaskCount());
445          }
446 +        assertEquals(1 + TASKS, p.getTaskCount());
447 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
448      }
449  
450      /**
451       * getThreadFactory returns factory in constructor if not set
452       */
453      public void testGetThreadFactory() throws InterruptedException {
454 <        ThreadFactory tf = new SimpleThreadFactory();
455 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf);
456 <        assertSame(tf, p.getThreadFactory());
457 <        joinPool(p);
454 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
455 >        final ScheduledThreadPoolExecutor p =
456 >            new ScheduledThreadPoolExecutor(1, threadFactory);
457 >        try (PoolCleaner cleaner = cleaner(p)) {
458 >            assertSame(threadFactory, p.getThreadFactory());
459 >        }
460      }
461  
462      /**
463       * setThreadFactory sets the thread factory returned by getThreadFactory
464       */
465      public void testSetThreadFactory() throws InterruptedException {
466 <        ThreadFactory tf = new SimpleThreadFactory();
466 >        ThreadFactory threadFactory = new SimpleThreadFactory();
467          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
468 <        p.setThreadFactory(tf);
469 <        assertSame(tf, p.getThreadFactory());
470 <        joinPool(p);
468 >        try (PoolCleaner cleaner = cleaner(p)) {
469 >            p.setThreadFactory(threadFactory);
470 >            assertSame(threadFactory, p.getThreadFactory());
471 >        }
472      }
473  
474      /**
# Line 486 | Line 476 | public class ScheduledExecutorTest exten
476       */
477      public void testSetThreadFactoryNull() throws InterruptedException {
478          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
479 <        try {
480 <            p.setThreadFactory(null);
481 <            shouldThrow();
482 <        } catch (NullPointerException success) {
483 <        } finally {
494 <            joinPool(p);
479 >        try (PoolCleaner cleaner = cleaner(p)) {
480 >            try {
481 >                p.setThreadFactory(null);
482 >                shouldThrow();
483 >            } catch (NullPointerException success) {}
484          }
485      }
486  
# Line 515 | Line 504 | public class ScheduledExecutorTest exten
504       */
505      public void testIsTerminated() throws InterruptedException {
506          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
507 <        final CountDownLatch threadStarted = new CountDownLatch(1);
508 <        final CountDownLatch done = new CountDownLatch(1);
509 <        assertFalse(p.isTerminated());
510 <        try {
507 >        try (PoolCleaner cleaner = cleaner(p)) {
508 >            final CountDownLatch threadStarted = new CountDownLatch(1);
509 >            final CountDownLatch done = new CountDownLatch(1);
510 >            assertFalse(p.isTerminated());
511              p.execute(new CheckedRunnable() {
512                  public void realRun() throws InterruptedException {
513                      assertFalse(p.isTerminated());
514                      threadStarted.countDown();
515                      done.await();
516                  }});
517 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
517 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
518              assertFalse(p.isTerminating());
519              done.countDown();
531        } finally {
520              try { p.shutdown(); } catch (SecurityException ok) { return; }
521 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
522 +            assertTrue(p.isTerminated());
523          }
534        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
535        assertTrue(p.isTerminated());
524      }
525  
526      /**
# Line 542 | Line 530 | public class ScheduledExecutorTest exten
530          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
531          final CountDownLatch threadStarted = new CountDownLatch(1);
532          final CountDownLatch done = new CountDownLatch(1);
533 <        try {
533 >        try (PoolCleaner cleaner = cleaner(p)) {
534              assertFalse(p.isTerminating());
535              p.execute(new CheckedRunnable() {
536                  public void realRun() throws InterruptedException {
# Line 550 | Line 538 | public class ScheduledExecutorTest exten
538                      threadStarted.countDown();
539                      done.await();
540                  }});
541 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
541 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
542              assertFalse(p.isTerminating());
543              done.countDown();
556        } finally {
544              try { p.shutdown(); } catch (SecurityException ok) { return; }
545 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
546 +            assertTrue(p.isTerminated());
547 +            assertFalse(p.isTerminating());
548          }
559        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
560        assertTrue(p.isTerminated());
561        assertFalse(p.isTerminating());
549      }
550  
551      /**
# Line 566 | Line 553 | public class ScheduledExecutorTest exten
553       */
554      public void testGetQueue() throws InterruptedException {
555          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
556 <        final CountDownLatch threadStarted = new CountDownLatch(1);
557 <        final CountDownLatch done = new CountDownLatch(1);
558 <        try {
556 >        try (PoolCleaner cleaner = cleaner(p)) {
557 >            final CountDownLatch threadStarted = new CountDownLatch(1);
558 >            final CountDownLatch done = new CountDownLatch(1);
559              ScheduledFuture[] tasks = new ScheduledFuture[5];
560              for (int i = 0; i < tasks.length; i++) {
561                  Runnable r = new CheckedRunnable() {
# Line 578 | Line 565 | public class ScheduledExecutorTest exten
565                      }};
566                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
567              }
568 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
568 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
569              BlockingQueue<Runnable> q = p.getQueue();
570              assertTrue(q.contains(tasks[tasks.length - 1]));
571              assertFalse(q.contains(tasks[0]));
585        } finally {
572              done.countDown();
587            joinPool(p);
573          }
574      }
575  
# Line 593 | Line 578 | public class ScheduledExecutorTest exten
578       */
579      public void testRemove() throws InterruptedException {
580          final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
581 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
582 <        final CountDownLatch threadStarted = new CountDownLatch(1);
583 <        final CountDownLatch done = new CountDownLatch(1);
584 <        try {
581 >        try (PoolCleaner cleaner = cleaner(p)) {
582 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
583 >            final CountDownLatch threadStarted = new CountDownLatch(1);
584 >            final CountDownLatch done = new CountDownLatch(1);
585              for (int i = 0; i < tasks.length; i++) {
586                  Runnable r = new CheckedRunnable() {
587                      public void realRun() throws InterruptedException {
# Line 605 | Line 590 | public class ScheduledExecutorTest exten
590                      }};
591                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
592              }
593 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
593 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
594              BlockingQueue<Runnable> q = p.getQueue();
595              assertFalse(p.remove((Runnable)tasks[0]));
596              assertTrue(q.contains((Runnable)tasks[4]));
# Line 616 | Line 601 | public class ScheduledExecutorTest exten
601              assertTrue(q.contains((Runnable)tasks[3]));
602              assertTrue(p.remove((Runnable)tasks[3]));
603              assertFalse(q.contains((Runnable)tasks[3]));
619        } finally {
604              done.countDown();
621            joinPool(p);
605          }
606      }
607  
# Line 626 | Line 609 | public class ScheduledExecutorTest exten
609       * purge eventually removes cancelled tasks from the queue
610       */
611      public void testPurge() throws InterruptedException {
612 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
613 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
614 <        for (int i = 0; i < tasks.length; i++)
615 <            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
616 <                                  LONG_DELAY_MS, MILLISECONDS);
617 <        try {
612 >        final ScheduledFuture[] tasks = new ScheduledFuture[5];
613 >        final Runnable releaser = new Runnable() { public void run() {
614 >            for (ScheduledFuture task : tasks)
615 >                if (task != null) task.cancel(true); }};
616 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
617 >        try (PoolCleaner cleaner = cleaner(p, releaser)) {
618 >            for (int i = 0; i < tasks.length; i++)
619 >                tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
620 >                                      LONG_DELAY_MS, MILLISECONDS);
621              int max = tasks.length;
622              if (tasks[4].cancel(true)) --max;
623              if (tasks[3].cancel(true)) --max;
# Line 643 | Line 629 | public class ScheduledExecutorTest exten
629                  long count = p.getTaskCount();
630                  if (count == max)
631                      return;
632 <            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
632 >            } while (millisElapsedSince(startTime) < LONG_DELAY_MS);
633              fail("Purge failed to remove cancelled tasks");
648        } finally {
649            for (ScheduledFuture task : tasks)
650                task.cancel(true);
651            joinPool(p);
634          }
635      }
636  
# Line 662 | Line 644 | public class ScheduledExecutorTest exten
644          final AtomicInteger ran = new AtomicInteger(0);
645          final ScheduledThreadPoolExecutor p =
646              new ScheduledThreadPoolExecutor(poolSize);
647 <        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
647 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
648          Runnable waiter = new CheckedRunnable() { public void realRun() {
649              threadsStarted.countDown();
650              try {
# Line 822 | Line 804 | public class ScheduledExecutorTest exten
804       * completed submit of callable returns result
805       */
806      public void testSubmitCallable() throws Exception {
807 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
808 <        try {
807 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
808 >        try (PoolCleaner cleaner = cleaner(e)) {
809              Future<String> future = e.submit(new StringTask());
810              String result = future.get();
811              assertSame(TEST_STRING, result);
830        } finally {
831            joinPool(e);
812          }
813      }
814  
# Line 836 | Line 816 | public class ScheduledExecutorTest exten
816       * completed submit of runnable returns successfully
817       */
818      public void testSubmitRunnable() throws Exception {
819 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
820 <        try {
819 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
820 >        try (PoolCleaner cleaner = cleaner(e)) {
821              Future<?> future = e.submit(new NoOpRunnable());
822              future.get();
823              assertTrue(future.isDone());
844        } finally {
845            joinPool(e);
824          }
825      }
826  
# Line 850 | Line 828 | public class ScheduledExecutorTest exten
828       * completed submit of (runnable, result) returns result
829       */
830      public void testSubmitRunnable2() throws Exception {
831 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
832 <        try {
831 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
832 >        try (PoolCleaner cleaner = cleaner(e)) {
833              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
834              String result = future.get();
835              assertSame(TEST_STRING, result);
858        } finally {
859            joinPool(e);
836          }
837      }
838  
# Line 864 | Line 840 | public class ScheduledExecutorTest exten
840       * invokeAny(null) throws NPE
841       */
842      public void testInvokeAny1() throws Exception {
843 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
844 <        try {
845 <            e.invokeAny(null);
846 <            shouldThrow();
847 <        } catch (NullPointerException success) {
848 <        } finally {
873 <            joinPool(e);
843 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
844 >        try (PoolCleaner cleaner = cleaner(e)) {
845 >            try {
846 >                e.invokeAny(null);
847 >                shouldThrow();
848 >            } catch (NullPointerException success) {}
849          }
850      }
851  
# Line 878 | Line 853 | public class ScheduledExecutorTest exten
853       * invokeAny(empty collection) throws IAE
854       */
855      public void testInvokeAny2() throws Exception {
856 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
857 <        try {
858 <            e.invokeAny(new ArrayList<Callable<String>>());
859 <            shouldThrow();
860 <        } catch (IllegalArgumentException success) {
861 <        } finally {
887 <            joinPool(e);
856 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
857 >        try (PoolCleaner cleaner = cleaner(e)) {
858 >            try {
859 >                e.invokeAny(new ArrayList<Callable<String>>());
860 >                shouldThrow();
861 >            } catch (IllegalArgumentException success) {}
862          }
863      }
864  
# Line 893 | Line 867 | public class ScheduledExecutorTest exten
867       */
868      public void testInvokeAny3() throws Exception {
869          CountDownLatch latch = new CountDownLatch(1);
870 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
871 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
872 <        l.add(latchAwaitingStringTask(latch));
873 <        l.add(null);
874 <        try {
875 <            e.invokeAny(l);
876 <            shouldThrow();
877 <        } catch (NullPointerException success) {
878 <        } finally {
870 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
871 >        try (PoolCleaner cleaner = cleaner(e)) {
872 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
873 >            l.add(latchAwaitingStringTask(latch));
874 >            l.add(null);
875 >            try {
876 >                e.invokeAny(l);
877 >                shouldThrow();
878 >            } catch (NullPointerException success) {}
879              latch.countDown();
906            joinPool(e);
880          }
881      }
882  
# Line 911 | Line 884 | public class ScheduledExecutorTest exten
884       * invokeAny(c) throws ExecutionException if no task completes
885       */
886      public void testInvokeAny4() throws Exception {
887 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
888 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
889 <        l.add(new NPETask());
890 <        try {
891 <            e.invokeAny(l);
892 <            shouldThrow();
893 <        } catch (ExecutionException success) {
894 <            assertTrue(success.getCause() instanceof NullPointerException);
895 <        } finally {
896 <            joinPool(e);
887 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
888 >        try (PoolCleaner cleaner = cleaner(e)) {
889 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
890 >            l.add(new NPETask());
891 >            try {
892 >                e.invokeAny(l);
893 >                shouldThrow();
894 >            } catch (ExecutionException success) {
895 >                assertTrue(success.getCause() instanceof NullPointerException);
896 >            }
897          }
898      }
899  
# Line 928 | Line 901 | public class ScheduledExecutorTest exten
901       * invokeAny(c) returns result of some task
902       */
903      public void testInvokeAny5() throws Exception {
904 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
905 <        try {
904 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
905 >        try (PoolCleaner cleaner = cleaner(e)) {
906              List<Callable<String>> l = new ArrayList<Callable<String>>();
907              l.add(new StringTask());
908              l.add(new StringTask());
909              String result = e.invokeAny(l);
910              assertSame(TEST_STRING, result);
938        } finally {
939            joinPool(e);
911          }
912      }
913  
# Line 944 | Line 915 | public class ScheduledExecutorTest exten
915       * invokeAll(null) throws NPE
916       */
917      public void testInvokeAll1() throws Exception {
918 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
919 <        try {
920 <            e.invokeAll(null);
921 <            shouldThrow();
922 <        } catch (NullPointerException success) {
923 <        } finally {
953 <            joinPool(e);
918 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
919 >        try (PoolCleaner cleaner = cleaner(e)) {
920 >            try {
921 >                e.invokeAll(null);
922 >                shouldThrow();
923 >            } catch (NullPointerException success) {}
924          }
925      }
926  
# Line 958 | Line 928 | public class ScheduledExecutorTest exten
928       * invokeAll(empty collection) returns empty collection
929       */
930      public void testInvokeAll2() throws Exception {
931 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
932 <        try {
931 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
932 >        try (PoolCleaner cleaner = cleaner(e)) {
933              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
934              assertTrue(r.isEmpty());
965        } finally {
966            joinPool(e);
935          }
936      }
937  
# Line 971 | Line 939 | public class ScheduledExecutorTest exten
939       * invokeAll(c) throws NPE if c has null elements
940       */
941      public void testInvokeAll3() throws Exception {
942 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
943 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
944 <        l.add(new StringTask());
945 <        l.add(null);
946 <        try {
947 <            e.invokeAll(l);
948 <            shouldThrow();
949 <        } catch (NullPointerException success) {
950 <        } finally {
983 <            joinPool(e);
942 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
943 >        try (PoolCleaner cleaner = cleaner(e)) {
944 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
945 >            l.add(new StringTask());
946 >            l.add(null);
947 >            try {
948 >                e.invokeAll(l);
949 >                shouldThrow();
950 >            } catch (NullPointerException success) {}
951          }
952      }
953  
# Line 988 | Line 955 | public class ScheduledExecutorTest exten
955       * get of invokeAll(c) throws exception on failed task
956       */
957      public void testInvokeAll4() throws Exception {
958 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
959 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
960 <        l.add(new NPETask());
961 <        List<Future<String>> futures = e.invokeAll(l);
962 <        assertEquals(1, futures.size());
963 <        try {
964 <            futures.get(0).get();
965 <            shouldThrow();
966 <        } catch (ExecutionException success) {
967 <            assertTrue(success.getCause() instanceof NullPointerException);
968 <        } finally {
969 <            joinPool(e);
958 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
959 >        try (PoolCleaner cleaner = cleaner(e)) {
960 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
961 >            l.add(new NPETask());
962 >            List<Future<String>> futures = e.invokeAll(l);
963 >            assertEquals(1, futures.size());
964 >            try {
965 >                futures.get(0).get();
966 >                shouldThrow();
967 >            } catch (ExecutionException success) {
968 >                assertTrue(success.getCause() instanceof NullPointerException);
969 >            }
970          }
971      }
972  
# Line 1007 | Line 974 | public class ScheduledExecutorTest exten
974       * invokeAll(c) returns results of all completed tasks
975       */
976      public void testInvokeAll5() throws Exception {
977 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
978 <        try {
977 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
978 >        try (PoolCleaner cleaner = cleaner(e)) {
979              List<Callable<String>> l = new ArrayList<Callable<String>>();
980              l.add(new StringTask());
981              l.add(new StringTask());
# Line 1016 | Line 983 | public class ScheduledExecutorTest exten
983              assertEquals(2, futures.size());
984              for (Future<String> future : futures)
985                  assertSame(TEST_STRING, future.get());
1019        } finally {
1020            joinPool(e);
986          }
987      }
988  
# Line 1025 | Line 990 | public class ScheduledExecutorTest exten
990       * timed invokeAny(null) throws NPE
991       */
992      public void testTimedInvokeAny1() throws Exception {
993 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
994 <        try {
995 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
996 <            shouldThrow();
997 <        } catch (NullPointerException success) {
998 <        } finally {
1034 <            joinPool(e);
993 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
994 >        try (PoolCleaner cleaner = cleaner(e)) {
995 >            try {
996 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
997 >                shouldThrow();
998 >            } catch (NullPointerException success) {}
999          }
1000      }
1001  
# Line 1039 | Line 1003 | public class ScheduledExecutorTest exten
1003       * timed invokeAny(,,null) throws NPE
1004       */
1005      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1006 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1007 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1008 <        l.add(new StringTask());
1009 <        try {
1010 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1011 <            shouldThrow();
1012 <        } catch (NullPointerException success) {
1013 <        } finally {
1050 <            joinPool(e);
1006 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1007 >        try (PoolCleaner cleaner = cleaner(e)) {
1008 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1009 >            l.add(new StringTask());
1010 >            try {
1011 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1012 >                shouldThrow();
1013 >            } catch (NullPointerException success) {}
1014          }
1015      }
1016  
# Line 1055 | Line 1018 | public class ScheduledExecutorTest exten
1018       * timed invokeAny(empty collection) throws IAE
1019       */
1020      public void testTimedInvokeAny2() throws Exception {
1021 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1022 <        try {
1023 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1024 <            shouldThrow();
1025 <        } catch (IllegalArgumentException success) {
1026 <        } finally {
1064 <            joinPool(e);
1021 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1022 >        try (PoolCleaner cleaner = cleaner(e)) {
1023 >            try {
1024 >                e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1025 >                shouldThrow();
1026 >            } catch (IllegalArgumentException success) {}
1027          }
1028      }
1029  
# Line 1070 | Line 1032 | public class ScheduledExecutorTest exten
1032       */
1033      public void testTimedInvokeAny3() throws Exception {
1034          CountDownLatch latch = new CountDownLatch(1);
1035 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1036 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1037 <        l.add(latchAwaitingStringTask(latch));
1038 <        l.add(null);
1039 <        try {
1040 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1041 <            shouldThrow();
1042 <        } catch (NullPointerException success) {
1043 <        } finally {
1035 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1036 >        try (PoolCleaner cleaner = cleaner(e)) {
1037 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1038 >            l.add(latchAwaitingStringTask(latch));
1039 >            l.add(null);
1040 >            try {
1041 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1042 >                shouldThrow();
1043 >            } catch (NullPointerException success) {}
1044              latch.countDown();
1083            joinPool(e);
1045          }
1046      }
1047  
# Line 1088 | Line 1049 | public class ScheduledExecutorTest exten
1049       * timed invokeAny(c) throws ExecutionException if no task completes
1050       */
1051      public void testTimedInvokeAny4() throws Exception {
1052 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1053 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1054 <        l.add(new NPETask());
1055 <        try {
1056 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1057 <            shouldThrow();
1058 <        } catch (ExecutionException success) {
1059 <            assertTrue(success.getCause() instanceof NullPointerException);
1060 <        } finally {
1061 <            joinPool(e);
1052 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1053 >        try (PoolCleaner cleaner = cleaner(e)) {
1054 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1055 >            l.add(new NPETask());
1056 >            try {
1057 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1058 >                shouldThrow();
1059 >            } catch (ExecutionException success) {
1060 >                assertTrue(success.getCause() instanceof NullPointerException);
1061 >            }
1062          }
1063      }
1064  
# Line 1105 | Line 1066 | public class ScheduledExecutorTest exten
1066       * timed invokeAny(c) returns result of some task
1067       */
1068      public void testTimedInvokeAny5() throws Exception {
1069 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1070 <        try {
1069 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1070 >        try (PoolCleaner cleaner = cleaner(e)) {
1071              List<Callable<String>> l = new ArrayList<Callable<String>>();
1072              l.add(new StringTask());
1073              l.add(new StringTask());
1074              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1075              assertSame(TEST_STRING, result);
1115        } finally {
1116            joinPool(e);
1076          }
1077      }
1078  
# Line 1121 | Line 1080 | public class ScheduledExecutorTest exten
1080       * timed invokeAll(null) throws NPE
1081       */
1082      public void testTimedInvokeAll1() throws Exception {
1083 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1084 <        try {
1085 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1086 <            shouldThrow();
1087 <        } catch (NullPointerException success) {
1088 <        } finally {
1130 <            joinPool(e);
1083 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1084 >        try (PoolCleaner cleaner = cleaner(e)) {
1085 >            try {
1086 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1087 >                shouldThrow();
1088 >            } catch (NullPointerException success) {}
1089          }
1090      }
1091  
# Line 1135 | Line 1093 | public class ScheduledExecutorTest exten
1093       * timed invokeAll(,,null) throws NPE
1094       */
1095      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1096 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1097 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1098 <        l.add(new StringTask());
1099 <        try {
1100 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1101 <            shouldThrow();
1102 <        } catch (NullPointerException success) {
1103 <        } finally {
1146 <            joinPool(e);
1096 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1097 >        try (PoolCleaner cleaner = cleaner(e)) {
1098 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1099 >            l.add(new StringTask());
1100 >            try {
1101 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1102 >                shouldThrow();
1103 >            } catch (NullPointerException success) {}
1104          }
1105      }
1106  
# Line 1151 | Line 1108 | public class ScheduledExecutorTest exten
1108       * timed invokeAll(empty collection) returns empty collection
1109       */
1110      public void testTimedInvokeAll2() throws Exception {
1111 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1112 <        try {
1113 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1111 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1112 >        try (PoolCleaner cleaner = cleaner(e)) {
1113 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1114 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1115              assertTrue(r.isEmpty());
1158        } finally {
1159            joinPool(e);
1116          }
1117      }
1118  
# Line 1164 | Line 1120 | public class ScheduledExecutorTest exten
1120       * timed invokeAll(c) throws NPE if c has null elements
1121       */
1122      public void testTimedInvokeAll3() throws Exception {
1123 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1124 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1125 <        l.add(new StringTask());
1126 <        l.add(null);
1127 <        try {
1128 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1129 <            shouldThrow();
1130 <        } catch (NullPointerException success) {
1131 <        } finally {
1176 <            joinPool(e);
1123 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1124 >        try (PoolCleaner cleaner = cleaner(e)) {
1125 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1126 >            l.add(new StringTask());
1127 >            l.add(null);
1128 >            try {
1129 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1130 >                shouldThrow();
1131 >            } catch (NullPointerException success) {}
1132          }
1133      }
1134  
# Line 1181 | Line 1136 | public class ScheduledExecutorTest exten
1136       * get of element of invokeAll(c) throws exception on failed task
1137       */
1138      public void testTimedInvokeAll4() throws Exception {
1139 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1140 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1141 <        l.add(new NPETask());
1142 <        List<Future<String>> futures =
1143 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1144 <        assertEquals(1, futures.size());
1145 <        try {
1146 <            futures.get(0).get();
1147 <            shouldThrow();
1148 <        } catch (ExecutionException success) {
1149 <            assertTrue(success.getCause() instanceof NullPointerException);
1150 <        } finally {
1151 <            joinPool(e);
1139 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1140 >        try (PoolCleaner cleaner = cleaner(e)) {
1141 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1142 >            l.add(new NPETask());
1143 >            List<Future<String>> futures =
1144 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1145 >            assertEquals(1, futures.size());
1146 >            try {
1147 >                futures.get(0).get();
1148 >                shouldThrow();
1149 >            } catch (ExecutionException success) {
1150 >                assertTrue(success.getCause() instanceof NullPointerException);
1151 >            }
1152          }
1153      }
1154  
# Line 1201 | Line 1156 | public class ScheduledExecutorTest exten
1156       * timed invokeAll(c) returns results of all completed tasks
1157       */
1158      public void testTimedInvokeAll5() throws Exception {
1159 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1160 <        try {
1159 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1160 >        try (PoolCleaner cleaner = cleaner(e)) {
1161              List<Callable<String>> l = new ArrayList<Callable<String>>();
1162              l.add(new StringTask());
1163              l.add(new StringTask());
# Line 1211 | Line 1166 | public class ScheduledExecutorTest exten
1166              assertEquals(2, futures.size());
1167              for (Future<String> future : futures)
1168                  assertSame(TEST_STRING, future.get());
1214        } finally {
1215            joinPool(e);
1169          }
1170      }
1171  
# Line 1220 | Line 1173 | public class ScheduledExecutorTest exten
1173       * timed invokeAll(c) cancels tasks not completed by timeout
1174       */
1175      public void testTimedInvokeAll6() throws Exception {
1176 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1177 <        try {
1176 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1177 >        try (PoolCleaner cleaner = cleaner(e)) {
1178              for (long timeout = timeoutMillis();;) {
1179                  List<Callable<String>> tasks = new ArrayList<>();
1180                  tasks.add(new StringTask("0"));
# Line 1245 | Line 1198 | public class ScheduledExecutorTest exten
1198                          fail("expected exactly one task to be cancelled");
1199                  }
1200              }
1248        } finally {
1249            joinPool(e);
1201          }
1202      }
1203  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines