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.9 by tim, Tue Dec 9 19:09:24 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 14 | Line 15 | 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);
22      }
23  
23    private static final String TEST_STRING = "a test string";
24
25    private static class StringTask implements Callable<String> {
26        public String call() { return TEST_STRING; }
27    }
28
29    static class DirectExecutor implements Executor {
30        public void execute(Runnable r) {
31            r.run();
32        }
33    }
34
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 80 | 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      /**
# Line 91 | Line 80 | public class ExecutorsTest extends JSR16
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 102 | 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 115 | 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      /**
# Line 126 | Line 115 | public class ExecutorsTest extends JSR16
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 137 | 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 149 | 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      /**
# Line 160 | Line 163 | public class ExecutorsTest extends JSR16
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 171 | 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 183 | 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() {
198 <        try {
199 <            Executor e = new DirectExecutor();
200 <            TrackedShortRunnable task = new TrackedShortRunnable();
201 <            assertFalse(task.done);
202 <            Future<?> future = Executors.execute(e, task);
199 <            future.get();
200 <            assertTrue(task.done);
201 <        }
202 <        catch (ExecutionException ex) {
203 <            unexpectedException();
204 <        }
205 <        catch (InterruptedException ex) {
206 <            unexpectedException();
207 <        }
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 <     * invoke of a runnable runs it to completion
206 >     * unconfigurableExecutorService(null) throws NPE
207       */
208 <    public void testInvokeRunnable() {
208 >    public void testunconfigurableExecutorServiceNPE() {
209          try {
210 <            Executor e = new DirectExecutor();
216 <            TrackedShortRunnable task = new TrackedShortRunnable();
217 <            assertFalse(task.done);
218 <            Executors.invoke(e, task);
219 <            assertTrue(task.done);
220 <        }
221 <        catch (ExecutionException ex) {
222 <            unexpectedException();
210 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
211          }
212 <        catch (InterruptedException ex) {
225 <            unexpectedException();
212 >        catch (NullPointerException success) {
213          }
214      }
215  
216      /**
217 <     * execute of a callable runs it to completion
217 >     * unconfigurableScheduledExecutorService(null) throws NPE
218       */
219 <    public void testExecuteCallable() {
219 >    public void testunconfigurableScheduledExecutorServiceNPE() {
220          try {
221 <            Executor e = new DirectExecutor();
235 <            Future<String> future = Executors.execute(e, new StringTask());
236 <            String result = future.get();
237 <            assertSame(TEST_STRING, result);
238 <        }
239 <        catch (ExecutionException ex) {
240 <            unexpectedException();
221 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
222          }
223 <        catch (InterruptedException ex) {
243 <            unexpectedException();
223 >        catch (NullPointerException success) {
224          }
225      }
226  
227  
228      /**
229 <     * execute of a privileged action runs it to completion
229 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
230       */
231 <    public void testExecutePrivilegedAction() {
232 <        Policy savedPolicy = Policy.getPolicy();
233 <        AdjustablePolicy policy = new AdjustablePolicy();
234 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
235 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
236 <        Policy.setPolicy(policy);
237 <        try {
238 <            Executor e = new DirectExecutor();
239 <            Future future = Executors.execute(e, new PrivilegedAction() {
240 <                    public Object run() {
241 <                        return TEST_STRING;
242 <                    }});
243 <
264 <            Object result = future.get();
265 <            assertSame(TEST_STRING, result);
266 <        }
267 <        catch (ExecutionException ex) {
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 (InterruptedException 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 <        finally {
267 <            Policy.setPolicy(savedPolicy);
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 <     * execute of a privileged exception action runs it to completion
289 >     *  timeouts from execute will time out if they compute too long.
290       */
291 <    public void testExecutePrivilegedExceptionAction() {
292 <        Policy savedPolicy = Policy.getPolicy();
293 <        AdjustablePolicy policy = new AdjustablePolicy();
294 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
285 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
286 <        Policy.setPolicy(policy);
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();
289 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
290 <                    public Object run() {
291 <                        return TEST_STRING;
292 <                    }});
296 >            long startTime = System.currentTimeMillis();
297  
298 <            Object result = future.get();
299 <            assertSame(TEST_STRING, result);
300 <        }
301 <        catch (ExecutionException ex) {
302 <            unexpectedException();
303 <        }
304 <        catch (InterruptedException ex) {
305 <            unexpectedException();
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          finally {
324 <            Policy.setPolicy(savedPolicy);
324 >            joinPool(executor);
325          }
326      }
327  
328 +
329      /**
330 <     * execute of a failed privileged exception action reports exception
330 >     * ThreadPoolExecutor using defaultThreadFactory has
331 >     * specified group, priority, daemon status, and name
332       */
333 <    public void testExecuteFailedPrivilegedExceptionAction() {
334 <        Policy savedPolicy = Policy.getPolicy();
335 <        AdjustablePolicy policy = new AdjustablePolicy();
336 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
337 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
338 <        Policy.setPolicy(policy);
339 <        try {
340 <            Executor e = new DirectExecutor();
341 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
342 <                    public Object run() throws Exception {
343 <                        throw new IndexOutOfBoundsException();
344 <                    }});
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 <            Object result = future.get();
357 <            shouldThrow();
358 <        }
359 <        catch (ExecutionException success) {
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 <        }
367 <        finally {
333 <            Policy.setPolicy(savedPolicy);
366 >        } finally {
367 >            joinPool(e);
368          }
369      }
370  
371      /**
372 <     * invoke of a collable runs it to completion
372 >     * ThreadPoolExecutor using privilegedThreadFactory has
373 >     * specified group, priority, daemon status, name,
374 >     * access control context and context class loader
375       */
376 <    public void testInvokeCallable() {
376 >    public void testPrivilegedThreadFactory() {
377 >        Policy savedPolicy = null;
378          try {
379 <            Executor e = new DirectExecutor();
380 <            String result = Executors.invoke(e, new StringTask());
381 <
382 <            assertSame(TEST_STRING, result);
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 (ExecutionException ex) {
388 <            unexpectedException();
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 (InterruptedException 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 <    /**
430 <     * execute with null executor throws NPE
431 <     */
432 <    public void testNullExecuteRunnable() {
433 <        try {
360 <            TrackedShortRunnable task = new TrackedShortRunnable();
361 <            assertFalse(task.done);
362 <            Future<?> future = Executors.execute(null, task);
363 <            shouldThrow();
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 <        catch (NullPointerException success) {
436 <        }
437 <        catch (Exception ex) {
438 <            unexpectedException();
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 <            TrackedShortRunnable task = null;
454 <            Future<?> future = Executors.execute(e, task);
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 <            TrackedShortRunnable 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() {
511 <        try {
512 <            Executor e = new DirectExecutor();
513 <            StringTask t = null;
514 <            Future<String> future = Executors.execute(e, t);
515 <            shouldThrow();
510 >    public void testprivilegedCallableWithNoPrivs() {
511 >        Callable task;
512 >        Policy savedPolicy = null;
513 >        AdjustablePolicy policy = null;
514 >        AccessControlContext noprivAcc = null;
515 >        try {
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();
557 <        }
558 <        catch (NullPointerException success) {
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 (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
442 <     *  if saturated.
573 >     * callable(Runnable) returns null when called
574       */
575 <    public void testExecute1() {
445 <        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());
580 <            }
581 <            shouldThrow();
452 <        } catch(RejectedExecutionException success){}
453 <        joinPool(p);
454 <    }
577 >            Callable c = Executors.callable(new NoOpRunnable());
578 >            assertNull(c.call());
579 >        } catch (Exception ex) {
580 >            unexpectedException();
581 >        }
582  
456    /**
457     *  execute(Executor, Callable)throws RejectedExecutionException
458     *  if saturated.
459     */
460    public void testExecute2() {
461         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
462        try {
463            for(int i = 0; i < 5; ++i) {
464                Executors.execute(p, new SmallCallable());
465            }
466            shouldThrow();
467        } catch(RejectedExecutionException e){}
468        joinPool(p);
583      }
584  
471
585      /**
586 <     *  invoke(Executor, Runnable) throws InterruptedException if
474 <     *  caller interrupted.
586 >     * callable(Runnable, result) returns result when called
587       */
588 <    public void testInterruptedInvoke() {
477 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
478 <        Thread t = new Thread(new Runnable() {
479 <                public void run() {
480 <                    try {
481 <                        Executors.invoke(p,new Runnable() {
482 <                                public void run() {
483 <                                    try {
484 <                                        Thread.sleep(MEDIUM_DELAY_MS);
485 <                                        shouldThrow();
486 <                                    } catch(InterruptedException e){
487 <                                    }
488 <                                }
489 <                            });
490 <                    } catch(InterruptedException success){
491 <                    } catch(Exception e) {
492 <                        unexpectedException();
493 <                    }
494 <                    
495 <                }
496 <            });
588 >    public void testCallable2() {
589          try {
590 <            t.start();
591 <            Thread.sleep(SHORT_DELAY_MS);
592 <            t.interrupt();
501 <        } catch(Exception e){
590 >            Callable c = Executors.callable(new NoOpRunnable(), one);
591 >            assertEquals(one, c.call());
592 >        } catch (Exception ex) {
593              unexpectedException();
594          }
504        joinPool(p);
595      }
596  
597      /**
598 <     *  invoke(Executor, Runnable) throws ExecutionException if
509 <     *  runnable throws exception.
598 >     * callable(PrivilegedAction) returns its result when called
599       */
600 <    public void testInvoke3() {
512 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
600 >    public void testCallable3() {
601          try {
602 <            Runnable r = new Runnable() {
603 <                    public void run() {
604 <                        int i = 5/0;
605 <                    }
518 <                };
519 <            
520 <            for(int i =0; i < 5; i++){
521 <                Executors.invoke(p,r);
522 <            }
523 <            
524 <            shouldThrow();
525 <        } catch(ExecutionException success){
526 <        } 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          }
529        joinPool(p);
608      }
609  
532
533
610      /**
611 <     *  invoke(Executor, Callable) throws InterruptedException if
536 <     *  callable throws exception
611 >     * callable(PrivilegedExceptionAction) returns its result when called
612       */
613 <    public void testInvoke5() {
539 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
540 <        
541 <        final Callable c = new Callable() {
542 <                public Object call() {
543 <                    try {
544 <                        Executors.invoke(p, new SmallCallable());
545 <                        shouldThrow();
546 <                    } catch(InterruptedException e){}
547 <                    catch(RejectedExecutionException e2){}
548 <                    catch(ExecutionException e3){}
549 <                    return Boolean.TRUE;
550 <                }
551 <            };
552 <
553 <
554 <        
555 <        Thread t = new Thread(new Runnable() {
556 <                public void run() {
557 <                    try {
558 <                        c.call();
559 <                    } catch(Exception e){}
560 <                }
561 <          });
613 >    public void testCallable4() {
614          try {
615 <            t.start();
616 <            Thread.sleep(SHORT_DELAY_MS);
617 <            t.interrupt();
618 <            t.join();
567 <        } catch(InterruptedException 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          }
570        
571        joinPool(p);
621      }
622  
623 +
624      /**
625 <     *  invoke(Executor, Callable) will throw ExecutionException
576 <     *  if callable throws exception
625 >     * callable(null Runnable) throws NPE
626       */
627 <    public void testInvoke6() {
579 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
580 <
627 >    public void testCallableNPE1() {
628          try {
629 <            Callable c = new Callable() {
630 <                    public Object call() {
631 <                        int i = 5/0;
585 <                        return Boolean.TRUE;
586 <                    }
587 <                };
588 <            
589 <            for(int i =0; i < 5; i++){
590 <                Executors.invoke(p,c);
591 <            }
592 <            
593 <            shouldThrow();
594 <        }
595 <        catch(ExecutionException success){
596 <        } catch(Exception e) {
597 <            unexpectedException();
629 >            Runnable r = null;
630 >            Callable c = Executors.callable(r);
631 >        } catch (NullPointerException success) {
632          }
599        joinPool(p);
633      }
634  
602
603
635      /**
636 <     *  timeouts from execute will time out if they compute too long.
636 >     * callable(null, result) throws NPE
637       */
638 <    public void testTimedCallable() {
608 <        int N = 10000;
609 <        ExecutorService executor = Executors.newSingleThreadExecutor();
610 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
638 >    public void testCallableNPE2() {
639          try {
640 <            long startTime = System.currentTimeMillis();
641 <            
642 <            long i = 0;
615 <            while (tasks.size() < N) {
616 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
617 <                i += 10;
618 <            }
619 <            
620 <            int iters = 0;
621 <            BigInteger sum = BigInteger.ZERO;
622 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
623 <                try {
624 <                    ++iters;
625 <                    sum = sum.add(it.next().call());
626 <                }
627 <                catch (TimeoutException success) {
628 <                    assertTrue(iters > 0);
629 <                    return;
630 <                }
631 <                catch (Exception e) {
632 <                    unexpectedException();
633 <                }
634 <            }
635 <            // if by chance we didn't ever time out, total time must be small
636 <            long elapsed = System.currentTimeMillis() - startTime;
637 <            assertTrue(elapsed < N);
638 <        }
639 <        finally {
640 <            joinPool(executor);
640 >            Runnable r = null;
641 >            Callable c = Executors.callable(r, one);
642 >        } catch (NullPointerException success) {
643          }
644      }
645  
644    
646      /**
647 <     * ThreadPoolExecutor using defaultThreadFactory has
647 <     * specified group, priority, daemon status, and name
647 >     * callable(null PrivilegedAction) throws NPE
648       */
649 <    public void testDefaultThreadFactory() {
650 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
651 <        Runnable r = new Runnable() {
652 <                public void run() {
653 <                    Thread current = Thread.currentThread();
654 <                    threadAssertTrue(!current.isDaemon());
655 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
656 <                    ThreadGroup g = current.getThreadGroup();
657 <                    SecurityManager s = System.getSecurityManager();
658 <                    if (s != null)
659 <                        threadAssertTrue(g == s.getThreadGroup());
660 <                    else
661 <                        threadAssertTrue(g == egroup);
662 <                    String name = current.getName();
663 <                    threadAssertTrue(name.endsWith("thread-1"));
664 <                }
665 <            };
666 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
667 <        
668 <        e.execute(r);
669 <        e.shutdown();
649 >    public void testCallableNPE3() {
650          try {
651 <            Thread.sleep(SHORT_DELAY_MS);
652 <        } catch (Exception eX) {
653 <            unexpectedException();
674 <        } finally {
675 <            joinPool(e);
651 >            PrivilegedAction r = null;
652 >            Callable c = Executors.callable(r);
653 >        } catch (NullPointerException success) {
654          }
655      }
656  
657      /**
658 <     * ThreadPoolExecutor using privilegedThreadFactory has
681 <     * specified group, priority, daemon status, name,
682 <     * access control context and context class loader
658 >     * callable(null PrivilegedExceptionAction) throws NPE
659       */
660 <    public void testPrivilegedThreadFactory() {
685 <        Policy savedPolicy = Policy.getPolicy();
686 <        AdjustablePolicy policy = new AdjustablePolicy();
687 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
688 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
689 <        Policy.setPolicy(policy);
690 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
691 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
692 <        final AccessControlContext thisacc = AccessController.getContext();
693 <        Runnable r = new Runnable() {
694 <                public void run() {
695 <                    Thread current = Thread.currentThread();
696 <                    threadAssertTrue(!current.isDaemon());
697 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
698 <                    ThreadGroup g = current.getThreadGroup();
699 <                    SecurityManager s = System.getSecurityManager();
700 <                    if (s != null)
701 <                        threadAssertTrue(g == s.getThreadGroup());
702 <                    else
703 <                        threadAssertTrue(g == egroup);
704 <                    String name = current.getName();
705 <                    threadAssertTrue(name.endsWith("thread-1"));
706 <                    threadAssertTrue(thisccl == current.getContextClassLoader());
707 <                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
708 <                }
709 <            };
710 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
711 <        
712 <        Policy.setPolicy(savedPolicy);
713 <        e.execute(r);
714 <        e.shutdown();
660 >    public void testCallableNPE4() {
661          try {
662 <            Thread.sleep(SHORT_DELAY_MS);
663 <        } catch (Exception ex) {
664 <            unexpectedException();
719 <        } finally {
720 <            joinPool(e);
662 >            PrivilegedExceptionAction r = null;
663 >            Callable c = Executors.callable(r);
664 >        } catch (NullPointerException success) {
665          }
722
666      }
667  
668 +
669   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines