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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines