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.9 by tim, Tue Dec 9 19:09:24 2003 UTC vs.
Revision 1.34 by jsr166, Sat Oct 9 19:30:35 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);
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<?> future = Executors.execute(e, task);
199 <            future.get();
200 <            assertTrue(task.done);
201 <        }
202 <        catch (ExecutionException ex) {
203 <            unexpectedException();
204 <        }
205 <        catch (InterruptedException ex) {
206 <            unexpectedException();
207 <        }
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);
218 <            Executors.invoke(e, task);
219 <            assertTrue(task.done);
220 <        }
221 <        catch (ExecutionException ex) {
222 <            unexpectedException();
223 <        }
224 <        catch (InterruptedException ex) {
225 <            unexpectedException();
226 <        }
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();
237 <            assertSame(TEST_STRING, result);
238 <        }
239 <        catch (ExecutionException ex) {
240 <            unexpectedException();
241 <        }
242 <        catch (InterruptedException ex) {
243 <            unexpectedException();
244 <        }
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() {
260 <                    public Object run() {
261 <                        return TEST_STRING;
262 <                    }});
263 <
264 <            Object result = future.get();
265 <            assertSame(TEST_STRING, result);
266 <        }
267 <        catch (ExecutionException ex) {
268 <            unexpectedException();
269 <        }
270 <        catch (InterruptedException ex) {
271 <            unexpectedException();
272 <        }
273 <        finally {
274 <            Policy.setPolicy(savedPolicy);
275 <        }
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() {
290 <                    public Object run() {
291 <                        return TEST_STRING;
292 <                    }});
293 <
294 <            Object result = future.get();
295 <            assertSame(TEST_STRING, result);
296 <        }
297 <        catch (ExecutionException ex) {
298 <            unexpectedException();
299 <        }
300 <        catch (InterruptedException ex) {
301 <            unexpectedException();
302 <        }
303 <        finally {
304 <            Policy.setPolicy(savedPolicy);
305 <        }
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() {
320 <                    public Object run() throws Exception {
321 <                        throw new IndexOutOfBoundsException();
322 <                    }});
323 <
324 <            Object result = future.get();
325 <            shouldThrow();
326 <        }
327 <        catch (ExecutionException success) {
328 <        }
329 <        catch (InterruptedException ex) {
330 <            unexpectedException();
331 <        }
332 <        finally {
333 <            Policy.setPolicy(savedPolicy);
334 <        }
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 = new CheckedInterruptedRunnable() {
227 >            public void realRun() throws InterruptedException {
228 >                Thread.sleep(LONG_DELAY_MS);
229 >            }};
230 >        for (ExecutorService executor :
231 >                 new ExecutorService[] {
232 >                     Executors.newSingleThreadExecutor(),
233 >                     Executors.newCachedThreadPool(),
234 >                     Executors.newFixedThreadPool(2),
235 >                     Executors.newScheduledThreadPool(2),
236 >                 }) {
237 >            try {
238 >                Future future = executor.submit(sleeper);
239 >                try {
240 >                    future.get(SHORT_DELAY_MS, MILLISECONDS);
241 >                    shouldThrow();
242 >                } catch (TimeoutException success) {
243 >                } finally {
244 >                    future.cancel(true);
245 >                }
246 >            }
247 >            finally {
248 >                joinPool(executor);
249 >            }
250          }
251      }
252  
253 +
254      /**
255 <     * execute with null executor throws NPE
255 >     * ThreadPoolExecutor using defaultThreadFactory has
256 >     * specified group, priority, daemon status, and name
257       */
258 <    public void testNullExecuteRunnable() {
258 >    public void testDefaultThreadFactory() throws Exception {
259 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
260 >        Runnable r = new CheckedRunnable() {
261 >            public void realRun() {
262 >                try {
263 >                    Thread current = Thread.currentThread();
264 >                    assertTrue(!current.isDaemon());
265 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
266 >                    ThreadGroup g = current.getThreadGroup();
267 >                    SecurityManager s = System.getSecurityManager();
268 >                    if (s != null)
269 >                        assertTrue(g == s.getThreadGroup());
270 >                    else
271 >                        assertTrue(g == egroup);
272 >                    String name = current.getName();
273 >                    assertTrue(name.endsWith("thread-1"));
274 >                } catch (SecurityException ok) {
275 >                    // Also pass if not allowed to change setting
276 >                }
277 >            }};
278 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
279 >
280 >        e.execute(r);
281          try {
282 <            TrackedShortRunnable task = new TrackedShortRunnable();
283 <            assertFalse(task.done);
362 <            Future<?> future = Executors.execute(null, task);
363 <            shouldThrow();
282 >            e.shutdown();
283 >        } catch (SecurityException ok) {
284          }
285 <        catch (NullPointerException success) {
286 <        }
287 <        catch (Exception ex) {
288 <            unexpectedException();
285 >
286 >        try {
287 >            Thread.sleep(SHORT_DELAY_MS);
288 >        } finally {
289 >            joinPool(e);
290          }
291      }
292  
293      /**
294 <     * execute with a null runnable throws NPE
294 >     * ThreadPoolExecutor using privilegedThreadFactory has
295 >     * specified group, priority, daemon status, name,
296 >     * access control context and context class loader
297       */
298 <    public void testExecuteNullRunnable() {
299 <        try {
300 <            Executor e = new DirectExecutor();
301 <            TrackedShortRunnable task = null;
302 <            Future<?> future = Executors.execute(e, task);
303 <            shouldThrow();
298 >    public void testPrivilegedThreadFactory() throws Exception {
299 >        Runnable r = new CheckedRunnable() {
300 >            public void realRun() throws Exception {
301 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
302 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
303 >                final AccessControlContext thisacc = AccessController.getContext();
304 >                Runnable r = new CheckedRunnable() {
305 >                    public void realRun() {
306 >                        Thread current = Thread.currentThread();
307 >                        assertTrue(!current.isDaemon());
308 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
309 >                        ThreadGroup g = current.getThreadGroup();
310 >                        SecurityManager s = System.getSecurityManager();
311 >                        if (s != null)
312 >                            assertTrue(g == s.getThreadGroup());
313 >                        else
314 >                            assertTrue(g == egroup);
315 >                        String name = current.getName();
316 >                        assertTrue(name.endsWith("thread-1"));
317 >                        assertSame(thisccl, current.getContextClassLoader());
318 >                        assertEquals(thisacc, AccessController.getContext());
319 >                    }};
320 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
321 >                e.execute(r);
322 >                e.shutdown();
323 >                Thread.sleep(SHORT_DELAY_MS);
324 >                joinPool(e);
325 >            }};
326 >
327 >        runWithPermissions(r,
328 >                           new RuntimePermission("getClassLoader"),
329 >                           new RuntimePermission("setContextClassLoader"),
330 >                           new RuntimePermission("modifyThread"));
331 >    }
332 >
333 >    boolean haveCCLPermissions() {
334 >        SecurityManager sm = System.getSecurityManager();
335 >        if (sm != null) {
336 >            try {
337 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
338 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
339 >            } catch (AccessControlException e) {
340 >                return false;
341 >            }
342          }
343 <        catch (NullPointerException success) {
343 >        return true;
344 >    }
345 >
346 >    void checkCCL() {
347 >        SecurityManager sm = System.getSecurityManager();
348 >        if (sm != null) {
349 >            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
350 >            sm.checkPermission(new RuntimePermission("getClassLoader"));
351          }
352 <        catch (Exception ex) {
353 <            unexpectedException();
352 >    }
353 >
354 >    class CheckCCL implements Callable<Object> {
355 >        public Object call() {
356 >            checkCCL();
357 >            return null;
358          }
359      }
360  
361 +
362      /**
363 <     * invoke of a null runnable throws NPE
363 >     * Without class loader permissions, creating
364 >     * privilegedCallableUsingCurrentClassLoader throws ACE
365       */
366 <    public void testInvokeNullRunnable() {
367 <        try {
368 <            Executor e = new DirectExecutor();
369 <            TrackedShortRunnable task = null;
370 <            Executors.invoke(e, task);
371 <            shouldThrow();
372 <        }
373 <        catch (NullPointerException success) {
374 <        }
375 <        catch (Exception ex) {
376 <            unexpectedException();
377 <        }
366 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
367 >        Runnable r = new CheckedRunnable() {
368 >            public void realRun() throws Exception {
369 >                if (System.getSecurityManager() == null)
370 >                    return;
371 >                try {
372 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
373 >                    shouldThrow();
374 >                } catch (AccessControlException success) {}
375 >            }};
376 >
377 >        runWithoutPermissions(r);
378      }
379  
380      /**
381 <     * execute of a null callable throws NPE
381 >     * With class loader permissions, calling
382 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
383       */
384 <    public void testExecuteNullCallable() {
385 <        try {
386 <            Executor e = new DirectExecutor();
387 <            StringTask t = null;
388 <            Future<String> future = Executors.execute(e, t);
389 <            shouldThrow();
390 <        }
391 <        catch (NullPointerException success) {
392 <        }
393 <        catch (Exception ex) {
394 <            unexpectedException();
420 <        }
384 >    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
385 >        Runnable r = new CheckedRunnable() {
386 >            public void realRun() throws Exception {
387 >                Executors.privilegedCallableUsingCurrentClassLoader
388 >                    (new NoOpCallable())
389 >                    .call();
390 >            }};
391 >
392 >        runWithPermissions(r,
393 >                           new RuntimePermission("getClassLoader"),
394 >                           new RuntimePermission("setContextClassLoader"));
395      }
396  
397      /**
398 <     * invoke of a null callable throws NPE
398 >     * Without permissions, calling privilegedCallable throws ACE
399       */
400 <    public void testInvokeNullCallable() {
401 <        try {
402 <            Executor e = new DirectExecutor();
403 <            StringTask t = null;
404 <            String result = Executors.invoke(e, t);
405 <            shouldThrow();
406 <        }
407 <        catch (NullPointerException success) {
408 <        }
409 <        catch (Exception ex) {
410 <            unexpectedException();
411 <        }
400 >    public void testprivilegedCallableWithNoPrivs() throws Exception {
401 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
402 >        Executors.privilegedCallable(new CheckCCL());
403 >
404 >        Runnable r = new CheckedRunnable() {
405 >            public void realRun() throws Exception {
406 >                if (System.getSecurityManager() == null)
407 >                    return;
408 >                Callable task = Executors.privilegedCallable(new CheckCCL());
409 >                try {
410 >                    task.call();
411 >                    shouldThrow();
412 >                } catch (AccessControlException success) {}
413 >            }};
414 >
415 >        runWithoutPermissions(r);
416 >
417 >        // It seems rather difficult to test that the
418 >        // AccessControlContext of the privilegedCallable is used
419 >        // instead of its caller.  Below is a failed attempt to do
420 >        // that, which does not work because the AccessController
421 >        // cannot capture the internal state of the current Policy.
422 >        // It would be much more work to differentiate based on,
423 >        // e.g. CodeSource.
424 >
425 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
426 > //         final Callable[] task = new Callable[1];
427 >
428 > //         runWithPermissions
429 > //             (new CheckedRunnable() {
430 > //                 public void realRun() {
431 > //                     if (System.getSecurityManager() == null)
432 > //                         return;
433 > //                     noprivAcc[0] = AccessController.getContext();
434 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
435 > //                     try {
436 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
437 > //                                                           public Void run() {
438 > //                                                               checkCCL();
439 > //                                                               return null;
440 > //                                                           }}, noprivAcc[0]);
441 > //                         shouldThrow();
442 > //                     } catch (AccessControlException success) {}
443 > //                 }});
444 >
445 > //         runWithPermissions
446 > //             (new CheckedRunnable() {
447 > //                 public void realRun() throws Exception {
448 > //                     if (System.getSecurityManager() == null)
449 > //                         return;
450 > //                     // Verify that we have an underprivileged ACC
451 > //                     try {
452 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
453 > //                                                           public Void run() {
454 > //                                                               checkCCL();
455 > //                                                               return null;
456 > //                                                           }}, noprivAcc[0]);
457 > //                         shouldThrow();
458 > //                     } catch (AccessControlException success) {}
459 >
460 > //                     try {
461 > //                         task[0].call();
462 > //                         shouldThrow();
463 > //                     } catch (AccessControlException success) {}
464 > //                 }},
465 > //              new RuntimePermission("getClassLoader"),
466 > //              new RuntimePermission("setContextClassLoader"));
467      }
468  
469      /**
470 <     *  execute(Executor, Runnable) throws RejectedExecutionException
442 <     *  if saturated.
470 >     * With permissions, calling privilegedCallable succeeds
471       */
472 <    public void testExecute1() {
473 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
474 <        try {
475 <            
476 <            for(int i = 0; i < 5; ++i){
477 <                Executors.execute(p, new MediumRunnable());
478 <            }
479 <            shouldThrow();
480 <        } catch(RejectedExecutionException success){}
453 <        joinPool(p);
472 >    public void testprivilegedCallableWithPrivs() throws Exception {
473 >        Runnable r = new CheckedRunnable() {
474 >            public void realRun() throws Exception {
475 >                Executors.privilegedCallable(new CheckCCL()).call();
476 >            }};
477 >
478 >         runWithPermissions(r,
479 >                           new RuntimePermission("getClassLoader"),
480 >                           new RuntimePermission("setContextClassLoader"));
481      }
482  
483      /**
484 <     *  execute(Executor, Callable)throws RejectedExecutionException
458 <     *  if saturated.
484 >     * callable(Runnable) returns null when called
485       */
486 <    public void testExecute2() {
487 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
488 <        try {
463 <            for(int i = 0; i < 5; ++i) {
464 <                Executors.execute(p, new SmallCallable());
465 <            }
466 <            shouldThrow();
467 <        } catch(RejectedExecutionException e){}
468 <        joinPool(p);
486 >    public void testCallable1() throws Exception {
487 >        Callable c = Executors.callable(new NoOpRunnable());
488 >        assertNull(c.call());
489      }
490  
471
491      /**
492 <     *  invoke(Executor, Runnable) throws InterruptedException if
474 <     *  caller interrupted.
492 >     * callable(Runnable, result) returns result when called
493       */
494 <    public void testInterruptedInvoke() {
495 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
496 <        Thread t = new Thread(new Runnable() {
479 <                public void run() {
480 <                    try {
481 <                        Executors.invoke(p,new Runnable() {
482 <                                public void run() {
483 <                                    try {
484 <                                        Thread.sleep(MEDIUM_DELAY_MS);
485 <                                        shouldThrow();
486 <                                    } catch(InterruptedException e){
487 <                                    }
488 <                                }
489 <                            });
490 <                    } catch(InterruptedException success){
491 <                    } catch(Exception e) {
492 <                        unexpectedException();
493 <                    }
494 <                    
495 <                }
496 <            });
497 <        try {
498 <            t.start();
499 <            Thread.sleep(SHORT_DELAY_MS);
500 <            t.interrupt();
501 <        } catch(Exception e){
502 <            unexpectedException();
503 <        }
504 <        joinPool(p);
494 >    public void testCallable2() throws Exception {
495 >        Callable c = Executors.callable(new NoOpRunnable(), one);
496 >        assertSame(one, c.call());
497      }
498  
499      /**
500 <     *  invoke(Executor, Runnable) throws ExecutionException if
509 <     *  runnable throws exception.
500 >     * callable(PrivilegedAction) returns its result when called
501       */
502 <    public void testInvoke3() {
503 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
504 <        try {
505 <            Runnable r = new Runnable() {
515 <                    public void run() {
516 <                        int i = 5/0;
517 <                    }
518 <                };
519 <            
520 <            for(int i =0; i < 5; i++){
521 <                Executors.invoke(p,r);
522 <            }
523 <            
524 <            shouldThrow();
525 <        } catch(ExecutionException success){
526 <        } catch(Exception e){
527 <            unexpectedException();
528 <        }
529 <        joinPool(p);
502 >    public void testCallable3() throws Exception {
503 >        Callable c = Executors.callable(new PrivilegedAction() {
504 >                public Object run() { return one; }});
505 >        assertSame(one, c.call());
506      }
507  
532
533
508      /**
509 <     *  invoke(Executor, Callable) throws InterruptedException if
536 <     *  callable throws exception
509 >     * callable(PrivilegedExceptionAction) returns its result when called
510       */
511 <    public void testInvoke5() {
512 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
513 <        
514 <        final Callable c = new Callable() {
542 <                public Object call() {
543 <                    try {
544 <                        Executors.invoke(p, new SmallCallable());
545 <                        shouldThrow();
546 <                    } catch(InterruptedException e){}
547 <                    catch(RejectedExecutionException e2){}
548 <                    catch(ExecutionException e3){}
549 <                    return Boolean.TRUE;
550 <                }
551 <            };
552 <
553 <
554 <        
555 <        Thread t = new Thread(new Runnable() {
556 <                public void run() {
557 <                    try {
558 <                        c.call();
559 <                    } catch(Exception e){}
560 <                }
561 <          });
562 <        try {
563 <            t.start();
564 <            Thread.sleep(SHORT_DELAY_MS);
565 <            t.interrupt();
566 <            t.join();
567 <        } catch(InterruptedException e){
568 <            unexpectedException();
569 <        }
570 <        
571 <        joinPool(p);
511 >    public void testCallable4() throws Exception {
512 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
513 >                public Object run() { return one; }});
514 >        assertSame(one, c.call());
515      }
516  
517 +
518      /**
519 <     *  invoke(Executor, Callable) will throw ExecutionException
576 <     *  if callable throws exception
519 >     * callable(null Runnable) throws NPE
520       */
521 <    public void testInvoke6() {
579 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
580 <
521 >    public void testCallableNPE1() {
522          try {
523 <            Callable c = new Callable() {
583 <                    public Object call() {
584 <                        int i = 5/0;
585 <                        return Boolean.TRUE;
586 <                    }
587 <                };
588 <            
589 <            for(int i =0; i < 5; i++){
590 <                Executors.invoke(p,c);
591 <            }
592 <            
523 >            Callable c = Executors.callable((Runnable) null);
524              shouldThrow();
525 <        }
595 <        catch(ExecutionException success){
596 <        } catch(Exception e) {
597 <            unexpectedException();
598 <        }
599 <        joinPool(p);
525 >        } catch (NullPointerException success) {}
526      }
527  
602
603
528      /**
529 <     *  timeouts from execute will time out if they compute too long.
529 >     * callable(null, result) throws NPE
530       */
531 <    public void testTimedCallable() {
608 <        int N = 10000;
609 <        ExecutorService executor = Executors.newSingleThreadExecutor();
610 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
531 >    public void testCallableNPE2() {
532          try {
533 <            long startTime = System.currentTimeMillis();
534 <            
535 <            long i = 0;
615 <            while (tasks.size() < N) {
616 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
617 <                i += 10;
618 <            }
619 <            
620 <            int iters = 0;
621 <            BigInteger sum = BigInteger.ZERO;
622 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
623 <                try {
624 <                    ++iters;
625 <                    sum = sum.add(it.next().call());
626 <                }
627 <                catch (TimeoutException success) {
628 <                    assertTrue(iters > 0);
629 <                    return;
630 <                }
631 <                catch (Exception e) {
632 <                    unexpectedException();
633 <                }
634 <            }
635 <            // if by chance we didn't ever time out, total time must be small
636 <            long elapsed = System.currentTimeMillis() - startTime;
637 <            assertTrue(elapsed < N);
638 <        }
639 <        finally {
640 <            joinPool(executor);
641 <        }
533 >            Callable c = Executors.callable((Runnable) null, one);
534 >            shouldThrow();
535 >        } catch (NullPointerException success) {}
536      }
537  
644    
538      /**
539 <     * ThreadPoolExecutor using defaultThreadFactory has
647 <     * specified group, priority, daemon status, and name
539 >     * callable(null PrivilegedAction) throws NPE
540       */
541 <    public void testDefaultThreadFactory() {
650 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
651 <        Runnable r = new Runnable() {
652 <                public void run() {
653 <                    Thread current = Thread.currentThread();
654 <                    threadAssertTrue(!current.isDaemon());
655 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
656 <                    ThreadGroup g = current.getThreadGroup();
657 <                    SecurityManager s = System.getSecurityManager();
658 <                    if (s != null)
659 <                        threadAssertTrue(g == s.getThreadGroup());
660 <                    else
661 <                        threadAssertTrue(g == egroup);
662 <                    String name = current.getName();
663 <                    threadAssertTrue(name.endsWith("thread-1"));
664 <                }
665 <            };
666 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
667 <        
668 <        e.execute(r);
669 <        e.shutdown();
541 >    public void testCallableNPE3() {
542          try {
543 <            Thread.sleep(SHORT_DELAY_MS);
544 <        } catch (Exception eX) {
545 <            unexpectedException();
674 <        } finally {
675 <            joinPool(e);
676 <        }
543 >            Callable c = Executors.callable((PrivilegedAction) null);
544 >            shouldThrow();
545 >        } catch (NullPointerException success) {}
546      }
547  
548      /**
549 <     * ThreadPoolExecutor using privilegedThreadFactory has
681 <     * specified group, priority, daemon status, name,
682 <     * access control context and context class loader
549 >     * callable(null PrivilegedExceptionAction) throws NPE
550       */
551 <    public void testPrivilegedThreadFactory() {
685 <        Policy savedPolicy = Policy.getPolicy();
686 <        AdjustablePolicy policy = new AdjustablePolicy();
687 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
688 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
689 <        Policy.setPolicy(policy);
690 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
691 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
692 <        final AccessControlContext thisacc = AccessController.getContext();
693 <        Runnable r = new Runnable() {
694 <                public void run() {
695 <                    Thread current = Thread.currentThread();
696 <                    threadAssertTrue(!current.isDaemon());
697 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
698 <                    ThreadGroup g = current.getThreadGroup();
699 <                    SecurityManager s = System.getSecurityManager();
700 <                    if (s != null)
701 <                        threadAssertTrue(g == s.getThreadGroup());
702 <                    else
703 <                        threadAssertTrue(g == egroup);
704 <                    String name = current.getName();
705 <                    threadAssertTrue(name.endsWith("thread-1"));
706 <                    threadAssertTrue(thisccl == current.getContextClassLoader());
707 <                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
708 <                }
709 <            };
710 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
711 <        
712 <        Policy.setPolicy(savedPolicy);
713 <        e.execute(r);
714 <        e.shutdown();
551 >    public void testCallableNPE4() {
552          try {
553 <            Thread.sleep(SHORT_DELAY_MS);
554 <        } catch (Exception ex) {
555 <            unexpectedException();
719 <        } finally {
720 <            joinPool(e);
721 <        }
722 <
553 >            Callable c = Executors.callable((PrivilegedExceptionAction) null);
554 >            shouldThrow();
555 >        } catch (NullPointerException success) {}
556      }
557  
558 +
559   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines