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.8 by dl, Sat Nov 1 18:37:02 2003 UTC vs.
Revision 1.12 by dl, Sat Dec 27 19:26:43 2003 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);
21 <    }
22 <
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 <        }
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) {
29 >        TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
30              this.exec = exec;
31              this.func = func;
32              this.msecs = msecs;
33          }
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 142 | Line 131 | public class ExecutorsTest extends JSR16
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 187 | Line 190 | public class ExecutorsTest extends JSR16
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<String> future = Executors.execute(e, task, TEST_STRING);
199 <            String result = future.get();
200 <            assertTrue(task.done);
201 <            assertSame(TEST_STRING, result);
202 <        }
203 <        catch (ExecutionException ex) {
204 <            unexpectedException();
205 <        }
206 <        catch (InterruptedException ex) {
207 <            unexpectedException();
208 <        }
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 >        e.shutdown();
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();
217 <            TrackedShortRunnable task = new TrackedShortRunnable();
218 <            assertFalse(task.done);
219 <            Executors.invoke(e, task);
220 <            assertTrue(task.done);
210 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
211          }
212 <        catch (ExecutionException ex) {
223 <            unexpectedException();
224 <        }
225 <        catch (InterruptedException ex) {
226 <            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();
236 <            Future<String> future = Executors.execute(e, new StringTask());
237 <            String result = future.get();
238 <            assertSame(TEST_STRING, result);
239 <        }
240 <        catch (ExecutionException ex) {
241 <            unexpectedException();
221 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
222          }
223 <        catch (InterruptedException ex) {
244 <            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 <
244 <            Object result = future.get();
266 <            assertSame(TEST_STRING, result);
267 <        }
268 <        catch (ExecutionException ex) {
269 <            unexpectedException();
270 <        }
271 <        catch (InterruptedException 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 >            p1.shutdown();
241 >            joinPool(p1);
242 >        } catch(RejectedExecutionException e){}
243 >        catch(Exception e){
244 >            e.printStackTrace();
245              unexpectedException();
246          }
274        finally {
275            Policy.setPolicy(savedPolicy);
276        }
247      }
248  
249      /**
250 <     * execute of a privileged exception action runs it to completion
250 >     * a newScheduledThreadPool successfully runs delayed task
251       */
252 <    public void testExecutePrivilegedExceptionAction() {
253 <        Policy savedPolicy = Policy.getPolicy();
254 <        AdjustablePolicy policy = new AdjustablePolicy();
255 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
256 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
257 <        Policy.setPolicy(policy);
258 <        try {
259 <            Executor e = new DirectExecutor();
260 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
261 <                    public Object run() {
262 <                        return TEST_STRING;
263 <                    }});
264 <
265 <            Object result = future.get();
296 <            assertSame(TEST_STRING, result);
297 <        }
298 <        catch (ExecutionException ex) {
299 <            unexpectedException();
300 <        }
301 <        catch (InterruptedException ex) {
252 >    public void testnewScheduledThreadPool() {
253 >        try {
254 >            TrackedCallable callable = new TrackedCallable();
255 >            ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
256 >            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
257 >            assertFalse(callable.done);
258 >            Thread.sleep(MEDIUM_DELAY_MS);
259 >            assertTrue(callable.done);
260 >            assertEquals(Boolean.TRUE, f.get());
261 >            p1.shutdown();
262 >            joinPool(p1);
263 >        } catch(RejectedExecutionException e){}
264 >        catch(Exception e){
265 >            e.printStackTrace();
266              unexpectedException();
267          }
304        finally {
305            Policy.setPolicy(savedPolicy);
306        }
268      }
269  
270      /**
271 <     * execute of a failed privileged exception action reports exception
271 >     * an unconfigurable  newScheduledThreadPool successfully runs delayed task
272       */
273 <    public void testExecuteFailedPrivilegedExceptionAction() {
274 <        Policy savedPolicy = Policy.getPolicy();
275 <        AdjustablePolicy policy = new AdjustablePolicy();
276 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
277 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
278 <        Policy.setPolicy(policy);
279 <        try {
280 <            Executor e = new DirectExecutor();
281 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
282 <                    public Object run() throws Exception {
283 <                        throw new IndexOutOfBoundsException();
284 <                    }});
285 <
286 <            Object result = future.get();
326 <            shouldThrow();
327 <        }
328 <        catch (ExecutionException success) {
329 <        }
330 <        catch (InterruptedException ex) {
273 >    public void testunconfigurableScheduledExecutorService() {
274 >        try {
275 >            TrackedCallable callable = new TrackedCallable();
276 >            ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
277 >            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
278 >            assertFalse(callable.done);
279 >            Thread.sleep(MEDIUM_DELAY_MS);
280 >            assertTrue(callable.done);
281 >            assertEquals(Boolean.TRUE, f.get());
282 >            p1.shutdown();
283 >            joinPool(p1);
284 >        } catch(RejectedExecutionException e){}
285 >        catch(Exception e){
286 >            e.printStackTrace();
287              unexpectedException();
288          }
333        finally {
334            Policy.setPolicy(savedPolicy);
335        }
289      }
290  
291      /**
292 <     * invoke of a collable runs it to completion
292 >     *  timeouts from execute will time out if they compute too long.
293       */
294 <    public void testInvokeCallable() {
294 >    public void testTimedCallable() {
295 >        int N = 10000;
296 >        ExecutorService executor = Executors.newSingleThreadExecutor();
297 >        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
298          try {
299 <            Executor e = new DirectExecutor();
300 <            String result = Executors.invoke(e, new StringTask());
301 <
302 <            assertSame(TEST_STRING, result);
303 <        }
304 <        catch (ExecutionException ex) {
305 <            unexpectedException();
299 >            long startTime = System.currentTimeMillis();
300 >            
301 >            long i = 0;
302 >            while (tasks.size() < N) {
303 >                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
304 >                i += 10;
305 >            }
306 >            
307 >            int iters = 0;
308 >            BigInteger sum = BigInteger.ZERO;
309 >            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
310 >                try {
311 >                    ++iters;
312 >                    sum = sum.add(it.next().call());
313 >                }
314 >                catch (TimeoutException success) {
315 >                    assertTrue(iters > 0);
316 >                    return;
317 >                }
318 >                catch (Exception e) {
319 >                    unexpectedException();
320 >                }
321 >            }
322 >            // if by chance we didn't ever time out, total time must be small
323 >            long elapsed = System.currentTimeMillis() - startTime;
324 >            assertTrue(elapsed < N);
325          }
326 <        catch (InterruptedException ex) {
327 <            unexpectedException();
326 >        finally {
327 >            joinPool(executor);
328          }
329      }
330  
331 +    
332      /**
333 <     * execute with null executor throws NPE
333 >     * ThreadPoolExecutor using defaultThreadFactory has
334 >     * specified group, priority, daemon status, and name
335       */
336 <    public void testNullExecuteRunnable() {
336 >    public void testDefaultThreadFactory() {
337 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
338 >        Runnable r = new Runnable() {
339 >                public void run() {
340 >                    Thread current = Thread.currentThread();
341 >                    threadAssertTrue(!current.isDaemon());
342 >                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
343 >                    ThreadGroup g = current.getThreadGroup();
344 >                    SecurityManager s = System.getSecurityManager();
345 >                    if (s != null)
346 >                        threadAssertTrue(g == s.getThreadGroup());
347 >                    else
348 >                        threadAssertTrue(g == egroup);
349 >                    String name = current.getName();
350 >                    threadAssertTrue(name.endsWith("thread-1"));
351 >                }
352 >            };
353 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
354 >        
355 >        e.execute(r);
356 >        e.shutdown();
357          try {
358 <            TrackedShortRunnable task = new TrackedShortRunnable();
359 <            assertFalse(task.done);
363 <            Future<String> future = Executors.execute(null, task, TEST_STRING);
364 <            shouldThrow();
365 <        }
366 <        catch (NullPointerException success) {
367 <        }
368 <        catch (Exception ex) {
358 >            Thread.sleep(SHORT_DELAY_MS);
359 >        } catch (Exception eX) {
360              unexpectedException();
361 +        } finally {
362 +            joinPool(e);
363          }
364      }
365  
366      /**
367 <     * execute with a null runnable throws NPE
367 >     * ThreadPoolExecutor using privilegedThreadFactory has
368 >     * specified group, priority, daemon status, name,
369 >     * access control context and context class loader
370       */
371 <    public void testExecuteNullRunnable() {
371 >    public void testPrivilegedThreadFactory() {
372 >        Policy savedPolicy = Policy.getPolicy();
373 >        AdjustablePolicy policy = new AdjustablePolicy();
374 >        policy.addPermission(new RuntimePermission("getContextClassLoader"));
375 >        policy.addPermission(new RuntimePermission("setContextClassLoader"));
376 >        Policy.setPolicy(policy);
377 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
378 >        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
379 >        final AccessControlContext thisacc = AccessController.getContext();
380 >        Runnable r = new Runnable() {
381 >                public void run() {
382 >                    Thread current = Thread.currentThread();
383 >                    threadAssertTrue(!current.isDaemon());
384 >                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
385 >                    ThreadGroup g = current.getThreadGroup();
386 >                    SecurityManager s = System.getSecurityManager();
387 >                    if (s != null)
388 >                        threadAssertTrue(g == s.getThreadGroup());
389 >                    else
390 >                        threadAssertTrue(g == egroup);
391 >                    String name = current.getName();
392 >                    threadAssertTrue(name.endsWith("thread-1"));
393 >                    threadAssertTrue(thisccl == current.getContextClassLoader());
394 >                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
395 >                }
396 >            };
397 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
398 >        
399 >        Policy.setPolicy(savedPolicy);
400 >        e.execute(r);
401 >        e.shutdown();
402          try {
403 <            Executor e = new DirectExecutor();
404 <            TrackedShortRunnable task = null;
380 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
381 <            shouldThrow();
382 <        }
383 <        catch (NullPointerException success) {
384 <        }
385 <        catch (Exception ex) {
403 >            Thread.sleep(SHORT_DELAY_MS);
404 >        } catch (Exception ex) {
405              unexpectedException();
406 +        } finally {
407 +            joinPool(e);
408 +        }
409 +
410 +    }
411 +
412 +    static class CheckCCL implements Callable<Object> {
413 +        public Object call() {
414 +            AccessControlContext acc = AccessController.getContext();
415 +            acc.checkPermission(new RuntimePermission("getContextClassLoader"));
416 +            return null;
417          }
418      }
419  
420 +
421      /**
422 <     * invoke of a null runnable throws NPE
422 >     * Without class loader permissions, creating
423 >     * privilegedCallableUsingCurrentClassLoader throws ACE
424       */
425 <    public void testInvokeNullRunnable() {
425 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
426 >        Policy savedPolicy = Policy.getPolicy();
427 >        AdjustablePolicy policy = new AdjustablePolicy();
428 >        Policy.setPolicy(policy);
429          try {
430 <            Executor e = new DirectExecutor();
396 <            TrackedShortRunnable task = null;
397 <            Executors.invoke(e, task);
430 >            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
431              shouldThrow();
432 <        }
433 <        catch (NullPointerException success) {
401 <        }
402 <        catch (Exception ex) {
432 >        } catch(AccessControlException success) {
433 >        } catch(Exception ex) {
434              unexpectedException();
435 +        }
436 +        finally {
437 +            Policy.setPolicy(savedPolicy);
438          }
439      }
440  
441      /**
442 <     * execute of a null callable throws NPE
442 >     * Without class loader permissions, calling
443 >     * privilegedCallableUsingCurrentClassLoader throws ACE
444       */
445 <    public void testExecuteNullCallable() {
445 >    public void testprivilegedCallableUsingCCLWithPrivs() {
446 >        Policy savedPolicy = Policy.getPolicy();
447 >        AdjustablePolicy policy = new AdjustablePolicy();
448 >        policy.addPermission(new RuntimePermission("getContextClassLoader"));
449 >        policy.addPermission(new RuntimePermission("setContextClassLoader"));
450 >        Policy.setPolicy(policy);
451          try {
452 <            Executor e = new DirectExecutor();
453 <            StringTask t = null;
454 <            Future<String> future = Executors.execute(e, t);
415 <            shouldThrow();
416 <        }
417 <        catch (NullPointerException success) {
418 <        }
419 <        catch (Exception ex) {
452 >            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
453 >            task.call();
454 >        } catch(Exception ex) {
455              unexpectedException();
456 +        }
457 +        finally {
458 +            Policy.setPolicy(savedPolicy);
459          }
460      }
461  
462      /**
463 <     * invoke of a null callable throws NPE
463 >     * Without permissions, calling privilegedCallable throws ACE
464       */
465 <    public void testInvokeNullCallable() {
465 >    public void testprivilegedCallableWithNoPrivs() {
466 >        Policy savedPolicy = Policy.getPolicy();
467 >        AdjustablePolicy policy = new AdjustablePolicy();
468 >        Policy.setPolicy(policy);
469 >        Callable task = Executors.privilegedCallable(new CheckCCL());
470 >        Policy.setPolicy(savedPolicy);
471          try {
472 <            Executor e = new DirectExecutor();
430 <            StringTask t = null;
431 <            String result = Executors.invoke(e, t);
472 >            task.call();
473              shouldThrow();
474 <        }
475 <        catch (NullPointerException success) {
435 <        }
436 <        catch (Exception ex) {
474 >        } catch(AccessControlException success) {
475 >        } catch(Exception ex) {
476              unexpectedException();
477 +        } finally {
478          }
479      }
480  
481      /**
482 <     *  execute(Executor, Runnable) throws RejectedExecutionException
443 <     *  if saturated.
482 >     * With permissions, calling privilegedCallable succeeds
483       */
484 <    public void testExecute1() {
485 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
484 >    public void testprivilegedCallableWithPrivs() {
485 >        Policy savedPolicy = Policy.getPolicy();
486 >        AdjustablePolicy policy = new AdjustablePolicy();
487 >        policy.addPermission(new RuntimePermission("getContextClassLoader"));
488 >        policy.addPermission(new RuntimePermission("setContextClassLoader"));
489 >        Policy.setPolicy(policy);
490 >        Callable task = Executors.privilegedCallable(new CheckCCL());
491          try {
492 <            
493 <            for(int i = 0; i < 5; ++i){
494 <                Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
495 <            }
496 <            shouldThrow();
497 <        } catch(RejectedExecutionException success){}
454 <        joinPool(p);
492 >            task.call();
493 >        } catch(Exception ex) {
494 >            unexpectedException();
495 >        } finally {
496 >            Policy.setPolicy(savedPolicy);
497 >        }
498      }
499  
500      /**
501 <     *  execute(Executor, Callable)throws RejectedExecutionException
502 <     *  if saturated.
503 <     */
461 <    public void testExecute2() {
462 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
501 >     * callable(Runnable) returns null when called
502 >     */
503 >    public void testCallable1() {
504          try {
505 <            for(int i = 0; i < 5; ++i) {
506 <                Executors.execute(p, new SmallCallable());
507 <            }
508 <            shouldThrow();
509 <        } catch(RejectedExecutionException e){}
510 <        joinPool(p);
505 >            Callable c = Executors.callable(new NoOpRunnable());
506 >            assertNull(c.call());
507 >        } catch(Exception ex) {
508 >            unexpectedException();
509 >        }
510 >        
511      }
512  
472
513      /**
514 <     *  invoke(Executor, Runnable) throws InterruptedException if
515 <     *  caller interrupted.
516 <     */
477 <    public void testInterruptedInvoke() {
478 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
479 <        Thread t = new Thread(new Runnable() {
480 <                public void run() {
481 <                    try {
482 <                        Executors.invoke(p,new Runnable() {
483 <                                public void run() {
484 <                                    try {
485 <                                        Thread.sleep(MEDIUM_DELAY_MS);
486 <                                        shouldThrow();
487 <                                    } catch(InterruptedException e){
488 <                                    }
489 <                                }
490 <                            });
491 <                    } catch(InterruptedException success){
492 <                    } catch(Exception e) {
493 <                        unexpectedException();
494 <                    }
495 <                    
496 <                }
497 <            });
514 >     * callable(Runnable, result) returns result when called
515 >     */
516 >    public void testCallable2() {
517          try {
518 <            t.start();
519 <            Thread.sleep(SHORT_DELAY_MS);
520 <            t.interrupt();
502 <        } catch(Exception e){
518 >            Callable c = Executors.callable(new NoOpRunnable(), one);
519 >            assertEquals(one, c.call());
520 >        } catch(Exception ex) {
521              unexpectedException();
522          }
505        joinPool(p);
523      }
524  
525      /**
526 <     *  invoke(Executor, Runnable) throws ExecutionException if
527 <     *  runnable throws exception.
528 <     */
512 <    public void testInvoke3() {
513 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
526 >     * callable(PrivilegedAction) returns its result when called
527 >     */
528 >    public void testCallable3() {
529          try {
530 <            Runnable r = new Runnable() {
531 <                    public void run() {
532 <                        int i = 5/0;
533 <                    }
519 <                };
520 <            
521 <            for(int i =0; i < 5; i++){
522 <                Executors.invoke(p,r);
523 <            }
524 <            
525 <            shouldThrow();
526 <        } catch(ExecutionException success){
527 <        } catch(Exception e){
530 >            Callable c = Executors.callable(new PrivilegedAction() {
531 >                    public Object run() { return one; }});
532 >        assertEquals(one, c.call());
533 >        } catch(Exception ex) {
534              unexpectedException();
535          }
530        joinPool(p);
536      }
537  
533
534
538      /**
539 <     *  invoke(Executor, Callable) throws InterruptedException if
540 <     *  callable throws exception
541 <     */
539 <    public void testInvoke5() {
540 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
541 <        
542 <        final Callable c = new Callable() {
543 <                public Object call() {
544 <                    try {
545 <                        Executors.invoke(p, new SmallCallable());
546 <                        shouldThrow();
547 <                    } catch(InterruptedException e){}
548 <                    catch(RejectedExecutionException e2){}
549 <                    catch(ExecutionException e3){}
550 <                    return Boolean.TRUE;
551 <                }
552 <            };
553 <
554 <
555 <        
556 <        Thread t = new Thread(new Runnable() {
557 <                public void run() {
558 <                    try {
559 <                        c.call();
560 <                    } catch(Exception e){}
561 <                }
562 <          });
539 >     * callable(PrivilegedExceptionAction) returns its result when called
540 >     */
541 >    public void testCallable4() {
542          try {
543 <            t.start();
544 <            Thread.sleep(SHORT_DELAY_MS);
545 <            t.interrupt();
546 <            t.join();
568 <        } catch(InterruptedException e){
543 >            Callable c = Executors.callable(new PrivilegedExceptionAction() {
544 >                    public Object run() { return one; }});
545 >            assertEquals(one, c.call());
546 >        } catch(Exception ex) {
547              unexpectedException();
548          }
571        
572        joinPool(p);
549      }
550  
575    /**
576     *  invoke(Executor, Callable) will throw ExecutionException
577     *  if callable throws exception
578     */
579    public void testInvoke6() {
580        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
551  
552 +    /**
553 +     * callable(null Runnable) throws NPE
554 +     */
555 +    public void testCallableNPE1() {
556          try {
557 <            Callable c = new Callable() {
558 <                    public Object call() {
559 <                        int i = 5/0;
586 <                        return Boolean.TRUE;
587 <                    }
588 <                };
589 <            
590 <            for(int i =0; i < 5; i++){
591 <                Executors.invoke(p,c);
592 <            }
593 <            
594 <            shouldThrow();
595 <        }
596 <        catch(ExecutionException success){
597 <        } catch(Exception e) {
598 <            unexpectedException();
557 >            Runnable r = null;
558 >            Callable c = Executors.callable(r);
559 >        } catch (NullPointerException success) {
560          }
600        joinPool(p);
561      }
562  
603
604
563      /**
564 <     *  timeouts from execute will time out if they compute too long.
565 <     */
566 <    public void testTimedCallable() {
609 <        int N = 10000;
610 <        ExecutorService executor = Executors.newSingleThreadExecutor();
611 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
564 >     * callable(null, result) throws NPE
565 >     */
566 >    public void testCallableNPE2() {
567          try {
568 <            long startTime = System.currentTimeMillis();
569 <            
570 <            long i = 0;
616 <            while (tasks.size() < N) {
617 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
618 <                i += 10;
619 <            }
620 <            
621 <            int iters = 0;
622 <            BigInteger sum = BigInteger.ZERO;
623 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
624 <                try {
625 <                    ++iters;
626 <                    sum = sum.add(it.next().call());
627 <                }
628 <                catch (TimeoutException success) {
629 <                    assertTrue(iters > 0);
630 <                    return;
631 <                }
632 <                catch (Exception e) {
633 <                    unexpectedException();
634 <                }
635 <            }
636 <            // if by chance we didn't ever time out, total time must be small
637 <            long elapsed = System.currentTimeMillis() - startTime;
638 <            assertTrue(elapsed < N);
639 <        }
640 <        finally {
641 <            joinPool(executor);
568 >            Runnable r = null;
569 >            Callable c = Executors.callable(r, one);
570 >        } catch (NullPointerException success) {
571          }
572      }
573  
645    
574      /**
575 <     * ThreadPoolExecutor using defaultThreadFactory has
576 <     * specified group, priority, daemon status, and name
577 <     */
578 <    public void testDefaultThreadFactory() {
579 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
580 <        Runnable r = new Runnable() {
581 <                public void run() {
582 <                    Thread current = Thread.currentThread();
655 <                    threadAssertTrue(!current.isDaemon());
656 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
657 <                    ThreadGroup g = current.getThreadGroup();
658 <                    SecurityManager s = System.getSecurityManager();
659 <                    if (s != null)
660 <                        threadAssertTrue(g == s.getThreadGroup());
661 <                    else
662 <                        threadAssertTrue(g == egroup);
663 <                    String name = current.getName();
664 <                    threadAssertTrue(name.endsWith("thread-1"));
665 <                }
666 <            };
667 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
668 <        
669 <        e.execute(r);
670 <        e.shutdown();
671 <        try {
672 <            Thread.sleep(SHORT_DELAY_MS);
673 <        } catch (Exception eX) {
674 <            unexpectedException();
675 <        } finally {
676 <            joinPool(e);
677 <        }
575 >     * callable(null PrivilegedAction) throws NPE
576 >     */
577 >    public void testCallableNPE3() {
578 >        try {
579 >            PrivilegedAction r = null;
580 >            Callable c = Executors.callable(r);
581 >        } catch (NullPointerException success) {
582 >        }
583      }
584  
585      /**
586 <     * ThreadPoolExecutor using privilegedThreadFactory has
587 <     * specified group, priority, daemon status, name,
588 <     * access control context and context class loader
589 <     */
590 <    public void testPrivilegedThreadFactory() {
591 <        Policy savedPolicy = Policy.getPolicy();
592 <        AdjustablePolicy policy = new AdjustablePolicy();
593 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
689 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
690 <        Policy.setPolicy(policy);
691 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
692 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
693 <        final AccessControlContext thisacc = AccessController.getContext();
694 <        Runnable r = new Runnable() {
695 <                public void run() {
696 <                    Thread current = Thread.currentThread();
697 <                    threadAssertTrue(!current.isDaemon());
698 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
699 <                    ThreadGroup g = current.getThreadGroup();
700 <                    SecurityManager s = System.getSecurityManager();
701 <                    if (s != null)
702 <                        threadAssertTrue(g == s.getThreadGroup());
703 <                    else
704 <                        threadAssertTrue(g == egroup);
705 <                    String name = current.getName();
706 <                    threadAssertTrue(name.endsWith("thread-1"));
707 <                    threadAssertTrue(thisccl == current.getContextClassLoader());
708 <                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
709 <                }
710 <            };
711 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
712 <        
713 <        Policy.setPolicy(savedPolicy);
714 <        e.execute(r);
715 <        e.shutdown();
716 <        try {
717 <            Thread.sleep(SHORT_DELAY_MS);
718 <        } catch (Exception ex) {
719 <            unexpectedException();
720 <        } finally {
721 <            joinPool(e);
722 <        }
723 <
586 >     * callable(null PrivilegedExceptionAction) throws NPE
587 >     */
588 >    public void testCallableNPE4() {
589 >        try {
590 >            PrivilegedExceptionAction r = null;
591 >            Callable c = Executors.callable(r);
592 >        } catch (NullPointerException success) {
593 >        }
594      }
595  
596 +
597   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines