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.47 by jsr166, Wed Jan 4 06:09:58 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 <                            });
317 <                    } catch(InterruptedException success){
318 <                    } catch(Exception e) {
319 <                        unexpectedException();
320 <                    }
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 >                    assertTrue(!current.isDaemon());
310 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
311 >                    ThreadGroup g = current.getThreadGroup();
312 >                    SecurityManager s = System.getSecurityManager();
313 >                    if (s != null)
314 >                        assertTrue(g == s.getThreadGroup());
315 >                    else
316 >                        assertTrue(g == egroup);
317 >                    String name = current.getName();
318 >                    assertTrue(name.endsWith("thread-1"));
319 >                } catch (SecurityException ok) {
320 >                    // Also pass if not allowed to change setting
321                  }
322 <            });
323 <        try {
324 <            t.start();
325 <            Thread.sleep(SHORT_DELAY_MS);
326 <            t.interrupt();
327 <        } catch(Exception e){
153 <            unexpectedException();
322 >                done.countDown();
323 >            }};
324 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
325 >        try (PoolCleaner cleaner = cleaner(e)) {
326 >            e.execute(r);
327 >            await(done);
328          }
155        joinPool(p);
329      }
330  
331      /**
332 <     *   invoke(Executor, Runnable) will throw
333 <     *  ExecutionException An ExecutionException occurs when the
334 <     *  underlying Runnable throws an exception, here the
335 <     *  DivideByZeroException will cause an ExecutionException
336 <     */
337 <    public void testInvoke3() {
338 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
339 <        try {
340 <            Runnable r = new Runnable() {
341 <                    public void run() {
342 <                        int i = 5/0;
343 <                    }
344 <                };
345 <            
346 <            for(int i =0; i < 5; i++){
347 <                Executors.invoke(p,r);
332 >     * ThreadPoolExecutor using privilegedThreadFactory has
333 >     * specified group, priority, daemon status, name,
334 >     * access control context and context class loader
335 >     */
336 >    public void testPrivilegedThreadFactory() throws Exception {
337 >        final CountDownLatch done = new CountDownLatch(1);
338 >        Runnable r = new CheckedRunnable() {
339 >            public void realRun() throws Exception {
340 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
341 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
342 >                final AccessControlContext thisacc = AccessController.getContext();
343 >                Runnable r = new CheckedRunnable() {
344 >                    public void realRun() {
345 >                        Thread current = Thread.currentThread();
346 >                        assertTrue(!current.isDaemon());
347 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
348 >                        ThreadGroup g = current.getThreadGroup();
349 >                        SecurityManager s = System.getSecurityManager();
350 >                        if (s != null)
351 >                            assertTrue(g == s.getThreadGroup());
352 >                        else
353 >                            assertTrue(g == egroup);
354 >                        String name = current.getName();
355 >                        assertTrue(name.endsWith("thread-1"));
356 >                        assertSame(thisccl, current.getContextClassLoader());
357 >                        assertEquals(thisacc, AccessController.getContext());
358 >                        done.countDown();
359 >                    }};
360 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
361 >                try (PoolCleaner cleaner = cleaner(e)) {
362 >                    e.execute(r);
363 >                    await(done);
364 >                }
365 >            }};
366 >
367 >        runWithPermissions(r,
368 >                           new RuntimePermission("getClassLoader"),
369 >                           new RuntimePermission("setContextClassLoader"),
370 >                           new RuntimePermission("modifyThread"));
371 >    }
372 >
373 >    boolean haveCCLPermissions() {
374 >        SecurityManager sm = System.getSecurityManager();
375 >        if (sm != null) {
376 >            try {
377 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
378 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
379 >            } catch (AccessControlException e) {
380 >                return false;
381              }
176            
177            shouldThrow();
178        } catch(ExecutionException success){
179        } catch(Exception e){
180            unexpectedException();
382          }
383 <        joinPool(p);
383 >        return true;
384      }
385  
386 +    void checkCCL() {
387 +        SecurityManager sm = System.getSecurityManager();
388 +        if (sm != null) {
389 +            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
390 +            sm.checkPermission(new RuntimePermission("getClassLoader"));
391 +        }
392 +    }
393  
394 +    class CheckCCL implements Callable<Object> {
395 +        public Object call() {
396 +            checkCCL();
397 +            return null;
398 +        }
399 +    }
400  
401      /**
402 <     *   invoke(Executor, Callable) throws
403 <     *  InterruptedException A single use of invoke starts that will
190 <     *  wait long enough for the invoking thread to be interrupted
402 >     * Without class loader permissions, creating
403 >     * privilegedCallableUsingCurrentClassLoader throws ACE
404       */
405 <    public void testInvoke5() {
406 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
407 <        
408 <        final Callable c = new Callable() {
409 <                public Object call() {
410 <                    try {
411 <                        Executors.invoke(p, new SmallCallable());
412 <                        shouldThrow();
413 <                    } catch(InterruptedException e){}
414 <                    catch(RejectedExecutionException e2){}
202 <                    catch(ExecutionException e3){}
203 <                    return Boolean.TRUE;
204 <                }
205 <            };
405 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
406 >        Runnable r = new CheckedRunnable() {
407 >            public void realRun() throws Exception {
408 >                if (System.getSecurityManager() == null)
409 >                    return;
410 >                try {
411 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
412 >                    shouldThrow();
413 >                } catch (AccessControlException success) {}
414 >            }};
415  
416 +        runWithoutPermissions(r);
417 +    }
418  
419 <        
420 <        Thread t = new Thread(new Runnable() {
421 <                public void run() {
422 <                    try {
423 <                        c.call();
424 <                    } catch(Exception e){}
425 <                }
426 <          });
427 <        try {
428 <            t.start();
429 <            Thread.sleep(SHORT_DELAY_MS);
430 <            t.interrupt();
431 <            t.join();
432 <        } catch(InterruptedException e){
433 <            unexpectedException();
223 <        }
224 <        
225 <        joinPool(p);
419 >    /**
420 >     * With class loader permissions, calling
421 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
422 >     */
423 >    public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
424 >        Runnable r = new CheckedRunnable() {
425 >            public void realRun() throws Exception {
426 >                Executors.privilegedCallableUsingCurrentClassLoader
427 >                    (new NoOpCallable())
428 >                    .call();
429 >            }};
430 >
431 >        runWithPermissions(r,
432 >                           new RuntimePermission("getClassLoader"),
433 >                           new RuntimePermission("setContextClassLoader"));
434      }
435  
436      /**
437 <     *   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
437 >     * Without permissions, calling privilegedCallable throws ACE
438       */
439 <    public void testInvoke6() {
440 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
439 >    public void testPrivilegedCallableWithNoPrivs() throws Exception {
440 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
441 >        Executors.privilegedCallable(new CheckCCL());
442  
443 <        try {
444 <            Callable c = new Callable() {
445 <                    public Object call() {
446 <                        int i = 5/0;
447 <                        return Boolean.TRUE;
448 <                    }
449 <                };
450 <            
451 <            for(int i =0; i < 5; i++){
452 <                Executors.invoke(p,c);
453 <            }
454 <            
455 <            shouldThrow();
456 <        } catch(RejectedExecutionException e){}
457 <        catch(InterruptedException e2){}
458 <        catch(ExecutionException e3){}
459 <        joinPool(p);
443 >        Runnable r = new CheckedRunnable() {
444 >            public void realRun() throws Exception {
445 >                if (System.getSecurityManager() == null)
446 >                    return;
447 >                Callable task = Executors.privilegedCallable(new CheckCCL());
448 >                try {
449 >                    task.call();
450 >                    shouldThrow();
451 >                } catch (AccessControlException success) {}
452 >            }};
453 >
454 >        runWithoutPermissions(r);
455 >
456 >        // It seems rather difficult to test that the
457 >        // AccessControlContext of the privilegedCallable is used
458 >        // instead of its caller.  Below is a failed attempt to do
459 >        // that, which does not work because the AccessController
460 >        // cannot capture the internal state of the current Policy.
461 >        // It would be much more work to differentiate based on,
462 >        // e.g. CodeSource.
463 >
464 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
465 > //         final Callable[] task = new Callable[1];
466 >
467 > //         runWithPermissions
468 > //             (new CheckedRunnable() {
469 > //                 public void realRun() {
470 > //                     if (System.getSecurityManager() == null)
471 > //                         return;
472 > //                     noprivAcc[0] = AccessController.getContext();
473 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
474 > //                     try {
475 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
476 > //                                                           public Void run() {
477 > //                                                               checkCCL();
478 > //                                                               return null;
479 > //                                                           }}, noprivAcc[0]);
480 > //                         shouldThrow();
481 > //                     } catch (AccessControlException success) {}
482 > //                 }});
483 >
484 > //         runWithPermissions
485 > //             (new CheckedRunnable() {
486 > //                 public void realRun() throws Exception {
487 > //                     if (System.getSecurityManager() == null)
488 > //                         return;
489 > //                     // Verify that we have an underprivileged ACC
490 > //                     try {
491 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
492 > //                                                           public Void run() {
493 > //                                                               checkCCL();
494 > //                                                               return null;
495 > //                                                           }}, noprivAcc[0]);
496 > //                         shouldThrow();
497 > //                     } catch (AccessControlException success) {}
498 >
499 > //                     try {
500 > //                         task[0].call();
501 > //                         shouldThrow();
502 > //                     } catch (AccessControlException success) {}
503 > //                 }},
504 > //              new RuntimePermission("getClassLoader"),
505 > //              new RuntimePermission("setContextClassLoader"));
506      }
507  
508      /**
509 <     *
509 >     * With permissions, calling privilegedCallable succeeds
510       */
511 <    public void testExecuteRunnable () {
512 <        try {
513 <            Executor e = new DirectExecutor();
514 <            MyTask task = new MyTask();
515 <            assertFalse(task.isCompleted());
516 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
517 <            String result = future.get();
518 <            assertTrue(task.isCompleted());
519 <            assertSame(TEST_STRING, result);
267 <        }
268 <        catch (ExecutionException ex) {
269 <            unexpectedException();
270 <        }
271 <        catch (InterruptedException ex) {
272 <            unexpectedException();
273 <        }
511 >    public void testPrivilegedCallableWithPrivs() throws Exception {
512 >        Runnable r = new CheckedRunnable() {
513 >            public void realRun() throws Exception {
514 >                Executors.privilegedCallable(new CheckCCL()).call();
515 >            }};
516 >
517 >        runWithPermissions(r,
518 >                           new RuntimePermission("getClassLoader"),
519 >                           new RuntimePermission("setContextClassLoader"));
520      }
521  
522      /**
523 <     *
523 >     * callable(Runnable) returns null when called
524       */
525 <    public void testInvokeRunnable () {
526 <        try {
527 <            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 <        }
525 >    public void testCallable1() throws Exception {
526 >        Callable c = Executors.callable(new NoOpRunnable());
527 >        assertNull(c.call());
528      }
529  
530      /**
531 <     *
531 >     * callable(Runnable, result) returns result when called
532       */
533 <    public void testExecuteCallable () {
534 <        try {
535 <            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 <        }
533 >    public void testCallable2() throws Exception {
534 >        Callable c = Executors.callable(new NoOpRunnable(), one);
535 >        assertSame(one, c.call());
536      }
537  
538      /**
539 <     *
539 >     * callable(PrivilegedAction) returns its result when called
540       */
541 <    public void testInvokeCallable () {
542 <        try {
543 <            Executor e = new DirectExecutor();
544 <            String result = Executors.invoke(e, new StringTask());
541 >    public void testCallable3() throws Exception {
542 >        Callable c = Executors.callable(new PrivilegedAction() {
543 >                public Object run() { return one; }});
544 >        assertSame(one, c.call());
545 >    }
546  
547 <            assertSame(TEST_STRING, result);
548 <        }
549 <        catch (ExecutionException ex) {
550 <            unexpectedException();
551 <        }
552 <        catch (InterruptedException ex) {
553 <            unexpectedException();
328 <        }
547 >    /**
548 >     * callable(PrivilegedExceptionAction) returns its result when called
549 >     */
550 >    public void testCallable4() throws Exception {
551 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
552 >                public Object run() { return one; }});
553 >        assertSame(one, c.call());
554      }
555  
556      /**
557 <     *  timeouts from execute will time out if they compute too long.
557 >     * callable(null Runnable) throws NPE
558       */
559 <    public void testTimedCallable() {
335 <        int N = 10000;
336 <        ExecutorService executor = Executors.newSingleThreadExecutor();
337 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
559 >    public void testCallableNPE1() {
560          try {
561 <            long startTime = System.currentTimeMillis();
562 <            
563 <            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 <        }
561 >            Callable c = Executors.callable((Runnable) null);
562 >            shouldThrow();
563 >        } catch (NullPointerException success) {}
564      }
565  
566 <    
566 >    /**
567 >     * callable(null, result) throws NPE
568 >     */
569 >    public void testCallableNPE2() {
570 >        try {
571 >            Callable c = Executors.callable((Runnable) null, one);
572 >            shouldThrow();
573 >        } catch (NullPointerException success) {}
574 >    }
575  
576 +    /**
577 +     * callable(null PrivilegedAction) throws NPE
578 +     */
579 +    public void testCallableNPE3() {
580 +        try {
581 +            Callable c = Executors.callable((PrivilegedAction) null);
582 +            shouldThrow();
583 +        } catch (NullPointerException success) {}
584 +    }
585 +
586 +    /**
587 +     * callable(null PrivilegedExceptionAction) throws NPE
588 +     */
589 +    public void testCallableNPE4() {
590 +        try {
591 +            Callable c = Executors.callable((PrivilegedExceptionAction) null);
592 +            shouldThrow();
593 +        } catch (NullPointerException success) {}
594 +    }
595  
596   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines