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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines