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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines