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.58 by jsr166, Mon Sep 28 08:23:49 2015 UTC vs.
Revision 1.80 by jsr166, Mon Feb 22 23:16:06 2016 UTC

# Line 7 | Line 7
7   */
8  
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
11   import static java.util.concurrent.TimeUnit.SECONDS;
12  
13   import java.util.ArrayList;
# Line 25 | Line 26 | import java.util.concurrent.ScheduledFut
26   import java.util.concurrent.ScheduledThreadPoolExecutor;
27   import java.util.concurrent.ThreadFactory;
28   import java.util.concurrent.ThreadPoolExecutor;
29 + import java.util.concurrent.atomic.AtomicBoolean;
30   import java.util.concurrent.atomic.AtomicInteger;
31 + import java.util.concurrent.atomic.AtomicLong;
32  
33   import junit.framework.Test;
34   import junit.framework.TestSuite;
# Line 42 | Line 45 | public class ScheduledExecutorTest exten
45       * execute successfully executes a runnable
46       */
47      public void testExecute() throws InterruptedException {
48 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
49 <        final CountDownLatch done = new CountDownLatch(1);
50 <        final Runnable task = new CheckedRunnable() {
51 <            public void realRun() {
52 <                done.countDown();
50 <            }};
51 <        try {
48 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
49 >        try (PoolCleaner cleaner = cleaner(p)) {
50 >            final CountDownLatch done = new CountDownLatch(1);
51 >            final Runnable task = new CheckedRunnable() {
52 >                public void realRun() { done.countDown(); }};
53              p.execute(task);
54 <            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
54 <        } finally {
55 <            joinPool(p);
54 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
55          }
56      }
57  
# Line 60 | Line 59 | public class ScheduledExecutorTest exten
59       * delayed schedule of callable successfully executes after delay
60       */
61      public void testSchedule1() throws Exception {
62 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
63 <        final long startTime = System.nanoTime();
64 <        final CountDownLatch done = new CountDownLatch(1);
65 <        try {
62 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
63 >        try (PoolCleaner cleaner = cleaner(p)) {
64 >            final long startTime = System.nanoTime();
65 >            final CountDownLatch done = new CountDownLatch(1);
66              Callable task = new CheckedCallable<Boolean>() {
67                  public Boolean realCall() {
68                      done.countDown();
# Line 74 | Line 73 | public class ScheduledExecutorTest exten
73              assertSame(Boolean.TRUE, f.get());
74              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
75              assertTrue(done.await(0L, MILLISECONDS));
77        } finally {
78            joinPool(p);
76          }
77      }
78  
# Line 83 | Line 80 | public class ScheduledExecutorTest exten
80       * delayed schedule of runnable successfully executes after delay
81       */
82      public void testSchedule3() throws Exception {
83 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
84 <        final long startTime = System.nanoTime();
85 <        final CountDownLatch done = new CountDownLatch(1);
86 <        try {
83 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
84 >        try (PoolCleaner cleaner = cleaner(p)) {
85 >            final long startTime = System.nanoTime();
86 >            final CountDownLatch done = new CountDownLatch(1);
87              Runnable task = new CheckedRunnable() {
88                  public void realRun() {
89                      done.countDown();
# Line 96 | Line 93 | public class ScheduledExecutorTest exten
93              await(done);
94              assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
95              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
99        } finally {
100            joinPool(p);
96          }
97      }
98  
# Line 105 | Line 100 | public class ScheduledExecutorTest exten
100       * scheduleAtFixedRate executes runnable after given initial delay
101       */
102      public void testSchedule4() throws Exception {
103 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
104 <        final long startTime = System.nanoTime();
105 <        final CountDownLatch done = new CountDownLatch(1);
106 <        try {
103 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
104 >        try (PoolCleaner cleaner = cleaner(p)) {
105 >            final long startTime = System.nanoTime();
106 >            final CountDownLatch done = new CountDownLatch(1);
107              Runnable task = new CheckedRunnable() {
108                  public void realRun() {
109                      done.countDown();
# Line 120 | Line 115 | public class ScheduledExecutorTest exten
115              await(done);
116              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
117              f.cancel(true);
123        } finally {
124            joinPool(p);
118          }
119      }
120  
# Line 129 | Line 122 | public class ScheduledExecutorTest exten
122       * scheduleWithFixedDelay executes runnable after given initial delay
123       */
124      public void testSchedule5() throws Exception {
125 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
126 <        final long startTime = System.nanoTime();
127 <        final CountDownLatch done = new CountDownLatch(1);
128 <        try {
125 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
126 >        try (PoolCleaner cleaner = cleaner(p)) {
127 >            final long startTime = System.nanoTime();
128 >            final CountDownLatch done = new CountDownLatch(1);
129              Runnable task = new CheckedRunnable() {
130                  public void realRun() {
131                      done.countDown();
# Line 144 | Line 137 | public class ScheduledExecutorTest exten
137              await(done);
138              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
139              f.cancel(true);
147        } finally {
148            joinPool(p);
140          }
141      }
142  
# Line 155 | Line 146 | public class ScheduledExecutorTest exten
146      }
147  
148      /**
149 <     * scheduleAtFixedRate executes series of tasks at given rate
149 >     * scheduleAtFixedRate executes series of tasks at given rate.
150 >     * Eventually, it must hold that:
151 >     *   cycles - 1 <= elapsedMillis/delay < cycles
152       */
153      public void testFixedRateSequence() throws InterruptedException {
154 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
155 <        try {
154 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
155 >        try (PoolCleaner cleaner = cleaner(p)) {
156              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
157 <                long startTime = System.nanoTime();
158 <                int cycles = 10;
157 >                final long startTime = System.nanoTime();
158 >                final int cycles = 8;
159                  final CountDownLatch done = new CountDownLatch(cycles);
160 <                Runnable task = new CheckedRunnable() {
160 >                final Runnable task = new CheckedRunnable() {
161                      public void realRun() { done.countDown(); }};
162 <                ScheduledFuture h =
162 >                final ScheduledFuture periodicTask =
163                      p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
164 <                done.await();
165 <                h.cancel(true);
166 <                double normalizedTime =
167 <                    (double) millisElapsedSince(startTime) / delay;
168 <                if (normalizedTime >= cycles - 1 &&
169 <                    normalizedTime <= cycles)
164 >                final int totalDelayMillis = (cycles - 1) * delay;
165 >                await(done, totalDelayMillis + LONG_DELAY_MS);
166 >                periodicTask.cancel(true);
167 >                final long elapsedMillis = millisElapsedSince(startTime);
168 >                assertTrue(elapsedMillis >= totalDelayMillis);
169 >                if (elapsedMillis <= cycles * delay)
170                      return;
171 +                // else retry with longer delay
172              }
173 <            throw new AssertionError("unexpected execution rate");
180 <        } finally {
181 <            joinPool(p);
173 >            fail("unexpected execution rate");
174          }
175      }
176  
177      /**
178 <     * scheduleWithFixedDelay executes series of tasks with given period
178 >     * scheduleWithFixedDelay executes series of tasks with given period.
179 >     * Eventually, it must hold that each task starts at least delay and at
180 >     * most 2 * delay after the termination of the previous task.
181       */
182      public void testFixedDelaySequence() throws InterruptedException {
183 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
184 <        try {
183 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
184 >        try (PoolCleaner cleaner = cleaner(p)) {
185              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
186 <                long startTime = System.nanoTime();
187 <                int cycles = 10;
186 >                final long startTime = System.nanoTime();
187 >                final AtomicLong previous = new AtomicLong(startTime);
188 >                final AtomicBoolean tryLongerDelay = new AtomicBoolean(false);
189 >                final int cycles = 8;
190                  final CountDownLatch done = new CountDownLatch(cycles);
191 <                Runnable task = new CheckedRunnable() {
192 <                    public void realRun() { done.countDown(); }};
193 <                ScheduledFuture h =
191 >                final int d = delay;
192 >                final Runnable task = new CheckedRunnable() {
193 >                    public void realRun() {
194 >                        long now = System.nanoTime();
195 >                        long elapsedMillis
196 >                            = NANOSECONDS.toMillis(now - previous.get());
197 >                        if (done.getCount() == cycles) { // first execution
198 >                            if (elapsedMillis >= d)
199 >                                tryLongerDelay.set(true);
200 >                        } else {
201 >                            assertTrue(elapsedMillis >= d);
202 >                            if (elapsedMillis >= 2 * d)
203 >                                tryLongerDelay.set(true);
204 >                        }
205 >                        previous.set(now);
206 >                        done.countDown();
207 >                    }};
208 >                final ScheduledFuture periodicTask =
209                      p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
210 <                done.await();
211 <                h.cancel(true);
212 <                double normalizedTime =
213 <                    (double) millisElapsedSince(startTime) / delay;
214 <                if (normalizedTime >= cycles - 1 &&
215 <                    normalizedTime <= cycles)
210 >                final int totalDelayMillis = (cycles - 1) * delay;
211 >                await(done, totalDelayMillis + cycles * LONG_DELAY_MS);
212 >                periodicTask.cancel(true);
213 >                final long elapsedMillis = millisElapsedSince(startTime);
214 >                assertTrue(elapsedMillis >= totalDelayMillis);
215 >                if (!tryLongerDelay.get())
216                      return;
217 +                // else retry with longer delay
218              }
219 <            throw new AssertionError("unexpected execution rate");
208 <        } finally {
209 <            joinPool(p);
219 >            fail("unexpected execution rate");
220          }
221      }
222  
# Line 214 | Line 224 | public class ScheduledExecutorTest exten
224       * execute(null) throws NPE
225       */
226      public void testExecuteNull() throws InterruptedException {
227 <        ScheduledThreadPoolExecutor se = null;
228 <        try {
229 <            se = new ScheduledThreadPoolExecutor(1);
230 <            se.execute(null);
231 <            shouldThrow();
232 <        } catch (NullPointerException success) {}
233 <
224 <        joinPool(se);
227 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
228 >        try (PoolCleaner cleaner = cleaner(p)) {
229 >            try {
230 >                p.execute(null);
231 >                shouldThrow();
232 >            } catch (NullPointerException success) {}
233 >        }
234      }
235  
236      /**
237       * schedule(null) throws NPE
238       */
239      public void testScheduleNull() throws InterruptedException {
240 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
241 <        try {
242 <            TrackedCallable callable = null;
243 <            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
244 <            shouldThrow();
245 <        } catch (NullPointerException success) {}
246 <        joinPool(se);
240 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
241 >        try (PoolCleaner cleaner = cleaner(p)) {
242 >            try {
243 >                TrackedCallable callable = null;
244 >                Future f = p.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
245 >                shouldThrow();
246 >            } catch (NullPointerException success) {}
247 >        }
248      }
249  
250      /**
251       * execute throws RejectedExecutionException if shutdown
252       */
253      public void testSchedule1_RejectedExecutionException() throws InterruptedException {
254 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
255 <        try {
256 <            se.shutdown();
257 <            se.schedule(new NoOpRunnable(),
258 <                        MEDIUM_DELAY_MS, MILLISECONDS);
259 <            shouldThrow();
260 <        } catch (RejectedExecutionException success) {
261 <        } catch (SecurityException ok) {
254 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
255 >        try (PoolCleaner cleaner = cleaner(p)) {
256 >            try {
257 >                p.shutdown();
258 >                p.schedule(new NoOpRunnable(),
259 >                           MEDIUM_DELAY_MS, MILLISECONDS);
260 >                shouldThrow();
261 >            } catch (RejectedExecutionException success) {
262 >            } catch (SecurityException ok) {}
263          }
253
254        joinPool(se);
264      }
265  
266      /**
267       * schedule throws RejectedExecutionException if shutdown
268       */
269      public void testSchedule2_RejectedExecutionException() throws InterruptedException {
270 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
271 <        try {
272 <            se.shutdown();
273 <            se.schedule(new NoOpCallable(),
274 <                        MEDIUM_DELAY_MS, MILLISECONDS);
275 <            shouldThrow();
276 <        } catch (RejectedExecutionException success) {
277 <        } catch (SecurityException ok) {
270 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
271 >        try (PoolCleaner cleaner = cleaner(p)) {
272 >            try {
273 >                p.shutdown();
274 >                p.schedule(new NoOpCallable(),
275 >                           MEDIUM_DELAY_MS, MILLISECONDS);
276 >                shouldThrow();
277 >            } catch (RejectedExecutionException success) {
278 >            } catch (SecurityException ok) {}
279          }
270        joinPool(se);
280      }
281  
282      /**
283       * schedule callable throws RejectedExecutionException if shutdown
284       */
285      public void testSchedule3_RejectedExecutionException() throws InterruptedException {
286 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
287 <        try {
288 <            se.shutdown();
289 <            se.schedule(new NoOpCallable(),
290 <                        MEDIUM_DELAY_MS, MILLISECONDS);
291 <            shouldThrow();
292 <        } catch (RejectedExecutionException success) {
293 <        } catch (SecurityException ok) {
286 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
287 >        try (PoolCleaner cleaner = cleaner(p)) {
288 >            try {
289 >                p.shutdown();
290 >                p.schedule(new NoOpCallable(),
291 >                           MEDIUM_DELAY_MS, MILLISECONDS);
292 >                shouldThrow();
293 >            } catch (RejectedExecutionException success) {
294 >            } catch (SecurityException ok) {}
295          }
286        joinPool(se);
296      }
297  
298      /**
299       * scheduleAtFixedRate throws RejectedExecutionException if shutdown
300       */
301      public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
302 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
303 <        try {
304 <            se.shutdown();
305 <            se.scheduleAtFixedRate(new NoOpRunnable(),
306 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
307 <            shouldThrow();
308 <        } catch (RejectedExecutionException success) {
309 <        } catch (SecurityException ok) {
302 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
303 >        try (PoolCleaner cleaner = cleaner(p)) {
304 >            try {
305 >                p.shutdown();
306 >                p.scheduleAtFixedRate(new NoOpRunnable(),
307 >                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
308 >                shouldThrow();
309 >            } catch (RejectedExecutionException success) {
310 >            } catch (SecurityException ok) {}
311          }
302        joinPool(se);
312      }
313  
314      /**
315       * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
316       */
317      public void testScheduleWithFixedDelay1_RejectedExecutionException() throws InterruptedException {
318 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
319 <        try {
320 <            se.shutdown();
321 <            se.scheduleWithFixedDelay(new NoOpRunnable(),
322 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
323 <            shouldThrow();
324 <        } catch (RejectedExecutionException success) {
325 <        } catch (SecurityException ok) {
318 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
319 >        try (PoolCleaner cleaner = cleaner(p)) {
320 >            try {
321 >                p.shutdown();
322 >                p.scheduleWithFixedDelay(new NoOpRunnable(),
323 >                                         MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
324 >                shouldThrow();
325 >            } catch (RejectedExecutionException success) {
326 >            } catch (SecurityException ok) {}
327          }
318        joinPool(se);
328      }
329  
330      /**
# Line 323 | Line 332 | public class ScheduledExecutorTest exten
332       * thread becomes active
333       */
334      public void testGetActiveCount() throws InterruptedException {
326        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
327        final CountDownLatch threadStarted = new CountDownLatch(1);
335          final CountDownLatch done = new CountDownLatch(1);
336 <        try {
336 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
337 >        try (PoolCleaner cleaner = cleaner(p, done)) {
338 >            final CountDownLatch threadStarted = new CountDownLatch(1);
339              assertEquals(0, p.getActiveCount());
340              p.execute(new CheckedRunnable() {
341                  public void realRun() throws InterruptedException {
342                      threadStarted.countDown();
343                      assertEquals(1, p.getActiveCount());
344 <                    done.await();
344 >                    await(done);
345                  }});
346 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
346 >            await(threadStarted);
347              assertEquals(1, p.getActiveCount());
339        } finally {
340            done.countDown();
341            joinPool(p);
348          }
349      }
350  
# Line 348 | Line 354 | public class ScheduledExecutorTest exten
354       */
355      public void testGetCompletedTaskCount() throws InterruptedException {
356          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
357 <        final CountDownLatch threadStarted = new CountDownLatch(1);
358 <        final CountDownLatch threadProceed = new CountDownLatch(1);
359 <        final CountDownLatch threadDone = new CountDownLatch(1);
360 <        try {
357 >        try (PoolCleaner cleaner = cleaner(p)) {
358 >            final CountDownLatch threadStarted = new CountDownLatch(1);
359 >            final CountDownLatch threadProceed = new CountDownLatch(1);
360 >            final CountDownLatch threadDone = new CountDownLatch(1);
361              assertEquals(0, p.getCompletedTaskCount());
362              p.execute(new CheckedRunnable() {
363                  public void realRun() throws InterruptedException {
# Line 370 | Line 376 | public class ScheduledExecutorTest exten
376                      fail("timed out");
377                  Thread.yield();
378              }
373        } finally {
374            joinPool(p);
379          }
380      }
381  
# Line 380 | Line 384 | public class ScheduledExecutorTest exten
384       */
385      public void testGetCorePoolSize() throws InterruptedException {
386          ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
387 <        assertEquals(1, p.getCorePoolSize());
388 <        joinPool(p);
387 >        try (PoolCleaner cleaner = cleaner(p)) {
388 >            assertEquals(1, p.getCorePoolSize());
389 >        }
390      }
391  
392      /**
# Line 393 | Line 398 | public class ScheduledExecutorTest exten
398          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
399          final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
400          final CountDownLatch done = new CountDownLatch(1);
401 <        try {
401 >        try (PoolCleaner cleaner = cleaner(p, done)) {
402              assertEquals(0, p.getLargestPoolSize());
403              for (int i = 0; i < THREADS; i++)
404                  p.execute(new CheckedRunnable() {
405                      public void realRun() throws InterruptedException {
406                          threadsStarted.countDown();
407 <                        done.await();
407 >                        await(done);
408                          assertEquals(THREADS, p.getLargestPoolSize());
409                      }});
410 <            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
406 <            assertEquals(THREADS, p.getLargestPoolSize());
407 <        } finally {
408 <            done.countDown();
409 <            joinPool(p);
410 >            await(threadsStarted);
411              assertEquals(THREADS, p.getLargestPoolSize());
412          }
413 +        assertEquals(THREADS, p.getLargestPoolSize());
414      }
415  
416      /**
# Line 419 | Line 421 | public class ScheduledExecutorTest exten
421          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
422          final CountDownLatch threadStarted = new CountDownLatch(1);
423          final CountDownLatch done = new CountDownLatch(1);
424 <        try {
424 >        try (PoolCleaner cleaner = cleaner(p, done)) {
425              assertEquals(0, p.getPoolSize());
426              p.execute(new CheckedRunnable() {
427                  public void realRun() throws InterruptedException {
428                      threadStarted.countDown();
429                      assertEquals(1, p.getPoolSize());
430 <                    done.await();
430 >                    await(done);
431                  }});
432 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
432 >            await(threadStarted);
433              assertEquals(1, p.getPoolSize());
432        } finally {
433            done.countDown();
434            joinPool(p);
434          }
435      }
436  
# Line 440 | Line 439 | public class ScheduledExecutorTest exten
439       * submitted
440       */
441      public void testGetTaskCount() throws InterruptedException {
442 <        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
444 <        final CountDownLatch threadStarted = new CountDownLatch(1);
442 >        final int TASKS = 3;
443          final CountDownLatch done = new CountDownLatch(1);
444 <        final int TASKS = 5;
445 <        try {
444 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
445 >        try (PoolCleaner cleaner = cleaner(p, done)) {
446 >            final CountDownLatch threadStarted = new CountDownLatch(1);
447              assertEquals(0, p.getTaskCount());
448 <            for (int i = 0; i < TASKS; i++)
448 >            assertEquals(0, p.getCompletedTaskCount());
449 >            p.execute(new CheckedRunnable() {
450 >                public void realRun() throws InterruptedException {
451 >                    threadStarted.countDown();
452 >                    await(done);
453 >                }});
454 >            await(threadStarted);
455 >            assertEquals(1, p.getTaskCount());
456 >            assertEquals(0, p.getCompletedTaskCount());
457 >            for (int i = 0; i < TASKS; i++) {
458 >                assertEquals(1 + i, p.getTaskCount());
459                  p.execute(new CheckedRunnable() {
460                      public void realRun() throws InterruptedException {
461                          threadStarted.countDown();
462 <                        done.await();
462 >                        assertEquals(1 + TASKS, p.getTaskCount());
463 >                        await(done);
464                      }});
465 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
466 <            assertEquals(TASKS, p.getTaskCount());
467 <        } finally {
458 <            done.countDown();
459 <            joinPool(p);
465 >            }
466 >            assertEquals(1 + TASKS, p.getTaskCount());
467 >            assertEquals(0, p.getCompletedTaskCount());
468          }
469 +        assertEquals(1 + TASKS, p.getTaskCount());
470 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
471      }
472  
473      /**
474       * getThreadFactory returns factory in constructor if not set
475       */
476      public void testGetThreadFactory() throws InterruptedException {
477 <        ThreadFactory tf = new SimpleThreadFactory();
478 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf);
479 <        assertSame(tf, p.getThreadFactory());
480 <        joinPool(p);
477 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
478 >        final ScheduledThreadPoolExecutor p =
479 >            new ScheduledThreadPoolExecutor(1, threadFactory);
480 >        try (PoolCleaner cleaner = cleaner(p)) {
481 >            assertSame(threadFactory, p.getThreadFactory());
482 >        }
483      }
484  
485      /**
486       * setThreadFactory sets the thread factory returned by getThreadFactory
487       */
488      public void testSetThreadFactory() throws InterruptedException {
489 <        ThreadFactory tf = new SimpleThreadFactory();
490 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
491 <        p.setThreadFactory(tf);
492 <        assertSame(tf, p.getThreadFactory());
493 <        joinPool(p);
489 >        ThreadFactory threadFactory = new SimpleThreadFactory();
490 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
491 >        try (PoolCleaner cleaner = cleaner(p)) {
492 >            p.setThreadFactory(threadFactory);
493 >            assertSame(threadFactory, p.getThreadFactory());
494 >        }
495      }
496  
497      /**
498       * setThreadFactory(null) throws NPE
499       */
500      public void testSetThreadFactoryNull() throws InterruptedException {
501 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
502 <        try {
503 <            p.setThreadFactory(null);
504 <            shouldThrow();
505 <        } catch (NullPointerException success) {
506 <        } finally {
494 <            joinPool(p);
501 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
502 >        try (PoolCleaner cleaner = cleaner(p)) {
503 >            try {
504 >                p.setThreadFactory(null);
505 >                shouldThrow();
506 >            } catch (NullPointerException success) {}
507          }
508      }
509  
# Line 500 | Line 512 | public class ScheduledExecutorTest exten
512       */
513      public void testIsShutdown() {
514  
515 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
515 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
516          try {
517              assertFalse(p.isShutdown());
518          }
# Line 515 | Line 527 | public class ScheduledExecutorTest exten
527       */
528      public void testIsTerminated() throws InterruptedException {
529          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
530 <        final CountDownLatch threadStarted = new CountDownLatch(1);
531 <        final CountDownLatch done = new CountDownLatch(1);
532 <        assertFalse(p.isTerminated());
533 <        try {
530 >        try (PoolCleaner cleaner = cleaner(p)) {
531 >            final CountDownLatch threadStarted = new CountDownLatch(1);
532 >            final CountDownLatch done = new CountDownLatch(1);
533 >            assertFalse(p.isTerminated());
534              p.execute(new CheckedRunnable() {
535                  public void realRun() throws InterruptedException {
536                      assertFalse(p.isTerminated());
537                      threadStarted.countDown();
538 <                    done.await();
538 >                    await(done);
539                  }});
540 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
540 >            await(threadStarted);
541              assertFalse(p.isTerminating());
542              done.countDown();
531        } finally {
543              try { p.shutdown(); } catch (SecurityException ok) { return; }
544 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
545 +            assertTrue(p.isTerminated());
546          }
534        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
535        assertTrue(p.isTerminated());
547      }
548  
549      /**
# Line 542 | Line 553 | public class ScheduledExecutorTest exten
553          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
554          final CountDownLatch threadStarted = new CountDownLatch(1);
555          final CountDownLatch done = new CountDownLatch(1);
556 <        try {
556 >        try (PoolCleaner cleaner = cleaner(p)) {
557              assertFalse(p.isTerminating());
558              p.execute(new CheckedRunnable() {
559                  public void realRun() throws InterruptedException {
560                      assertFalse(p.isTerminating());
561                      threadStarted.countDown();
562 <                    done.await();
562 >                    await(done);
563                  }});
564 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
564 >            await(threadStarted);
565              assertFalse(p.isTerminating());
566              done.countDown();
556        } finally {
567              try { p.shutdown(); } catch (SecurityException ok) { return; }
568 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
569 +            assertTrue(p.isTerminated());
570 +            assertFalse(p.isTerminating());
571          }
559        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
560        assertTrue(p.isTerminated());
561        assertFalse(p.isTerminating());
572      }
573  
574      /**
575       * getQueue returns the work queue, which contains queued tasks
576       */
577      public void testGetQueue() throws InterruptedException {
568        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
569        final CountDownLatch threadStarted = new CountDownLatch(1);
578          final CountDownLatch done = new CountDownLatch(1);
579 <        try {
579 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
580 >        try (PoolCleaner cleaner = cleaner(p, done)) {
581 >            final CountDownLatch threadStarted = new CountDownLatch(1);
582              ScheduledFuture[] tasks = new ScheduledFuture[5];
583              for (int i = 0; i < tasks.length; i++) {
584                  Runnable r = new CheckedRunnable() {
585                      public void realRun() throws InterruptedException {
586                          threadStarted.countDown();
587 <                        done.await();
587 >                        await(done);
588                      }};
589                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
590              }
591 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
591 >            await(threadStarted);
592              BlockingQueue<Runnable> q = p.getQueue();
593              assertTrue(q.contains(tasks[tasks.length - 1]));
594              assertFalse(q.contains(tasks[0]));
585        } finally {
586            done.countDown();
587            joinPool(p);
595          }
596      }
597  
# Line 592 | Line 599 | public class ScheduledExecutorTest exten
599       * remove(task) removes queued task, and fails to remove active task
600       */
601      public void testRemove() throws InterruptedException {
595        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
596        ScheduledFuture[] tasks = new ScheduledFuture[5];
597        final CountDownLatch threadStarted = new CountDownLatch(1);
602          final CountDownLatch done = new CountDownLatch(1);
603 <        try {
603 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
604 >        try (PoolCleaner cleaner = cleaner(p, done)) {
605 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
606 >            final CountDownLatch threadStarted = new CountDownLatch(1);
607              for (int i = 0; i < tasks.length; i++) {
608                  Runnable r = new CheckedRunnable() {
609                      public void realRun() throws InterruptedException {
610                          threadStarted.countDown();
611 <                        done.await();
611 >                        await(done);
612                      }};
613                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
614              }
615 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
615 >            await(threadStarted);
616              BlockingQueue<Runnable> q = p.getQueue();
617              assertFalse(p.remove((Runnable)tasks[0]));
618              assertTrue(q.contains((Runnable)tasks[4]));
# Line 616 | Line 623 | public class ScheduledExecutorTest exten
623              assertTrue(q.contains((Runnable)tasks[3]));
624              assertTrue(p.remove((Runnable)tasks[3]));
625              assertFalse(q.contains((Runnable)tasks[3]));
619        } finally {
620            done.countDown();
621            joinPool(p);
626          }
627      }
628  
# Line 626 | Line 630 | public class ScheduledExecutorTest exten
630       * purge eventually removes cancelled tasks from the queue
631       */
632      public void testPurge() throws InterruptedException {
633 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
634 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
635 <        for (int i = 0; i < tasks.length; i++)
636 <            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
637 <                                  LONG_DELAY_MS, MILLISECONDS);
638 <        try {
633 >        final ScheduledFuture[] tasks = new ScheduledFuture[5];
634 >        final Runnable releaser = new Runnable() { public void run() {
635 >            for (ScheduledFuture task : tasks)
636 >                if (task != null) task.cancel(true); }};
637 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
638 >        try (PoolCleaner cleaner = cleaner(p, releaser)) {
639 >            for (int i = 0; i < tasks.length; i++)
640 >                tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
641 >                                      LONG_DELAY_MS, MILLISECONDS);
642              int max = tasks.length;
643              if (tasks[4].cancel(true)) --max;
644              if (tasks[3].cancel(true)) --max;
# Line 643 | Line 650 | public class ScheduledExecutorTest exten
650                  long count = p.getTaskCount();
651                  if (count == max)
652                      return;
653 <            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
653 >            } while (millisElapsedSince(startTime) < LONG_DELAY_MS);
654              fail("Purge failed to remove cancelled tasks");
648        } finally {
649            for (ScheduledFuture task : tasks)
650                task.cancel(true);
651            joinPool(p);
655          }
656      }
657  
# Line 662 | Line 665 | public class ScheduledExecutorTest exten
665          final AtomicInteger ran = new AtomicInteger(0);
666          final ScheduledThreadPoolExecutor p =
667              new ScheduledThreadPoolExecutor(poolSize);
668 <        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
668 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
669          Runnable waiter = new CheckedRunnable() { public void realRun() {
670              threadsStarted.countDown();
671              try {
# Line 672 | Line 675 | public class ScheduledExecutorTest exten
675          }};
676          for (int i = 0; i < count; i++)
677              p.execute(waiter);
678 <        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
678 >        await(threadsStarted);
679          assertEquals(poolSize, p.getActiveCount());
680          assertEquals(0, p.getCompletedTaskCount());
681          final List<Runnable> queuedTasks;
# Line 695 | Line 698 | public class ScheduledExecutorTest exten
698       * and those tasks are drained from the queue
699       */
700      public void testShutdownNow_delayedTasks() throws InterruptedException {
701 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
701 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
702          List<ScheduledFuture> tasks = new ArrayList<>();
703          for (int i = 0; i < 3; i++) {
704              Runnable r = new NoOpRunnable();
# Line 822 | Line 825 | public class ScheduledExecutorTest exten
825       * completed submit of callable returns result
826       */
827      public void testSubmitCallable() throws Exception {
828 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
829 <        try {
828 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
829 >        try (PoolCleaner cleaner = cleaner(e)) {
830              Future<String> future = e.submit(new StringTask());
831              String result = future.get();
832              assertSame(TEST_STRING, result);
830        } finally {
831            joinPool(e);
833          }
834      }
835  
# Line 836 | Line 837 | public class ScheduledExecutorTest exten
837       * completed submit of runnable returns successfully
838       */
839      public void testSubmitRunnable() throws Exception {
840 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
841 <        try {
840 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
841 >        try (PoolCleaner cleaner = cleaner(e)) {
842              Future<?> future = e.submit(new NoOpRunnable());
843              future.get();
844              assertTrue(future.isDone());
844        } finally {
845            joinPool(e);
845          }
846      }
847  
# Line 850 | Line 849 | public class ScheduledExecutorTest exten
849       * completed submit of (runnable, result) returns result
850       */
851      public void testSubmitRunnable2() throws Exception {
852 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
853 <        try {
852 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
853 >        try (PoolCleaner cleaner = cleaner(e)) {
854              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
855              String result = future.get();
856              assertSame(TEST_STRING, result);
858        } finally {
859            joinPool(e);
857          }
858      }
859  
# Line 864 | Line 861 | public class ScheduledExecutorTest exten
861       * invokeAny(null) throws NPE
862       */
863      public void testInvokeAny1() throws Exception {
864 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
865 <        try {
866 <            e.invokeAny(null);
867 <            shouldThrow();
868 <        } catch (NullPointerException success) {
869 <        } finally {
873 <            joinPool(e);
864 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
865 >        try (PoolCleaner cleaner = cleaner(e)) {
866 >            try {
867 >                e.invokeAny(null);
868 >                shouldThrow();
869 >            } catch (NullPointerException success) {}
870          }
871      }
872  
# Line 878 | Line 874 | public class ScheduledExecutorTest exten
874       * invokeAny(empty collection) throws IAE
875       */
876      public void testInvokeAny2() throws Exception {
877 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
878 <        try {
879 <            e.invokeAny(new ArrayList<Callable<String>>());
880 <            shouldThrow();
881 <        } catch (IllegalArgumentException success) {
882 <        } finally {
887 <            joinPool(e);
877 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
878 >        try (PoolCleaner cleaner = cleaner(e)) {
879 >            try {
880 >                e.invokeAny(new ArrayList<Callable<String>>());
881 >                shouldThrow();
882 >            } catch (IllegalArgumentException success) {}
883          }
884      }
885  
# Line 893 | Line 888 | public class ScheduledExecutorTest exten
888       */
889      public void testInvokeAny3() throws Exception {
890          CountDownLatch latch = new CountDownLatch(1);
891 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
892 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
893 <        l.add(latchAwaitingStringTask(latch));
894 <        l.add(null);
895 <        try {
896 <            e.invokeAny(l);
897 <            shouldThrow();
898 <        } catch (NullPointerException success) {
899 <        } finally {
891 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
892 >        try (PoolCleaner cleaner = cleaner(e)) {
893 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
894 >            l.add(latchAwaitingStringTask(latch));
895 >            l.add(null);
896 >            try {
897 >                e.invokeAny(l);
898 >                shouldThrow();
899 >            } catch (NullPointerException success) {}
900              latch.countDown();
906            joinPool(e);
901          }
902      }
903  
# Line 911 | Line 905 | public class ScheduledExecutorTest exten
905       * invokeAny(c) throws ExecutionException if no task completes
906       */
907      public void testInvokeAny4() throws Exception {
908 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
909 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
910 <        l.add(new NPETask());
911 <        try {
912 <            e.invokeAny(l);
913 <            shouldThrow();
914 <        } catch (ExecutionException success) {
915 <            assertTrue(success.getCause() instanceof NullPointerException);
916 <        } finally {
917 <            joinPool(e);
908 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
909 >        try (PoolCleaner cleaner = cleaner(e)) {
910 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
911 >            l.add(new NPETask());
912 >            try {
913 >                e.invokeAny(l);
914 >                shouldThrow();
915 >            } catch (ExecutionException success) {
916 >                assertTrue(success.getCause() instanceof NullPointerException);
917 >            }
918          }
919      }
920  
# Line 928 | Line 922 | public class ScheduledExecutorTest exten
922       * invokeAny(c) returns result of some task
923       */
924      public void testInvokeAny5() throws Exception {
925 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
926 <        try {
925 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
926 >        try (PoolCleaner cleaner = cleaner(e)) {
927              List<Callable<String>> l = new ArrayList<Callable<String>>();
928              l.add(new StringTask());
929              l.add(new StringTask());
930              String result = e.invokeAny(l);
931              assertSame(TEST_STRING, result);
938        } finally {
939            joinPool(e);
932          }
933      }
934  
# Line 944 | Line 936 | public class ScheduledExecutorTest exten
936       * invokeAll(null) throws NPE
937       */
938      public void testInvokeAll1() throws Exception {
939 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
940 <        try {
941 <            e.invokeAll(null);
942 <            shouldThrow();
943 <        } catch (NullPointerException success) {
944 <        } finally {
953 <            joinPool(e);
939 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
940 >        try (PoolCleaner cleaner = cleaner(e)) {
941 >            try {
942 >                e.invokeAll(null);
943 >                shouldThrow();
944 >            } catch (NullPointerException success) {}
945          }
946      }
947  
# Line 958 | Line 949 | public class ScheduledExecutorTest exten
949       * invokeAll(empty collection) returns empty collection
950       */
951      public void testInvokeAll2() throws Exception {
952 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
953 <        try {
952 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
953 >        try (PoolCleaner cleaner = cleaner(e)) {
954              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
955              assertTrue(r.isEmpty());
965        } finally {
966            joinPool(e);
956          }
957      }
958  
# Line 971 | Line 960 | public class ScheduledExecutorTest exten
960       * invokeAll(c) throws NPE if c has null elements
961       */
962      public void testInvokeAll3() throws Exception {
963 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
964 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
965 <        l.add(new StringTask());
966 <        l.add(null);
967 <        try {
968 <            e.invokeAll(l);
969 <            shouldThrow();
970 <        } catch (NullPointerException success) {
971 <        } finally {
983 <            joinPool(e);
963 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
964 >        try (PoolCleaner cleaner = cleaner(e)) {
965 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
966 >            l.add(new StringTask());
967 >            l.add(null);
968 >            try {
969 >                e.invokeAll(l);
970 >                shouldThrow();
971 >            } catch (NullPointerException success) {}
972          }
973      }
974  
# Line 988 | Line 976 | public class ScheduledExecutorTest exten
976       * get of invokeAll(c) throws exception on failed task
977       */
978      public void testInvokeAll4() throws Exception {
979 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
980 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
981 <        l.add(new NPETask());
982 <        List<Future<String>> futures = e.invokeAll(l);
983 <        assertEquals(1, futures.size());
984 <        try {
985 <            futures.get(0).get();
986 <            shouldThrow();
987 <        } catch (ExecutionException success) {
988 <            assertTrue(success.getCause() instanceof NullPointerException);
989 <        } finally {
990 <            joinPool(e);
979 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
980 >        try (PoolCleaner cleaner = cleaner(e)) {
981 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
982 >            l.add(new NPETask());
983 >            List<Future<String>> futures = e.invokeAll(l);
984 >            assertEquals(1, futures.size());
985 >            try {
986 >                futures.get(0).get();
987 >                shouldThrow();
988 >            } catch (ExecutionException success) {
989 >                assertTrue(success.getCause() instanceof NullPointerException);
990 >            }
991          }
992      }
993  
# Line 1007 | Line 995 | public class ScheduledExecutorTest exten
995       * invokeAll(c) returns results of all completed tasks
996       */
997      public void testInvokeAll5() throws Exception {
998 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
999 <        try {
998 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
999 >        try (PoolCleaner cleaner = cleaner(e)) {
1000              List<Callable<String>> l = new ArrayList<Callable<String>>();
1001              l.add(new StringTask());
1002              l.add(new StringTask());
# Line 1016 | Line 1004 | public class ScheduledExecutorTest exten
1004              assertEquals(2, futures.size());
1005              for (Future<String> future : futures)
1006                  assertSame(TEST_STRING, future.get());
1019        } finally {
1020            joinPool(e);
1007          }
1008      }
1009  
# Line 1025 | Line 1011 | public class ScheduledExecutorTest exten
1011       * timed invokeAny(null) throws NPE
1012       */
1013      public void testTimedInvokeAny1() throws Exception {
1014 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1015 <        try {
1016 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1017 <            shouldThrow();
1018 <        } catch (NullPointerException success) {
1019 <        } finally {
1034 <            joinPool(e);
1014 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1015 >        try (PoolCleaner cleaner = cleaner(e)) {
1016 >            try {
1017 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1018 >                shouldThrow();
1019 >            } catch (NullPointerException success) {}
1020          }
1021      }
1022  
# Line 1039 | Line 1024 | public class ScheduledExecutorTest exten
1024       * timed invokeAny(,,null) throws NPE
1025       */
1026      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1027 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1028 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1029 <        l.add(new StringTask());
1030 <        try {
1031 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1032 <            shouldThrow();
1033 <        } catch (NullPointerException success) {
1034 <        } finally {
1050 <            joinPool(e);
1027 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1028 >        try (PoolCleaner cleaner = cleaner(e)) {
1029 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1030 >            l.add(new StringTask());
1031 >            try {
1032 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1033 >                shouldThrow();
1034 >            } catch (NullPointerException success) {}
1035          }
1036      }
1037  
# Line 1055 | Line 1039 | public class ScheduledExecutorTest exten
1039       * timed invokeAny(empty collection) throws IAE
1040       */
1041      public void testTimedInvokeAny2() throws Exception {
1042 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1043 <        try {
1044 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1045 <            shouldThrow();
1046 <        } catch (IllegalArgumentException success) {
1047 <        } finally {
1064 <            joinPool(e);
1042 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1043 >        try (PoolCleaner cleaner = cleaner(e)) {
1044 >            try {
1045 >                e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1046 >                shouldThrow();
1047 >            } catch (IllegalArgumentException success) {}
1048          }
1049      }
1050  
# Line 1070 | Line 1053 | public class ScheduledExecutorTest exten
1053       */
1054      public void testTimedInvokeAny3() throws Exception {
1055          CountDownLatch latch = new CountDownLatch(1);
1056 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1057 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1058 <        l.add(latchAwaitingStringTask(latch));
1059 <        l.add(null);
1060 <        try {
1061 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1062 <            shouldThrow();
1063 <        } catch (NullPointerException success) {
1064 <        } finally {
1056 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1057 >        try (PoolCleaner cleaner = cleaner(e)) {
1058 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1059 >            l.add(latchAwaitingStringTask(latch));
1060 >            l.add(null);
1061 >            try {
1062 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1063 >                shouldThrow();
1064 >            } catch (NullPointerException success) {}
1065              latch.countDown();
1083            joinPool(e);
1066          }
1067      }
1068  
# Line 1088 | Line 1070 | public class ScheduledExecutorTest exten
1070       * timed invokeAny(c) throws ExecutionException if no task completes
1071       */
1072      public void testTimedInvokeAny4() throws Exception {
1073 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1074 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1075 <        l.add(new NPETask());
1076 <        try {
1077 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1078 <            shouldThrow();
1079 <        } catch (ExecutionException success) {
1080 <            assertTrue(success.getCause() instanceof NullPointerException);
1081 <        } finally {
1082 <            joinPool(e);
1073 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1074 >        try (PoolCleaner cleaner = cleaner(e)) {
1075 >            long startTime = System.nanoTime();
1076 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1077 >            l.add(new NPETask());
1078 >            try {
1079 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1080 >                shouldThrow();
1081 >            } catch (ExecutionException success) {
1082 >                assertTrue(success.getCause() instanceof NullPointerException);
1083 >            }
1084 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1085          }
1086      }
1087  
# Line 1105 | Line 1089 | public class ScheduledExecutorTest exten
1089       * timed invokeAny(c) returns result of some task
1090       */
1091      public void testTimedInvokeAny5() throws Exception {
1092 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1093 <        try {
1092 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1093 >        try (PoolCleaner cleaner = cleaner(e)) {
1094 >            long startTime = System.nanoTime();
1095              List<Callable<String>> l = new ArrayList<Callable<String>>();
1096              l.add(new StringTask());
1097              l.add(new StringTask());
1098 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1098 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1099              assertSame(TEST_STRING, result);
1100 <        } finally {
1116 <            joinPool(e);
1100 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1101          }
1102      }
1103  
# Line 1121 | Line 1105 | public class ScheduledExecutorTest exten
1105       * timed invokeAll(null) throws NPE
1106       */
1107      public void testTimedInvokeAll1() throws Exception {
1108 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1109 <        try {
1110 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1111 <            shouldThrow();
1112 <        } catch (NullPointerException success) {
1113 <        } finally {
1130 <            joinPool(e);
1108 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1109 >        try (PoolCleaner cleaner = cleaner(e)) {
1110 >            try {
1111 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1112 >                shouldThrow();
1113 >            } catch (NullPointerException success) {}
1114          }
1115      }
1116  
# Line 1135 | Line 1118 | public class ScheduledExecutorTest exten
1118       * timed invokeAll(,,null) throws NPE
1119       */
1120      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1121 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1122 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1123 <        l.add(new StringTask());
1124 <        try {
1125 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1126 <            shouldThrow();
1127 <        } catch (NullPointerException success) {
1128 <        } finally {
1146 <            joinPool(e);
1121 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1122 >        try (PoolCleaner cleaner = cleaner(e)) {
1123 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1124 >            l.add(new StringTask());
1125 >            try {
1126 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1127 >                shouldThrow();
1128 >            } catch (NullPointerException success) {}
1129          }
1130      }
1131  
# Line 1151 | Line 1133 | public class ScheduledExecutorTest exten
1133       * timed invokeAll(empty collection) returns empty collection
1134       */
1135      public void testTimedInvokeAll2() throws Exception {
1136 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1137 <        try {
1138 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1136 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1137 >        try (PoolCleaner cleaner = cleaner(e)) {
1138 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1139 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1140              assertTrue(r.isEmpty());
1158        } finally {
1159            joinPool(e);
1141          }
1142      }
1143  
# Line 1164 | Line 1145 | public class ScheduledExecutorTest exten
1145       * timed invokeAll(c) throws NPE if c has null elements
1146       */
1147      public void testTimedInvokeAll3() throws Exception {
1148 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1149 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1150 <        l.add(new StringTask());
1151 <        l.add(null);
1152 <        try {
1153 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1154 <            shouldThrow();
1155 <        } catch (NullPointerException success) {
1156 <        } finally {
1176 <            joinPool(e);
1148 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1149 >        try (PoolCleaner cleaner = cleaner(e)) {
1150 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1151 >            l.add(new StringTask());
1152 >            l.add(null);
1153 >            try {
1154 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1155 >                shouldThrow();
1156 >            } catch (NullPointerException success) {}
1157          }
1158      }
1159  
# Line 1181 | Line 1161 | public class ScheduledExecutorTest exten
1161       * get of element of invokeAll(c) throws exception on failed task
1162       */
1163      public void testTimedInvokeAll4() throws Exception {
1164 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1165 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1166 <        l.add(new NPETask());
1167 <        List<Future<String>> futures =
1168 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1169 <        assertEquals(1, futures.size());
1170 <        try {
1171 <            futures.get(0).get();
1172 <            shouldThrow();
1173 <        } catch (ExecutionException success) {
1174 <            assertTrue(success.getCause() instanceof NullPointerException);
1175 <        } finally {
1176 <            joinPool(e);
1164 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1165 >        try (PoolCleaner cleaner = cleaner(e)) {
1166 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1167 >            l.add(new NPETask());
1168 >            List<Future<String>> futures =
1169 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1170 >            assertEquals(1, futures.size());
1171 >            try {
1172 >                futures.get(0).get();
1173 >                shouldThrow();
1174 >            } catch (ExecutionException success) {
1175 >                assertTrue(success.getCause() instanceof NullPointerException);
1176 >            }
1177          }
1178      }
1179  
# Line 1201 | Line 1181 | public class ScheduledExecutorTest exten
1181       * timed invokeAll(c) returns results of all completed tasks
1182       */
1183      public void testTimedInvokeAll5() throws Exception {
1184 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1185 <        try {
1184 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1185 >        try (PoolCleaner cleaner = cleaner(e)) {
1186              List<Callable<String>> l = new ArrayList<Callable<String>>();
1187              l.add(new StringTask());
1188              l.add(new StringTask());
1189              List<Future<String>> futures =
1190 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1190 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1191              assertEquals(2, futures.size());
1192              for (Future<String> future : futures)
1193                  assertSame(TEST_STRING, future.get());
1214        } finally {
1215            joinPool(e);
1194          }
1195      }
1196  
# Line 1220 | Line 1198 | public class ScheduledExecutorTest exten
1198       * timed invokeAll(c) cancels tasks not completed by timeout
1199       */
1200      public void testTimedInvokeAll6() throws Exception {
1201 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1202 <        try {
1203 <            for (long timeout = timeoutMillis();;) {
1201 >        for (long timeout = timeoutMillis();;) {
1202 >            final CountDownLatch done = new CountDownLatch(1);
1203 >            final Callable<String> waiter = new CheckedCallable<String>() {
1204 >                public String realCall() {
1205 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1206 >                    catch (InterruptedException ok) {}
1207 >                    return "1"; }};
1208 >            final ExecutorService p = new ScheduledThreadPoolExecutor(2);
1209 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1210                  List<Callable<String>> tasks = new ArrayList<>();
1211                  tasks.add(new StringTask("0"));
1212 <                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1212 >                tasks.add(waiter);
1213                  tasks.add(new StringTask("2"));
1214                  long startTime = System.nanoTime();
1215                  List<Future<String>> futures =
1216 <                    e.invokeAll(tasks, timeout, MILLISECONDS);
1216 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1217                  assertEquals(tasks.size(), futures.size());
1218                  assertTrue(millisElapsedSince(startTime) >= timeout);
1219                  for (Future future : futures)
# Line 1245 | Line 1229 | public class ScheduledExecutorTest exten
1229                          fail("expected exactly one task to be cancelled");
1230                  }
1231              }
1232 <        } finally {
1233 <            joinPool(e);
1232 >        }
1233 >    }
1234 >
1235 >    /**
1236 >     * A fixed delay task with overflowing period should not prevent a
1237 >     * one-shot task from executing.
1238 >     * https://bugs.openjdk.java.net/browse/JDK-8051859
1239 >     */
1240 >    public void testScheduleWithFixedDelay_overflow() throws Exception {
1241 >        final CountDownLatch delayedDone = new CountDownLatch(1);
1242 >        final CountDownLatch immediateDone = new CountDownLatch(1);
1243 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
1244 >        try (PoolCleaner cleaner = cleaner(p)) {
1245 >            final Runnable immediate = new Runnable() { public void run() {
1246 >                immediateDone.countDown();
1247 >            }};
1248 >            final Runnable delayed = new Runnable() { public void run() {
1249 >                delayedDone.countDown();
1250 >                p.submit(immediate);
1251 >            }};
1252 >            p.scheduleWithFixedDelay(delayed, 0L, Long.MAX_VALUE, SECONDS);
1253 >            await(delayedDone);
1254 >            await(immediateDone);
1255          }
1256      }
1257  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines