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.7 by dl, Sun Oct 5 23:00:40 2003 UTC vs.
Revision 1.46 by jsr166, Sun Oct 4 16:14:48 2015 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{
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);
20 <    }
21 <
22 <    private static final String TEST_STRING = "a test string";
23 <
24 <    private static class StringTask implements Callable<String> {
25 <        public String call() { return TEST_STRING; }
26 <    }
27 <
28 <    static class DirectExecutor implements Executor {
29 <        public void execute(Runnable r) {
30 <            r.run();
31 <        }
34 >        return new TestSuite(ExecutorsTest.class);
35      }
36  
34    static class TimedCallable<T> implements Callable<T> {
35        private final Executor exec;
36        private final Callable<T> func;
37        private final long msecs;
38        
39        TimedCallable(Executor exec, Callable<T> func, long msecs) {
40            this.exec = exec;
41            this.func = func;
42            this.msecs = msecs;
43        }
44        
45        public T call() throws Exception {
46            Future<T> ftask = Executors.execute(exec, func);
47            try {
48                return ftask.get(msecs, TimeUnit.MILLISECONDS);
49            } finally {
50                ftask.cancel(true);
51            }
52        }
53    }
54
55
56    private static class Fib implements Callable<BigInteger> {
57        private final BigInteger n;
58        Fib(long n) {
59            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
60            this.n = BigInteger.valueOf(n);
61        }
62        public BigInteger call() {
63            BigInteger f1 = BigInteger.ONE;
64            BigInteger f2 = f1;
65            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
66                BigInteger t = f1.add(f2);
67                f1 = f2;
68                f2 = t;
69            }
70            return f1;
71        }
72    };
73
37      /**
38       * A newCachedThreadPool can execute runnables
39       */
40      public void testNewCachedThreadPool1() {
41 <        ExecutorService e = Executors.newCachedThreadPool();
42 <        e.execute(new NoOpRunnable());
43 <        e.execute(new NoOpRunnable());
44 <        e.execute(new NoOpRunnable());
45 <        e.shutdown();
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      /**
50       * A newCachedThreadPool with given ThreadFactory can execute runnables
51       */
52      public void testNewCachedThreadPool2() {
53 <        ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
54 <        e.execute(new NoOpRunnable());
55 <        e.execute(new NoOpRunnable());
56 <        e.execute(new NoOpRunnable());
57 <        e.shutdown();
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      /**
# Line 100 | Line 65 | public class ExecutorsTest extends JSR16
65          try {
66              ExecutorService e = Executors.newCachedThreadPool(null);
67              shouldThrow();
68 <        }
104 <        catch(NullPointerException success) {
105 <        }
68 >        } catch (NullPointerException success) {}
69      }
70  
108
71      /**
72       * A new SingleThreadExecutor can execute runnables
73       */
74      public void testNewSingleThreadExecutor1() {
75 <        ExecutorService e = Executors.newSingleThreadExecutor();
76 <        e.execute(new NoOpRunnable());
77 <        e.execute(new NoOpRunnable());
78 <        e.execute(new NoOpRunnable());
79 <        e.shutdown();
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      /**
84       * A new SingleThreadExecutor with given ThreadFactory can execute runnables
85       */
86      public void testNewSingleThreadExecutor2() {
87 <        ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
88 <        e.execute(new NoOpRunnable());
89 <        e.execute(new NoOpRunnable());
90 <        e.execute(new NoOpRunnable());
91 <        e.shutdown();
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      /**
# Line 135 | Line 99 | public class ExecutorsTest extends JSR16
99          try {
100              ExecutorService e = Executors.newSingleThreadExecutor(null);
101              shouldThrow();
102 <        }
103 <        catch(NullPointerException success) {
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  
# Line 144 | Line 119 | public class ExecutorsTest extends JSR16
119       * A new newFixedThreadPool can execute runnables
120       */
121      public void testNewFixedThreadPool1() {
122 <        ExecutorService e = Executors.newFixedThreadPool(2);
123 <        e.execute(new NoOpRunnable());
124 <        e.execute(new NoOpRunnable());
125 <        e.execute(new NoOpRunnable());
126 <        e.shutdown();
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       * A new newFixedThreadPool with given ThreadFactory can execute runnables
132       */
133      public void testNewFixedThreadPool2() {
134 <        ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
135 <        e.execute(new NoOpRunnable());
136 <        e.execute(new NoOpRunnable());
137 <        e.execute(new NoOpRunnable());
138 <        e.shutdown();
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      /**
# Line 169 | Line 146 | public class ExecutorsTest extends JSR16
146          try {
147              ExecutorService e = Executors.newFixedThreadPool(2, null);
148              shouldThrow();
149 <        }
173 <        catch(NullPointerException success) {
174 <        }
149 >        } catch (NullPointerException success) {}
150      }
151  
152      /**
# Line 181 | Line 156 | public class ExecutorsTest extends JSR16
156          try {
157              ExecutorService e = Executors.newFixedThreadPool(0);
158              shouldThrow();
159 <        }
185 <        catch(IllegalArgumentException success) {
186 <        }
159 >        } catch (IllegalArgumentException success) {}
160      }
161  
162      /**
163 <     * execute of runnable runs it to completion
163 >     * An unconfigurable newFixedThreadPool can execute runnables
164       */
165 <    public void testExecuteRunnable() {
166 <        try {
167 <            Executor e = new DirectExecutor();
168 <            TrackedShortRunnable task = new TrackedShortRunnable();
169 <            assertFalse(task.done);
170 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
198 <            String result = future.get();
199 <            assertTrue(task.done);
200 <            assertSame(TEST_STRING, result);
201 <        }
202 <        catch (ExecutionException ex) {
203 <            unexpectedException();
204 <        }
205 <        catch (InterruptedException ex) {
206 <            unexpectedException();
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 <     * invoke of a runnable runs it to completion
175 >     * unconfigurableExecutorService(null) throws NPE
176       */
177 <    public void testInvokeRunnable() {
177 >    public void testUnconfigurableExecutorServiceNPE() {
178          try {
179 <            Executor e = new DirectExecutor();
180 <            TrackedShortRunnable task = new TrackedShortRunnable();
181 <            assertFalse(task.done);
218 <            Executors.invoke(e, task);
219 <            assertTrue(task.done);
220 <        }
221 <        catch (ExecutionException ex) {
222 <            unexpectedException();
223 <        }
224 <        catch (InterruptedException ex) {
225 <            unexpectedException();
226 <        }
179 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
180 >            shouldThrow();
181 >        } catch (NullPointerException success) {}
182      }
183  
184      /**
185 <     * execute of a callable runs it to completion
185 >     * unconfigurableScheduledExecutorService(null) throws NPE
186       */
187 <    public void testExecuteCallable() {
187 >    public void testUnconfigurableScheduledExecutorServiceNPE() {
188          try {
189 <            Executor e = new DirectExecutor();
190 <            Future<String> future = Executors.execute(e, new StringTask());
191 <            String result = future.get();
237 <            assertSame(TEST_STRING, result);
238 <        }
239 <        catch (ExecutionException ex) {
240 <            unexpectedException();
241 <        }
242 <        catch (InterruptedException ex) {
243 <            unexpectedException();
244 <        }
189 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
190 >            shouldThrow();
191 >        } catch (NullPointerException success) {}
192      }
193  
194      /**
195 <     * invoke of a collable runs it to completion
195 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
196       */
197 <    public void testInvokeCallable() {
198 <        try {
199 <            Executor e = new DirectExecutor();
200 <            String result = Executors.invoke(e, new StringTask());
201 <
202 <            assertSame(TEST_STRING, result);
203 <        }
204 <        catch (ExecutionException ex) {
205 <            unexpectedException();
206 <        }
207 <        catch (InterruptedException ex) {
208 <            unexpectedException();
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 <     * execute with null executor throws NPE
219 >     * a newScheduledThreadPool successfully runs delayed task
220       */
221 <    public void testNullExecuteRunnable() {
222 <        try {
223 <            TrackedShortRunnable task = new TrackedShortRunnable();
224 <            assertFalse(task.done);
225 <            Future<String> future = Executors.execute(null, task, TEST_STRING);
226 <            shouldThrow();
227 <        }
228 <        catch (NullPointerException success) {
229 <        }
230 <        catch (Exception ex) {
231 <            unexpectedException();
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 <     * execute with a null runnable throws NPE
243 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
244       */
245 <    public void testExecuteNullRunnable() {
246 <        try {
247 <            Executor e = new DirectExecutor();
248 <            TrackedShortRunnable task = null;
249 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
250 <            shouldThrow();
251 <        }
252 <        catch (NullPointerException success) {
253 <        }
254 <        catch (Exception ex) {
255 <            unexpectedException();
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 <     * invoke of a null runnable throws NPE
269 >     * Future.get on submitted tasks will time out if they compute too long.
270       */
271 <    public void testInvokeNullRunnable() {
272 <        try {
273 <            Executor e = new DirectExecutor();
274 <            TrackedShortRunnable task = null;
275 <            Executors.invoke(e, task);
276 <            shouldThrow();
277 <        }
278 <        catch (NullPointerException success) {
279 <        }
280 <        catch (Exception ex) {
281 <            unexpectedException();
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<Thread>();
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 <     * execute of a null callable throws NPE
299 >     * ThreadPoolExecutor using defaultThreadFactory has
300 >     * specified group, priority, daemon status, and name
301       */
302 <    public void testExecuteNullCallable() {
303 <        try {
304 <            Executor e = new DirectExecutor();
305 <            StringTask t = null;
306 <            Future<String> future = Executors.execute(e, t);
307 <            shouldThrow();
308 <        }
309 <        catch (NullPointerException success) {
310 <        }
311 <        catch (Exception ex) {
312 <            unexpectedException();
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 >                done.countDown();
323 >            }};
324 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
325 >        try (PoolCleaner cleaner = cleaner(e)) {
326 >            e.execute(r);
327 >            await(done);
328          }
329      }
330  
331      /**
332 <     * invoke of a null callable throws NPE
333 <     */
334 <    public void testInvokeNullCallable() {
335 <        try {
336 <            Executor e = new DirectExecutor();
337 <            StringTask t = null;
338 <            String result = Executors.invoke(e, t);
339 <            shouldThrow();
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 >            }
382          }
383 <        catch (NullPointerException success) {
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 <        catch (Exception ex) {
393 <            unexpectedException();
392 >    }
393 >
394 >    class CheckCCL implements Callable<Object> {
395 >        public Object call() {
396 >            checkCCL();
397 >            return null;
398          }
399      }
400  
401      /**
402 <     *  execute(Executor, Runnable) throws RejectedExecutionException
403 <     *  if saturated.
402 >     * Without class loader permissions, creating
403 >     * privilegedCallableUsingCurrentClassLoader throws ACE
404       */
405 <    public void testExecute1() {
406 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
407 <        try {
408 <            
409 <            for(int i = 0; i < 5; ++i){
410 <                Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
411 <            }
412 <            shouldThrow();
413 <        } catch(RejectedExecutionException success){}
414 <        joinPool(p);
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 <     *  execute(Executor, Callable)throws RejectedExecutionException
421 <     *  if saturated.
420 >     * With class loader permissions, calling
421 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
422       */
423 <    public void testExecute2() {
424 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
425 <        try {
426 <            for(int i = 0; i < 5; ++i) {
427 <                Executors.execute(p, new SmallCallable());
428 <            }
429 <            shouldThrow();
377 <        } catch(RejectedExecutionException e){}
378 <        joinPool(p);
379 <    }
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, Runnable) throws InterruptedException if
384 <     *  caller interrupted.
437 >     * Without permissions, calling privilegedCallable throws ACE
438       */
439 <    public void testInterruptedInvoke() {
440 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
441 <        Thread t = new Thread(new Runnable() {
442 <                public void run() {
443 <                    try {
444 <                        Executors.invoke(p,new Runnable() {
445 <                                public void run() {
446 <                                    try {
447 <                                        Thread.sleep(MEDIUM_DELAY_MS);
448 <                                        shouldThrow();
449 <                                    } catch(InterruptedException e){
450 <                                    }
451 <                                }
452 <                            });
453 <                    } catch(InterruptedException success){
454 <                    } catch(Exception e) {
455 <                        unexpectedException();
456 <                    }
457 <                    
458 <                }
459 <            });
460 <        try {
461 <            t.start();
462 <            Thread.sleep(SHORT_DELAY_MS);
463 <            t.interrupt();
464 <        } catch(Exception e){
465 <            unexpectedException();
466 <        }
467 <        joinPool(p);
439 >    public void testPrivilegedCallableWithNoPrivs() throws Exception {
440 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
441 >        Executors.privilegedCallable(new CheckCCL());
442 >
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 <     *  invoke(Executor, Runnable) throws ExecutionException if
419 <     *  runnable throws exception.
509 >     * With permissions, calling privilegedCallable succeeds
510       */
511 <    public void testInvoke3() {
512 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
513 <        try {
514 <            Runnable r = new Runnable() {
515 <                    public void run() {
516 <                        int i = 5/0;
517 <                    }
518 <                };
519 <            
430 <            for(int i =0; i < 5; i++){
431 <                Executors.invoke(p,r);
432 <            }
433 <            
434 <            shouldThrow();
435 <        } catch(ExecutionException success){
436 <        } catch(Exception e){
437 <            unexpectedException();
438 <        }
439 <        joinPool(p);
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 +     * callable(Runnable) returns null when called
524 +     */
525 +    public void testCallable1() throws Exception {
526 +        Callable c = Executors.callable(new NoOpRunnable());
527 +        assertNull(c.call());
528 +    }
529  
530 +    /**
531 +     * callable(Runnable, result) returns result when called
532 +     */
533 +    public void testCallable2() throws Exception {
534 +        Callable c = Executors.callable(new NoOpRunnable(), one);
535 +        assertSame(one, c.call());
536 +    }
537  
538      /**
539 <     *  invoke(Executor, Callable) throws InterruptedException if
446 <     *  callable throws exception
539 >     * callable(PrivilegedAction) returns its result when called
540       */
541 <    public void testInvoke5() {
542 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
543 <        
544 <        final Callable c = new Callable() {
545 <                public Object call() {
453 <                    try {
454 <                        Executors.invoke(p, new SmallCallable());
455 <                        shouldThrow();
456 <                    } catch(InterruptedException e){}
457 <                    catch(RejectedExecutionException e2){}
458 <                    catch(ExecutionException e3){}
459 <                    return Boolean.TRUE;
460 <                }
461 <            };
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 +    /**
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 <        Thread t = new Thread(new Runnable() {
558 <                public void run() {
559 <                    try {
468 <                        c.call();
469 <                    } catch(Exception e){}
470 <                }
471 <          });
556 >    /**
557 >     * callable(null Runnable) throws NPE
558 >     */
559 >    public void testCallableNPE1() {
560          try {
561 <            t.start();
562 <            Thread.sleep(SHORT_DELAY_MS);
563 <            t.interrupt();
476 <            t.join();
477 <        } catch(InterruptedException e){
478 <            unexpectedException();
479 <        }
480 <        
481 <        joinPool(p);
561 >            Callable c = Executors.callable((Runnable) null);
562 >            shouldThrow();
563 >        } catch (NullPointerException success) {}
564      }
565  
566      /**
567 <     *  invoke(Executor, Callable) will throw ExecutionException
486 <     *  if callable throws exception
567 >     * callable(null, result) throws NPE
568       */
569 <    public void testInvoke6() {
489 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
490 <
569 >    public void testCallableNPE2() {
570          try {
571 <            Callable c = new Callable() {
493 <                    public Object call() {
494 <                        int i = 5/0;
495 <                        return Boolean.TRUE;
496 <                    }
497 <                };
498 <            
499 <            for(int i =0; i < 5; i++){
500 <                Executors.invoke(p,c);
501 <            }
502 <            
571 >            Callable c = Executors.callable((Runnable) null, one);
572              shouldThrow();
573 <        }
505 <        catch(ExecutionException success){
506 <        } catch(Exception e) {
507 <            unexpectedException();
508 <        }
509 <        joinPool(p);
573 >        } catch (NullPointerException success) {}
574      }
575  
512
513
576      /**
577 <     *  timeouts from execute will time out if they compute too long.
577 >     * callable(null PrivilegedAction) throws NPE
578       */
579 <    public void testTimedCallable() {
518 <        int N = 10000;
519 <        ExecutorService executor = Executors.newSingleThreadExecutor();
520 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
579 >    public void testCallableNPE3() {
580          try {
581 <            long startTime = System.currentTimeMillis();
582 <            
583 <            long i = 0;
525 <            while (tasks.size() < N) {
526 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
527 <                i += 10;
528 <            }
529 <            
530 <            int iters = 0;
531 <            BigInteger sum = BigInteger.ZERO;
532 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
533 <                try {
534 <                    ++iters;
535 <                    sum = sum.add(it.next().call());
536 <                }
537 <                catch (TimeoutException success) {
538 <                    assertTrue(iters > 0);
539 <                    return;
540 <                }
541 <                catch (Exception e) {
542 <                    unexpectedException();
543 <                }
544 <            }
545 <            // if by chance we didn't ever time out, total time must be small
546 <            long elapsed = System.currentTimeMillis() - startTime;
547 <            assertTrue(elapsed < N);
548 <        }
549 <        finally {
550 <            joinPool(executor);
551 <        }
581 >            Callable c = Executors.callable((PrivilegedAction) null);
582 >            shouldThrow();
583 >        } catch (NullPointerException success) {}
584      }
585  
586 <    
587 <
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