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.14 by jsr166, Sat Oct 9 19:30:35 2010 UTC vs.
Revision 1.38 by jsr166, Sun Sep 27 20:17:39 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
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 java.util.concurrent.atomic.*;
8 > import static java.util.concurrent.TimeUnit.SECONDS;
9 >
10 > import java.util.ArrayList;
11 > import java.util.HashSet;
12 > import java.util.List;
13 > import java.util.concurrent.BlockingQueue;
14 > import java.util.concurrent.Callable;
15 > import java.util.concurrent.CancellationException;
16 > import java.util.concurrent.CountDownLatch;
17 > import java.util.concurrent.Delayed;
18 > import java.util.concurrent.ExecutionException;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.Future;
22 > import java.util.concurrent.RejectedExecutionException;
23 > import java.util.concurrent.RejectedExecutionHandler;
24 > import java.util.concurrent.RunnableScheduledFuture;
25 > import java.util.concurrent.ScheduledFuture;
26 > import java.util.concurrent.ScheduledThreadPoolExecutor;
27 > import java.util.concurrent.ThreadFactory;
28 > import java.util.concurrent.ThreadPoolExecutor;
29 > import java.util.concurrent.TimeoutException;
30 > import java.util.concurrent.TimeUnit;
31 > import java.util.concurrent.atomic.AtomicInteger;
32 >
33 > import junit.framework.Test;
34 > import junit.framework.TestSuite;
35  
36   public class ScheduledExecutorSubclassTest extends JSR166TestCase {
37      public static void main(String[] args) {
38 <        junit.textui.TestRunner.run(suite());
38 >        main(suite(), args);
39      }
40      public static Test suite() {
41          return new TestSuite(ScheduledExecutorSubclassTest.class);
# Line 36 | Line 59 | public class ScheduledExecutorSubclassTe
59          }
60          public boolean isCancelled() { return task.isCancelled(); }
61          public boolean isDone() { return task.isDone(); }
62 <        public V get() throws InterruptedException,  ExecutionException {
62 >        public V get() throws InterruptedException, ExecutionException {
63              V v = task.get();
64              assertTrue(ran);
65              return v;
66          }
67 <        public V get(long time, TimeUnit unit) throws InterruptedException,  ExecutionException, TimeoutException {
67 >        public V get(long time, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
68              V v = task.get(time, unit);
69              assertTrue(ran);
70              return v;
71          }
72      }
73  
51
74      public class CustomExecutor extends ScheduledThreadPoolExecutor {
75  
76          protected <V> RunnableScheduledFuture<V> decorateTask(Runnable r, RunnableScheduledFuture<V> task) {
# Line 58 | Line 80 | public class ScheduledExecutorSubclassTe
80          protected <V> RunnableScheduledFuture<V> decorateTask(Callable<V> c, RunnableScheduledFuture<V> task) {
81              return new CustomTask<V>(task);
82          }
83 <        CustomExecutor(int corePoolSize) { super(corePoolSize);}
83 >        CustomExecutor(int corePoolSize) { super(corePoolSize); }
84          CustomExecutor(int corePoolSize, RejectedExecutionHandler handler) {
85              super(corePoolSize, handler);
86          }
# Line 73 | Line 95 | public class ScheduledExecutorSubclassTe
95  
96      }
97  
76
98      /**
99       * execute successfully executes a runnable
100       */
101      public void testExecute() throws InterruptedException {
102 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
103 <        CustomExecutor p1 = new CustomExecutor(1);
104 <        p1.execute(runnable);
105 <        assertFalse(runnable.done);
106 <        Thread.sleep(SHORT_DELAY_MS);
107 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
108 <        Thread.sleep(MEDIUM_DELAY_MS);
109 <        assertTrue(runnable.done);
110 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
111 <        joinPool(p1);
102 >        CustomExecutor p = new CustomExecutor(1);
103 >        final CountDownLatch done = new CountDownLatch(1);
104 >        final Runnable task = new CheckedRunnable() {
105 >            public void realRun() {
106 >                done.countDown();
107 >            }};
108 >        try {
109 >            p.execute(task);
110 >            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
111 >        } finally {
112 >            joinPool(p);
113 >        }
114      }
115  
93
116      /**
117       * delayed schedule of callable successfully executes after delay
118       */
119      public void testSchedule1() throws Exception {
120 <        TrackedCallable callable = new TrackedCallable();
121 <        CustomExecutor p1 = new CustomExecutor(1);
122 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
123 <        assertFalse(callable.done);
124 <        Thread.sleep(MEDIUM_DELAY_MS);
125 <        assertTrue(callable.done);
126 <        assertEquals(Boolean.TRUE, f.get());
127 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
128 <        joinPool(p1);
120 >        CustomExecutor p = new CustomExecutor(1);
121 >        final long startTime = System.nanoTime();
122 >        final CountDownLatch done = new CountDownLatch(1);
123 >        try {
124 >            Callable task = new CheckedCallable<Boolean>() {
125 >                public Boolean realCall() {
126 >                    done.countDown();
127 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
128 >                    return Boolean.TRUE;
129 >                }};
130 >            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
131 >            assertSame(Boolean.TRUE, f.get());
132 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
133 >            assertTrue(done.await(0L, MILLISECONDS));
134 >        } finally {
135 >            joinPool(p);
136 >        }
137      }
138  
139      /**
140       * delayed schedule of runnable successfully executes after delay
141       */
142 <    public void testSchedule3() throws InterruptedException {
143 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
144 <        CustomExecutor p1 = new CustomExecutor(1);
145 <        p1.schedule(runnable, SMALL_DELAY_MS, MILLISECONDS);
146 <        Thread.sleep(SHORT_DELAY_MS);
147 <        assertFalse(runnable.done);
148 <        Thread.sleep(MEDIUM_DELAY_MS);
149 <        assertTrue(runnable.done);
150 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
151 <        joinPool(p1);
142 >    public void testSchedule3() throws Exception {
143 >        CustomExecutor p = new CustomExecutor(1);
144 >        final long startTime = System.nanoTime();
145 >        final CountDownLatch done = new CountDownLatch(1);
146 >        try {
147 >            Runnable task = new CheckedRunnable() {
148 >                public void realRun() {
149 >                    done.countDown();
150 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
151 >                }};
152 >            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
153 >            await(done);
154 >            assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
155 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
156 >        } finally {
157 >            joinPool(p);
158 >        }
159      }
160  
161      /**
162       * scheduleAtFixedRate executes runnable after given initial delay
163       */
164      public void testSchedule4() throws InterruptedException {
165 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
166 <        CustomExecutor p1 = new CustomExecutor(1);
167 <        ScheduledFuture h = p1.scheduleAtFixedRate(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
168 <        assertFalse(runnable.done);
169 <        Thread.sleep(MEDIUM_DELAY_MS);
170 <        assertTrue(runnable.done);
171 <        h.cancel(true);
172 <        joinPool(p1);
173 <    }
174 <
175 <    static class RunnableCounter implements Runnable {
176 <        AtomicInteger count = new AtomicInteger(0);
177 <        public void run() { count.getAndIncrement(); }
165 >        CustomExecutor p = new CustomExecutor(1);
166 >        final long startTime = System.nanoTime();
167 >        final CountDownLatch done = new CountDownLatch(1);
168 >        try {
169 >            Runnable task = new CheckedRunnable() {
170 >                public void realRun() {
171 >                    done.countDown();
172 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
173 >                }};
174 >            ScheduledFuture f =
175 >                p.scheduleAtFixedRate(task, timeoutMillis(),
176 >                                      LONG_DELAY_MS, MILLISECONDS);
177 >            await(done);
178 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
179 >            f.cancel(true);
180 >        } finally {
181 >            joinPool(p);
182 >        }
183      }
184  
185      /**
186       * scheduleWithFixedDelay executes runnable after given initial delay
187       */
188      public void testSchedule5() throws InterruptedException {
189 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
190 <        CustomExecutor p1 = new CustomExecutor(1);
191 <        ScheduledFuture h = p1.scheduleWithFixedDelay(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
192 <        assertFalse(runnable.done);
193 <        Thread.sleep(MEDIUM_DELAY_MS);
194 <        assertTrue(runnable.done);
195 <        h.cancel(true);
196 <        joinPool(p1);
189 >        CustomExecutor p = new CustomExecutor(1);
190 >        final long startTime = System.nanoTime();
191 >        final CountDownLatch done = new CountDownLatch(1);
192 >        try {
193 >            Runnable task = new CheckedRunnable() {
194 >                public void realRun() {
195 >                    done.countDown();
196 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
197 >                }};
198 >            ScheduledFuture f =
199 >                p.scheduleWithFixedDelay(task, timeoutMillis(),
200 >                                         LONG_DELAY_MS, MILLISECONDS);
201 >            await(done);
202 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
203 >            f.cancel(true);
204 >        } finally {
205 >            joinPool(p);
206 >        }
207 >    }
208 >
209 >    static class RunnableCounter implements Runnable {
210 >        AtomicInteger count = new AtomicInteger(0);
211 >        public void run() { count.getAndIncrement(); }
212      }
213  
214      /**
215       * scheduleAtFixedRate executes series of tasks at given rate
216       */
217      public void testFixedRateSequence() throws InterruptedException {
218 <        CustomExecutor p1 = new CustomExecutor(1);
219 <        RunnableCounter counter = new RunnableCounter();
220 <        ScheduledFuture h =
221 <            p1.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
222 <        Thread.sleep(SMALL_DELAY_MS);
223 <        h.cancel(true);
224 <        int c = counter.count.get();
225 <        // By time scaling conventions, we must have at least
226 <        // an execution per SHORT delay, but no more than one SHORT more
227 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
228 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
229 <        joinPool(p1);
218 >        CustomExecutor p = new CustomExecutor(1);
219 >        try {
220 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
221 >                long startTime = System.nanoTime();
222 >                int cycles = 10;
223 >                final CountDownLatch done = new CountDownLatch(cycles);
224 >                Runnable task = new CheckedRunnable() {
225 >                    public void realRun() { done.countDown(); }};
226 >                ScheduledFuture h =
227 >                    p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
228 >                done.await();
229 >                h.cancel(true);
230 >                double normalizedTime =
231 >                    (double) millisElapsedSince(startTime) / delay;
232 >                if (normalizedTime >= cycles - 1 &&
233 >                    normalizedTime <= cycles)
234 >                    return;
235 >            }
236 >            throw new AssertionError("unexpected execution rate");
237 >        } finally {
238 >            joinPool(p);
239 >        }
240      }
241  
242      /**
243       * scheduleWithFixedDelay executes series of tasks with given period
244       */
245      public void testFixedDelaySequence() throws InterruptedException {
246 <        CustomExecutor p1 = new CustomExecutor(1);
247 <        RunnableCounter counter = new RunnableCounter();
248 <        ScheduledFuture h =
249 <            p1.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
250 <        Thread.sleep(SMALL_DELAY_MS);
251 <        h.cancel(true);
252 <        int c = counter.count.get();
253 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
254 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
255 <        joinPool(p1);
246 >        CustomExecutor p = new CustomExecutor(1);
247 >        try {
248 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
249 >                long startTime = System.nanoTime();
250 >                int cycles = 10;
251 >                final CountDownLatch done = new CountDownLatch(cycles);
252 >                Runnable task = new CheckedRunnable() {
253 >                    public void realRun() { done.countDown(); }};
254 >                ScheduledFuture h =
255 >                    p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
256 >                done.await();
257 >                h.cancel(true);
258 >                double normalizedTime =
259 >                    (double) millisElapsedSince(startTime) / delay;
260 >                if (normalizedTime >= cycles - 1 &&
261 >                    normalizedTime <= cycles)
262 >                    return;
263 >            }
264 >            throw new AssertionError("unexpected execution rate");
265 >        } finally {
266 >            joinPool(p);
267 >        }
268      }
269  
191
270      /**
271       * execute(null) throws NPE
272       */
# Line 250 | Line 328 | public class ScheduledExecutorSubclassTe
328      /**
329       * schedule callable throws RejectedExecutionException if shutdown
330       */
331 <     public void testSchedule3_RejectedExecutionException() {
332 <         CustomExecutor se = new CustomExecutor(1);
333 <         try {
334 <             se.shutdown();
335 <             se.schedule(new NoOpCallable(),
336 <                         MEDIUM_DELAY_MS, MILLISECONDS);
337 <             shouldThrow();
338 <         } catch (RejectedExecutionException success) {
339 <         } catch (SecurityException ok) {
340 <         }
341 <         joinPool(se);
331 >    public void testSchedule3_RejectedExecutionException() {
332 >        CustomExecutor se = new CustomExecutor(1);
333 >        try {
334 >            se.shutdown();
335 >            se.schedule(new NoOpCallable(),
336 >                        MEDIUM_DELAY_MS, MILLISECONDS);
337 >            shouldThrow();
338 >        } catch (RejectedExecutionException success) {
339 >        } catch (SecurityException ok) {
340 >        }
341 >        joinPool(se);
342      }
343  
344      /**
# Line 300 | Line 378 | public class ScheduledExecutorSubclassTe
378       * thread becomes active
379       */
380      public void testGetActiveCount() throws InterruptedException {
381 <        CustomExecutor p2 = new CustomExecutor(2);
382 <        assertEquals(0, p2.getActiveCount());
383 <        p2.execute(new SmallRunnable());
384 <        Thread.sleep(SHORT_DELAY_MS);
385 <        assertEquals(1, p2.getActiveCount());
386 <        joinPool(p2);
381 >        final ThreadPoolExecutor p = new CustomExecutor(2);
382 >        final CountDownLatch threadStarted = new CountDownLatch(1);
383 >        final CountDownLatch done = new CountDownLatch(1);
384 >        try {
385 >            assertEquals(0, p.getActiveCount());
386 >            p.execute(new CheckedRunnable() {
387 >                public void realRun() throws InterruptedException {
388 >                    threadStarted.countDown();
389 >                    assertEquals(1, p.getActiveCount());
390 >                    done.await();
391 >                }});
392 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
393 >            assertEquals(1, p.getActiveCount());
394 >        } finally {
395 >            done.countDown();
396 >            joinPool(p);
397 >        }
398      }
399  
400      /**
# Line 313 | Line 402 | public class ScheduledExecutorSubclassTe
402       * when tasks complete
403       */
404      public void testGetCompletedTaskCount() throws InterruptedException {
405 <        CustomExecutor p2 = new CustomExecutor(2);
406 <        assertEquals(0, p2.getCompletedTaskCount());
407 <        p2.execute(new SmallRunnable());
408 <        Thread.sleep(MEDIUM_DELAY_MS);
409 <        assertEquals(1, p2.getCompletedTaskCount());
410 <        joinPool(p2);
405 >        final ThreadPoolExecutor p = new CustomExecutor(2);
406 >        final CountDownLatch threadStarted = new CountDownLatch(1);
407 >        final CountDownLatch threadProceed = new CountDownLatch(1);
408 >        final CountDownLatch threadDone = new CountDownLatch(1);
409 >        try {
410 >            assertEquals(0, p.getCompletedTaskCount());
411 >            p.execute(new CheckedRunnable() {
412 >                public void realRun() throws InterruptedException {
413 >                    threadStarted.countDown();
414 >                    assertEquals(0, p.getCompletedTaskCount());
415 >                    threadProceed.await();
416 >                    threadDone.countDown();
417 >                }});
418 >            await(threadStarted);
419 >            assertEquals(0, p.getCompletedTaskCount());
420 >            threadProceed.countDown();
421 >            threadDone.await();
422 >            long startTime = System.nanoTime();
423 >            while (p.getCompletedTaskCount() != 1) {
424 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
425 >                    fail("timed out");
426 >                Thread.yield();
427 >            }
428 >        } finally {
429 >            joinPool(p);
430 >        }
431      }
432  
433      /**
434       * getCorePoolSize returns size given in constructor if not otherwise set
435       */
436      public void testGetCorePoolSize() {
437 <        CustomExecutor p1 = new CustomExecutor(1);
438 <        assertEquals(1, p1.getCorePoolSize());
439 <        joinPool(p1);
437 >        CustomExecutor p = new CustomExecutor(1);
438 >        assertEquals(1, p.getCorePoolSize());
439 >        joinPool(p);
440      }
441  
442      /**
# Line 335 | Line 444 | public class ScheduledExecutorSubclassTe
444       * multiple threads active
445       */
446      public void testGetLargestPoolSize() throws InterruptedException {
447 <        CustomExecutor p2 = new CustomExecutor(2);
448 <        assertEquals(0, p2.getLargestPoolSize());
449 <        p2.execute(new SmallRunnable());
450 <        p2.execute(new SmallRunnable());
451 <        Thread.sleep(SHORT_DELAY_MS);
452 <        assertEquals(2, p2.getLargestPoolSize());
453 <        joinPool(p2);
447 >        final int THREADS = 3;
448 >        final ThreadPoolExecutor p = new CustomExecutor(THREADS);
449 >        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
450 >        final CountDownLatch done = new CountDownLatch(1);
451 >        try {
452 >            assertEquals(0, p.getLargestPoolSize());
453 >            for (int i = 0; i < THREADS; i++)
454 >                p.execute(new CheckedRunnable() {
455 >                    public void realRun() throws InterruptedException {
456 >                        threadsStarted.countDown();
457 >                        done.await();
458 >                        assertEquals(THREADS, p.getLargestPoolSize());
459 >                    }});
460 >            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
461 >            assertEquals(THREADS, p.getLargestPoolSize());
462 >        } finally {
463 >            done.countDown();
464 >            joinPool(p);
465 >            assertEquals(THREADS, p.getLargestPoolSize());
466 >        }
467      }
468  
469      /**
470       * getPoolSize increases, but doesn't overestimate, when threads
471       * become active
472       */
473 <    public void testGetPoolSize() {
474 <        CustomExecutor p1 = new CustomExecutor(1);
475 <        assertEquals(0, p1.getPoolSize());
476 <        p1.execute(new SmallRunnable());
477 <        assertEquals(1, p1.getPoolSize());
478 <        joinPool(p1);
473 >    public void testGetPoolSize() throws InterruptedException {
474 >        final ThreadPoolExecutor p = new CustomExecutor(1);
475 >        final CountDownLatch threadStarted = new CountDownLatch(1);
476 >        final CountDownLatch done = new CountDownLatch(1);
477 >        try {
478 >            assertEquals(0, p.getPoolSize());
479 >            p.execute(new CheckedRunnable() {
480 >                public void realRun() throws InterruptedException {
481 >                    threadStarted.countDown();
482 >                    assertEquals(1, p.getPoolSize());
483 >                    done.await();
484 >                }});
485 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
486 >            assertEquals(1, p.getPoolSize());
487 >        } finally {
488 >            done.countDown();
489 >            joinPool(p);
490 >        }
491      }
492  
493      /**
# Line 361 | Line 495 | public class ScheduledExecutorSubclassTe
495       * submitted
496       */
497      public void testGetTaskCount() throws InterruptedException {
498 <        CustomExecutor p1 = new CustomExecutor(1);
499 <        assertEquals(0, p1.getTaskCount());
500 <        for (int i = 0; i < 5; i++)
501 <            p1.execute(new SmallRunnable());
502 <        Thread.sleep(SHORT_DELAY_MS);
503 <        assertEquals(5, p1.getTaskCount());
504 <        joinPool(p1);
498 >        final ThreadPoolExecutor p = new CustomExecutor(1);
499 >        final CountDownLatch threadStarted = new CountDownLatch(1);
500 >        final CountDownLatch done = new CountDownLatch(1);
501 >        final int TASKS = 5;
502 >        try {
503 >            assertEquals(0, p.getTaskCount());
504 >            for (int i = 0; i < TASKS; i++)
505 >                p.execute(new CheckedRunnable() {
506 >                    public void realRun() throws InterruptedException {
507 >                        threadStarted.countDown();
508 >                        done.await();
509 >                    }});
510 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
511 >            assertEquals(TASKS, p.getTaskCount());
512 >        } finally {
513 >            done.countDown();
514 >            joinPool(p);
515 >        }
516      }
517  
518      /**
# Line 406 | Line 551 | public class ScheduledExecutorSubclassTe
551      }
552  
553      /**
554 <     * isShutDown is false before shutdown, true after
554 >     * isShutdown is false before shutdown, true after
555       */
556      public void testIsShutdown() {
557 <        CustomExecutor p1 = new CustomExecutor(1);
557 >        CustomExecutor p = new CustomExecutor(1);
558          try {
559 <            assertFalse(p1.isShutdown());
559 >            assertFalse(p.isShutdown());
560          }
561          finally {
562 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
562 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
563          }
564 <        assertTrue(p1.isShutdown());
564 >        assertTrue(p.isShutdown());
565      }
566  
422
567      /**
568       * isTerminated is false before termination, true after
569       */
570      public void testIsTerminated() throws InterruptedException {
571 <        CustomExecutor p1 = new CustomExecutor(1);
572 <        try {
573 <            p1.execute(new SmallRunnable());
571 >        final ThreadPoolExecutor p = new CustomExecutor(1);
572 >        final CountDownLatch threadStarted = new CountDownLatch(1);
573 >        final CountDownLatch done = new CountDownLatch(1);
574 >        assertFalse(p.isTerminated());
575 >        try {
576 >            p.execute(new CheckedRunnable() {
577 >                public void realRun() throws InterruptedException {
578 >                    assertFalse(p.isTerminated());
579 >                    threadStarted.countDown();
580 >                    done.await();
581 >                }});
582 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
583 >            assertFalse(p.isTerminating());
584 >            done.countDown();
585          } finally {
586 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
586 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
587          }
588 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
589 <        assertTrue(p1.isTerminated());
588 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
589 >        assertTrue(p.isTerminated());
590      }
591  
592      /**
593       * isTerminating is not true when running or when terminated
594       */
595      public void testIsTerminating() throws InterruptedException {
596 <        CustomExecutor p1 = new CustomExecutor(1);
597 <        assertFalse(p1.isTerminating());
598 <        try {
599 <            p1.execute(new SmallRunnable());
600 <            assertFalse(p1.isTerminating());
601 <        } finally {
602 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
603 <        }
604 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
605 <        assertTrue(p1.isTerminated());
606 <        assertFalse(p1.isTerminating());
596 >        final ThreadPoolExecutor p = new CustomExecutor(1);
597 >        final CountDownLatch threadStarted = new CountDownLatch(1);
598 >        final CountDownLatch done = new CountDownLatch(1);
599 >        try {
600 >            assertFalse(p.isTerminating());
601 >            p.execute(new CheckedRunnable() {
602 >                public void realRun() throws InterruptedException {
603 >                    assertFalse(p.isTerminating());
604 >                    threadStarted.countDown();
605 >                    done.await();
606 >                }});
607 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
608 >            assertFalse(p.isTerminating());
609 >            done.countDown();
610 >        } finally {
611 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
612 >        }
613 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
614 >        assertTrue(p.isTerminated());
615 >        assertFalse(p.isTerminating());
616      }
617  
618      /**
619       * getQueue returns the work queue, which contains queued tasks
620       */
621      public void testGetQueue() throws InterruptedException {
622 <        CustomExecutor p1 = new CustomExecutor(1);
623 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
624 <        for (int i = 0; i < 5; i++) {
625 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
626 <        }
627 <        try {
628 <            Thread.sleep(SHORT_DELAY_MS);
629 <            BlockingQueue<Runnable> q = p1.getQueue();
630 <            assertTrue(q.contains(tasks[4]));
622 >        ScheduledThreadPoolExecutor p = new CustomExecutor(1);
623 >        final CountDownLatch threadStarted = new CountDownLatch(1);
624 >        final CountDownLatch done = new CountDownLatch(1);
625 >        try {
626 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
627 >            for (int i = 0; i < tasks.length; i++) {
628 >                Runnable r = new CheckedRunnable() {
629 >                    public void realRun() throws InterruptedException {
630 >                        threadStarted.countDown();
631 >                        done.await();
632 >                    }};
633 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
634 >            }
635 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
636 >            BlockingQueue<Runnable> q = p.getQueue();
637 >            assertTrue(q.contains(tasks[tasks.length - 1]));
638              assertFalse(q.contains(tasks[0]));
639          } finally {
640 <            joinPool(p1);
640 >            done.countDown();
641 >            joinPool(p);
642          }
643      }
644  
# Line 474 | Line 646 | public class ScheduledExecutorSubclassTe
646       * remove(task) removes queued task, and fails to remove active task
647       */
648      public void testRemove() throws InterruptedException {
649 <        CustomExecutor p1 = new CustomExecutor(1);
649 >        final ScheduledThreadPoolExecutor p = new CustomExecutor(1);
650          ScheduledFuture[] tasks = new ScheduledFuture[5];
651 <        for (int i = 0; i < 5; i++) {
652 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
481 <        }
651 >        final CountDownLatch threadStarted = new CountDownLatch(1);
652 >        final CountDownLatch done = new CountDownLatch(1);
653          try {
654 <            Thread.sleep(SHORT_DELAY_MS);
655 <            BlockingQueue<Runnable> q = p1.getQueue();
656 <            assertFalse(p1.remove((Runnable)tasks[0]));
654 >            for (int i = 0; i < tasks.length; i++) {
655 >                Runnable r = new CheckedRunnable() {
656 >                    public void realRun() throws InterruptedException {
657 >                        threadStarted.countDown();
658 >                        done.await();
659 >                    }};
660 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
661 >            }
662 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
663 >            BlockingQueue<Runnable> q = p.getQueue();
664 >            assertFalse(p.remove((Runnable)tasks[0]));
665              assertTrue(q.contains((Runnable)tasks[4]));
666              assertTrue(q.contains((Runnable)tasks[3]));
667 <            assertTrue(p1.remove((Runnable)tasks[4]));
668 <            assertFalse(p1.remove((Runnable)tasks[4]));
667 >            assertTrue(p.remove((Runnable)tasks[4]));
668 >            assertFalse(p.remove((Runnable)tasks[4]));
669              assertFalse(q.contains((Runnable)tasks[4]));
670              assertTrue(q.contains((Runnable)tasks[3]));
671 <            assertTrue(p1.remove((Runnable)tasks[3]));
671 >            assertTrue(p.remove((Runnable)tasks[3]));
672              assertFalse(q.contains((Runnable)tasks[3]));
673          } finally {
674 <            joinPool(p1);
674 >            done.countDown();
675 >            joinPool(p);
676          }
677      }
678  
# Line 500 | Line 680 | public class ScheduledExecutorSubclassTe
680       * purge removes cancelled tasks from the queue
681       */
682      public void testPurge() throws InterruptedException {
683 <        CustomExecutor p1 = new CustomExecutor(1);
683 >        CustomExecutor p = new CustomExecutor(1);
684          ScheduledFuture[] tasks = new ScheduledFuture[5];
685 <        for (int i = 0; i < 5; i++) {
686 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
687 <        }
685 >        for (int i = 0; i < tasks.length; i++)
686 >            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
687 >                                  LONG_DELAY_MS, MILLISECONDS);
688          try {
689 <            int max = 5;
689 >            int max = tasks.length;
690              if (tasks[4].cancel(true)) --max;
691              if (tasks[3].cancel(true)) --max;
692              // There must eventually be an interference-free point at
693              // which purge will not fail. (At worst, when queue is empty.)
694 <            int k;
695 <            for (k = 0; k < SMALL_DELAY_MS; ++k) {
696 <                p1.purge();
697 <                long count = p1.getTaskCount();
698 <                if (count >= 0 && count <= max)
699 <                    break;
700 <                Thread.sleep(1);
701 <            }
522 <            assertTrue(k < SMALL_DELAY_MS);
694 >            long startTime = System.nanoTime();
695 >            do {
696 >                p.purge();
697 >                long count = p.getTaskCount();
698 >                if (count == max)
699 >                    return;
700 >            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
701 >            fail("Purge failed to remove cancelled tasks");
702          } finally {
703 <            joinPool(p1);
703 >            for (ScheduledFuture task : tasks)
704 >                task.cancel(true);
705 >            joinPool(p);
706          }
707      }
708  
709      /**
710 <     * shutDownNow returns a list containing tasks that were not run
710 >     * shutdownNow returns a list containing tasks that were not run,
711 >     * and those tasks are drained from the queue
712       */
713 <    public void testShutDownNow() {
714 <        CustomExecutor p1 = new CustomExecutor(1);
715 <        for (int i = 0; i < 5; i++)
716 <            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
717 <        List l;
713 >    public void testShutdownNow_delayedTasks() throws InterruptedException {
714 >        CustomExecutor p = new CustomExecutor(1);
715 >        List<ScheduledFuture> tasks = new ArrayList<>();
716 >        for (int i = 0; i < 3; i++) {
717 >            Runnable r = new NoOpRunnable();
718 >            tasks.add(p.schedule(r, 9, SECONDS));
719 >            tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
720 >            tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
721 >        }
722 >        assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
723 >        final List<Runnable> queuedTasks;
724          try {
725 <            l = p1.shutdownNow();
725 >            queuedTasks = p.shutdownNow();
726          } catch (SecurityException ok) {
727 <            return;
727 >            return; // Allowed in case test doesn't have privs
728 >        }
729 >        assertTrue(p.isShutdown());
730 >        assertTrue(p.getQueue().isEmpty());
731 >        assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
732 >        assertEquals(tasks.size(), queuedTasks.size());
733 >        for (ScheduledFuture task : tasks) {
734 >            assertFalse(((CustomTask)task).ran);
735 >            assertFalse(task.isDone());
736 >            assertFalse(task.isCancelled());
737          }
738 <        assertTrue(p1.isShutdown());
739 <        assertTrue(l.size() > 0 && l.size() <= 5);
543 <        joinPool(p1);
738 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
739 >        assertTrue(p.isTerminated());
740      }
741  
742      /**
743       * In default setting, shutdown cancels periodic but not delayed
744       * tasks at shutdown
745       */
746 <    public void testShutDown1() throws InterruptedException {
747 <        CustomExecutor p1 = new CustomExecutor(1);
748 <        assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
749 <        assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
746 >    public void testShutdown1() throws InterruptedException {
747 >        CustomExecutor p = new CustomExecutor(1);
748 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
749 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
750  
751          ScheduledFuture[] tasks = new ScheduledFuture[5];
752 <        for (int i = 0; i < 5; i++)
753 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
754 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
755 <        BlockingQueue q = p1.getQueue();
756 <        for (Iterator it = q.iterator(); it.hasNext();) {
757 <            ScheduledFuture t = (ScheduledFuture)it.next();
758 <            assertFalse(t.isCancelled());
759 <        }
760 <        assertTrue(p1.isShutdown());
761 <        Thread.sleep(SMALL_DELAY_MS);
762 <        for (int i = 0; i < 5; ++i) {
763 <            assertTrue(tasks[i].isDone());
764 <            assertFalse(tasks[i].isCancelled());
752 >        for (int i = 0; i < tasks.length; i++)
753 >            tasks[i] = p.schedule(new NoOpRunnable(),
754 >                                  SHORT_DELAY_MS, MILLISECONDS);
755 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
756 >        BlockingQueue<Runnable> q = p.getQueue();
757 >        for (ScheduledFuture task : tasks) {
758 >            assertFalse(task.isDone());
759 >            assertFalse(task.isCancelled());
760 >            assertTrue(q.contains(task));
761 >        }
762 >        assertTrue(p.isShutdown());
763 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
764 >        assertTrue(p.isTerminated());
765 >        for (ScheduledFuture task : tasks) {
766 >            assertTrue(task.isDone());
767 >            assertFalse(task.isCancelled());
768          }
769      }
770  
572
771      /**
772       * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
773       * delayed tasks are cancelled at shutdown
774       */
775 <    public void testShutDown2() throws InterruptedException {
776 <        CustomExecutor p1 = new CustomExecutor(1);
777 <        p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
775 >    public void testShutdown2() throws InterruptedException {
776 >        CustomExecutor p = new CustomExecutor(1);
777 >        p.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
778 >        assertFalse(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
779 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
780          ScheduledFuture[] tasks = new ScheduledFuture[5];
781 <        for (int i = 0; i < 5; i++)
782 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
783 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
784 <        assertTrue(p1.isShutdown());
785 <        BlockingQueue q = p1.getQueue();
781 >        for (int i = 0; i < tasks.length; i++)
782 >            tasks[i] = p.schedule(new NoOpRunnable(),
783 >                                  SHORT_DELAY_MS, MILLISECONDS);
784 >        BlockingQueue q = p.getQueue();
785 >        assertEquals(tasks.length, q.size());
786 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
787 >        assertTrue(p.isShutdown());
788          assertTrue(q.isEmpty());
789 <        Thread.sleep(SMALL_DELAY_MS);
790 <        assertTrue(p1.isTerminated());
789 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
790 >        assertTrue(p.isTerminated());
791 >        for (ScheduledFuture task : tasks) {
792 >            assertTrue(task.isDone());
793 >            assertTrue(task.isCancelled());
794 >        }
795      }
796  
591
797      /**
798       * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
799 <     * periodic tasks are not cancelled at shutdown
799 >     * periodic tasks are cancelled at shutdown
800       */
801 <    public void testShutDown3() throws InterruptedException {
802 <        CustomExecutor p1 = new CustomExecutor(1);
803 <        p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
801 >    public void testShutdown3() throws InterruptedException {
802 >        CustomExecutor p = new CustomExecutor(1);
803 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
804 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
805 >        p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
806 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
807 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
808 >        long initialDelay = LONG_DELAY_MS;
809          ScheduledFuture task =
810 <            p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, MILLISECONDS);
811 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
812 <        assertTrue(p1.isShutdown());
813 <        BlockingQueue q = p1.getQueue();
814 <        assertTrue(q.isEmpty());
815 <        Thread.sleep(SHORT_DELAY_MS);
816 <        assertTrue(p1.isTerminated());
810 >            p.scheduleAtFixedRate(new NoOpRunnable(), initialDelay,
811 >                                  5, MILLISECONDS);
812 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
813 >        assertTrue(p.isShutdown());
814 >        assertTrue(p.getQueue().isEmpty());
815 >        assertTrue(task.isDone());
816 >        assertTrue(task.isCancelled());
817 >        joinPool(p);
818      }
819  
820      /**
821       * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
822 <     * periodic tasks are cancelled at shutdown
822 >     * periodic tasks are not cancelled at shutdown
823       */
824 <    public void testShutDown4() throws InterruptedException {
825 <        CustomExecutor p1 = new CustomExecutor(1);
824 >    public void testShutdown4() throws InterruptedException {
825 >        CustomExecutor p = new CustomExecutor(1);
826 >        final CountDownLatch counter = new CountDownLatch(2);
827          try {
828 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
828 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
829 >            assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
830 >            assertTrue(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
831 >            final Runnable r = new CheckedRunnable() {
832 >                public void realRun() {
833 >                    counter.countDown();
834 >                }};
835              ScheduledFuture task =
836 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, MILLISECONDS);
836 >                p.scheduleAtFixedRate(r, 1, 1, MILLISECONDS);
837 >            assertFalse(task.isDone());
838              assertFalse(task.isCancelled());
839 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
839 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
840              assertFalse(task.isCancelled());
841 <            assertFalse(p1.isTerminated());
842 <            assertTrue(p1.isShutdown());
843 <            Thread.sleep(SHORT_DELAY_MS);
841 >            assertFalse(p.isTerminated());
842 >            assertTrue(p.isShutdown());
843 >            assertTrue(counter.await(SMALL_DELAY_MS, MILLISECONDS));
844              assertFalse(task.isCancelled());
845 <            assertTrue(task.cancel(true));
845 >            assertTrue(task.cancel(false));
846              assertTrue(task.isDone());
847 <            Thread.sleep(SHORT_DELAY_MS);
848 <            assertTrue(p1.isTerminated());
847 >            assertTrue(task.isCancelled());
848 >            assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
849 >            assertTrue(p.isTerminated());
850          }
851          finally {
852 <            joinPool(p1);
852 >            joinPool(p);
853          }
854      }
855  
# Line 1037 | Line 1257 | public class ScheduledExecutorSubclassTe
1257      public void testTimedInvokeAll6() throws Exception {
1258          ExecutorService e = new CustomExecutor(2);
1259          try {
1260 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1261 <            l.add(new StringTask());
1262 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1263 <            l.add(new StringTask());
1264 <            List<Future<String>> futures =
1265 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1266 <            assertEquals(3, futures.size());
1267 <            Iterator<Future<String>> it = futures.iterator();
1268 <            Future<String> f1 = it.next();
1269 <            Future<String> f2 = it.next();
1270 <            Future<String> f3 = it.next();
1271 <            assertTrue(f1.isDone());
1272 <            assertTrue(f2.isDone());
1273 <            assertTrue(f3.isDone());
1274 <            assertFalse(f1.isCancelled());
1275 <            assertTrue(f2.isCancelled());
1260 >            for (long timeout = timeoutMillis();;) {
1261 >                List<Callable<String>> tasks = new ArrayList<>();
1262 >                tasks.add(new StringTask("0"));
1263 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1264 >                tasks.add(new StringTask("2"));
1265 >                long startTime = System.nanoTime();
1266 >                List<Future<String>> futures =
1267 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1268 >                assertEquals(tasks.size(), futures.size());
1269 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1270 >                for (Future future : futures)
1271 >                    assertTrue(future.isDone());
1272 >                assertTrue(futures.get(1).isCancelled());
1273 >                try {
1274 >                    assertEquals("0", futures.get(0).get());
1275 >                    assertEquals("2", futures.get(2).get());
1276 >                    break;
1277 >                } catch (CancellationException retryWithLongerTimeout) {
1278 >                    timeout *= 2;
1279 >                    if (timeout >= LONG_DELAY_MS / 2)
1280 >                        fail("expected exactly one task to be cancelled");
1281 >                }
1282 >            }
1283          } finally {
1284              joinPool(e);
1285          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines