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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines