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

Comparing jsr166/src/test/tck/ScheduledExecutorTest.java (file contents):
Revision 1.6 by dl, Thu Sep 25 11:02:41 2003 UTC vs.
Revision 1.21 by dl, Thu Jan 22 15:17:35 2004 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
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
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
10   import java.util.*;
11   import java.util.concurrent.*;
12 + import java.util.concurrent.atomic.*;
13  
14   public class ScheduledExecutorTest extends JSR166TestCase {
15      public static void main(String[] args) {
# Line 17 | Line 19 | public class ScheduledExecutorTest exten
19          return new TestSuite(ScheduledExecutorTest.class);
20      }
21  
20    static class MyRunnable implements Runnable {
21        volatile boolean done = false;
22        public void run() {
23            try {
24                Thread.sleep(SMALL_DELAY_MS);
25                done = true;
26            } catch(Exception e){
27            }
28        }
29    }
30
31    static class MyCallable implements Callable {
32        volatile boolean done = false;
33        public Object call() {
34            try {
35                Thread.sleep(SMALL_DELAY_MS);
36                done = true;
37            } catch(Exception e){
38            }
39            return Boolean.TRUE;
40        }
41    }
22  
23      /**
24       * execute successfully executes a runnable
25       */
26      public void testExecute() {
27          try {
28 <            MyRunnable runnable =new MyRunnable();
29 <            ScheduledExecutor p1 = new ScheduledExecutor(1);
28 >            TrackedShortRunnable runnable =new TrackedShortRunnable();
29 >            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
30              p1.execute(runnable);
31              assertFalse(runnable.done);
32              Thread.sleep(SHORT_DELAY_MS);
33 <            p1.shutdown();
33 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
34              try {
35                  Thread.sleep(MEDIUM_DELAY_MS);
36              } catch(InterruptedException e){
37                  unexpectedException();
38              }
39              assertTrue(runnable.done);
40 <            p1.shutdown();
40 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
41              joinPool(p1);
42          }
43          catch(Exception e){
# Line 72 | Line 52 | public class ScheduledExecutorTest exten
52       */
53      public void testSchedule1() {
54          try {
55 <            MyCallable callable = new MyCallable();
56 <            ScheduledExecutor p1 = new ScheduledExecutor(1);
55 >            TrackedCallable callable = new TrackedCallable();
56 >            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
57              Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
58              assertFalse(callable.done);
59              Thread.sleep(MEDIUM_DELAY_MS);
60              assertTrue(callable.done);
61              assertEquals(Boolean.TRUE, f.get());
62 <            p1.shutdown();
62 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
63              joinPool(p1);
64          } catch(RejectedExecutionException e){}
65          catch(Exception e){
66 +            e.printStackTrace();
67              unexpectedException();
68          }
69      }
# Line 92 | Line 73 | public class ScheduledExecutorTest exten
73       */
74      public void testSchedule3() {
75          try {
76 <            MyRunnable runnable = new MyRunnable();
77 <            ScheduledExecutor p1 = new ScheduledExecutor(1);
76 >            TrackedShortRunnable runnable = new TrackedShortRunnable();
77 >            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
78              p1.schedule(runnable, SMALL_DELAY_MS, TimeUnit.MILLISECONDS);
79              Thread.sleep(SHORT_DELAY_MS);
80              assertFalse(runnable.done);
81              Thread.sleep(MEDIUM_DELAY_MS);
82              assertTrue(runnable.done);
83 <            p1.shutdown();
83 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
84              joinPool(p1);
85          } catch(Exception e){
86              unexpectedException();
# Line 111 | Line 92 | public class ScheduledExecutorTest exten
92       */
93      public void testSchedule4() {
94          try {
95 <            MyRunnable runnable = new MyRunnable();
96 <            ScheduledExecutor p1 = new ScheduledExecutor(1);
97 <            ScheduledCancellable h = p1.scheduleAtFixedRate(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
95 >            TrackedShortRunnable runnable = new TrackedShortRunnable();
96 >            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
97 >            ScheduledFuture h = p1.scheduleAtFixedRate(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
98              assertFalse(runnable.done);
99              Thread.sleep(MEDIUM_DELAY_MS);
100              assertTrue(runnable.done);
101              h.cancel(true);
121            p1.shutdown();
102              joinPool(p1);
103          } catch(Exception e){
104              unexpectedException();
105          }
106      }
107  
108 +    static class RunnableCounter implements Runnable {
109 +        AtomicInteger count = new AtomicInteger(0);
110 +        public void run() { count.getAndIncrement(); }
111 +    }
112 +
113      /**
114       * scheduleWithFixedDelay executes runnable after given initial delay
115       */
116      public void testSchedule5() {
117          try {
118 <            MyRunnable runnable = new MyRunnable();
119 <            ScheduledExecutor p1 = new ScheduledExecutor(1);
120 <            ScheduledCancellable h = p1.scheduleWithFixedDelay(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
118 >            TrackedShortRunnable runnable = new TrackedShortRunnable();
119 >            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
120 >            ScheduledFuture h = p1.scheduleWithFixedDelay(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
121              assertFalse(runnable.done);
122              Thread.sleep(MEDIUM_DELAY_MS);
123              assertTrue(runnable.done);
124              h.cancel(true);
140            p1.shutdown();
125              joinPool(p1);
126          } catch(Exception e){
127              unexpectedException();
# Line 145 | Line 129 | public class ScheduledExecutorTest exten
129      }
130      
131      /**
132 +     * scheduleAtFixedRate executes series of tasks at given rate
133 +     */
134 +    public void testFixedRateSequence() {
135 +        try {
136 +            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
137 +            RunnableCounter counter = new RunnableCounter();
138 +            ScheduledFuture h =
139 +                p1.scheduleAtFixedRate(counter, 0, 1, TimeUnit.MILLISECONDS);
140 +            Thread.sleep(SMALL_DELAY_MS);
141 +            h.cancel(true);
142 +            int c = counter.count.get();
143 +            // By time scaling conventions, we must have at least
144 +            // an execution per SHORT delay, but no more than one SHORT more
145 +            assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
146 +            assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
147 +            joinPool(p1);
148 +        } catch(Exception e){
149 +            unexpectedException();
150 +        }
151 +    }
152 +
153 +    /**
154 +     * scheduleWithFixedDelay executes series of tasks with given period
155 +     */
156 +    public void testFixedDelaySequence() {
157 +        try {
158 +            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
159 +            RunnableCounter counter = new RunnableCounter();
160 +            ScheduledFuture h =
161 +                p1.scheduleWithFixedDelay(counter, 0, 1, TimeUnit.MILLISECONDS);
162 +            Thread.sleep(SMALL_DELAY_MS);
163 +            h.cancel(true);
164 +            int c = counter.count.get();
165 +            assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
166 +            assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
167 +            joinPool(p1);
168 +        } catch(Exception e){
169 +            unexpectedException();
170 +        }
171 +    }
172 +
173 +
174 +    /**
175       *  execute (null) throws NPE
176       */
177      public void testExecuteNull() {
178 <        ScheduledExecutor se = null;
178 >        ScheduledThreadPoolExecutor se = null;
179          try {
180 <            se = new ScheduledExecutor(1);
180 >            se = new ScheduledThreadPoolExecutor(1);
181              se.execute(null);
182              shouldThrow();
183          } catch(NullPointerException success){}
# Line 165 | Line 192 | public class ScheduledExecutorTest exten
192       * schedule (null) throws NPE
193       */
194      public void testScheduleNull() {
195 <        ScheduledExecutor se = new ScheduledExecutor(1);
195 >        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
196          try {
197 <            MyCallable callable = null;
197 >            TrackedCallable callable = null;
198              Future f = se.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
199              shouldThrow();
200          } catch(NullPointerException success){}
# Line 181 | Line 208 | public class ScheduledExecutorTest exten
208       * execute throws RejectedExecutionException if shutdown
209       */
210      public void testSchedule1_RejectedExecutionException() {
211 <        ScheduledExecutor se = new ScheduledExecutor(1);
211 >        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
212          try {
213              se.shutdown();
214              se.schedule(new NoOpRunnable(),
215                          MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
216              shouldThrow();
217          } catch(RejectedExecutionException success){
218 +        } catch (SecurityException ok) {
219          }
220 +        
221          joinPool(se);
222  
223      }
# Line 197 | Line 226 | public class ScheduledExecutorTest exten
226       * schedule throws RejectedExecutionException if shutdown
227       */
228      public void testSchedule2_RejectedExecutionException() {
229 <        ScheduledExecutor se = new ScheduledExecutor(1);
229 >        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
230          try {
231              se.shutdown();
232              se.schedule(new NoOpCallable(),
233                          MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
234              shouldThrow();
235          } catch(RejectedExecutionException success){
236 +        } catch (SecurityException ok) {
237          }
238          joinPool(se);
239      }
# Line 212 | Line 242 | public class ScheduledExecutorTest exten
242       * schedule callable throws RejectedExecutionException if shutdown
243       */
244       public void testSchedule3_RejectedExecutionException() {
245 <         ScheduledExecutor se = new ScheduledExecutor(1);
245 >         ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
246           try {
247              se.shutdown();
248              se.schedule(new NoOpCallable(),
249                          MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
250              shouldThrow();
251          } catch(RejectedExecutionException success){
252 <        }
252 >        } catch (SecurityException ok) {
253 >        }
254           joinPool(se);
255      }
256  
# Line 227 | Line 258 | public class ScheduledExecutorTest exten
258       *  scheduleAtFixedRate throws RejectedExecutionException if shutdown
259       */
260      public void testScheduleAtFixedRate1_RejectedExecutionException() {
261 <        ScheduledExecutor se = new ScheduledExecutor(1);
261 >        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
262          try {
263              se.shutdown();
264              se.scheduleAtFixedRate(new NoOpRunnable(),
265                                     MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
266              shouldThrow();
267          } catch(RejectedExecutionException success){
268 +        } catch (SecurityException ok) {
269          }
270          joinPool(se);
271      }
# Line 242 | Line 274 | public class ScheduledExecutorTest exten
274       * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
275       */
276      public void testScheduleWithFixedDelay1_RejectedExecutionException() {
277 <        ScheduledExecutor se = new ScheduledExecutor(1);
277 >        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
278          try {
279              se.shutdown();
280              se.scheduleWithFixedDelay(new NoOpRunnable(),
281                                        MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
282              shouldThrow();
283          } catch(RejectedExecutionException success){
284 +        } catch (SecurityException ok) {
285          }
286          joinPool(se);
287      }
# Line 258 | Line 291 | public class ScheduledExecutorTest exten
291       *  thread becomes active
292       */
293      public void testGetActiveCount() {
294 <        ScheduledExecutor p2 = new ScheduledExecutor(2);
294 >        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
295          assertEquals(0, p2.getActiveCount());
296          p2.execute(new SmallRunnable());
297          try {
# Line 275 | Line 308 | public class ScheduledExecutorTest exten
308       *   when tasks complete
309       */
310      public void testGetCompletedTaskCount() {
311 <        ScheduledExecutor p2 = new ScheduledExecutor(2);
311 >        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
312          assertEquals(0, p2.getCompletedTaskCount());
313          p2.execute(new SmallRunnable());
314          try {
# Line 291 | Line 324 | public class ScheduledExecutorTest exten
324       *  getCorePoolSize returns size given in constructor if not otherwise set
325       */
326      public void testGetCorePoolSize() {
327 <        ScheduledExecutor p1 = new ScheduledExecutor(1);
327 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
328          assertEquals(1, p1.getCorePoolSize());
329          joinPool(p1);
330      }
# Line 301 | Line 334 | public class ScheduledExecutorTest exten
334       *   multiple threads active
335       */
336      public void testGetLargestPoolSize() {
337 <        ScheduledExecutor p2 = new ScheduledExecutor(2);
337 >        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
338          assertEquals(0, p2.getLargestPoolSize());
339          p2.execute(new SmallRunnable());
340          p2.execute(new SmallRunnable());
# Line 319 | Line 352 | public class ScheduledExecutorTest exten
352       *   become active
353       */
354      public void testGetPoolSize() {
355 <        ScheduledExecutor p1 = new ScheduledExecutor(1);
355 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
356          assertEquals(0, p1.getPoolSize());
357          p1.execute(new SmallRunnable());
358          assertEquals(1, p1.getPoolSize());
# Line 331 | Line 364 | public class ScheduledExecutorTest exten
364       *    submitted
365       */
366      public void testGetTaskCount() {
367 <        ScheduledExecutor p1 = new ScheduledExecutor(1);
367 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
368          assertEquals(0, p1.getTaskCount());
369          for(int i = 0; i < 5; i++)
370              p1.execute(new SmallRunnable());
# Line 343 | Line 376 | public class ScheduledExecutorTest exten
376          assertEquals(5, p1.getTaskCount());
377          joinPool(p1);
378      }
379 +
380 +    /**
381 +     * getThreadFactory returns factory in constructor if not set
382 +     */
383 +    public void testGetThreadFactory() {
384 +        ThreadFactory tf = new SimpleThreadFactory();
385 +        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf);
386 +        assertSame(tf, p.getThreadFactory());
387 +        joinPool(p);
388 +    }
389 +
390 +    /**
391 +     * setThreadFactory sets the thread factory returned by getThreadFactory
392 +     */
393 +    public void testSetThreadFactory() {
394 +        ThreadFactory tf = new SimpleThreadFactory();
395 +        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
396 +        p.setThreadFactory(tf);
397 +        assertSame(tf, p.getThreadFactory());
398 +        joinPool(p);
399 +    }
400 +
401 +    /**
402 +     * setThreadFactory(null) throws NPE
403 +     */
404 +    public void testSetThreadFactoryNull() {
405 +        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
406 +        try {
407 +            p.setThreadFactory(null);
408 +            shouldThrow();
409 +        } catch (NullPointerException success) {
410 +        } finally {
411 +            joinPool(p);
412 +        }
413 +    }
414      
415      /**
416       *   is isShutDown is false before shutdown, true after
417       */
418      public void testIsShutdown() {
419          
420 <        ScheduledExecutor p1 = new ScheduledExecutor(1);
420 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
421          try {
422              assertFalse(p1.isShutdown());
423          }
424          finally {
425 <            p1.shutdown();
425 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
426          }
427          assertTrue(p1.isShutdown());
428      }
# Line 364 | Line 432 | public class ScheduledExecutorTest exten
432       *   isTerminated is false before termination, true after
433       */
434      public void testIsTerminated() {
435 <        ScheduledExecutor p1 = new ScheduledExecutor(1);
435 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
436          try {
437              p1.execute(new SmallRunnable());
438          } finally {
439 <            p1.shutdown();
439 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
440          }
441          try {
442              assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
# Line 382 | Line 450 | public class ScheduledExecutorTest exten
450       *  isTerminating is not true when running or when terminated
451       */
452      public void testIsTerminating() {
453 <        ScheduledExecutor p1 = new ScheduledExecutor(1);
453 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
454          assertFalse(p1.isTerminating());
455          try {
456              p1.execute(new SmallRunnable());
457              assertFalse(p1.isTerminating());
458          } finally {
459 <            p1.shutdown();
459 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
460          }
461          try {
462              assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
# Line 400 | Line 468 | public class ScheduledExecutorTest exten
468      }
469  
470      /**
471 <     *   purge removes cancelled tasks from the queue
471 >     * getQueue returns the work queue, which contains queued tasks
472 >     */
473 >    public void testGetQueue() {
474 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
475 >        ScheduledFuture[] tasks = new ScheduledFuture[5];
476 >        for(int i = 0; i < 5; i++){
477 >            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, TimeUnit.MILLISECONDS);
478 >        }
479 >        try {
480 >            Thread.sleep(SHORT_DELAY_MS);
481 >            BlockingQueue<Runnable> q = p1.getQueue();
482 >            assertTrue(q.contains(tasks[4]));
483 >            assertFalse(q.contains(tasks[0]));
484 >        } catch(Exception e) {
485 >            unexpectedException();
486 >        } finally {
487 >            joinPool(p1);
488 >        }
489 >    }
490 >
491 >    /**
492 >     * remove(task) removes queued task, and fails to remove active task
493 >     */
494 >    public void testRemove() {
495 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
496 >        ScheduledFuture[] tasks = new ScheduledFuture[5];
497 >        for(int i = 0; i < 5; i++){
498 >            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, TimeUnit.MILLISECONDS);
499 >        }
500 >        try {
501 >            Thread.sleep(SHORT_DELAY_MS);
502 >            BlockingQueue<Runnable> q = p1.getQueue();
503 >            assertFalse(p1.remove((Runnable)tasks[0]));
504 >            assertTrue(q.contains((Runnable)tasks[4]));
505 >            assertTrue(q.contains((Runnable)tasks[3]));
506 >            assertTrue(p1.remove((Runnable)tasks[4]));
507 >            assertFalse(p1.remove((Runnable)tasks[4]));
508 >            assertFalse(q.contains((Runnable)tasks[4]));
509 >            assertTrue(q.contains((Runnable)tasks[3]));
510 >            assertTrue(p1.remove((Runnable)tasks[3]));
511 >            assertFalse(q.contains((Runnable)tasks[3]));
512 >        } catch(Exception e) {
513 >            unexpectedException();
514 >        } finally {
515 >            joinPool(p1);
516 >        }
517 >    }
518 >
519 >    /**
520 >     *  purge removes cancelled tasks from the queue
521       */
522      public void testPurge() {
523 <        ScheduledExecutor p1 = new ScheduledExecutor(1);
524 <        ScheduledCancellable[] tasks = new ScheduledCancellable[5];
523 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
524 >        ScheduledFuture[] tasks = new ScheduledFuture[5];
525          for(int i = 0; i < 5; i++){
526 <            tasks[i] = p1.schedule(new SmallRunnable(), 1, TimeUnit.MILLISECONDS);
526 >            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
527 >        }
528 >        try {
529 >            int max = 5;
530 >            if (tasks[4].cancel(true)) --max;
531 >            if (tasks[3].cancel(true)) --max;
532 >            // There must eventually be an interference-free point at
533 >            // which purge will not fail. (At worst, when queue is empty.)
534 >            int k;
535 >            for (k = 0; k < SMALL_DELAY_MS; ++k) {
536 >                p1.purge();
537 >                long count = p1.getTaskCount();
538 >                if (count >= 0 && count <= max)
539 >                    break;
540 >                Thread.sleep(1);
541 >            }
542 >            assertTrue(k < SMALL_DELAY_MS);
543 >        } catch(Exception e) {
544 >            unexpectedException();
545 >        } finally {
546 >            joinPool(p1);
547          }
411        int max = 5;
412        if (tasks[4].cancel(true)) --max;
413        if (tasks[3].cancel(true)) --max;
414        p1.purge();
415        long count = p1.getTaskCount();
416        assertTrue(count > 0 && count <= max);
417        joinPool(p1);
548      }
549  
550      /**
551       *  shutDownNow returns a list containing tasks that were not run
552       */
553      public void testShutDownNow() {
554 <        ScheduledExecutor p1 = new ScheduledExecutor(1);
554 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
555          for(int i = 0; i < 5; i++)
556 <            p1.schedule(new SmallRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
557 <        List l = p1.shutdownNow();
556 >            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
557 >        List l;
558 >        try {
559 >            l = p1.shutdownNow();
560 >        } catch (SecurityException ok) {
561 >            return;
562 >        }
563          assertTrue(p1.isShutdown());
564          assertTrue(l.size() > 0 && l.size() <= 5);
565          joinPool(p1);
# Line 436 | Line 571 | public class ScheduledExecutorTest exten
571       */
572      public void testShutDown1() {
573          try {
574 <            ScheduledExecutor p1 = new ScheduledExecutor(1);
574 >            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
575              assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
576              assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
577  
578 <            ScheduledCancellable[] tasks = new ScheduledCancellable[5];
578 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
579              for(int i = 0; i < 5; i++)
580                  tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
581 <            p1.shutdown();
581 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
582              BlockingQueue q = p1.getQueue();
583              for (Iterator it = q.iterator(); it.hasNext();) {
584 <                ScheduledCancellable t = (ScheduledCancellable)it.next();
584 >                ScheduledFuture t = (ScheduledFuture)it.next();
585                  assertFalse(t.isCancelled());
586              }
587              assertTrue(p1.isShutdown());
# Line 469 | Line 604 | public class ScheduledExecutorTest exten
604       */
605      public void testShutDown2() {
606          try {
607 <            ScheduledExecutor p1 = new ScheduledExecutor(1);
607 >            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
608              p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
609 <            ScheduledCancellable[] tasks = new ScheduledCancellable[5];
609 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
610              for(int i = 0; i < 5; i++)
611                  tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
612 <            p1.shutdown();
612 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
613              assertTrue(p1.isShutdown());
614              BlockingQueue q = p1.getQueue();
615              assertTrue(q.isEmpty());
# Line 493 | Line 628 | public class ScheduledExecutorTest exten
628       */
629      public void testShutDown3() {
630          try {
631 <            ScheduledExecutor p1 = new ScheduledExecutor(1);
631 >            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
632              p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
633 <            ScheduledCancellable task =
633 >            ScheduledFuture task =
634                  p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
635 <            p1.shutdown();
635 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
636              assertTrue(p1.isShutdown());
637              BlockingQueue q = p1.getQueue();
638              assertTrue(q.isEmpty());
# Line 514 | Line 649 | public class ScheduledExecutorTest exten
649       * periodic tasks are cancelled at shutdown
650       */
651      public void testShutDown4() {
652 <        ScheduledExecutor p1 = new ScheduledExecutor(1);
652 >        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
653          try {
654              p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
655 <            ScheduledCancellable task =
656 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
655 >            ScheduledFuture task =
656 >                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, TimeUnit.MILLISECONDS);
657              assertFalse(task.isCancelled());
658 <            p1.shutdown();
658 >            try { p1.shutdown(); } catch(SecurityException ok) { return; }
659              assertFalse(task.isCancelled());
660              assertFalse(p1.isTerminated());
661              assertTrue(p1.isShutdown());
662              Thread.sleep(SHORT_DELAY_MS);
663              assertFalse(task.isCancelled());
664 <            task.cancel(true);
665 <            assertTrue(task.isCancelled());
664 >            assertTrue(task.cancel(true));
665 >            assertTrue(task.isDone());
666              Thread.sleep(SHORT_DELAY_MS);
667              assertTrue(p1.isTerminated());
668          }
669          catch(Exception ex) {
670              unexpectedException();
671          }
672 <        finally {
673 <            p1.shutdownNow();
672 >        finally {
673 >            joinPool(p1);
674 >        }
675 >    }
676 >
677 >    /**
678 >     * completed submit of callable returns result
679 >     */
680 >    public void testSubmitCallable() {
681 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
682 >        try {
683 >            Future<String> future = e.submit(new StringTask());
684 >            String result = future.get();
685 >            assertSame(TEST_STRING, result);
686 >        }
687 >        catch (ExecutionException ex) {
688 >            unexpectedException();
689 >        }
690 >        catch (InterruptedException ex) {
691 >            unexpectedException();
692 >        } finally {
693 >            joinPool(e);
694 >        }
695 >    }
696 >
697 >    /**
698 >     * completed submit of runnable returns successfully
699 >     */
700 >    public void testSubmitRunnable() {
701 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
702 >        try {
703 >            Future<?> future = e.submit(new NoOpRunnable());
704 >            future.get();
705 >            assertTrue(future.isDone());
706 >        }
707 >        catch (ExecutionException ex) {
708 >            unexpectedException();
709 >        }
710 >        catch (InterruptedException ex) {
711 >            unexpectedException();
712 >        } finally {
713 >            joinPool(e);
714 >        }
715 >    }
716 >
717 >    /**
718 >     * completed submit of (runnable, result) returns result
719 >     */
720 >    public void testSubmitRunnable2() {
721 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
722 >        try {
723 >            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
724 >            String result = future.get();
725 >            assertSame(TEST_STRING, result);
726 >        }
727 >        catch (ExecutionException ex) {
728 >            unexpectedException();
729 >        }
730 >        catch (InterruptedException ex) {
731 >            unexpectedException();
732 >        } finally {
733 >            joinPool(e);
734 >        }
735 >    }
736 >
737 >    /**
738 >     * invokeAny(null) throws NPE
739 >     */
740 >    public void testInvokeAny1() {
741 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
742 >        try {
743 >            e.invokeAny(null);
744 >        } catch (NullPointerException success) {
745 >        } catch(Exception ex) {
746 >            unexpectedException();
747 >        } finally {
748 >            joinPool(e);
749 >        }
750 >    }
751 >
752 >    /**
753 >     * invokeAny(empty collection) throws IAE
754 >     */
755 >    public void testInvokeAny2() {
756 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
757 >        try {
758 >            e.invokeAny(new ArrayList<Callable<String>>());
759 >        } catch (IllegalArgumentException success) {
760 >        } catch(Exception ex) {
761 >            unexpectedException();
762 >        } finally {
763 >            joinPool(e);
764 >        }
765 >    }
766 >
767 >    /**
768 >     * invokeAny(c) throws NPE if c has null elements
769 >     */
770 >    public void testInvokeAny3() {
771 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
772 >        try {
773 >            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
774 >            l.add(new StringTask());
775 >            l.add(null);
776 >            e.invokeAny(l);
777 >        } catch (NullPointerException success) {
778 >        } catch(Exception ex) {
779 >            unexpectedException();
780 >        } finally {
781 >            joinPool(e);
782 >        }
783 >    }
784 >
785 >    /**
786 >     * invokeAny(c) throws ExecutionException if no task completes
787 >     */
788 >    public void testInvokeAny4() {
789 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
790 >        try {
791 >            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
792 >            l.add(new NPETask());
793 >            e.invokeAny(l);
794 >        } catch (ExecutionException success) {
795 >        } catch(Exception ex) {
796 >            unexpectedException();
797 >        } finally {
798 >            joinPool(e);
799 >        }
800 >    }
801 >
802 >    /**
803 >     * invokeAny(c) returns result of some task
804 >     */
805 >    public void testInvokeAny5() {
806 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
807 >        try {
808 >            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
809 >            l.add(new StringTask());
810 >            l.add(new StringTask());
811 >            String result = e.invokeAny(l);
812 >            assertSame(TEST_STRING, result);
813 >        } catch (ExecutionException success) {
814 >        } catch(Exception ex) {
815 >            unexpectedException();
816 >        } finally {
817 >            joinPool(e);
818 >        }
819 >    }
820 >
821 >    /**
822 >     * invokeAll(null) throws NPE
823 >     */
824 >    public void testInvokeAll1() {
825 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
826 >        try {
827 >            e.invokeAll(null);
828 >        } catch (NullPointerException success) {
829 >        } catch(Exception ex) {
830 >            unexpectedException();
831 >        } finally {
832 >            joinPool(e);
833 >        }
834 >    }
835 >
836 >    /**
837 >     * invokeAll(empty collection) returns empty collection
838 >     */
839 >    public void testInvokeAll2() {
840 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
841 >        try {
842 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
843 >            assertTrue(r.isEmpty());
844 >        } catch(Exception ex) {
845 >            unexpectedException();
846 >        } finally {
847 >            joinPool(e);
848 >        }
849 >    }
850 >
851 >    /**
852 >     * invokeAll(c) throws NPE if c has null elements
853 >     */
854 >    public void testInvokeAll3() {
855 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
856 >        try {
857 >            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
858 >            l.add(new StringTask());
859 >            l.add(null);
860 >            e.invokeAll(l);
861 >        } catch (NullPointerException success) {
862 >        } catch(Exception ex) {
863 >            unexpectedException();
864 >        } finally {
865 >            joinPool(e);
866 >        }
867 >    }
868 >
869 >    /**
870 >     * get of invokeAll(c) throws exception on failed task
871 >     */
872 >    public void testInvokeAll4() {
873 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
874 >        try {
875 >            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
876 >            l.add(new NPETask());
877 >            List<Future<String>> result = e.invokeAll(l);
878 >            assertEquals(1, result.size());
879 >            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
880 >                it.next().get();
881 >        } catch(ExecutionException success) {
882 >        } catch(Exception ex) {
883 >            unexpectedException();
884 >        } finally {
885 >            joinPool(e);
886 >        }
887 >    }
888 >
889 >    /**
890 >     * invokeAll(c) returns results of all completed tasks
891 >     */
892 >    public void testInvokeAll5() {
893 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
894 >        try {
895 >            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
896 >            l.add(new StringTask());
897 >            l.add(new StringTask());
898 >            List<Future<String>> result = e.invokeAll(l);
899 >            assertEquals(2, result.size());
900 >            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
901 >                assertSame(TEST_STRING, it.next().get());
902 >        } catch (ExecutionException success) {
903 >        } catch(Exception ex) {
904 >            unexpectedException();
905 >        } finally {
906 >            joinPool(e);
907 >        }
908 >    }
909 >
910 >    /**
911 >     * timed invokeAny(null) throws NPE
912 >     */
913 >    public void testTimedInvokeAny1() {
914 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
915 >        try {
916 >            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
917 >        } catch (NullPointerException success) {
918 >        } catch(Exception ex) {
919 >            unexpectedException();
920 >        } finally {
921 >            joinPool(e);
922 >        }
923 >    }
924 >
925 >    /**
926 >     * timed invokeAny(,,null) throws NPE
927 >     */
928 >    public void testTimedInvokeAnyNullTimeUnit() {
929 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
930 >        try {
931 >            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
932 >            l.add(new StringTask());
933 >            e.invokeAny(l, MEDIUM_DELAY_MS, null);
934 >        } catch (NullPointerException success) {
935 >        } catch(Exception ex) {
936 >            unexpectedException();
937 >        } finally {
938 >            joinPool(e);
939 >        }
940 >    }
941 >
942 >    /**
943 >     * timed invokeAny(empty collection) throws IAE
944 >     */
945 >    public void testTimedInvokeAny2() {
946 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
947 >        try {
948 >            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
949 >        } catch (IllegalArgumentException success) {
950 >        } catch(Exception ex) {
951 >            unexpectedException();
952 >        } finally {
953 >            joinPool(e);
954 >        }
955 >    }
956 >
957 >    /**
958 >     * timed invokeAny(c) throws NPE if c has null elements
959 >     */
960 >    public void testTimedInvokeAny3() {
961 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
962 >        try {
963 >            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
964 >            l.add(new StringTask());
965 >            l.add(null);
966 >            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
967 >        } catch (NullPointerException success) {
968 >        } catch(Exception ex) {
969 >            ex.printStackTrace();
970 >            unexpectedException();
971 >        } finally {
972 >            joinPool(e);
973 >        }
974 >    }
975 >
976 >    /**
977 >     * timed invokeAny(c) throws ExecutionException if no task completes
978 >     */
979 >    public void testTimedInvokeAny4() {
980 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
981 >        try {
982 >            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
983 >            l.add(new NPETask());
984 >            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
985 >        } catch(ExecutionException success) {
986 >        } catch(Exception ex) {
987 >            unexpectedException();
988 >        } finally {
989 >            joinPool(e);
990 >        }
991 >    }
992 >
993 >    /**
994 >     * timed invokeAny(c) returns result of some task
995 >     */
996 >    public void testTimedInvokeAny5() {
997 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
998 >        try {
999 >            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1000 >            l.add(new StringTask());
1001 >            l.add(new StringTask());
1002 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1003 >            assertSame(TEST_STRING, result);
1004 >        } catch (ExecutionException success) {
1005 >        } catch(Exception ex) {
1006 >            unexpectedException();
1007 >        } finally {
1008 >            joinPool(e);
1009 >        }
1010 >    }
1011 >
1012 >    /**
1013 >     * timed invokeAll(null) throws NPE
1014 >     */
1015 >    public void testTimedInvokeAll1() {
1016 >        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1017 >        try {
1018 >            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1019 >        } catch (NullPointerException success) {
1020 >        } catch(Exception ex) {
1021 >            unexpectedException();
1022 >        } finally {
1023 >            joinPool(e);
1024          }
1025      }
1026  
1027 +    /**
1028 +     * timed invokeAll(,,null) throws NPE
1029 +     */
1030 +    public void testTimedInvokeAllNullTimeUnit() {
1031 +        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1032 +        try {
1033 +            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1034 +            l.add(new StringTask());
1035 +            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1036 +        } catch (NullPointerException success) {
1037 +        } catch(Exception ex) {
1038 +            unexpectedException();
1039 +        } finally {
1040 +            joinPool(e);
1041 +        }
1042 +    }
1043 +
1044 +    /**
1045 +     * timed invokeAll(empty collection) returns empty collection
1046 +     */
1047 +    public void testTimedInvokeAll2() {
1048 +        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1049 +        try {
1050 +            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1051 +            assertTrue(r.isEmpty());
1052 +        } catch(Exception ex) {
1053 +            unexpectedException();
1054 +        } finally {
1055 +            joinPool(e);
1056 +        }
1057 +    }
1058 +
1059 +    /**
1060 +     * timed invokeAll(c) throws NPE if c has null elements
1061 +     */
1062 +    public void testTimedInvokeAll3() {
1063 +        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1064 +        try {
1065 +            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1066 +            l.add(new StringTask());
1067 +            l.add(null);
1068 +            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1069 +        } catch (NullPointerException success) {
1070 +        } catch(Exception ex) {
1071 +            unexpectedException();
1072 +        } finally {
1073 +            joinPool(e);
1074 +        }
1075 +    }
1076 +
1077 +    /**
1078 +     * get of element of invokeAll(c) throws exception on failed task
1079 +     */
1080 +    public void testTimedInvokeAll4() {
1081 +        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1082 +        try {
1083 +            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1084 +            l.add(new NPETask());
1085 +            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1086 +            assertEquals(1, result.size());
1087 +            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1088 +                it.next().get();
1089 +        } catch(ExecutionException success) {
1090 +        } catch(Exception ex) {
1091 +            unexpectedException();
1092 +        } finally {
1093 +            joinPool(e);
1094 +        }
1095 +    }
1096 +
1097 +    /**
1098 +     * timed invokeAll(c) returns results of all completed tasks
1099 +     */
1100 +    public void testTimedInvokeAll5() {
1101 +        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1102 +        try {
1103 +            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1104 +            l.add(new StringTask());
1105 +            l.add(new StringTask());
1106 +            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1107 +            assertEquals(2, result.size());
1108 +            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1109 +                assertSame(TEST_STRING, it.next().get());
1110 +        } catch (ExecutionException success) {
1111 +        } catch(Exception ex) {
1112 +            unexpectedException();
1113 +        } finally {
1114 +            joinPool(e);
1115 +        }
1116 +    }
1117 +
1118 +    /**
1119 +     * timed invokeAll(c) cancels tasks not completed by timeout
1120 +     */
1121 +    public void testTimedInvokeAll6() {
1122 +        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1123 +        try {
1124 +            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1125 +            l.add(new StringTask());
1126 +            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1127 +            l.add(new StringTask());
1128 +            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
1129 +            assertEquals(3, result.size());
1130 +            Iterator<Future<String>> it = result.iterator();
1131 +            Future<String> f1 = it.next();
1132 +            Future<String> f2 = it.next();
1133 +            Future<String> f3 = it.next();
1134 +            assertTrue(f1.isDone());
1135 +            assertTrue(f2.isDone());
1136 +            assertTrue(f3.isDone());
1137 +            assertFalse(f1.isCancelled());
1138 +            assertTrue(f2.isCancelled());
1139 +        } catch(Exception ex) {
1140 +            unexpectedException();
1141 +        } finally {
1142 +            joinPool(e);
1143 +        }
1144 +    }
1145 +
1146 +
1147   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines