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

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.5 by dl, Thu Sep 25 11:02:41 2003 UTC vs.
Revision 1.21 by jsr166, Mon Nov 16 04:57:10 2009 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  
# Line 10 | Line 11 | import junit.framework.*;
11   import java.util.*;
12   import java.util.concurrent.*;
13   import java.math.BigInteger;
14 + import java.security.*;
15  
16   public class ExecutorsTest extends JSR166TestCase{
17      public static void main(String[] args) {
18 <        junit.textui.TestRunner.run (suite());  
18 >        junit.textui.TestRunner.run (suite());
19      }
20      public static Test suite() {
21 <        return new TestSuite(ExecutorsTest.class);
20 <    }
21 <
22 <    private static final String TEST_STRING = "a test string";
23 <
24 <    private static class MyTask implements Runnable {
25 <        public void run() { completed = true; }
26 <        public boolean isCompleted() { return completed; }
27 <        public void reset() { completed = false; }
28 <        private boolean completed = false;
29 <    }
30 <
31 <    private static class StringTask implements Callable<String> {
32 <        public String call() { return TEST_STRING; }
33 <    }
34 <
35 <    static class DirectExecutor implements Executor {
36 <        public void execute(Runnable r) {
37 <            r.run();
38 <        }
21 >        return new TestSuite(ExecutorsTest.class);
22      }
23  
24      static class TimedCallable<T> implements Callable<T> {
25 <        private final Executor exec;
25 >        private final ExecutorService exec;
26          private final Callable<T> func;
27          private final long msecs;
28 <        
29 <        TimedCallable(Executor exec, Callable<T> func, long msecs) {
28 >
29 >        TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
30              this.exec = exec;
31              this.func = func;
32              this.msecs = msecs;
33          }
34 <        
34 >
35          public T call() throws Exception {
36 <            Future<T> ftask = Executors.execute(exec, func);
36 >            Future<T> ftask = exec.submit(func);
37              try {
38                  return ftask.get(msecs, TimeUnit.MILLISECONDS);
39              } finally {
# Line 79 | Line 62 | public class ExecutorsTest extends JSR16
62      };
63  
64      /**
82     * For use as ThreadFactory in constructors
83     */
84    static class MyThreadFactory implements ThreadFactory{
85        public Thread newThread(Runnable r){
86            return new Thread(r);
87        }  
88    }
89
90    /**
65       * A newCachedThreadPool can execute runnables
66       */
67      public void testNewCachedThreadPool1() {
# Line 95 | Line 69 | public class ExecutorsTest extends JSR16
69          e.execute(new NoOpRunnable());
70          e.execute(new NoOpRunnable());
71          e.execute(new NoOpRunnable());
72 <        e.shutdown();
72 >        joinPool(e);
73      }
74  
75      /**
76       * A newCachedThreadPool with given ThreadFactory can execute runnables
77       */
78      public void testNewCachedThreadPool2() {
79 <        ExecutorService e = Executors.newCachedThreadPool(new MyThreadFactory());
79 >        ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
80          e.execute(new NoOpRunnable());
81          e.execute(new NoOpRunnable());
82          e.execute(new NoOpRunnable());
83 <        e.shutdown();
83 >        joinPool(e);
84      }
85  
86      /**
# Line 117 | Line 91 | public class ExecutorsTest extends JSR16
91              ExecutorService e = Executors.newCachedThreadPool(null);
92              shouldThrow();
93          }
94 <        catch(NullPointerException success) {
94 >        catch (NullPointerException success) {
95          }
96      }
97  
# Line 130 | Line 104 | public class ExecutorsTest extends JSR16
104          e.execute(new NoOpRunnable());
105          e.execute(new NoOpRunnable());
106          e.execute(new NoOpRunnable());
107 <        e.shutdown();
107 >        joinPool(e);
108      }
109  
110      /**
111       * A new SingleThreadExecutor with given ThreadFactory can execute runnables
112       */
113      public void testNewSingleThreadExecutor2() {
114 <        ExecutorService e = Executors.newSingleThreadExecutor(new MyThreadFactory());
114 >        ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
115          e.execute(new NoOpRunnable());
116          e.execute(new NoOpRunnable());
117          e.execute(new NoOpRunnable());
118 <        e.shutdown();
118 >        joinPool(e);
119      }
120  
121      /**
# Line 152 | Line 126 | public class ExecutorsTest extends JSR16
126              ExecutorService e = Executors.newSingleThreadExecutor(null);
127              shouldThrow();
128          }
129 <        catch(NullPointerException success) {
129 >        catch (NullPointerException success) {
130          }
131      }
132  
133      /**
134 +     * A new SingleThreadExecutor cannot be casted to concrete implementation
135 +     */
136 +    public void testCastNewSingleThreadExecutor() {
137 +        ExecutorService e = Executors.newSingleThreadExecutor();
138 +        try {
139 +            ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
140 +        } catch (ClassCastException success) {
141 +        } finally {
142 +            joinPool(e);
143 +        }
144 +    }
145 +
146 +
147 +    /**
148       * A new newFixedThreadPool can execute runnables
149       */
150      public void testNewFixedThreadPool1() {
# Line 164 | Line 152 | public class ExecutorsTest extends JSR16
152          e.execute(new NoOpRunnable());
153          e.execute(new NoOpRunnable());
154          e.execute(new NoOpRunnable());
155 <        e.shutdown();
155 >        joinPool(e);
156      }
157  
158      /**
159       * A new newFixedThreadPool with given ThreadFactory can execute runnables
160       */
161      public void testNewFixedThreadPool2() {
162 <        ExecutorService e = Executors.newFixedThreadPool(2, new MyThreadFactory());
162 >        ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
163          e.execute(new NoOpRunnable());
164          e.execute(new NoOpRunnable());
165          e.execute(new NoOpRunnable());
166 <        e.shutdown();
166 >        joinPool(e);
167      }
168  
169      /**
# Line 186 | Line 174 | public class ExecutorsTest extends JSR16
174              ExecutorService e = Executors.newFixedThreadPool(2, null);
175              shouldThrow();
176          }
177 <        catch(NullPointerException success) {
177 >        catch (NullPointerException success) {
178          }
179      }
180  
# Line 198 | Line 186 | public class ExecutorsTest extends JSR16
186              ExecutorService e = Executors.newFixedThreadPool(0);
187              shouldThrow();
188          }
189 <        catch(IllegalArgumentException success) {
189 >        catch (IllegalArgumentException success) {
190          }
191      }
192  
193 +
194      /**
195 <     * execute of runnable runs it to completion
195 >     * An unconfigurable newFixedThreadPool can execute runnables
196       */
197 <    public void testExecuteRunnable () {
197 >    public void testunconfigurableExecutorService() {
198 >        ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
199 >        e.execute(new NoOpRunnable());
200 >        e.execute(new NoOpRunnable());
201 >        e.execute(new NoOpRunnable());
202 >        joinPool(e);
203 >    }
204 >
205 >    /**
206 >     * unconfigurableExecutorService(null) throws NPE
207 >     */
208 >    public void testunconfigurableExecutorServiceNPE() {
209          try {
210 <            Executor e = new DirectExecutor();
211 <            MyTask task = new MyTask();
212 <            assertFalse(task.isCompleted());
213 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
214 <            String result = future.get();
215 <            assertTrue(task.isCompleted());
216 <            assertSame(TEST_STRING, result);
210 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
211          }
212 <        catch (ExecutionException ex) {
219 <            unexpectedException();
220 <        }
221 <        catch (InterruptedException ex) {
222 <            unexpectedException();
212 >        catch (NullPointerException success) {
213          }
214      }
215  
216      /**
217 <     * invoke of a runnable runs it to completion
217 >     * unconfigurableScheduledExecutorService(null) throws NPE
218       */
219 <    public void testInvokeRunnable () {
219 >    public void testunconfigurableScheduledExecutorServiceNPE() {
220          try {
221 <            Executor e = new DirectExecutor();
232 <            MyTask task = new MyTask();
233 <            assertFalse(task.isCompleted());
234 <            Executors.invoke(e, task);
235 <            assertTrue(task.isCompleted());
221 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
222          }
223 <        catch (ExecutionException ex) {
238 <            unexpectedException();
239 <        }
240 <        catch (InterruptedException ex) {
241 <            unexpectedException();
223 >        catch (NullPointerException success) {
224          }
225      }
226  
227 +
228      /**
229 <     * execute of a callable runs it to completion
229 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
230       */
231 <    public void testExecuteCallable () {
232 <        try {
233 <            Executor e = new DirectExecutor();
234 <            Future<String> future = Executors.execute(e, new StringTask());
235 <            String result = future.get();
236 <            assertSame(TEST_STRING, result);
231 >    public void testNewSingleThreadScheduledExecutor() {
232 >        try {
233 >            TrackedCallable callable = new TrackedCallable();
234 >            ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
235 >            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
236 >            assertFalse(callable.done);
237 >            Thread.sleep(MEDIUM_DELAY_MS);
238 >            assertTrue(callable.done);
239 >            assertEquals(Boolean.TRUE, f.get());
240 >            joinPool(p1);
241 >        } catch (RejectedExecutionException e){}
242 >        catch (Exception e){
243 >            e.printStackTrace();
244 >            unexpectedException();
245          }
246 <        catch (ExecutionException ex) {
246 >    }
247 >
248 >    /**
249 >     * a newScheduledThreadPool successfully runs delayed task
250 >     */
251 >    public void testnewScheduledThreadPool() {
252 >        try {
253 >            TrackedCallable callable = new TrackedCallable();
254 >            ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
255 >            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
256 >            assertFalse(callable.done);
257 >            Thread.sleep(MEDIUM_DELAY_MS);
258 >            assertTrue(callable.done);
259 >            assertEquals(Boolean.TRUE, f.get());
260 >            joinPool(p1);
261 >        } catch (RejectedExecutionException e){}
262 >        catch (Exception e){
263 >            e.printStackTrace();
264              unexpectedException();
265          }
266 <        catch (InterruptedException ex) {
266 >    }
267 >
268 >    /**
269 >     * an unconfigurable  newScheduledThreadPool successfully runs delayed task
270 >     */
271 >    public void testunconfigurableScheduledExecutorService() {
272 >        try {
273 >            TrackedCallable callable = new TrackedCallable();
274 >            ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
275 >            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
276 >            assertFalse(callable.done);
277 >            Thread.sleep(MEDIUM_DELAY_MS);
278 >            assertTrue(callable.done);
279 >            assertEquals(Boolean.TRUE, f.get());
280 >            joinPool(p1);
281 >        } catch (RejectedExecutionException e){}
282 >        catch (Exception e){
283 >            e.printStackTrace();
284              unexpectedException();
285          }
286      }
287  
288      /**
289 <     * invoke of a collable runs it to completion
289 >     *  timeouts from execute will time out if they compute too long.
290       */
291 <    public void testInvokeCallable () {
291 >    public void testTimedCallable() {
292 >        int N = 10000;
293 >        ExecutorService executor = Executors.newSingleThreadExecutor();
294 >        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
295          try {
296 <            Executor e = new DirectExecutor();
269 <            String result = Executors.invoke(e, new StringTask());
296 >            long startTime = System.currentTimeMillis();
297  
298 <            assertSame(TEST_STRING, result);
298 >            long i = 0;
299 >            while (tasks.size() < N) {
300 >                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
301 >                i += 10;
302 >            }
303 >
304 >            int iters = 0;
305 >            BigInteger sum = BigInteger.ZERO;
306 >            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
307 >                try {
308 >                    ++iters;
309 >                    sum = sum.add(it.next().call());
310 >                }
311 >                catch (TimeoutException success) {
312 >                    assertTrue(iters > 0);
313 >                    return;
314 >                }
315 >                catch (Exception e) {
316 >                    unexpectedException();
317 >                }
318 >            }
319 >            // if by chance we didn't ever time out, total time must be small
320 >            long elapsed = System.currentTimeMillis() - startTime;
321 >            assertTrue(elapsed < N);
322          }
323 <        catch (ExecutionException ex) {
324 <            unexpectedException();
323 >        finally {
324 >            joinPool(executor);
325 >        }
326 >    }
327 >
328 >
329 >    /**
330 >     * ThreadPoolExecutor using defaultThreadFactory has
331 >     * specified group, priority, daemon status, and name
332 >     */
333 >    public void testDefaultThreadFactory() {
334 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
335 >        Runnable r = new Runnable() {
336 >                public void run() {
337 >                    try {
338 >                        Thread current = Thread.currentThread();
339 >                        threadAssertTrue(!current.isDaemon());
340 >                        threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
341 >                        ThreadGroup g = current.getThreadGroup();
342 >                        SecurityManager s = System.getSecurityManager();
343 >                        if (s != null)
344 >                            threadAssertTrue(g == s.getThreadGroup());
345 >                        else
346 >                            threadAssertTrue(g == egroup);
347 >                        String name = current.getName();
348 >                        threadAssertTrue(name.endsWith("thread-1"));
349 >                    } catch (SecurityException ok) {
350 >                        // Also pass if not allowed to change setting
351 >                    }
352 >                }
353 >            };
354 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
355 >
356 >        e.execute(r);
357 >        try {
358 >            e.shutdown();
359 >        } catch (SecurityException ok) {
360          }
361 <        catch (InterruptedException ex) {
361 >
362 >        try {
363 >            Thread.sleep(SHORT_DELAY_MS);
364 >        } catch (Exception eX) {
365              unexpectedException();
366 +        } finally {
367 +            joinPool(e);
368          }
369      }
370  
371      /**
372 <     * execute with null executor throws NPE
372 >     * ThreadPoolExecutor using privilegedThreadFactory has
373 >     * specified group, priority, daemon status, name,
374 >     * access control context and context class loader
375       */
376 <    public void testNullExecuteRunnable () {
376 >    public void testPrivilegedThreadFactory() {
377 >        Policy savedPolicy = null;
378          try {
379 <            MyTask task = new MyTask();
380 <            assertFalse(task.isCompleted());
381 <            Future<String> future = Executors.execute(null, task, TEST_STRING);
382 <            shouldThrow();
379 >            savedPolicy = Policy.getPolicy();
380 >            AdjustablePolicy policy = new AdjustablePolicy();
381 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
382 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
383 >            Policy.setPolicy(policy);
384 >        } catch (AccessControlException ok) {
385 >            return;
386          }
387 <        catch (NullPointerException success) {
387 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
388 >        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
389 >        final AccessControlContext thisacc = AccessController.getContext();
390 >        Runnable r = new Runnable() {
391 >                public void run() {
392 >                    try {
393 >                        Thread current = Thread.currentThread();
394 >                        threadAssertTrue(!current.isDaemon());
395 >                        threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
396 >                        ThreadGroup g = current.getThreadGroup();
397 >                        SecurityManager s = System.getSecurityManager();
398 >                        if (s != null)
399 >                            threadAssertTrue(g == s.getThreadGroup());
400 >                        else
401 >                            threadAssertTrue(g == egroup);
402 >                        String name = current.getName();
403 >                        threadAssertTrue(name.endsWith("thread-1"));
404 >                        threadAssertTrue(thisccl == current.getContextClassLoader());
405 >                        threadAssertTrue(thisacc.equals(AccessController.getContext()));
406 >                    } catch (SecurityException ok) {
407 >                        // Also pass if not allowed to change settings
408 >                    }
409 >                }
410 >            };
411 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
412 >
413 >        Policy.setPolicy(savedPolicy);
414 >        e.execute(r);
415 >        try {
416 >            e.shutdown();
417 >        } catch (SecurityException ok) {
418          }
419 <        catch (Exception ex) {
419 >        try {
420 >            Thread.sleep(SHORT_DELAY_MS);
421 >        } catch (Exception ex) {
422              unexpectedException();
423 +        } finally {
424 +            joinPool(e);
425          }
426 +
427      }
428  
429 +    void checkCCL() {
430 +        SecurityManager sm = System.getSecurityManager();
431 +        if (sm != null) {
432 +            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
433 +            sm.checkPermission(new RuntimePermission("getClassLoader"));
434 +        }
435 +    }
436 +
437 +    class CheckCCL implements Callable<Object> {
438 +        public Object call() {
439 +            checkCCL();
440 +            return null;
441 +        }
442 +    }
443 +
444 +
445      /**
446 <     * execute with a null runnable throws NPE
446 >     * Without class loader permissions, creating
447 >     * privilegedCallableUsingCurrentClassLoader throws ACE
448       */
449 <    public void testExecuteNullRunnable() {
449 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
450 >        Policy savedPolicy = null;
451          try {
452 <            Executor e = new DirectExecutor();
453 <            MyTask task = null;
454 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
455 <            shouldThrow();
452 >            savedPolicy = Policy.getPolicy();
453 >            AdjustablePolicy policy = new AdjustablePolicy();
454 >            Policy.setPolicy(policy);
455 >        } catch (AccessControlException ok) {
456 >            return;
457          }
458 <        catch (NullPointerException success) {
458 >
459 >        // Check if program still has too many permissions to run test
460 >        try {
461 >            checkCCL();
462 >            // too many privileges to test; so return
463 >            Policy.setPolicy(savedPolicy);
464 >            return;
465 >        } catch (AccessControlException ok) {
466          }
467 <        catch (Exception ex) {
467 >
468 >        try {
469 >            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
470 >            shouldThrow();
471 >        } catch (AccessControlException success) {
472 >        } catch (Exception ex) {
473              unexpectedException();
474          }
475 +        finally {
476 +            Policy.setPolicy(savedPolicy);
477 +        }
478      }
479  
480      /**
481 <     * invoke of a null runnable throws NPE
481 >     * With class loader permissions, calling
482 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
483       */
484 <    public void testInvokeNullRunnable () {
484 >    public void testprivilegedCallableUsingCCLWithPrivs() {
485 >        Policy savedPolicy = null;
486          try {
487 <            Executor e = new DirectExecutor();
488 <            MyTask task = null;
489 <            Executors.invoke(e, task);
490 <            shouldThrow();
487 >            savedPolicy = Policy.getPolicy();
488 >            AdjustablePolicy policy = new AdjustablePolicy();
489 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
490 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
491 >            Policy.setPolicy(policy);
492 >        } catch (AccessControlException ok) {
493 >            return;
494          }
495 <        catch (NullPointerException success) {
496 <        }
497 <        catch (Exception ex) {
495 >
496 >        try {
497 >            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
498 >            task.call();
499 >        } catch (Exception ex) {
500              unexpectedException();
501          }
502 +        finally {
503 +            Policy.setPolicy(savedPolicy);
504 +        }
505      }
506  
507      /**
508 <     * execute of a null callable throws NPE
508 >     * Without permissions, calling privilegedCallable throws ACE
509       */
510 <    public void testExecuteNullCallable () {
510 >    public void testprivilegedCallableWithNoPrivs() {
511 >        Callable task;
512 >        Policy savedPolicy = null;
513 >        AdjustablePolicy policy = null;
514 >        AccessControlContext noprivAcc = null;
515          try {
516 <            Executor e = new DirectExecutor();
517 <            StringTask t = null;
518 <            Future<String> future = Executors.execute(e, t);
519 <            shouldThrow();
516 >            savedPolicy = Policy.getPolicy();
517 >            policy = new AdjustablePolicy();
518 >            Policy.setPolicy(policy);
519 >            noprivAcc = AccessController.getContext();
520 >            task = Executors.privilegedCallable(new CheckCCL());
521 >            Policy.setPolicy(savedPolicy);
522 >        } catch (AccessControlException ok) {
523 >            return; // program has too few permissions to set up test
524          }
525 <        catch (NullPointerException success) {
525 >
526 >        // Make sure that program doesn't have too many permissions
527 >        try {
528 >            AccessController.doPrivileged(new PrivilegedAction() {
529 >                    public Object run() {
530 >                        checkCCL();
531 >                        return null;
532 >                    }}, noprivAcc);
533 >            // too many permssions; skip test
534 >            return;
535 >        } catch (AccessControlException ok) {
536          }
537 <        catch (Exception ex) {
537 >
538 >        try {
539 >            task.call();
540 >            shouldThrow();
541 >        } catch (AccessControlException success) {
542 >        } catch (Exception ex) {
543              unexpectedException();
544          }
545      }
546  
547      /**
548 <     * invoke of a null callable throws NPE
548 >     * With permissions, calling privilegedCallable succeeds
549       */
550 <    public void testInvokeNullCallable () {
550 >    public void testprivilegedCallableWithPrivs() {
551 >        Policy savedPolicy = null;
552          try {
553 <            Executor e = new DirectExecutor();
554 <            StringTask t = null;
555 <            String result = Executors.invoke(e, t);
556 <            shouldThrow();
553 >            savedPolicy = Policy.getPolicy();
554 >            AdjustablePolicy policy = new AdjustablePolicy();
555 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
556 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
557 >            Policy.setPolicy(policy);
558 >        } catch (AccessControlException ok) {
559 >            return;
560          }
561 <        catch (NullPointerException success) {
562 <        }
563 <        catch (Exception ex) {
561 >
562 >        Callable task = Executors.privilegedCallable(new CheckCCL());
563 >        try {
564 >            task.call();
565 >        } catch (Exception ex) {
566              unexpectedException();
567 +        } finally {
568 +            Policy.setPolicy(savedPolicy);
569          }
570      }
571  
572      /**
573 <     *  execute(Executor, Runnable) throws RejectedExecutionException
368 <     *  if saturated.
573 >     * callable(Runnable) returns null when called
574       */
575 <    public void testExecute1() {
371 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
575 >    public void testCallable1() {
576          try {
577 <            
578 <            for(int i = 0; i < 5; ++i){
579 <                Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
580 <            }
581 <            shouldThrow();
582 <        } catch(RejectedExecutionException success){}
379 <        joinPool(p);
577 >            Callable c = Executors.callable(new NoOpRunnable());
578 >            assertNull(c.call());
579 >        } catch (Exception ex) {
580 >            unexpectedException();
581 >        }
582 >
583      }
584  
585      /**
586 <     *  execute(Executor, Callable)throws RejectedExecutionException
384 <     *  if saturated.
586 >     * callable(Runnable, result) returns result when called
587       */
588 <    public void testExecute2() {
387 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
588 >    public void testCallable2() {
589          try {
590 <            for(int i = 0; i < 5; ++i) {
591 <                Executors.execute(p, new SmallCallable());
592 <            }
593 <            shouldThrow();
594 <        } catch(RejectedExecutionException e){}
394 <        joinPool(p);
590 >            Callable c = Executors.callable(new NoOpRunnable(), one);
591 >            assertEquals(one, c.call());
592 >        } catch (Exception ex) {
593 >            unexpectedException();
594 >        }
595      }
596  
397
597      /**
598 <     *  invoke(Executor, Runnable) throws InterruptedException if
400 <     *  caller interrupted.
598 >     * callable(PrivilegedAction) returns its result when called
599       */
600 <    public void testInterruptedInvoke() {
403 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
404 <        Thread t = new Thread(new Runnable() {
405 <                public void run() {
406 <                    try {
407 <                        Executors.invoke(p,new Runnable() {
408 <                                public void run() {
409 <                                    try {
410 <                                        Thread.sleep(MEDIUM_DELAY_MS);
411 <                                        shouldThrow();
412 <                                    } catch(InterruptedException e){
413 <                                    }
414 <                                }
415 <                            });
416 <                    } catch(InterruptedException success){
417 <                    } catch(Exception e) {
418 <                        unexpectedException();
419 <                    }
420 <                    
421 <                }
422 <            });
600 >    public void testCallable3() {
601          try {
602 <            t.start();
603 <            Thread.sleep(SHORT_DELAY_MS);
604 <            t.interrupt();
605 <        } catch(Exception e){
602 >            Callable c = Executors.callable(new PrivilegedAction() {
603 >                    public Object run() { return one; }});
604 >        assertEquals(one, c.call());
605 >        } catch (Exception ex) {
606              unexpectedException();
607          }
430        joinPool(p);
608      }
609  
610      /**
611 <     *  invoke(Executor, Runnable) throws ExecutionException if
435 <     *  runnable throws exception.
611 >     * callable(PrivilegedExceptionAction) returns its result when called
612       */
613 <    public void testInvoke3() {
438 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
613 >    public void testCallable4() {
614          try {
615 <            Runnable r = new Runnable() {
616 <                    public void run() {
617 <                        int i = 5/0;
618 <                    }
444 <                };
445 <            
446 <            for(int i =0; i < 5; i++){
447 <                Executors.invoke(p,r);
448 <            }
449 <            
450 <            shouldThrow();
451 <        } catch(ExecutionException success){
452 <        } catch(Exception e){
615 >            Callable c = Executors.callable(new PrivilegedExceptionAction() {
616 >                    public Object run() { return one; }});
617 >            assertEquals(one, c.call());
618 >        } catch (Exception ex) {
619              unexpectedException();
620          }
455        joinPool(p);
621      }
622  
623  
459
624      /**
625 <     *  invoke(Executor, Callable) throws InterruptedException if
462 <     *  callable throws exception
625 >     * callable(null Runnable) throws NPE
626       */
627 <    public void testInvoke5() {
465 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
466 <        
467 <        final Callable c = new Callable() {
468 <                public Object call() {
469 <                    try {
470 <                        Executors.invoke(p, new SmallCallable());
471 <                        shouldThrow();
472 <                    } catch(InterruptedException e){}
473 <                    catch(RejectedExecutionException e2){}
474 <                    catch(ExecutionException e3){}
475 <                    return Boolean.TRUE;
476 <                }
477 <            };
478 <
479 <
480 <        
481 <        Thread t = new Thread(new Runnable() {
482 <                public void run() {
483 <                    try {
484 <                        c.call();
485 <                    } catch(Exception e){}
486 <                }
487 <          });
627 >    public void testCallableNPE1() {
628          try {
629 <            t.start();
630 <            Thread.sleep(SHORT_DELAY_MS);
631 <            t.interrupt();
492 <            t.join();
493 <        } catch(InterruptedException e){
494 <            unexpectedException();
629 >            Runnable r = null;
630 >            Callable c = Executors.callable(r);
631 >        } catch (NullPointerException success) {
632          }
496        
497        joinPool(p);
633      }
634  
635      /**
636 <     *  invoke(Executor, Callable) will throw ExecutionException
502 <     *  if callable throws exception
636 >     * callable(null, result) throws NPE
637       */
638 <    public void testInvoke6() {
505 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
506 <
638 >    public void testCallableNPE2() {
639          try {
640 <            Callable c = new Callable() {
641 <                    public Object call() {
642 <                        int i = 5/0;
511 <                        return Boolean.TRUE;
512 <                    }
513 <                };
514 <            
515 <            for(int i =0; i < 5; i++){
516 <                Executors.invoke(p,c);
517 <            }
518 <            
519 <            shouldThrow();
520 <        }
521 <        catch(ExecutionException success){
522 <        } catch(Exception e) {
523 <            unexpectedException();
640 >            Runnable r = null;
641 >            Callable c = Executors.callable(r, one);
642 >        } catch (NullPointerException success) {
643          }
525        joinPool(p);
644      }
645  
528
529
646      /**
647 <     *  timeouts from execute will time out if they compute too long.
647 >     * callable(null PrivilegedAction) throws NPE
648       */
649 <    public void testTimedCallable() {
534 <        int N = 10000;
535 <        ExecutorService executor = Executors.newSingleThreadExecutor();
536 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
649 >    public void testCallableNPE3() {
650          try {
651 <            long startTime = System.currentTimeMillis();
652 <            
653 <            long i = 0;
541 <            while (tasks.size() < N) {
542 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
543 <                i += 10;
544 <            }
545 <            
546 <            int iters = 0;
547 <            BigInteger sum = BigInteger.ZERO;
548 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
549 <                try {
550 <                    ++iters;
551 <                    sum = sum.add(it.next().call());
552 <                }
553 <                catch (TimeoutException success) {
554 <                    assertTrue(iters > 0);
555 <                    return;
556 <                }
557 <                catch (Exception e) {
558 <                    unexpectedException();
559 <                }
560 <            }
561 <            // if by chance we didn't ever time out, total time must be small
562 <            long elapsed = System.currentTimeMillis() - startTime;
563 <            assertTrue(elapsed < N);
564 <        }
565 <        finally {
566 <            joinPool(executor);
651 >            PrivilegedAction r = null;
652 >            Callable c = Executors.callable(r);
653 >        } catch (NullPointerException success) {
654          }
655      }
656  
657 <    
657 >    /**
658 >     * callable(null PrivilegedExceptionAction) throws NPE
659 >     */
660 >    public void testCallableNPE4() {
661 >        try {
662 >            PrivilegedExceptionAction r = null;
663 >            Callable c = Executors.callable(r);
664 >        } catch (NullPointerException success) {
665 >        }
666 >    }
667  
668  
669   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines