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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines