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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines