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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines