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.5 by dl, Thu Sep 25 11:02:41 2003 UTC vs.
Revision 1.52 by dl, Sat Feb 1 16:45:50 2020 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 MyTask implements Runnable {
25 <        public void run() { completed = true; }
26 <        public boolean isCompleted() { return completed; }
27 <        public void reset() { completed = false; }
28 <        private boolean completed = false;
29 <    }
30 <
31 <    private static class StringTask implements Callable<String> {
32 <        public String call() { return TEST_STRING; }
33 <    }
34 <
35 <    static class DirectExecutor implements Executor {
36 <        public void execute(Runnable r) {
37 <            r.run();
38 <        }
39 <    }
40 <
41 <    static class TimedCallable<T> implements Callable<T> {
42 <        private final Executor exec;
43 <        private final Callable<T> func;
44 <        private final long msecs;
45 <        
46 <        TimedCallable(Executor exec, Callable<T> func, long msecs) {
47 <            this.exec = exec;
48 <            this.func = func;
49 <            this.msecs = msecs;
50 <        }
51 <        
52 <        public T call() throws Exception {
53 <            Future<T> ftask = Executors.execute(exec, func);
54 <            try {
55 <                return ftask.get(msecs, TimeUnit.MILLISECONDS);
56 <            } finally {
57 <                ftask.cancel(true);
58 <            }
59 <        }
60 <    }
61 <
62 <
63 <    private static class Fib implements Callable<BigInteger> {
64 <        private final BigInteger n;
65 <        Fib(long n) {
66 <            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
67 <            this.n = BigInteger.valueOf(n);
68 <        }
69 <        public BigInteger call() {
70 <            BigInteger f1 = BigInteger.ONE;
71 <            BigInteger f2 = f1;
72 <            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
73 <                BigInteger t = f1.add(f2);
74 <                f1 = f2;
75 <                f2 = t;
76 <            }
77 <            return f1;
78 <        }
79 <    };
80 <
81 <    /**
82 <     * For use as ThreadFactory in constructors
83 <     */
84 <    static class MyThreadFactory implements ThreadFactory{
85 <        public Thread newThread(Runnable r){
86 <            return new Thread(r);
87 <        }  
34 >        return new TestSuite(ExecutorsTest.class);
35      }
36  
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 MyThreadFactory());
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 114 | Line 63 | public class ExecutorsTest extends JSR16
63       */
64      public void testNewCachedThreadPool3() {
65          try {
66 <            ExecutorService e = Executors.newCachedThreadPool(null);
66 >            ExecutorService unused = Executors.newCachedThreadPool(null);
67              shouldThrow();
68 <        }
120 <        catch(NullPointerException success) {
121 <        }
68 >        } catch (NullPointerException success) {}
69      }
70  
124
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 MyThreadFactory());
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 149 | Line 97 | public class ExecutorsTest extends JSR16
97       */
98      public void testNewSingleThreadExecutor3() {
99          try {
100 <            ExecutorService e = Executors.newSingleThreadExecutor(null);
100 >            ExecutorService unused = 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 160 | 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 MyThreadFactory());
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      /**
143 <     * A new newFixedThreadPool with null ThreadFactory throws NPE
143 >     * A new newFixedThreadPool with null ThreadFactory throws
144 >     * NullPointerException
145       */
146      public void testNewFixedThreadPool3() {
147          try {
148 <            ExecutorService e = Executors.newFixedThreadPool(2, null);
148 >            ExecutorService unused = Executors.newFixedThreadPool(2, null);
149              shouldThrow();
150 <        }
189 <        catch(NullPointerException success) {
190 <        }
150 >        } catch (NullPointerException success) {}
151      }
152  
153      /**
154 <     * A new newFixedThreadPool with 0 threads throws IAE
154 >     * A new newFixedThreadPool with 0 threads throws IllegalArgumentException
155       */
156      public void testNewFixedThreadPool4() {
157          try {
158 <            ExecutorService e = Executors.newFixedThreadPool(0);
158 >            ExecutorService unused = Executors.newFixedThreadPool(0);
159              shouldThrow();
160 <        }
201 <        catch(IllegalArgumentException success) {
202 <        }
160 >        } catch (IllegalArgumentException success) {}
161      }
162  
163      /**
164 <     * execute of runnable runs it to completion
164 >     * An unconfigurable newFixedThreadPool can execute runnables
165       */
166 <    public void testExecuteRunnable () {
167 <        try {
168 <            Executor e = new DirectExecutor();
169 <            MyTask task = new MyTask();
170 <            assertFalse(task.isCompleted());
171 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
214 <            String result = future.get();
215 <            assertTrue(task.isCompleted());
216 <            assertSame(TEST_STRING, result);
217 <        }
218 <        catch (ExecutionException ex) {
219 <            unexpectedException();
220 <        }
221 <        catch (InterruptedException ex) {
222 <            unexpectedException();
166 >    public void testUnconfigurableExecutorService() {
167 >        final ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
168 >        try (PoolCleaner cleaner = cleaner(e)) {
169 >            e.execute(new NoOpRunnable());
170 >            e.execute(new NoOpRunnable());
171 >            e.execute(new NoOpRunnable());
172          }
173      }
174  
175      /**
176 <     * invoke of a runnable runs it to completion
176 >     * unconfigurableExecutorService(null) throws NPE
177       */
178 <    public void testInvokeRunnable () {
178 >    public void testUnconfigurableExecutorServiceNPE() {
179          try {
180 <            Executor e = new DirectExecutor();
181 <            MyTask task = new MyTask();
182 <            assertFalse(task.isCompleted());
183 <            Executors.invoke(e, task);
235 <            assertTrue(task.isCompleted());
236 <        }
237 <        catch (ExecutionException ex) {
238 <            unexpectedException();
239 <        }
240 <        catch (InterruptedException ex) {
241 <            unexpectedException();
242 <        }
180 >            ExecutorService unused =
181 >                Executors.unconfigurableExecutorService(null);
182 >            shouldThrow();
183 >        } catch (NullPointerException success) {}
184      }
185  
186      /**
187 <     * execute of a callable runs it to completion
187 >     * unconfigurableScheduledExecutorService(null) throws NPE
188       */
189 <    public void testExecuteCallable () {
189 >    public void testUnconfigurableScheduledExecutorServiceNPE() {
190          try {
191 <            Executor e = new DirectExecutor();
192 <            Future<String> future = Executors.execute(e, new StringTask());
193 <            String result = future.get();
194 <            assertSame(TEST_STRING, result);
254 <        }
255 <        catch (ExecutionException ex) {
256 <            unexpectedException();
257 <        }
258 <        catch (InterruptedException ex) {
259 <            unexpectedException();
260 <        }
191 >            ExecutorService unused =
192 >                Executors.unconfigurableScheduledExecutorService(null);
193 >            shouldThrow();
194 >        } catch (NullPointerException success) {}
195      }
196  
197      /**
198 <     * invoke of a collable runs it to completion
198 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
199       */
200 <    public void testInvokeCallable () {
201 <        try {
202 <            Executor e = new DirectExecutor();
203 <            String result = Executors.invoke(e, new StringTask());
204 <
205 <            assertSame(TEST_STRING, result);
206 <        }
207 <        catch (ExecutionException ex) {
208 <            unexpectedException();
209 <        }
210 <        catch (InterruptedException ex) {
211 <            unexpectedException();
200 >    public void testNewSingleThreadScheduledExecutor() throws Exception {
201 >        final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
202 >        try (PoolCleaner cleaner = cleaner(p)) {
203 >            final CountDownLatch proceed = new CountDownLatch(1);
204 >            final Runnable task = new CheckedRunnable() {
205 >                public void realRun() {
206 >                    await(proceed);
207 >                }};
208 >            long startTime = System.nanoTime();
209 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
210 >                                  timeoutMillis(), MILLISECONDS);
211 >            assertFalse(f.isDone());
212 >            proceed.countDown();
213 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
214 >            assertSame(Boolean.TRUE, f.get());
215 >            assertTrue(f.isDone());
216 >            assertFalse(f.isCancelled());
217 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
218          }
219      }
220  
221      /**
222 <     * execute with null executor throws NPE
222 >     * a newScheduledThreadPool successfully runs delayed task
223       */
224 <    public void testNullExecuteRunnable () {
225 <        try {
226 <            MyTask task = new MyTask();
227 <            assertFalse(task.isCompleted());
228 <            Future<String> future = Executors.execute(null, task, TEST_STRING);
229 <            shouldThrow();
230 <        }
231 <        catch (NullPointerException success) {
232 <        }
233 <        catch (Exception ex) {
234 <            unexpectedException();
224 >    public void testNewScheduledThreadPool() throws Exception {
225 >        final ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
226 >        try (PoolCleaner cleaner = cleaner(p)) {
227 >            final CountDownLatch proceed = new CountDownLatch(1);
228 >            final Runnable task = new CheckedRunnable() {
229 >                public void realRun() {
230 >                    await(proceed);
231 >                }};
232 >            long startTime = System.nanoTime();
233 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
234 >                                  timeoutMillis(), MILLISECONDS);
235 >            assertFalse(f.isDone());
236 >            proceed.countDown();
237 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
238 >            assertSame(Boolean.TRUE, f.get());
239 >            assertTrue(f.isDone());
240 >            assertFalse(f.isCancelled());
241 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
242          }
243      }
244  
245      /**
246 <     * execute with a null runnable throws NPE
246 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
247       */
248 <    public void testExecuteNullRunnable() {
249 <        try {
250 <            Executor e = new DirectExecutor();
251 <            MyTask task = null;
252 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
253 <            shouldThrow();
254 <        }
255 <        catch (NullPointerException success) {
256 <        }
257 <        catch (Exception ex) {
258 <            unexpectedException();
248 >    public void testUnconfigurableScheduledExecutorService() throws Exception {
249 >        final ScheduledExecutorService p =
250 >            Executors.unconfigurableScheduledExecutorService
251 >            (Executors.newScheduledThreadPool(2));
252 >        try (PoolCleaner cleaner = cleaner(p)) {
253 >            final CountDownLatch proceed = new CountDownLatch(1);
254 >            final Runnable task = new CheckedRunnable() {
255 >                public void realRun() {
256 >                    await(proceed);
257 >                }};
258 >            long startTime = System.nanoTime();
259 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
260 >                                  timeoutMillis(), MILLISECONDS);
261 >            assertFalse(f.isDone());
262 >            proceed.countDown();
263 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
264 >            assertSame(Boolean.TRUE, f.get());
265 >            assertTrue(f.isDone());
266 >            assertFalse(f.isCancelled());
267 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
268          }
269      }
270  
271      /**
272 <     * invoke of a null runnable throws NPE
272 >     * Future.get on submitted tasks will time out if they compute too long.
273       */
274 <    public void testInvokeNullRunnable () {
275 <        try {
276 <            Executor e = new DirectExecutor();
277 <            MyTask task = null;
278 <            Executors.invoke(e, task);
279 <            shouldThrow();
280 <        }
281 <        catch (NullPointerException success) {
282 <        }
283 <        catch (Exception ex) {
284 <            unexpectedException();
285 <        }
274 >    public void testTimedCallable() throws Exception {
275 >        final ExecutorService[] executors = {
276 >            Executors.newSingleThreadExecutor(),
277 >            Executors.newCachedThreadPool(),
278 >            Executors.newFixedThreadPool(2),
279 >            Executors.newScheduledThreadPool(2),
280 >        };
281 >
282 >        final Runnable sleeper = new CheckedRunnable() {
283 >            public void realRun() throws InterruptedException {
284 >                try {
285 >                    delay(LONG_DELAY_MS);
286 >                } catch(InterruptedException OK) {
287 >                }
288 >            }};
289 >
290 >        List<Thread> threads = new ArrayList<>();
291 >        for (final ExecutorService executor : executors) {
292 >            threads.add(newStartedThread(new CheckedRunnable() {
293 >                public void realRun() {
294 >                    Future future = executor.submit(sleeper);
295 >                    assertFutureTimesOut(future);
296 >                }}));
297 >        }
298 >        for (Thread thread : threads)
299 >            awaitTermination(thread);
300 >        for (ExecutorService executor : executors)
301 >            executor.shutdownNow(); // assumes shutdownNow interrupts threads
302 >        for (ExecutorService executor : executors)
303 >            joinPool(executor);
304      }
305  
306      /**
307 <     * execute of a null callable throws NPE
307 >     * ThreadPoolExecutor using defaultThreadFactory has
308 >     * specified group, priority, daemon status, and name
309       */
310 <    public void testExecuteNullCallable () {
311 <        try {
312 <            Executor e = new DirectExecutor();
313 <            StringTask t = null;
314 <            Future<String> future = Executors.execute(e, t);
315 <            shouldThrow();
316 <        }
317 <        catch (NullPointerException success) {
318 <        }
319 <        catch (Exception ex) {
320 <            unexpectedException();
310 >    public void testDefaultThreadFactory() throws Exception {
311 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
312 >        final CountDownLatch done = new CountDownLatch(1);
313 >        Runnable r = new CheckedRunnable() {
314 >            public void realRun() {
315 >                try {
316 >                    Thread current = Thread.currentThread();
317 >                    assertFalse(current.isDaemon());
318 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
319 >                    SecurityManager s = System.getSecurityManager();
320 >                    assertSame(current.getThreadGroup(),
321 >                               (s == null) ? egroup : s.getThreadGroup());
322 >                    assertTrue(current.getName().endsWith("thread-1"));
323 >                } catch (SecurityException ok) {
324 >                    // Also pass if not allowed to change setting
325 >                }
326 >                done.countDown();
327 >            }};
328 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
329 >        try (PoolCleaner cleaner = cleaner(e)) {
330 >            e.execute(r);
331 >            await(done);
332          }
333      }
334  
335      /**
336 <     * invoke of a null callable throws NPE
337 <     */
338 <    public void testInvokeNullCallable () {
339 <        try {
340 <            Executor e = new DirectExecutor();
341 <            StringTask t = null;
342 <            String result = Executors.invoke(e, t);
343 <            shouldThrow();
336 >     * ThreadPoolExecutor using privilegedThreadFactory has
337 >     * specified group, priority, daemon status, name,
338 >     * access control context and context class loader
339 >     */
340 >    public void testPrivilegedThreadFactory() throws Exception {
341 >        final CountDownLatch done = new CountDownLatch(1);
342 >        Runnable r = new CheckedRunnable() {
343 >            public void realRun() throws Exception {
344 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
345 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
346 >                final AccessControlContext thisacc = AccessController.getContext();
347 >                Runnable r = new CheckedRunnable() {
348 >                    public void realRun() {
349 >                        Thread current = Thread.currentThread();
350 >                        assertFalse(current.isDaemon());
351 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
352 >                        SecurityManager s = System.getSecurityManager();
353 >                        assertSame(current.getThreadGroup(),
354 >                                   (s == null) ? egroup : s.getThreadGroup());
355 >                        assertTrue(current.getName().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();
393 <        } catch(RejectedExecutionException e){}
394 <        joinPool(p);
395 <    }
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
400 <     *  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
435 <     *  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 <            
446 <            for(int i =0; i < 5; i++){
447 <                Executors.invoke(p,r);
448 <            }
449 <            
450 <            shouldThrow();
451 <        } catch(ExecutionException success){
452 <        } catch(Exception e){
453 <            unexpectedException();
454 <        }
455 <        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
462 <     *  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() {
469 <                    try {
470 <                        Executors.invoke(p, new SmallCallable());
471 <                        shouldThrow();
472 <                    } catch(InterruptedException e){}
473 <                    catch(RejectedExecutionException e2){}
474 <                    catch(ExecutionException e3){}
475 <                    return Boolean.TRUE;
476 <                }
477 <            };
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 {
484 <                        c.call();
485 <                    } catch(Exception e){}
486 <                }
487 <          });
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();
492 <            t.join();
493 <        } catch(InterruptedException e){
494 <            unexpectedException();
495 <        }
496 <        
497 <        joinPool(p);
561 >            Callable unused = Executors.callable((Runnable) null);
562 >            shouldThrow();
563 >        } catch (NullPointerException success) {}
564      }
565  
566      /**
567 <     *  invoke(Executor, Callable) will throw ExecutionException
502 <     *  if callable throws exception
567 >     * callable(null, result) throws NPE
568       */
569 <    public void testInvoke6() {
505 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
506 <
569 >    public void testCallableNPE2() {
570          try {
571 <            Callable c = new Callable() {
509 <                    public Object call() {
510 <                        int i = 5/0;
511 <                        return Boolean.TRUE;
512 <                    }
513 <                };
514 <            
515 <            for(int i =0; i < 5; i++){
516 <                Executors.invoke(p,c);
517 <            }
518 <            
571 >            Callable unused = Executors.callable((Runnable) null, one);
572              shouldThrow();
573 <        }
521 <        catch(ExecutionException success){
522 <        } catch(Exception e) {
523 <            unexpectedException();
524 <        }
525 <        joinPool(p);
573 >        } catch (NullPointerException success) {}
574      }
575  
576 <
576 >    /**
577 >     * callable(null PrivilegedAction) throws NPE
578 >     */
579 >    public void testCallableNPE3() {
580 >        try {
581 >            Callable unused = Executors.callable((PrivilegedAction) null);
582 >            shouldThrow();
583 >        } catch (NullPointerException success) {}
584 >    }
585  
586      /**
587 <     *  timeouts from execute will time out if they compute too long.
587 >     * callable(null PrivilegedExceptionAction) throws NPE
588       */
589 <    public void testTimedCallable() {
534 <        int N = 10000;
535 <        ExecutorService executor = Executors.newSingleThreadExecutor();
536 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
589 >    public void testCallableNPE4() {
590          try {
591 <            long startTime = System.currentTimeMillis();
592 <            
593 <            long i = 0;
594 <            while (tasks.size() < N) {
595 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
596 <                i += 10;
597 <            }
598 <            
599 <            int iters = 0;
600 <            BigInteger sum = BigInteger.ZERO;
601 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
602 <                try {
603 <                    ++iters;
604 <                    sum = sum.add(it.next().call());
605 <                }
553 <                catch (TimeoutException success) {
554 <                    assertTrue(iters > 0);
555 <                    return;
556 <                }
557 <                catch (Exception e) {
558 <                    unexpectedException();
559 <                }
560 <            }
561 <            // if by chance we didn't ever time out, total time must be small
562 <            long elapsed = System.currentTimeMillis() - startTime;
563 <            assertTrue(elapsed < N);
564 <        }
565 <        finally {
566 <            joinPool(executor);
591 >            Callable unused = Executors.callable((PrivilegedExceptionAction) null);
592 >            shouldThrow();
593 >        } catch (NullPointerException success) {}
594 >    }
595 >
596 >    /**
597 >     * callable(runnable, x).toString() contains toString of wrapped task
598 >     */
599 >    public void testCallable_withResult_toString() {
600 >        if (testImplementationDetails) {
601 >            Runnable r = () -> {};
602 >            Callable<String> c = Executors.callable(r, "");
603 >            assertEquals(
604 >                identityString(c) + "[Wrapped task = " + r.toString() + "]",
605 >                c.toString());
606          }
607      }
608  
609 <    
609 >    /**
610 >     * callable(runnable).toString() contains toString of wrapped task
611 >     */
612 >    public void testCallable_toString() {
613 >        if (testImplementationDetails) {
614 >            Runnable r = () -> {};
615 >            Callable<Object> c = Executors.callable(r);
616 >            assertEquals(
617 >                identityString(c) + "[Wrapped task = " + r.toString() + "]",
618 >                c.toString());
619 >        }
620 >    }
621  
622 +    /**
623 +     * privilegedCallable(callable).toString() contains toString of wrapped task
624 +     */
625 +    public void testPrivilegedCallable_toString() {
626 +        if (testImplementationDetails) {
627 +            Callable<String> c = () -> "";
628 +            Callable<String> priv = Executors.privilegedCallable(c);
629 +            assertEquals(
630 +                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
631 +                priv.toString());
632 +        }
633 +    }
634  
635 +    /**
636 +     * privilegedCallableUsingCurrentClassLoader(callable).toString()
637 +     * contains toString of wrapped task
638 +     */
639 +    public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
640 +        if (testImplementationDetails) {
641 +            Callable<String> c = () -> "";
642 +            Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
643 +            assertEquals(
644 +                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
645 +                priv.toString());
646 +        }
647 +    }
648   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines