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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines