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.32 by jsr166, Mon Oct 4 03:34:21 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() {
261 <                    public Object run() {
262 <                        return TEST_STRING;
263 <                    }});
264 <
265 <            Object result = future.get();
266 <            assertSame(TEST_STRING, result);
267 <        }
268 <        catch (ExecutionException ex) {
269 <            unexpectedException();
270 <        }
271 <        catch (InterruptedException ex) {
272 <            unexpectedException();
273 <        }
274 <        finally {
275 <            Policy.setPolicy(savedPolicy);
276 <        }
183 >    public void testNewSingleThreadScheduledExecutor() throws Exception {
184 >        TrackedCallable callable = new TrackedCallable();
185 >        ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
186 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
187 >        assertFalse(callable.done);
188 >        Thread.sleep(MEDIUM_DELAY_MS);
189 >        assertTrue(callable.done);
190 >        assertEquals(Boolean.TRUE, f.get());
191 >        joinPool(p1);
192      }
193  
194      /**
195 <     * execute of a privileged exception action runs it to completion
195 >     * a newScheduledThreadPool successfully runs delayed task
196       */
197 <    public void testExecutePrivilegedExceptionAction() {
198 <        Policy savedPolicy = Policy.getPolicy();
199 <        AdjustablePolicy policy = new AdjustablePolicy();
200 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
201 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
202 <        Policy.setPolicy(policy);
203 <        try {
204 <            Executor e = new DirectExecutor();
205 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
291 <                    public Object run() {
292 <                        return TEST_STRING;
293 <                    }});
294 <
295 <            Object result = future.get();
296 <            assertSame(TEST_STRING, result);
297 <        }
298 <        catch (ExecutionException ex) {
299 <            unexpectedException();
300 <        }
301 <        catch (InterruptedException ex) {
302 <            unexpectedException();
303 <        }
304 <        finally {
305 <            Policy.setPolicy(savedPolicy);
306 <        }
197 >    public void testnewScheduledThreadPool() throws Exception {
198 >        TrackedCallable callable = new TrackedCallable();
199 >        ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
200 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
201 >        assertFalse(callable.done);
202 >        Thread.sleep(MEDIUM_DELAY_MS);
203 >        assertTrue(callable.done);
204 >        assertEquals(Boolean.TRUE, f.get());
205 >        joinPool(p1);
206      }
207  
208      /**
209 <     * execute of a failed privileged exception action reports exception
209 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
210       */
211 <    public void testExecuteFailedPrivilegedExceptionAction() {
212 <        Policy savedPolicy = Policy.getPolicy();
213 <        AdjustablePolicy policy = new AdjustablePolicy();
214 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
215 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
216 <        Policy.setPolicy(policy);
217 <        try {
218 <            Executor e = new DirectExecutor();
219 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
321 <                    public Object run() throws Exception {
322 <                        throw new IndexOutOfBoundsException();
323 <                    }});
324 <
325 <            Object result = future.get();
326 <            shouldThrow();
327 <        }
328 <        catch (ExecutionException success) {
329 <        }
330 <        catch (InterruptedException ex) {
331 <            unexpectedException();
332 <        }
333 <        finally {
334 <            Policy.setPolicy(savedPolicy);
335 <        }
211 >    public void testunconfigurableScheduledExecutorService() throws Exception {
212 >        TrackedCallable callable = new TrackedCallable();
213 >        ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
214 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
215 >        assertFalse(callable.done);
216 >        Thread.sleep(MEDIUM_DELAY_MS);
217 >        assertTrue(callable.done);
218 >        assertEquals(Boolean.TRUE, f.get());
219 >        joinPool(p1);
220      }
221  
222      /**
223 <     * invoke of a collable runs it to completion
223 >     *  Future.get on submitted tasks will time out if they compute too long.
224       */
225 <    public void testInvokeCallable() {
226 <        try {
227 <            Executor e = new DirectExecutor();
228 <            String result = Executors.invoke(e, new StringTask());
229 <
230 <            assertSame(TEST_STRING, result);
231 <        }
232 <        catch (ExecutionException ex) {
233 <            unexpectedException();
234 <        }
235 <        catch (InterruptedException ex) {
236 <            unexpectedException();
225 >    public void testTimedCallable() throws Exception {
226 >        final Runnable sleeper =
227 >            new RunnableShouldThrow(InterruptedException.class) {
228 >                public void realRun() throws InterruptedException {
229 >                    Thread.sleep(LONG_DELAY_MS);
230 >                }};
231 >        for (ExecutorService executor :
232 >                 new ExecutorService[] {
233 >                     Executors.newSingleThreadExecutor(),
234 >                     Executors.newCachedThreadPool(),
235 >                     Executors.newFixedThreadPool(2),
236 >                     Executors.newScheduledThreadPool(2),
237 >                 }) {
238 >            try {
239 >                Future future = executor.submit(sleeper);
240 >                try {
241 >                    future.get(SHORT_DELAY_MS, MILLISECONDS);
242 >                    shouldThrow();
243 >                } catch (TimeoutException success) {
244 >                } finally {
245 >                    future.cancel(true);
246 >                }
247 >            }
248 >            finally {
249 >                joinPool(executor);
250 >            }
251          }
252      }
253  
254 +
255      /**
256 <     * execute with null executor throws NPE
256 >     * ThreadPoolExecutor using defaultThreadFactory has
257 >     * specified group, priority, daemon status, and name
258       */
259 <    public void testNullExecuteRunnable() {
259 >    public void testDefaultThreadFactory() throws Exception {
260 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
261 >        Runnable r = new CheckedRunnable() {
262 >            public void realRun() {
263 >                try {
264 >                    Thread current = Thread.currentThread();
265 >                    assertTrue(!current.isDaemon());
266 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
267 >                    ThreadGroup g = current.getThreadGroup();
268 >                    SecurityManager s = System.getSecurityManager();
269 >                    if (s != null)
270 >                        assertTrue(g == s.getThreadGroup());
271 >                    else
272 >                        assertTrue(g == egroup);
273 >                    String name = current.getName();
274 >                    assertTrue(name.endsWith("thread-1"));
275 >                } catch (SecurityException ok) {
276 >                    // Also pass if not allowed to change setting
277 >                }
278 >            }};
279 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
280 >
281 >        e.execute(r);
282          try {
283 <            TrackedShortRunnable task = new TrackedShortRunnable();
284 <            assertFalse(task.done);
363 <            Future<String> future = Executors.execute(null, task, TEST_STRING);
364 <            shouldThrow();
365 <        }
366 <        catch (NullPointerException success) {
283 >            e.shutdown();
284 >        } catch (SecurityException ok) {
285          }
286 <        catch (Exception ex) {
287 <            unexpectedException();
286 >
287 >        try {
288 >            Thread.sleep(SHORT_DELAY_MS);
289 >        } finally {
290 >            joinPool(e);
291          }
292      }
293  
294      /**
295 <     * execute with a null runnable throws NPE
295 >     * ThreadPoolExecutor using privilegedThreadFactory has
296 >     * specified group, priority, daemon status, name,
297 >     * access control context and context class loader
298       */
299 <    public void testExecuteNullRunnable() {
300 <        try {
301 <            Executor e = new DirectExecutor();
302 <            TrackedShortRunnable task = null;
303 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
304 <            shouldThrow();
299 >    public void testPrivilegedThreadFactory() throws Exception {
300 >        Runnable r = new CheckedRunnable() {
301 >            public void realRun() throws Exception {
302 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
303 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
304 >                final AccessControlContext thisacc = AccessController.getContext();
305 >                Runnable r = new CheckedRunnable() {
306 >                    public void realRun() {
307 >                        Thread current = Thread.currentThread();
308 >                        assertTrue(!current.isDaemon());
309 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
310 >                        ThreadGroup g = current.getThreadGroup();
311 >                        SecurityManager s = System.getSecurityManager();
312 >                        if (s != null)
313 >                            assertTrue(g == s.getThreadGroup());
314 >                        else
315 >                            assertTrue(g == egroup);
316 >                        String name = current.getName();
317 >                        assertTrue(name.endsWith("thread-1"));
318 >                        assertSame(thisccl, current.getContextClassLoader());
319 >                        assertEquals(thisacc, AccessController.getContext());
320 >                    }};
321 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
322 >                e.execute(r);
323 >                e.shutdown();
324 >                Thread.sleep(SHORT_DELAY_MS);
325 >                joinPool(e);
326 >            }};
327 >
328 >        runWithPermissions(r,
329 >                           new RuntimePermission("getClassLoader"),
330 >                           new RuntimePermission("setContextClassLoader"),
331 >                           new RuntimePermission("modifyThread"));
332 >    }
333 >
334 >    boolean haveCCLPermissions() {
335 >        SecurityManager sm = System.getSecurityManager();
336 >        if (sm != null) {
337 >            try {
338 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
339 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
340 >            } catch (AccessControlException e) {
341 >                return false;
342 >            }
343          }
344 <        catch (NullPointerException success) {
344 >        return true;
345 >    }
346 >
347 >    void checkCCL() {
348 >        SecurityManager sm = System.getSecurityManager();
349 >        if (sm != null) {
350 >            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
351 >            sm.checkPermission(new RuntimePermission("getClassLoader"));
352          }
353 <        catch (Exception ex) {
354 <            unexpectedException();
353 >    }
354 >
355 >    class CheckCCL implements Callable<Object> {
356 >        public Object call() {
357 >            checkCCL();
358 >            return null;
359          }
360      }
361  
362 +
363      /**
364 <     * invoke of a null runnable throws NPE
364 >     * Without class loader permissions, creating
365 >     * privilegedCallableUsingCurrentClassLoader throws ACE
366       */
367 <    public void testInvokeNullRunnable() {
368 <        try {
369 <            Executor e = new DirectExecutor();
370 <            TrackedShortRunnable task = null;
371 <            Executors.invoke(e, task);
372 <            shouldThrow();
373 <        }
374 <        catch (NullPointerException success) {
375 <        }
376 <        catch (Exception ex) {
377 <            unexpectedException();
378 <        }
367 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
368 >        Runnable r = new CheckedRunnable() {
369 >            public void realRun() throws Exception {
370 >                if (System.getSecurityManager() == null)
371 >                    return;
372 >                try {
373 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
374 >                    shouldThrow();
375 >                } catch (AccessControlException success) {}
376 >            }};
377 >
378 >        runWithoutPermissions(r);
379      }
380  
381      /**
382 <     * execute of a null callable throws NPE
382 >     * With class loader permissions, calling
383 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
384       */
385 <    public void testExecuteNullCallable() {
386 <        try {
387 <            Executor e = new DirectExecutor();
388 <            StringTask t = null;
389 <            Future<String> future = Executors.execute(e, t);
390 <            shouldThrow();
391 <        }
392 <        catch (NullPointerException success) {
393 <        }
394 <        catch (Exception ex) {
395 <            unexpectedException();
421 <        }
385 >    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
386 >        Runnable r = new CheckedRunnable() {
387 >            public void realRun() throws Exception {
388 >                Executors.privilegedCallableUsingCurrentClassLoader
389 >                    (new NoOpCallable())
390 >                    .call();
391 >            }};
392 >
393 >        runWithPermissions(r,
394 >                           new RuntimePermission("getClassLoader"),
395 >                           new RuntimePermission("setContextClassLoader"));
396      }
397  
398      /**
399 <     * invoke of a null callable throws NPE
399 >     * Without permissions, calling privilegedCallable throws ACE
400       */
401 <    public void testInvokeNullCallable() {
402 <        try {
403 <            Executor e = new DirectExecutor();
404 <            StringTask t = null;
405 <            String result = Executors.invoke(e, t);
406 <            shouldThrow();
407 <        }
408 <        catch (NullPointerException success) {
409 <        }
410 <        catch (Exception ex) {
411 <            unexpectedException();
412 <        }
401 >    public void testprivilegedCallableWithNoPrivs() throws Exception {
402 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
403 >        Executors.privilegedCallable(new CheckCCL());
404 >
405 >        Runnable r = new CheckedRunnable() {
406 >            public void realRun() throws Exception {
407 >                if (System.getSecurityManager() == null)
408 >                    return;
409 >                Callable task = Executors.privilegedCallable(new CheckCCL());
410 >                try {
411 >                    task.call();
412 >                    shouldThrow();
413 >                } catch (AccessControlException success) {}
414 >            }};
415 >
416 >        runWithoutPermissions(r);
417 >
418 >        // It seems rather difficult to test that the
419 >        // AccessControlContext of the privilegedCallable is used
420 >        // instead of its caller.  Below is a failed attempt to do
421 >        // that, which does not work because the AccessController
422 >        // cannot capture the internal state of the current Policy.
423 >        // It would be much more work to differentiate based on,
424 >        // e.g. CodeSource.
425 >
426 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
427 > //         final Callable[] task = new Callable[1];
428 >
429 > //         runWithPermissions
430 > //             (new CheckedRunnable() {
431 > //                 public void realRun() {
432 > //                     if (System.getSecurityManager() == null)
433 > //                         return;
434 > //                     noprivAcc[0] = AccessController.getContext();
435 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
436 > //                     try {
437 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
438 > //                                                           public Void run() {
439 > //                                                               checkCCL();
440 > //                                                               return null;
441 > //                                                           }}, noprivAcc[0]);
442 > //                         shouldThrow();
443 > //                     } catch (AccessControlException success) {}
444 > //                 }});
445 >
446 > //         runWithPermissions
447 > //             (new CheckedRunnable() {
448 > //                 public void realRun() throws Exception {
449 > //                     if (System.getSecurityManager() == null)
450 > //                         return;
451 > //                     // Verify that we have an underprivileged ACC
452 > //                     try {
453 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
454 > //                                                           public Void run() {
455 > //                                                               checkCCL();
456 > //                                                               return null;
457 > //                                                           }}, noprivAcc[0]);
458 > //                         shouldThrow();
459 > //                     } catch (AccessControlException success) {}
460 >
461 > //                     try {
462 > //                         task[0].call();
463 > //                         shouldThrow();
464 > //                     } catch (AccessControlException success) {}
465 > //                 }},
466 > //              new RuntimePermission("getClassLoader"),
467 > //              new RuntimePermission("setContextClassLoader"));
468      }
469  
470      /**
471 <     *  execute(Executor, Runnable) throws RejectedExecutionException
443 <     *  if saturated.
471 >     * With permissions, calling privilegedCallable succeeds
472       */
473 <    public void testExecute1() {
474 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
475 <        try {
476 <            
477 <            for(int i = 0; i < 5; ++i){
478 <                Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
479 <            }
480 <            shouldThrow();
481 <        } catch(RejectedExecutionException success){}
454 <        joinPool(p);
473 >    public void testprivilegedCallableWithPrivs() throws Exception {
474 >        Runnable r = new CheckedRunnable() {
475 >            public void realRun() throws Exception {
476 >                Executors.privilegedCallable(new CheckCCL()).call();
477 >            }};
478 >
479 >         runWithPermissions(r,
480 >                           new RuntimePermission("getClassLoader"),
481 >                           new RuntimePermission("setContextClassLoader"));
482      }
483  
484      /**
485 <     *  execute(Executor, Callable)throws RejectedExecutionException
459 <     *  if saturated.
485 >     * callable(Runnable) returns null when called
486       */
487 <    public void testExecute2() {
488 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
489 <        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);
487 >    public void testCallable1() throws Exception {
488 >        Callable c = Executors.callable(new NoOpRunnable());
489 >        assertNull(c.call());
490      }
491  
472
492      /**
493 <     *  invoke(Executor, Runnable) throws InterruptedException if
475 <     *  caller interrupted.
493 >     * callable(Runnable, result) returns result when called
494       */
495 <    public void testInterruptedInvoke() {
496 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
497 <        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);
495 >    public void testCallable2() throws Exception {
496 >        Callable c = Executors.callable(new NoOpRunnable(), one);
497 >        assertSame(one, c.call());
498      }
499  
500      /**
501 <     *  invoke(Executor, Runnable) throws ExecutionException if
510 <     *  runnable throws exception.
501 >     * callable(PrivilegedAction) returns its result when called
502       */
503 <    public void testInvoke3() {
504 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
505 <        try {
506 <            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);
503 >    public void testCallable3() throws Exception {
504 >        Callable c = Executors.callable(new PrivilegedAction() {
505 >                public Object run() { return one; }});
506 >        assertSame(one, c.call());
507      }
508  
533
534
509      /**
510 <     *  invoke(Executor, Callable) throws InterruptedException if
537 <     *  callable throws exception
510 >     * callable(PrivilegedExceptionAction) returns its result when called
511       */
512 <    public void testInvoke5() {
513 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
514 <        
515 <        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);
512 >    public void testCallable4() throws Exception {
513 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
514 >                public Object run() { return one; }});
515 >        assertSame(one, c.call());
516      }
517  
518 +
519      /**
520 <     *  invoke(Executor, Callable) will throw ExecutionException
577 <     *  if callable throws exception
520 >     * callable(null Runnable) throws NPE
521       */
522 <    public void testInvoke6() {
580 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
581 <
522 >    public void testCallableNPE1() {
523          try {
524 <            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 <            
524 >            Callable c = Executors.callable((Runnable) null);
525              shouldThrow();
526 <        }
596 <        catch(ExecutionException success){
597 <        } catch(Exception e) {
598 <            unexpectedException();
599 <        }
600 <        joinPool(p);
526 >        } catch (NullPointerException success) {}
527      }
528  
603
604
529      /**
530 <     *  timeouts from execute will time out if they compute too long.
530 >     * callable(null, result) throws NPE
531       */
532 <    public void testTimedCallable() {
609 <        int N = 10000;
610 <        ExecutorService executor = Executors.newSingleThreadExecutor();
611 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
532 >    public void testCallableNPE2() {
533          try {
534 <            long startTime = System.currentTimeMillis();
535 <            
536 <            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 <        }
534 >            Callable c = Executors.callable((Runnable) null, one);
535 >            shouldThrow();
536 >        } catch (NullPointerException success) {}
537      }
538  
645    
539      /**
540 <     * ThreadPoolExecutor using defaultThreadFactory has
648 <     * specified group, priority, daemon status, and name
540 >     * callable(null PrivilegedAction) throws NPE
541       */
542 <    public void testDefaultThreadFactory() {
543 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
544 <        Runnable r = new Runnable() {
545 <                public void run() {
546 <                    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 <        }
542 >    public void testCallableNPE3() {
543 >        try {
544 >            Callable c = Executors.callable((PrivilegedAction) null);
545 >            shouldThrow();
546 >        } catch (NullPointerException success) {}
547      }
548  
549      /**
550 <     * ThreadPoolExecutor using privilegedThreadFactory has
682 <     * specified group, priority, daemon status, name,
683 <     * access control context and context class loader
550 >     * callable(null PrivilegedExceptionAction) throws NPE
551       */
552 <    public void testPrivilegedThreadFactory() {
553 <        Policy savedPolicy = Policy.getPolicy();
554 <        AdjustablePolicy policy = new AdjustablePolicy();
555 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
556 <        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 <
552 >    public void testCallableNPE4() {
553 >        try {
554 >            Callable c = Executors.callable((PrivilegedExceptionAction) null);
555 >            shouldThrow();
556 >        } catch (NullPointerException success) {}
557      }
558  
559 +
560   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines