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.28 by jsr166, Wed Dec 2 19:17:01 2009 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
2 > * Written by Doug Lea with assistance from members of JCP JSR-166
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/licenses/publicdomain
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9  
10   import junit.framework.*;
11   import java.util.*;
12   import java.util.concurrent.*;
13 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
14   import java.math.BigInteger;
15 + import java.security.*;
16  
17 < public class ExecutorsTest extends JSR166TestCase{
15 <  
17 > public class ExecutorsTest extends JSR166TestCase {
18      public static void main(String[] args) {
19 <        junit.textui.TestRunner.run (suite());  
19 >        junit.textui.TestRunner.run (suite());
20      }
21      public static Test suite() {
22 <        return new TestSuite(ExecutorsTest.class);
22 >        return new TestSuite(ExecutorsTest.class);
23      }
24  
25 <    private static final String TEST_STRING = "a test string";
25 >    /**
26 >     * A newCachedThreadPool can execute runnables
27 >     */
28 >    public void testNewCachedThreadPool1() {
29 >        ExecutorService e = Executors.newCachedThreadPool();
30 >        e.execute(new NoOpRunnable());
31 >        e.execute(new NoOpRunnable());
32 >        e.execute(new NoOpRunnable());
33 >        joinPool(e);
34 >    }
35  
36 <    private static class MyTask implements Runnable {
37 <        public void run() { completed = true; }
38 <        public boolean isCompleted() { return completed; }
39 <        public void reset() { completed = false; }
40 <        private boolean completed = false;
36 >    /**
37 >     * A newCachedThreadPool with given ThreadFactory can execute runnables
38 >     */
39 >    public void testNewCachedThreadPool2() {
40 >        ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
41 >        e.execute(new NoOpRunnable());
42 >        e.execute(new NoOpRunnable());
43 >        e.execute(new NoOpRunnable());
44 >        joinPool(e);
45      }
46  
47 <    private static class StringTask implements Callable<String> {
48 <        public String call() { return TEST_STRING; }
47 >    /**
48 >     * A newCachedThreadPool with null ThreadFactory throws NPE
49 >     */
50 >    public void testNewCachedThreadPool3() {
51 >        try {
52 >            ExecutorService e = Executors.newCachedThreadPool(null);
53 >            shouldThrow();
54 >        } catch (NullPointerException success) {}
55      }
56  
57 <    static class DirectExecutor implements Executor {
58 <        public void execute(Runnable r) {
59 <            r.run();
60 <        }
57 >
58 >    /**
59 >     * A new SingleThreadExecutor can execute runnables
60 >     */
61 >    public void testNewSingleThreadExecutor1() {
62 >        ExecutorService e = Executors.newSingleThreadExecutor();
63 >        e.execute(new NoOpRunnable());
64 >        e.execute(new NoOpRunnable());
65 >        e.execute(new NoOpRunnable());
66 >        joinPool(e);
67      }
68  
69 <    static class TimedCallable<T> implements Callable<T> {
70 <        private final Executor exec;
71 <        private final Callable<T> func;
72 <        private final long msecs;
73 <        
74 <        TimedCallable(Executor exec, Callable<T> func, long msecs) {
75 <            this.exec = exec;
76 <            this.func = func;
77 <            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 <        }
69 >    /**
70 >     * A new SingleThreadExecutor with given ThreadFactory can execute runnables
71 >     */
72 >    public void testNewSingleThreadExecutor2() {
73 >        ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
74 >        e.execute(new NoOpRunnable());
75 >        e.execute(new NoOpRunnable());
76 >        e.execute(new NoOpRunnable());
77 >        joinPool(e);
78      }
79  
80 +    /**
81 +     * A new SingleThreadExecutor with null ThreadFactory throws NPE
82 +     */
83 +    public void testNewSingleThreadExecutor3() {
84 +        try {
85 +            ExecutorService e = Executors.newSingleThreadExecutor(null);
86 +            shouldThrow();
87 +        } catch (NullPointerException success) {}
88 +    }
89  
90 <    private static class Fib implements Callable<BigInteger> {
91 <        private final BigInteger n;
92 <        Fib(long n) {
93 <            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
94 <            this.n = BigInteger.valueOf(n);
95 <        }
96 <        public BigInteger call() {
97 <            BigInteger f1 = BigInteger.ONE;
98 <            BigInteger f2 = f1;
99 <            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
100 <                BigInteger t = f1.add(f2);
75 <                f1 = f2;
76 <                f2 = t;
77 <            }
78 <            return f1;
90 >    /**
91 >     * A new SingleThreadExecutor cannot be casted to concrete implementation
92 >     */
93 >    public void testCastNewSingleThreadExecutor() {
94 >        ExecutorService e = Executors.newSingleThreadExecutor();
95 >        try {
96 >            ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
97 >            shouldThrow();
98 >        } catch (ClassCastException success) {
99 >        } finally {
100 >            joinPool(e);
101          }
102 <    };
102 >    }
103 >
104  
105 +    /**
106 +     * A new newFixedThreadPool can execute runnables
107 +     */
108 +    public void testNewFixedThreadPool1() {
109 +        ExecutorService e = Executors.newFixedThreadPool(2);
110 +        e.execute(new NoOpRunnable());
111 +        e.execute(new NoOpRunnable());
112 +        e.execute(new NoOpRunnable());
113 +        joinPool(e);
114 +    }
115  
116 +    /**
117 +     * A new newFixedThreadPool with given ThreadFactory can execute runnables
118 +     */
119 +    public void testNewFixedThreadPool2() {
120 +        ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
121 +        e.execute(new NoOpRunnable());
122 +        e.execute(new NoOpRunnable());
123 +        e.execute(new NoOpRunnable());
124 +        joinPool(e);
125 +    }
126  
127      /**
128 <     *   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
128 >     * A new newFixedThreadPool with null ThreadFactory throws NPE
129       */
130 <    public void testExecute1() {
92 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
130 >    public void testNewFixedThreadPool3() {
131          try {
132 <            
95 <            for(int i = 0; i < 5; ++i){
96 <                Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
97 <            }
132 >            ExecutorService e = Executors.newFixedThreadPool(2, null);
133              shouldThrow();
134 <        } catch(RejectedExecutionException success){}
100 <        joinPool(p);
134 >        } catch (NullPointerException success) {}
135      }
136  
137      /**
138 <     *   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
138 >     * A new newFixedThreadPool with 0 threads throws IAE
139       */
140 <    public void testExecute2() {
111 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
140 >    public void testNewFixedThreadPool4() {
141          try {
142 <            for(int i = 0; i < 5; ++i) {
114 <                Executors.execute(p, new SmallCallable());
115 <            }
142 >            ExecutorService e = Executors.newFixedThreadPool(0);
143              shouldThrow();
144 <        } catch(RejectedExecutionException e){}
118 <        joinPool(p);
144 >        } catch (IllegalArgumentException success) {}
145      }
146  
147  
148      /**
149 <     *   invoke(Executor, Runnable) throws InterruptedException
124 <     *  A single use of invoke starts that will wait long enough
125 <     *  for the invoking thread to be interrupted
149 >     * An unconfigurable newFixedThreadPool can execute runnables
150       */
151 <    public void testInvoke2() {
152 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
153 <        Thread t = new Thread(new Runnable() {
154 <                public void run() {
155 <                    try {
156 <                        Executors.invoke(p,new Runnable() {
157 <                                public void run() {
158 <                                    try {
159 <                                        Thread.sleep(MEDIUM_DELAY_MS);
160 <                                        shouldThrow();
161 <                                    } catch(InterruptedException e){
162 <                                    }
139 <                                }
140 <                            });
141 <                    } catch(InterruptedException success){
142 <                    } catch(Exception e) {
143 <                        unexpectedException();
144 <                    }
145 <                    
146 <                }
147 <            });
151 >    public void testunconfigurableExecutorService() {
152 >        ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
153 >        e.execute(new NoOpRunnable());
154 >        e.execute(new NoOpRunnable());
155 >        e.execute(new NoOpRunnable());
156 >        joinPool(e);
157 >    }
158 >
159 >    /**
160 >     * unconfigurableExecutorService(null) throws NPE
161 >     */
162 >    public void testunconfigurableExecutorServiceNPE() {
163          try {
164 <            t.start();
165 <            Thread.sleep(SHORT_DELAY_MS);
166 <            t.interrupt();
152 <        } catch(Exception e){
153 <            unexpectedException();
154 <        }
155 <        joinPool(p);
164 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
165 >            shouldThrow();
166 >        } catch (NullPointerException success) {}
167      }
168  
169      /**
170 <     *   invoke(Executor, Runnable) will throw
160 <     *  ExecutionException An ExecutionException occurs when the
161 <     *  underlying Runnable throws an exception, here the
162 <     *  DivideByZeroException will cause an ExecutionException
170 >     * unconfigurableScheduledExecutorService(null) throws NPE
171       */
172 <    public void testInvoke3() {
165 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
172 >    public void testunconfigurableScheduledExecutorServiceNPE() {
173          try {
174 <            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 <            
174 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
175              shouldThrow();
176 <        } catch(ExecutionException success){
177 <        } catch(Exception e){
178 <            unexpectedException();
179 <        }
180 <        joinPool(p);
176 >        } catch (NullPointerException success) {}
177 >    }
178 >
179 >
180 >    /**
181 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
182 >     */
183 >    public void testNewSingleThreadScheduledExecutor() throws Exception {
184 >        TrackedCallable callable = new TrackedCallable();
185 >        ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
186 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
187 >        assertFalse(callable.done);
188 >        Thread.sleep(MEDIUM_DELAY_MS);
189 >        assertTrue(callable.done);
190 >        assertEquals(Boolean.TRUE, f.get());
191 >        joinPool(p1);
192 >    }
193 >
194 >    /**
195 >     * a newScheduledThreadPool successfully runs delayed task
196 >     */
197 >    public void testnewScheduledThreadPool() throws Exception {
198 >        TrackedCallable callable = new TrackedCallable();
199 >        ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
200 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
201 >        assertFalse(callable.done);
202 >        Thread.sleep(MEDIUM_DELAY_MS);
203 >        assertTrue(callable.done);
204 >        assertEquals(Boolean.TRUE, f.get());
205 >        joinPool(p1);
206 >    }
207 >
208 >    /**
209 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
210 >     */
211 >    public void testunconfigurableScheduledExecutorService() throws Exception {
212 >        TrackedCallable callable = new TrackedCallable();
213 >        ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
214 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
215 >        assertFalse(callable.done);
216 >        Thread.sleep(MEDIUM_DELAY_MS);
217 >        assertTrue(callable.done);
218 >        assertEquals(Boolean.TRUE, f.get());
219 >        joinPool(p1);
220      }
221  
222 +    /**
223 +     *  Future.get on submitted tasks will time out if they compute too long.
224 +     */
225 +    public void testTimedCallable() throws Exception {
226 +        final Runnable sleeper =
227 +            new RunnableShouldThrow(InterruptedException.class) {
228 +                public void realRun() throws InterruptedException {
229 +                    Thread.sleep(LONG_DELAY_MS);
230 +                }};
231 +        for (ExecutorService executor :
232 +                 new ExecutorService[] {
233 +                     Executors.newSingleThreadExecutor(),
234 +                     Executors.newCachedThreadPool(),
235 +                     Executors.newFixedThreadPool(2),
236 +                     Executors.newScheduledThreadPool(2),
237 +                 }) {
238 +            try {
239 +                Future future = executor.submit(sleeper);
240 +                try {
241 +                    future.get(SHORT_DELAY_MS, MILLISECONDS);
242 +                    shouldThrow();
243 +                } catch (TimeoutException success) {
244 +                } finally {
245 +                    future.cancel(true);
246 +                }
247 +            }
248 +            finally {
249 +                joinPool(executor);
250 +            }
251 +        }
252 +    }
253  
254  
255      /**
256 <     *   invoke(Executor, Callable) throws
257 <     *  InterruptedException A single use of invoke starts that will
190 <     *  wait long enough for the invoking thread to be interrupted
256 >     * ThreadPoolExecutor using defaultThreadFactory has
257 >     * specified group, priority, daemon status, and name
258       */
259 <    public void testInvoke5() {
260 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
261 <        
262 <        final Callable c = new Callable() {
196 <                public Object call() {
259 >    public void testDefaultThreadFactory() throws Exception {
260 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
261 >        Runnable r = new Runnable() {
262 >                public void run() {
263                      try {
264 <                        Executors.invoke(p, new SmallCallable());
265 <                        shouldThrow();
266 <                    } catch(InterruptedException e){}
267 <                    catch(RejectedExecutionException e2){}
268 <                    catch(ExecutionException e3){}
269 <                    return Boolean.TRUE;
264 >                        Thread current = Thread.currentThread();
265 >                        threadAssertTrue(!current.isDaemon());
266 >                        threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
267 >                        ThreadGroup g = current.getThreadGroup();
268 >                        SecurityManager s = System.getSecurityManager();
269 >                        if (s != null)
270 >                            threadAssertTrue(g == s.getThreadGroup());
271 >                        else
272 >                            threadAssertTrue(g == egroup);
273 >                        String name = current.getName();
274 >                        threadAssertTrue(name.endsWith("thread-1"));
275 >                    } catch (SecurityException ok) {
276 >                        // Also pass if not allowed to change setting
277 >                    }
278                  }
279              };
280 +        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
281  
282 +        e.execute(r);
283 +        try {
284 +            e.shutdown();
285 +        } catch (SecurityException ok) {
286 +        }
287  
288 <        
289 <        Thread t = new Thread(new Runnable() {
288 >        try {
289 >            Thread.sleep(SHORT_DELAY_MS);
290 >        } finally {
291 >            joinPool(e);
292 >        }
293 >    }
294 >
295 >    /**
296 >     * ThreadPoolExecutor using privilegedThreadFactory has
297 >     * specified group, priority, daemon status, name,
298 >     * access control context and context class loader
299 >     */
300 >    public void testPrivilegedThreadFactory() throws Exception {
301 >        Policy savedPolicy = null;
302 >        try {
303 >            savedPolicy = Policy.getPolicy();
304 >            AdjustablePolicy policy = new AdjustablePolicy();
305 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
306 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
307 >            Policy.setPolicy(policy);
308 >        } catch (AccessControlException ok) {
309 >            return;
310 >        }
311 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
312 >        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
313 >        final AccessControlContext thisacc = AccessController.getContext();
314 >        Runnable r = new Runnable() {
315                  public void run() {
316                      try {
317 <                        c.call();
318 <                    } catch(Exception e){}
317 >                        Thread current = Thread.currentThread();
318 >                        threadAssertTrue(!current.isDaemon());
319 >                        threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
320 >                        ThreadGroup g = current.getThreadGroup();
321 >                        SecurityManager s = System.getSecurityManager();
322 >                        if (s != null)
323 >                            threadAssertTrue(g == s.getThreadGroup());
324 >                        else
325 >                            threadAssertTrue(g == egroup);
326 >                        String name = current.getName();
327 >                        threadAssertTrue(name.endsWith("thread-1"));
328 >                        threadAssertTrue(thisccl == current.getContextClassLoader());
329 >                        threadAssertTrue(thisacc.equals(AccessController.getContext()));
330 >                    } catch (SecurityException ok) {
331 >                        // Also pass if not allowed to change settings
332 >                    }
333                  }
334 <          });
334 >            };
335 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
336 >
337 >        Policy.setPolicy(savedPolicy);
338 >        e.execute(r);
339 >        try {
340 >            e.shutdown();
341 >        } catch (SecurityException ok) {
342 >        }
343          try {
217            t.start();
344              Thread.sleep(SHORT_DELAY_MS);
345 <            t.interrupt();
346 <            t.join();
347 <        } catch(InterruptedException e){
348 <            unexpectedException();
345 >        } finally {
346 >            joinPool(e);
347 >        }
348 >    }
349 >
350 >    void checkCCL() {
351 >        SecurityManager sm = System.getSecurityManager();
352 >        if (sm != null) {
353 >            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
354 >            sm.checkPermission(new RuntimePermission("getClassLoader"));
355          }
224        
225        joinPool(p);
356      }
357  
358 +    class CheckCCL implements Callable<Object> {
359 +        public Object call() {
360 +            checkCCL();
361 +            return null;
362 +        }
363 +    }
364 +
365 +
366      /**
367 <     *   invoke(Executor, Callable) will throw ExecutionException
368 <     *  An ExecutionException occurs when the underlying Runnable throws
231 <     *  an exception, here the DivideByZeroException will cause an ExecutionException
367 >     * Without class loader permissions, creating
368 >     * privilegedCallableUsingCurrentClassLoader throws ACE
369       */
370 <    public void testInvoke6() {
371 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
370 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
371 >        Policy savedPolicy = null;
372 >        try {
373 >            savedPolicy = Policy.getPolicy();
374 >            AdjustablePolicy policy = new AdjustablePolicy();
375 >            Policy.setPolicy(policy);
376 >        } catch (AccessControlException ok) {
377 >            return;
378 >        }
379  
380 +        // Check if program still has too many permissions to run test
381          try {
382 <            Callable c = new Callable() {
383 <                    public Object call() {
384 <                        int i = 5/0;
385 <                        return Boolean.TRUE;
386 <                    }
387 <                };
388 <            
389 <            for(int i =0; i < 5; i++){
390 <                Executors.invoke(p,c);
246 <            }
247 <            
382 >            checkCCL();
383 >            // too many privileges to test; so return
384 >            Policy.setPolicy(savedPolicy);
385 >            return;
386 >        } catch (AccessControlException ok) {
387 >        }
388 >
389 >        try {
390 >            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
391              shouldThrow();
392 <        } catch(RejectedExecutionException e){}
393 <        catch(InterruptedException e2){}
394 <        catch(ExecutionException e3){}
395 <        joinPool(p);
392 >        } catch (AccessControlException success) {
393 >        } finally {
394 >            Policy.setPolicy(savedPolicy);
395 >        }
396      }
397  
398      /**
399 <     *
399 >     * With class loader permissions, calling
400 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
401       */
402 <    public void testExecuteRunnable () {
402 >    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
403 >        Policy savedPolicy = null;
404          try {
405 <            Executor e = new DirectExecutor();
406 <            MyTask task = new MyTask();
407 <            assertFalse(task.isCompleted());
408 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
409 <            String result = future.get();
410 <            assertTrue(task.isCompleted());
411 <            assertSame(TEST_STRING, result);
405 >            savedPolicy = Policy.getPolicy();
406 >            AdjustablePolicy policy = new AdjustablePolicy();
407 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
408 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
409 >            Policy.setPolicy(policy);
410 >        } catch (AccessControlException ok) {
411 >            return;
412          }
413 <        catch (ExecutionException ex) {
414 <            unexpectedException();
413 >
414 >        try {
415 >            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
416 >            task.call();
417          }
418 <        catch (InterruptedException ex) {
419 <            unexpectedException();
418 >        finally {
419 >            Policy.setPolicy(savedPolicy);
420          }
421      }
422  
423      /**
424 <     *
424 >     * Without permissions, calling privilegedCallable throws ACE
425       */
426 <    public void testInvokeRunnable () {
426 >    public void testprivilegedCallableWithNoPrivs() throws Exception {
427 >        Callable task;
428 >        Policy savedPolicy = null;
429 >        AdjustablePolicy policy = null;
430 >        AccessControlContext noprivAcc = null;
431          try {
432 <            Executor e = new DirectExecutor();
433 <            MyTask task = new MyTask();
434 <            assertFalse(task.isCompleted());
435 <            Executors.invoke(e, task);
436 <            assertTrue(task.isCompleted());
432 >            savedPolicy = Policy.getPolicy();
433 >            policy = new AdjustablePolicy();
434 >            Policy.setPolicy(policy);
435 >            noprivAcc = AccessController.getContext();
436 >            task = Executors.privilegedCallable(new CheckCCL());
437 >            Policy.setPolicy(savedPolicy);
438 >        } catch (AccessControlException ok) {
439 >            return; // program has too few permissions to set up test
440          }
441 <        catch (ExecutionException ex) {
442 <            unexpectedException();
443 <        }
444 <        catch (InterruptedException ex) {
445 <            unexpectedException();
441 >
442 >        // Make sure that program doesn't have too many permissions
443 >        try {
444 >            AccessController.doPrivileged(new PrivilegedAction() {
445 >                    public Object run() {
446 >                        checkCCL();
447 >                        return null;
448 >                    }}, noprivAcc);
449 >            // too many permssions; skip test
450 >            return;
451 >        } catch (AccessControlException ok) {
452          }
453 +
454 +        try {
455 +            task.call();
456 +            shouldThrow();
457 +        } catch (AccessControlException success) {}
458      }
459  
460      /**
461 <     *
461 >     * With permissions, calling privilegedCallable succeeds
462       */
463 <    public void testExecuteCallable () {
463 >    public void testprivilegedCallableWithPrivs() throws Exception {
464 >        Policy savedPolicy = null;
465          try {
466 <            Executor e = new DirectExecutor();
467 <            Future<String> future = Executors.execute(e, new StringTask());
468 <            String result = future.get();
469 <            assertSame(TEST_STRING, result);
470 <        }
471 <        catch (ExecutionException ex) {
472 <            unexpectedException();
466 >            savedPolicy = Policy.getPolicy();
467 >            AdjustablePolicy policy = new AdjustablePolicy();
468 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
469 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
470 >            Policy.setPolicy(policy);
471 >        } catch (AccessControlException ok) {
472 >            return;
473          }
474 <        catch (InterruptedException ex) {
475 <            unexpectedException();
474 >
475 >        Callable task = Executors.privilegedCallable(new CheckCCL());
476 >        try {
477 >            task.call();
478 >        } finally {
479 >            Policy.setPolicy(savedPolicy);
480          }
481      }
482  
483      /**
484 <     *
484 >     * callable(Runnable) returns null when called
485 >     */
486 >    public void testCallable1() throws Exception {
487 >        Callable c = Executors.callable(new NoOpRunnable());
488 >        assertNull(c.call());
489 >    }
490 >
491 >    /**
492 >     * callable(Runnable, result) returns result when called
493 >     */
494 >    public void testCallable2() throws Exception {
495 >        Callable c = Executors.callable(new NoOpRunnable(), one);
496 >        assertSame(one, c.call());
497 >    }
498 >
499 >    /**
500 >     * callable(PrivilegedAction) returns its result when called
501 >     */
502 >    public void testCallable3() throws Exception {
503 >        Callable c = Executors.callable(new PrivilegedAction() {
504 >                public Object run() { return one; }});
505 >        assertSame(one, c.call());
506 >    }
507 >
508 >    /**
509 >     * callable(PrivilegedExceptionAction) returns its result when called
510 >     */
511 >    public void testCallable4() throws Exception {
512 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
513 >                public Object run() { return one; }});
514 >        assertSame(one, c.call());
515 >    }
516 >
517 >
518 >    /**
519 >     * callable(null Runnable) throws NPE
520       */
521 <    public void testInvokeCallable () {
521 >    public void testCallableNPE1() {
522          try {
523 <            Executor e = new DirectExecutor();
524 <            String result = Executors.invoke(e, new StringTask());
523 >            Callable c = Executors.callable((Runnable) null);
524 >            shouldThrow();
525 >        } catch (NullPointerException success) {}
526 >    }
527  
528 <            assertSame(TEST_STRING, result);
529 <        }
530 <        catch (ExecutionException ex) {
531 <            unexpectedException();
532 <        }
533 <        catch (InterruptedException ex) {
534 <            unexpectedException();
535 <        }
528 >    /**
529 >     * callable(null, result) throws NPE
530 >     */
531 >    public void testCallableNPE2() {
532 >        try {
533 >            Callable c = Executors.callable((Runnable) null, one);
534 >            shouldThrow();
535 >        } catch (NullPointerException success) {}
536      }
537  
538      /**
539 <     *  timeouts from execute will time out if they compute too long.
539 >     * callable(null PrivilegedAction) throws NPE
540       */
541 <    public void testTimedCallable() {
335 <        int N = 10000;
336 <        ExecutorService executor = Executors.newSingleThreadExecutor();
337 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
541 >    public void testCallableNPE3() {
542          try {
543 <            long startTime = System.currentTimeMillis();
544 <            
545 <            long i = 0;
342 <            while (tasks.size() < N) {
343 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
344 <                i += 10;
345 <            }
346 <            
347 <            int iters = 0;
348 <            BigInteger sum = BigInteger.ZERO;
349 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
350 <                try {
351 <                    ++iters;
352 <                    sum = sum.add(it.next().call());
353 <                }
354 <                catch (TimeoutException success) {
355 <                    assertTrue(iters > 0);
356 <                    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 <        }
543 >            Callable c = Executors.callable((PrivilegedAction) null);
544 >            shouldThrow();
545 >        } catch (NullPointerException success) {}
546      }
547  
548 <    
548 >    /**
549 >     * callable(null PrivilegedExceptionAction) throws NPE
550 >     */
551 >    public void testCallableNPE4() {
552 >        try {
553 >            Callable c = Executors.callable((PrivilegedExceptionAction) null);
554 >            shouldThrow();
555 >        } catch (NullPointerException success) {}
556 >    }
557  
558  
559   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines