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.41 by jsr166, Sun May 29 06:54:23 2011 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/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
8
9   import junit.framework.*;
10   import java.util.*;
11   import java.util.concurrent.*;
12 < import java.math.BigInteger;
12 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
13   import java.security.*;
14  
15 < public class ExecutorsTest extends JSR166TestCase{
15 > public class ExecutorsTest extends JSR166TestCase {
16      public static void main(String[] args) {
17 <        junit.textui.TestRunner.run (suite());  
17 >        junit.textui.TestRunner.run(suite());
18      }
19      public static Test suite() {
20          return new TestSuite(ExecutorsTest.class);
21      }
22  
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
23      /**
24       * A newCachedThreadPool can execute runnables
25       */
# Line 80 | Line 28 | public class ExecutorsTest extends JSR16
28          e.execute(new NoOpRunnable());
29          e.execute(new NoOpRunnable());
30          e.execute(new NoOpRunnable());
31 <        e.shutdown();
31 >        joinPool(e);
32      }
33  
34      /**
# Line 91 | Line 39 | public class ExecutorsTest extends JSR16
39          e.execute(new NoOpRunnable());
40          e.execute(new NoOpRunnable());
41          e.execute(new NoOpRunnable());
42 <        e.shutdown();
42 >        joinPool(e);
43      }
44  
45      /**
# Line 101 | Line 49 | public class ExecutorsTest extends JSR16
49          try {
50              ExecutorService e = Executors.newCachedThreadPool(null);
51              shouldThrow();
52 <        }
105 <        catch(NullPointerException success) {
106 <        }
52 >        } catch (NullPointerException success) {}
53      }
54  
109
55      /**
56       * A new SingleThreadExecutor can execute runnables
57       */
# Line 115 | Line 60 | public class ExecutorsTest extends JSR16
60          e.execute(new NoOpRunnable());
61          e.execute(new NoOpRunnable());
62          e.execute(new NoOpRunnable());
63 <        e.shutdown();
63 >        joinPool(e);
64      }
65  
66      /**
# Line 126 | Line 71 | public class ExecutorsTest extends JSR16
71          e.execute(new NoOpRunnable());
72          e.execute(new NoOpRunnable());
73          e.execute(new NoOpRunnable());
74 <        e.shutdown();
74 >        joinPool(e);
75      }
76  
77      /**
# Line 136 | Line 81 | public class ExecutorsTest extends JSR16
81          try {
82              ExecutorService e = Executors.newSingleThreadExecutor(null);
83              shouldThrow();
84 <        }
85 <        catch(NullPointerException success) {
84 >        } catch (NullPointerException success) {}
85 >    }
86 >
87 >    /**
88 >     * A new SingleThreadExecutor cannot be casted to concrete implementation
89 >     */
90 >    public void testCastNewSingleThreadExecutor() {
91 >        ExecutorService e = Executors.newSingleThreadExecutor();
92 >        try {
93 >            ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
94 >            shouldThrow();
95 >        } catch (ClassCastException success) {
96 >        } finally {
97 >            joinPool(e);
98          }
99      }
100  
# Line 149 | Line 106 | public class ExecutorsTest extends JSR16
106          e.execute(new NoOpRunnable());
107          e.execute(new NoOpRunnable());
108          e.execute(new NoOpRunnable());
109 <        e.shutdown();
109 >        joinPool(e);
110      }
111  
112      /**
# Line 160 | Line 117 | public class ExecutorsTest extends JSR16
117          e.execute(new NoOpRunnable());
118          e.execute(new NoOpRunnable());
119          e.execute(new NoOpRunnable());
120 <        e.shutdown();
120 >        joinPool(e);
121      }
122  
123      /**
# Line 170 | Line 127 | public class ExecutorsTest extends JSR16
127          try {
128              ExecutorService e = Executors.newFixedThreadPool(2, null);
129              shouldThrow();
130 <        }
174 <        catch(NullPointerException success) {
175 <        }
130 >        } catch (NullPointerException success) {}
131      }
132  
133      /**
# Line 182 | Line 137 | public class ExecutorsTest extends JSR16
137          try {
138              ExecutorService e = Executors.newFixedThreadPool(0);
139              shouldThrow();
140 <        }
186 <        catch(IllegalArgumentException success) {
187 <        }
140 >        } catch (IllegalArgumentException success) {}
141      }
142  
143      /**
144 <     * execute of runnable runs it to completion
144 >     * An unconfigurable newFixedThreadPool can execute runnables
145       */
146 <    public void testExecuteRunnable() {
147 <        try {
148 <            Executor e = new DirectExecutor();
149 <            TrackedShortRunnable task = new TrackedShortRunnable();
150 <            assertFalse(task.done);
151 <            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 <        }
146 >    public void testunconfigurableExecutorService() {
147 >        ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
148 >        e.execute(new NoOpRunnable());
149 >        e.execute(new NoOpRunnable());
150 >        e.execute(new NoOpRunnable());
151 >        joinPool(e);
152      }
153  
154      /**
155 <     * invoke of a runnable runs it to completion
155 >     * unconfigurableExecutorService(null) throws NPE
156       */
157 <    public void testInvokeRunnable() {
157 >    public void testunconfigurableExecutorServiceNPE() {
158          try {
159 <            Executor e = new DirectExecutor();
160 <            TrackedShortRunnable task = new TrackedShortRunnable();
161 <            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 <        }
159 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
160 >            shouldThrow();
161 >        } catch (NullPointerException success) {}
162      }
163  
164      /**
165 <     * execute of a callable runs it to completion
165 >     * unconfigurableScheduledExecutorService(null) throws NPE
166       */
167 <    public void testExecuteCallable() {
167 >    public void testunconfigurableScheduledExecutorServiceNPE() {
168          try {
169 <            Executor e = new DirectExecutor();
170 <            Future<String> future = Executors.execute(e, new StringTask());
171 <            String result = future.get();
237 <            assertSame(TEST_STRING, result);
238 <        }
239 <        catch (ExecutionException ex) {
240 <            unexpectedException();
241 <        }
242 <        catch (InterruptedException ex) {
243 <            unexpectedException();
244 <        }
169 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
170 >            shouldThrow();
171 >        } catch (NullPointerException success) {}
172      }
173  
247
174      /**
175 <     * execute of a privileged action runs it to completion
175 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
176       */
177 <    public void testExecutePrivilegedAction() {
178 <        Policy savedPolicy = Policy.getPolicy();
179 <        AdjustablePolicy policy = new AdjustablePolicy();
180 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
181 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
182 <        Policy.setPolicy(policy);
183 <        try {
184 <            Executor e = new DirectExecutor();
185 <            Future future = Executors.execute(e, new PrivilegedAction() {
186 <                    public Object run() {
187 <                        return TEST_STRING;
188 <                    }});
189 <
190 <            Object result = future.get();
191 <            assertSame(TEST_STRING, result);
192 <        }
193 <        catch (ExecutionException ex) {
268 <            unexpectedException();
269 <        }
270 <        catch (InterruptedException ex) {
271 <            unexpectedException();
272 <        }
273 <        finally {
274 <            Policy.setPolicy(savedPolicy);
177 >    public void testNewSingleThreadScheduledExecutor() throws Exception {
178 >        ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
179 >        try {
180 >            final CountDownLatch done = new CountDownLatch(1);
181 >            final Runnable task = new CheckedRunnable() {
182 >                public void realRun() {
183 >                    done.countDown();
184 >                }};
185 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
186 >                                  SHORT_DELAY_MS, MILLISECONDS);
187 >            assertFalse(f.isDone());
188 >            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
189 >            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
190 >            assertSame(Boolean.TRUE, f.get());
191 >            assertTrue(f.isDone());
192 >        } finally {
193 >            joinPool(p);
194          }
195      }
196  
197      /**
198 <     * execute of a privileged exception action runs it to completion
198 >     * a newScheduledThreadPool successfully runs delayed task
199       */
200 <    public void testExecutePrivilegedExceptionAction() {
201 <        Policy savedPolicy = Policy.getPolicy();
202 <        AdjustablePolicy policy = new AdjustablePolicy();
203 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
204 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
205 <        Policy.setPolicy(policy);
206 <        try {
207 <            Executor e = new DirectExecutor();
208 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
209 <                    public Object run() {
210 <                        return TEST_STRING;
211 <                    }});
212 <
213 <            Object result = future.get();
214 <            assertSame(TEST_STRING, result);
215 <        }
216 <        catch (ExecutionException ex) {
298 <            unexpectedException();
299 <        }
300 <        catch (InterruptedException ex) {
301 <            unexpectedException();
302 <        }
303 <        finally {
304 <            Policy.setPolicy(savedPolicy);
200 >    public void testnewScheduledThreadPool() throws Exception {
201 >        ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
202 >        try {
203 >            final CountDownLatch done = new CountDownLatch(1);
204 >            final Runnable task = new CheckedRunnable() {
205 >                public void realRun() {
206 >                    done.countDown();
207 >                }};
208 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
209 >                                  SHORT_DELAY_MS, MILLISECONDS);
210 >            assertFalse(f.isDone());
211 >            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
212 >            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
213 >            assertSame(Boolean.TRUE, f.get());
214 >            assertTrue(f.isDone());
215 >        } finally {
216 >            joinPool(p);
217          }
218      }
219  
220      /**
221 <     * execute of a failed privileged exception action reports exception
221 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
222       */
223 <    public void testExecuteFailedPrivilegedExceptionAction() {
224 <        Policy savedPolicy = Policy.getPolicy();
225 <        AdjustablePolicy policy = new AdjustablePolicy();
226 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
227 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
228 <        Policy.setPolicy(policy);
229 <        try {
230 <            Executor e = new DirectExecutor();
231 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
232 <                    public Object run() throws Exception {
233 <                        throw new IndexOutOfBoundsException();
234 <                    }});
235 <
236 <            Object result = future.get();
237 <            shouldThrow();
238 <        }
239 <        catch (ExecutionException success) {
240 <        }
241 <        catch (InterruptedException ex) {
330 <            unexpectedException();
331 <        }
332 <        finally {
333 <            Policy.setPolicy(savedPolicy);
223 >    public void testunconfigurableScheduledExecutorService() throws Exception {
224 >        ScheduledExecutorService p =
225 >            Executors.unconfigurableScheduledExecutorService
226 >            (Executors.newScheduledThreadPool(2));
227 >        try {
228 >            final CountDownLatch done = new CountDownLatch(1);
229 >            final Runnable task = new CheckedRunnable() {
230 >                public void realRun() {
231 >                    done.countDown();
232 >                }};
233 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
234 >                                  SHORT_DELAY_MS, MILLISECONDS);
235 >            assertFalse(f.isDone());
236 >            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
237 >            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
238 >            assertSame(Boolean.TRUE, f.get());
239 >            assertTrue(f.isDone());
240 >        } finally {
241 >            joinPool(p);
242          }
243      }
244  
245      /**
246 <     * invoke of a collable runs it to completion
246 >     * Future.get on submitted tasks will time out if they compute too long.
247       */
248 <    public void testInvokeCallable() {
249 <        try {
250 <            Executor e = new DirectExecutor();
251 <            String result = Executors.invoke(e, new StringTask());
252 <
253 <            assertSame(TEST_STRING, result);
254 <        }
255 <        catch (ExecutionException ex) {
256 <            unexpectedException();
257 <        }
258 <        catch (InterruptedException ex) {
259 <            unexpectedException();
260 <        }
248 >    public void testTimedCallable() throws Exception {
249 >        final ExecutorService[] executors = {
250 >            Executors.newSingleThreadExecutor(),
251 >            Executors.newCachedThreadPool(),
252 >            Executors.newFixedThreadPool(2),
253 >            Executors.newScheduledThreadPool(2),
254 >        };
255 >
256 >        final Runnable sleeper = new CheckedInterruptedRunnable() {
257 >            public void realRun() throws InterruptedException {
258 >                delay(LONG_DELAY_MS);
259 >            }};
260 >
261 >        List<Thread> threads = new ArrayList<Thread>();
262 >        for (final ExecutorService executor : executors) {
263 >            threads.add(newStartedThread(new CheckedRunnable() {
264 >                public void realRun() {
265 >                    long startTime = System.nanoTime();
266 >                    Future future = executor.submit(sleeper);
267 >                    assertFutureTimesOut(future);
268 >                }}));
269 >        }
270 >        for (Thread thread : threads)
271 >            awaitTermination(thread);
272 >        for (ExecutorService executor : executors)
273 >            joinPool(executor);
274      }
275  
276      /**
277 <     * execute with null executor throws NPE
277 >     * ThreadPoolExecutor using defaultThreadFactory has
278 >     * specified group, priority, daemon status, and name
279       */
280 <    public void testNullExecuteRunnable() {
280 >    public void testDefaultThreadFactory() throws Exception {
281 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
282 >        Runnable r = new CheckedRunnable() {
283 >            public void realRun() {
284 >                try {
285 >                    Thread current = Thread.currentThread();
286 >                    assertTrue(!current.isDaemon());
287 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
288 >                    ThreadGroup g = current.getThreadGroup();
289 >                    SecurityManager s = System.getSecurityManager();
290 >                    if (s != null)
291 >                        assertTrue(g == s.getThreadGroup());
292 >                    else
293 >                        assertTrue(g == egroup);
294 >                    String name = current.getName();
295 >                    assertTrue(name.endsWith("thread-1"));
296 >                } catch (SecurityException ok) {
297 >                    // Also pass if not allowed to change setting
298 >                }
299 >            }};
300 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
301 >
302 >        e.execute(r);
303          try {
304 <            TrackedShortRunnable task = new TrackedShortRunnable();
305 <            assertFalse(task.done);
362 <            Future<?> future = Executors.execute(null, task);
363 <            shouldThrow();
364 <        }
365 <        catch (NullPointerException success) {
304 >            e.shutdown();
305 >        } catch (SecurityException ok) {
306          }
307 <        catch (Exception ex) {
308 <            unexpectedException();
307 >
308 >        try {
309 >            delay(SHORT_DELAY_MS);
310 >        } finally {
311 >            joinPool(e);
312          }
313      }
314  
315      /**
316 <     * execute with a null runnable throws NPE
316 >     * ThreadPoolExecutor using privilegedThreadFactory has
317 >     * specified group, priority, daemon status, name,
318 >     * access control context and context class loader
319       */
320 <    public void testExecuteNullRunnable() {
321 <        try {
322 <            Executor e = new DirectExecutor();
323 <            TrackedShortRunnable task = null;
324 <            Future<?> future = Executors.execute(e, task);
325 <            shouldThrow();
320 >    public void testPrivilegedThreadFactory() throws Exception {
321 >        Runnable r = new CheckedRunnable() {
322 >            public void realRun() throws Exception {
323 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
324 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
325 >                final AccessControlContext thisacc = AccessController.getContext();
326 >                Runnable r = new CheckedRunnable() {
327 >                    public void realRun() {
328 >                        Thread current = Thread.currentThread();
329 >                        assertTrue(!current.isDaemon());
330 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
331 >                        ThreadGroup g = current.getThreadGroup();
332 >                        SecurityManager s = System.getSecurityManager();
333 >                        if (s != null)
334 >                            assertTrue(g == s.getThreadGroup());
335 >                        else
336 >                            assertTrue(g == egroup);
337 >                        String name = current.getName();
338 >                        assertTrue(name.endsWith("thread-1"));
339 >                        assertSame(thisccl, current.getContextClassLoader());
340 >                        assertEquals(thisacc, AccessController.getContext());
341 >                    }};
342 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
343 >                e.execute(r);
344 >                e.shutdown();
345 >                delay(SHORT_DELAY_MS);
346 >                joinPool(e);
347 >            }};
348 >
349 >        runWithPermissions(r,
350 >                           new RuntimePermission("getClassLoader"),
351 >                           new RuntimePermission("setContextClassLoader"),
352 >                           new RuntimePermission("modifyThread"));
353 >    }
354 >
355 >    boolean haveCCLPermissions() {
356 >        SecurityManager sm = System.getSecurityManager();
357 >        if (sm != null) {
358 >            try {
359 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
360 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
361 >            } catch (AccessControlException e) {
362 >                return false;
363 >            }
364          }
365 <        catch (NullPointerException success) {
365 >        return true;
366 >    }
367 >
368 >    void checkCCL() {
369 >        SecurityManager sm = System.getSecurityManager();
370 >        if (sm != null) {
371 >            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
372 >            sm.checkPermission(new RuntimePermission("getClassLoader"));
373          }
374 <        catch (Exception ex) {
375 <            unexpectedException();
374 >    }
375 >
376 >    class CheckCCL implements Callable<Object> {
377 >        public Object call() {
378 >            checkCCL();
379 >            return null;
380          }
381      }
382  
383      /**
384 <     * invoke of a null runnable throws NPE
384 >     * Without class loader permissions, creating
385 >     * privilegedCallableUsingCurrentClassLoader throws ACE
386       */
387 <    public void testInvokeNullRunnable() {
388 <        try {
389 <            Executor e = new DirectExecutor();
390 <            TrackedShortRunnable task = null;
391 <            Executors.invoke(e, task);
392 <            shouldThrow();
393 <        }
394 <        catch (NullPointerException success) {
395 <        }
396 <        catch (Exception ex) {
397 <            unexpectedException();
398 <        }
387 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
388 >        Runnable r = new CheckedRunnable() {
389 >            public void realRun() throws Exception {
390 >                if (System.getSecurityManager() == null)
391 >                    return;
392 >                try {
393 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
394 >                    shouldThrow();
395 >                } catch (AccessControlException success) {}
396 >            }};
397 >
398 >        runWithoutPermissions(r);
399      }
400  
401      /**
402 <     * execute of a null callable throws NPE
402 >     * With class loader permissions, calling
403 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
404       */
405 <    public void testExecuteNullCallable() {
406 <        try {
407 <            Executor e = new DirectExecutor();
408 <            StringTask t = null;
409 <            Future<String> future = Executors.execute(e, t);
410 <            shouldThrow();
411 <        }
412 <        catch (NullPointerException success) {
413 <        }
414 <        catch (Exception ex) {
415 <            unexpectedException();
420 <        }
405 >    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
406 >        Runnable r = new CheckedRunnable() {
407 >            public void realRun() throws Exception {
408 >                Executors.privilegedCallableUsingCurrentClassLoader
409 >                    (new NoOpCallable())
410 >                    .call();
411 >            }};
412 >
413 >        runWithPermissions(r,
414 >                           new RuntimePermission("getClassLoader"),
415 >                           new RuntimePermission("setContextClassLoader"));
416      }
417  
418      /**
419 <     * invoke of a null callable throws NPE
419 >     * Without permissions, calling privilegedCallable throws ACE
420       */
421 <    public void testInvokeNullCallable() {
422 <        try {
423 <            Executor e = new DirectExecutor();
424 <            StringTask t = null;
425 <            String result = Executors.invoke(e, t);
426 <            shouldThrow();
427 <        }
428 <        catch (NullPointerException success) {
429 <        }
430 <        catch (Exception ex) {
431 <            unexpectedException();
432 <        }
421 >    public void testprivilegedCallableWithNoPrivs() throws Exception {
422 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
423 >        Executors.privilegedCallable(new CheckCCL());
424 >
425 >        Runnable r = new CheckedRunnable() {
426 >            public void realRun() throws Exception {
427 >                if (System.getSecurityManager() == null)
428 >                    return;
429 >                Callable task = Executors.privilegedCallable(new CheckCCL());
430 >                try {
431 >                    task.call();
432 >                    shouldThrow();
433 >                } catch (AccessControlException success) {}
434 >            }};
435 >
436 >        runWithoutPermissions(r);
437 >
438 >        // It seems rather difficult to test that the
439 >        // AccessControlContext of the privilegedCallable is used
440 >        // instead of its caller.  Below is a failed attempt to do
441 >        // that, which does not work because the AccessController
442 >        // cannot capture the internal state of the current Policy.
443 >        // It would be much more work to differentiate based on,
444 >        // e.g. CodeSource.
445 >
446 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
447 > //         final Callable[] task = new Callable[1];
448 >
449 > //         runWithPermissions
450 > //             (new CheckedRunnable() {
451 > //                 public void realRun() {
452 > //                     if (System.getSecurityManager() == null)
453 > //                         return;
454 > //                     noprivAcc[0] = AccessController.getContext();
455 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
456 > //                     try {
457 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
458 > //                                                           public Void run() {
459 > //                                                               checkCCL();
460 > //                                                               return null;
461 > //                                                           }}, noprivAcc[0]);
462 > //                         shouldThrow();
463 > //                     } catch (AccessControlException success) {}
464 > //                 }});
465 >
466 > //         runWithPermissions
467 > //             (new CheckedRunnable() {
468 > //                 public void realRun() throws Exception {
469 > //                     if (System.getSecurityManager() == null)
470 > //                         return;
471 > //                     // Verify that we have an underprivileged ACC
472 > //                     try {
473 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
474 > //                                                           public Void run() {
475 > //                                                               checkCCL();
476 > //                                                               return null;
477 > //                                                           }}, noprivAcc[0]);
478 > //                         shouldThrow();
479 > //                     } catch (AccessControlException success) {}
480 >
481 > //                     try {
482 > //                         task[0].call();
483 > //                         shouldThrow();
484 > //                     } catch (AccessControlException success) {}
485 > //                 }},
486 > //              new RuntimePermission("getClassLoader"),
487 > //              new RuntimePermission("setContextClassLoader"));
488      }
489  
490      /**
491 <     *  execute(Executor, Runnable) throws RejectedExecutionException
442 <     *  if saturated.
491 >     * With permissions, calling privilegedCallable succeeds
492       */
493 <    public void testExecute1() {
494 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
495 <        try {
496 <            
497 <            for(int i = 0; i < 5; ++i){
498 <                Executors.execute(p, new MediumRunnable());
499 <            }
500 <            shouldThrow();
501 <        } catch(RejectedExecutionException success){}
453 <        joinPool(p);
493 >    public void testprivilegedCallableWithPrivs() throws Exception {
494 >        Runnable r = new CheckedRunnable() {
495 >            public void realRun() throws Exception {
496 >                Executors.privilegedCallable(new CheckCCL()).call();
497 >            }};
498 >
499 >        runWithPermissions(r,
500 >                           new RuntimePermission("getClassLoader"),
501 >                           new RuntimePermission("setContextClassLoader"));
502      }
503  
504      /**
505 <     *  execute(Executor, Callable)throws RejectedExecutionException
458 <     *  if saturated.
505 >     * callable(Runnable) returns null when called
506       */
507 <    public void testExecute2() {
508 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
509 <        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);
507 >    public void testCallable1() throws Exception {
508 >        Callable c = Executors.callable(new NoOpRunnable());
509 >        assertNull(c.call());
510      }
511  
471
512      /**
513 <     *  invoke(Executor, Runnable) throws InterruptedException if
474 <     *  caller interrupted.
513 >     * callable(Runnable, result) returns result when called
514       */
515 <    public void testInterruptedInvoke() {
516 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
517 <        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);
515 >    public void testCallable2() throws Exception {
516 >        Callable c = Executors.callable(new NoOpRunnable(), one);
517 >        assertSame(one, c.call());
518      }
519  
520      /**
521 <     *  invoke(Executor, Runnable) throws ExecutionException if
509 <     *  runnable throws exception.
521 >     * callable(PrivilegedAction) returns its result when called
522       */
523 <    public void testInvoke3() {
524 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
525 <        try {
526 <            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);
523 >    public void testCallable3() throws Exception {
524 >        Callable c = Executors.callable(new PrivilegedAction() {
525 >                public Object run() { return one; }});
526 >        assertSame(one, c.call());
527      }
528  
532
533
529      /**
530 <     *  invoke(Executor, Callable) throws InterruptedException if
536 <     *  callable throws exception
530 >     * callable(PrivilegedExceptionAction) returns its result when called
531       */
532 <    public void testInvoke5() {
533 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
534 <        
535 <        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);
532 >    public void testCallable4() throws Exception {
533 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
534 >                public Object run() { return one; }});
535 >        assertSame(one, c.call());
536      }
537  
538      /**
539 <     *  invoke(Executor, Callable) will throw ExecutionException
576 <     *  if callable throws exception
539 >     * callable(null Runnable) throws NPE
540       */
541 <    public void testInvoke6() {
579 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
580 <
541 >    public void testCallableNPE1() {
542          try {
543 <            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 <            
543 >            Callable c = Executors.callable((Runnable) null);
544              shouldThrow();
545 <        }
595 <        catch(ExecutionException success){
596 <        } catch(Exception e) {
597 <            unexpectedException();
598 <        }
599 <        joinPool(p);
545 >        } catch (NullPointerException success) {}
546      }
547  
602
603
548      /**
549 <     *  timeouts from execute will time out if they compute too long.
549 >     * callable(null, result) throws NPE
550       */
551 <    public void testTimedCallable() {
608 <        int N = 10000;
609 <        ExecutorService executor = Executors.newSingleThreadExecutor();
610 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
551 >    public void testCallableNPE2() {
552          try {
553 <            long startTime = System.currentTimeMillis();
554 <            
555 <            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 <        }
553 >            Callable c = Executors.callable((Runnable) null, one);
554 >            shouldThrow();
555 >        } catch (NullPointerException success) {}
556      }
557  
644    
558      /**
559 <     * ThreadPoolExecutor using defaultThreadFactory has
647 <     * specified group, priority, daemon status, and name
559 >     * callable(null PrivilegedAction) throws NPE
560       */
561 <    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();
561 >    public void testCallableNPE3() {
562          try {
563 <            Thread.sleep(SHORT_DELAY_MS);
564 <        } catch (Exception eX) {
565 <            unexpectedException();
674 <        } finally {
675 <            joinPool(e);
676 <        }
563 >            Callable c = Executors.callable((PrivilegedAction) null);
564 >            shouldThrow();
565 >        } catch (NullPointerException success) {}
566      }
567  
568      /**
569 <     * ThreadPoolExecutor using privilegedThreadFactory has
681 <     * specified group, priority, daemon status, name,
682 <     * access control context and context class loader
569 >     * callable(null PrivilegedExceptionAction) throws NPE
570       */
571 <    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();
571 >    public void testCallableNPE4() {
572          try {
573 <            Thread.sleep(SHORT_DELAY_MS);
574 <        } catch (Exception ex) {
575 <            unexpectedException();
719 <        } finally {
720 <            joinPool(e);
721 <        }
722 <
573 >            Callable c = Executors.callable((PrivilegedExceptionAction) null);
574 >            shouldThrow();
575 >        } catch (NullPointerException success) {}
576      }
577  
578   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines