ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ExecutorsTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.1 by dl, Sun Aug 31 19:24:55 2003 UTC vs.
Revision 1.26 by jsr166, Sat Nov 21 02:33:20 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines