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.2 by dl, Sun Sep 7 20:39:11 2003 UTC vs.
Revision 1.12 by dl, Sat Dec 27 19:26:43 2003 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 TestCase{
15 <    
16 > public class ExecutorsTest extends JSR166TestCase{
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 <    private static long SHORT_DELAY_MS = 100;
25 <    private static long MEDIUM_DELAY_MS = 1000;
26 <    private static long LONG_DELAY_MS = 10000;
27 <
28 <    class SleepRun implements Runnable {
29 <        public void run() {
30 <            try{
31 <                Thread.sleep(MEDIUM_DELAY_MS);
32 <            } catch(InterruptedException e){
33 <                fail("unexpected exception");
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          }
43      }
38    
44  
45 <    class SleepCall implements Callable {
46 <        public Object call(){
47 <            try{
48 <                Thread.sleep(MEDIUM_DELAY_MS);
49 <            }catch(InterruptedException e){
50 <                fail("unexpected exception");
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 <            return Boolean.TRUE;
60 >            return f1;
61          }
62 <    }
50 <
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 +        e.shutdown();
73 +    }
74  
75      /**
76 <     *  Test to verify execute(Executor, Runnable) will throw
55 <     *  RejectedExecutionException Attempting to execute a runnable on
56 <     *  a full ThreadPool will cause such an exception here, up to 5
57 <     *  runnables are attempted on a pool capable on handling one
58 <     *  until it throws an exception
76 >     * A newCachedThreadPool with given ThreadFactory can execute runnables
77       */
78 <    public void testExecute1(){
79 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
80 <        try{
81 <            
82 <            for(int i = 0; i < 5; ++i){
83 <                Executors.execute(p, new SleepRun(), Boolean.TRUE);
66 <            }
67 <            fail("should throw");
68 <        } catch(RejectedExecutionException success){}
69 <        p.shutdownNow();
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 >        e.shutdown();
84      }
85  
86      /**
87 <     *  Test to verify execute(Executor, Callable) will throw
88 <     *  RejectedExecutionException Attempting to execute a callable on
89 <     *  a full ThreadPool will cause such an exception here, up to 5
90 <     *  runnables are attempted on a pool capable on handling one
91 <     *  until it throws an exception
92 <     */
93 <    public void testExecute2(){
94 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
95 <        try{
82 <            for(int i = 0; i < 5; ++i) {
83 <                Executors.execute(p, new SleepCall());
84 <            }
85 <            fail("should throw");
86 <        }catch(RejectedExecutionException e){}
87 <        p.shutdownNow();
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 >        }
96      }
97  
98  
99      /**
100 <     *  Test to verify invoke(Executor, Runnable) throws InterruptedException
101 <     *  A single use of invoke starts that will wait long enough
102 <     *  for the invoking thread to be interrupted
103 <     */
104 <    public void testInvoke2(){
105 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
106 <        Thread t = new Thread(new Runnable() {
107 <                public void run(){
100 <                    try{
101 <                        Executors.invoke(p,new Runnable(){
102 <                                public void run(){
103 <                                    try{
104 <                                        Thread.sleep(MEDIUM_DELAY_MS);
105 <                                        fail("should throw");
106 <                                    }catch(InterruptedException e){
107 <                                    }
108 <                                }
109 <                            });
110 <                    } catch(InterruptedException success){
111 <                    } catch(Exception e) {
112 <                        fail("unexpected exception");
113 <                    }
114 <                    
115 <                }
116 <            });
117 <        try{
118 <            t.start();
119 <            Thread.sleep(SHORT_DELAY_MS);
120 <            t.interrupt();
121 <        }catch(Exception e){
122 <            fail("unexpected exception");
123 <        }
124 <        p.shutdownNow();
100 >     * A new SingleThreadExecutor can execute runnables
101 >     */
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 >        e.shutdown();
108      }
109  
110      /**
111 <     *  Test to verify invoke(Executor, Runnable) will throw
112 <     *  ExecutionException An ExecutionException occurs when the
113 <     *  underlying Runnable throws an exception, here the
114 <     *  DivideByZeroException will cause an ExecutionException
115 <     */
116 <    public void testInvoke3(){
117 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
118 <        try{
136 <            Runnable r = new Runnable(){
137 <                    public void run(){
138 <                        int i = 5/0;
139 <                    }
140 <                };
141 <            
142 <            for(int i =0; i < 5; i++){
143 <                Executors.invoke(p,r);
144 <            }
145 <            
146 <            fail("should throw");
147 <        } catch(ExecutionException success){
148 <        } catch(Exception e){
149 <            fail("should throw EE");
150 <        }
151 <        p.shutdownNow();
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 >        e.shutdown();
119      }
120  
154
155
121      /**
122 <     *  Test to verify invoke(Executor, Callable) throws
158 <     *  InterruptedException A single use of invoke starts that will
159 <     *  wait long enough for the invoking thread to be interrupted
122 >     * A new SingleThreadExecutor with null ThreadFactory throws NPE
123       */
124 <    public void testInvoke5(){
125 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
126 <        
127 <        final Callable c = new Callable(){
128 <                public Object call(){
129 <                    try{
167 <                        Executors.invoke(p, new SleepCall());
168 <                        fail("should throw");
169 <                    }catch(InterruptedException e){}
170 <                    catch(RejectedExecutionException e2){}
171 <                    catch(ExecutionException e3){}
172 <                    return Boolean.TRUE;
173 <                }
174 <            };
175 <
176 <
177 <        
178 <        Thread t = new Thread(new Runnable(){
179 <                public void run(){
180 <                    try{
181 <                        c.call();
182 <                    }catch(Exception e){}
183 <                }
184 <          });
185 <        try{
186 <            t.start();
187 <            Thread.sleep(SHORT_DELAY_MS);
188 <            t.interrupt();
189 <            t.join();
190 <        }catch(InterruptedException e){
191 <            fail("unexpected exception");
124 >    public void testNewSingleThreadExecutor3() {
125 >        try {
126 >            ExecutorService e = Executors.newSingleThreadExecutor(null);
127 >            shouldThrow();
128 >        }
129 >        catch(NullPointerException success) {
130          }
193        
194        p.shutdownNow();
131      }
132  
133      /**
134 <     *  Test to verify invoke(Executor, Callable) will throw ExecutionException
199 <     *  An ExecutionException occurs when the underlying Runnable throws
200 <     *  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,100L,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;
210 <                    }
211 <                };
212 <            
213 <            for(int i =0; i < 5; i++){
214 <                Executors.invoke(p,c);
215 <            }
216 <            
217 <            fail("should throw");
218 <        }catch(RejectedExecutionException e){}
219 <        catch(InterruptedException e2){}
220 <        catch(ExecutionException e3){}
221 <        p.shutdownNow();
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  
224    public void testExecuteRunnable () {
225        try {
226            Executor e = new DirectExecutor();
227            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 >        e.shutdown();
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 >        e.shutdown();
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) {
241 <            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();
249 <
250 <            assertFalse("task should not be complete", task.isCompleted());
251 <
252 <            Executors.invoke(e, task);
253 <
254 <            assertTrue("task should be complete", task.isCompleted());
255 <        }
256 <        catch (ExecutionException ex) {
257 <            fail("Unexpected exception");
186 >            ExecutorService e = Executors.newFixedThreadPool(0);
187 >            shouldThrow();
188          }
189 <        catch (InterruptedException ex) {
260 <            fail("Unexpected exception");
189 >        catch(IllegalArgumentException success) {
190          }
191      }
192  
264    public void testExecuteCallable () {
265        try {
266            Executor e = new DirectExecutor();
267            Future<String> future = Executors.execute(e, new StringTask());
268            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 >        e.shutdown();
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) {
276 <            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();
283 <            String result = Executors.invoke(e, new StringTask());
284 <
285 <            assertSame("should return test string", TEST_STRING, result);
221 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
222          }
223 <        catch (ExecutionException ex) {
288 <            fail("Unexpected exception" );
289 <        }
290 <        catch (InterruptedException ex) {
291 <            fail("Unexpected exception");
223 >        catch (NullPointerException success) {
224          }
225      }
226  
295    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 >            p1.shutdown();
241 >            joinPool(p1);
242 >        } catch(RejectedExecutionException e){}
243 >        catch(Exception e){
244 >            e.printStackTrace();
245 >            unexpectedException();
246 >        }
247      }
248  
249 <    private static class StringTask implements Callable<String> {
250 <        public String call() { return TEST_STRING; }
249 >    /**
250 >     * a newScheduledThreadPool successfully runs delayed task
251 >     */
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 >            p1.shutdown();
262 >            joinPool(p1);
263 >        } catch(RejectedExecutionException e){}
264 >        catch(Exception e){
265 >            e.printStackTrace();
266 >            unexpectedException();
267 >        }
268      }
269  
270 <    static class DirectExecutor implements Executor {
271 <        public void execute(Runnable r) {
272 <            r.run();
270 >    /**
271 >     * an unconfigurable  newScheduledThreadPool successfully runs delayed task
272 >     */
273 >    public void testunconfigurableScheduledExecutorService() {
274 >        try {
275 >            TrackedCallable callable = new TrackedCallable();
276 >            ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
277 >            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
278 >            assertFalse(callable.done);
279 >            Thread.sleep(MEDIUM_DELAY_MS);
280 >            assertTrue(callable.done);
281 >            assertEquals(Boolean.TRUE, f.get());
282 >            p1.shutdown();
283 >            joinPool(p1);
284 >        } catch(RejectedExecutionException e){}
285 >        catch(Exception e){
286 >            e.printStackTrace();
287 >            unexpectedException();
288          }
289      }
290  
291      /**
292 <     * Check that timeouts from execute will time out if they compute
316 <     * too long.
292 >     *  timeouts from execute will time out if they compute too long.
293       */
318
294      public void testTimedCallable() {
295          int N = 10000;
296          ExecutorService executor = Executors.newSingleThreadExecutor();
# Line 341 | Line 316 | public class ExecutorsTest extends TestC
316                      return;
317                  }
318                  catch (Exception e) {
319 <                    fail("unexpected exception: " + e);
319 >                    unexpectedException();
320                  }
321              }
322              // if by chance we didn't ever time out, total time must be small
# Line 349 | Line 324 | public class ExecutorsTest extends TestC
324              assertTrue(elapsed < N);
325          }
326          finally {
327 <            executor.shutdownNow();
327 >            joinPool(executor);
328          }
329      }
330  
331      
332 <    static class TimedCallable<T> implements Callable<T> {
333 <        private final Executor exec;
334 <        private final Callable<T> func;
335 <        private final long msecs;
332 >    /**
333 >     * ThreadPoolExecutor using defaultThreadFactory has
334 >     * specified group, priority, daemon status, and name
335 >     */
336 >    public void testDefaultThreadFactory() {
337 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
338 >        Runnable r = new Runnable() {
339 >                public void run() {
340 >                    Thread current = Thread.currentThread();
341 >                    threadAssertTrue(!current.isDaemon());
342 >                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
343 >                    ThreadGroup g = current.getThreadGroup();
344 >                    SecurityManager s = System.getSecurityManager();
345 >                    if (s != null)
346 >                        threadAssertTrue(g == s.getThreadGroup());
347 >                    else
348 >                        threadAssertTrue(g == egroup);
349 >                    String name = current.getName();
350 >                    threadAssertTrue(name.endsWith("thread-1"));
351 >                }
352 >            };
353 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
354          
355 <        TimedCallable(Executor exec, Callable<T> func, long msecs) {
356 <            this.exec = exec;
357 <            this.func = func;
358 <            this.msecs = msecs;
355 >        e.execute(r);
356 >        e.shutdown();
357 >        try {
358 >            Thread.sleep(SHORT_DELAY_MS);
359 >        } catch (Exception eX) {
360 >            unexpectedException();
361 >        } finally {
362 >            joinPool(e);
363          }
364 +    }
365 +
366 +    /**
367 +     * ThreadPoolExecutor using privilegedThreadFactory has
368 +     * specified group, priority, daemon status, name,
369 +     * access control context and context class loader
370 +     */
371 +    public void testPrivilegedThreadFactory() {
372 +        Policy savedPolicy = Policy.getPolicy();
373 +        AdjustablePolicy policy = new AdjustablePolicy();
374 +        policy.addPermission(new RuntimePermission("getContextClassLoader"));
375 +        policy.addPermission(new RuntimePermission("setContextClassLoader"));
376 +        Policy.setPolicy(policy);
377 +        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
378 +        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
379 +        final AccessControlContext thisacc = AccessController.getContext();
380 +        Runnable r = new Runnable() {
381 +                public void run() {
382 +                    Thread current = Thread.currentThread();
383 +                    threadAssertTrue(!current.isDaemon());
384 +                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
385 +                    ThreadGroup g = current.getThreadGroup();
386 +                    SecurityManager s = System.getSecurityManager();
387 +                    if (s != null)
388 +                        threadAssertTrue(g == s.getThreadGroup());
389 +                    else
390 +                        threadAssertTrue(g == egroup);
391 +                    String name = current.getName();
392 +                    threadAssertTrue(name.endsWith("thread-1"));
393 +                    threadAssertTrue(thisccl == current.getContextClassLoader());
394 +                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
395 +                }
396 +            };
397 +        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
398          
399 <        public T call() throws Exception {
400 <            Future<T> ftask = Executors.execute(exec, func);
401 <            try {
402 <                return ftask.get(msecs, TimeUnit.MILLISECONDS);
403 <            } finally {
404 <                ftask.cancel(true);
405 <            }
399 >        Policy.setPolicy(savedPolicy);
400 >        e.execute(r);
401 >        e.shutdown();
402 >        try {
403 >            Thread.sleep(SHORT_DELAY_MS);
404 >        } catch (Exception ex) {
405 >            unexpectedException();
406 >        } finally {
407 >            joinPool(e);
408          }
409 +
410      }
411  
412 +    static class CheckCCL implements Callable<Object> {
413 +        public Object call() {
414 +            AccessControlContext acc = AccessController.getContext();
415 +            acc.checkPermission(new RuntimePermission("getContextClassLoader"));
416 +            return null;
417 +        }
418 +    }
419  
420 <    private static class Fib implements Callable<BigInteger> {
421 <        private final BigInteger n;
422 <        Fib(long n) {
423 <            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
424 <            this.n = BigInteger.valueOf(n);
420 >
421 >    /**
422 >     * Without class loader permissions, creating
423 >     * privilegedCallableUsingCurrentClassLoader throws ACE
424 >     */
425 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
426 >        Policy savedPolicy = Policy.getPolicy();
427 >        AdjustablePolicy policy = new AdjustablePolicy();
428 >        Policy.setPolicy(policy);
429 >        try {
430 >            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
431 >            shouldThrow();
432 >        } catch(AccessControlException success) {
433 >        } catch(Exception ex) {
434 >            unexpectedException();
435 >        }
436 >        finally {
437 >            Policy.setPolicy(savedPolicy);
438          }
439 <        public BigInteger call() {
440 <            BigInteger f1 = BigInteger.ONE;
441 <            BigInteger f2 = f1;
442 <            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
443 <                BigInteger t = f1.add(f2);
444 <                f1 = f2;
445 <                f2 = t;
446 <            }
447 <            return f1;
439 >    }
440 >
441 >    /**
442 >     * Without class loader permissions, calling
443 >     * privilegedCallableUsingCurrentClassLoader throws ACE
444 >     */
445 >    public void testprivilegedCallableUsingCCLWithPrivs() {
446 >        Policy savedPolicy = Policy.getPolicy();
447 >        AdjustablePolicy policy = new AdjustablePolicy();
448 >        policy.addPermission(new RuntimePermission("getContextClassLoader"));
449 >        policy.addPermission(new RuntimePermission("setContextClassLoader"));
450 >        Policy.setPolicy(policy);
451 >        try {
452 >            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
453 >            task.call();
454 >        } catch(Exception ex) {
455 >            unexpectedException();
456 >        }
457 >        finally {
458 >            Policy.setPolicy(savedPolicy);
459          }
460 <    };
460 >    }
461 >
462 >    /**
463 >     * Without permissions, calling privilegedCallable throws ACE
464 >     */
465 >    public void testprivilegedCallableWithNoPrivs() {
466 >        Policy savedPolicy = Policy.getPolicy();
467 >        AdjustablePolicy policy = new AdjustablePolicy();
468 >        Policy.setPolicy(policy);
469 >        Callable task = Executors.privilegedCallable(new CheckCCL());
470 >        Policy.setPolicy(savedPolicy);
471 >        try {
472 >            task.call();
473 >            shouldThrow();
474 >        } catch(AccessControlException success) {
475 >        } catch(Exception ex) {
476 >            unexpectedException();
477 >        } finally {
478 >        }
479 >    }
480 >
481 >    /**
482 >     * With permissions, calling privilegedCallable succeeds
483 >     */
484 >    public void testprivilegedCallableWithPrivs() {
485 >        Policy savedPolicy = Policy.getPolicy();
486 >        AdjustablePolicy policy = new AdjustablePolicy();
487 >        policy.addPermission(new RuntimePermission("getContextClassLoader"));
488 >        policy.addPermission(new RuntimePermission("setContextClassLoader"));
489 >        Policy.setPolicy(policy);
490 >        Callable task = Executors.privilegedCallable(new CheckCCL());
491 >        try {
492 >            task.call();
493 >        } catch(Exception ex) {
494 >            unexpectedException();
495 >        } finally {
496 >            Policy.setPolicy(savedPolicy);
497 >        }
498 >    }
499  
500 +    /**
501 +     * callable(Runnable) returns null when called
502 +     */
503 +    public void testCallable1() {
504 +        try {
505 +            Callable c = Executors.callable(new NoOpRunnable());
506 +            assertNull(c.call());
507 +        } catch(Exception ex) {
508 +            unexpectedException();
509 +        }
510 +        
511 +    }
512 +
513 +    /**
514 +     * callable(Runnable, result) returns result when called
515 +     */
516 +    public void testCallable2() {
517 +        try {
518 +            Callable c = Executors.callable(new NoOpRunnable(), one);
519 +            assertEquals(one, c.call());
520 +        } catch(Exception ex) {
521 +            unexpectedException();
522 +        }
523 +    }
524 +
525 +    /**
526 +     * callable(PrivilegedAction) returns its result when called
527 +     */
528 +    public void testCallable3() {
529 +        try {
530 +            Callable c = Executors.callable(new PrivilegedAction() {
531 +                    public Object run() { return one; }});
532 +        assertEquals(one, c.call());
533 +        } catch(Exception ex) {
534 +            unexpectedException();
535 +        }
536 +    }
537 +
538 +    /**
539 +     * callable(PrivilegedExceptionAction) returns its result when called
540 +     */
541 +    public void testCallable4() {
542 +        try {
543 +            Callable c = Executors.callable(new PrivilegedExceptionAction() {
544 +                    public Object run() { return one; }});
545 +            assertEquals(one, c.call());
546 +        } catch(Exception ex) {
547 +            unexpectedException();
548 +        }
549 +    }
550 +
551 +
552 +    /**
553 +     * callable(null Runnable) throws NPE
554 +     */
555 +    public void testCallableNPE1() {
556 +        try {
557 +            Runnable r = null;
558 +            Callable c = Executors.callable(r);
559 +        } catch (NullPointerException success) {
560 +        }
561 +    }
562 +
563 +    /**
564 +     * callable(null, result) throws NPE
565 +     */
566 +    public void testCallableNPE2() {
567 +        try {
568 +            Runnable r = null;
569 +            Callable c = Executors.callable(r, one);
570 +        } catch (NullPointerException success) {
571 +        }
572 +    }
573 +
574 +    /**
575 +     * callable(null PrivilegedAction) throws NPE
576 +     */
577 +    public void testCallableNPE3() {
578 +        try {
579 +            PrivilegedAction r = null;
580 +            Callable c = Executors.callable(r);
581 +        } catch (NullPointerException success) {
582 +        }
583 +    }
584 +
585 +    /**
586 +     * callable(null PrivilegedExceptionAction) throws NPE
587 +     */
588 +    public void testCallableNPE4() {
589 +        try {
590 +            PrivilegedExceptionAction r = null;
591 +            Callable c = Executors.callable(r);
592 +        } catch (NullPointerException success) {
593 +        }
594 +    }
595  
596  
597   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines