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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines