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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines