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.10 by tim, Wed Dec 10 01:51:12 2003 UTC vs.
Revision 1.34 by jsr166, Sat Oct 9 19:30:35 2010 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  
10   import junit.framework.*;
11   import java.util.*;
12   import java.util.concurrent.*;
13 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
14   import java.math.BigInteger;
15   import java.security.*;
16  
17 < public class ExecutorsTest extends JSR166TestCase{
17 > public class ExecutorsTest extends JSR166TestCase {
18      public static void main(String[] args) {
19 <        junit.textui.TestRunner.run (suite());  
19 >        junit.textui.TestRunner.run(suite());
20      }
21      public static Test suite() {
22          return new TestSuite(ExecutorsTest.class);
23      }
24  
23    static class TimedCallable<T> implements Callable<T> {
24        private final ExecutorService exec;
25        private final Callable<T> func;
26        private final long msecs;
27        
28        TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
29            this.exec = exec;
30            this.func = func;
31            this.msecs = msecs;
32        }
33        
34        public T call() throws Exception {
35            Future<T> ftask = exec.submit(func);
36            try {
37                return ftask.get(msecs, TimeUnit.MILLISECONDS);
38            } finally {
39                ftask.cancel(true);
40            }
41        }
42    }
43
44
45    private static class Fib implements Callable<BigInteger> {
46        private final BigInteger n;
47        Fib(long n) {
48            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
49            this.n = BigInteger.valueOf(n);
50        }
51        public BigInteger call() {
52            BigInteger f1 = BigInteger.ONE;
53            BigInteger f2 = f1;
54            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
55                BigInteger t = f1.add(f2);
56                f1 = f2;
57                f2 = t;
58            }
59            return f1;
60        }
61    };
62
25      /**
26       * A newCachedThreadPool can execute runnables
27       */
# Line 68 | Line 30 | public class ExecutorsTest extends JSR16
30          e.execute(new NoOpRunnable());
31          e.execute(new NoOpRunnable());
32          e.execute(new NoOpRunnable());
33 <        e.shutdown();
33 >        joinPool(e);
34      }
35  
36      /**
# Line 79 | Line 41 | public class ExecutorsTest extends JSR16
41          e.execute(new NoOpRunnable());
42          e.execute(new NoOpRunnable());
43          e.execute(new NoOpRunnable());
44 <        e.shutdown();
44 >        joinPool(e);
45      }
46  
47      /**
# Line 89 | Line 51 | public class ExecutorsTest extends JSR16
51          try {
52              ExecutorService e = Executors.newCachedThreadPool(null);
53              shouldThrow();
54 <        }
93 <        catch(NullPointerException success) {
94 <        }
54 >        } catch (NullPointerException success) {}
55      }
56  
57  
# Line 103 | Line 63 | public class ExecutorsTest extends JSR16
63          e.execute(new NoOpRunnable());
64          e.execute(new NoOpRunnable());
65          e.execute(new NoOpRunnable());
66 <        e.shutdown();
66 >        joinPool(e);
67      }
68  
69      /**
# Line 114 | Line 74 | public class ExecutorsTest extends JSR16
74          e.execute(new NoOpRunnable());
75          e.execute(new NoOpRunnable());
76          e.execute(new NoOpRunnable());
77 <        e.shutdown();
77 >        joinPool(e);
78      }
79  
80      /**
# Line 124 | Line 84 | public class ExecutorsTest extends JSR16
84          try {
85              ExecutorService e = Executors.newSingleThreadExecutor(null);
86              shouldThrow();
87 <        }
88 <        catch(NullPointerException success) {
87 >        } catch (NullPointerException success) {}
88 >    }
89 >
90 >    /**
91 >     * A new SingleThreadExecutor cannot be casted to concrete implementation
92 >     */
93 >    public void testCastNewSingleThreadExecutor() {
94 >        ExecutorService e = Executors.newSingleThreadExecutor();
95 >        try {
96 >            ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
97 >            shouldThrow();
98 >        } catch (ClassCastException success) {
99 >        } finally {
100 >            joinPool(e);
101          }
102      }
103  
104 +
105      /**
106       * A new newFixedThreadPool can execute runnables
107       */
# Line 137 | Line 110 | public class ExecutorsTest extends JSR16
110          e.execute(new NoOpRunnable());
111          e.execute(new NoOpRunnable());
112          e.execute(new NoOpRunnable());
113 <        e.shutdown();
113 >        joinPool(e);
114      }
115  
116      /**
# Line 148 | Line 121 | public class ExecutorsTest extends JSR16
121          e.execute(new NoOpRunnable());
122          e.execute(new NoOpRunnable());
123          e.execute(new NoOpRunnable());
124 <        e.shutdown();
124 >        joinPool(e);
125      }
126  
127      /**
# Line 158 | Line 131 | public class ExecutorsTest extends JSR16
131          try {
132              ExecutorService e = Executors.newFixedThreadPool(2, null);
133              shouldThrow();
134 <        }
162 <        catch(NullPointerException success) {
163 <        }
134 >        } catch (NullPointerException success) {}
135      }
136  
137      /**
# Line 170 | Line 141 | public class ExecutorsTest extends JSR16
141          try {
142              ExecutorService e = Executors.newFixedThreadPool(0);
143              shouldThrow();
144 <        }
174 <        catch(IllegalArgumentException success) {
175 <        }
144 >        } catch (IllegalArgumentException success) {}
145      }
146  
147  
148      /**
149 <     *  timeouts from execute will time out if they compute too long.
149 >     * An unconfigurable newFixedThreadPool can execute runnables
150       */
151 <    public void testTimedCallable() {
152 <        int N = 10000;
153 <        ExecutorService executor = Executors.newSingleThreadExecutor();
154 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
155 <        try {
156 <            long startTime = System.currentTimeMillis();
157 <            
158 <            long i = 0;
159 <            while (tasks.size() < N) {
160 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
161 <                i += 10;
162 <            }
163 <            
164 <            int iters = 0;
165 <            BigInteger sum = BigInteger.ZERO;
166 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
151 >    public void testunconfigurableExecutorService() {
152 >        ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
153 >        e.execute(new NoOpRunnable());
154 >        e.execute(new NoOpRunnable());
155 >        e.execute(new NoOpRunnable());
156 >        joinPool(e);
157 >    }
158 >
159 >    /**
160 >     * unconfigurableExecutorService(null) throws NPE
161 >     */
162 >    public void testunconfigurableExecutorServiceNPE() {
163 >        try {
164 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
165 >            shouldThrow();
166 >        } catch (NullPointerException success) {}
167 >    }
168 >
169 >    /**
170 >     * unconfigurableScheduledExecutorService(null) throws NPE
171 >     */
172 >    public void testunconfigurableScheduledExecutorServiceNPE() {
173 >        try {
174 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
175 >            shouldThrow();
176 >        } catch (NullPointerException success) {}
177 >    }
178 >
179 >
180 >    /**
181 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
182 >     */
183 >    public void testNewSingleThreadScheduledExecutor() throws Exception {
184 >        TrackedCallable callable = new TrackedCallable();
185 >        ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
186 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
187 >        assertFalse(callable.done);
188 >        Thread.sleep(MEDIUM_DELAY_MS);
189 >        assertTrue(callable.done);
190 >        assertEquals(Boolean.TRUE, f.get());
191 >        joinPool(p1);
192 >    }
193 >
194 >    /**
195 >     * a newScheduledThreadPool successfully runs delayed task
196 >     */
197 >    public void testnewScheduledThreadPool() throws Exception {
198 >        TrackedCallable callable = new TrackedCallable();
199 >        ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
200 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
201 >        assertFalse(callable.done);
202 >        Thread.sleep(MEDIUM_DELAY_MS);
203 >        assertTrue(callable.done);
204 >        assertEquals(Boolean.TRUE, f.get());
205 >        joinPool(p1);
206 >    }
207 >
208 >    /**
209 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
210 >     */
211 >    public void testunconfigurableScheduledExecutorService() throws Exception {
212 >        TrackedCallable callable = new TrackedCallable();
213 >        ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
214 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
215 >        assertFalse(callable.done);
216 >        Thread.sleep(MEDIUM_DELAY_MS);
217 >        assertTrue(callable.done);
218 >        assertEquals(Boolean.TRUE, f.get());
219 >        joinPool(p1);
220 >    }
221 >
222 >    /**
223 >     * Future.get on submitted tasks will time out if they compute too long.
224 >     */
225 >    public void testTimedCallable() throws Exception {
226 >        final Runnable sleeper = new CheckedInterruptedRunnable() {
227 >            public void realRun() throws InterruptedException {
228 >                Thread.sleep(LONG_DELAY_MS);
229 >            }};
230 >        for (ExecutorService executor :
231 >                 new ExecutorService[] {
232 >                     Executors.newSingleThreadExecutor(),
233 >                     Executors.newCachedThreadPool(),
234 >                     Executors.newFixedThreadPool(2),
235 >                     Executors.newScheduledThreadPool(2),
236 >                 }) {
237 >            try {
238 >                Future future = executor.submit(sleeper);
239                  try {
240 <                    ++iters;
241 <                    sum = sum.add(it.next().call());
242 <                }
243 <                catch (TimeoutException success) {
244 <                    assertTrue(iters > 0);
204 <                    return;
205 <                }
206 <                catch (Exception e) {
207 <                    unexpectedException();
240 >                    future.get(SHORT_DELAY_MS, MILLISECONDS);
241 >                    shouldThrow();
242 >                } catch (TimeoutException success) {
243 >                } finally {
244 >                    future.cancel(true);
245                  }
246              }
247 <            // if by chance we didn't ever time out, total time must be small
248 <            long elapsed = System.currentTimeMillis() - startTime;
249 <            assertTrue(elapsed < N);
213 <        }
214 <        finally {
215 <            joinPool(executor);
247 >            finally {
248 >                joinPool(executor);
249 >            }
250          }
251      }
252  
253 <    
253 >
254      /**
255       * ThreadPoolExecutor using defaultThreadFactory has
256       * specified group, priority, daemon status, and name
257       */
258 <    public void testDefaultThreadFactory() {
258 >    public void testDefaultThreadFactory() throws Exception {
259          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
260 <        Runnable r = new Runnable() {
261 <                public void run() {
260 >        Runnable r = new CheckedRunnable() {
261 >            public void realRun() {
262 >                try {
263                      Thread current = Thread.currentThread();
264 <                    threadAssertTrue(!current.isDaemon());
265 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
264 >                    assertTrue(!current.isDaemon());
265 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
266                      ThreadGroup g = current.getThreadGroup();
267                      SecurityManager s = System.getSecurityManager();
268                      if (s != null)
269 <                        threadAssertTrue(g == s.getThreadGroup());
269 >                        assertTrue(g == s.getThreadGroup());
270                      else
271 <                        threadAssertTrue(g == egroup);
271 >                        assertTrue(g == egroup);
272                      String name = current.getName();
273 <                    threadAssertTrue(name.endsWith("thread-1"));
273 >                    assertTrue(name.endsWith("thread-1"));
274 >                } catch (SecurityException ok) {
275 >                    // Also pass if not allowed to change setting
276                  }
277 <            };
277 >            }};
278          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
279 <        
279 >
280          e.execute(r);
281 <        e.shutdown();
281 >        try {
282 >            e.shutdown();
283 >        } catch (SecurityException ok) {
284 >        }
285 >
286          try {
287              Thread.sleep(SHORT_DELAY_MS);
247        } catch (Exception eX) {
248            unexpectedException();
288          } finally {
289              joinPool(e);
290          }
# Line 256 | Line 295 | public class ExecutorsTest extends JSR16
295       * specified group, priority, daemon status, name,
296       * access control context and context class loader
297       */
298 <    public void testPrivilegedThreadFactory() {
299 <        Policy savedPolicy = Policy.getPolicy();
300 <        AdjustablePolicy policy = new AdjustablePolicy();
301 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
302 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
303 <        Policy.setPolicy(policy);
304 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
305 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
306 <        final AccessControlContext thisacc = AccessController.getContext();
307 <        Runnable r = new Runnable() {
308 <                public void run() {
309 <                    Thread current = Thread.currentThread();
310 <                    threadAssertTrue(!current.isDaemon());
311 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
312 <                    ThreadGroup g = current.getThreadGroup();
313 <                    SecurityManager s = System.getSecurityManager();
314 <                    if (s != null)
315 <                        threadAssertTrue(g == s.getThreadGroup());
316 <                    else
317 <                        threadAssertTrue(g == egroup);
318 <                    String name = current.getName();
319 <                    threadAssertTrue(name.endsWith("thread-1"));
320 <                    threadAssertTrue(thisccl == current.getContextClassLoader());
321 <                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
322 <                }
323 <            };
324 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
325 <        
326 <        Policy.setPolicy(savedPolicy);
327 <        e.execute(r);
328 <        e.shutdown();
329 <        try {
330 <            Thread.sleep(SHORT_DELAY_MS);
331 <        } catch (Exception ex) {
332 <            unexpectedException();
333 <        } finally {
334 <            joinPool(e);
298 >    public void testPrivilegedThreadFactory() throws Exception {
299 >        Runnable r = new CheckedRunnable() {
300 >            public void realRun() throws Exception {
301 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
302 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
303 >                final AccessControlContext thisacc = AccessController.getContext();
304 >                Runnable r = new CheckedRunnable() {
305 >                    public void realRun() {
306 >                        Thread current = Thread.currentThread();
307 >                        assertTrue(!current.isDaemon());
308 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
309 >                        ThreadGroup g = current.getThreadGroup();
310 >                        SecurityManager s = System.getSecurityManager();
311 >                        if (s != null)
312 >                            assertTrue(g == s.getThreadGroup());
313 >                        else
314 >                            assertTrue(g == egroup);
315 >                        String name = current.getName();
316 >                        assertTrue(name.endsWith("thread-1"));
317 >                        assertSame(thisccl, current.getContextClassLoader());
318 >                        assertEquals(thisacc, AccessController.getContext());
319 >                    }};
320 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
321 >                e.execute(r);
322 >                e.shutdown();
323 >                Thread.sleep(SHORT_DELAY_MS);
324 >                joinPool(e);
325 >            }};
326 >
327 >        runWithPermissions(r,
328 >                           new RuntimePermission("getClassLoader"),
329 >                           new RuntimePermission("setContextClassLoader"),
330 >                           new RuntimePermission("modifyThread"));
331 >    }
332 >
333 >    boolean haveCCLPermissions() {
334 >        SecurityManager sm = System.getSecurityManager();
335 >        if (sm != null) {
336 >            try {
337 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
338 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
339 >            } catch (AccessControlException e) {
340 >                return false;
341 >            }
342 >        }
343 >        return true;
344 >    }
345 >
346 >    void checkCCL() {
347 >        SecurityManager sm = System.getSecurityManager();
348 >        if (sm != null) {
349 >            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
350 >            sm.checkPermission(new RuntimePermission("getClassLoader"));
351 >        }
352 >    }
353 >
354 >    class CheckCCL implements Callable<Object> {
355 >        public Object call() {
356 >            checkCCL();
357 >            return null;
358          }
359 +    }
360 +
361 +
362 +    /**
363 +     * Without class loader permissions, creating
364 +     * privilegedCallableUsingCurrentClassLoader throws ACE
365 +     */
366 +    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
367 +        Runnable r = new CheckedRunnable() {
368 +            public void realRun() throws Exception {
369 +                if (System.getSecurityManager() == null)
370 +                    return;
371 +                try {
372 +                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
373 +                    shouldThrow();
374 +                } catch (AccessControlException success) {}
375 +            }};
376 +
377 +        runWithoutPermissions(r);
378 +    }
379 +
380 +    /**
381 +     * With class loader permissions, calling
382 +     * privilegedCallableUsingCurrentClassLoader does not throw ACE
383 +     */
384 +    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
385 +        Runnable r = new CheckedRunnable() {
386 +            public void realRun() throws Exception {
387 +                Executors.privilegedCallableUsingCurrentClassLoader
388 +                    (new NoOpCallable())
389 +                    .call();
390 +            }};
391  
392 +        runWithPermissions(r,
393 +                           new RuntimePermission("getClassLoader"),
394 +                           new RuntimePermission("setContextClassLoader"));
395      }
396  
397 +    /**
398 +     * Without permissions, calling privilegedCallable throws ACE
399 +     */
400 +    public void testprivilegedCallableWithNoPrivs() throws Exception {
401 +        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
402 +        Executors.privilegedCallable(new CheckCCL());
403 +
404 +        Runnable r = new CheckedRunnable() {
405 +            public void realRun() throws Exception {
406 +                if (System.getSecurityManager() == null)
407 +                    return;
408 +                Callable task = Executors.privilegedCallable(new CheckCCL());
409 +                try {
410 +                    task.call();
411 +                    shouldThrow();
412 +                } catch (AccessControlException success) {}
413 +            }};
414 +
415 +        runWithoutPermissions(r);
416 +
417 +        // It seems rather difficult to test that the
418 +        // AccessControlContext of the privilegedCallable is used
419 +        // instead of its caller.  Below is a failed attempt to do
420 +        // that, which does not work because the AccessController
421 +        // cannot capture the internal state of the current Policy.
422 +        // It would be much more work to differentiate based on,
423 +        // e.g. CodeSource.
424 +
425 + //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
426 + //         final Callable[] task = new Callable[1];
427 +
428 + //         runWithPermissions
429 + //             (new CheckedRunnable() {
430 + //                 public void realRun() {
431 + //                     if (System.getSecurityManager() == null)
432 + //                         return;
433 + //                     noprivAcc[0] = AccessController.getContext();
434 + //                     task[0] = Executors.privilegedCallable(new CheckCCL());
435 + //                     try {
436 + //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
437 + //                                                           public Void run() {
438 + //                                                               checkCCL();
439 + //                                                               return null;
440 + //                                                           }}, noprivAcc[0]);
441 + //                         shouldThrow();
442 + //                     } catch (AccessControlException success) {}
443 + //                 }});
444 +
445 + //         runWithPermissions
446 + //             (new CheckedRunnable() {
447 + //                 public void realRun() throws Exception {
448 + //                     if (System.getSecurityManager() == null)
449 + //                         return;
450 + //                     // Verify that we have an underprivileged ACC
451 + //                     try {
452 + //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
453 + //                                                           public Void run() {
454 + //                                                               checkCCL();
455 + //                                                               return null;
456 + //                                                           }}, noprivAcc[0]);
457 + //                         shouldThrow();
458 + //                     } catch (AccessControlException success) {}
459 +
460 + //                     try {
461 + //                         task[0].call();
462 + //                         shouldThrow();
463 + //                     } catch (AccessControlException success) {}
464 + //                 }},
465 + //              new RuntimePermission("getClassLoader"),
466 + //              new RuntimePermission("setContextClassLoader"));
467 +    }
468 +
469 +    /**
470 +     * With permissions, calling privilegedCallable succeeds
471 +     */
472 +    public void testprivilegedCallableWithPrivs() throws Exception {
473 +        Runnable r = new CheckedRunnable() {
474 +            public void realRun() throws Exception {
475 +                Executors.privilegedCallable(new CheckCCL()).call();
476 +            }};
477 +
478 +         runWithPermissions(r,
479 +                           new RuntimePermission("getClassLoader"),
480 +                           new RuntimePermission("setContextClassLoader"));
481 +    }
482 +
483 +    /**
484 +     * callable(Runnable) returns null when called
485 +     */
486 +    public void testCallable1() throws Exception {
487 +        Callable c = Executors.callable(new NoOpRunnable());
488 +        assertNull(c.call());
489 +    }
490 +
491 +    /**
492 +     * callable(Runnable, result) returns result when called
493 +     */
494 +    public void testCallable2() throws Exception {
495 +        Callable c = Executors.callable(new NoOpRunnable(), one);
496 +        assertSame(one, c.call());
497 +    }
498 +
499 +    /**
500 +     * callable(PrivilegedAction) returns its result when called
501 +     */
502 +    public void testCallable3() throws Exception {
503 +        Callable c = Executors.callable(new PrivilegedAction() {
504 +                public Object run() { return one; }});
505 +        assertSame(one, c.call());
506 +    }
507 +
508 +    /**
509 +     * callable(PrivilegedExceptionAction) returns its result when called
510 +     */
511 +    public void testCallable4() throws Exception {
512 +        Callable c = Executors.callable(new PrivilegedExceptionAction() {
513 +                public Object run() { return one; }});
514 +        assertSame(one, c.call());
515 +    }
516 +
517 +
518 +    /**
519 +     * callable(null Runnable) throws NPE
520 +     */
521 +    public void testCallableNPE1() {
522 +        try {
523 +            Callable c = Executors.callable((Runnable) null);
524 +            shouldThrow();
525 +        } catch (NullPointerException success) {}
526 +    }
527 +
528 +    /**
529 +     * callable(null, result) throws NPE
530 +     */
531 +    public void testCallableNPE2() {
532 +        try {
533 +            Callable c = Executors.callable((Runnable) null, one);
534 +            shouldThrow();
535 +        } catch (NullPointerException success) {}
536 +    }
537 +
538 +    /**
539 +     * callable(null PrivilegedAction) throws NPE
540 +     */
541 +    public void testCallableNPE3() {
542 +        try {
543 +            Callable c = Executors.callable((PrivilegedAction) null);
544 +            shouldThrow();
545 +        } catch (NullPointerException success) {}
546 +    }
547 +
548 +    /**
549 +     * callable(null PrivilegedExceptionAction) throws NPE
550 +     */
551 +    public void testCallableNPE4() {
552 +        try {
553 +            Callable c = Executors.callable((PrivilegedExceptionAction) null);
554 +            shouldThrow();
555 +        } catch (NullPointerException success) {}
556 +    }
557 +
558 +
559   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines