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.15 by dl, Thu Jan 22 14:07:50 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 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 +        joinPool(e);
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 >        joinPool(e);
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 >        joinPool(e);
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 >        joinPool(e);
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 >        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) {
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 >        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) {
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 >            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
316 <     * too long.
289 >     *  timeouts from execute will time out if they compute too long.
290       */
318
291      public void testTimedCallable() {
292          int N = 10000;
293          ExecutorService executor = Executors.newSingleThreadExecutor();
# Line 341 | Line 313 | public class ExecutorsTest extends TestC
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 349 | Line 321 | public class ExecutorsTest extends TestC
321              assertTrue(elapsed < N);
322          }
323          finally {
324 <            executor.shutdownNow();
324 >            joinPool(executor);
325          }
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);
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 >    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 >    }
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 >        }
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 >    class CallCCL implements Runnable {
492 >        final Callable task;
493 >        CallCCL(Callable t) { task = t; }
494 >        public void run() {
495              try {
496 <                return ftask.get(msecs, TimeUnit.MILLISECONDS);
497 <            } finally {
498 <                ftask.cancel(true);
499 <            }
496 >                task.call();
497 >                threadShouldThrow();
498 >            } catch(AccessControlException success) {
499 >            } catch(Exception ex) {
500 >                threadUnexpectedException();
501 >            }
502          }
503      }
504  
505 +    /**
506 +     * Without permissions, calling privilegedCallable throws ACE
507 +     */
508 +    public void testprivilegedCallableWithNoPrivs() {
509 +        Thread t1;
510 +        try {
511 +            Policy savedPolicy = Policy.getPolicy();
512 +            AdjustablePolicy policy = new AdjustablePolicy();
513 +            Policy.setPolicy(policy);
514 +            Callable task = Executors.privilegedCallable(new CheckCCL());
515 +            t1 = new Thread(new CallCCL(task));
516 +            Policy.setPolicy(savedPolicy);
517 +        } catch (AccessControlException ok) {
518 +            return;
519 +        }
520  
521 <    private static class Fib implements Callable<BigInteger> {
522 <        private final BigInteger n;
523 <        Fib(long n) {
524 <            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
525 <            this.n = BigInteger.valueOf(n);
521 >        try {
522 >            t1.start();
523 >            t1.join();
524 >        } catch(Exception ex) {
525 >            unexpectedException();
526 >        }
527 >    }
528 >
529 >    /**
530 >     * With permissions, calling privilegedCallable succeeds
531 >     */
532 >    public void testprivilegedCallableWithPrivs() {
533 >        Policy savedPolicy = null;
534 >        try {
535 >            savedPolicy = Policy.getPolicy();
536 >            AdjustablePolicy policy = new AdjustablePolicy();
537 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
538 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
539 >            Policy.setPolicy(policy);
540 >        } catch (AccessControlException ok) {
541 >            return;
542          }
543 <        public BigInteger call() {
544 <            BigInteger f1 = BigInteger.ONE;
545 <            BigInteger f2 = f1;
546 <            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
547 <                BigInteger t = f1.add(f2);
548 <                f1 = f2;
549 <                f2 = t;
550 <            }
393 <            return f1;
543 >            
544 >        Callable task = Executors.privilegedCallable(new CheckCCL());
545 >        try {
546 >            task.call();
547 >        } catch(Exception ex) {
548 >            unexpectedException();
549 >        } finally {
550 >            Policy.setPolicy(savedPolicy);
551          }
552 <    };
552 >    }
553 >
554 >    /**
555 >     * callable(Runnable) returns null when called
556 >     */
557 >    public void testCallable1() {
558 >        try {
559 >            Callable c = Executors.callable(new NoOpRunnable());
560 >            assertNull(c.call());
561 >        } catch(Exception ex) {
562 >            unexpectedException();
563 >        }
564 >        
565 >    }
566 >
567 >    /**
568 >     * callable(Runnable, result) returns result when called
569 >     */
570 >    public void testCallable2() {
571 >        try {
572 >            Callable c = Executors.callable(new NoOpRunnable(), one);
573 >            assertEquals(one, c.call());
574 >        } catch(Exception ex) {
575 >            unexpectedException();
576 >        }
577 >    }
578  
579 +    /**
580 +     * callable(PrivilegedAction) returns its result when called
581 +     */
582 +    public void testCallable3() {
583 +        try {
584 +            Callable c = Executors.callable(new PrivilegedAction() {
585 +                    public Object run() { return one; }});
586 +        assertEquals(one, c.call());
587 +        } catch(Exception ex) {
588 +            unexpectedException();
589 +        }
590 +    }
591 +
592 +    /**
593 +     * callable(PrivilegedExceptionAction) returns its result when called
594 +     */
595 +    public void testCallable4() {
596 +        try {
597 +            Callable c = Executors.callable(new PrivilegedExceptionAction() {
598 +                    public Object run() { return one; }});
599 +            assertEquals(one, c.call());
600 +        } catch(Exception ex) {
601 +            unexpectedException();
602 +        }
603 +    }
604 +
605 +
606 +    /**
607 +     * callable(null Runnable) throws NPE
608 +     */
609 +    public void testCallableNPE1() {
610 +        try {
611 +            Runnable r = null;
612 +            Callable c = Executors.callable(r);
613 +        } catch (NullPointerException success) {
614 +        }
615 +    }
616 +
617 +    /**
618 +     * callable(null, result) throws NPE
619 +     */
620 +    public void testCallableNPE2() {
621 +        try {
622 +            Runnable r = null;
623 +            Callable c = Executors.callable(r, one);
624 +        } catch (NullPointerException success) {
625 +        }
626 +    }
627 +
628 +    /**
629 +     * callable(null PrivilegedAction) throws NPE
630 +     */
631 +    public void testCallableNPE3() {
632 +        try {
633 +            PrivilegedAction r = null;
634 +            Callable c = Executors.callable(r);
635 +        } catch (NullPointerException success) {
636 +        }
637 +    }
638 +
639 +    /**
640 +     * callable(null PrivilegedExceptionAction) throws NPE
641 +     */
642 +    public void testCallableNPE4() {
643 +        try {
644 +            PrivilegedExceptionAction r = null;
645 +            Callable c = Executors.callable(r);
646 +        } catch (NullPointerException success) {
647 +        }
648 +    }
649  
650  
651   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines