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.3 by dl, Sun Sep 14 20:42:40 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      }
19    
20
21      public static Test suite() {
22 <        return new TestSuite(ExecutorsTest.class);
22 >        return new TestSuite(ExecutorsTest.class);
23      }
24  
25      /**
26 <     *   execute(Executor, Runnable) will throw
27 <     *  RejectedExecutionException Attempting to execute a runnable on
28 <     *  a full ThreadPool will cause such an exception here, up to 5
29 <     *  runnables are attempted on a pool capable on handling one
30 <     *  until it throws an exception
31 <     */
32 <    public void testExecute1(){
33 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
34 <        try{
35 <            
36 <            for(int i = 0; i < 5; ++i){
37 <                Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
38 <            }
39 <            fail("should throw");
40 <        } catch(RejectedExecutionException success){}
41 <        joinPool(p);
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      /**
37 <     *   execute(Executor, Callable) will throw
38 <     *  RejectedExecutionException Attempting to execute a callable on
39 <     *  a full ThreadPool will cause such an exception here, up to 5
40 <     *  runnables are attempted on a pool capable on handling one
41 <     *  until it throws an exception
42 <     */
43 <    public void testExecute2(){
44 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
45 <        try{
46 <            for(int i = 0; i < 5; ++i) {
47 <                Executors.execute(p, new SmallCallable());
48 <            }
49 <            fail("should throw");
50 <        }catch(RejectedExecutionException e){}
51 <        joinPool(p);
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 >    /**
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  
58      /**
59 <     *   invoke(Executor, Runnable) throws InterruptedException
60 <     *  A single use of invoke starts that will wait long enough
61 <     *  for the invoking thread to be interrupted
62 <     */
63 <    public void testInvoke2(){
64 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
65 <        Thread t = new Thread(new Runnable() {
66 <                public void run(){
72 <                    try{
73 <                        Executors.invoke(p,new Runnable(){
74 <                                public void run(){
75 <                                    try{
76 <                                        Thread.sleep(MEDIUM_DELAY_MS);
77 <                                        fail("should throw");
78 <                                    }catch(InterruptedException e){
79 <                                    }
80 <                                }
81 <                            });
82 <                    } catch(InterruptedException success){
83 <                    } catch(Exception e) {
84 <                        fail("unexpected exception");
85 <                    }
86 <                    
87 <                }
88 <            });
89 <        try{
90 <            t.start();
91 <            Thread.sleep(SHORT_DELAY_MS);
92 <            t.interrupt();
93 <        }catch(Exception e){
94 <            fail("unexpected exception");
95 <        }
96 <        joinPool(p);
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      /**
70 <     *   invoke(Executor, Runnable) will throw
101 <     *  ExecutionException An ExecutionException occurs when the
102 <     *  underlying Runnable throws an exception, here the
103 <     *  DivideByZeroException will cause an ExecutionException
70 >     * A new SingleThreadExecutor with given ThreadFactory can execute runnables
71       */
72 <    public void testInvoke3(){
73 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
74 <        try{
75 <            Runnable r = new Runnable(){
76 <                    public void run(){
77 <                        int i = 5/0;
78 <                    }
79 <                };
80 <            
81 <            for(int i =0; i < 5; i++){
82 <                Executors.invoke(p,r);
83 <            }
84 <            
85 <            fail("should throw");
86 <        } catch(ExecutionException success){
87 <        } catch(Exception e){
121 <            fail("should throw EE");
122 <        }
123 <        joinPool(p);
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 +    /**
91 +     * A new SingleThreadExecutor cannot be casted to concrete implementation
92 +     */
93 +    public void testCastNewSingleThreadExecutor() {
94 +        ExecutorService e = Executors.newSingleThreadExecutor();
95 +        try {
96 +            ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
97 +            shouldThrow();
98 +        } catch (ClassCastException success) {
99 +        } finally {
100 +            joinPool(e);
101 +        }
102 +    }
103  
104  
105      /**
106 <     *   invoke(Executor, Callable) throws
107 <     *  InterruptedException A single use of invoke starts that will
108 <     *  wait long enough for the invoking thread to be interrupted
109 <     */
110 <    public void testInvoke5(){
111 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
112 <        
113 <        final Callable c = new Callable(){
114 <                public Object call(){
138 <                    try{
139 <                        Executors.invoke(p, new SmallCallable());
140 <                        fail("should throw");
141 <                    }catch(InterruptedException e){}
142 <                    catch(RejectedExecutionException e2){}
143 <                    catch(ExecutionException e3){}
144 <                    return Boolean.TRUE;
145 <                }
146 <            };
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 <        Thread t = new Thread(new Runnable(){
129 <                public void run(){
130 <                    try{
131 <                        c.call();
132 <                    }catch(Exception e){}
133 <                }
134 <          });
135 <        try{
136 <            t.start();
137 <            Thread.sleep(SHORT_DELAY_MS);
138 <            t.interrupt();
139 <            t.join();
140 <        }catch(InterruptedException e){
141 <            fail("unexpected exception");
142 <        }
143 <        
144 <        joinPool(p);
127 >    /**
128 >     * A new newFixedThreadPool with null ThreadFactory throws NPE
129 >     */
130 >    public void testNewFixedThreadPool3() {
131 >        try {
132 >            ExecutorService e = Executors.newFixedThreadPool(2, null);
133 >            shouldThrow();
134 >        } catch (NullPointerException success) {}
135 >    }
136 >
137 >    /**
138 >     * A new newFixedThreadPool with 0 threads throws IAE
139 >     */
140 >    public void testNewFixedThreadPool4() {
141 >        try {
142 >            ExecutorService e = Executors.newFixedThreadPool(0);
143 >            shouldThrow();
144 >        } catch (IllegalArgumentException success) {}
145      }
146  
147 +
148      /**
149 <     *   invoke(Executor, Callable) will throw ExecutionException
171 <     *  An ExecutionException occurs when the underlying Runnable throws
172 <     *  an exception, here the DivideByZeroException will cause an ExecutionException
149 >     * An unconfigurable newFixedThreadPool can execute runnables
150       */
151 <    public void testInvoke6(){
152 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
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 <        try{
160 <            Callable c = new Callable(){
161 <                    public Object call(){
162 <                        int i = 5/0;
163 <                        return Boolean.TRUE;
164 <                    }
165 <                };
166 <            
185 <            for(int i =0; i < 5; i++){
186 <                Executors.invoke(p,c);
187 <            }
188 <            
189 <            fail("should throw");
190 <        }catch(RejectedExecutionException e){}
191 <        catch(InterruptedException e2){}
192 <        catch(ExecutionException e3){}
193 <        joinPool(p);
159 >    /**
160 >     * unconfigurableExecutorService(null) throws NPE
161 >     */
162 >    public void testunconfigurableExecutorServiceNPE() {
163 >        try {
164 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
165 >            shouldThrow();
166 >        } catch (NullPointerException success) {}
167      }
168  
169 <    public void testExecuteRunnable () {
169 >    /**
170 >     * unconfigurableScheduledExecutorService(null) throws NPE
171 >     */
172 >    public void testunconfigurableScheduledExecutorServiceNPE() {
173          try {
174 <            Executor e = new DirectExecutor();
175 <            Task task = new Task();
174 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
175 >            shouldThrow();
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 <            assertFalse("task should not be complete", task.isCompleted());
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 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
209 <            String result = future.get();
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 <            assertTrue("task should be complete", task.isCompleted());
223 <            assertSame("should return test string", TEST_STRING, result);
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 <        catch (ExecutionException ex) {
253 <            fail("Unexpected exception");
252 >    }
253 >
254 >
255 >    /**
256 >     * ThreadPoolExecutor using defaultThreadFactory has
257 >     * specified group, priority, daemon status, and name
258 >     */
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 >                        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 <        catch (InterruptedException ex) {
288 <            fail("Unexpected exception");
287 >
288 >        try {
289 >            Thread.sleep(SHORT_DELAY_MS);
290 >        } finally {
291 >            joinPool(e);
292          }
293      }
294  
295 <    public void testInvokeRunnable () {
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 <            Executor e = new DirectExecutor();
304 <            Task task = new Task();
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 >                        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 >            };
335 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
336  
337 <            assertFalse("task should not be complete", task.isCompleted());
337 >        Policy.setPolicy(savedPolicy);
338 >        e.execute(r);
339 >        try {
340 >            e.shutdown();
341 >        } catch (SecurityException ok) {
342 >        }
343 >        try {
344 >            Thread.sleep(SHORT_DELAY_MS);
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 >        }
356 >    }
357 >
358 >    class CheckCCL implements Callable<Object> {
359 >        public Object call() {
360 >            checkCCL();
361 >            return null;
362 >        }
363 >    }
364  
224            Executors.invoke(e, task);
365  
366 <            assertTrue("task should be complete", task.isCompleted());
366 >    /**
367 >     * Without class loader permissions, creating
368 >     * privilegedCallableUsingCurrentClassLoader throws ACE
369 >     */
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 <        catch (ExecutionException ex) {
380 <            fail("Unexpected exception");
379 >
380 >        // Check if program still has too many permissions to run test
381 >        try {
382 >            checkCCL();
383 >            // too many privileges to test; so return
384 >            Policy.setPolicy(savedPolicy);
385 >            return;
386 >        } catch (AccessControlException ok) {
387          }
388 <        catch (InterruptedException ex) {
389 <            fail("Unexpected exception");
388 >
389 >        try {
390 >            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
391 >            shouldThrow();
392 >        } catch (AccessControlException success) {
393 >        } finally {
394 >            Policy.setPolicy(savedPolicy);
395          }
396      }
397  
398 <    public void testExecuteCallable () {
398 >    /**
399 >     * With class loader permissions, calling
400 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
401 >     */
402 >    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
403 >        Policy savedPolicy = null;
404          try {
405 <            Executor e = new DirectExecutor();
406 <            Future<String> future = Executors.execute(e, new StringTask());
407 <            String result = future.get();
408 <
409 <            assertSame("should return test string", 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 <            fail("Unexpected exception");
413 >
414 >        try {
415 >            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
416 >            task.call();
417          }
418 <        catch (InterruptedException ex) {
419 <            fail("Unexpected exception");
418 >        finally {
419 >            Policy.setPolicy(savedPolicy);
420          }
421      }
422  
423 <    public void testInvokeCallable () {
423 >    /**
424 >     * Without permissions, calling privilegedCallable throws ACE
425 >     */
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 <            String result = Executors.invoke(e, new StringTask());
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  
442 <            assertSame("should return test string", TEST_STRING, result);
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 <        catch (ExecutionException ex) {
454 <            fail("Unexpected exception" );
453 >
454 >        try {
455 >            task.call();
456 >            shouldThrow();
457 >        } catch (AccessControlException success) {}
458 >    }
459 >
460 >    /**
461 >     * With permissions, calling privilegedCallable succeeds
462 >     */
463 >    public void testprivilegedCallableWithPrivs() throws Exception {
464 >        Policy savedPolicy = null;
465 >        try {
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 <            fail("Unexpected exception");
474 >
475 >        Callable task = Executors.privilegedCallable(new CheckCCL());
476 >        try {
477 >            task.call();
478 >        } finally {
479 >            Policy.setPolicy(savedPolicy);
480          }
481      }
482  
483 <    private static final String TEST_STRING = "a test string";
484 <
485 <    private static class Task implements Runnable {
486 <        public void run() { completed = true; }
487 <        public boolean isCompleted() { return completed; }
488 <        public void reset() { completed = false; }
273 <        private boolean completed = false;
483 >    /**
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 <    private static class StringTask implements Callable<String> {
492 <        public String call() { return TEST_STRING; }
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 <    static class DirectExecutor implements Executor {
500 <        public void execute(Runnable r) {
501 <            r.run();
502 <        }
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 <     * Check that timeouts from execute will time out if they compute
288 <     * too long.
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 <    public void testTimedCallable() {
519 <        int N = 10000;
520 <        ExecutorService executor = Executors.newSingleThreadExecutor();
521 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
518 >    /**
519 >     * callable(null Runnable) throws NPE
520 >     */
521 >    public void testCallableNPE1() {
522          try {
523 <            long startTime = System.currentTimeMillis();
524 <            
525 <            long i = 0;
299 <            while (tasks.size() < N) {
300 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
301 <                i += 10;
302 <            }
303 <            
304 <            int iters = 0;
305 <            BigInteger sum = BigInteger.ZERO;
306 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
307 <                try {
308 <                    ++iters;
309 <                    sum = sum.add(it.next().call());
310 <                }
311 <                catch (TimeoutException success) {
312 <                    assertTrue(iters > 0);
313 <                    return;
314 <                }
315 <                catch (Exception e) {
316 <                    fail("unexpected exception: " + e);
317 <                }
318 <            }
319 <            // if by chance we didn't ever time out, total time must be small
320 <            long elapsed = System.currentTimeMillis() - startTime;
321 <            assertTrue(elapsed < N);
322 <        }
323 <        finally {
324 <            joinPool(executor);
325 <        }
523 >            Callable c = Executors.callable((Runnable) null);
524 >            shouldThrow();
525 >        } catch (NullPointerException success) {}
526      }
527  
528 <    
529 <    static class TimedCallable<T> implements Callable<T> {
530 <        private final Executor exec;
531 <        private final Callable<T> func;
532 <        private final long msecs;
533 <        
534 <        TimedCallable(Executor exec, Callable<T> func, long msecs) {
535 <            this.exec = exec;
336 <            this.func = func;
337 <            this.msecs = msecs;
338 <        }
339 <        
340 <        public T call() throws Exception {
341 <            Future<T> ftask = Executors.execute(exec, func);
342 <            try {
343 <                return ftask.get(msecs, TimeUnit.MILLISECONDS);
344 <            } finally {
345 <                ftask.cancel(true);
346 <            }
347 <        }
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 +     * callable(null PrivilegedAction) throws NPE
540 +     */
541 +    public void testCallableNPE3() {
542 +        try {
543 +            Callable c = Executors.callable((PrivilegedAction) null);
544 +            shouldThrow();
545 +        } catch (NullPointerException success) {}
546 +    }
547  
548 <    private static class Fib implements Callable<BigInteger> {
549 <        private final BigInteger n;
550 <        Fib(long n) {
551 <            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
552 <            this.n = BigInteger.valueOf(n);
553 <        }
554 <        public BigInteger call() {
555 <            BigInteger f1 = BigInteger.ONE;
556 <            BigInteger f2 = f1;
360 <            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
361 <                BigInteger t = f1.add(f2);
362 <                f1 = f2;
363 <                f2 = t;
364 <            }
365 <            return f1;
366 <        }
367 <    };
368 <
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