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.15 by dl, Thu Jan 22 14:07:50 2004 UTC vs.
Revision 1.50 by jsr166, Wed Aug 16 17:18:34 2017 UTC

# Line 1 | Line 1
1   /*
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/licenses/publicdomain
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
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  
24    static class TimedCallable<T> implements Callable<T> {
25        private final ExecutorService exec;
26        private final Callable<T> func;
27        private final long msecs;
28        
29        TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
30            this.exec = exec;
31            this.func = func;
32            this.msecs = msecs;
33        }
34        
35        public T call() throws Exception {
36            Future<T> ftask = exec.submit(func);
37            try {
38                return ftask.get(msecs, TimeUnit.MILLISECONDS);
39            } finally {
40                ftask.cancel(true);
41            }
42        }
43    }
44
45
46    private static class Fib implements Callable<BigInteger> {
47        private final BigInteger n;
48        Fib(long n) {
49            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
50            this.n = BigInteger.valueOf(n);
51        }
52        public BigInteger call() {
53            BigInteger f1 = BigInteger.ONE;
54            BigInteger f2 = f1;
55            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
56                BigInteger t = f1.add(f2);
57                f1 = f2;
58                f2 = t;
59            }
60            return f1;
61        }
62    };
63
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 <        joinPool(e);
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 <        joinPool(e);
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 90 | Line 65 | public class ExecutorsTest extends JSR16
65          try {
66              ExecutorService e = Executors.newCachedThreadPool(null);
67              shouldThrow();
68 <        }
94 <        catch(NullPointerException success) {
95 <        }
68 >        } catch (NullPointerException success) {}
69      }
70  
98
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 <        joinPool(e);
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 <        joinPool(e);
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 125 | Line 99 | public class ExecutorsTest extends JSR16
99          try {
100              ExecutorService e = Executors.newSingleThreadExecutor(null);
101              shouldThrow();
102 <        }
129 <        catch(NullPointerException success) {
130 <        }
102 >        } catch (NullPointerException success) {}
103      }
104  
105      /**
106       * A new SingleThreadExecutor cannot be casted to concrete implementation
107       */
108      public void testCastNewSingleThreadExecutor() {
109 <        ExecutorService e = Executors.newSingleThreadExecutor();
110 <        try {
111 <            ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
112 <        } catch (ClassCastException success) {
113 <        } finally {
114 <            joinPool(e);
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  
146
118      /**
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 <        joinPool(e);
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 <        joinPool(e);
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);
149              shouldThrow();
150 <        }
177 <        catch(NullPointerException success) {
178 <        }
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);
159              shouldThrow();
160 <        }
189 <        catch(IllegalArgumentException success) {
190 <        }
160 >        } catch (IllegalArgumentException success) {}
161      }
162  
193
163      /**
164       * An unconfigurable newFixedThreadPool can execute runnables
165       */
166 <    public void testunconfigurableExecutorService() {
167 <        ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
168 <        e.execute(new NoOpRunnable());
169 <        e.execute(new NoOpRunnable());
170 <        e.execute(new NoOpRunnable());
171 <        joinPool(e);
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       * unconfigurableExecutorService(null) throws NPE
177       */
178 <    public void testunconfigurableExecutorServiceNPE() {
178 >    public void testUnconfigurableExecutorServiceNPE() {
179          try {
180              ExecutorService e = Executors.unconfigurableExecutorService(null);
181 <        }
182 <        catch (NullPointerException success) {
213 <        }
181 >            shouldThrow();
182 >        } catch (NullPointerException success) {}
183      }
184  
185      /**
186       * unconfigurableScheduledExecutorService(null) throws NPE
187       */
188 <    public void testunconfigurableScheduledExecutorServiceNPE() {
188 >    public void testUnconfigurableScheduledExecutorServiceNPE() {
189          try {
190              ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
191 <        }
192 <        catch (NullPointerException success) {
224 <        }
191 >            shouldThrow();
192 >        } catch (NullPointerException success) {}
193      }
194  
227
195      /**
196       * a newSingleThreadScheduledExecutor successfully runs delayed task
197       */
198 <    public void testNewSingleThreadScheduledExecutor() {
199 <        try {
200 <            TrackedCallable callable = new TrackedCallable();
201 <            ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
202 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
203 <            assertFalse(callable.done);
204 <            Thread.sleep(MEDIUM_DELAY_MS);
205 <            assertTrue(callable.done);
206 <            assertEquals(Boolean.TRUE, f.get());
207 <            joinPool(p1);
208 <        } catch(RejectedExecutionException e){}
209 <        catch(Exception e){
210 <            e.printStackTrace();
211 <            unexpectedException();
198 >    public void testNewSingleThreadScheduledExecutor() throws Exception {
199 >        final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
200 >        try (PoolCleaner cleaner = cleaner(p)) {
201 >            final CountDownLatch proceed = new CountDownLatch(1);
202 >            final Runnable task = new CheckedRunnable() {
203 >                public void realRun() {
204 >                    await(proceed);
205 >                }};
206 >            long startTime = System.nanoTime();
207 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
208 >                                  timeoutMillis(), MILLISECONDS);
209 >            assertFalse(f.isDone());
210 >            proceed.countDown();
211 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
212 >            assertSame(Boolean.TRUE, f.get());
213 >            assertTrue(f.isDone());
214 >            assertFalse(f.isCancelled());
215 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
216          }
217      }
218  
219      /**
220       * a newScheduledThreadPool successfully runs delayed task
221       */
222 <    public void testnewScheduledThreadPool() {
223 <        try {
224 <            TrackedCallable callable = new TrackedCallable();
225 <            ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
226 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
227 <            assertFalse(callable.done);
228 <            Thread.sleep(MEDIUM_DELAY_MS);
229 <            assertTrue(callable.done);
230 <            assertEquals(Boolean.TRUE, f.get());
231 <            joinPool(p1);
232 <        } catch(RejectedExecutionException e){}
233 <        catch(Exception e){
234 <            e.printStackTrace();
235 <            unexpectedException();
236 <        }
237 <    }
238 <
239 <    /**
240 <     * an unconfigurable  newScheduledThreadPool successfully runs delayed task
241 <     */
242 <    public void testunconfigurableScheduledExecutorService() {
243 <        try {
244 <            TrackedCallable callable = new TrackedCallable();
245 <            ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
246 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
247 <            assertFalse(callable.done);
248 <            Thread.sleep(MEDIUM_DELAY_MS);
249 <            assertTrue(callable.done);
250 <            assertEquals(Boolean.TRUE, f.get());
251 <            joinPool(p1);
252 <        } catch(RejectedExecutionException e){}
253 <        catch(Exception e){
254 <            e.printStackTrace();
255 <            unexpectedException();
256 <        }
257 <    }
258 <
259 <    /**
260 <     *  timeouts from execute will time out if they compute too long.
261 <     */
262 <    public void testTimedCallable() {
263 <        int N = 10000;
264 <        ExecutorService executor = Executors.newSingleThreadExecutor();
265 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
266 <        try {
267 <            long startTime = System.currentTimeMillis();
268 <            
269 <            long i = 0;
270 <            while (tasks.size() < N) {
271 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
272 <                i += 10;
273 <            }
274 <            
275 <            int iters = 0;
276 <            BigInteger sum = BigInteger.ZERO;
277 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
278 <                try {
279 <                    ++iters;
280 <                    sum = sum.add(it.next().call());
281 <                }
282 <                catch (TimeoutException success) {
283 <                    assertTrue(iters > 0);
284 <                    return;
285 <                }
286 <                catch (Exception e) {
287 <                    unexpectedException();
288 <                }
289 <            }
290 <            // if by chance we didn't ever time out, total time must be small
291 <            long elapsed = System.currentTimeMillis() - startTime;
292 <            assertTrue(elapsed < N);
293 <        }
294 <        finally {
222 >    public void testNewScheduledThreadPool() throws Exception {
223 >        final ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
224 >        try (PoolCleaner cleaner = cleaner(p)) {
225 >            final CountDownLatch proceed = new CountDownLatch(1);
226 >            final Runnable task = new CheckedRunnable() {
227 >                public void realRun() {
228 >                    await(proceed);
229 >                }};
230 >            long startTime = System.nanoTime();
231 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
232 >                                  timeoutMillis(), MILLISECONDS);
233 >            assertFalse(f.isDone());
234 >            proceed.countDown();
235 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
236 >            assertSame(Boolean.TRUE, f.get());
237 >            assertTrue(f.isDone());
238 >            assertFalse(f.isCancelled());
239 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
240 >        }
241 >    }
242 >
243 >    /**
244 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
245 >     */
246 >    public void testUnconfigurableScheduledExecutorService() throws Exception {
247 >        final ScheduledExecutorService p =
248 >            Executors.unconfigurableScheduledExecutorService
249 >            (Executors.newScheduledThreadPool(2));
250 >        try (PoolCleaner cleaner = cleaner(p)) {
251 >            final CountDownLatch proceed = new CountDownLatch(1);
252 >            final Runnable task = new CheckedRunnable() {
253 >                public void realRun() {
254 >                    await(proceed);
255 >                }};
256 >            long startTime = System.nanoTime();
257 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
258 >                                  timeoutMillis(), MILLISECONDS);
259 >            assertFalse(f.isDone());
260 >            proceed.countDown();
261 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
262 >            assertSame(Boolean.TRUE, f.get());
263 >            assertTrue(f.isDone());
264 >            assertFalse(f.isCancelled());
265 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
266 >        }
267 >    }
268 >
269 >    /**
270 >     * Future.get on submitted tasks will time out if they compute too long.
271 >     */
272 >    public void testTimedCallable() throws Exception {
273 >        final ExecutorService[] executors = {
274 >            Executors.newSingleThreadExecutor(),
275 >            Executors.newCachedThreadPool(),
276 >            Executors.newFixedThreadPool(2),
277 >            Executors.newScheduledThreadPool(2),
278 >        };
279 >
280 >        final Runnable sleeper = new CheckedInterruptedRunnable() {
281 >            public void realRun() throws InterruptedException {
282 >                delay(LONG_DELAY_MS);
283 >            }};
284 >
285 >        List<Thread> threads = new ArrayList<>();
286 >        for (final ExecutorService executor : executors) {
287 >            threads.add(newStartedThread(new CheckedRunnable() {
288 >                public void realRun() {
289 >                    Future future = executor.submit(sleeper);
290 >                    assertFutureTimesOut(future);
291 >                }}));
292 >        }
293 >        for (Thread thread : threads)
294 >            awaitTermination(thread);
295 >        for (ExecutorService executor : executors)
296              joinPool(executor);
325        }
297      }
298  
328    
299      /**
300       * ThreadPoolExecutor using defaultThreadFactory has
301       * specified group, priority, daemon status, and name
302       */
303 <    public void testDefaultThreadFactory() {
303 >    public void testDefaultThreadFactory() throws Exception {
304          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
305 <        Runnable r = new Runnable() {
306 <                public void run() {
307 <                    try {
308 <                        Thread current = Thread.currentThread();
309 <                        threadAssertTrue(!current.isDaemon());
310 <                        threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
311 <                        ThreadGroup g = current.getThreadGroup();
312 <                        SecurityManager s = System.getSecurityManager();
313 <                        if (s != null)
314 <                            threadAssertTrue(g == s.getThreadGroup());
315 <                        else
316 <                            threadAssertTrue(g == egroup);
317 <                        String name = current.getName();
348 <                        threadAssertTrue(name.endsWith("thread-1"));
349 <                    } catch (SecurityException ok) {
350 <                        // Also pass if not allowed to change setting
351 <                    }
305 >        final CountDownLatch done = new CountDownLatch(1);
306 >        Runnable r = new CheckedRunnable() {
307 >            public void realRun() {
308 >                try {
309 >                    Thread current = Thread.currentThread();
310 >                    assertFalse(current.isDaemon());
311 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
312 >                    SecurityManager s = System.getSecurityManager();
313 >                    assertSame(current.getThreadGroup(),
314 >                               (s == null) ? egroup : s.getThreadGroup());
315 >                    assertTrue(current.getName().endsWith("thread-1"));
316 >                } catch (SecurityException ok) {
317 >                    // Also pass if not allowed to change setting
318                  }
319 <            };
319 >                done.countDown();
320 >            }};
321          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
322 <        
323 <        e.execute(r);
324 <        try {
358 <            e.shutdown();
359 <        } catch(SecurityException ok) {
360 <        }
361 <        
362 <        try {
363 <            Thread.sleep(SHORT_DELAY_MS);
364 <        } catch (Exception eX) {
365 <            unexpectedException();
366 <        } finally {
367 <            joinPool(e);
322 >        try (PoolCleaner cleaner = cleaner(e)) {
323 >            e.execute(r);
324 >            await(done);
325          }
326      }
327  
# Line 373 | Line 330 | public class ExecutorsTest extends JSR16
330       * specified group, priority, daemon status, name,
331       * access control context and context class loader
332       */
333 <    public void testPrivilegedThreadFactory() {
334 <        Policy savedPolicy = null;
335 <        try {
336 <            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 <        } catch (AccessControlException ok) {
342 <            return;
343 <        }
344 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
345 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
346 <        final AccessControlContext thisacc = AccessController.getContext();
347 <        Runnable r = new Runnable() {
348 <                public void run() {
349 <                    try {
350 <                        Thread current = Thread.currentThread();
351 <                        threadAssertTrue(!current.isDaemon());
352 <                        threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
353 <                        ThreadGroup g = current.getThreadGroup();
354 <                        SecurityManager s = System.getSecurityManager();
355 <                        if (s != null)
356 <                            threadAssertTrue(g == s.getThreadGroup());
400 <                        else
401 <                            threadAssertTrue(g == egroup);
402 <                        String name = current.getName();
403 <                        threadAssertTrue(name.endsWith("thread-1"));
404 <                        threadAssertTrue(thisccl == current.getContextClassLoader());
405 <                        threadAssertTrue(thisacc.equals(AccessController.getContext()));
406 <                    } catch(SecurityException ok) {
407 <                        // Also pass if not allowed to change settings
408 <                    }
333 >    public void testPrivilegedThreadFactory() throws Exception {
334 >        final CountDownLatch done = new CountDownLatch(1);
335 >        Runnable r = new CheckedRunnable() {
336 >            public void realRun() throws Exception {
337 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
338 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
339 >                final AccessControlContext thisacc = AccessController.getContext();
340 >                Runnable r = new CheckedRunnable() {
341 >                    public void realRun() {
342 >                        Thread current = Thread.currentThread();
343 >                        assertFalse(current.isDaemon());
344 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
345 >                        SecurityManager s = System.getSecurityManager();
346 >                        assertSame(current.getThreadGroup(),
347 >                                   (s == null) ? egroup : s.getThreadGroup());
348 >                        assertTrue(current.getName().endsWith("thread-1"));
349 >                        assertSame(thisccl, current.getContextClassLoader());
350 >                        assertEquals(thisacc, AccessController.getContext());
351 >                        done.countDown();
352 >                    }};
353 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
354 >                try (PoolCleaner cleaner = cleaner(e)) {
355 >                    e.execute(r);
356 >                    await(done);
357                  }
358 <            };
359 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
360 <        
361 <        Policy.setPolicy(savedPolicy);
362 <        e.execute(r);
363 <        try {
364 <            e.shutdown();
365 <        } catch(SecurityException ok) {
366 <        }
367 <        try {
368 <            Thread.sleep(SHORT_DELAY_MS);
369 <        } catch (Exception ex) {
370 <            unexpectedException();
371 <        } finally {
372 <            joinPool(e);
358 >            }};
359 >
360 >        runWithPermissions(r,
361 >                           new RuntimePermission("getClassLoader"),
362 >                           new RuntimePermission("setContextClassLoader"),
363 >                           new RuntimePermission("modifyThread"));
364 >    }
365 >
366 >    boolean haveCCLPermissions() {
367 >        SecurityManager sm = System.getSecurityManager();
368 >        if (sm != null) {
369 >            try {
370 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
371 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
372 >            } catch (AccessControlException e) {
373 >                return false;
374 >            }
375          }
376 +        return true;
377 +    }
378  
379 +    void checkCCL() {
380 +        SecurityManager sm = System.getSecurityManager();
381 +        if (sm != null) {
382 +            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
383 +            sm.checkPermission(new RuntimePermission("getClassLoader"));
384 +        }
385      }
386  
387 <    static class CheckCCL implements Callable<Object> {
387 >    class CheckCCL implements Callable<Object> {
388          public Object call() {
389 <            AccessControlContext acc = AccessController.getContext();
432 <            acc.checkPermission(new RuntimePermission("getContextClassLoader"));
389 >            checkCCL();
390              return null;
391          }
392      }
393  
437
394      /**
395       * Without class loader permissions, creating
396       * privilegedCallableUsingCurrentClassLoader throws ACE
397       */
398      public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
399 <        Policy savedPolicy = null;
400 <        try {
401 <            savedPolicy = Policy.getPolicy();
402 <            AdjustablePolicy policy = new AdjustablePolicy();
403 <            Policy.setPolicy(policy);
404 <        } catch (AccessControlException ok) {
405 <            return;
406 <        }
399 >        Runnable r = new CheckedRunnable() {
400 >            public void realRun() throws Exception {
401 >                if (System.getSecurityManager() == null)
402 >                    return;
403 >                try {
404 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
405 >                    shouldThrow();
406 >                } catch (AccessControlException success) {}
407 >            }};
408  
409 <        try {
453 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
454 <            shouldThrow();
455 <        } catch(AccessControlException success) {
456 <        } catch(Exception ex) {
457 <            unexpectedException();
458 <        }
459 <        finally {
460 <            Policy.setPolicy(savedPolicy);
461 <        }
409 >        runWithoutPermissions(r);
410      }
411  
412      /**
413 <     * Without class loader permissions, calling
414 <     * privilegedCallableUsingCurrentClassLoader throws ACE
413 >     * With class loader permissions, calling
414 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
415       */
416 <    public void testprivilegedCallableUsingCCLWithPrivs() {
417 <        Policy savedPolicy = null;
418 <        try {
419 <            savedPolicy = Policy.getPolicy();
420 <            AdjustablePolicy policy = new AdjustablePolicy();
421 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
422 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
475 <            Policy.setPolicy(policy);
476 <        } catch (AccessControlException ok) {
477 <            return;
478 <        }
479 <            
480 <        try {
481 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
482 <            task.call();
483 <        } catch(Exception ex) {
484 <            unexpectedException();
485 <        }
486 <        finally {
487 <            Policy.setPolicy(savedPolicy);
488 <        }
489 <    }
416 >    public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
417 >        Runnable r = new CheckedRunnable() {
418 >            public void realRun() throws Exception {
419 >                Executors.privilegedCallableUsingCurrentClassLoader
420 >                    (new NoOpCallable())
421 >                    .call();
422 >            }};
423  
424 <    class CallCCL implements Runnable {
425 <        final Callable task;
426 <        CallCCL(Callable t) { task = t; }
494 <        public void run() {
495 <            try {
496 <                task.call();
497 <                threadShouldThrow();
498 <            } catch(AccessControlException success) {
499 <            } catch(Exception ex) {
500 <                threadUnexpectedException();
501 <            }
502 <        }
424 >        runWithPermissions(r,
425 >                           new RuntimePermission("getClassLoader"),
426 >                           new RuntimePermission("setContextClassLoader"));
427      }
428  
429      /**
430       * Without permissions, calling privilegedCallable throws ACE
431       */
432 <    public void testprivilegedCallableWithNoPrivs() {
433 <        Thread t1;
434 <        try {
435 <            Policy savedPolicy = Policy.getPolicy();
436 <            AdjustablePolicy policy = new AdjustablePolicy();
437 <            Policy.setPolicy(policy);
438 <            Callable task = Executors.privilegedCallable(new CheckCCL());
439 <            t1 = new Thread(new CallCCL(task));
440 <            Policy.setPolicy(savedPolicy);
441 <        } catch (AccessControlException ok) {
442 <            return;
443 <        }
444 <
445 <        try {
446 <            t1.start();
447 <            t1.join();
448 <        } catch(Exception ex) {
449 <            unexpectedException();
450 <        }
432 >    public void testPrivilegedCallableWithNoPrivs() throws Exception {
433 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
434 >        Executors.privilegedCallable(new CheckCCL());
435 >
436 >        Runnable r = new CheckedRunnable() {
437 >            public void realRun() throws Exception {
438 >                if (System.getSecurityManager() == null)
439 >                    return;
440 >                Callable task = Executors.privilegedCallable(new CheckCCL());
441 >                try {
442 >                    task.call();
443 >                    shouldThrow();
444 >                } catch (AccessControlException success) {}
445 >            }};
446 >
447 >        runWithoutPermissions(r);
448 >
449 >        // It seems rather difficult to test that the
450 >        // AccessControlContext of the privilegedCallable is used
451 >        // instead of its caller.  Below is a failed attempt to do
452 >        // that, which does not work because the AccessController
453 >        // cannot capture the internal state of the current Policy.
454 >        // It would be much more work to differentiate based on,
455 >        // e.g. CodeSource.
456 >
457 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
458 > //         final Callable[] task = new Callable[1];
459 >
460 > //         runWithPermissions
461 > //             (new CheckedRunnable() {
462 > //                 public void realRun() {
463 > //                     if (System.getSecurityManager() == null)
464 > //                         return;
465 > //                     noprivAcc[0] = AccessController.getContext();
466 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
467 > //                     try {
468 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
469 > //                                                           public Void run() {
470 > //                                                               checkCCL();
471 > //                                                               return null;
472 > //                                                           }}, noprivAcc[0]);
473 > //                         shouldThrow();
474 > //                     } catch (AccessControlException success) {}
475 > //                 }});
476 >
477 > //         runWithPermissions
478 > //             (new CheckedRunnable() {
479 > //                 public void realRun() throws Exception {
480 > //                     if (System.getSecurityManager() == null)
481 > //                         return;
482 > //                     // Verify that we have an underprivileged ACC
483 > //                     try {
484 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
485 > //                                                           public Void run() {
486 > //                                                               checkCCL();
487 > //                                                               return null;
488 > //                                                           }}, noprivAcc[0]);
489 > //                         shouldThrow();
490 > //                     } catch (AccessControlException success) {}
491 >
492 > //                     try {
493 > //                         task[0].call();
494 > //                         shouldThrow();
495 > //                     } catch (AccessControlException success) {}
496 > //                 }},
497 > //              new RuntimePermission("getClassLoader"),
498 > //              new RuntimePermission("setContextClassLoader"));
499      }
500  
501      /**
502       * With permissions, calling privilegedCallable succeeds
503       */
504 <    public void testprivilegedCallableWithPrivs() {
505 <        Policy savedPolicy = null;
506 <        try {
507 <            savedPolicy = Policy.getPolicy();
508 <            AdjustablePolicy policy = new AdjustablePolicy();
509 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
510 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
511 <            Policy.setPolicy(policy);
512 <        } catch (AccessControlException ok) {
541 <            return;
542 <        }
543 <            
544 <        Callable task = Executors.privilegedCallable(new CheckCCL());
545 <        try {
546 <            task.call();
547 <        } catch(Exception ex) {
548 <            unexpectedException();
549 <        } finally {
550 <            Policy.setPolicy(savedPolicy);
551 <        }
504 >    public void testPrivilegedCallableWithPrivs() throws Exception {
505 >        Runnable r = new CheckedRunnable() {
506 >            public void realRun() throws Exception {
507 >                Executors.privilegedCallable(new CheckCCL()).call();
508 >            }};
509 >
510 >        runWithPermissions(r,
511 >                           new RuntimePermission("getClassLoader"),
512 >                           new RuntimePermission("setContextClassLoader"));
513      }
514  
515      /**
516       * callable(Runnable) returns null when called
517 <     */
518 <    public void testCallable1() {
519 <        try {
520 <            Callable c = Executors.callable(new NoOpRunnable());
560 <            assertNull(c.call());
561 <        } catch(Exception ex) {
562 <            unexpectedException();
563 <        }
564 <        
517 >     */
518 >    public void testCallable1() throws Exception {
519 >        Callable c = Executors.callable(new NoOpRunnable());
520 >        assertNull(c.call());
521      }
522  
523      /**
524       * callable(Runnable, result) returns result when called
525 <     */
526 <    public void testCallable2() {
527 <        try {
528 <            Callable c = Executors.callable(new NoOpRunnable(), one);
573 <            assertEquals(one, c.call());
574 <        } catch(Exception ex) {
575 <            unexpectedException();
576 <        }
525 >     */
526 >    public void testCallable2() throws Exception {
527 >        Callable c = Executors.callable(new NoOpRunnable(), one);
528 >        assertSame(one, c.call());
529      }
530  
531      /**
532       * callable(PrivilegedAction) returns its result when called
533 <     */
534 <    public void testCallable3() {
535 <        try {
536 <            Callable c = Executors.callable(new PrivilegedAction() {
537 <                    public Object run() { return one; }});
586 <        assertEquals(one, c.call());
587 <        } catch(Exception ex) {
588 <            unexpectedException();
589 <        }
533 >     */
534 >    public void testCallable3() throws Exception {
535 >        Callable c = Executors.callable(new PrivilegedAction() {
536 >                public Object run() { return one; }});
537 >        assertSame(one, c.call());
538      }
539  
540      /**
541       * callable(PrivilegedExceptionAction) returns its result when called
542 <     */
543 <    public void testCallable4() {
544 <        try {
545 <            Callable c = Executors.callable(new PrivilegedExceptionAction() {
546 <                    public Object run() { return one; }});
599 <            assertEquals(one, c.call());
600 <        } catch(Exception ex) {
601 <            unexpectedException();
602 <        }
542 >     */
543 >    public void testCallable4() throws Exception {
544 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
545 >                public Object run() { return one; }});
546 >        assertSame(one, c.call());
547      }
548  
605
549      /**
550       * callable(null Runnable) throws NPE
551 <     */
551 >     */
552      public void testCallableNPE1() {
553          try {
554 <            Runnable r = null;
555 <            Callable c = Executors.callable(r);
556 <        } catch (NullPointerException success) {
614 <        }
554 >            Callable c = Executors.callable((Runnable) null);
555 >            shouldThrow();
556 >        } catch (NullPointerException success) {}
557      }
558  
559      /**
560       * callable(null, result) throws NPE
561 <     */
561 >     */
562      public void testCallableNPE2() {
563          try {
564 <            Runnable r = null;
565 <            Callable c = Executors.callable(r, one);
566 <        } catch (NullPointerException success) {
625 <        }
564 >            Callable c = Executors.callable((Runnable) null, one);
565 >            shouldThrow();
566 >        } catch (NullPointerException success) {}
567      }
568  
569      /**
570       * callable(null PrivilegedAction) throws NPE
571 <     */
571 >     */
572      public void testCallableNPE3() {
573          try {
574 <            PrivilegedAction r = null;
575 <            Callable c = Executors.callable(r);
576 <        } catch (NullPointerException success) {
636 <        }
574 >            Callable c = Executors.callable((PrivilegedAction) null);
575 >            shouldThrow();
576 >        } catch (NullPointerException success) {}
577      }
578  
579      /**
580       * callable(null PrivilegedExceptionAction) throws NPE
581 <     */
581 >     */
582      public void testCallableNPE4() {
583          try {
584 <            PrivilegedExceptionAction r = null;
585 <            Callable c = Executors.callable(r);
586 <        } catch (NullPointerException success) {
584 >            Callable c = Executors.callable((PrivilegedExceptionAction) null);
585 >            shouldThrow();
586 >        } catch (NullPointerException success) {}
587 >    }
588 >
589 >    /**
590 >     * callable(runnable, x).toString() contains toString of wrapped task
591 >     */
592 >    public void testCallable_withResult_toString() {
593 >        if (testImplementationDetails) {
594 >            Runnable r = () -> {};
595 >            Callable<String> c = Executors.callable(r, "");
596 >            assertEquals(
597 >                identityString(c) + "[Wrapped task = " + r.toString() + "]",
598 >                c.toString());
599          }
600      }
601  
602 +    /**
603 +     * callable(runnable).toString() contains toString of wrapped task
604 +     */
605 +    public void testCallable_toString() {
606 +        if (testImplementationDetails) {
607 +            Runnable r = () -> {};
608 +            Callable<Object> c = Executors.callable(r);
609 +            assertEquals(
610 +                identityString(c) + "[Wrapped task = " + r.toString() + "]",
611 +                c.toString());
612 +        }
613 +    }
614  
615 +    /**
616 +     * privilegedCallable(callable).toString() contains toString of wrapped task
617 +     */
618 +    public void testPrivilegedCallable_toString() {
619 +        if (testImplementationDetails) {
620 +            Callable<String> c = () -> "";
621 +            Callable<String> priv = Executors.privilegedCallable(c);
622 +            assertEquals(
623 +                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
624 +                priv.toString());
625 +        }
626 +    }
627 +
628 +    /**
629 +     * privilegedCallableUsingCurrentClassLoader(callable).toString()
630 +     * contains toString of wrapped task
631 +     */
632 +    public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
633 +        if (testImplementationDetails) {
634 +            Callable<String> c = () -> "";
635 +            Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
636 +            assertEquals(
637 +                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
638 +                priv.toString());
639 +        }
640 +    }
641   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines