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.9 by tim, Tue Dec 9 19:09:24 2003 UTC vs.
Revision 1.51 by jsr166, Mon Dec 16 22:55:54 2019 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;
15 < import java.security.*;
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);
35      }
36  
23    private static final String TEST_STRING = "a test string";
24
25    private static class StringTask implements Callable<String> {
26        public String call() { return TEST_STRING; }
27    }
28
29    static class DirectExecutor implements Executor {
30        public void execute(Runnable r) {
31            r.run();
32        }
33    }
34
35    static class TimedCallable<T> implements Callable<T> {
36        private final Executor exec;
37        private final Callable<T> func;
38        private final long msecs;
39        
40        TimedCallable(Executor exec, Callable<T> func, long msecs) {
41            this.exec = exec;
42            this.func = func;
43            this.msecs = msecs;
44        }
45        
46        public T call() throws Exception {
47            Future<T> ftask = Executors.execute(exec, func);
48            try {
49                return ftask.get(msecs, TimeUnit.MILLISECONDS);
50            } finally {
51                ftask.cancel(true);
52            }
53        }
54    }
55
56
57    private static class Fib implements Callable<BigInteger> {
58        private final BigInteger n;
59        Fib(long n) {
60            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
61            this.n = BigInteger.valueOf(n);
62        }
63        public BigInteger call() {
64            BigInteger f1 = BigInteger.ONE;
65            BigInteger f2 = f1;
66            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
67                BigInteger t = f1.add(f2);
68                f1 = f2;
69                f2 = t;
70            }
71            return f1;
72        }
73    };
74
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 99 | 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 <        }
105 <        catch(NullPointerException success) {
106 <        }
68 >        } catch (NullPointerException success) {}
69      }
70  
109
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 134 | 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 145 | 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      /**
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 <        }
174 <        catch(NullPointerException success) {
175 <        }
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 <        }
186 <        catch(IllegalArgumentException success) {
187 <        }
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 <            TrackedShortRunnable task = new TrackedShortRunnable();
170 <            assertFalse(task.done);
171 <            Future<?> future = Executors.execute(e, task);
199 <            future.get();
200 <            assertTrue(task.done);
201 <        }
202 <        catch (ExecutionException ex) {
203 <            unexpectedException();
204 <        }
205 <        catch (InterruptedException ex) {
206 <            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 <            TrackedShortRunnable task = new TrackedShortRunnable();
182 <            assertFalse(task.done);
183 <            Executors.invoke(e, task);
219 <            assertTrue(task.done);
220 <        }
221 <        catch (ExecutionException ex) {
222 <            unexpectedException();
223 <        }
224 <        catch (InterruptedException ex) {
225 <            unexpectedException();
226 <        }
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);
195 <        }
196 <        catch (ExecutionException ex) {
197 <            unexpectedException();
191 >            ExecutorService unused =
192 >                Executors.unconfigurableScheduledExecutorService(null);
193 >            shouldThrow();
194 >        } catch (NullPointerException success) {}
195 >    }
196 >
197 >    /**
198 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
199 >     */
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 <        catch (InterruptedException ex) {
220 <            unexpectedException();
219 >    }
220 >
221 >    /**
222 >     * a newScheduledThreadPool successfully runs delayed task
223 >     */
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 +     * an unconfigurable newScheduledThreadPool successfully runs delayed task
247 +     */
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 <     * execute of a privileged action runs it to completion
272 >     * Future.get on submitted tasks will time out if they compute too long.
273       */
274 <    public void testExecutePrivilegedAction() {
275 <        Policy savedPolicy = Policy.getPolicy();
276 <        AdjustablePolicy policy = new AdjustablePolicy();
277 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
278 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
279 <        Policy.setPolicy(policy);
280 <        try {
258 <            Executor e = new DirectExecutor();
259 <            Future future = Executors.execute(e, new PrivilegedAction() {
260 <                    public Object run() {
261 <                        return TEST_STRING;
262 <                    }});
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 <            Object result = future.get();
283 <            assertSame(TEST_STRING, result);
284 <        }
285 <        catch (ExecutionException ex) {
286 <            unexpectedException();
287 <        }
288 <        catch (InterruptedException ex) {
289 <            unexpectedException();
282 >        final Runnable sleeper = new CheckedInterruptedRunnable() {
283 >            public void realRun() throws InterruptedException {
284 >                delay(LONG_DELAY_MS);
285 >            }};
286 >
287 >        List<Thread> threads = new ArrayList<>();
288 >        for (final ExecutorService executor : executors) {
289 >            threads.add(newStartedThread(new CheckedRunnable() {
290 >                public void realRun() {
291 >                    Future future = executor.submit(sleeper);
292 >                    assertFutureTimesOut(future);
293 >                }}));
294          }
295 <        finally {
296 <            Policy.setPolicy(savedPolicy);
295 >        for (Thread thread : threads)
296 >            awaitTermination(thread);
297 >        for (ExecutorService executor : executors)
298 >            joinPool(executor);
299 >    }
300 >
301 >    /**
302 >     * ThreadPoolExecutor using defaultThreadFactory has
303 >     * specified group, priority, daemon status, and name
304 >     */
305 >    public void testDefaultThreadFactory() throws Exception {
306 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
307 >        final CountDownLatch done = new CountDownLatch(1);
308 >        Runnable r = new CheckedRunnable() {
309 >            public void realRun() {
310 >                try {
311 >                    Thread current = Thread.currentThread();
312 >                    assertFalse(current.isDaemon());
313 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
314 >                    SecurityManager s = System.getSecurityManager();
315 >                    assertSame(current.getThreadGroup(),
316 >                               (s == null) ? egroup : s.getThreadGroup());
317 >                    assertTrue(current.getName().endsWith("thread-1"));
318 >                } catch (SecurityException ok) {
319 >                    // Also pass if not allowed to change setting
320 >                }
321 >                done.countDown();
322 >            }};
323 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
324 >        try (PoolCleaner cleaner = cleaner(e)) {
325 >            e.execute(r);
326 >            await(done);
327          }
328      }
329  
330      /**
331 <     * execute of a privileged exception action runs it to completion
331 >     * ThreadPoolExecutor using privilegedThreadFactory has
332 >     * specified group, priority, daemon status, name,
333 >     * access control context and context class loader
334       */
335 <    public void testExecutePrivilegedExceptionAction() {
336 <        Policy savedPolicy = Policy.getPolicy();
337 <        AdjustablePolicy policy = new AdjustablePolicy();
338 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
339 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
340 <        Policy.setPolicy(policy);
341 <        try {
342 <            Executor e = new DirectExecutor();
343 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
344 <                    public Object run() {
345 <                        return TEST_STRING;
346 <                    }});
335 >    public void testPrivilegedThreadFactory() throws Exception {
336 >        final CountDownLatch done = new CountDownLatch(1);
337 >        Runnable r = new CheckedRunnable() {
338 >            public void realRun() throws Exception {
339 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
340 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
341 >                final AccessControlContext thisacc = AccessController.getContext();
342 >                Runnable r = new CheckedRunnable() {
343 >                    public void realRun() {
344 >                        Thread current = Thread.currentThread();
345 >                        assertFalse(current.isDaemon());
346 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
347 >                        SecurityManager s = System.getSecurityManager();
348 >                        assertSame(current.getThreadGroup(),
349 >                                   (s == null) ? egroup : s.getThreadGroup());
350 >                        assertTrue(current.getName().endsWith("thread-1"));
351 >                        assertSame(thisccl, current.getContextClassLoader());
352 >                        assertEquals(thisacc, AccessController.getContext());
353 >                        done.countDown();
354 >                    }};
355 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
356 >                try (PoolCleaner cleaner = cleaner(e)) {
357 >                    e.execute(r);
358 >                    await(done);
359 >                }
360 >            }};
361  
362 <            Object result = future.get();
363 <            assertSame(TEST_STRING, result);
364 <        }
365 <        catch (ExecutionException ex) {
366 <            unexpectedException();
362 >        runWithPermissions(r,
363 >                           new RuntimePermission("getClassLoader"),
364 >                           new RuntimePermission("setContextClassLoader"),
365 >                           new RuntimePermission("modifyThread"));
366 >    }
367 >
368 >    boolean haveCCLPermissions() {
369 >        SecurityManager sm = System.getSecurityManager();
370 >        if (sm != null) {
371 >            try {
372 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
373 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
374 >            } catch (AccessControlException e) {
375 >                return false;
376 >            }
377          }
378 <        catch (InterruptedException ex) {
379 <            unexpectedException();
378 >        return true;
379 >    }
380 >
381 >    void checkCCL() {
382 >        SecurityManager sm = System.getSecurityManager();
383 >        if (sm != null) {
384 >            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
385 >            sm.checkPermission(new RuntimePermission("getClassLoader"));
386          }
387 <        finally {
388 <            Policy.setPolicy(savedPolicy);
387 >    }
388 >
389 >    class CheckCCL implements Callable<Object> {
390 >        public Object call() {
391 >            checkCCL();
392 >            return null;
393          }
394      }
395  
396      /**
397 <     * execute of a failed privileged exception action reports exception
397 >     * Without class loader permissions, creating
398 >     * privilegedCallableUsingCurrentClassLoader throws ACE
399       */
400 <    public void testExecuteFailedPrivilegedExceptionAction() {
401 <        Policy savedPolicy = Policy.getPolicy();
402 <        AdjustablePolicy policy = new AdjustablePolicy();
403 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
404 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
405 <        Policy.setPolicy(policy);
406 <        try {
407 <            Executor e = new DirectExecutor();
408 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
409 <                    public Object run() throws Exception {
321 <                        throw new IndexOutOfBoundsException();
322 <                    }});
400 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
401 >        Runnable r = new CheckedRunnable() {
402 >            public void realRun() throws Exception {
403 >                if (System.getSecurityManager() == null)
404 >                    return;
405 >                try {
406 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
407 >                    shouldThrow();
408 >                } catch (AccessControlException success) {}
409 >            }};
410  
411 <            Object result = future.get();
325 <            shouldThrow();
326 <        }
327 <        catch (ExecutionException success) {
328 <        }
329 <        catch (InterruptedException ex) {
330 <            unexpectedException();
331 <        }
332 <        finally {
333 <            Policy.setPolicy(savedPolicy);
334 <        }
411 >        runWithoutPermissions(r);
412      }
413  
414      /**
415 <     * invoke of a collable runs it to completion
415 >     * With class loader permissions, calling
416 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
417       */
418 <    public void testInvokeCallable() {
419 <        try {
420 <            Executor e = new DirectExecutor();
421 <            String result = Executors.invoke(e, new StringTask());
418 >    public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
419 >        Runnable r = new CheckedRunnable() {
420 >            public void realRun() throws Exception {
421 >                Executors.privilegedCallableUsingCurrentClassLoader
422 >                    (new NoOpCallable())
423 >                    .call();
424 >            }};
425  
426 <            assertSame(TEST_STRING, result);
427 <        }
428 <        catch (ExecutionException ex) {
348 <            unexpectedException();
349 <        }
350 <        catch (InterruptedException ex) {
351 <            unexpectedException();
352 <        }
426 >        runWithPermissions(r,
427 >                           new RuntimePermission("getClassLoader"),
428 >                           new RuntimePermission("setContextClassLoader"));
429      }
430  
431      /**
432 <     * execute with null executor throws NPE
432 >     * Without permissions, calling privilegedCallable throws ACE
433       */
434 <    public void testNullExecuteRunnable() {
435 <        try {
436 <            TrackedShortRunnable task = new TrackedShortRunnable();
437 <            assertFalse(task.done);
438 <            Future<?> future = Executors.execute(null, task);
439 <            shouldThrow();
440 <        }
441 <        catch (NullPointerException success) {
442 <        }
443 <        catch (Exception ex) {
444 <            unexpectedException();
445 <        }
434 >    public void testPrivilegedCallableWithNoPrivs() throws Exception {
435 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
436 >        Executors.privilegedCallable(new CheckCCL());
437 >
438 >        Runnable r = new CheckedRunnable() {
439 >            public void realRun() throws Exception {
440 >                if (System.getSecurityManager() == null)
441 >                    return;
442 >                Callable task = Executors.privilegedCallable(new CheckCCL());
443 >                try {
444 >                    task.call();
445 >                    shouldThrow();
446 >                } catch (AccessControlException success) {}
447 >            }};
448 >
449 >        runWithoutPermissions(r);
450 >
451 >        // It seems rather difficult to test that the
452 >        // AccessControlContext of the privilegedCallable is used
453 >        // instead of its caller.  Below is a failed attempt to do
454 >        // that, which does not work because the AccessController
455 >        // cannot capture the internal state of the current Policy.
456 >        // It would be much more work to differentiate based on,
457 >        // e.g. CodeSource.
458 >
459 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
460 > //         final Callable[] task = new Callable[1];
461 >
462 > //         runWithPermissions
463 > //             (new CheckedRunnable() {
464 > //                 public void realRun() {
465 > //                     if (System.getSecurityManager() == null)
466 > //                         return;
467 > //                     noprivAcc[0] = AccessController.getContext();
468 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
469 > //                     try {
470 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
471 > //                                                           public Void run() {
472 > //                                                               checkCCL();
473 > //                                                               return null;
474 > //                                                           }}, noprivAcc[0]);
475 > //                         shouldThrow();
476 > //                     } catch (AccessControlException success) {}
477 > //                 }});
478 >
479 > //         runWithPermissions
480 > //             (new CheckedRunnable() {
481 > //                 public void realRun() throws Exception {
482 > //                     if (System.getSecurityManager() == null)
483 > //                         return;
484 > //                     // Verify that we have an underprivileged ACC
485 > //                     try {
486 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
487 > //                                                           public Void run() {
488 > //                                                               checkCCL();
489 > //                                                               return null;
490 > //                                                           }}, noprivAcc[0]);
491 > //                         shouldThrow();
492 > //                     } catch (AccessControlException success) {}
493 >
494 > //                     try {
495 > //                         task[0].call();
496 > //                         shouldThrow();
497 > //                     } catch (AccessControlException success) {}
498 > //                 }},
499 > //              new RuntimePermission("getClassLoader"),
500 > //              new RuntimePermission("setContextClassLoader"));
501      }
502  
503      /**
504 <     * execute with a null runnable throws NPE
504 >     * With permissions, calling privilegedCallable succeeds
505       */
506 <    public void testExecuteNullRunnable() {
507 <        try {
508 <            Executor e = new DirectExecutor();
509 <            TrackedShortRunnable task = null;
510 <            Future<?> future = Executors.execute(e, task);
511 <            shouldThrow();
512 <        }
513 <        catch (NullPointerException success) {
514 <        }
384 <        catch (Exception ex) {
385 <            unexpectedException();
386 <        }
506 >    public void testPrivilegedCallableWithPrivs() throws Exception {
507 >        Runnable r = new CheckedRunnable() {
508 >            public void realRun() throws Exception {
509 >                Executors.privilegedCallable(new CheckCCL()).call();
510 >            }};
511 >
512 >        runWithPermissions(r,
513 >                           new RuntimePermission("getClassLoader"),
514 >                           new RuntimePermission("setContextClassLoader"));
515      }
516  
517      /**
518 <     * invoke of a null runnable throws NPE
518 >     * callable(Runnable) returns null when called
519       */
520 <    public void testInvokeNullRunnable() {
521 <        try {
522 <            Executor e = new DirectExecutor();
395 <            TrackedShortRunnable task = null;
396 <            Executors.invoke(e, task);
397 <            shouldThrow();
398 <        }
399 <        catch (NullPointerException success) {
400 <        }
401 <        catch (Exception ex) {
402 <            unexpectedException();
403 <        }
520 >    public void testCallable1() throws Exception {
521 >        Callable c = Executors.callable(new NoOpRunnable());
522 >        assertNull(c.call());
523      }
524  
525      /**
526 <     * execute of a null callable throws NPE
526 >     * callable(Runnable, result) returns result when called
527       */
528 <    public void testExecuteNullCallable() {
529 <        try {
530 <            Executor e = new DirectExecutor();
412 <            StringTask t = null;
413 <            Future<String> future = Executors.execute(e, t);
414 <            shouldThrow();
415 <        }
416 <        catch (NullPointerException success) {
417 <        }
418 <        catch (Exception ex) {
419 <            unexpectedException();
420 <        }
528 >    public void testCallable2() throws Exception {
529 >        Callable c = Executors.callable(new NoOpRunnable(), one);
530 >        assertSame(one, c.call());
531      }
532  
533      /**
534 <     * invoke of a null callable throws NPE
534 >     * callable(PrivilegedAction) returns its result when called
535       */
536 <    public void testInvokeNullCallable() {
537 <        try {
538 <            Executor e = new DirectExecutor();
539 <            StringTask t = null;
430 <            String result = Executors.invoke(e, t);
431 <            shouldThrow();
432 <        }
433 <        catch (NullPointerException success) {
434 <        }
435 <        catch (Exception ex) {
436 <            unexpectedException();
437 <        }
536 >    public void testCallable3() throws Exception {
537 >        Callable c = Executors.callable(new PrivilegedAction() {
538 >                public Object run() { return one; }});
539 >        assertSame(one, c.call());
540      }
541  
542      /**
543 <     *  execute(Executor, Runnable) throws RejectedExecutionException
442 <     *  if saturated.
543 >     * callable(PrivilegedExceptionAction) returns its result when called
544       */
545 <    public void testExecute1() {
546 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
547 <        try {
548 <            
448 <            for(int i = 0; i < 5; ++i){
449 <                Executors.execute(p, new MediumRunnable());
450 <            }
451 <            shouldThrow();
452 <        } catch(RejectedExecutionException success){}
453 <        joinPool(p);
545 >    public void testCallable4() throws Exception {
546 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
547 >                public Object run() { return one; }});
548 >        assertSame(one, c.call());
549      }
550  
551      /**
552 <     *  execute(Executor, Callable)throws RejectedExecutionException
458 <     *  if saturated.
552 >     * callable(null Runnable) throws NPE
553       */
554 <    public void testExecute2() {
461 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
554 >    public void testCallableNPE1() {
555          try {
556 <            for(int i = 0; i < 5; ++i) {
464 <                Executors.execute(p, new SmallCallable());
465 <            }
556 >            Callable unused = Executors.callable((Runnable) null);
557              shouldThrow();
558 <        } catch(RejectedExecutionException e){}
468 <        joinPool(p);
558 >        } catch (NullPointerException success) {}
559      }
560  
471
561      /**
562 <     *  invoke(Executor, Runnable) throws InterruptedException if
474 <     *  caller interrupted.
562 >     * callable(null, result) throws NPE
563       */
564 <    public void testInterruptedInvoke() {
477 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
478 <        Thread t = new Thread(new Runnable() {
479 <                public void run() {
480 <                    try {
481 <                        Executors.invoke(p,new Runnable() {
482 <                                public void run() {
483 <                                    try {
484 <                                        Thread.sleep(MEDIUM_DELAY_MS);
485 <                                        shouldThrow();
486 <                                    } catch(InterruptedException e){
487 <                                    }
488 <                                }
489 <                            });
490 <                    } catch(InterruptedException success){
491 <                    } catch(Exception e) {
492 <                        unexpectedException();
493 <                    }
494 <                    
495 <                }
496 <            });
564 >    public void testCallableNPE2() {
565          try {
566 <            t.start();
567 <            Thread.sleep(SHORT_DELAY_MS);
568 <            t.interrupt();
501 <        } catch(Exception e){
502 <            unexpectedException();
503 <        }
504 <        joinPool(p);
566 >            Callable unused = Executors.callable((Runnable) null, one);
567 >            shouldThrow();
568 >        } catch (NullPointerException success) {}
569      }
570  
571      /**
572 <     *  invoke(Executor, Runnable) throws ExecutionException if
509 <     *  runnable throws exception.
572 >     * callable(null PrivilegedAction) throws NPE
573       */
574 <    public void testInvoke3() {
512 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
574 >    public void testCallableNPE3() {
575          try {
576 <            Runnable r = new Runnable() {
515 <                    public void run() {
516 <                        int i = 5/0;
517 <                    }
518 <                };
519 <            
520 <            for(int i =0; i < 5; i++){
521 <                Executors.invoke(p,r);
522 <            }
523 <            
576 >            Callable unused = Executors.callable((PrivilegedAction) null);
577              shouldThrow();
578 <        } catch(ExecutionException success){
526 <        } catch(Exception e){
527 <            unexpectedException();
528 <        }
529 <        joinPool(p);
578 >        } catch (NullPointerException success) {}
579      }
580  
532
533
581      /**
582 <     *  invoke(Executor, Callable) throws InterruptedException if
536 <     *  callable throws exception
582 >     * callable(null PrivilegedExceptionAction) throws NPE
583       */
584 <    public void testInvoke5() {
539 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
540 <        
541 <        final Callable c = new Callable() {
542 <                public Object call() {
543 <                    try {
544 <                        Executors.invoke(p, new SmallCallable());
545 <                        shouldThrow();
546 <                    } catch(InterruptedException e){}
547 <                    catch(RejectedExecutionException e2){}
548 <                    catch(ExecutionException e3){}
549 <                    return Boolean.TRUE;
550 <                }
551 <            };
552 <
553 <
554 <        
555 <        Thread t = new Thread(new Runnable() {
556 <                public void run() {
557 <                    try {
558 <                        c.call();
559 <                    } catch(Exception e){}
560 <                }
561 <          });
584 >    public void testCallableNPE4() {
585          try {
586 <            t.start();
587 <            Thread.sleep(SHORT_DELAY_MS);
588 <            t.interrupt();
566 <            t.join();
567 <        } catch(InterruptedException e){
568 <            unexpectedException();
569 <        }
570 <        
571 <        joinPool(p);
586 >            Callable unused = Executors.callable((PrivilegedExceptionAction) null);
587 >            shouldThrow();
588 >        } catch (NullPointerException success) {}
589      }
590  
591      /**
592 <     *  invoke(Executor, Callable) will throw ExecutionException
576 <     *  if callable throws exception
592 >     * callable(runnable, x).toString() contains toString of wrapped task
593       */
594 <    public void testInvoke6() {
595 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
596 <
597 <        try {
598 <            Callable c = new Callable() {
599 <                    public Object call() {
600 <                        int i = 5/0;
585 <                        return Boolean.TRUE;
586 <                    }
587 <                };
588 <            
589 <            for(int i =0; i < 5; i++){
590 <                Executors.invoke(p,c);
591 <            }
592 <            
593 <            shouldThrow();
594 <        }
595 <        catch(ExecutionException success){
596 <        } catch(Exception e) {
597 <            unexpectedException();
594 >    public void testCallable_withResult_toString() {
595 >        if (testImplementationDetails) {
596 >            Runnable r = () -> {};
597 >            Callable<String> c = Executors.callable(r, "");
598 >            assertEquals(
599 >                identityString(c) + "[Wrapped task = " + r.toString() + "]",
600 >                c.toString());
601          }
599        joinPool(p);
602      }
603  
602
603
604      /**
605 <     *  timeouts from execute will time out if they compute too long.
605 >     * callable(runnable).toString() contains toString of wrapped task
606       */
607 <    public void testTimedCallable() {
608 <        int N = 10000;
609 <        ExecutorService executor = Executors.newSingleThreadExecutor();
610 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
611 <        try {
612 <            long startTime = System.currentTimeMillis();
613 <            
614 <            long i = 0;
615 <            while (tasks.size() < N) {
616 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
617 <                i += 10;
618 <            }
619 <            
620 <            int iters = 0;
621 <            BigInteger sum = BigInteger.ZERO;
622 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
623 <                try {
624 <                    ++iters;
625 <                    sum = sum.add(it.next().call());
626 <                }
627 <                catch (TimeoutException success) {
628 <                    assertTrue(iters > 0);
629 <                    return;
630 <                }
631 <                catch (Exception e) {
632 <                    unexpectedException();
633 <                }
634 <            }
635 <            // if by chance we didn't ever time out, total time must be small
636 <            long elapsed = System.currentTimeMillis() - startTime;
637 <            assertTrue(elapsed < N);
638 <        }
639 <        finally {
640 <            joinPool(executor);
607 >    public void testCallable_toString() {
608 >        if (testImplementationDetails) {
609 >            Runnable r = () -> {};
610 >            Callable<Object> c = Executors.callable(r);
611 >            assertEquals(
612 >                identityString(c) + "[Wrapped task = " + r.toString() + "]",
613 >                c.toString());
614          }
615      }
616  
644    
617      /**
618 <     * ThreadPoolExecutor using defaultThreadFactory has
647 <     * specified group, priority, daemon status, and name
618 >     * privilegedCallable(callable).toString() contains toString of wrapped task
619       */
620 <    public void testDefaultThreadFactory() {
621 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
622 <        Runnable r = new Runnable() {
623 <                public void run() {
624 <                    Thread current = Thread.currentThread();
625 <                    threadAssertTrue(!current.isDaemon());
626 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
656 <                    ThreadGroup g = current.getThreadGroup();
657 <                    SecurityManager s = System.getSecurityManager();
658 <                    if (s != null)
659 <                        threadAssertTrue(g == s.getThreadGroup());
660 <                    else
661 <                        threadAssertTrue(g == egroup);
662 <                    String name = current.getName();
663 <                    threadAssertTrue(name.endsWith("thread-1"));
664 <                }
665 <            };
666 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
667 <        
668 <        e.execute(r);
669 <        e.shutdown();
670 <        try {
671 <            Thread.sleep(SHORT_DELAY_MS);
672 <        } catch (Exception eX) {
673 <            unexpectedException();
674 <        } finally {
675 <            joinPool(e);
620 >    public void testPrivilegedCallable_toString() {
621 >        if (testImplementationDetails) {
622 >            Callable<String> c = () -> "";
623 >            Callable<String> priv = Executors.privilegedCallable(c);
624 >            assertEquals(
625 >                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
626 >                priv.toString());
627          }
628      }
629  
630      /**
631 <     * ThreadPoolExecutor using privilegedThreadFactory has
632 <     * specified group, priority, daemon status, name,
682 <     * access control context and context class loader
631 >     * privilegedCallableUsingCurrentClassLoader(callable).toString()
632 >     * contains toString of wrapped task
633       */
634 <    public void testPrivilegedThreadFactory() {
635 <        Policy savedPolicy = Policy.getPolicy();
636 <        AdjustablePolicy policy = new AdjustablePolicy();
637 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
638 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
639 <        Policy.setPolicy(policy);
640 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
691 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
692 <        final AccessControlContext thisacc = AccessController.getContext();
693 <        Runnable r = new Runnable() {
694 <                public void run() {
695 <                    Thread current = Thread.currentThread();
696 <                    threadAssertTrue(!current.isDaemon());
697 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
698 <                    ThreadGroup g = current.getThreadGroup();
699 <                    SecurityManager s = System.getSecurityManager();
700 <                    if (s != null)
701 <                        threadAssertTrue(g == s.getThreadGroup());
702 <                    else
703 <                        threadAssertTrue(g == egroup);
704 <                    String name = current.getName();
705 <                    threadAssertTrue(name.endsWith("thread-1"));
706 <                    threadAssertTrue(thisccl == current.getContextClassLoader());
707 <                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
708 <                }
709 <            };
710 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
711 <        
712 <        Policy.setPolicy(savedPolicy);
713 <        e.execute(r);
714 <        e.shutdown();
715 <        try {
716 <            Thread.sleep(SHORT_DELAY_MS);
717 <        } catch (Exception ex) {
718 <            unexpectedException();
719 <        } finally {
720 <            joinPool(e);
634 >    public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
635 >        if (testImplementationDetails) {
636 >            Callable<String> c = () -> "";
637 >            Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
638 >            assertEquals(
639 >                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
640 >                priv.toString());
641          }
722
642      }
724
643   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines