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

Comparing jsr166/src/test/tck/ScheduledExecutorSubclassTest.java (file contents):
Revision 1.29 by jsr166, Fri Jun 10 19:45:01 2011 UTC vs.
Revision 1.72 by jsr166, Fri Sep 6 18:43:35 2019 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 import junit.framework.*;
8 import java.util.*;
9 import java.util.concurrent.*;
7   import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
9 + import static java.util.concurrent.TimeUnit.SECONDS;
10 +
11 + import java.util.ArrayList;
12 + import java.util.Collection;
13 + import java.util.Collections;
14 + import java.util.HashSet;
15 + import java.util.List;
16 + import java.util.concurrent.BlockingQueue;
17 + import java.util.concurrent.Callable;
18 + import java.util.concurrent.CancellationException;
19 + import java.util.concurrent.CountDownLatch;
20 + import java.util.concurrent.Delayed;
21 + import java.util.concurrent.ExecutionException;
22 + import java.util.concurrent.ExecutorService;
23 + import java.util.concurrent.Future;
24 + import java.util.concurrent.RejectedExecutionException;
25 + import java.util.concurrent.RejectedExecutionHandler;
26 + import java.util.concurrent.RunnableScheduledFuture;
27 + import java.util.concurrent.ScheduledFuture;
28 + import java.util.concurrent.ScheduledThreadPoolExecutor;
29 + import java.util.concurrent.ThreadFactory;
30 + import java.util.concurrent.ThreadLocalRandom;
31 + import java.util.concurrent.ThreadPoolExecutor;
32 + import java.util.concurrent.TimeoutException;
33 + import java.util.concurrent.TimeUnit;
34 + import java.util.concurrent.atomic.AtomicBoolean;
35   import java.util.concurrent.atomic.AtomicInteger;
36 + import java.util.concurrent.atomic.AtomicLong;
37 + import java.util.stream.Stream;
38 +
39 + import junit.framework.Test;
40 + import junit.framework.TestSuite;
41  
42   public class ScheduledExecutorSubclassTest extends JSR166TestCase {
43      public static void main(String[] args) {
44 <        junit.textui.TestRunner.run(suite());
44 >        main(suite(), args);
45      }
46      public static Test suite() {
47          return new TestSuite(ScheduledExecutorSubclassTest.class);
48      }
49  
50      static class CustomTask<V> implements RunnableScheduledFuture<V> {
51 <        RunnableScheduledFuture<V> task;
51 >        private final RunnableScheduledFuture<V> task;
52          volatile boolean ran;
53 <        CustomTask(RunnableScheduledFuture<V> t) { task = t; }
53 >        CustomTask(RunnableScheduledFuture<V> task) { this.task = task; }
54          public boolean isPeriodic() { return task.isPeriodic(); }
55          public void run() {
56              ran = true;
# Line 36 | Line 65 | public class ScheduledExecutorSubclassTe
65          }
66          public boolean isCancelled() { return task.isCancelled(); }
67          public boolean isDone() { return task.isDone(); }
68 <        public V get() throws InterruptedException,  ExecutionException {
68 >        public V get() throws InterruptedException, ExecutionException {
69              V v = task.get();
70              assertTrue(ran);
71              return v;
72          }
73 <        public V get(long time, TimeUnit unit) throws InterruptedException,  ExecutionException, TimeoutException {
73 >        public V get(long time, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
74              V v = task.get(time, unit);
75              assertTrue(ran);
76              return v;
# Line 76 | Line 105 | public class ScheduledExecutorSubclassTe
105       * execute successfully executes a runnable
106       */
107      public void testExecute() throws InterruptedException {
108 <        CustomExecutor p = new CustomExecutor(1);
109 <        final CountDownLatch done = new CountDownLatch(1);
110 <        final Runnable task = new CheckedRunnable() {
111 <            public void realRun() {
112 <                done.countDown();
84 <            }};
85 <        try {
108 >        final CustomExecutor p = new CustomExecutor(1);
109 >        try (PoolCleaner cleaner = cleaner(p)) {
110 >            final CountDownLatch done = new CountDownLatch(1);
111 >            final Runnable task = new CheckedRunnable() {
112 >                public void realRun() { done.countDown(); }};
113              p.execute(task);
114 <            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
88 <        } finally {
89 <            joinPool(p);
114 >            await(done);
115          }
116      }
117  
# Line 94 | Line 119 | public class ScheduledExecutorSubclassTe
119       * delayed schedule of callable successfully executes after delay
120       */
121      public void testSchedule1() throws Exception {
97        CustomExecutor p = new CustomExecutor(1);
98        final long startTime = System.nanoTime();
122          final CountDownLatch done = new CountDownLatch(1);
123 <        try {
123 >        final CustomExecutor p = new CustomExecutor(1);
124 >        try (PoolCleaner cleaner = cleaner(p, done)) {
125 >            final long startTime = System.nanoTime();
126              Callable task = new CheckedCallable<Boolean>() {
127                  public Boolean realCall() {
128                      done.countDown();
# Line 107 | Line 132 | public class ScheduledExecutorSubclassTe
132              Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
133              assertSame(Boolean.TRUE, f.get());
134              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
110            assertTrue(done.await(0L, MILLISECONDS));
111        } finally {
112            joinPool(p);
135          }
136      }
137  
# Line 117 | Line 139 | public class ScheduledExecutorSubclassTe
139       * delayed schedule of runnable successfully executes after delay
140       */
141      public void testSchedule3() throws Exception {
142 <        CustomExecutor p = new CustomExecutor(1);
143 <        final long startTime = System.nanoTime();
144 <        final CountDownLatch done = new CountDownLatch(1);
145 <        try {
142 >        final CustomExecutor p = new CustomExecutor(1);
143 >        try (PoolCleaner cleaner = cleaner(p)) {
144 >            final long startTime = System.nanoTime();
145 >            final CountDownLatch done = new CountDownLatch(1);
146              Runnable task = new CheckedRunnable() {
147                  public void realRun() {
148                      done.countDown();
# Line 130 | Line 152 | public class ScheduledExecutorSubclassTe
152              await(done);
153              assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
154              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
133        } finally {
134            joinPool(p);
155          }
156      }
157  
# Line 139 | Line 159 | public class ScheduledExecutorSubclassTe
159       * scheduleAtFixedRate executes runnable after given initial delay
160       */
161      public void testSchedule4() throws InterruptedException {
162 <        CustomExecutor p = new CustomExecutor(1);
163 <        final long startTime = System.nanoTime();
164 <        final CountDownLatch done = new CountDownLatch(1);
165 <        try {
162 >        final CustomExecutor p = new CustomExecutor(1);
163 >        try (PoolCleaner cleaner = cleaner(p)) {
164 >            final long startTime = System.nanoTime();
165 >            final CountDownLatch done = new CountDownLatch(1);
166              Runnable task = new CheckedRunnable() {
167                  public void realRun() {
168                      done.countDown();
# Line 154 | Line 174 | public class ScheduledExecutorSubclassTe
174              await(done);
175              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
176              f.cancel(true);
157        } finally {
158            joinPool(p);
177          }
178      }
179  
# Line 163 | Line 181 | public class ScheduledExecutorSubclassTe
181       * scheduleWithFixedDelay executes runnable after given initial delay
182       */
183      public void testSchedule5() throws InterruptedException {
184 <        CustomExecutor p = new CustomExecutor(1);
185 <        final long startTime = System.nanoTime();
186 <        final CountDownLatch done = new CountDownLatch(1);
187 <        try {
184 >        final CustomExecutor p = new CustomExecutor(1);
185 >        try (PoolCleaner cleaner = cleaner(p)) {
186 >            final long startTime = System.nanoTime();
187 >            final CountDownLatch done = new CountDownLatch(1);
188              Runnable task = new CheckedRunnable() {
189                  public void realRun() {
190                      done.countDown();
# Line 178 | Line 196 | public class ScheduledExecutorSubclassTe
196              await(done);
197              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
198              f.cancel(true);
181        } finally {
182            joinPool(p);
199          }
200      }
201  
# Line 189 | Line 205 | public class ScheduledExecutorSubclassTe
205      }
206  
207      /**
208 <     * scheduleAtFixedRate executes series of tasks at given rate
208 >     * scheduleAtFixedRate executes series of tasks at given rate.
209 >     * Eventually, it must hold that:
210 >     *   cycles - 1 <= elapsedMillis/delay < cycles
211       */
212      public void testFixedRateSequence() throws InterruptedException {
213 <        CustomExecutor p = new CustomExecutor(1);
214 <        RunnableCounter counter = new RunnableCounter();
215 <        ScheduledFuture h =
216 <            p.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
217 <        delay(SMALL_DELAY_MS);
218 <        h.cancel(true);
219 <        int c = counter.count.get();
220 <        // By time scaling conventions, we must have at least
221 <        // an execution per SHORT delay, but no more than one SHORT more
222 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
223 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
224 <        joinPool(p);
213 >        final CustomExecutor p = new CustomExecutor(1);
214 >        try (PoolCleaner cleaner = cleaner(p)) {
215 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
216 >                final long startTime = System.nanoTime();
217 >                final int cycles = 8;
218 >                final CountDownLatch done = new CountDownLatch(cycles);
219 >                final Runnable task = new CheckedRunnable() {
220 >                    public void realRun() { done.countDown(); }};
221 >                final ScheduledFuture periodicTask =
222 >                    p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
223 >                final int totalDelayMillis = (cycles - 1) * delay;
224 >                await(done, totalDelayMillis + LONG_DELAY_MS);
225 >                periodicTask.cancel(true);
226 >                final long elapsedMillis = millisElapsedSince(startTime);
227 >                assertTrue(elapsedMillis >= totalDelayMillis);
228 >                if (elapsedMillis <= cycles * delay)
229 >                    return;
230 >                // else retry with longer delay
231 >            }
232 >            fail("unexpected execution rate");
233 >        }
234      }
235  
236      /**
237 <     * scheduleWithFixedDelay executes series of tasks with given period
237 >     * scheduleWithFixedDelay executes series of tasks with given period.
238 >     * Eventually, it must hold that each task starts at least delay and at
239 >     * most 2 * delay after the termination of the previous task.
240       */
241      public void testFixedDelaySequence() throws InterruptedException {
242 <        CustomExecutor p = new CustomExecutor(1);
243 <        RunnableCounter counter = new RunnableCounter();
244 <        ScheduledFuture h =
245 <            p.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
246 <        delay(SMALL_DELAY_MS);
247 <        h.cancel(true);
248 <        int c = counter.count.get();
249 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
250 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
251 <        joinPool(p);
252 <    }
253 <
254 <    /**
255 <     * execute(null) throws NPE
256 <     */
257 <    public void testExecuteNull() throws InterruptedException {
258 <        CustomExecutor se = new CustomExecutor(1);
259 <        try {
260 <            se.execute(null);
261 <            shouldThrow();
262 <        } catch (NullPointerException success) {}
263 <        joinPool(se);
242 >        final CustomExecutor p = new CustomExecutor(1);
243 >        try (PoolCleaner cleaner = cleaner(p)) {
244 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
245 >                final long startTime = System.nanoTime();
246 >                final AtomicLong previous = new AtomicLong(startTime);
247 >                final AtomicBoolean tryLongerDelay = new AtomicBoolean(false);
248 >                final int cycles = 8;
249 >                final CountDownLatch done = new CountDownLatch(cycles);
250 >                final int d = delay;
251 >                final Runnable task = new CheckedRunnable() {
252 >                    public void realRun() {
253 >                        long now = System.nanoTime();
254 >                        long elapsedMillis
255 >                            = NANOSECONDS.toMillis(now - previous.get());
256 >                        if (done.getCount() == cycles) { // first execution
257 >                            if (elapsedMillis >= d)
258 >                                tryLongerDelay.set(true);
259 >                        } else {
260 >                            assertTrue(elapsedMillis >= d);
261 >                            if (elapsedMillis >= 2 * d)
262 >                                tryLongerDelay.set(true);
263 >                        }
264 >                        previous.set(now);
265 >                        done.countDown();
266 >                    }};
267 >                final ScheduledFuture periodicTask =
268 >                    p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
269 >                final int totalDelayMillis = (cycles - 1) * delay;
270 >                await(done, totalDelayMillis + cycles * LONG_DELAY_MS);
271 >                periodicTask.cancel(true);
272 >                final long elapsedMillis = millisElapsedSince(startTime);
273 >                assertTrue(elapsedMillis >= totalDelayMillis);
274 >                if (!tryLongerDelay.get())
275 >                    return;
276 >                // else retry with longer delay
277 >            }
278 >            fail("unexpected execution rate");
279 >        }
280      }
281  
282      /**
283 <     * schedule(null) throws NPE
283 >     * Submitting null tasks throws NullPointerException
284       */
285 <    public void testScheduleNull() throws InterruptedException {
286 <        CustomExecutor se = new CustomExecutor(1);
287 <        try {
288 <            TrackedCallable callable = null;
289 <            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
245 <            shouldThrow();
246 <        } catch (NullPointerException success) {}
247 <        joinPool(se);
285 >    public void testNullTaskSubmission() {
286 >        final CustomExecutor p = new CustomExecutor(1);
287 >        try (PoolCleaner cleaner = cleaner(p)) {
288 >            assertNullTaskSubmissionThrowsNullPointerException(p);
289 >        }
290      }
291  
292      /**
293 <     * execute throws RejectedExecutionException if shutdown
293 >     * Submitted tasks are rejected when shutdown
294       */
295 <    public void testSchedule1_RejectedExecutionException() {
296 <        CustomExecutor se = new CustomExecutor(1);
297 <        try {
298 <            se.shutdown();
299 <            se.schedule(new NoOpRunnable(),
300 <                        MEDIUM_DELAY_MS, MILLISECONDS);
301 <            shouldThrow();
302 <        } catch (RejectedExecutionException success) {
303 <        } catch (SecurityException ok) {
304 <        }
295 >    public void testSubmittedTasksRejectedWhenShutdown() throws InterruptedException {
296 >        final CustomExecutor p = new CustomExecutor(2);
297 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
298 >        final CountDownLatch threadsStarted = new CountDownLatch(p.getCorePoolSize());
299 >        final CountDownLatch done = new CountDownLatch(1);
300 >        final Runnable r = () -> {
301 >            threadsStarted.countDown();
302 >            for (;;) {
303 >                try {
304 >                    done.await();
305 >                    return;
306 >                } catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
307 >            }};
308 >        final Callable<Boolean> c = () -> {
309 >            threadsStarted.countDown();
310 >            for (;;) {
311 >                try {
312 >                    done.await();
313 >                    return Boolean.TRUE;
314 >                } catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
315 >            }};
316  
317 <        joinPool(se);
318 <    }
317 >        try (PoolCleaner cleaner = cleaner(p, done)) {
318 >            for (int i = p.getCorePoolSize(); i--> 0; ) {
319 >                switch (rnd.nextInt(4)) {
320 >                case 0: p.execute(r); break;
321 >                case 1: assertFalse(p.submit(r).isDone()); break;
322 >                case 2: assertFalse(p.submit(r, Boolean.TRUE).isDone()); break;
323 >                case 3: assertFalse(p.submit(c).isDone()); break;
324 >                }
325 >            }
326  
327 <    /**
328 <     * schedule throws RejectedExecutionException if shutdown
269 <     */
270 <    public void testSchedule2_RejectedExecutionException() {
271 <        CustomExecutor se = new CustomExecutor(1);
272 <        try {
273 <            se.shutdown();
274 <            se.schedule(new NoOpCallable(),
275 <                        MEDIUM_DELAY_MS, MILLISECONDS);
276 <            shouldThrow();
277 <        } catch (RejectedExecutionException success) {
278 <        } catch (SecurityException ok) {
279 <        }
280 <        joinPool(se);
281 <    }
327 >            // ScheduledThreadPoolExecutor has an unbounded queue, so never saturated.
328 >            await(threadsStarted);
329  
330 <    /**
331 <     * schedule callable throws RejectedExecutionException if shutdown
332 <     */
333 <    public void testSchedule3_RejectedExecutionException() {
334 <        CustomExecutor se = new CustomExecutor(1);
335 <        try {
336 <            se.shutdown();
290 <            se.schedule(new NoOpCallable(),
291 <                        MEDIUM_DELAY_MS, MILLISECONDS);
292 <            shouldThrow();
293 <        } catch (RejectedExecutionException success) {
294 <        } catch (SecurityException ok) {
295 <        }
296 <        joinPool(se);
297 <    }
330 >            if (rnd.nextBoolean())
331 >                p.shutdownNow();
332 >            else
333 >                p.shutdown();
334 >            // Pool is shutdown, but not yet terminated
335 >            assertTaskSubmissionsAreRejected(p);
336 >            assertFalse(p.isTerminated());
337  
338 <    /**
339 <     * scheduleAtFixedRate throws RejectedExecutionException if shutdown
301 <     */
302 <    public void testScheduleAtFixedRate1_RejectedExecutionException() {
303 <        CustomExecutor se = new CustomExecutor(1);
304 <        try {
305 <            se.shutdown();
306 <            se.scheduleAtFixedRate(new NoOpRunnable(),
307 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
308 <            shouldThrow();
309 <        } catch (RejectedExecutionException success) {
310 <        } catch (SecurityException ok) {
311 <        }
312 <        joinPool(se);
313 <    }
338 >            done.countDown();   // release blocking tasks
339 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
340  
341 <    /**
316 <     * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
317 <     */
318 <    public void testScheduleWithFixedDelay1_RejectedExecutionException() {
319 <        CustomExecutor se = new CustomExecutor(1);
320 <        try {
321 <            se.shutdown();
322 <            se.scheduleWithFixedDelay(new NoOpRunnable(),
323 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
324 <            shouldThrow();
325 <        } catch (RejectedExecutionException success) {
326 <        } catch (SecurityException ok) {
341 >            assertTaskSubmissionsAreRejected(p);
342          }
343 <        joinPool(se);
343 >        assertEquals(p.getCorePoolSize(), p.getCompletedTaskCount());
344      }
345  
346      /**
# Line 333 | Line 348 | public class ScheduledExecutorSubclassTe
348       * thread becomes active
349       */
350      public void testGetActiveCount() throws InterruptedException {
336        final ThreadPoolExecutor p = new CustomExecutor(2);
337        final CountDownLatch threadStarted = new CountDownLatch(1);
351          final CountDownLatch done = new CountDownLatch(1);
352 <        try {
352 >        final ThreadPoolExecutor p = new CustomExecutor(2);
353 >        try (PoolCleaner cleaner = cleaner(p, done)) {
354 >            final CountDownLatch threadStarted = new CountDownLatch(1);
355              assertEquals(0, p.getActiveCount());
356              p.execute(new CheckedRunnable() {
357                  public void realRun() throws InterruptedException {
358                      threadStarted.countDown();
359                      assertEquals(1, p.getActiveCount());
360 <                    done.await();
360 >                    await(done);
361                  }});
362 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
362 >            await(threadStarted);
363              assertEquals(1, p.getActiveCount());
349        } finally {
350            done.countDown();
351            joinPool(p);
364          }
365      }
366  
# Line 358 | Line 370 | public class ScheduledExecutorSubclassTe
370       */
371      public void testGetCompletedTaskCount() throws InterruptedException {
372          final ThreadPoolExecutor p = new CustomExecutor(2);
373 <        final CountDownLatch threadStarted = new CountDownLatch(1);
374 <        final CountDownLatch threadProceed = new CountDownLatch(1);
375 <        final CountDownLatch threadDone = new CountDownLatch(1);
376 <        try {
373 >        try (PoolCleaner cleaner = cleaner(p)) {
374 >            final CountDownLatch threadStarted = new CountDownLatch(1);
375 >            final CountDownLatch threadProceed = new CountDownLatch(1);
376 >            final CountDownLatch threadDone = new CountDownLatch(1);
377              assertEquals(0, p.getCompletedTaskCount());
378              p.execute(new CheckedRunnable() {
379                  public void realRun() throws InterruptedException {
380                      threadStarted.countDown();
381                      assertEquals(0, p.getCompletedTaskCount());
382 <                    threadProceed.await();
382 >                    await(threadProceed);
383                      threadDone.countDown();
384                  }});
385              await(threadStarted);
386              assertEquals(0, p.getCompletedTaskCount());
387              threadProceed.countDown();
388 <            threadDone.await();
388 >            await(threadDone);
389              long startTime = System.nanoTime();
390              while (p.getCompletedTaskCount() != 1) {
391                  if (millisElapsedSince(startTime) > LONG_DELAY_MS)
392                      fail("timed out");
393                  Thread.yield();
394              }
383        } finally {
384            joinPool(p);
395          }
396      }
397  
# Line 389 | Line 399 | public class ScheduledExecutorSubclassTe
399       * getCorePoolSize returns size given in constructor if not otherwise set
400       */
401      public void testGetCorePoolSize() {
402 <        CustomExecutor p = new CustomExecutor(1);
403 <        assertEquals(1, p.getCorePoolSize());
404 <        joinPool(p);
402 >        final CustomExecutor p = new CustomExecutor(1);
403 >        try (PoolCleaner cleaner = cleaner(p)) {
404 >            assertEquals(1, p.getCorePoolSize());
405 >        }
406      }
407  
408      /**
# Line 400 | Line 411 | public class ScheduledExecutorSubclassTe
411       */
412      public void testGetLargestPoolSize() throws InterruptedException {
413          final int THREADS = 3;
403        final ThreadPoolExecutor p = new CustomExecutor(THREADS);
404        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
414          final CountDownLatch done = new CountDownLatch(1);
415 <        try {
415 >        final ThreadPoolExecutor p = new CustomExecutor(THREADS);
416 >        try (PoolCleaner cleaner = cleaner(p, done)) {
417 >            final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
418              assertEquals(0, p.getLargestPoolSize());
419              for (int i = 0; i < THREADS; i++)
420                  p.execute(new CheckedRunnable() {
421                      public void realRun() throws InterruptedException {
422                          threadsStarted.countDown();
423 <                        done.await();
423 >                        await(done);
424                          assertEquals(THREADS, p.getLargestPoolSize());
425                      }});
426 <            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
416 <            assertEquals(THREADS, p.getLargestPoolSize());
417 <        } finally {
418 <            done.countDown();
419 <            joinPool(p);
426 >            await(threadsStarted);
427              assertEquals(THREADS, p.getLargestPoolSize());
428          }
429 +        assertEquals(THREADS, p.getLargestPoolSize());
430      }
431  
432      /**
# Line 426 | Line 434 | public class ScheduledExecutorSubclassTe
434       * become active
435       */
436      public void testGetPoolSize() throws InterruptedException {
429        final ThreadPoolExecutor p = new CustomExecutor(1);
430        final CountDownLatch threadStarted = new CountDownLatch(1);
437          final CountDownLatch done = new CountDownLatch(1);
438 <        try {
438 >        final ThreadPoolExecutor p = new CustomExecutor(1);
439 >        try (PoolCleaner cleaner = cleaner(p, done)) {
440 >            final CountDownLatch threadStarted = new CountDownLatch(1);
441              assertEquals(0, p.getPoolSize());
442              p.execute(new CheckedRunnable() {
443                  public void realRun() throws InterruptedException {
444                      threadStarted.countDown();
445                      assertEquals(1, p.getPoolSize());
446 <                    done.await();
446 >                    await(done);
447                  }});
448 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
448 >            await(threadStarted);
449              assertEquals(1, p.getPoolSize());
442        } finally {
443            done.countDown();
444            joinPool(p);
450          }
451      }
452  
# Line 450 | Line 455 | public class ScheduledExecutorSubclassTe
455       * submitted
456       */
457      public void testGetTaskCount() throws InterruptedException {
458 <        final ThreadPoolExecutor p = new CustomExecutor(1);
454 <        final CountDownLatch threadStarted = new CountDownLatch(1);
458 >        final int TASKS = 3;
459          final CountDownLatch done = new CountDownLatch(1);
460 <        final int TASKS = 5;
461 <        try {
460 >        final ThreadPoolExecutor p = new CustomExecutor(1);
461 >        try (PoolCleaner cleaner = cleaner(p, done)) {
462 >            final CountDownLatch threadStarted = new CountDownLatch(1);
463              assertEquals(0, p.getTaskCount());
464 <            for (int i = 0; i < TASKS; i++)
464 >            assertEquals(0, p.getCompletedTaskCount());
465 >            p.execute(new CheckedRunnable() {
466 >                public void realRun() throws InterruptedException {
467 >                    threadStarted.countDown();
468 >                    await(done);
469 >                }});
470 >            await(threadStarted);
471 >            assertEquals(1, p.getTaskCount());
472 >            assertEquals(0, p.getCompletedTaskCount());
473 >            for (int i = 0; i < TASKS; i++) {
474 >                assertEquals(1 + i, p.getTaskCount());
475                  p.execute(new CheckedRunnable() {
476                      public void realRun() throws InterruptedException {
477                          threadStarted.countDown();
478 <                        done.await();
478 >                        assertEquals(1 + TASKS, p.getTaskCount());
479 >                        await(done);
480                      }});
481 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
482 <            assertEquals(TASKS, p.getTaskCount());
483 <        } finally {
468 <            done.countDown();
469 <            joinPool(p);
481 >            }
482 >            assertEquals(1 + TASKS, p.getTaskCount());
483 >            assertEquals(0, p.getCompletedTaskCount());
484          }
485 +        assertEquals(1 + TASKS, p.getTaskCount());
486 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
487      }
488  
489      /**
490       * getThreadFactory returns factory in constructor if not set
491       */
492      public void testGetThreadFactory() {
493 <        ThreadFactory tf = new SimpleThreadFactory();
494 <        CustomExecutor p = new CustomExecutor(1, tf);
495 <        assertSame(tf, p.getThreadFactory());
496 <        joinPool(p);
493 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
494 >        final CustomExecutor p = new CustomExecutor(1, threadFactory);
495 >        try (PoolCleaner cleaner = cleaner(p)) {
496 >            assertSame(threadFactory, p.getThreadFactory());
497 >        }
498      }
499  
500      /**
501       * setThreadFactory sets the thread factory returned by getThreadFactory
502       */
503      public void testSetThreadFactory() {
504 <        ThreadFactory tf = new SimpleThreadFactory();
505 <        CustomExecutor p = new CustomExecutor(1);
506 <        p.setThreadFactory(tf);
507 <        assertSame(tf, p.getThreadFactory());
508 <        joinPool(p);
504 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
505 >        final CustomExecutor p = new CustomExecutor(1);
506 >        try (PoolCleaner cleaner = cleaner(p)) {
507 >            p.setThreadFactory(threadFactory);
508 >            assertSame(threadFactory, p.getThreadFactory());
509 >        }
510      }
511  
512      /**
513       * setThreadFactory(null) throws NPE
514       */
515      public void testSetThreadFactoryNull() {
516 <        CustomExecutor p = new CustomExecutor(1);
517 <        try {
518 <            p.setThreadFactory(null);
519 <            shouldThrow();
520 <        } catch (NullPointerException success) {
521 <        } finally {
504 <            joinPool(p);
516 >        final CustomExecutor p = new CustomExecutor(1);
517 >        try (PoolCleaner cleaner = cleaner(p)) {
518 >            try {
519 >                p.setThreadFactory(null);
520 >                shouldThrow();
521 >            } catch (NullPointerException success) {}
522          }
523      }
524  
# Line 509 | Line 526 | public class ScheduledExecutorSubclassTe
526       * isShutdown is false before shutdown, true after
527       */
528      public void testIsShutdown() {
529 <        CustomExecutor p = new CustomExecutor(1);
530 <        try {
529 >        final CustomExecutor p = new CustomExecutor(1);
530 >        try (PoolCleaner cleaner = cleaner(p)) {
531              assertFalse(p.isShutdown());
515        }
516        finally {
532              try { p.shutdown(); } catch (SecurityException ok) { return; }
533 +            assertTrue(p.isShutdown());
534          }
519        assertTrue(p.isShutdown());
535      }
536  
537      /**
538       * isTerminated is false before termination, true after
539       */
540      public void testIsTerminated() throws InterruptedException {
526        final ThreadPoolExecutor p = new CustomExecutor(1);
527        final CountDownLatch threadStarted = new CountDownLatch(1);
541          final CountDownLatch done = new CountDownLatch(1);
542 <        assertFalse(p.isTerminated());
543 <        try {
542 >        final ThreadPoolExecutor p = new CustomExecutor(1);
543 >        try (PoolCleaner cleaner = cleaner(p)) {
544 >            final CountDownLatch threadStarted = new CountDownLatch(1);
545              p.execute(new CheckedRunnable() {
546                  public void realRun() throws InterruptedException {
547                      assertFalse(p.isTerminated());
548                      threadStarted.countDown();
549 <                    done.await();
549 >                    await(done);
550                  }});
551 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
551 >            await(threadStarted);
552 >            assertFalse(p.isTerminated());
553              assertFalse(p.isTerminating());
554              done.countDown();
540        } finally {
555              try { p.shutdown(); } catch (SecurityException ok) { return; }
556 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
557 +            assertTrue(p.isTerminated());
558          }
543        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
544        assertTrue(p.isTerminated());
559      }
560  
561      /**
562       * isTerminating is not true when running or when terminated
563       */
564      public void testIsTerminating() throws InterruptedException {
551        final ThreadPoolExecutor p = new CustomExecutor(1);
552        final CountDownLatch threadStarted = new CountDownLatch(1);
565          final CountDownLatch done = new CountDownLatch(1);
566 <        try {
566 >        final ThreadPoolExecutor p = new CustomExecutor(1);
567 >        try (PoolCleaner cleaner = cleaner(p)) {
568 >            final CountDownLatch threadStarted = new CountDownLatch(1);
569              assertFalse(p.isTerminating());
570              p.execute(new CheckedRunnable() {
571                  public void realRun() throws InterruptedException {
572                      assertFalse(p.isTerminating());
573                      threadStarted.countDown();
574 <                    done.await();
574 >                    await(done);
575                  }});
576 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
576 >            await(threadStarted);
577              assertFalse(p.isTerminating());
578              done.countDown();
565        } finally {
579              try { p.shutdown(); } catch (SecurityException ok) { return; }
580 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
581 +            assertTrue(p.isTerminated());
582 +            assertFalse(p.isTerminating());
583          }
568        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
569        assertTrue(p.isTerminated());
570        assertFalse(p.isTerminating());
584      }
585  
586      /**
587       * getQueue returns the work queue, which contains queued tasks
588       */
589      public void testGetQueue() throws InterruptedException {
577        ScheduledThreadPoolExecutor p = new CustomExecutor(1);
578        final CountDownLatch threadStarted = new CountDownLatch(1);
590          final CountDownLatch done = new CountDownLatch(1);
591 <        try {
591 >        final ScheduledThreadPoolExecutor p = new CustomExecutor(1);
592 >        try (PoolCleaner cleaner = cleaner(p, done)) {
593 >            final CountDownLatch threadStarted = new CountDownLatch(1);
594              ScheduledFuture[] tasks = new ScheduledFuture[5];
595              for (int i = 0; i < tasks.length; i++) {
596                  Runnable r = new CheckedRunnable() {
597                      public void realRun() throws InterruptedException {
598                          threadStarted.countDown();
599 <                        done.await();
599 >                        await(done);
600                      }};
601                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
602              }
603 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
603 >            await(threadStarted);
604              BlockingQueue<Runnable> q = p.getQueue();
605              assertTrue(q.contains(tasks[tasks.length - 1]));
606              assertFalse(q.contains(tasks[0]));
594        } finally {
595            done.countDown();
596            joinPool(p);
607          }
608      }
609  
# Line 601 | Line 611 | public class ScheduledExecutorSubclassTe
611       * remove(task) removes queued task, and fails to remove active task
612       */
613      public void testRemove() throws InterruptedException {
604        final ScheduledThreadPoolExecutor p = new CustomExecutor(1);
605        ScheduledFuture[] tasks = new ScheduledFuture[5];
606        final CountDownLatch threadStarted = new CountDownLatch(1);
614          final CountDownLatch done = new CountDownLatch(1);
615 <        try {
615 >        final ScheduledThreadPoolExecutor p = new CustomExecutor(1);
616 >        try (PoolCleaner cleaner = cleaner(p, done)) {
617 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
618 >            final CountDownLatch threadStarted = new CountDownLatch(1);
619              for (int i = 0; i < tasks.length; i++) {
620                  Runnable r = new CheckedRunnable() {
621                      public void realRun() throws InterruptedException {
622                          threadStarted.countDown();
623 <                        done.await();
623 >                        await(done);
624                      }};
625                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
626              }
627 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
627 >            await(threadStarted);
628              BlockingQueue<Runnable> q = p.getQueue();
629              assertFalse(p.remove((Runnable)tasks[0]));
630              assertTrue(q.contains((Runnable)tasks[4]));
# Line 625 | Line 635 | public class ScheduledExecutorSubclassTe
635              assertTrue(q.contains((Runnable)tasks[3]));
636              assertTrue(p.remove((Runnable)tasks[3]));
637              assertFalse(q.contains((Runnable)tasks[3]));
628        } finally {
629            done.countDown();
630            joinPool(p);
638          }
639      }
640  
# Line 635 | Line 642 | public class ScheduledExecutorSubclassTe
642       * purge removes cancelled tasks from the queue
643       */
644      public void testPurge() throws InterruptedException {
645 <        CustomExecutor p = new CustomExecutor(1);
646 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
647 <        for (int i = 0; i < tasks.length; i++)
648 <            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
649 <                                  LONG_DELAY_MS, MILLISECONDS);
650 <        try {
645 >        final ScheduledFuture[] tasks = new ScheduledFuture[5];
646 >        final Runnable releaser = new Runnable() { public void run() {
647 >            for (ScheduledFuture task : tasks)
648 >                if (task != null) task.cancel(true); }};
649 >        final CustomExecutor p = new CustomExecutor(1);
650 >        try (PoolCleaner cleaner = cleaner(p, releaser)) {
651 >            for (int i = 0; i < tasks.length; i++)
652 >                tasks[i] = p.schedule(possiblyInterruptedRunnable(SMALL_DELAY_MS),
653 >                                      LONG_DELAY_MS, MILLISECONDS);
654              int max = tasks.length;
655              if (tasks[4].cancel(true)) --max;
656              if (tasks[3].cancel(true)) --max;
# Line 652 | Line 662 | public class ScheduledExecutorSubclassTe
662                  long count = p.getTaskCount();
663                  if (count == max)
664                      return;
665 <            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
665 >            } while (millisElapsedSince(startTime) < LONG_DELAY_MS);
666              fail("Purge failed to remove cancelled tasks");
657        } finally {
658            for (ScheduledFuture task : tasks)
659                task.cancel(true);
660            joinPool(p);
667          }
668      }
669  
670      /**
671 <     * shutdownNow returns a list containing tasks that were not run
671 >     * shutdownNow returns a list containing tasks that were not run,
672 >     * and those tasks are drained from the queue
673       */
674 <    public void testShutdownNow() {
675 <        CustomExecutor p = new CustomExecutor(1);
676 <        for (int i = 0; i < 5; i++)
677 <            p.schedule(new SmallPossiblyInterruptedRunnable(),
678 <                       LONG_DELAY_MS, MILLISECONDS);
674 >    public void testShutdownNow() throws InterruptedException {
675 >        final int poolSize = 2;
676 >        final int count = 5;
677 >        final AtomicInteger ran = new AtomicInteger(0);
678 >        final CustomExecutor p = new CustomExecutor(poolSize);
679 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
680 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
681 >            threadsStarted.countDown();
682 >            try {
683 >                MILLISECONDS.sleep(LONGER_DELAY_MS);
684 >            } catch (InterruptedException success) {}
685 >            ran.getAndIncrement();
686 >        }};
687 >        for (int i = 0; i < count; i++)
688 >            p.execute(waiter);
689 >        await(threadsStarted);
690 >        assertEquals(poolSize, p.getActiveCount());
691 >        assertEquals(0, p.getCompletedTaskCount());
692 >        final List<Runnable> queuedTasks;
693          try {
694 <            List<Runnable> l = p.shutdownNow();
674 <            assertTrue(p.isShutdown());
675 <            assertEquals(5, l.size());
694 >            queuedTasks = p.shutdownNow();
695          } catch (SecurityException ok) {
696 <            // Allowed in case test doesn't have privs
678 <        } finally {
679 <            joinPool(p);
696 >            return; // Allowed in case test doesn't have privs
697          }
698 +        assertTrue(p.isShutdown());
699 +        assertTrue(p.getQueue().isEmpty());
700 +        assertEquals(count - poolSize, queuedTasks.size());
701 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
702 +        assertTrue(p.isTerminated());
703 +        assertEquals(poolSize, ran.get());
704 +        assertEquals(poolSize, p.getCompletedTaskCount());
705      }
706  
707      /**
708 <     * In default setting, shutdown cancels periodic but not delayed
709 <     * tasks at shutdown
708 >     * shutdownNow returns a list containing tasks that were not run,
709 >     * and those tasks are drained from the queue
710       */
711 <    public void testShutdown1() throws InterruptedException {
712 <        CustomExecutor p = new CustomExecutor(1);
713 <        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
714 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
715 <
716 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
717 <        for (int i = 0; i < tasks.length; i++)
718 <            tasks[i] = p.schedule(new NoOpRunnable(),
719 <                                  SHORT_DELAY_MS, MILLISECONDS);
720 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
721 <        BlockingQueue<Runnable> q = p.getQueue();
722 <        for (ScheduledFuture task : tasks) {
723 <            assertFalse(task.isDone());
724 <            assertFalse(task.isCancelled());
725 <            assertTrue(q.contains(task));
711 >    public void testShutdownNow_delayedTasks() throws InterruptedException {
712 >        final CustomExecutor p = new CustomExecutor(1);
713 >        List<ScheduledFuture> tasks = new ArrayList<>();
714 >        for (int i = 0; i < 3; i++) {
715 >            Runnable r = new NoOpRunnable();
716 >            tasks.add(p.schedule(r, 9, SECONDS));
717 >            tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
718 >            tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
719 >        }
720 >        if (testImplementationDetails)
721 >            assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
722 >        final List<Runnable> queuedTasks;
723 >        try {
724 >            queuedTasks = p.shutdownNow();
725 >        } catch (SecurityException ok) {
726 >            return; // Allowed in case test doesn't have privs
727          }
728          assertTrue(p.isShutdown());
729 <        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
730 <        assertTrue(p.isTerminated());
729 >        assertTrue(p.getQueue().isEmpty());
730 >        if (testImplementationDetails)
731 >            assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
732 >        assertEquals(tasks.size(), queuedTasks.size());
733          for (ScheduledFuture task : tasks) {
734 <            assertTrue(task.isDone());
734 >            assertFalse(((CustomTask)task).ran);
735 >            assertFalse(task.isDone());
736              assertFalse(task.isCancelled());
737          }
738 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
739 +        assertTrue(p.isTerminated());
740      }
741  
742      /**
743 <     * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
744 <     * delayed tasks are cancelled at shutdown
745 <     */
746 <    public void testShutdown2() throws InterruptedException {
747 <        CustomExecutor p = new CustomExecutor(1);
748 <        p.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
749 <        assertFalse(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
750 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
751 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
752 <        for (int i = 0; i < tasks.length; i++)
753 <            tasks[i] = p.schedule(new NoOpRunnable(),
754 <                                  SHORT_DELAY_MS, MILLISECONDS);
755 <        BlockingQueue q = p.getQueue();
756 <        assertEquals(tasks.length, q.size());
757 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
758 <        assertTrue(p.isShutdown());
759 <        assertTrue(q.isEmpty());
760 <        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
761 <        assertTrue(p.isTerminated());
762 <        for (ScheduledFuture task : tasks) {
763 <            assertTrue(task.isDone());
764 <            assertTrue(task.isCancelled());
743 >     * By default, periodic tasks are cancelled at shutdown.
744 >     * By default, delayed tasks keep running after shutdown.
745 >     * Check that changing the default values work:
746 >     * - setExecuteExistingDelayedTasksAfterShutdownPolicy
747 >     * - setContinueExistingPeriodicTasksAfterShutdownPolicy
748 >     */
749 >    @SuppressWarnings("FutureReturnValueIgnored")
750 >    public void testShutdown_cancellation() throws Exception {
751 >        final int poolSize = 4;
752 >        final CustomExecutor p = new CustomExecutor(poolSize);
753 >        final BlockingQueue<Runnable> q = p.getQueue();
754 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
755 >        final long delay = rnd.nextInt(2);
756 >        final int rounds = rnd.nextInt(1, 3);
757 >        final boolean effectiveDelayedPolicy;
758 >        final boolean effectivePeriodicPolicy;
759 >        final boolean effectiveRemovePolicy;
760 >
761 >        if (rnd.nextBoolean())
762 >            p.setExecuteExistingDelayedTasksAfterShutdownPolicy(
763 >                effectiveDelayedPolicy = rnd.nextBoolean());
764 >        else
765 >            effectiveDelayedPolicy = true;
766 >        assertEquals(effectiveDelayedPolicy,
767 >                     p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
768 >
769 >        if (rnd.nextBoolean())
770 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(
771 >                effectivePeriodicPolicy = rnd.nextBoolean());
772 >        else
773 >            effectivePeriodicPolicy = false;
774 >        assertEquals(effectivePeriodicPolicy,
775 >                     p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
776 >
777 >        if (rnd.nextBoolean())
778 >            p.setRemoveOnCancelPolicy(
779 >                effectiveRemovePolicy = rnd.nextBoolean());
780 >        else
781 >            effectiveRemovePolicy = false;
782 >        assertEquals(effectiveRemovePolicy,
783 >                     p.getRemoveOnCancelPolicy());
784 >
785 >        final boolean periodicTasksContinue = effectivePeriodicPolicy && rnd.nextBoolean();
786 >
787 >        // Strategy: Wedge the pool with one wave of "blocker" tasks,
788 >        // then add a second wave that waits in the queue until unblocked.
789 >        final AtomicInteger ran = new AtomicInteger(0);
790 >        final CountDownLatch poolBlocked = new CountDownLatch(poolSize);
791 >        final CountDownLatch unblock = new CountDownLatch(1);
792 >        final RuntimeException exception = new RuntimeException();
793 >
794 >        class Task implements Runnable {
795 >            public void run() {
796 >                try {
797 >                    ran.getAndIncrement();
798 >                    poolBlocked.countDown();
799 >                    await(unblock);
800 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
801 >            }
802          }
736    }
803  
804 <    /**
805 <     * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
806 <     * periodic tasks are cancelled at shutdown
807 <     */
808 <    public void testShutdown3() throws InterruptedException {
809 <        CustomExecutor p = new CustomExecutor(1);
810 <        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
811 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
812 <        p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
813 <        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
814 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
815 <        long initialDelay = LONG_DELAY_MS;
816 <        ScheduledFuture task =
817 <            p.scheduleAtFixedRate(new NoOpRunnable(), initialDelay,
818 <                                  5, MILLISECONDS);
804 >        class PeriodicTask extends Task {
805 >            PeriodicTask(int rounds) { this.rounds = rounds; }
806 >            int rounds;
807 >            public void run() {
808 >                if (--rounds == 0) super.run();
809 >                // throw exception to surely terminate this periodic task,
810 >                // but in a separate execution and in a detectable way.
811 >                if (rounds == -1) throw exception;
812 >            }
813 >        }
814 >
815 >        Runnable task = new Task();
816 >
817 >        List<Future<?>> immediates = new ArrayList<>();
818 >        List<Future<?>> delayeds   = new ArrayList<>();
819 >        List<Future<?>> periodics  = new ArrayList<>();
820 >
821 >        immediates.add(p.submit(task));
822 >        delayeds.add(p.schedule(task, delay, MILLISECONDS));
823 >        periodics.add(p.scheduleAtFixedRate(
824 >                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
825 >        periodics.add(p.scheduleWithFixedDelay(
826 >                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
827 >
828 >        await(poolBlocked);
829 >
830 >        assertEquals(poolSize, ran.get());
831 >        assertEquals(poolSize, p.getActiveCount());
832 >        assertTrue(q.isEmpty());
833 >
834 >        // Add second wave of tasks.
835 >        immediates.add(p.submit(task));
836 >        delayeds.add(p.schedule(task, effectiveDelayedPolicy ? delay : LONG_DELAY_MS, MILLISECONDS));
837 >        periodics.add(p.scheduleAtFixedRate(
838 >                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
839 >        periodics.add(p.scheduleWithFixedDelay(
840 >                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
841 >
842 >        assertEquals(poolSize, q.size());
843 >        assertEquals(poolSize, ran.get());
844 >
845 >        immediates.forEach(
846 >            f -> assertTrue(((ScheduledFuture)f).getDelay(NANOSECONDS) <= 0L));
847 >
848 >        Stream.of(immediates, delayeds, periodics).flatMap(Collection::stream)
849 >            .forEach(f -> assertFalse(f.isDone()));
850 >
851          try { p.shutdown(); } catch (SecurityException ok) { return; }
852          assertTrue(p.isShutdown());
853 <        assertTrue(p.getQueue().isEmpty());
854 <        assertTrue(task.isDone());
757 <        assertTrue(task.isCancelled());
758 <        joinPool(p);
759 <    }
853 >        assertTrue(p.isTerminating());
854 >        assertFalse(p.isTerminated());
855  
856 <    /**
857 <     * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
858 <     * periodic tasks are not cancelled at shutdown
859 <     */
860 <    public void testShutdown4() throws InterruptedException {
861 <        CustomExecutor p = new CustomExecutor(1);
862 <        final CountDownLatch counter = new CountDownLatch(2);
863 <        try {
864 <            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
865 <            assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
866 <            assertTrue(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
867 <            final Runnable r = new CheckedRunnable() {
868 <                public void realRun() {
869 <                    counter.countDown();
870 <                }};
871 <            ScheduledFuture task =
872 <                p.scheduleAtFixedRate(r, 1, 1, MILLISECONDS);
873 <            assertFalse(task.isDone());
874 <            assertFalse(task.isCancelled());
875 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
876 <            assertFalse(task.isCancelled());
877 <            assertFalse(p.isTerminated());
878 <            assertTrue(p.isShutdown());
879 <            assertTrue(counter.await(SMALL_DELAY_MS, MILLISECONDS));
880 <            assertFalse(task.isCancelled());
881 <            assertTrue(task.cancel(false));
882 <            assertTrue(task.isDone());
883 <            assertTrue(task.isCancelled());
884 <            assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
885 <            assertTrue(p.isTerminated());
886 <        }
887 <        finally {
888 <            joinPool(p);
856 >        if (rnd.nextBoolean())
857 >            assertThrows(
858 >                RejectedExecutionException.class,
859 >                () -> p.submit(task),
860 >                () -> p.schedule(task, 1, SECONDS),
861 >                () -> p.scheduleAtFixedRate(
862 >                    new PeriodicTask(1), 1, 1, SECONDS),
863 >                () -> p.scheduleWithFixedDelay(
864 >                    new PeriodicTask(2), 1, 1, SECONDS));
865 >
866 >        assertTrue(q.contains(immediates.get(1)));
867 >        assertTrue(!effectiveDelayedPolicy
868 >                   ^ q.contains(delayeds.get(1)));
869 >        assertTrue(!effectivePeriodicPolicy
870 >                   ^ q.containsAll(periodics.subList(2, 4)));
871 >
872 >        immediates.forEach(f -> assertFalse(f.isDone()));
873 >
874 >        assertFalse(delayeds.get(0).isDone());
875 >        if (effectiveDelayedPolicy)
876 >            assertFalse(delayeds.get(1).isDone());
877 >        else
878 >            assertTrue(delayeds.get(1).isCancelled());
879 >
880 >        if (effectivePeriodicPolicy)
881 >            periodics.forEach(
882 >                f -> {
883 >                    assertFalse(f.isDone());
884 >                    if (!periodicTasksContinue) {
885 >                        assertTrue(f.cancel(false));
886 >                        assertTrue(f.isCancelled());
887 >                    }
888 >                });
889 >        else {
890 >            periodics.subList(0, 2).forEach(f -> assertFalse(f.isDone()));
891 >            periodics.subList(2, 4).forEach(f -> assertTrue(f.isCancelled()));
892          }
893 +
894 +        unblock.countDown();    // Release all pool threads
895 +
896 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
897 +        assertFalse(p.isTerminating());
898 +        assertTrue(p.isTerminated());
899 +
900 +        assertTrue(q.isEmpty());
901 +
902 +        Stream.of(immediates, delayeds, periodics).flatMap(Collection::stream)
903 +            .forEach(f -> assertTrue(f.isDone()));
904 +
905 +        for (Future<?> f : immediates) assertNull(f.get());
906 +
907 +        assertNull(delayeds.get(0).get());
908 +        if (effectiveDelayedPolicy)
909 +            assertNull(delayeds.get(1).get());
910 +        else
911 +            assertTrue(delayeds.get(1).isCancelled());
912 +
913 +        if (periodicTasksContinue)
914 +            periodics.forEach(
915 +                f -> {
916 +                    try { f.get(); }
917 +                    catch (ExecutionException success) {
918 +                        assertSame(exception, success.getCause());
919 +                    }
920 +                    catch (Throwable fail) { threadUnexpectedException(fail); }
921 +                });
922 +        else
923 +            periodics.forEach(f -> assertTrue(f.isCancelled()));
924 +
925 +        assertEquals(poolSize + 1
926 +                     + (effectiveDelayedPolicy ? 1 : 0)
927 +                     + (periodicTasksContinue ? 2 : 0),
928 +                     ran.get());
929      }
930  
931      /**
932       * completed submit of callable returns result
933       */
934      public void testSubmitCallable() throws Exception {
935 <        ExecutorService e = new CustomExecutor(2);
936 <        try {
935 >        final ExecutorService e = new CustomExecutor(2);
936 >        try (PoolCleaner cleaner = cleaner(e)) {
937              Future<String> future = e.submit(new StringTask());
938              String result = future.get();
939              assertSame(TEST_STRING, result);
806        } finally {
807            joinPool(e);
940          }
941      }
942  
# Line 812 | Line 944 | public class ScheduledExecutorSubclassTe
944       * completed submit of runnable returns successfully
945       */
946      public void testSubmitRunnable() throws Exception {
947 <        ExecutorService e = new CustomExecutor(2);
948 <        try {
947 >        final ExecutorService e = new CustomExecutor(2);
948 >        try (PoolCleaner cleaner = cleaner(e)) {
949              Future<?> future = e.submit(new NoOpRunnable());
950              future.get();
951              assertTrue(future.isDone());
820        } finally {
821            joinPool(e);
952          }
953      }
954  
# Line 826 | Line 956 | public class ScheduledExecutorSubclassTe
956       * completed submit of (runnable, result) returns result
957       */
958      public void testSubmitRunnable2() throws Exception {
959 <        ExecutorService e = new CustomExecutor(2);
960 <        try {
959 >        final ExecutorService e = new CustomExecutor(2);
960 >        try (PoolCleaner cleaner = cleaner(e)) {
961              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
962              String result = future.get();
963              assertSame(TEST_STRING, result);
834        } finally {
835            joinPool(e);
964          }
965      }
966  
# Line 840 | Line 968 | public class ScheduledExecutorSubclassTe
968       * invokeAny(null) throws NPE
969       */
970      public void testInvokeAny1() throws Exception {
971 <        ExecutorService e = new CustomExecutor(2);
972 <        try {
973 <            e.invokeAny(null);
974 <            shouldThrow();
975 <        } catch (NullPointerException success) {
976 <        } finally {
849 <            joinPool(e);
971 >        final ExecutorService e = new CustomExecutor(2);
972 >        try (PoolCleaner cleaner = cleaner(e)) {
973 >            try {
974 >                e.invokeAny(null);
975 >                shouldThrow();
976 >            } catch (NullPointerException success) {}
977          }
978      }
979  
980      /**
981 <     * invokeAny(empty collection) throws IAE
981 >     * invokeAny(empty collection) throws IllegalArgumentException
982       */
983      public void testInvokeAny2() throws Exception {
984 <        ExecutorService e = new CustomExecutor(2);
985 <        try {
986 <            e.invokeAny(new ArrayList<Callable<String>>());
987 <            shouldThrow();
988 <        } catch (IllegalArgumentException success) {
989 <        } finally {
863 <            joinPool(e);
984 >        final ExecutorService e = new CustomExecutor(2);
985 >        try (PoolCleaner cleaner = cleaner(e)) {
986 >            try {
987 >                e.invokeAny(new ArrayList<Callable<String>>());
988 >                shouldThrow();
989 >            } catch (IllegalArgumentException success) {}
990          }
991      }
992  
# Line 868 | Line 994 | public class ScheduledExecutorSubclassTe
994       * invokeAny(c) throws NPE if c has null elements
995       */
996      public void testInvokeAny3() throws Exception {
997 <        CountDownLatch latch = new CountDownLatch(1);
998 <        ExecutorService e = new CustomExecutor(2);
999 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1000 <        l.add(latchAwaitingStringTask(latch));
1001 <        l.add(null);
1002 <        try {
1003 <            e.invokeAny(l);
1004 <            shouldThrow();
1005 <        } catch (NullPointerException success) {
1006 <        } finally {
997 >        final CountDownLatch latch = new CountDownLatch(1);
998 >        final ExecutorService e = new CustomExecutor(2);
999 >        try (PoolCleaner cleaner = cleaner(e)) {
1000 >            List<Callable<String>> l = new ArrayList<>();
1001 >            l.add(latchAwaitingStringTask(latch));
1002 >            l.add(null);
1003 >            try {
1004 >                e.invokeAny(l);
1005 >                shouldThrow();
1006 >            } catch (NullPointerException success) {}
1007              latch.countDown();
882            joinPool(e);
1008          }
1009      }
1010  
# Line 887 | Line 1012 | public class ScheduledExecutorSubclassTe
1012       * invokeAny(c) throws ExecutionException if no task completes
1013       */
1014      public void testInvokeAny4() throws Exception {
1015 <        ExecutorService e = new CustomExecutor(2);
1016 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1017 <        l.add(new NPETask());
1018 <        try {
1019 <            e.invokeAny(l);
1020 <            shouldThrow();
1021 <        } catch (ExecutionException success) {
1022 <            assertTrue(success.getCause() instanceof NullPointerException);
1023 <        } finally {
1024 <            joinPool(e);
1015 >        final ExecutorService e = new CustomExecutor(2);
1016 >        try (PoolCleaner cleaner = cleaner(e)) {
1017 >            List<Callable<String>> l = new ArrayList<>();
1018 >            l.add(new NPETask());
1019 >            try {
1020 >                e.invokeAny(l);
1021 >                shouldThrow();
1022 >            } catch (ExecutionException success) {
1023 >                assertTrue(success.getCause() instanceof NullPointerException);
1024 >            }
1025          }
1026      }
1027  
# Line 904 | Line 1029 | public class ScheduledExecutorSubclassTe
1029       * invokeAny(c) returns result of some task
1030       */
1031      public void testInvokeAny5() throws Exception {
1032 <        ExecutorService e = new CustomExecutor(2);
1033 <        try {
1034 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1032 >        final ExecutorService e = new CustomExecutor(2);
1033 >        try (PoolCleaner cleaner = cleaner(e)) {
1034 >            List<Callable<String>> l = new ArrayList<>();
1035              l.add(new StringTask());
1036              l.add(new StringTask());
1037              String result = e.invokeAny(l);
1038              assertSame(TEST_STRING, result);
914        } finally {
915            joinPool(e);
1039          }
1040      }
1041  
# Line 920 | Line 1043 | public class ScheduledExecutorSubclassTe
1043       * invokeAll(null) throws NPE
1044       */
1045      public void testInvokeAll1() throws Exception {
1046 <        ExecutorService e = new CustomExecutor(2);
1047 <        try {
1048 <            e.invokeAll(null);
1049 <            shouldThrow();
1050 <        } catch (NullPointerException success) {
1051 <        } finally {
929 <            joinPool(e);
1046 >        final ExecutorService e = new CustomExecutor(2);
1047 >        try (PoolCleaner cleaner = cleaner(e)) {
1048 >            try {
1049 >                e.invokeAll(null);
1050 >                shouldThrow();
1051 >            } catch (NullPointerException success) {}
1052          }
1053      }
1054  
1055      /**
1056 <     * invokeAll(empty collection) returns empty collection
1056 >     * invokeAll(empty collection) returns empty list
1057       */
1058      public void testInvokeAll2() throws Exception {
1059 <        ExecutorService e = new CustomExecutor(2);
1060 <        try {
1061 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1059 >        final ExecutorService e = new CustomExecutor(2);
1060 >        final Collection<Callable<String>> emptyCollection
1061 >            = Collections.emptyList();
1062 >        try (PoolCleaner cleaner = cleaner(e)) {
1063 >            List<Future<String>> r = e.invokeAll(emptyCollection);
1064              assertTrue(r.isEmpty());
941        } finally {
942            joinPool(e);
1065          }
1066      }
1067  
# Line 947 | Line 1069 | public class ScheduledExecutorSubclassTe
1069       * invokeAll(c) throws NPE if c has null elements
1070       */
1071      public void testInvokeAll3() throws Exception {
1072 <        ExecutorService e = new CustomExecutor(2);
1073 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1074 <        l.add(new StringTask());
1075 <        l.add(null);
1076 <        try {
1077 <            e.invokeAll(l);
1078 <            shouldThrow();
1079 <        } catch (NullPointerException success) {
1080 <        } finally {
959 <            joinPool(e);
1072 >        final ExecutorService e = new CustomExecutor(2);
1073 >        try (PoolCleaner cleaner = cleaner(e)) {
1074 >            List<Callable<String>> l = new ArrayList<>();
1075 >            l.add(new StringTask());
1076 >            l.add(null);
1077 >            try {
1078 >                e.invokeAll(l);
1079 >                shouldThrow();
1080 >            } catch (NullPointerException success) {}
1081          }
1082      }
1083  
# Line 964 | Line 1085 | public class ScheduledExecutorSubclassTe
1085       * get of invokeAll(c) throws exception on failed task
1086       */
1087      public void testInvokeAll4() throws Exception {
1088 <        ExecutorService e = new CustomExecutor(2);
1089 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1090 <        l.add(new NPETask());
1091 <        List<Future<String>> futures = e.invokeAll(l);
1092 <        assertEquals(1, futures.size());
1093 <        try {
1094 <            futures.get(0).get();
1095 <            shouldThrow();
1096 <        } catch (ExecutionException success) {
1097 <            assertTrue(success.getCause() instanceof NullPointerException);
1098 <        } finally {
1099 <            joinPool(e);
1088 >        final ExecutorService e = new CustomExecutor(2);
1089 >        try (PoolCleaner cleaner = cleaner(e)) {
1090 >            List<Callable<String>> l = new ArrayList<>();
1091 >            l.add(new NPETask());
1092 >            List<Future<String>> futures = e.invokeAll(l);
1093 >            assertEquals(1, futures.size());
1094 >            try {
1095 >                futures.get(0).get();
1096 >                shouldThrow();
1097 >            } catch (ExecutionException success) {
1098 >                assertTrue(success.getCause() instanceof NullPointerException);
1099 >            }
1100          }
1101      }
1102  
# Line 983 | Line 1104 | public class ScheduledExecutorSubclassTe
1104       * invokeAll(c) returns results of all completed tasks
1105       */
1106      public void testInvokeAll5() throws Exception {
1107 <        ExecutorService e = new CustomExecutor(2);
1108 <        try {
1109 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1107 >        final ExecutorService e = new CustomExecutor(2);
1108 >        try (PoolCleaner cleaner = cleaner(e)) {
1109 >            List<Callable<String>> l = new ArrayList<>();
1110              l.add(new StringTask());
1111              l.add(new StringTask());
1112              List<Future<String>> futures = e.invokeAll(l);
1113              assertEquals(2, futures.size());
1114              for (Future<String> future : futures)
1115                  assertSame(TEST_STRING, future.get());
995        } finally {
996            joinPool(e);
1116          }
1117      }
1118  
# Line 1001 | Line 1120 | public class ScheduledExecutorSubclassTe
1120       * timed invokeAny(null) throws NPE
1121       */
1122      public void testTimedInvokeAny1() throws Exception {
1123 <        ExecutorService e = new CustomExecutor(2);
1124 <        try {
1125 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1126 <            shouldThrow();
1127 <        } catch (NullPointerException success) {
1128 <        } finally {
1010 <            joinPool(e);
1123 >        final ExecutorService e = new CustomExecutor(2);
1124 >        try (PoolCleaner cleaner = cleaner(e)) {
1125 >            try {
1126 >                e.invokeAny(null, randomTimeout(), randomTimeUnit());
1127 >                shouldThrow();
1128 >            } catch (NullPointerException success) {}
1129          }
1130      }
1131  
# Line 1015 | Line 1133 | public class ScheduledExecutorSubclassTe
1133       * timed invokeAny(,,null) throws NPE
1134       */
1135      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1136 <        ExecutorService e = new CustomExecutor(2);
1137 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1138 <        l.add(new StringTask());
1139 <        try {
1140 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1141 <            shouldThrow();
1142 <        } catch (NullPointerException success) {
1143 <        } finally {
1026 <            joinPool(e);
1136 >        final ExecutorService e = new CustomExecutor(2);
1137 >        try (PoolCleaner cleaner = cleaner(e)) {
1138 >            List<Callable<String>> l = new ArrayList<>();
1139 >            l.add(new StringTask());
1140 >            try {
1141 >                e.invokeAny(l, randomTimeout(), null);
1142 >                shouldThrow();
1143 >            } catch (NullPointerException success) {}
1144          }
1145      }
1146  
1147      /**
1148 <     * timed invokeAny(empty collection) throws IAE
1148 >     * timed invokeAny(empty collection) throws IllegalArgumentException
1149       */
1150      public void testTimedInvokeAny2() throws Exception {
1151 <        ExecutorService e = new CustomExecutor(2);
1152 <        try {
1153 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1154 <            shouldThrow();
1155 <        } catch (IllegalArgumentException success) {
1156 <        } finally {
1157 <            joinPool(e);
1151 >        final ExecutorService e = new CustomExecutor(2);
1152 >        final Collection<Callable<String>> emptyCollection
1153 >            = Collections.emptyList();
1154 >        try (PoolCleaner cleaner = cleaner(e)) {
1155 >            try {
1156 >                e.invokeAny(emptyCollection, randomTimeout(), randomTimeUnit());
1157 >                shouldThrow();
1158 >            } catch (IllegalArgumentException success) {}
1159          }
1160      }
1161  
# Line 1046 | Line 1164 | public class ScheduledExecutorSubclassTe
1164       */
1165      public void testTimedInvokeAny3() throws Exception {
1166          CountDownLatch latch = new CountDownLatch(1);
1167 <        ExecutorService e = new CustomExecutor(2);
1168 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1169 <        l.add(latchAwaitingStringTask(latch));
1170 <        l.add(null);
1171 <        try {
1172 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1173 <            shouldThrow();
1174 <        } catch (NullPointerException success) {
1175 <        } finally {
1167 >        final ExecutorService e = new CustomExecutor(2);
1168 >        try (PoolCleaner cleaner = cleaner(e)) {
1169 >            List<Callable<String>> l = new ArrayList<>();
1170 >            l.add(latchAwaitingStringTask(latch));
1171 >            l.add(null);
1172 >            try {
1173 >                e.invokeAny(l, randomTimeout(), randomTimeUnit());
1174 >                shouldThrow();
1175 >            } catch (NullPointerException success) {}
1176              latch.countDown();
1059            joinPool(e);
1177          }
1178      }
1179  
# Line 1064 | Line 1181 | public class ScheduledExecutorSubclassTe
1181       * timed invokeAny(c) throws ExecutionException if no task completes
1182       */
1183      public void testTimedInvokeAny4() throws Exception {
1184 <        ExecutorService e = new CustomExecutor(2);
1185 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1186 <        l.add(new NPETask());
1187 <        try {
1188 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1189 <            shouldThrow();
1190 <        } catch (ExecutionException success) {
1191 <            assertTrue(success.getCause() instanceof NullPointerException);
1192 <        } finally {
1193 <            joinPool(e);
1184 >        final ExecutorService e = new CustomExecutor(2);
1185 >        try (PoolCleaner cleaner = cleaner(e)) {
1186 >            long startTime = System.nanoTime();
1187 >            List<Callable<String>> l = new ArrayList<>();
1188 >            l.add(new NPETask());
1189 >            try {
1190 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1191 >                shouldThrow();
1192 >            } catch (ExecutionException success) {
1193 >                assertTrue(success.getCause() instanceof NullPointerException);
1194 >            }
1195 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1196          }
1197      }
1198  
# Line 1081 | Line 1200 | public class ScheduledExecutorSubclassTe
1200       * timed invokeAny(c) returns result of some task
1201       */
1202      public void testTimedInvokeAny5() throws Exception {
1203 <        ExecutorService e = new CustomExecutor(2);
1204 <        try {
1205 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1203 >        final ExecutorService e = new CustomExecutor(2);
1204 >        try (PoolCleaner cleaner = cleaner(e)) {
1205 >            long startTime = System.nanoTime();
1206 >            List<Callable<String>> l = new ArrayList<>();
1207              l.add(new StringTask());
1208              l.add(new StringTask());
1209 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1209 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1210              assertSame(TEST_STRING, result);
1211 <        } finally {
1092 <            joinPool(e);
1211 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1212          }
1213      }
1214  
1215      /**
1216 <     * timed invokeAll(null) throws NPE
1216 >     * timed invokeAll(null) throws NullPointerException
1217       */
1218      public void testTimedInvokeAll1() throws Exception {
1219 <        ExecutorService e = new CustomExecutor(2);
1220 <        try {
1221 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1222 <            shouldThrow();
1223 <        } catch (NullPointerException success) {
1224 <        } finally {
1106 <            joinPool(e);
1219 >        final ExecutorService e = new CustomExecutor(2);
1220 >        try (PoolCleaner cleaner = cleaner(e)) {
1221 >            try {
1222 >                e.invokeAll(null, randomTimeout(), randomTimeUnit());
1223 >                shouldThrow();
1224 >            } catch (NullPointerException success) {}
1225          }
1226      }
1227  
1228      /**
1229 <     * timed invokeAll(,,null) throws NPE
1229 >     * timed invokeAll(,,null) throws NullPointerException
1230       */
1231      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1232 <        ExecutorService e = new CustomExecutor(2);
1233 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1234 <        l.add(new StringTask());
1235 <        try {
1236 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1237 <            shouldThrow();
1238 <        } catch (NullPointerException success) {
1239 <        } finally {
1122 <            joinPool(e);
1232 >        final ExecutorService e = new CustomExecutor(2);
1233 >        try (PoolCleaner cleaner = cleaner(e)) {
1234 >            List<Callable<String>> l = new ArrayList<>();
1235 >            l.add(new StringTask());
1236 >            try {
1237 >                e.invokeAll(l, randomTimeout(), null);
1238 >                shouldThrow();
1239 >            } catch (NullPointerException success) {}
1240          }
1241      }
1242  
1243      /**
1244 <     * timed invokeAll(empty collection) returns empty collection
1244 >     * timed invokeAll(empty collection) returns empty list
1245       */
1246      public void testTimedInvokeAll2() throws Exception {
1247 <        ExecutorService e = new CustomExecutor(2);
1248 <        try {
1249 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1247 >        final ExecutorService e = new CustomExecutor(2);
1248 >        final Collection<Callable<String>> emptyCollection
1249 >            = Collections.emptyList();
1250 >        try (PoolCleaner cleaner = cleaner(e)) {
1251 >            List<Future<String>> r =
1252 >                e.invokeAll(emptyCollection, randomTimeout(), randomTimeUnit());
1253              assertTrue(r.isEmpty());
1134        } finally {
1135            joinPool(e);
1254          }
1255      }
1256  
# Line 1140 | Line 1258 | public class ScheduledExecutorSubclassTe
1258       * timed invokeAll(c) throws NPE if c has null elements
1259       */
1260      public void testTimedInvokeAll3() throws Exception {
1261 <        ExecutorService e = new CustomExecutor(2);
1262 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1263 <        l.add(new StringTask());
1264 <        l.add(null);
1265 <        try {
1266 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1267 <            shouldThrow();
1268 <        } catch (NullPointerException success) {
1269 <        } finally {
1152 <            joinPool(e);
1261 >        final ExecutorService e = new CustomExecutor(2);
1262 >        try (PoolCleaner cleaner = cleaner(e)) {
1263 >            List<Callable<String>> l = new ArrayList<>();
1264 >            l.add(new StringTask());
1265 >            l.add(null);
1266 >            try {
1267 >                e.invokeAll(l, randomTimeout(), randomTimeUnit());
1268 >                shouldThrow();
1269 >            } catch (NullPointerException success) {}
1270          }
1271      }
1272  
# Line 1157 | Line 1274 | public class ScheduledExecutorSubclassTe
1274       * get of element of invokeAll(c) throws exception on failed task
1275       */
1276      public void testTimedInvokeAll4() throws Exception {
1277 <        ExecutorService e = new CustomExecutor(2);
1278 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1279 <        l.add(new NPETask());
1280 <        List<Future<String>> futures =
1281 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1282 <        assertEquals(1, futures.size());
1283 <        try {
1284 <            futures.get(0).get();
1285 <            shouldThrow();
1286 <        } catch (ExecutionException success) {
1287 <            assertTrue(success.getCause() instanceof NullPointerException);
1288 <        } finally {
1289 <            joinPool(e);
1277 >        final ExecutorService e = new CustomExecutor(2);
1278 >        final Collection<Callable<String>> c = new ArrayList<>();
1279 >        c.add(new NPETask());
1280 >        try (PoolCleaner cleaner = cleaner(e)) {
1281 >            List<Future<String>> futures =
1282 >                e.invokeAll(c, LONG_DELAY_MS, MILLISECONDS);
1283 >            assertEquals(1, futures.size());
1284 >            try {
1285 >                futures.get(0).get();
1286 >                shouldThrow();
1287 >            } catch (ExecutionException success) {
1288 >                assertTrue(success.getCause() instanceof NullPointerException);
1289 >            }
1290          }
1291      }
1292  
# Line 1177 | Line 1294 | public class ScheduledExecutorSubclassTe
1294       * timed invokeAll(c) returns results of all completed tasks
1295       */
1296      public void testTimedInvokeAll5() throws Exception {
1297 <        ExecutorService e = new CustomExecutor(2);
1298 <        try {
1299 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1297 >        final ExecutorService e = new CustomExecutor(2);
1298 >        try (PoolCleaner cleaner = cleaner(e)) {
1299 >            List<Callable<String>> l = new ArrayList<>();
1300              l.add(new StringTask());
1301              l.add(new StringTask());
1302              List<Future<String>> futures =
1303 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1303 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1304              assertEquals(2, futures.size());
1305              for (Future<String> future : futures)
1306                  assertSame(TEST_STRING, future.get());
1190        } finally {
1191            joinPool(e);
1307          }
1308      }
1309  
# Line 1196 | Line 1311 | public class ScheduledExecutorSubclassTe
1311       * timed invokeAll(c) cancels tasks not completed by timeout
1312       */
1313      public void testTimedInvokeAll6() throws Exception {
1314 <        ExecutorService e = new CustomExecutor(2);
1315 <        try {
1316 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1317 <            l.add(new StringTask());
1318 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1319 <            l.add(new StringTask());
1320 <            List<Future<String>> futures =
1321 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1322 <            assertEquals(l.size(), futures.size());
1323 <            for (Future future : futures)
1324 <                assertTrue(future.isDone());
1325 <            assertFalse(futures.get(0).isCancelled());
1326 <            assertTrue(futures.get(1).isCancelled());
1327 <        } finally {
1328 <            joinPool(e);
1314 >        for (long timeout = timeoutMillis();;) {
1315 >            final CountDownLatch done = new CountDownLatch(1);
1316 >            final Callable<String> waiter = new CheckedCallable<String>() {
1317 >                public String realCall() {
1318 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1319 >                    catch (InterruptedException ok) {}
1320 >                    return "1"; }};
1321 >            final ExecutorService p = new CustomExecutor(2);
1322 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1323 >                List<Callable<String>> tasks = new ArrayList<>();
1324 >                tasks.add(new StringTask("0"));
1325 >                tasks.add(waiter);
1326 >                tasks.add(new StringTask("2"));
1327 >                long startTime = System.nanoTime();
1328 >                List<Future<String>> futures =
1329 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1330 >                assertEquals(tasks.size(), futures.size());
1331 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1332 >                for (Future future : futures)
1333 >                    assertTrue(future.isDone());
1334 >                assertTrue(futures.get(1).isCancelled());
1335 >                try {
1336 >                    assertEquals("0", futures.get(0).get());
1337 >                    assertEquals("2", futures.get(2).get());
1338 >                    break;
1339 >                } catch (CancellationException retryWithLongerTimeout) {
1340 >                    timeout *= 2;
1341 >                    if (timeout >= LONG_DELAY_MS / 2)
1342 >                        fail("expected exactly one task to be cancelled");
1343 >                }
1344 >            }
1345          }
1346      }
1347  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines