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.4 by dl, Sat Sep 20 18:20:07 2003 UTC vs.
Revision 1.44 by jsr166, Sun Feb 22 19:16:12 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;
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{
27 <  
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 >        junit.textui.TestRunner.run(suite());
32      }
33      public static Test suite() {
34 <        return new TestSuite(ExecutorsTest.class);
34 >        return new TestSuite(ExecutorsTest.class);
35      }
36  
37 <    private static final String TEST_STRING = "a test string";
37 >    /**
38 >     * A newCachedThreadPool can execute runnables
39 >     */
40 >    public void testNewCachedThreadPool1() {
41 >        ExecutorService e = Executors.newCachedThreadPool();
42 >        e.execute(new NoOpRunnable());
43 >        e.execute(new NoOpRunnable());
44 >        e.execute(new NoOpRunnable());
45 >        joinPool(e);
46 >    }
47  
48 <    private static class MyTask implements Runnable {
49 <        public void run() { completed = true; }
50 <        public boolean isCompleted() { return completed; }
51 <        public void reset() { completed = false; }
52 <        private boolean completed = false;
48 >    /**
49 >     * A newCachedThreadPool with given ThreadFactory can execute runnables
50 >     */
51 >    public void testNewCachedThreadPool2() {
52 >        ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
53 >        e.execute(new NoOpRunnable());
54 >        e.execute(new NoOpRunnable());
55 >        e.execute(new NoOpRunnable());
56 >        joinPool(e);
57      }
58  
59 <    private static class StringTask implements Callable<String> {
60 <        public String call() { return TEST_STRING; }
59 >    /**
60 >     * A newCachedThreadPool with null ThreadFactory throws NPE
61 >     */
62 >    public void testNewCachedThreadPool3() {
63 >        try {
64 >            ExecutorService e = Executors.newCachedThreadPool(null);
65 >            shouldThrow();
66 >        } catch (NullPointerException success) {}
67      }
68  
69 <    static class DirectExecutor implements Executor {
70 <        public void execute(Runnable r) {
71 <            r.run();
72 <        }
69 >    /**
70 >     * A new SingleThreadExecutor can execute runnables
71 >     */
72 >    public void testNewSingleThreadExecutor1() {
73 >        ExecutorService e = Executors.newSingleThreadExecutor();
74 >        e.execute(new NoOpRunnable());
75 >        e.execute(new NoOpRunnable());
76 >        e.execute(new NoOpRunnable());
77 >        joinPool(e);
78      }
79  
80 <    static class TimedCallable<T> implements Callable<T> {
81 <        private final Executor exec;
82 <        private final Callable<T> func;
83 <        private final long msecs;
84 <        
85 <        TimedCallable(Executor exec, Callable<T> func, long msecs) {
86 <            this.exec = exec;
87 <            this.func = func;
88 <            this.msecs = msecs;
51 <        }
52 <        
53 <        public T call() throws Exception {
54 <            Future<T> ftask = Executors.execute(exec, func);
55 <            try {
56 <                return ftask.get(msecs, TimeUnit.MILLISECONDS);
57 <            } finally {
58 <                ftask.cancel(true);
59 <            }
60 <        }
80 >    /**
81 >     * A new SingleThreadExecutor with given ThreadFactory can execute runnables
82 >     */
83 >    public void testNewSingleThreadExecutor2() {
84 >        ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
85 >        e.execute(new NoOpRunnable());
86 >        e.execute(new NoOpRunnable());
87 >        e.execute(new NoOpRunnable());
88 >        joinPool(e);
89      }
90  
91 +    /**
92 +     * A new SingleThreadExecutor with null ThreadFactory throws NPE
93 +     */
94 +    public void testNewSingleThreadExecutor3() {
95 +        try {
96 +            ExecutorService e = Executors.newSingleThreadExecutor(null);
97 +            shouldThrow();
98 +        } catch (NullPointerException success) {}
99 +    }
100  
101 <    private static class Fib implements Callable<BigInteger> {
102 <        private final BigInteger n;
103 <        Fib(long n) {
104 <            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
105 <            this.n = BigInteger.valueOf(n);
106 <        }
107 <        public BigInteger call() {
108 <            BigInteger f1 = BigInteger.ONE;
109 <            BigInteger f2 = f1;
110 <            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
111 <                BigInteger t = f1.add(f2);
75 <                f1 = f2;
76 <                f2 = t;
77 <            }
78 <            return f1;
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 <    };
113 >    }
114  
115 +    /**
116 +     * A new newFixedThreadPool can execute runnables
117 +     */
118 +    public void testNewFixedThreadPool1() {
119 +        ExecutorService e = Executors.newFixedThreadPool(2);
120 +        e.execute(new NoOpRunnable());
121 +        e.execute(new NoOpRunnable());
122 +        e.execute(new NoOpRunnable());
123 +        joinPool(e);
124 +    }
125  
126 +    /**
127 +     * A new newFixedThreadPool with given ThreadFactory can execute runnables
128 +     */
129 +    public void testNewFixedThreadPool2() {
130 +        ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
131 +        e.execute(new NoOpRunnable());
132 +        e.execute(new NoOpRunnable());
133 +        e.execute(new NoOpRunnable());
134 +        joinPool(e);
135 +    }
136  
137      /**
138 <     *   execute(Executor, Runnable) will throw
86 <     *  RejectedExecutionException Attempting to execute a runnable on
87 <     *  a full ThreadPool will cause such an exception here, up to 5
88 <     *  runnables are attempted on a pool capable on handling one
89 <     *  until it throws an exception
138 >     * A new newFixedThreadPool with null ThreadFactory throws NPE
139       */
140 <    public void testExecute1() {
92 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
140 >    public void testNewFixedThreadPool3() {
141          try {
142 <            
95 <            for(int i = 0; i < 5; ++i){
96 <                Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
97 <            }
142 >            ExecutorService e = Executors.newFixedThreadPool(2, null);
143              shouldThrow();
144 <        } catch(RejectedExecutionException success){}
100 <        joinPool(p);
144 >        } catch (NullPointerException success) {}
145      }
146  
147      /**
148 <     *   execute(Executor, Callable) will throw
105 <     *  RejectedExecutionException Attempting to execute a callable on
106 <     *  a full ThreadPool will cause such an exception here, up to 5
107 <     *  runnables are attempted on a pool capable on handling one
108 <     *  until it throws an exception
148 >     * A new newFixedThreadPool with 0 threads throws IAE
149       */
150 <    public void testExecute2() {
111 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
150 >    public void testNewFixedThreadPool4() {
151          try {
152 <            for(int i = 0; i < 5; ++i) {
114 <                Executors.execute(p, new SmallCallable());
115 <            }
152 >            ExecutorService e = Executors.newFixedThreadPool(0);
153              shouldThrow();
154 <        } catch(RejectedExecutionException e){}
118 <        joinPool(p);
154 >        } catch (IllegalArgumentException success) {}
155      }
156  
157 +    /**
158 +     * An unconfigurable newFixedThreadPool can execute runnables
159 +     */
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(Executor, Runnable) throws InterruptedException
170 <     *  A single use of invoke starts that will wait long enough
171 <     *  for the invoking thread to be interrupted
126 <     */
127 <    public void testInvoke2() {
128 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
129 <        Thread t = new Thread(new Runnable() {
130 <                public void run() {
131 <                    try {
132 <                        Executors.invoke(p,new Runnable() {
133 <                                public void run() {
134 <                                    try {
135 <                                        Thread.sleep(MEDIUM_DELAY_MS);
136 <                                        shouldThrow();
137 <                                    } catch(InterruptedException e){
138 <                                    }
139 <                                }
140 <                            });
141 <                    } catch(InterruptedException success){
142 <                    } catch(Exception e) {
143 <                        unexpectedException();
144 <                    }
145 <                    
146 <                }
147 <            });
169 >     * unconfigurableExecutorService(null) throws NPE
170 >     */
171 >    public void testUnconfigurableExecutorServiceNPE() {
172          try {
173 <            t.start();
174 <            Thread.sleep(SHORT_DELAY_MS);
175 <            t.interrupt();
152 <        } catch(Exception e){
153 <            unexpectedException();
154 <        }
155 <        joinPool(p);
173 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
174 >            shouldThrow();
175 >        } catch (NullPointerException success) {}
176      }
177  
178      /**
179 <     *   invoke(Executor, Runnable) will throw
180 <     *  ExecutionException An ExecutionException occurs when the
181 <     *  underlying Runnable throws an exception, here the
182 <     *  DivideByZeroException will cause an ExecutionException
183 <     */
164 <    public void testInvoke3() {
165 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
166 <        try {
167 <            Runnable r = new Runnable() {
168 <                    public void run() {
169 <                        int i = 5/0;
170 <                    }
171 <                };
172 <            
173 <            for(int i =0; i < 5; i++){
174 <                Executors.invoke(p,r);
175 <            }
176 <            
179 >     * unconfigurableScheduledExecutorService(null) throws NPE
180 >     */
181 >    public void testUnconfigurableScheduledExecutorServiceNPE() {
182 >        try {
183 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
184              shouldThrow();
185 <        } catch(ExecutionException success){
179 <        } catch(Exception e){
180 <            unexpectedException();
181 <        }
182 <        joinPool(p);
185 >        } catch (NullPointerException success) {}
186      }
187  
188 <
188 >    /**
189 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
190 >     */
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 >     * a newScheduledThreadPool successfully runs delayed task
216 >     */
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 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
242 >     */
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 >     * Future.get on submitted tasks will time out if they compute too long.
270 >     */
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 >        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 <     *   invoke(Executor, Callable) throws
300 <     *  InterruptedException A single use of invoke starts that will
190 <     *  wait long enough for the invoking thread to be interrupted
299 >     * ThreadPoolExecutor using defaultThreadFactory has
300 >     * specified group, priority, daemon status, and name
301       */
302 <    public void testInvoke5() {
303 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
304 <        
305 <        final Callable c = new Callable() {
306 <                public Object call() {
307 <                    try {
308 <                        Executors.invoke(p, new SmallCallable());
309 <                        shouldThrow();
310 <                    } catch(InterruptedException e){}
311 <                    catch(RejectedExecutionException e2){}
312 <                    catch(ExecutionException e3){}
313 <                    return Boolean.TRUE;
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 <            };
322 >                done.countDown();
323 >            }};
324 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
325 >
326 >        e.execute(r);
327 >        await(done);
328 >
329 >        try {
330 >            e.shutdown();
331 >        } catch (SecurityException ok) {
332 >        }
333 >
334 >        joinPool(e);
335 >    }
336  
337 +    /**
338 +     * ThreadPoolExecutor using privilegedThreadFactory has
339 +     * specified group, priority, daemon status, name,
340 +     * access control context and context class loader
341 +     */
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 +        return true;
390 +    }
391  
392 <        
393 <        Thread t = new Thread(new Runnable() {
394 <                public void run() {
395 <                    try {
396 <                        c.call();
397 <                    } catch(Exception e){}
398 <                }
399 <          });
400 <        try {
401 <            t.start();
402 <            Thread.sleep(SHORT_DELAY_MS);
403 <            t.interrupt();
220 <            t.join();
221 <        } catch(InterruptedException e){
222 <            unexpectedException();
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 >    }
399 >
400 >    class CheckCCL implements Callable<Object> {
401 >        public Object call() {
402 >            checkCCL();
403 >            return null;
404          }
224        
225        joinPool(p);
405      }
406  
407      /**
408 <     *   invoke(Executor, Callable) will throw ExecutionException
409 <     *  An ExecutionException occurs when the underlying Runnable throws
231 <     *  an exception, here the DivideByZeroException will cause an ExecutionException
408 >     * Without class loader permissions, creating
409 >     * privilegedCallableUsingCurrentClassLoader throws ACE
410       */
411 <    public void testInvoke6() {
412 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
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 <        try {
237 <            Callable c = new Callable() {
238 <                    public Object call() {
239 <                        int i = 5/0;
240 <                        return Boolean.TRUE;
241 <                    }
242 <                };
243 <            
244 <            for(int i =0; i < 5; i++){
245 <                Executors.invoke(p,c);
246 <            }
247 <            
248 <            shouldThrow();
249 <        } catch(RejectedExecutionException e){}
250 <        catch(InterruptedException e2){}
251 <        catch(ExecutionException e3){}
252 <        joinPool(p);
422 >        runWithoutPermissions(r);
423      }
424  
425      /**
426 <     *
426 >     * With class loader permissions, calling
427 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
428       */
429 <    public void testExecuteRunnable () {
430 <        try {
431 <            Executor e = new DirectExecutor();
432 <            MyTask task = new MyTask();
433 <            assertFalse(task.isCompleted());
434 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
435 <            String result = future.get();
436 <            assertTrue(task.isCompleted());
437 <            assertSame(TEST_STRING, result);
438 <        }
439 <        catch (ExecutionException ex) {
269 <            unexpectedException();
270 <        }
271 <        catch (InterruptedException ex) {
272 <            unexpectedException();
273 <        }
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 <     *
443 >     * Without permissions, calling privilegedCallable throws ACE
444       */
445 <    public void testInvokeRunnable () {
446 <        try {
447 <            Executor e = new DirectExecutor();
448 <            MyTask task = new MyTask();
449 <            assertFalse(task.isCompleted());
450 <            Executors.invoke(e, task);
451 <            assertTrue(task.isCompleted());
452 <        }
453 <        catch (ExecutionException ex) {
454 <            unexpectedException();
455 <        }
456 <        catch (InterruptedException ex) {
457 <            unexpectedException();
458 <        }
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 <     *
515 >     * With permissions, calling privilegedCallable succeeds
516       */
517 <    public void testExecuteCallable () {
518 <        try {
519 <            Executor e = new DirectExecutor();
520 <            Future<String> future = Executors.execute(e, new StringTask());
521 <            String result = future.get();
522 <            assertSame(TEST_STRING, result);
523 <        }
524 <        catch (ExecutionException ex) {
525 <            unexpectedException();
307 <        }
308 <        catch (InterruptedException ex) {
309 <            unexpectedException();
310 <        }
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 <     *
529 >     * callable(Runnable) returns null when called
530       */
531 <    public void testInvokeCallable () {
532 <        try {
533 <            Executor e = new DirectExecutor();
534 <            String result = Executors.invoke(e, new StringTask());
531 >    public void testCallable1() throws Exception {
532 >        Callable c = Executors.callable(new NoOpRunnable());
533 >        assertNull(c.call());
534 >    }
535  
536 <            assertSame(TEST_STRING, result);
537 <        }
538 <        catch (ExecutionException ex) {
539 <            unexpectedException();
540 <        }
541 <        catch (InterruptedException ex) {
327 <            unexpectedException();
328 <        }
536 >    /**
537 >     * callable(Runnable, result) returns result when called
538 >     */
539 >    public void testCallable2() throws Exception {
540 >        Callable c = Executors.callable(new NoOpRunnable(), one);
541 >        assertSame(one, c.call());
542      }
543  
544      /**
545 <     *  timeouts from execute will time out if they compute too long.
545 >     * callable(PrivilegedAction) returns its result when called
546       */
547 <    public void testTimedCallable() {
548 <        int N = 10000;
549 <        ExecutorService executor = Executors.newSingleThreadExecutor();
550 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
551 <        try {
552 <            long startTime = System.currentTimeMillis();
553 <            
554 <            long i = 0;
555 <            while (tasks.size() < N) {
556 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
557 <                i += 10;
558 <            }
559 <            
560 <            int iters = 0;
561 <            BigInteger sum = BigInteger.ZERO;
562 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
563 <                try {
564 <                    ++iters;
565 <                    sum = sum.add(it.next().call());
566 <                }
567 <                catch (TimeoutException success) {
568 <                    assertTrue(iters > 0);
569 <                    return;
357 <                }
358 <                catch (Exception e) {
359 <                    unexpectedException();
360 <                }
361 <            }
362 <            // if by chance we didn't ever time out, total time must be small
363 <            long elapsed = System.currentTimeMillis() - startTime;
364 <            assertTrue(elapsed < N);
365 <        }
366 <        finally {
367 <            joinPool(executor);
368 <        }
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 >
553 >    /**
554 >     * callable(PrivilegedExceptionAction) returns its result when called
555 >     */
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 >     * callable(null Runnable) throws NPE
564 >     */
565 >    public void testCallableNPE1() {
566 >        try {
567 >            Callable c = Executors.callable((Runnable) null);
568 >            shouldThrow();
569 >        } catch (NullPointerException success) {}
570      }
571  
572 <    
572 >    /**
573 >     * callable(null, result) throws NPE
574 >     */
575 >    public void testCallableNPE2() {
576 >        try {
577 >            Callable c = Executors.callable((Runnable) null, one);
578 >            shouldThrow();
579 >        } catch (NullPointerException success) {}
580 >    }
581  
582 +    /**
583 +     * callable(null PrivilegedAction) throws NPE
584 +     */
585 +    public void testCallableNPE3() {
586 +        try {
587 +            Callable c = Executors.callable((PrivilegedAction) null);
588 +            shouldThrow();
589 +        } catch (NullPointerException success) {}
590 +    }
591 +
592 +    /**
593 +     * callable(null PrivilegedExceptionAction) throws NPE
594 +     */
595 +    public void testCallableNPE4() {
596 +        try {
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