ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ExecutorsTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.8 by dl, Sat Nov 1 18:37:02 2003 UTC vs.
Revision 1.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);
22 >        return new TestSuite(ExecutorsTest.class);
23      }
24  
23    private static final String TEST_STRING = "a test string";
24
25    private static class StringTask implements Callable<String> {
26        public String call() { return TEST_STRING; }
27    }
28
29    static class DirectExecutor implements Executor {
30        public void execute(Runnable r) {
31            r.run();
32        }
33    }
34
35    static class TimedCallable<T> implements Callable<T> {
36        private final Executor exec;
37        private final Callable<T> func;
38        private final long msecs;
39        
40        TimedCallable(Executor exec, Callable<T> func, long msecs) {
41            this.exec = exec;
42            this.func = func;
43            this.msecs = msecs;
44        }
45        
46        public T call() throws Exception {
47            Future<T> ftask = Executors.execute(exec, func);
48            try {
49                return ftask.get(msecs, TimeUnit.MILLISECONDS);
50            } finally {
51                ftask.cancel(true);
52            }
53        }
54    }
55
56
57    private static class Fib implements Callable<BigInteger> {
58        private final BigInteger n;
59        Fib(long n) {
60            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
61            this.n = BigInteger.valueOf(n);
62        }
63        public BigInteger call() {
64            BigInteger f1 = BigInteger.ONE;
65            BigInteger f2 = f1;
66            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
67                BigInteger t = f1.add(f2);
68                f1 = f2;
69                f2 = t;
70            }
71            return f1;
72        }
73    };
74
25      /**
26       * A newCachedThreadPool can execute runnables
27       */
# Line 80 | Line 30 | public class ExecutorsTest extends JSR16
30          e.execute(new NoOpRunnable());
31          e.execute(new NoOpRunnable());
32          e.execute(new NoOpRunnable());
33 <        e.shutdown();
33 >        joinPool(e);
34      }
35  
36      /**
# Line 91 | Line 41 | public class ExecutorsTest extends JSR16
41          e.execute(new NoOpRunnable());
42          e.execute(new NoOpRunnable());
43          e.execute(new NoOpRunnable());
44 <        e.shutdown();
44 >        joinPool(e);
45      }
46  
47      /**
# Line 101 | Line 51 | public class ExecutorsTest extends JSR16
51          try {
52              ExecutorService e = Executors.newCachedThreadPool(null);
53              shouldThrow();
54 <        }
105 <        catch(NullPointerException success) {
106 <        }
54 >        } catch (NullPointerException success) {}
55      }
56  
57  
# Line 115 | Line 63 | public class ExecutorsTest extends JSR16
63          e.execute(new NoOpRunnable());
64          e.execute(new NoOpRunnable());
65          e.execute(new NoOpRunnable());
66 <        e.shutdown();
66 >        joinPool(e);
67      }
68  
69      /**
# Line 126 | 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 136 | 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 149 | Line 110 | public class ExecutorsTest extends JSR16
110          e.execute(new NoOpRunnable());
111          e.execute(new NoOpRunnable());
112          e.execute(new NoOpRunnable());
113 <        e.shutdown();
113 >        joinPool(e);
114      }
115  
116      /**
# Line 160 | Line 121 | public class ExecutorsTest extends JSR16
121          e.execute(new NoOpRunnable());
122          e.execute(new NoOpRunnable());
123          e.execute(new NoOpRunnable());
124 <        e.shutdown();
124 >        joinPool(e);
125      }
126  
127      /**
# Line 170 | Line 131 | public class ExecutorsTest extends JSR16
131          try {
132              ExecutorService e = Executors.newFixedThreadPool(2, null);
133              shouldThrow();
134 <        }
174 <        catch(NullPointerException success) {
175 <        }
134 >        } catch (NullPointerException success) {}
135      }
136  
137      /**
# Line 182 | Line 141 | public class ExecutorsTest extends JSR16
141          try {
142              ExecutorService e = Executors.newFixedThreadPool(0);
143              shouldThrow();
144 <        }
186 <        catch(IllegalArgumentException success) {
187 <        }
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 <            TrackedShortRunnable task = new TrackedShortRunnable();
155 <            assertFalse(task.done);
156 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
199 <            String result = future.get();
200 <            assertTrue(task.done);
201 <            assertSame(TEST_STRING, result);
202 <        }
203 <        catch (ExecutionException ex) {
204 <            unexpectedException();
205 <        }
206 <        catch (InterruptedException ex) {
207 <            unexpectedException();
208 <        }
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 <            TrackedShortRunnable task = new TrackedShortRunnable();
166 <            assertFalse(task.done);
219 <            Executors.invoke(e, task);
220 <            assertTrue(task.done);
221 <        }
222 <        catch (ExecutionException ex) {
223 <            unexpectedException();
224 <        }
225 <        catch (InterruptedException ex) {
226 <            unexpectedException();
227 <        }
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();
238 <            assertSame(TEST_STRING, result);
239 <        }
240 <        catch (ExecutionException ex) {
241 <            unexpectedException();
242 <        }
243 <        catch (InterruptedException ex) {
244 <            unexpectedException();
245 <        }
174 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
175 >            shouldThrow();
176 >        } catch (NullPointerException success) {}
177      }
178  
179  
180      /**
181 <     * execute of a privileged action runs it to completion
181 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
182       */
183 <    public void testExecutePrivilegedAction() {
184 <        Policy savedPolicy = Policy.getPolicy();
185 <        AdjustablePolicy policy = new AdjustablePolicy();
186 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
187 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
188 <        Policy.setPolicy(policy);
189 <        try {
190 <            Executor e = new DirectExecutor();
191 <            Future future = Executors.execute(e, new PrivilegedAction() {
192 <                    public Object run() {
193 <                        return TEST_STRING;
194 <                    }});
195 <
196 <            Object result = future.get();
197 <            assertSame(TEST_STRING, result);
198 <        }
268 <        catch (ExecutionException ex) {
269 <            unexpectedException();
270 <        }
271 <        catch (InterruptedException ex) {
272 <            unexpectedException();
183 >    public void testNewSingleThreadScheduledExecutor() throws Exception {
184 >        ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
185 >        try {
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          }
274        finally {
275            Policy.setPolicy(savedPolicy);
276        }
200      }
201  
202      /**
203 <     * execute of a privileged exception action runs it to completion
203 >     * a newScheduledThreadPool successfully runs delayed task
204       */
205 <    public void testExecutePrivilegedExceptionAction() {
206 <        Policy savedPolicy = Policy.getPolicy();
284 <        AdjustablePolicy policy = new AdjustablePolicy();
285 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
286 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
287 <        Policy.setPolicy(policy);
205 >    public void testnewScheduledThreadPool() throws Exception {
206 >        ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
207          try {
208 <            Executor e = new DirectExecutor();
209 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
210 <                    public Object run() {
211 <                        return TEST_STRING;
212 <                    }});
213 <
214 <            Object result = future.get();
215 <            assertSame(TEST_STRING, result);
216 <        }
217 <        catch (ExecutionException ex) {
218 <            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          }
301        catch (InterruptedException ex) {
302            unexpectedException();
303        }
304        finally {
305            Policy.setPolicy(savedPolicy);
306        }
222      }
223  
224      /**
225 <     * execute of a failed privileged exception action reports exception
225 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
226       */
227 <    public void testExecuteFailedPrivilegedExceptionAction() {
228 <        Policy savedPolicy = Policy.getPolicy();
229 <        AdjustablePolicy policy = new AdjustablePolicy();
230 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
316 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
317 <        Policy.setPolicy(policy);
227 >    public void testunconfigurableScheduledExecutorService() throws Exception {
228 >        ScheduledExecutorService p =
229 >            Executors.unconfigurableScheduledExecutorService
230 >            (Executors.newScheduledThreadPool(2));
231          try {
232 <            Executor e = new DirectExecutor();
233 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
234 <                    public Object run() throws Exception {
235 <                        throw new IndexOutOfBoundsException();
236 <                    }});
237 <
238 <            Object result = future.get();
239 <            shouldThrow();
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          }
328        catch (ExecutionException success) {
329        }
330        catch (InterruptedException ex) {
331            unexpectedException();
332        }
333        finally {
334            Policy.setPolicy(savedPolicy);
335        }
246      }
247  
248      /**
249 <     * invoke of a collable runs it to completion
249 >     * Future.get on submitted tasks will time out if they compute too long.
250       */
251 <    public void testInvokeCallable() {
252 <        try {
253 <            Executor e = new DirectExecutor();
254 <            String result = Executors.invoke(e, new StringTask());
255 <
256 <            assertSame(TEST_STRING, result);
257 <        }
258 <        catch (ExecutionException ex) {
259 <            unexpectedException();
260 <        }
261 <        catch (InterruptedException ex) {
262 <            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 with null executor throws NPE
281 >     * ThreadPoolExecutor using defaultThreadFactory has
282 >     * specified group, priority, daemon status, and name
283       */
284 <    public void testNullExecuteRunnable() {
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 <            TrackedShortRunnable task = new TrackedShortRunnable();
309 <            assertFalse(task.done);
363 <            Future<String> future = Executors.execute(null, task, TEST_STRING);
364 <            shouldThrow();
365 <        }
366 <        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 <     * execute with a null runnable throws NPE
320 >     * ThreadPoolExecutor using privilegedThreadFactory has
321 >     * specified group, priority, daemon status, name,
322 >     * access control context and context class loader
323       */
324 <    public void testExecuteNullRunnable() {
325 <        try {
326 <            Executor e = new DirectExecutor();
327 <            TrackedShortRunnable task = null;
328 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
329 <            shouldThrow();
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 <     * invoke of a null runnable throws NPE
389 >     * Without class loader permissions, creating
390 >     * privilegedCallableUsingCurrentClassLoader throws ACE
391       */
392 <    public void testInvokeNullRunnable() {
393 <        try {
394 <            Executor e = new DirectExecutor();
395 <            TrackedShortRunnable task = null;
396 <            Executors.invoke(e, task);
397 <            shouldThrow();
398 <        }
399 <        catch (NullPointerException success) {
400 <        }
401 <        catch (Exception ex) {
402 <            unexpectedException();
403 <        }
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 of a null callable throws NPE
407 >     * With class loader permissions, calling
408 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
409       */
410 <    public void testExecuteNullCallable() {
411 <        try {
412 <            Executor e = new DirectExecutor();
413 <            StringTask t = null;
414 <            Future<String> future = Executors.execute(e, t);
415 <            shouldThrow();
416 <        }
417 <        catch (NullPointerException success) {
418 <        }
419 <        catch (Exception ex) {
420 <            unexpectedException();
421 <        }
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 <     * invoke of a null callable throws NPE
424 >     * Without permissions, calling privilegedCallable throws ACE
425       */
426 <    public void testInvokeNullCallable() {
427 <        try {
428 <            Executor e = new DirectExecutor();
429 <            StringTask t = null;
430 <            String result = Executors.invoke(e, t);
431 <            shouldThrow();
432 <        }
433 <        catch (NullPointerException success) {
434 <        }
435 <        catch (Exception ex) {
436 <            unexpectedException();
437 <        }
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 <     *  execute(Executor, Runnable) throws RejectedExecutionException
443 <     *  if saturated.
496 >     * With permissions, calling privilegedCallable succeeds
497       */
498 <    public void testExecute1() {
499 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
500 <        try {
501 <            
502 <            for(int i = 0; i < 5; ++i){
503 <                Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
504 <            }
505 <            shouldThrow();
506 <        } catch(RejectedExecutionException success){}
454 <        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 <     *  execute(Executor, Callable)throws RejectedExecutionException
459 <     *  if saturated.
510 >     * callable(Runnable) returns null when called
511       */
512 <    public void testExecute2() {
513 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
514 <        try {
464 <            for(int i = 0; i < 5; ++i) {
465 <                Executors.execute(p, new SmallCallable());
466 <            }
467 <            shouldThrow();
468 <        } catch(RejectedExecutionException e){}
469 <        joinPool(p);
512 >    public void testCallable1() throws Exception {
513 >        Callable c = Executors.callable(new NoOpRunnable());
514 >        assertNull(c.call());
515      }
516  
472
517      /**
518 <     *  invoke(Executor, Runnable) throws InterruptedException if
475 <     *  caller interrupted.
518 >     * callable(Runnable, result) returns result when called
519       */
520 <    public void testInterruptedInvoke() {
521 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
522 <        Thread t = new Thread(new Runnable() {
480 <                public void run() {
481 <                    try {
482 <                        Executors.invoke(p,new Runnable() {
483 <                                public void run() {
484 <                                    try {
485 <                                        Thread.sleep(MEDIUM_DELAY_MS);
486 <                                        shouldThrow();
487 <                                    } catch(InterruptedException e){
488 <                                    }
489 <                                }
490 <                            });
491 <                    } catch(InterruptedException success){
492 <                    } catch(Exception e) {
493 <                        unexpectedException();
494 <                    }
495 <                    
496 <                }
497 <            });
498 <        try {
499 <            t.start();
500 <            Thread.sleep(SHORT_DELAY_MS);
501 <            t.interrupt();
502 <        } catch(Exception e){
503 <            unexpectedException();
504 <        }
505 <        joinPool(p);
520 >    public void testCallable2() throws Exception {
521 >        Callable c = Executors.callable(new NoOpRunnable(), one);
522 >        assertSame(one, c.call());
523      }
524  
525      /**
526 <     *  invoke(Executor, Runnable) throws ExecutionException if
510 <     *  runnable throws exception.
526 >     * callable(PrivilegedAction) returns its result when called
527       */
528 <    public void testInvoke3() {
529 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
530 <        try {
531 <            Runnable r = new Runnable() {
516 <                    public void run() {
517 <                        int i = 5/0;
518 <                    }
519 <                };
520 <            
521 <            for(int i =0; i < 5; i++){
522 <                Executors.invoke(p,r);
523 <            }
524 <            
525 <            shouldThrow();
526 <        } catch(ExecutionException success){
527 <        } catch(Exception e){
528 <            unexpectedException();
529 <        }
530 <        joinPool(p);
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  
533
534
534      /**
535 <     *  invoke(Executor, Callable) throws InterruptedException if
537 <     *  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() {
543 <                public Object call() {
544 <                    try {
545 <                        Executors.invoke(p, new SmallCallable());
546 <                        shouldThrow();
547 <                    } catch(InterruptedException e){}
548 <                    catch(RejectedExecutionException e2){}
549 <                    catch(ExecutionException e3){}
550 <                    return Boolean.TRUE;
551 <                }
552 <            };
553 <
554 <
555 <        
556 <        Thread t = new Thread(new Runnable() {
557 <                public void run() {
558 <                    try {
559 <                        c.call();
560 <                    } catch(Exception e){}
561 <                }
562 <          });
563 <        try {
564 <            t.start();
565 <            Thread.sleep(SHORT_DELAY_MS);
566 <            t.interrupt();
567 <            t.join();
568 <        } catch(InterruptedException e){
569 <            unexpectedException();
570 <        }
571 <        
572 <        joinPool(p);
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 <     *  invoke(Executor, Callable) will throw ExecutionException
577 <     *  if callable throws exception
545 >     * callable(null Runnable) throws NPE
546       */
547 <    public void testInvoke6() {
580 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
581 <
547 >    public void testCallableNPE1() {
548          try {
549 <            Callable c = new Callable() {
584 <                    public Object call() {
585 <                        int i = 5/0;
586 <                        return Boolean.TRUE;
587 <                    }
588 <                };
589 <            
590 <            for(int i =0; i < 5; i++){
591 <                Executors.invoke(p,c);
592 <            }
593 <            
549 >            Callable c = Executors.callable((Runnable) null);
550              shouldThrow();
551 <        }
596 <        catch(ExecutionException success){
597 <        } catch(Exception e) {
598 <            unexpectedException();
599 <        }
600 <        joinPool(p);
551 >        } catch (NullPointerException success) {}
552      }
553  
603
604
554      /**
555 <     *  timeouts from execute will time out if they compute too long.
555 >     * callable(null, result) throws NPE
556       */
557 <    public void testTimedCallable() {
609 <        int N = 10000;
610 <        ExecutorService executor = Executors.newSingleThreadExecutor();
611 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
557 >    public void testCallableNPE2() {
558          try {
559 <            long startTime = System.currentTimeMillis();
560 <            
561 <            long i = 0;
616 <            while (tasks.size() < N) {
617 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
618 <                i += 10;
619 <            }
620 <            
621 <            int iters = 0;
622 <            BigInteger sum = BigInteger.ZERO;
623 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
624 <                try {
625 <                    ++iters;
626 <                    sum = sum.add(it.next().call());
627 <                }
628 <                catch (TimeoutException success) {
629 <                    assertTrue(iters > 0);
630 <                    return;
631 <                }
632 <                catch (Exception e) {
633 <                    unexpectedException();
634 <                }
635 <            }
636 <            // if by chance we didn't ever time out, total time must be small
637 <            long elapsed = System.currentTimeMillis() - startTime;
638 <            assertTrue(elapsed < N);
639 <        }
640 <        finally {
641 <            joinPool(executor);
642 <        }
559 >            Callable c = Executors.callable((Runnable) null, one);
560 >            shouldThrow();
561 >        } catch (NullPointerException success) {}
562      }
563  
645    
564      /**
565 <     * ThreadPoolExecutor using defaultThreadFactory has
648 <     * specified group, priority, daemon status, and name
565 >     * callable(null PrivilegedAction) throws NPE
566       */
567 <    public void testDefaultThreadFactory() {
568 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
569 <        Runnable r = new Runnable() {
570 <                public void run() {
571 <                    Thread current = Thread.currentThread();
655 <                    threadAssertTrue(!current.isDaemon());
656 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
657 <                    ThreadGroup g = current.getThreadGroup();
658 <                    SecurityManager s = System.getSecurityManager();
659 <                    if (s != null)
660 <                        threadAssertTrue(g == s.getThreadGroup());
661 <                    else
662 <                        threadAssertTrue(g == egroup);
663 <                    String name = current.getName();
664 <                    threadAssertTrue(name.endsWith("thread-1"));
665 <                }
666 <            };
667 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
668 <        
669 <        e.execute(r);
670 <        e.shutdown();
671 <        try {
672 <            Thread.sleep(SHORT_DELAY_MS);
673 <        } catch (Exception eX) {
674 <            unexpectedException();
675 <        } finally {
676 <            joinPool(e);
677 <        }
567 >    public void testCallableNPE3() {
568 >        try {
569 >            Callable c = Executors.callable((PrivilegedAction) null);
570 >            shouldThrow();
571 >        } catch (NullPointerException success) {}
572      }
573  
574      /**
575 <     * ThreadPoolExecutor using privilegedThreadFactory has
682 <     * specified group, priority, daemon status, name,
683 <     * access control context and context class loader
575 >     * callable(null PrivilegedExceptionAction) throws NPE
576       */
577 <    public void testPrivilegedThreadFactory() {
578 <        Policy savedPolicy = Policy.getPolicy();
579 <        AdjustablePolicy policy = new AdjustablePolicy();
580 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
581 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
690 <        Policy.setPolicy(policy);
691 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
692 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
693 <        final AccessControlContext thisacc = AccessController.getContext();
694 <        Runnable r = new Runnable() {
695 <                public void run() {
696 <                    Thread current = Thread.currentThread();
697 <                    threadAssertTrue(!current.isDaemon());
698 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
699 <                    ThreadGroup g = current.getThreadGroup();
700 <                    SecurityManager s = System.getSecurityManager();
701 <                    if (s != null)
702 <                        threadAssertTrue(g == s.getThreadGroup());
703 <                    else
704 <                        threadAssertTrue(g == egroup);
705 <                    String name = current.getName();
706 <                    threadAssertTrue(name.endsWith("thread-1"));
707 <                    threadAssertTrue(thisccl == current.getContextClassLoader());
708 <                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
709 <                }
710 <            };
711 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
712 <        
713 <        Policy.setPolicy(savedPolicy);
714 <        e.execute(r);
715 <        e.shutdown();
716 <        try {
717 <            Thread.sleep(SHORT_DELAY_MS);
718 <        } catch (Exception ex) {
719 <            unexpectedException();
720 <        } finally {
721 <            joinPool(e);
722 <        }
723 <
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