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.54 by jsr166, Sat Feb 1 18:52:17 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;
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 CountDownLatch done = new CountDownLatch(1);
283 >
284 >        final Runnable sleeper = new CheckedRunnable() {
285 >            public void realRun() throws InterruptedException {
286 >                done.await(LONG_DELAY_MS, MILLISECONDS);
287 >            }};
288 >
289 >        List<Thread> threads = new ArrayList<>();
290 >        for (final ExecutorService executor : executors) {
291 >            threads.add(newStartedThread(new CheckedRunnable() {
292 >                public void realRun() {
293 >                    Future future = executor.submit(sleeper);
294 >                    assertFutureTimesOut(future);
295 >                }}));
296          }
297 <        finally {
298 <            Policy.setPolicy(savedPolicy);
297 >        for (Thread thread : threads)
298 >            awaitTermination(thread);
299 >        done.countDown();
300 >        for (ExecutorService executor : executors)
301 >            joinPool(executor);
302 >    }
303 >
304 >    /**
305 >     * ThreadPoolExecutor using defaultThreadFactory has
306 >     * specified group, priority, daemon status, and name
307 >     */
308 >    public void testDefaultThreadFactory() throws Exception {
309 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
310 >        final CountDownLatch done = new CountDownLatch(1);
311 >        Runnable r = new CheckedRunnable() {
312 >            public void realRun() {
313 >                try {
314 >                    Thread current = Thread.currentThread();
315 >                    assertFalse(current.isDaemon());
316 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
317 >                    SecurityManager s = System.getSecurityManager();
318 >                    assertSame(current.getThreadGroup(),
319 >                               (s == null) ? egroup : s.getThreadGroup());
320 >                    assertTrue(current.getName().endsWith("thread-1"));
321 >                } catch (SecurityException ok) {
322 >                    // Also pass if not allowed to change setting
323 >                }
324 >                done.countDown();
325 >            }};
326 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
327 >        try (PoolCleaner cleaner = cleaner(e)) {
328 >            e.execute(r);
329 >            await(done);
330          }
331      }
332  
333      /**
334 <     * execute of a privileged exception action runs it to completion
334 >     * ThreadPoolExecutor using privilegedThreadFactory has
335 >     * specified group, priority, daemon status, name,
336 >     * access control context and context class loader
337       */
338 <    public void testExecutePrivilegedExceptionAction() {
339 <        Policy savedPolicy = Policy.getPolicy();
340 <        AdjustablePolicy policy = new AdjustablePolicy();
341 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
342 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
343 <        Policy.setPolicy(policy);
344 <        try {
345 <            Executor e = new DirectExecutor();
346 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
347 <                    public Object run() {
348 <                        return TEST_STRING;
349 <                    }});
338 >    public void testPrivilegedThreadFactory() throws Exception {
339 >        final CountDownLatch done = new CountDownLatch(1);
340 >        Runnable r = new CheckedRunnable() {
341 >            public void realRun() throws Exception {
342 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
343 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
344 >                final AccessControlContext thisacc = AccessController.getContext();
345 >                Runnable r = new CheckedRunnable() {
346 >                    public void realRun() {
347 >                        Thread current = Thread.currentThread();
348 >                        assertFalse(current.isDaemon());
349 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
350 >                        SecurityManager s = System.getSecurityManager();
351 >                        assertSame(current.getThreadGroup(),
352 >                                   (s == null) ? egroup : s.getThreadGroup());
353 >                        assertTrue(current.getName().endsWith("thread-1"));
354 >                        assertSame(thisccl, current.getContextClassLoader());
355 >                        assertEquals(thisacc, AccessController.getContext());
356 >                        done.countDown();
357 >                    }};
358 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
359 >                try (PoolCleaner cleaner = cleaner(e)) {
360 >                    e.execute(r);
361 >                    await(done);
362 >                }
363 >            }};
364  
365 <            Object result = future.get();
366 <            assertSame(TEST_STRING, result);
367 <        }
368 <        catch (ExecutionException ex) {
369 <            unexpectedException();
365 >        runWithPermissions(r,
366 >                           new RuntimePermission("getClassLoader"),
367 >                           new RuntimePermission("setContextClassLoader"),
368 >                           new RuntimePermission("modifyThread"));
369 >    }
370 >
371 >    boolean haveCCLPermissions() {
372 >        SecurityManager sm = System.getSecurityManager();
373 >        if (sm != null) {
374 >            try {
375 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
376 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
377 >            } catch (AccessControlException e) {
378 >                return false;
379 >            }
380          }
381 <        catch (InterruptedException ex) {
382 <            unexpectedException();
381 >        return true;
382 >    }
383 >
384 >    void checkCCL() {
385 >        SecurityManager sm = System.getSecurityManager();
386 >        if (sm != null) {
387 >            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
388 >            sm.checkPermission(new RuntimePermission("getClassLoader"));
389          }
390 <        finally {
391 <            Policy.setPolicy(savedPolicy);
390 >    }
391 >
392 >    class CheckCCL implements Callable<Object> {
393 >        public Object call() {
394 >            checkCCL();
395 >            return null;
396          }
397      }
398  
399      /**
400 <     * execute of a failed privileged exception action reports exception
400 >     * Without class loader permissions, creating
401 >     * privilegedCallableUsingCurrentClassLoader throws ACE
402       */
403 <    public void testExecuteFailedPrivilegedExceptionAction() {
404 <        Policy savedPolicy = Policy.getPolicy();
405 <        AdjustablePolicy policy = new AdjustablePolicy();
406 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
407 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
408 <        Policy.setPolicy(policy);
409 <        try {
410 <            Executor e = new DirectExecutor();
411 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
412 <                    public Object run() throws Exception {
321 <                        throw new IndexOutOfBoundsException();
322 <                    }});
403 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
404 >        Runnable r = new CheckedRunnable() {
405 >            public void realRun() throws Exception {
406 >                if (System.getSecurityManager() == null)
407 >                    return;
408 >                try {
409 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
410 >                    shouldThrow();
411 >                } catch (AccessControlException success) {}
412 >            }};
413  
414 <            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 <        }
414 >        runWithoutPermissions(r);
415      }
416  
417      /**
418 <     * invoke of a collable runs it to completion
418 >     * With class loader permissions, calling
419 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
420       */
421 <    public void testInvokeCallable() {
422 <        try {
423 <            Executor e = new DirectExecutor();
424 <            String result = Executors.invoke(e, new StringTask());
421 >    public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
422 >        Runnable r = new CheckedRunnable() {
423 >            public void realRun() throws Exception {
424 >                Executors.privilegedCallableUsingCurrentClassLoader
425 >                    (new NoOpCallable())
426 >                    .call();
427 >            }};
428  
429 <            assertSame(TEST_STRING, result);
430 <        }
431 <        catch (ExecutionException ex) {
348 <            unexpectedException();
349 <        }
350 <        catch (InterruptedException ex) {
351 <            unexpectedException();
352 <        }
429 >        runWithPermissions(r,
430 >                           new RuntimePermission("getClassLoader"),
431 >                           new RuntimePermission("setContextClassLoader"));
432      }
433  
434      /**
435 <     * execute with null executor throws NPE
435 >     * Without permissions, calling privilegedCallable throws ACE
436       */
437 <    public void testNullExecuteRunnable() {
438 <        try {
439 <            TrackedShortRunnable task = new TrackedShortRunnable();
440 <            assertFalse(task.done);
441 <            Future<?> future = Executors.execute(null, task);
442 <            shouldThrow();
443 <        }
444 <        catch (NullPointerException success) {
445 <        }
446 <        catch (Exception ex) {
447 <            unexpectedException();
448 <        }
437 >    public void testPrivilegedCallableWithNoPrivs() throws Exception {
438 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
439 >        Executors.privilegedCallable(new CheckCCL());
440 >
441 >        Runnable r = new CheckedRunnable() {
442 >            public void realRun() throws Exception {
443 >                if (System.getSecurityManager() == null)
444 >                    return;
445 >                Callable task = Executors.privilegedCallable(new CheckCCL());
446 >                try {
447 >                    task.call();
448 >                    shouldThrow();
449 >                } catch (AccessControlException success) {}
450 >            }};
451 >
452 >        runWithoutPermissions(r);
453 >
454 >        // It seems rather difficult to test that the
455 >        // AccessControlContext of the privilegedCallable is used
456 >        // instead of its caller.  Below is a failed attempt to do
457 >        // that, which does not work because the AccessController
458 >        // cannot capture the internal state of the current Policy.
459 >        // It would be much more work to differentiate based on,
460 >        // e.g. CodeSource.
461 >
462 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
463 > //         final Callable[] task = new Callable[1];
464 >
465 > //         runWithPermissions
466 > //             (new CheckedRunnable() {
467 > //                 public void realRun() {
468 > //                     if (System.getSecurityManager() == null)
469 > //                         return;
470 > //                     noprivAcc[0] = AccessController.getContext();
471 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
472 > //                     try {
473 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
474 > //                                                           public Void run() {
475 > //                                                               checkCCL();
476 > //                                                               return null;
477 > //                                                           }}, noprivAcc[0]);
478 > //                         shouldThrow();
479 > //                     } catch (AccessControlException success) {}
480 > //                 }});
481 >
482 > //         runWithPermissions
483 > //             (new CheckedRunnable() {
484 > //                 public void realRun() throws Exception {
485 > //                     if (System.getSecurityManager() == null)
486 > //                         return;
487 > //                     // Verify that we have an underprivileged ACC
488 > //                     try {
489 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
490 > //                                                           public Void run() {
491 > //                                                               checkCCL();
492 > //                                                               return null;
493 > //                                                           }}, noprivAcc[0]);
494 > //                         shouldThrow();
495 > //                     } catch (AccessControlException success) {}
496 >
497 > //                     try {
498 > //                         task[0].call();
499 > //                         shouldThrow();
500 > //                     } catch (AccessControlException success) {}
501 > //                 }},
502 > //              new RuntimePermission("getClassLoader"),
503 > //              new RuntimePermission("setContextClassLoader"));
504      }
505  
506      /**
507 <     * execute with a null runnable throws NPE
507 >     * With permissions, calling privilegedCallable succeeds
508       */
509 <    public void testExecuteNullRunnable() {
510 <        try {
511 <            Executor e = new DirectExecutor();
512 <            TrackedShortRunnable task = null;
513 <            Future<?> future = Executors.execute(e, task);
514 <            shouldThrow();
515 <        }
516 <        catch (NullPointerException success) {
517 <        }
384 <        catch (Exception ex) {
385 <            unexpectedException();
386 <        }
509 >    public void testPrivilegedCallableWithPrivs() throws Exception {
510 >        Runnable r = new CheckedRunnable() {
511 >            public void realRun() throws Exception {
512 >                Executors.privilegedCallable(new CheckCCL()).call();
513 >            }};
514 >
515 >        runWithPermissions(r,
516 >                           new RuntimePermission("getClassLoader"),
517 >                           new RuntimePermission("setContextClassLoader"));
518      }
519  
520      /**
521 <     * invoke of a null runnable throws NPE
521 >     * callable(Runnable) returns null when called
522       */
523 <    public void testInvokeNullRunnable() {
524 <        try {
525 <            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 <        }
523 >    public void testCallable1() throws Exception {
524 >        Callable c = Executors.callable(new NoOpRunnable());
525 >        assertNull(c.call());
526      }
527  
528      /**
529 <     * execute of a null callable throws NPE
529 >     * callable(Runnable, result) returns result when called
530       */
531 <    public void testExecuteNullCallable() {
532 <        try {
533 <            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 <        }
531 >    public void testCallable2() throws Exception {
532 >        Callable c = Executors.callable(new NoOpRunnable(), one);
533 >        assertSame(one, c.call());
534      }
535  
536      /**
537 <     * invoke of a null callable throws NPE
537 >     * callable(PrivilegedAction) returns its result when called
538       */
539 <    public void testInvokeNullCallable() {
540 <        try {
541 <            Executor e = new DirectExecutor();
542 <            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 <        }
539 >    public void testCallable3() throws Exception {
540 >        Callable c = Executors.callable(new PrivilegedAction() {
541 >                public Object run() { return one; }});
542 >        assertSame(one, c.call());
543      }
544  
545      /**
546 <     *  execute(Executor, Runnable) throws RejectedExecutionException
442 <     *  if saturated.
546 >     * callable(PrivilegedExceptionAction) returns its result when called
547       */
548 <    public void testExecute1() {
549 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
550 <        try {
551 <            
448 <            for(int i = 0; i < 5; ++i){
449 <                Executors.execute(p, new MediumRunnable());
450 <            }
451 <            shouldThrow();
452 <        } catch(RejectedExecutionException success){}
453 <        joinPool(p);
548 >    public void testCallable4() throws Exception {
549 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
550 >                public Object run() { return one; }});
551 >        assertSame(one, c.call());
552      }
553  
554      /**
555 <     *  execute(Executor, Callable)throws RejectedExecutionException
458 <     *  if saturated.
555 >     * callable(null Runnable) throws NPE
556       */
557 <    public void testExecute2() {
461 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
557 >    public void testCallableNPE1() {
558          try {
559 <            for(int i = 0; i < 5; ++i) {
464 <                Executors.execute(p, new SmallCallable());
465 <            }
559 >            Callable unused = Executors.callable((Runnable) null);
560              shouldThrow();
561 <        } catch(RejectedExecutionException e){}
468 <        joinPool(p);
561 >        } catch (NullPointerException success) {}
562      }
563  
471
564      /**
565 <     *  invoke(Executor, Runnable) throws InterruptedException if
474 <     *  caller interrupted.
565 >     * callable(null, result) throws NPE
566       */
567 <    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 <            });
567 >    public void testCallableNPE2() {
568          try {
569 <            t.start();
570 <            Thread.sleep(SHORT_DELAY_MS);
571 <            t.interrupt();
501 <        } catch(Exception e){
502 <            unexpectedException();
503 <        }
504 <        joinPool(p);
569 >            Callable unused = Executors.callable((Runnable) null, one);
570 >            shouldThrow();
571 >        } catch (NullPointerException success) {}
572      }
573  
574      /**
575 <     *  invoke(Executor, Runnable) throws ExecutionException if
509 <     *  runnable throws exception.
575 >     * callable(null PrivilegedAction) throws NPE
576       */
577 <    public void testInvoke3() {
512 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
577 >    public void testCallableNPE3() {
578          try {
579 <            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 <            
579 >            Callable unused = Executors.callable((PrivilegedAction) null);
580              shouldThrow();
581 <        } catch(ExecutionException success){
526 <        } catch(Exception e){
527 <            unexpectedException();
528 <        }
529 <        joinPool(p);
581 >        } catch (NullPointerException success) {}
582      }
583  
532
533
584      /**
585 <     *  invoke(Executor, Callable) throws InterruptedException if
536 <     *  callable throws exception
585 >     * callable(null PrivilegedExceptionAction) throws NPE
586       */
587 <    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 <          });
587 >    public void testCallableNPE4() {
588          try {
589 <            t.start();
590 <            Thread.sleep(SHORT_DELAY_MS);
591 <            t.interrupt();
566 <            t.join();
567 <        } catch(InterruptedException e){
568 <            unexpectedException();
569 <        }
570 <        
571 <        joinPool(p);
589 >            Callable unused = Executors.callable((PrivilegedExceptionAction) null);
590 >            shouldThrow();
591 >        } catch (NullPointerException success) {}
592      }
593  
594      /**
595 <     *  invoke(Executor, Callable) will throw ExecutionException
576 <     *  if callable throws exception
595 >     * callable(runnable, x).toString() contains toString of wrapped task
596       */
597 <    public void testInvoke6() {
598 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
599 <
600 <        try {
601 <            Callable c = new Callable() {
602 <                    public Object call() {
603 <                        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();
597 >    public void testCallable_withResult_toString() {
598 >        if (testImplementationDetails) {
599 >            Runnable r = () -> {};
600 >            Callable<String> c = Executors.callable(r, "");
601 >            assertEquals(
602 >                identityString(c) + "[Wrapped task = " + r.toString() + "]",
603 >                c.toString());
604          }
599        joinPool(p);
605      }
606  
602
603
607      /**
608 <     *  timeouts from execute will time out if they compute too long.
608 >     * callable(runnable).toString() contains toString of wrapped task
609       */
610 <    public void testTimedCallable() {
611 <        int N = 10000;
612 <        ExecutorService executor = Executors.newSingleThreadExecutor();
613 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
614 <        try {
615 <            long startTime = System.currentTimeMillis();
616 <            
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);
610 >    public void testCallable_toString() {
611 >        if (testImplementationDetails) {
612 >            Runnable r = () -> {};
613 >            Callable<Object> c = Executors.callable(r);
614 >            assertEquals(
615 >                identityString(c) + "[Wrapped task = " + r.toString() + "]",
616 >                c.toString());
617          }
618      }
619  
644    
620      /**
621 <     * ThreadPoolExecutor using defaultThreadFactory has
647 <     * specified group, priority, daemon status, and name
621 >     * privilegedCallable(callable).toString() contains toString of wrapped task
622       */
623 <    public void testDefaultThreadFactory() {
624 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
625 <        Runnable r = new Runnable() {
626 <                public void run() {
627 <                    Thread current = Thread.currentThread();
628 <                    threadAssertTrue(!current.isDaemon());
629 <                    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);
623 >    public void testPrivilegedCallable_toString() {
624 >        if (testImplementationDetails) {
625 >            Callable<String> c = () -> "";
626 >            Callable<String> priv = Executors.privilegedCallable(c);
627 >            assertEquals(
628 >                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
629 >                priv.toString());
630          }
631      }
632  
633      /**
634 <     * ThreadPoolExecutor using privilegedThreadFactory has
635 <     * specified group, priority, daemon status, name,
682 <     * access control context and context class loader
634 >     * privilegedCallableUsingCurrentClassLoader(callable).toString()
635 >     * contains toString of wrapped task
636       */
637 <    public void testPrivilegedThreadFactory() {
638 <        Policy savedPolicy = Policy.getPolicy();
639 <        AdjustablePolicy policy = new AdjustablePolicy();
640 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
641 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
642 <        Policy.setPolicy(policy);
643 <        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);
637 >    public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
638 >        if (testImplementationDetails) {
639 >            Callable<String> c = () -> "";
640 >            Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
641 >            assertEquals(
642 >                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
643 >                priv.toString());
644          }
722
645      }
724
646   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines