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.21 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.46 by jsr166, Sun Oct 4 16:14:48 2015 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
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      /**
# Line 173 | Line 146 | public class ExecutorsTest extends JSR16
146          try {
147              ExecutorService e = Executors.newFixedThreadPool(2, null);
148              shouldThrow();
149 <        }
177 <        catch (NullPointerException success) {
178 <        }
149 >        } catch (NullPointerException success) {}
150      }
151  
152      /**
# Line 185 | Line 156 | public class ExecutorsTest extends JSR16
156          try {
157              ExecutorService e = Executors.newFixedThreadPool(0);
158              shouldThrow();
159 <        }
189 <        catch (IllegalArgumentException success) {
190 <        }
159 >        } catch (IllegalArgumentException success) {}
160      }
161  
193
162      /**
163       * An unconfigurable newFixedThreadPool can execute runnables
164       */
165 <    public void testunconfigurableExecutorService() {
166 <        ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
167 <        e.execute(new NoOpRunnable());
168 <        e.execute(new NoOpRunnable());
169 <        e.execute(new NoOpRunnable());
170 <        joinPool(e);
165 >    public void testUnconfigurableExecutorService() {
166 >        final ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
167 >        try (PoolCleaner cleaner = cleaner(e)) {
168 >            e.execute(new NoOpRunnable());
169 >            e.execute(new NoOpRunnable());
170 >            e.execute(new NoOpRunnable());
171 >        }
172      }
173  
174      /**
175       * unconfigurableExecutorService(null) throws NPE
176       */
177 <    public void testunconfigurableExecutorServiceNPE() {
177 >    public void testUnconfigurableExecutorServiceNPE() {
178          try {
179              ExecutorService e = Executors.unconfigurableExecutorService(null);
180 <        }
181 <        catch (NullPointerException success) {
213 <        }
180 >            shouldThrow();
181 >        } catch (NullPointerException success) {}
182      }
183  
184      /**
185       * unconfigurableScheduledExecutorService(null) throws NPE
186       */
187 <    public void testunconfigurableScheduledExecutorServiceNPE() {
187 >    public void testUnconfigurableScheduledExecutorServiceNPE() {
188          try {
189              ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
190 <        }
191 <        catch (NullPointerException success) {
224 <        }
190 >            shouldThrow();
191 >        } catch (NullPointerException success) {}
192      }
193  
227
194      /**
195       * a newSingleThreadScheduledExecutor successfully runs delayed task
196       */
197 <    public void testNewSingleThreadScheduledExecutor() {
198 <        try {
199 <            TrackedCallable callable = new TrackedCallable();
200 <            ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
201 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
202 <            assertFalse(callable.done);
203 <            Thread.sleep(MEDIUM_DELAY_MS);
204 <            assertTrue(callable.done);
205 <            assertEquals(Boolean.TRUE, f.get());
206 <            joinPool(p1);
207 <        } catch (RejectedExecutionException e){}
208 <        catch (Exception e){
209 <            e.printStackTrace();
210 <            unexpectedException();
197 >    public void testNewSingleThreadScheduledExecutor() throws Exception {
198 >        final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
199 >        try (PoolCleaner cleaner = cleaner(p)) {
200 >            final CountDownLatch proceed = new CountDownLatch(1);
201 >            final Runnable task = new CheckedRunnable() {
202 >                public void realRun() {
203 >                    await(proceed);
204 >                }};
205 >            long startTime = System.nanoTime();
206 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
207 >                                  timeoutMillis(), MILLISECONDS);
208 >            assertFalse(f.isDone());
209 >            proceed.countDown();
210 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
211 >            assertSame(Boolean.TRUE, f.get());
212 >            assertTrue(f.isDone());
213 >            assertFalse(f.isCancelled());
214 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
215          }
216      }
217  
218      /**
219       * a newScheduledThreadPool successfully runs delayed task
220       */
221 <    public void testnewScheduledThreadPool() {
222 <        try {
223 <            TrackedCallable callable = new TrackedCallable();
224 <            ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
225 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
226 <            assertFalse(callable.done);
227 <            Thread.sleep(MEDIUM_DELAY_MS);
228 <            assertTrue(callable.done);
229 <            assertEquals(Boolean.TRUE, f.get());
230 <            joinPool(p1);
231 <        } catch (RejectedExecutionException e){}
232 <        catch (Exception e){
233 <            e.printStackTrace();
234 <            unexpectedException();
235 <        }
236 <    }
237 <
238 <    /**
239 <     * an unconfigurable  newScheduledThreadPool successfully runs delayed task
240 <     */
241 <    public void testunconfigurableScheduledExecutorService() {
242 <        try {
243 <            TrackedCallable callable = new TrackedCallable();
244 <            ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
245 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
246 <            assertFalse(callable.done);
247 <            Thread.sleep(MEDIUM_DELAY_MS);
248 <            assertTrue(callable.done);
249 <            assertEquals(Boolean.TRUE, f.get());
250 <            joinPool(p1);
251 <        } catch (RejectedExecutionException e){}
252 <        catch (Exception e){
253 <            e.printStackTrace();
254 <            unexpectedException();
255 <        }
256 <    }
257 <
258 <    /**
259 <     *  timeouts from execute will time out if they compute too long.
260 <     */
261 <    public void testTimedCallable() {
262 <        int N = 10000;
263 <        ExecutorService executor = Executors.newSingleThreadExecutor();
264 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
265 <        try {
266 <            long startTime = System.currentTimeMillis();
267 <
268 <            long i = 0;
269 <            while (tasks.size() < N) {
270 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
271 <                i += 10;
272 <            }
273 <
274 <            int iters = 0;
275 <            BigInteger sum = BigInteger.ZERO;
276 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
277 <                try {
278 <                    ++iters;
279 <                    sum = sum.add(it.next().call());
280 <                }
281 <                catch (TimeoutException success) {
282 <                    assertTrue(iters > 0);
283 <                    return;
284 <                }
285 <                catch (Exception e) {
286 <                    unexpectedException();
287 <                }
288 <            }
289 <            // if by chance we didn't ever time out, total time must be small
290 <            long elapsed = System.currentTimeMillis() - startTime;
291 <            assertTrue(elapsed < N);
292 <        }
293 <        finally {
221 >    public void testNewScheduledThreadPool() throws Exception {
222 >        final ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
223 >        try (PoolCleaner cleaner = cleaner(p)) {
224 >            final CountDownLatch proceed = new CountDownLatch(1);
225 >            final Runnable task = new CheckedRunnable() {
226 >                public void realRun() {
227 >                    await(proceed);
228 >                }};
229 >            long startTime = System.nanoTime();
230 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
231 >                                  timeoutMillis(), MILLISECONDS);
232 >            assertFalse(f.isDone());
233 >            proceed.countDown();
234 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
235 >            assertSame(Boolean.TRUE, f.get());
236 >            assertTrue(f.isDone());
237 >            assertFalse(f.isCancelled());
238 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
239 >        }
240 >    }
241 >
242 >    /**
243 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
244 >     */
245 >    public void testUnconfigurableScheduledExecutorService() throws Exception {
246 >        final ScheduledExecutorService p =
247 >            Executors.unconfigurableScheduledExecutorService
248 >            (Executors.newScheduledThreadPool(2));
249 >        try (PoolCleaner cleaner = cleaner(p)) {
250 >            final CountDownLatch proceed = new CountDownLatch(1);
251 >            final Runnable task = new CheckedRunnable() {
252 >                public void realRun() {
253 >                    await(proceed);
254 >                }};
255 >            long startTime = System.nanoTime();
256 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
257 >                                  timeoutMillis(), MILLISECONDS);
258 >            assertFalse(f.isDone());
259 >            proceed.countDown();
260 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
261 >            assertSame(Boolean.TRUE, f.get());
262 >            assertTrue(f.isDone());
263 >            assertFalse(f.isCancelled());
264 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
265 >        }
266 >    }
267 >
268 >    /**
269 >     * Future.get on submitted tasks will time out if they compute too long.
270 >     */
271 >    public void testTimedCallable() throws Exception {
272 >        final ExecutorService[] executors = {
273 >            Executors.newSingleThreadExecutor(),
274 >            Executors.newCachedThreadPool(),
275 >            Executors.newFixedThreadPool(2),
276 >            Executors.newScheduledThreadPool(2),
277 >        };
278 >
279 >        final Runnable sleeper = new CheckedInterruptedRunnable() {
280 >            public void realRun() throws InterruptedException {
281 >                delay(LONG_DELAY_MS);
282 >            }};
283 >
284 >        List<Thread> threads = new ArrayList<Thread>();
285 >        for (final ExecutorService executor : executors) {
286 >            threads.add(newStartedThread(new CheckedRunnable() {
287 >                public void realRun() {
288 >                    Future future = executor.submit(sleeper);
289 >                    assertFutureTimesOut(future);
290 >                }}));
291 >        }
292 >        for (Thread thread : threads)
293 >            awaitTermination(thread);
294 >        for (ExecutorService executor : executors)
295              joinPool(executor);
325        }
296      }
297  
328
298      /**
299       * ThreadPoolExecutor using defaultThreadFactory has
300       * specified group, priority, daemon status, and name
301       */
302 <    public void testDefaultThreadFactory() {
302 >    public void testDefaultThreadFactory() throws Exception {
303          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
304 <        Runnable r = new Runnable() {
305 <                public void run() {
306 <                    try {
307 <                        Thread current = Thread.currentThread();
308 <                        threadAssertTrue(!current.isDaemon());
309 <                        threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
310 <                        ThreadGroup g = current.getThreadGroup();
311 <                        SecurityManager s = System.getSecurityManager();
312 <                        if (s != null)
313 <                            threadAssertTrue(g == s.getThreadGroup());
314 <                        else
315 <                            threadAssertTrue(g == egroup);
316 <                        String name = current.getName();
317 <                        threadAssertTrue(name.endsWith("thread-1"));
318 <                    } catch (SecurityException ok) {
319 <                        // Also pass if not allowed to change setting
320 <                    }
304 >        final CountDownLatch done = new CountDownLatch(1);
305 >        Runnable r = new CheckedRunnable() {
306 >            public void realRun() {
307 >                try {
308 >                    Thread current = Thread.currentThread();
309 >                    assertTrue(!current.isDaemon());
310 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
311 >                    ThreadGroup g = current.getThreadGroup();
312 >                    SecurityManager s = System.getSecurityManager();
313 >                    if (s != null)
314 >                        assertTrue(g == s.getThreadGroup());
315 >                    else
316 >                        assertTrue(g == egroup);
317 >                    String name = current.getName();
318 >                    assertTrue(name.endsWith("thread-1"));
319 >                } catch (SecurityException ok) {
320 >                    // Also pass if not allowed to change setting
321                  }
322 <            };
322 >                done.countDown();
323 >            }};
324          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
325 <
326 <        e.execute(r);
327 <        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);
325 >        try (PoolCleaner cleaner = cleaner(e)) {
326 >            e.execute(r);
327 >            await(done);
328          }
329      }
330  
# Line 373 | Line 333 | public class ExecutorsTest extends JSR16
333       * specified group, priority, daemon status, name,
334       * access control context and context class loader
335       */
336 <    public void testPrivilegedThreadFactory() {
337 <        Policy savedPolicy = null;
338 <        try {
339 <            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 <        } catch (AccessControlException ok) {
345 <            return;
346 <        }
347 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
348 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
349 <        final AccessControlContext thisacc = AccessController.getContext();
350 <        Runnable r = new Runnable() {
351 <                public void run() {
352 <                    try {
353 <                        Thread current = Thread.currentThread();
354 <                        threadAssertTrue(!current.isDaemon());
355 <                        threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
356 <                        ThreadGroup g = current.getThreadGroup();
357 <                        SecurityManager s = System.getSecurityManager();
358 <                        if (s != null)
359 <                            threadAssertTrue(g == s.getThreadGroup());
360 <                        else
361 <                            threadAssertTrue(g == egroup);
362 <                        String name = current.getName();
363 <                        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 <                    }
336 >    public void testPrivilegedThreadFactory() throws Exception {
337 >        final CountDownLatch done = new CountDownLatch(1);
338 >        Runnable r = new CheckedRunnable() {
339 >            public void realRun() throws Exception {
340 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
341 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
342 >                final AccessControlContext thisacc = AccessController.getContext();
343 >                Runnable r = new CheckedRunnable() {
344 >                    public void realRun() {
345 >                        Thread current = Thread.currentThread();
346 >                        assertTrue(!current.isDaemon());
347 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
348 >                        ThreadGroup g = current.getThreadGroup();
349 >                        SecurityManager s = System.getSecurityManager();
350 >                        if (s != null)
351 >                            assertTrue(g == s.getThreadGroup());
352 >                        else
353 >                            assertTrue(g == egroup);
354 >                        String name = current.getName();
355 >                        assertTrue(name.endsWith("thread-1"));
356 >                        assertSame(thisccl, current.getContextClassLoader());
357 >                        assertEquals(thisacc, AccessController.getContext());
358 >                        done.countDown();
359 >                    }};
360 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
361 >                try (PoolCleaner cleaner = cleaner(e)) {
362 >                    e.execute(r);
363 >                    await(done);
364                  }
365 <            };
411 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
365 >            }};
366  
367 <        Policy.setPolicy(savedPolicy);
368 <        e.execute(r);
369 <        try {
370 <            e.shutdown();
371 <        } catch (SecurityException ok) {
418 <        }
419 <        try {
420 <            Thread.sleep(SHORT_DELAY_MS);
421 <        } catch (Exception ex) {
422 <            unexpectedException();
423 <        } finally {
424 <            joinPool(e);
425 <        }
367 >        runWithPermissions(r,
368 >                           new RuntimePermission("getClassLoader"),
369 >                           new RuntimePermission("setContextClassLoader"),
370 >                           new RuntimePermission("modifyThread"));
371 >    }
372  
373 +    boolean haveCCLPermissions() {
374 +        SecurityManager sm = System.getSecurityManager();
375 +        if (sm != null) {
376 +            try {
377 +                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
378 +                sm.checkPermission(new RuntimePermission("getClassLoader"));
379 +            } catch (AccessControlException e) {
380 +                return false;
381 +            }
382 +        }
383 +        return true;
384      }
385  
386      void checkCCL() {
# Line 441 | Line 398 | public class ExecutorsTest extends JSR16
398          }
399      }
400  
444
401      /**
402       * Without class loader permissions, creating
403       * privilegedCallableUsingCurrentClassLoader throws ACE
404       */
405      public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
406 <        Policy savedPolicy = null;
407 <        try {
408 <            savedPolicy = Policy.getPolicy();
409 <            AdjustablePolicy policy = new AdjustablePolicy();
410 <            Policy.setPolicy(policy);
411 <        } catch (AccessControlException ok) {
412 <            return;
413 <        }
414 <
459 <        // Check if program still has too many permissions to run test
460 <        try {
461 <            checkCCL();
462 <            // too many privileges to test; so return
463 <            Policy.setPolicy(savedPolicy);
464 <            return;
465 <        } catch (AccessControlException ok) {
466 <        }
406 >        Runnable r = new CheckedRunnable() {
407 >            public void realRun() throws Exception {
408 >                if (System.getSecurityManager() == null)
409 >                    return;
410 >                try {
411 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
412 >                    shouldThrow();
413 >                } catch (AccessControlException success) {}
414 >            }};
415  
416 <        try {
469 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
470 <            shouldThrow();
471 <        } catch (AccessControlException success) {
472 <        } catch (Exception ex) {
473 <            unexpectedException();
474 <        }
475 <        finally {
476 <            Policy.setPolicy(savedPolicy);
477 <        }
416 >        runWithoutPermissions(r);
417      }
418  
419      /**
420       * With class loader permissions, calling
421       * privilegedCallableUsingCurrentClassLoader does not throw ACE
422       */
423 <    public void testprivilegedCallableUsingCCLWithPrivs() {
424 <        Policy savedPolicy = null;
425 <        try {
426 <            savedPolicy = Policy.getPolicy();
427 <            AdjustablePolicy policy = new AdjustablePolicy();
428 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
429 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
430 <            Policy.setPolicy(policy);
431 <        } catch (AccessControlException ok) {
432 <            return;
433 <        }
495 <
496 <        try {
497 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
498 <            task.call();
499 <        } catch (Exception ex) {
500 <            unexpectedException();
501 <        }
502 <        finally {
503 <            Policy.setPolicy(savedPolicy);
504 <        }
423 >    public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
424 >        Runnable r = new CheckedRunnable() {
425 >            public void realRun() throws Exception {
426 >                Executors.privilegedCallableUsingCurrentClassLoader
427 >                    (new NoOpCallable())
428 >                    .call();
429 >            }};
430 >
431 >        runWithPermissions(r,
432 >                           new RuntimePermission("getClassLoader"),
433 >                           new RuntimePermission("setContextClassLoader"));
434      }
435  
436      /**
437       * Without permissions, calling privilegedCallable throws ACE
438       */
439 <    public void testprivilegedCallableWithNoPrivs() {
440 <        Callable task;
441 <        Policy savedPolicy = null;
442 <        AdjustablePolicy policy = null;
443 <        AccessControlContext noprivAcc = null;
444 <        try {
445 <            savedPolicy = Policy.getPolicy();
446 <            policy = new AdjustablePolicy();
447 <            Policy.setPolicy(policy);
448 <            noprivAcc = AccessController.getContext();
449 <            task = Executors.privilegedCallable(new CheckCCL());
450 <            Policy.setPolicy(savedPolicy);
451 <        } catch (AccessControlException ok) {
452 <            return; // program has too few permissions to set up test
453 <        }
454 <
455 <        // Make sure that program doesn't have too many permissions
456 <        try {
457 <            AccessController.doPrivileged(new PrivilegedAction() {
458 <                    public Object run() {
459 <                        checkCCL();
460 <                        return null;
461 <                    }}, noprivAcc);
462 <            // too many permssions; skip test
463 <            return;
464 <        } catch (AccessControlException ok) {
465 <        }
466 <
467 <        try {
468 <            task.call();
469 <            shouldThrow();
470 <        } catch (AccessControlException success) {
471 <        } catch (Exception ex) {
472 <            unexpectedException();
473 <        }
439 >    public void testPrivilegedCallableWithNoPrivs() throws Exception {
440 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
441 >        Executors.privilegedCallable(new CheckCCL());
442 >
443 >        Runnable r = new CheckedRunnable() {
444 >            public void realRun() throws Exception {
445 >                if (System.getSecurityManager() == null)
446 >                    return;
447 >                Callable task = Executors.privilegedCallable(new CheckCCL());
448 >                try {
449 >                    task.call();
450 >                    shouldThrow();
451 >                } catch (AccessControlException success) {}
452 >            }};
453 >
454 >        runWithoutPermissions(r);
455 >
456 >        // It seems rather difficult to test that the
457 >        // AccessControlContext of the privilegedCallable is used
458 >        // instead of its caller.  Below is a failed attempt to do
459 >        // that, which does not work because the AccessController
460 >        // cannot capture the internal state of the current Policy.
461 >        // It would be much more work to differentiate based on,
462 >        // e.g. CodeSource.
463 >
464 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
465 > //         final Callable[] task = new Callable[1];
466 >
467 > //         runWithPermissions
468 > //             (new CheckedRunnable() {
469 > //                 public void realRun() {
470 > //                     if (System.getSecurityManager() == null)
471 > //                         return;
472 > //                     noprivAcc[0] = AccessController.getContext();
473 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
474 > //                     try {
475 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
476 > //                                                           public Void run() {
477 > //                                                               checkCCL();
478 > //                                                               return null;
479 > //                                                           }}, noprivAcc[0]);
480 > //                         shouldThrow();
481 > //                     } catch (AccessControlException success) {}
482 > //                 }});
483 >
484 > //         runWithPermissions
485 > //             (new CheckedRunnable() {
486 > //                 public void realRun() throws Exception {
487 > //                     if (System.getSecurityManager() == null)
488 > //                         return;
489 > //                     // Verify that we have an underprivileged ACC
490 > //                     try {
491 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
492 > //                                                           public Void run() {
493 > //                                                               checkCCL();
494 > //                                                               return null;
495 > //                                                           }}, noprivAcc[0]);
496 > //                         shouldThrow();
497 > //                     } catch (AccessControlException success) {}
498 >
499 > //                     try {
500 > //                         task[0].call();
501 > //                         shouldThrow();
502 > //                     } catch (AccessControlException success) {}
503 > //                 }},
504 > //              new RuntimePermission("getClassLoader"),
505 > //              new RuntimePermission("setContextClassLoader"));
506      }
507  
508      /**
509       * With permissions, calling privilegedCallable succeeds
510       */
511 <    public void testprivilegedCallableWithPrivs() {
512 <        Policy savedPolicy = null;
513 <        try {
514 <            savedPolicy = Policy.getPolicy();
515 <            AdjustablePolicy policy = new AdjustablePolicy();
516 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
517 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
518 <            Policy.setPolicy(policy);
519 <        } catch (AccessControlException ok) {
559 <            return;
560 <        }
561 <
562 <        Callable task = Executors.privilegedCallable(new CheckCCL());
563 <        try {
564 <            task.call();
565 <        } catch (Exception ex) {
566 <            unexpectedException();
567 <        } finally {
568 <            Policy.setPolicy(savedPolicy);
569 <        }
511 >    public void testPrivilegedCallableWithPrivs() throws Exception {
512 >        Runnable r = new CheckedRunnable() {
513 >            public void realRun() throws Exception {
514 >                Executors.privilegedCallable(new CheckCCL()).call();
515 >            }};
516 >
517 >        runWithPermissions(r,
518 >                           new RuntimePermission("getClassLoader"),
519 >                           new RuntimePermission("setContextClassLoader"));
520      }
521  
522      /**
523       * callable(Runnable) returns null when called
524       */
525 <    public void testCallable1() {
526 <        try {
527 <            Callable c = Executors.callable(new NoOpRunnable());
578 <            assertNull(c.call());
579 <        } catch (Exception ex) {
580 <            unexpectedException();
581 <        }
582 <
525 >    public void testCallable1() throws Exception {
526 >        Callable c = Executors.callable(new NoOpRunnable());
527 >        assertNull(c.call());
528      }
529  
530      /**
531       * callable(Runnable, result) returns result when called
532       */
533 <    public void testCallable2() {
534 <        try {
535 <            Callable c = Executors.callable(new NoOpRunnable(), one);
591 <            assertEquals(one, c.call());
592 <        } catch (Exception ex) {
593 <            unexpectedException();
594 <        }
533 >    public void testCallable2() throws Exception {
534 >        Callable c = Executors.callable(new NoOpRunnable(), one);
535 >        assertSame(one, c.call());
536      }
537  
538      /**
539       * callable(PrivilegedAction) returns its result when called
540       */
541 <    public void testCallable3() {
542 <        try {
543 <            Callable c = Executors.callable(new PrivilegedAction() {
544 <                    public Object run() { return one; }});
604 <        assertEquals(one, c.call());
605 <        } catch (Exception ex) {
606 <            unexpectedException();
607 <        }
541 >    public void testCallable3() throws Exception {
542 >        Callable c = Executors.callable(new PrivilegedAction() {
543 >                public Object run() { return one; }});
544 >        assertSame(one, c.call());
545      }
546  
547      /**
548       * callable(PrivilegedExceptionAction) returns its result when called
549       */
550 <    public void testCallable4() {
551 <        try {
552 <            Callable c = Executors.callable(new PrivilegedExceptionAction() {
553 <                    public Object run() { return one; }});
617 <            assertEquals(one, c.call());
618 <        } catch (Exception ex) {
619 <            unexpectedException();
620 <        }
550 >    public void testCallable4() throws Exception {
551 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
552 >                public Object run() { return one; }});
553 >        assertSame(one, c.call());
554      }
555  
623
556      /**
557       * callable(null Runnable) throws NPE
558       */
559      public void testCallableNPE1() {
560          try {
561 <            Runnable r = null;
562 <            Callable c = Executors.callable(r);
563 <        } catch (NullPointerException success) {
632 <        }
561 >            Callable c = Executors.callable((Runnable) null);
562 >            shouldThrow();
563 >        } catch (NullPointerException success) {}
564      }
565  
566      /**
# Line 637 | Line 568 | public class ExecutorsTest extends JSR16
568       */
569      public void testCallableNPE2() {
570          try {
571 <            Runnable r = null;
572 <            Callable c = Executors.callable(r, one);
573 <        } catch (NullPointerException success) {
643 <        }
571 >            Callable c = Executors.callable((Runnable) null, one);
572 >            shouldThrow();
573 >        } catch (NullPointerException success) {}
574      }
575  
576      /**
# Line 648 | Line 578 | public class ExecutorsTest extends JSR16
578       */
579      public void testCallableNPE3() {
580          try {
581 <            PrivilegedAction r = null;
582 <            Callable c = Executors.callable(r);
583 <        } catch (NullPointerException success) {
654 <        }
581 >            Callable c = Executors.callable((PrivilegedAction) null);
582 >            shouldThrow();
583 >        } catch (NullPointerException success) {}
584      }
585  
586      /**
# Line 659 | Line 588 | public class ExecutorsTest extends JSR16
588       */
589      public void testCallableNPE4() {
590          try {
591 <            PrivilegedExceptionAction r = null;
592 <            Callable c = Executors.callable(r);
593 <        } catch (NullPointerException success) {
665 <        }
591 >            Callable c = Executors.callable((PrivilegedExceptionAction) null);
592 >            shouldThrow();
593 >        } catch (NullPointerException success) {}
594      }
595  
668
596   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines