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.3 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.22 by jsr166, Sat May 7 19:34:51 2011 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.*;
10 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
11   import java.util.concurrent.atomic.*;
12  
13   public class ScheduledExecutorSubclassTest extends JSR166TestCase {
14      public static void main(String[] args) {
15 <        junit.textui.TestRunner.run (suite());
15 >        junit.textui.TestRunner.run(suite());
16      }
17      public static Test suite() {
18 <        return new TestSuite(ScheduledExecutorTest.class);
18 >        return new TestSuite(ScheduledExecutorSubclassTest.class);
19      }
20  
21      static class CustomTask<V> implements RunnableScheduledFuture<V> {
# Line 73 | Line 74 | public class ScheduledExecutorSubclassTe
74      }
75  
76  
76
77      /**
78       * execute successfully executes a runnable
79       */
80 <    public void testExecute() {
81 <        try {
82 <            TrackedShortRunnable runnable =new TrackedShortRunnable();
83 <            CustomExecutor p1 = new CustomExecutor(1);
84 <            p1.execute(runnable);
85 <            assertFalse(runnable.done);
86 <            Thread.sleep(SHORT_DELAY_MS);
87 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
88 <            try {
89 <                Thread.sleep(MEDIUM_DELAY_MS);
90 <            } catch (InterruptedException e){
91 <                unexpectedException();
92 <            }
93 <            assertTrue(runnable.done);
94 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
95 <            joinPool(p1);
96 <        }
97 <        catch (Exception e){
98 <            unexpectedException();
80 >    public void testExecute() throws InterruptedException {
81 >        CustomExecutor p = new CustomExecutor(1);
82 >        final CountDownLatch done = new CountDownLatch(1);
83 >        final Runnable task = new CheckedRunnable() {
84 >            public void realRun() {
85 >                done.countDown();
86 >            }};
87 >        try {
88 >            p.execute(task);
89 >            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
90 >        } finally {
91 >            joinPool(p);
92          }
100
93      }
94  
95  
96      /**
97       * delayed schedule of callable successfully executes after delay
98       */
99 <    public void testSchedule1() {
100 <        try {
101 <            TrackedCallable callable = new TrackedCallable();
102 <            CustomExecutor p1 = new CustomExecutor(1);
103 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
104 <            assertFalse(callable.done);
105 <            Thread.sleep(MEDIUM_DELAY_MS);
106 <            assertTrue(callable.done);
107 <            assertEquals(Boolean.TRUE, f.get());
108 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
109 <            joinPool(p1);
110 <        } catch (RejectedExecutionException e){}
111 <        catch (Exception e){
112 <            e.printStackTrace();
113 <            unexpectedException();
99 >    public void testSchedule1() throws Exception {
100 >        CustomExecutor p = new CustomExecutor(1);
101 >        final long t0 = System.nanoTime();
102 >        final long timeoutNanos = SHORT_DELAY_MS * 1000L * 1000L;
103 >        final CountDownLatch done = new CountDownLatch(1);
104 >        try {
105 >            Callable task = new CheckedCallable<Boolean>() {
106 >                public Boolean realCall() {
107 >                    done.countDown();
108 >                    assertTrue(System.nanoTime() - t0 >= timeoutNanos);
109 >                    return Boolean.TRUE;
110 >                }};
111 >            Future f = p.schedule(task, SHORT_DELAY_MS, MILLISECONDS);
112 >            assertEquals(Boolean.TRUE, f.get());
113 >            assertTrue(System.nanoTime() - t0 >= timeoutNanos);
114 >            assertTrue(done.await(0L, MILLISECONDS));
115 >        } finally {
116 >            joinPool(p);
117          }
118      }
119  
120      /**
121 <     *  delayed schedule of runnable successfully executes after delay
122 <     */
123 <    public void testSchedule3() {
124 <        try {
125 <            TrackedShortRunnable runnable = new TrackedShortRunnable();
126 <            CustomExecutor p1 = new CustomExecutor(1);
127 <            p1.schedule(runnable, SMALL_DELAY_MS, TimeUnit.MILLISECONDS);
128 <            Thread.sleep(SHORT_DELAY_MS);
129 <            assertFalse(runnable.done);
130 <            Thread.sleep(MEDIUM_DELAY_MS);
131 <            assertTrue(runnable.done);
132 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
133 <            joinPool(p1);
134 <        } catch (Exception e){
135 <            unexpectedException();
121 >     * delayed schedule of runnable successfully executes after delay
122 >     */
123 >    public void testSchedule3() throws Exception {
124 >        CustomExecutor p = new CustomExecutor(1);
125 >        final long t0 = System.nanoTime();
126 >        final long timeoutNanos = SHORT_DELAY_MS * 1000L * 1000L;
127 >        final CountDownLatch done = new CountDownLatch(1);
128 >        try {
129 >            Runnable task = new CheckedRunnable() {
130 >                public void realRun() {
131 >                    done.countDown();
132 >                    assertTrue(System.nanoTime() - t0 >= timeoutNanos);
133 >                }};
134 >            Future f = p.schedule(task, SHORT_DELAY_MS, MILLISECONDS);
135 >            assertNull(f.get());
136 >            assertTrue(System.nanoTime() - t0 >= timeoutNanos);
137 >            assertTrue(done.await(0L, MILLISECONDS));
138 >        } finally {
139 >            joinPool(p);
140          }
141      }
142  
143      /**
144       * scheduleAtFixedRate executes runnable after given initial delay
145       */
146 <    public void testSchedule4() {
147 <        try {
148 <            TrackedShortRunnable runnable = new TrackedShortRunnable();
149 <            CustomExecutor p1 = new CustomExecutor(1);
150 <            ScheduledFuture h = p1.scheduleAtFixedRate(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
151 <            assertFalse(runnable.done);
152 <            Thread.sleep(MEDIUM_DELAY_MS);
153 <            assertTrue(runnable.done);
154 <            h.cancel(true);
155 <            joinPool(p1);
156 <        } catch (Exception e){
157 <            unexpectedException();
146 >    public void testSchedule4() throws InterruptedException {
147 >        CustomExecutor p = new CustomExecutor(1);
148 >        final long t0 = System.nanoTime();
149 >        final long timeoutNanos = SHORT_DELAY_MS * 1000L * 1000L;
150 >        final CountDownLatch done = new CountDownLatch(1);
151 >        try {
152 >            Runnable task = new CheckedRunnable() {
153 >                public void realRun() {
154 >                    done.countDown();
155 >                    assertTrue(System.nanoTime() - t0 >= timeoutNanos);
156 >                }};
157 >            ScheduledFuture f =
158 >                p.scheduleAtFixedRate(task, SHORT_DELAY_MS,
159 >                                      SHORT_DELAY_MS, MILLISECONDS);
160 >            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
161 >            assertTrue(System.nanoTime() - t0 >= timeoutNanos);
162 >            f.cancel(true);
163 >        } finally {
164 >            joinPool(p);
165          }
166      }
167  
162    static class RunnableCounter implements Runnable {
163        AtomicInteger count = new AtomicInteger(0);
164        public void run() { count.getAndIncrement(); }
165    }
166
168      /**
169       * scheduleWithFixedDelay executes runnable after given initial delay
170       */
171 <    public void testSchedule5() {
172 <        try {
173 <            TrackedShortRunnable runnable = new TrackedShortRunnable();
174 <            CustomExecutor p1 = new CustomExecutor(1);
175 <            ScheduledFuture h = p1.scheduleWithFixedDelay(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
176 <            assertFalse(runnable.done);
177 <            Thread.sleep(MEDIUM_DELAY_MS);
178 <            assertTrue(runnable.done);
179 <            h.cancel(true);
180 <            joinPool(p1);
181 <        } catch (Exception e){
182 <            unexpectedException();
171 >    public void testSchedule5() throws InterruptedException {
172 >        CustomExecutor p = new CustomExecutor(1);
173 >        final long t0 = System.nanoTime();
174 >        final long timeoutNanos = SHORT_DELAY_MS * 1000L * 1000L;
175 >        final CountDownLatch done = new CountDownLatch(1);
176 >        try {
177 >            Runnable task = new CheckedRunnable() {
178 >                public void realRun() {
179 >                    done.countDown();
180 >                    assertTrue(System.nanoTime() - t0 >= timeoutNanos);
181 >                }};
182 >            ScheduledFuture f =
183 >                p.scheduleWithFixedDelay(task, SHORT_DELAY_MS,
184 >                                         SHORT_DELAY_MS, MILLISECONDS);
185 >            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
186 >            assertTrue(System.nanoTime() - t0 >= timeoutNanos);
187 >            f.cancel(true);
188 >        } finally {
189 >            joinPool(p);
190          }
191      }
192  
193 +    static class RunnableCounter implements Runnable {
194 +        AtomicInteger count = new AtomicInteger(0);
195 +        public void run() { count.getAndIncrement(); }
196 +    }
197 +
198      /**
199       * scheduleAtFixedRate executes series of tasks at given rate
200       */
201 <    public void testFixedRateSequence() {
202 <        try {
203 <            CustomExecutor p1 = new CustomExecutor(1);
204 <            RunnableCounter counter = new RunnableCounter();
205 <            ScheduledFuture h =
206 <                p1.scheduleAtFixedRate(counter, 0, 1, TimeUnit.MILLISECONDS);
207 <            Thread.sleep(SMALL_DELAY_MS);
208 <            h.cancel(true);
209 <            int c = counter.count.get();
210 <            // By time scaling conventions, we must have at least
211 <            // an execution per SHORT delay, but no more than one SHORT more
212 <            assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
213 <            assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
201 <            joinPool(p1);
202 <        } catch (Exception e){
203 <            unexpectedException();
204 <        }
201 >    public void testFixedRateSequence() throws InterruptedException {
202 >        CustomExecutor p = new CustomExecutor(1);
203 >        RunnableCounter counter = new RunnableCounter();
204 >        ScheduledFuture h =
205 >            p.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
206 >        delay(SMALL_DELAY_MS);
207 >        h.cancel(true);
208 >        int c = counter.count.get();
209 >        // By time scaling conventions, we must have at least
210 >        // an execution per SHORT delay, but no more than one SHORT more
211 >        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
212 >        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
213 >        joinPool(p);
214      }
215  
216      /**
217       * scheduleWithFixedDelay executes series of tasks with given period
218       */
219 <    public void testFixedDelaySequence() {
220 <        try {
221 <            CustomExecutor p1 = new CustomExecutor(1);
222 <            RunnableCounter counter = new RunnableCounter();
223 <            ScheduledFuture h =
224 <                p1.scheduleWithFixedDelay(counter, 0, 1, TimeUnit.MILLISECONDS);
225 <            Thread.sleep(SMALL_DELAY_MS);
226 <            h.cancel(true);
227 <            int c = counter.count.get();
228 <            assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
229 <            assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
221 <            joinPool(p1);
222 <        } catch (Exception e){
223 <            unexpectedException();
224 <        }
219 >    public void testFixedDelaySequence() throws InterruptedException {
220 >        CustomExecutor p = new CustomExecutor(1);
221 >        RunnableCounter counter = new RunnableCounter();
222 >        ScheduledFuture h =
223 >            p.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
224 >        delay(SMALL_DELAY_MS);
225 >        h.cancel(true);
226 >        int c = counter.count.get();
227 >        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
228 >        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
229 >        joinPool(p);
230      }
231  
232  
233      /**
234 <     *  execute (null) throws NPE
234 >     * execute(null) throws NPE
235       */
236 <    public void testExecuteNull() {
237 <        CustomExecutor se = null;
236 >    public void testExecuteNull() throws InterruptedException {
237 >        CustomExecutor se = new CustomExecutor(1);
238          try {
239 <            se = new CustomExecutor(1);
235 <            se.execute(null);
239 >            se.execute(null);
240              shouldThrow();
241 <        } catch (NullPointerException success){}
242 <        catch (Exception e){
239 <            unexpectedException();
240 <        }
241 <
242 <        joinPool(se);
241 >        } catch (NullPointerException success) {}
242 >        joinPool(se);
243      }
244  
245      /**
246 <     * schedule (null) throws NPE
246 >     * schedule(null) throws NPE
247       */
248 <    public void testScheduleNull() {
248 >    public void testScheduleNull() throws InterruptedException {
249          CustomExecutor se = new CustomExecutor(1);
250 <        try {
250 >        try {
251              TrackedCallable callable = null;
252 <            Future f = se.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
252 >            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
253              shouldThrow();
254 <        } catch (NullPointerException success){}
255 <        catch (Exception e){
256 <            unexpectedException();
257 <        }
258 <        joinPool(se);
254 >        } catch (NullPointerException success) {}
255 >        joinPool(se);
256      }
257  
258      /**
# Line 266 | Line 263 | public class ScheduledExecutorSubclassTe
263          try {
264              se.shutdown();
265              se.schedule(new NoOpRunnable(),
266 <                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
266 >                        MEDIUM_DELAY_MS, MILLISECONDS);
267              shouldThrow();
268 <        } catch (RejectedExecutionException success){
268 >        } catch (RejectedExecutionException success) {
269          } catch (SecurityException ok) {
270          }
271  
272          joinPool(se);
276
273      }
274  
275      /**
# Line 284 | Line 280 | public class ScheduledExecutorSubclassTe
280          try {
281              se.shutdown();
282              se.schedule(new NoOpCallable(),
283 <                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
283 >                        MEDIUM_DELAY_MS, MILLISECONDS);
284              shouldThrow();
285 <        } catch (RejectedExecutionException success){
285 >        } catch (RejectedExecutionException success) {
286          } catch (SecurityException ok) {
287          }
288          joinPool(se);
# Line 295 | Line 291 | public class ScheduledExecutorSubclassTe
291      /**
292       * schedule callable throws RejectedExecutionException if shutdown
293       */
294 <     public void testSchedule3_RejectedExecutionException() {
295 <         CustomExecutor se = new CustomExecutor(1);
296 <         try {
294 >    public void testSchedule3_RejectedExecutionException() {
295 >        CustomExecutor se = new CustomExecutor(1);
296 >        try {
297              se.shutdown();
298              se.schedule(new NoOpCallable(),
299 <                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
299 >                        MEDIUM_DELAY_MS, MILLISECONDS);
300              shouldThrow();
301 <        } catch (RejectedExecutionException success){
301 >        } catch (RejectedExecutionException success) {
302          } catch (SecurityException ok) {
303          }
304 <         joinPool(se);
304 >        joinPool(se);
305      }
306  
307      /**
308 <     *  scheduleAtFixedRate throws RejectedExecutionException if shutdown
308 >     * scheduleAtFixedRate throws RejectedExecutionException if shutdown
309       */
310      public void testScheduleAtFixedRate1_RejectedExecutionException() {
311          CustomExecutor se = new CustomExecutor(1);
312          try {
313              se.shutdown();
314              se.scheduleAtFixedRate(new NoOpRunnable(),
315 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
315 >                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
316              shouldThrow();
317 <        } catch (RejectedExecutionException success){
317 >        } catch (RejectedExecutionException success) {
318          } catch (SecurityException ok) {
319          }
320          joinPool(se);
# Line 332 | Line 328 | public class ScheduledExecutorSubclassTe
328          try {
329              se.shutdown();
330              se.scheduleWithFixedDelay(new NoOpRunnable(),
331 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
331 >                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
332              shouldThrow();
333 <        } catch (RejectedExecutionException success){
333 >        } catch (RejectedExecutionException success) {
334          } catch (SecurityException ok) {
335          }
336          joinPool(se);
337      }
338  
339      /**
340 <     *  getActiveCount increases but doesn't overestimate, when a
341 <     *  thread becomes active
340 >     * getActiveCount increases but doesn't overestimate, when a
341 >     * thread becomes active
342       */
343 <    public void testGetActiveCount() {
344 <        CustomExecutor p2 = new CustomExecutor(2);
345 <        assertEquals(0, p2.getActiveCount());
346 <        p2.execute(new SmallRunnable());
347 <        try {
348 <            Thread.sleep(SHORT_DELAY_MS);
349 <        } catch (Exception e){
350 <            unexpectedException();
343 >    public void testGetActiveCount() throws InterruptedException {
344 >        final ThreadPoolExecutor p = new CustomExecutor(2);
345 >        final CountDownLatch threadStarted = new CountDownLatch(1);
346 >        final CountDownLatch done = new CountDownLatch(1);
347 >        try {
348 >            assertEquals(0, p.getActiveCount());
349 >            p.execute(new CheckedRunnable() {
350 >                public void realRun() throws InterruptedException {
351 >                    threadStarted.countDown();
352 >                    assertEquals(1, p.getActiveCount());
353 >                    done.await();
354 >                }});
355 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
356 >            assertEquals(1, p.getActiveCount());
357 >        } finally {
358 >            done.countDown();
359 >            joinPool(p);
360          }
356        assertEquals(1, p2.getActiveCount());
357        joinPool(p2);
361      }
362  
363      /**
364 <     *    getCompletedTaskCount increases, but doesn't overestimate,
365 <     *   when tasks complete
364 >     * getCompletedTaskCount increases, but doesn't overestimate,
365 >     * when tasks complete
366       */
367 <    public void testGetCompletedTaskCount() {
368 <        CustomExecutor p2 = new CustomExecutor(2);
369 <        assertEquals(0, p2.getCompletedTaskCount());
370 <        p2.execute(new SmallRunnable());
371 <        try {
372 <            Thread.sleep(MEDIUM_DELAY_MS);
373 <        } catch (Exception e){
374 <            unexpectedException();
367 >    public void testGetCompletedTaskCount() throws InterruptedException {
368 >        final ThreadPoolExecutor p = new CustomExecutor(2);
369 >        final CountDownLatch threadStarted = new CountDownLatch(1);
370 >        final CountDownLatch threadProceed = new CountDownLatch(1);
371 >        final CountDownLatch threadDone = new CountDownLatch(1);
372 >        try {
373 >            assertEquals(0, p.getCompletedTaskCount());
374 >            p.execute(new CheckedRunnable() {
375 >                public void realRun() throws InterruptedException {
376 >                    threadStarted.countDown();
377 >                    assertEquals(0, p.getCompletedTaskCount());
378 >                    threadProceed.await();
379 >                    threadDone.countDown();
380 >                }});
381 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
382 >            assertEquals(0, p.getCompletedTaskCount());
383 >            threadProceed.countDown();
384 >            threadDone.await();
385 >            delay(SHORT_DELAY_MS);
386 >            assertEquals(1, p.getCompletedTaskCount());
387 >        } finally {
388 >            joinPool(p);
389          }
373        assertEquals(1, p2.getCompletedTaskCount());
374        joinPool(p2);
390      }
391  
392      /**
393 <     *  getCorePoolSize returns size given in constructor if not otherwise set
393 >     * getCorePoolSize returns size given in constructor if not otherwise set
394       */
395      public void testGetCorePoolSize() {
396 <        CustomExecutor p1 = new CustomExecutor(1);
397 <        assertEquals(1, p1.getCorePoolSize());
398 <        joinPool(p1);
396 >        CustomExecutor p = new CustomExecutor(1);
397 >        assertEquals(1, p.getCorePoolSize());
398 >        joinPool(p);
399      }
400  
401      /**
402 <     *    getLargestPoolSize increases, but doesn't overestimate, when
403 <     *   multiple threads active
402 >     * getLargestPoolSize increases, but doesn't overestimate, when
403 >     * multiple threads active
404       */
405 <    public void testGetLargestPoolSize() {
406 <        CustomExecutor p2 = new CustomExecutor(2);
407 <        assertEquals(0, p2.getLargestPoolSize());
408 <        p2.execute(new SmallRunnable());
409 <        p2.execute(new SmallRunnable());
410 <        try {
411 <            Thread.sleep(SHORT_DELAY_MS);
412 <        } catch (Exception e){
413 <            unexpectedException();
405 >    public void testGetLargestPoolSize() throws InterruptedException {
406 >        final int THREADS = 3;
407 >        final ThreadPoolExecutor p = new CustomExecutor(THREADS);
408 >        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
409 >        final CountDownLatch done = new CountDownLatch(1);
410 >        try {
411 >            assertEquals(0, p.getLargestPoolSize());
412 >            for (int i = 0; i < THREADS; i++)
413 >                p.execute(new CheckedRunnable() {
414 >                    public void realRun() throws InterruptedException {
415 >                        threadsStarted.countDown();
416 >                        done.await();
417 >                        assertEquals(THREADS, p.getLargestPoolSize());
418 >                    }});
419 >            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
420 >            assertEquals(THREADS, p.getLargestPoolSize());
421 >        } finally {
422 >            done.countDown();
423 >            joinPool(p);
424 >            assertEquals(THREADS, p.getLargestPoolSize());
425          }
400        assertEquals(2, p2.getLargestPoolSize());
401        joinPool(p2);
426      }
427  
428      /**
429 <     *   getPoolSize increases, but doesn't overestimate, when threads
430 <     *   become active
429 >     * getPoolSize increases, but doesn't overestimate, when threads
430 >     * become active
431       */
432 <    public void testGetPoolSize() {
433 <        CustomExecutor p1 = new CustomExecutor(1);
434 <        assertEquals(0, p1.getPoolSize());
435 <        p1.execute(new SmallRunnable());
436 <        assertEquals(1, p1.getPoolSize());
437 <        joinPool(p1);
432 >    public void testGetPoolSize() throws InterruptedException {
433 >        final ThreadPoolExecutor p = new CustomExecutor(1);
434 >        final CountDownLatch threadStarted = new CountDownLatch(1);
435 >        final CountDownLatch done = new CountDownLatch(1);
436 >        try {
437 >            assertEquals(0, p.getPoolSize());
438 >            p.execute(new CheckedRunnable() {
439 >                public void realRun() throws InterruptedException {
440 >                    threadStarted.countDown();
441 >                    assertEquals(1, p.getPoolSize());
442 >                    done.await();
443 >                }});
444 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
445 >            assertEquals(1, p.getPoolSize());
446 >        } finally {
447 >            done.countDown();
448 >            joinPool(p);
449 >        }
450      }
451  
452      /**
453 <     *    getTaskCount increases, but doesn't overestimate, when tasks
454 <     *    submitted
453 >     * getTaskCount increases, but doesn't overestimate, when tasks
454 >     * submitted
455       */
456 <    public void testGetTaskCount() {
457 <        CustomExecutor p1 = new CustomExecutor(1);
458 <        assertEquals(0, p1.getTaskCount());
459 <        for (int i = 0; i < 5; i++)
460 <            p1.execute(new SmallRunnable());
461 <        try {
462 <            Thread.sleep(SHORT_DELAY_MS);
463 <        } catch (Exception e){
464 <            unexpectedException();
456 >    public void testGetTaskCount() throws InterruptedException {
457 >        final ThreadPoolExecutor p = new CustomExecutor(1);
458 >        final CountDownLatch threadStarted = new CountDownLatch(1);
459 >        final CountDownLatch done = new CountDownLatch(1);
460 >        final int TASKS = 5;
461 >        try {
462 >            assertEquals(0, p.getTaskCount());
463 >            for (int i = 0; i < TASKS; i++)
464 >                p.execute(new CheckedRunnable() {
465 >                    public void realRun() throws InterruptedException {
466 >                        threadStarted.countDown();
467 >                        done.await();
468 >                    }});
469 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
470 >            assertEquals(TASKS, p.getTaskCount());
471 >        } finally {
472 >            done.countDown();
473 >            joinPool(p);
474          }
430        assertEquals(5, p1.getTaskCount());
431        joinPool(p1);
475      }
476  
477      /**
# Line 436 | Line 479 | public class ScheduledExecutorSubclassTe
479       */
480      public void testGetThreadFactory() {
481          ThreadFactory tf = new SimpleThreadFactory();
482 <        CustomExecutor p = new CustomExecutor(1, tf);
482 >        CustomExecutor p = new CustomExecutor(1, tf);
483          assertSame(tf, p.getThreadFactory());
484          joinPool(p);
485      }
# Line 446 | Line 489 | public class ScheduledExecutorSubclassTe
489       */
490      public void testSetThreadFactory() {
491          ThreadFactory tf = new SimpleThreadFactory();
492 <        CustomExecutor p = new CustomExecutor(1);
492 >        CustomExecutor p = new CustomExecutor(1);
493          p.setThreadFactory(tf);
494          assertSame(tf, p.getThreadFactory());
495          joinPool(p);
# Line 456 | Line 499 | public class ScheduledExecutorSubclassTe
499       * setThreadFactory(null) throws NPE
500       */
501      public void testSetThreadFactoryNull() {
502 <        CustomExecutor p = new CustomExecutor(1);
502 >        CustomExecutor p = new CustomExecutor(1);
503          try {
504              p.setThreadFactory(null);
505              shouldThrow();
# Line 467 | Line 510 | public class ScheduledExecutorSubclassTe
510      }
511  
512      /**
513 <     *   is isShutDown is false before shutdown, true after
513 >     * isShutDown is false before shutdown, true after
514       */
515      public void testIsShutdown() {
516 <
474 <        CustomExecutor p1 = new CustomExecutor(1);
516 >        CustomExecutor p = new CustomExecutor(1);
517          try {
518 <            assertFalse(p1.isShutdown());
518 >            assertFalse(p.isShutdown());
519          }
520          finally {
521 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
521 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
522          }
523 <        assertTrue(p1.isShutdown());
523 >        assertTrue(p.isShutdown());
524      }
525  
526  
527      /**
528 <     *   isTerminated is false before termination, true after
528 >     * isTerminated is false before termination, true after
529       */
530 <    public void testIsTerminated() {
531 <        CustomExecutor p1 = new CustomExecutor(1);
530 >    public void testIsTerminated() throws InterruptedException {
531 >        final ThreadPoolExecutor p = new CustomExecutor(1);
532 >        final CountDownLatch threadStarted = new CountDownLatch(1);
533 >        final CountDownLatch done = new CountDownLatch(1);
534 >        assertFalse(p.isTerminated());
535          try {
536 <            p1.execute(new SmallRunnable());
536 >            p.execute(new CheckedRunnable() {
537 >                public void realRun() throws InterruptedException {
538 >                    assertFalse(p.isTerminated());
539 >                    threadStarted.countDown();
540 >                    done.await();
541 >                }});
542 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
543 >            assertFalse(p.isTerminating());
544 >            done.countDown();
545          } finally {
546 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
494 <        }
495 <        try {
496 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
497 <            assertTrue(p1.isTerminated());
498 <        } catch (Exception e){
499 <            unexpectedException();
546 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
547          }
548 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
549 +        assertTrue(p.isTerminated());
550      }
551  
552      /**
553 <     *  isTerminating is not true when running or when terminated
553 >     * isTerminating is not true when running or when terminated
554       */
555 <    public void testIsTerminating() {
556 <        CustomExecutor p1 = new CustomExecutor(1);
557 <        assertFalse(p1.isTerminating());
555 >    public void testIsTerminating() throws InterruptedException {
556 >        final ThreadPoolExecutor p = new CustomExecutor(1);
557 >        final CountDownLatch threadStarted = new CountDownLatch(1);
558 >        final CountDownLatch done = new CountDownLatch(1);
559          try {
560 <            p1.execute(new SmallRunnable());
561 <            assertFalse(p1.isTerminating());
560 >            assertFalse(p.isTerminating());
561 >            p.execute(new CheckedRunnable() {
562 >                public void realRun() throws InterruptedException {
563 >                    assertFalse(p.isTerminating());
564 >                    threadStarted.countDown();
565 >                    done.await();
566 >                }});
567 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
568 >            assertFalse(p.isTerminating());
569 >            done.countDown();
570          } finally {
571 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
514 <        }
515 <        try {
516 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
517 <            assertTrue(p1.isTerminated());
518 <            assertFalse(p1.isTerminating());
519 <        } catch (Exception e){
520 <            unexpectedException();
571 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
572          }
573 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
574 +        assertTrue(p.isTerminated());
575 +        assertFalse(p.isTerminating());
576      }
577  
578      /**
579       * getQueue returns the work queue, which contains queued tasks
580       */
581 <    public void testGetQueue() {
582 <        CustomExecutor p1 = new CustomExecutor(1);
583 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
584 <        for (int i = 0; i < 5; i++){
531 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, TimeUnit.MILLISECONDS);
532 <        }
581 >    public void testGetQueue() throws InterruptedException {
582 >        ScheduledThreadPoolExecutor p = new CustomExecutor(1);
583 >        final CountDownLatch threadStarted = new CountDownLatch(1);
584 >        final CountDownLatch done = new CountDownLatch(1);
585          try {
586 <            Thread.sleep(SHORT_DELAY_MS);
587 <            BlockingQueue<Runnable> q = p1.getQueue();
588 <            assertTrue(q.contains(tasks[4]));
586 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
587 >            for (int i = 0; i < tasks.length; i++) {
588 >                Runnable r = new CheckedRunnable() {
589 >                    public void realRun() throws InterruptedException {
590 >                        threadStarted.countDown();
591 >                        done.await();
592 >                    }};
593 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
594 >            }
595 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
596 >            BlockingQueue<Runnable> q = p.getQueue();
597 >            assertTrue(q.contains(tasks[tasks.length - 1]));
598              assertFalse(q.contains(tasks[0]));
538        } catch (Exception e) {
539            unexpectedException();
599          } finally {
600 <            joinPool(p1);
600 >            done.countDown();
601 >            joinPool(p);
602          }
603      }
604  
605      /**
606       * remove(task) removes queued task, and fails to remove active task
607       */
608 <    public void testRemove() {
609 <        CustomExecutor p1 = new CustomExecutor(1);
608 >    public void testRemove() throws InterruptedException {
609 >        final ScheduledThreadPoolExecutor p = new CustomExecutor(1);
610          ScheduledFuture[] tasks = new ScheduledFuture[5];
611 <        for (int i = 0; i < 5; i++){
612 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, TimeUnit.MILLISECONDS);
553 <        }
611 >        final CountDownLatch threadStarted = new CountDownLatch(1);
612 >        final CountDownLatch done = new CountDownLatch(1);
613          try {
614 <            Thread.sleep(SHORT_DELAY_MS);
615 <            BlockingQueue<Runnable> q = p1.getQueue();
616 <            assertFalse(p1.remove((Runnable)tasks[0]));
614 >            for (int i = 0; i < tasks.length; i++) {
615 >                Runnable r = new CheckedRunnable() {
616 >                    public void realRun() throws InterruptedException {
617 >                        threadStarted.countDown();
618 >                        done.await();
619 >                    }};
620 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
621 >            }
622 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
623 >            BlockingQueue<Runnable> q = p.getQueue();
624 >            assertFalse(p.remove((Runnable)tasks[0]));
625              assertTrue(q.contains((Runnable)tasks[4]));
626              assertTrue(q.contains((Runnable)tasks[3]));
627 <            assertTrue(p1.remove((Runnable)tasks[4]));
628 <            assertFalse(p1.remove((Runnable)tasks[4]));
627 >            assertTrue(p.remove((Runnable)tasks[4]));
628 >            assertFalse(p.remove((Runnable)tasks[4]));
629              assertFalse(q.contains((Runnable)tasks[4]));
630              assertTrue(q.contains((Runnable)tasks[3]));
631 <            assertTrue(p1.remove((Runnable)tasks[3]));
631 >            assertTrue(p.remove((Runnable)tasks[3]));
632              assertFalse(q.contains((Runnable)tasks[3]));
566        } catch (Exception e) {
567            unexpectedException();
633          } finally {
634 <            joinPool(p1);
634 >            done.countDown();
635 >            joinPool(p);
636          }
637      }
638  
639      /**
640 <     *  purge removes cancelled tasks from the queue
640 >     * purge removes cancelled tasks from the queue
641       */
642 <    public void testPurge() {
643 <        CustomExecutor p1 = new CustomExecutor(1);
642 >    public void testPurge() throws InterruptedException {
643 >        CustomExecutor p = new CustomExecutor(1);
644          ScheduledFuture[] tasks = new ScheduledFuture[5];
645 <        for (int i = 0; i < 5; i++){
646 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
647 <        }
645 >        for (int i = 0; i < tasks.length; i++)
646 >            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
647 >                                  LONG_DELAY_MS, MILLISECONDS);
648          try {
649 <            int max = 5;
649 >            int max = tasks.length;
650              if (tasks[4].cancel(true)) --max;
651              if (tasks[3].cancel(true)) --max;
652              // There must eventually be an interference-free point at
653              // which purge will not fail. (At worst, when queue is empty.)
654 <            int k;
655 <            for (k = 0; k < SMALL_DELAY_MS; ++k) {
656 <                p1.purge();
657 <                long count = p1.getTaskCount();
658 <                if (count >= 0 && count <= max)
659 <                    break;
660 <                Thread.sleep(1);
661 <            }
596 <            assertTrue(k < SMALL_DELAY_MS);
597 <        } catch (Exception e) {
598 <            unexpectedException();
654 >            long startTime = System.nanoTime();
655 >            do {
656 >                p.purge();
657 >                long count = p.getTaskCount();
658 >                if (count == max)
659 >                    return;
660 >            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
661 >            fail("Purge failed to remove cancelled tasks");
662          } finally {
663 <            joinPool(p1);
663 >            for (ScheduledFuture task : tasks)
664 >                task.cancel(true);
665 >            joinPool(p);
666          }
667      }
668  
669      /**
670 <     *  shutDownNow returns a list containing tasks that were not run
670 >     * shutDownNow returns a list containing tasks that were not run
671       */
672      public void testShutDownNow() {
673 <        CustomExecutor p1 = new CustomExecutor(1);
673 >        CustomExecutor p = new CustomExecutor(1);
674          for (int i = 0; i < 5; i++)
675 <            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
676 <        List l;
675 >            p.schedule(new SmallPossiblyInterruptedRunnable(),
676 >                       LONG_DELAY_MS, MILLISECONDS);
677          try {
678 <            l = p1.shutdownNow();
678 >            List<Runnable> l = p.shutdownNow();
679 >            assertTrue(p.isShutdown());
680 >            assertEquals(5, l.size());
681          } catch (SecurityException ok) {
682 <            return;
682 >            // Allowed in case test doesn't have privs
683 >        } finally {
684 >            joinPool(p);
685          }
617        assertTrue(p1.isShutdown());
618        assertTrue(l.size() > 0 && l.size() <= 5);
619        joinPool(p1);
686      }
687  
688      /**
689       * In default setting, shutdown cancels periodic but not delayed
690       * tasks at shutdown
691       */
692 <    public void testShutDown1() {
693 <        try {
694 <            CustomExecutor p1 = new CustomExecutor(1);
695 <            assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
630 <            assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
631 <
632 <            ScheduledFuture[] tasks = new ScheduledFuture[5];
633 <            for (int i = 0; i < 5; i++)
634 <                tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
635 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
636 <            BlockingQueue q = p1.getQueue();
637 <            for (Iterator it = q.iterator(); it.hasNext();) {
638 <                ScheduledFuture t = (ScheduledFuture)it.next();
639 <                assertFalse(t.isCancelled());
640 <            }
641 <            assertTrue(p1.isShutdown());
642 <            Thread.sleep(SMALL_DELAY_MS);
643 <            for (int i = 0; i < 5; ++i) {
644 <                assertTrue(tasks[i].isDone());
645 <                assertFalse(tasks[i].isCancelled());
646 <            }
692 >    public void testShutDown1() throws InterruptedException {
693 >        CustomExecutor p = new CustomExecutor(1);
694 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
695 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
696  
697 +        ScheduledFuture[] tasks = new ScheduledFuture[5];
698 +        for (int i = 0; i < tasks.length; i++)
699 +            tasks[i] = p.schedule(new NoOpRunnable(),
700 +                                  SHORT_DELAY_MS, MILLISECONDS);
701 +        try { p.shutdown(); } catch (SecurityException ok) { return; }
702 +        BlockingQueue<Runnable> q = p.getQueue();
703 +        for (ScheduledFuture task : tasks) {
704 +            assertFalse(task.isDone());
705 +            assertFalse(task.isCancelled());
706 +            assertTrue(q.contains(task));
707          }
708 <        catch (Exception ex) {
709 <            unexpectedException();
708 >        assertTrue(p.isShutdown());
709 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
710 >        assertTrue(p.isTerminated());
711 >        for (ScheduledFuture task : tasks) {
712 >            assertTrue(task.isDone());
713 >            assertFalse(task.isCancelled());
714          }
715      }
716  
# Line 656 | Line 719 | public class ScheduledExecutorSubclassTe
719       * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
720       * delayed tasks are cancelled at shutdown
721       */
722 <    public void testShutDown2() {
723 <        try {
724 <            CustomExecutor p1 = new CustomExecutor(1);
725 <            p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
726 <            ScheduledFuture[] tasks = new ScheduledFuture[5];
727 <            for (int i = 0; i < 5; i++)
728 <                tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
729 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
730 <            assertTrue(p1.isShutdown());
731 <            BlockingQueue q = p1.getQueue();
732 <            assertTrue(q.isEmpty());
733 <            Thread.sleep(SMALL_DELAY_MS);
734 <            assertTrue(p1.isTerminated());
735 <        }
736 <        catch (Exception ex) {
737 <            unexpectedException();
722 >    public void testShutDown2() throws InterruptedException {
723 >        CustomExecutor p = new CustomExecutor(1);
724 >        p.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
725 >        assertFalse(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
726 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
727 >        ScheduledFuture[] tasks = new ScheduledFuture[5];
728 >        for (int i = 0; i < tasks.length; i++)
729 >            tasks[i] = p.schedule(new NoOpRunnable(),
730 >                                  SHORT_DELAY_MS, MILLISECONDS);
731 >        BlockingQueue q = p.getQueue();
732 >        assertEquals(tasks.length, q.size());
733 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
734 >        assertTrue(p.isShutdown());
735 >        assertTrue(q.isEmpty());
736 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
737 >        assertTrue(p.isTerminated());
738 >        for (ScheduledFuture task : tasks) {
739 >            assertTrue(task.isDone());
740 >            assertTrue(task.isCancelled());
741          }
742      }
743  
744  
745      /**
746       * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
747 <     * periodic tasks are not cancelled at shutdown
747 >     * periodic tasks are cancelled at shutdown
748       */
749 <    public void testShutDown3() {
750 <        try {
751 <            CustomExecutor p1 = new CustomExecutor(1);
752 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
753 <            ScheduledFuture task =
754 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
755 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
756 <            assertTrue(p1.isShutdown());
757 <            BlockingQueue q = p1.getQueue();
758 <            assertTrue(q.isEmpty());
759 <            Thread.sleep(SHORT_DELAY_MS);
760 <            assertTrue(p1.isTerminated());
761 <        }
762 <        catch (Exception ex) {
763 <            unexpectedException();
764 <        }
749 >    public void testShutDown3() throws InterruptedException {
750 >        CustomExecutor p = new CustomExecutor(1);
751 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
752 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
753 >        p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
754 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
755 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
756 >        ScheduledFuture task =
757 >            p.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, MILLISECONDS);
758 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
759 >        assertTrue(p.isShutdown());
760 >        BlockingQueue q = p.getQueue();
761 >        assertTrue(p.getQueue().isEmpty());
762 >        assertTrue(task.isDone());
763 >        assertTrue(task.isCancelled());
764 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
765 >        assertTrue(p.isTerminated());
766      }
767  
768      /**
769       * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
770 <     * periodic tasks are cancelled at shutdown
770 >     * periodic tasks are not cancelled at shutdown
771       */
772 <    public void testShutDown4() {
773 <        CustomExecutor p1 = new CustomExecutor(1);
774 <        try {
775 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
772 >    public void testShutDown4() throws InterruptedException {
773 >        CustomExecutor p = new CustomExecutor(1);
774 >        final CountDownLatch counter = new CountDownLatch(2);
775 >        try {
776 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
777 >            assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
778 >            assertTrue(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
779 >            final Runnable r = new CheckedRunnable() {
780 >                public void realRun() {
781 >                    counter.countDown();
782 >                }};
783              ScheduledFuture task =
784 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, TimeUnit.MILLISECONDS);
784 >                p.scheduleAtFixedRate(r, 1, 1, MILLISECONDS);
785 >            assertFalse(task.isDone());
786              assertFalse(task.isCancelled());
787 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
787 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
788              assertFalse(task.isCancelled());
789 <            assertFalse(p1.isTerminated());
790 <            assertTrue(p1.isShutdown());
791 <            Thread.sleep(SHORT_DELAY_MS);
789 >            assertFalse(p.isTerminated());
790 >            assertTrue(p.isShutdown());
791 >            assertTrue(counter.await(SMALL_DELAY_MS, MILLISECONDS));
792              assertFalse(task.isCancelled());
793 <            assertTrue(task.cancel(true));
793 >            assertTrue(task.cancel(false));
794              assertTrue(task.isDone());
795 <            Thread.sleep(SHORT_DELAY_MS);
796 <            assertTrue(p1.isTerminated());
797 <        }
723 <        catch (Exception ex) {
724 <            unexpectedException();
795 >            assertTrue(task.isCancelled());
796 >            assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
797 >            assertTrue(p.isTerminated());
798          }
799          finally {
800 <            joinPool(p1);
800 >            joinPool(p);
801          }
802      }
803  
804      /**
805       * completed submit of callable returns result
806       */
807 <    public void testSubmitCallable() {
807 >    public void testSubmitCallable() throws Exception {
808          ExecutorService e = new CustomExecutor(2);
809          try {
810              Future<String> future = e.submit(new StringTask());
811              String result = future.get();
812              assertSame(TEST_STRING, result);
740        }
741        catch (ExecutionException ex) {
742            unexpectedException();
743        }
744        catch (InterruptedException ex) {
745            unexpectedException();
813          } finally {
814              joinPool(e);
815          }
# Line 751 | Line 818 | public class ScheduledExecutorSubclassTe
818      /**
819       * completed submit of runnable returns successfully
820       */
821 <    public void testSubmitRunnable() {
821 >    public void testSubmitRunnable() throws Exception {
822          ExecutorService e = new CustomExecutor(2);
823          try {
824              Future<?> future = e.submit(new NoOpRunnable());
825              future.get();
826              assertTrue(future.isDone());
760        }
761        catch (ExecutionException ex) {
762            unexpectedException();
763        }
764        catch (InterruptedException ex) {
765            unexpectedException();
827          } finally {
828              joinPool(e);
829          }
# Line 771 | Line 832 | public class ScheduledExecutorSubclassTe
832      /**
833       * completed submit of (runnable, result) returns result
834       */
835 <    public void testSubmitRunnable2() {
835 >    public void testSubmitRunnable2() throws Exception {
836          ExecutorService e = new CustomExecutor(2);
837          try {
838              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
839              String result = future.get();
840              assertSame(TEST_STRING, result);
780        }
781        catch (ExecutionException ex) {
782            unexpectedException();
783        }
784        catch (InterruptedException ex) {
785            unexpectedException();
841          } finally {
842              joinPool(e);
843          }
# Line 791 | Line 846 | public class ScheduledExecutorSubclassTe
846      /**
847       * invokeAny(null) throws NPE
848       */
849 <    public void testInvokeAny1() {
849 >    public void testInvokeAny1() throws Exception {
850          ExecutorService e = new CustomExecutor(2);
851          try {
852              e.invokeAny(null);
853 +            shouldThrow();
854          } catch (NullPointerException success) {
799        } catch (Exception ex) {
800            unexpectedException();
855          } finally {
856              joinPool(e);
857          }
# Line 806 | Line 860 | public class ScheduledExecutorSubclassTe
860      /**
861       * invokeAny(empty collection) throws IAE
862       */
863 <    public void testInvokeAny2() {
863 >    public void testInvokeAny2() throws Exception {
864          ExecutorService e = new CustomExecutor(2);
865          try {
866              e.invokeAny(new ArrayList<Callable<String>>());
867 +            shouldThrow();
868          } catch (IllegalArgumentException success) {
814        } catch (Exception ex) {
815            unexpectedException();
869          } finally {
870              joinPool(e);
871          }
# Line 821 | Line 874 | public class ScheduledExecutorSubclassTe
874      /**
875       * invokeAny(c) throws NPE if c has null elements
876       */
877 <    public void testInvokeAny3() {
877 >    public void testInvokeAny3() throws Exception {
878 >        CountDownLatch latch = new CountDownLatch(1);
879          ExecutorService e = new CustomExecutor(2);
880 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
881 +        l.add(latchAwaitingStringTask(latch));
882 +        l.add(null);
883          try {
827            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
828            l.add(new StringTask());
829            l.add(null);
884              e.invokeAny(l);
885 +            shouldThrow();
886          } catch (NullPointerException success) {
832        } catch (Exception ex) {
833            unexpectedException();
887          } finally {
888 +            latch.countDown();
889              joinPool(e);
890          }
891      }
# Line 839 | Line 893 | public class ScheduledExecutorSubclassTe
893      /**
894       * invokeAny(c) throws ExecutionException if no task completes
895       */
896 <    public void testInvokeAny4() {
896 >    public void testInvokeAny4() throws Exception {
897          ExecutorService e = new CustomExecutor(2);
898 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
899 +        l.add(new NPETask());
900          try {
845            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
846            l.add(new NPETask());
901              e.invokeAny(l);
902 +            shouldThrow();
903          } catch (ExecutionException success) {
904 <        } catch (Exception ex) {
850 <            unexpectedException();
904 >            assertTrue(success.getCause() instanceof NullPointerException);
905          } finally {
906              joinPool(e);
907          }
# Line 856 | Line 910 | public class ScheduledExecutorSubclassTe
910      /**
911       * invokeAny(c) returns result of some task
912       */
913 <    public void testInvokeAny5() {
913 >    public void testInvokeAny5() throws Exception {
914          ExecutorService e = new CustomExecutor(2);
915          try {
916 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
916 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
917              l.add(new StringTask());
918              l.add(new StringTask());
919              String result = e.invokeAny(l);
920              assertSame(TEST_STRING, result);
867        } catch (ExecutionException success) {
868        } catch (Exception ex) {
869            unexpectedException();
921          } finally {
922              joinPool(e);
923          }
# Line 875 | Line 926 | public class ScheduledExecutorSubclassTe
926      /**
927       * invokeAll(null) throws NPE
928       */
929 <    public void testInvokeAll1() {
929 >    public void testInvokeAll1() throws Exception {
930          ExecutorService e = new CustomExecutor(2);
931          try {
932              e.invokeAll(null);
933 +            shouldThrow();
934          } catch (NullPointerException success) {
883        } catch (Exception ex) {
884            unexpectedException();
935          } finally {
936              joinPool(e);
937          }
# Line 890 | Line 940 | public class ScheduledExecutorSubclassTe
940      /**
941       * invokeAll(empty collection) returns empty collection
942       */
943 <    public void testInvokeAll2() {
943 >    public void testInvokeAll2() throws Exception {
944          ExecutorService e = new CustomExecutor(2);
945          try {
946              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
947              assertTrue(r.isEmpty());
898        } catch (Exception ex) {
899            unexpectedException();
948          } finally {
949              joinPool(e);
950          }
# Line 905 | Line 953 | public class ScheduledExecutorSubclassTe
953      /**
954       * invokeAll(c) throws NPE if c has null elements
955       */
956 <    public void testInvokeAll3() {
956 >    public void testInvokeAll3() throws Exception {
957          ExecutorService e = new CustomExecutor(2);
958 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
959 +        l.add(new StringTask());
960 +        l.add(null);
961          try {
911            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
912            l.add(new StringTask());
913            l.add(null);
962              e.invokeAll(l);
963 +            shouldThrow();
964          } catch (NullPointerException success) {
916        } catch (Exception ex) {
917            unexpectedException();
965          } finally {
966              joinPool(e);
967          }
# Line 923 | Line 970 | public class ScheduledExecutorSubclassTe
970      /**
971       * get of invokeAll(c) throws exception on failed task
972       */
973 <    public void testInvokeAll4() {
973 >    public void testInvokeAll4() throws Exception {
974          ExecutorService e = new CustomExecutor(2);
975 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
976 +        l.add(new NPETask());
977 +        List<Future<String>> futures = e.invokeAll(l);
978 +        assertEquals(1, futures.size());
979          try {
980 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
981 <            l.add(new NPETask());
931 <            List<Future<String>> result = e.invokeAll(l);
932 <            assertEquals(1, result.size());
933 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
934 <                it.next().get();
980 >            futures.get(0).get();
981 >            shouldThrow();
982          } catch (ExecutionException success) {
983 <        } catch (Exception ex) {
937 <            unexpectedException();
983 >            assertTrue(success.getCause() instanceof NullPointerException);
984          } finally {
985              joinPool(e);
986          }
# Line 943 | Line 989 | public class ScheduledExecutorSubclassTe
989      /**
990       * invokeAll(c) returns results of all completed tasks
991       */
992 <    public void testInvokeAll5() {
992 >    public void testInvokeAll5() throws Exception {
993          ExecutorService e = new CustomExecutor(2);
994          try {
995 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
995 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
996              l.add(new StringTask());
997              l.add(new StringTask());
998 <            List<Future<String>> result = e.invokeAll(l);
999 <            assertEquals(2, result.size());
1000 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1001 <                assertSame(TEST_STRING, it.next().get());
956 <        } catch (ExecutionException success) {
957 <        } catch (Exception ex) {
958 <            unexpectedException();
998 >            List<Future<String>> futures = e.invokeAll(l);
999 >            assertEquals(2, futures.size());
1000 >            for (Future<String> future : futures)
1001 >                assertSame(TEST_STRING, future.get());
1002          } finally {
1003              joinPool(e);
1004          }
# Line 964 | Line 1007 | public class ScheduledExecutorSubclassTe
1007      /**
1008       * timed invokeAny(null) throws NPE
1009       */
1010 <    public void testTimedInvokeAny1() {
1010 >    public void testTimedInvokeAny1() throws Exception {
1011          ExecutorService e = new CustomExecutor(2);
1012          try {
1013 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1013 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1014 >            shouldThrow();
1015          } catch (NullPointerException success) {
972        } catch (Exception ex) {
973            unexpectedException();
1016          } finally {
1017              joinPool(e);
1018          }
# Line 979 | Line 1021 | public class ScheduledExecutorSubclassTe
1021      /**
1022       * timed invokeAny(,,null) throws NPE
1023       */
1024 <    public void testTimedInvokeAnyNullTimeUnit() {
1024 >    public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1025          ExecutorService e = new CustomExecutor(2);
1026 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1027 +        l.add(new StringTask());
1028          try {
985            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
986            l.add(new StringTask());
1029              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1030 +            shouldThrow();
1031          } catch (NullPointerException success) {
989        } catch (Exception ex) {
990            unexpectedException();
1032          } finally {
1033              joinPool(e);
1034          }
# Line 996 | Line 1037 | public class ScheduledExecutorSubclassTe
1037      /**
1038       * timed invokeAny(empty collection) throws IAE
1039       */
1040 <    public void testTimedInvokeAny2() {
1040 >    public void testTimedInvokeAny2() throws Exception {
1041          ExecutorService e = new CustomExecutor(2);
1042          try {
1043 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1043 >            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1044 >            shouldThrow();
1045          } catch (IllegalArgumentException success) {
1004        } catch (Exception ex) {
1005            unexpectedException();
1046          } finally {
1047              joinPool(e);
1048          }
# Line 1011 | Line 1051 | public class ScheduledExecutorSubclassTe
1051      /**
1052       * timed invokeAny(c) throws NPE if c has null elements
1053       */
1054 <    public void testTimedInvokeAny3() {
1054 >    public void testTimedInvokeAny3() throws Exception {
1055 >        CountDownLatch latch = new CountDownLatch(1);
1056          ExecutorService e = new CustomExecutor(2);
1057 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1058 +        l.add(latchAwaitingStringTask(latch));
1059 +        l.add(null);
1060          try {
1061 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1062 <            l.add(new StringTask());
1019 <            l.add(null);
1020 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1061 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1062 >            shouldThrow();
1063          } catch (NullPointerException success) {
1022        } catch (Exception ex) {
1023            ex.printStackTrace();
1024            unexpectedException();
1064          } finally {
1065 +            latch.countDown();
1066              joinPool(e);
1067          }
1068      }
# Line 1030 | Line 1070 | public class ScheduledExecutorSubclassTe
1070      /**
1071       * timed invokeAny(c) throws ExecutionException if no task completes
1072       */
1073 <    public void testTimedInvokeAny4() {
1073 >    public void testTimedInvokeAny4() throws Exception {
1074          ExecutorService e = new CustomExecutor(2);
1075 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1076 +        l.add(new NPETask());
1077          try {
1078 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1079 <            l.add(new NPETask());
1038 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1078 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1079 >            shouldThrow();
1080          } catch (ExecutionException success) {
1081 <        } catch (Exception ex) {
1041 <            unexpectedException();
1081 >            assertTrue(success.getCause() instanceof NullPointerException);
1082          } finally {
1083              joinPool(e);
1084          }
# Line 1047 | Line 1087 | public class ScheduledExecutorSubclassTe
1087      /**
1088       * timed invokeAny(c) returns result of some task
1089       */
1090 <    public void testTimedInvokeAny5() {
1090 >    public void testTimedInvokeAny5() throws Exception {
1091          ExecutorService e = new CustomExecutor(2);
1092          try {
1093 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1093 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1094              l.add(new StringTask());
1095              l.add(new StringTask());
1096 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1096 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1097              assertSame(TEST_STRING, result);
1058        } catch (ExecutionException success) {
1059        } catch (Exception ex) {
1060            unexpectedException();
1098          } finally {
1099              joinPool(e);
1100          }
# Line 1066 | Line 1103 | public class ScheduledExecutorSubclassTe
1103      /**
1104       * timed invokeAll(null) throws NPE
1105       */
1106 <    public void testTimedInvokeAll1() {
1106 >    public void testTimedInvokeAll1() throws Exception {
1107          ExecutorService e = new CustomExecutor(2);
1108          try {
1109 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1109 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1110 >            shouldThrow();
1111          } catch (NullPointerException success) {
1074        } catch (Exception ex) {
1075            unexpectedException();
1112          } finally {
1113              joinPool(e);
1114          }
# Line 1081 | Line 1117 | public class ScheduledExecutorSubclassTe
1117      /**
1118       * timed invokeAll(,,null) throws NPE
1119       */
1120 <    public void testTimedInvokeAllNullTimeUnit() {
1120 >    public void testTimedInvokeAllNullTimeUnit() throws Exception {
1121          ExecutorService e = new CustomExecutor(2);
1122 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1123 +        l.add(new StringTask());
1124          try {
1087            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1088            l.add(new StringTask());
1125              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1126 +            shouldThrow();
1127          } catch (NullPointerException success) {
1091        } catch (Exception ex) {
1092            unexpectedException();
1128          } finally {
1129              joinPool(e);
1130          }
# Line 1098 | Line 1133 | public class ScheduledExecutorSubclassTe
1133      /**
1134       * timed invokeAll(empty collection) returns empty collection
1135       */
1136 <    public void testTimedInvokeAll2() {
1136 >    public void testTimedInvokeAll2() throws Exception {
1137          ExecutorService e = new CustomExecutor(2);
1138          try {
1139 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1139 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1140              assertTrue(r.isEmpty());
1106        } catch (Exception ex) {
1107            unexpectedException();
1141          } finally {
1142              joinPool(e);
1143          }
# Line 1113 | Line 1146 | public class ScheduledExecutorSubclassTe
1146      /**
1147       * timed invokeAll(c) throws NPE if c has null elements
1148       */
1149 <    public void testTimedInvokeAll3() {
1149 >    public void testTimedInvokeAll3() throws Exception {
1150          ExecutorService e = new CustomExecutor(2);
1151 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1152 +        l.add(new StringTask());
1153 +        l.add(null);
1154          try {
1155 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1156 <            l.add(new StringTask());
1121 <            l.add(null);
1122 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1155 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1156 >            shouldThrow();
1157          } catch (NullPointerException success) {
1124        } catch (Exception ex) {
1125            unexpectedException();
1158          } finally {
1159              joinPool(e);
1160          }
# Line 1131 | Line 1163 | public class ScheduledExecutorSubclassTe
1163      /**
1164       * get of element of invokeAll(c) throws exception on failed task
1165       */
1166 <    public void testTimedInvokeAll4() {
1166 >    public void testTimedInvokeAll4() throws Exception {
1167          ExecutorService e = new CustomExecutor(2);
1168 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1169 +        l.add(new NPETask());
1170 +        List<Future<String>> futures =
1171 +            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1172 +        assertEquals(1, futures.size());
1173          try {
1174 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1175 <            l.add(new NPETask());
1139 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1140 <            assertEquals(1, result.size());
1141 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1142 <                it.next().get();
1174 >            futures.get(0).get();
1175 >            shouldThrow();
1176          } catch (ExecutionException success) {
1177 <        } catch (Exception ex) {
1145 <            unexpectedException();
1177 >            assertTrue(success.getCause() instanceof NullPointerException);
1178          } finally {
1179              joinPool(e);
1180          }
# Line 1151 | Line 1183 | public class ScheduledExecutorSubclassTe
1183      /**
1184       * timed invokeAll(c) returns results of all completed tasks
1185       */
1186 <    public void testTimedInvokeAll5() {
1186 >    public void testTimedInvokeAll5() throws Exception {
1187          ExecutorService e = new CustomExecutor(2);
1188          try {
1189 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1189 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1190              l.add(new StringTask());
1191              l.add(new StringTask());
1192 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1193 <            assertEquals(2, result.size());
1194 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1195 <                assertSame(TEST_STRING, it.next().get());
1196 <        } catch (ExecutionException success) {
1165 <        } catch (Exception ex) {
1166 <            unexpectedException();
1192 >            List<Future<String>> futures =
1193 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1194 >            assertEquals(2, futures.size());
1195 >            for (Future<String> future : futures)
1196 >                assertSame(TEST_STRING, future.get());
1197          } finally {
1198              joinPool(e);
1199          }
# Line 1172 | Line 1202 | public class ScheduledExecutorSubclassTe
1202      /**
1203       * timed invokeAll(c) cancels tasks not completed by timeout
1204       */
1205 <    public void testTimedInvokeAll6() {
1205 >    public void testTimedInvokeAll6() throws Exception {
1206          ExecutorService e = new CustomExecutor(2);
1207          try {
1208 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1208 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1209              l.add(new StringTask());
1210              l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1211              l.add(new StringTask());
1212 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
1213 <            assertEquals(3, result.size());
1214 <            Iterator<Future<String>> it = result.iterator();
1212 >            List<Future<String>> futures =
1213 >                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1214 >            assertEquals(3, futures.size());
1215 >            Iterator<Future<String>> it = futures.iterator();
1216              Future<String> f1 = it.next();
1217              Future<String> f2 = it.next();
1218              Future<String> f3 = it.next();
# Line 1190 | Line 1221 | public class ScheduledExecutorSubclassTe
1221              assertTrue(f3.isDone());
1222              assertFalse(f1.isCancelled());
1223              assertTrue(f2.isCancelled());
1193        } catch (Exception ex) {
1194            unexpectedException();
1224          } finally {
1225              joinPool(e);
1226          }
1227      }
1228  
1200
1229   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines