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.26 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.42 by jsr166, Sun May 29 13:45:35 2011 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
9   import junit.framework.*;
10   import java.util.*;
11   import java.util.concurrent.*;
12   import static java.util.concurrent.TimeUnit.MILLISECONDS;
14 import java.math.BigInteger;
13   import java.security.*;
14  
15   public class ExecutorsTest extends JSR166TestCase {
16      public static void main(String[] args) {
17 <        junit.textui.TestRunner.run (suite());
17 >        junit.textui.TestRunner.run(suite());
18      }
19      public static Test suite() {
20          return new TestSuite(ExecutorsTest.class);
21      }
22  
25    static class TimedCallable<T> implements Callable<T> {
26        private final ExecutorService exec;
27        private final Callable<T> func;
28        private final long msecs;
29
30        TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
31            this.exec = exec;
32            this.func = func;
33            this.msecs = msecs;
34        }
35
36        public T call() throws Exception {
37            Future<T> ftask = exec.submit(func);
38            try {
39                return ftask.get(msecs, MILLISECONDS);
40            } finally {
41                ftask.cancel(true);
42            }
43        }
44    }
45
46
47    private static class Fib implements Callable<BigInteger> {
48        private final BigInteger n;
49        Fib(long n) {
50            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
51            this.n = BigInteger.valueOf(n);
52        }
53        public BigInteger call() {
54            BigInteger f1 = BigInteger.ONE;
55            BigInteger f2 = f1;
56            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
57                BigInteger t = f1.add(f2);
58                f1 = f2;
59                f2 = t;
60            }
61            return f1;
62        }
63    };
64
23      /**
24       * A newCachedThreadPool can execute runnables
25       */
# Line 94 | Line 52 | public class ExecutorsTest extends JSR16
52          } catch (NullPointerException success) {}
53      }
54  
97
55      /**
56       * A new SingleThreadExecutor can execute runnables
57       */
# Line 141 | Line 98 | public class ExecutorsTest extends JSR16
98          }
99      }
100  
144
101      /**
102       * A new newFixedThreadPool can execute runnables
103       */
# Line 184 | Line 140 | public class ExecutorsTest extends JSR16
140          } catch (IllegalArgumentException success) {}
141      }
142  
187
143      /**
144       * An unconfigurable newFixedThreadPool can execute runnables
145       */
146 <    public void testunconfigurableExecutorService() {
146 >    public void testUnconfigurableExecutorService() {
147          ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
148          e.execute(new NoOpRunnable());
149          e.execute(new NoOpRunnable());
# Line 199 | Line 154 | public class ExecutorsTest extends JSR16
154      /**
155       * unconfigurableExecutorService(null) throws NPE
156       */
157 <    public void testunconfigurableExecutorServiceNPE() {
157 >    public void testUnconfigurableExecutorServiceNPE() {
158          try {
159              ExecutorService e = Executors.unconfigurableExecutorService(null);
160              shouldThrow();
# Line 209 | Line 164 | public class ExecutorsTest extends JSR16
164      /**
165       * unconfigurableScheduledExecutorService(null) throws NPE
166       */
167 <    public void testunconfigurableScheduledExecutorServiceNPE() {
167 >    public void testUnconfigurableScheduledExecutorServiceNPE() {
168          try {
169              ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
170              shouldThrow();
171          } catch (NullPointerException success) {}
172      }
173  
219
174      /**
175       * a newSingleThreadScheduledExecutor successfully runs delayed task
176       */
177      public void testNewSingleThreadScheduledExecutor() throws Exception {
178 <        TrackedCallable callable = new TrackedCallable();
179 <        ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
180 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
181 <        assertFalse(callable.done);
182 <        Thread.sleep(MEDIUM_DELAY_MS);
183 <        assertTrue(callable.done);
184 <        assertEquals(Boolean.TRUE, f.get());
185 <        joinPool(p1);
178 >        ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
179 >        try {
180 >            final CountDownLatch proceed = new CountDownLatch(1);
181 >            final Runnable task = new CheckedRunnable() {
182 >                public void realRun() {
183 >                    await(proceed);
184 >                }};
185 >            long startTime = System.nanoTime();
186 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
187 >                                  timeoutMillis(), MILLISECONDS);
188 >            assertFalse(f.isDone());
189 >            proceed.countDown();
190 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
191 >            assertSame(Boolean.TRUE, f.get());
192 >            assertTrue(f.isDone());
193 >            assertFalse(f.isCancelled());
194 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
195 >        } finally {
196 >            joinPool(p);
197 >        }
198      }
199  
200      /**
201       * a newScheduledThreadPool successfully runs delayed task
202       */
203 <    public void testnewScheduledThreadPool() throws Exception {
204 <        TrackedCallable callable = new TrackedCallable();
205 <        ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
206 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
207 <        assertFalse(callable.done);
208 <        Thread.sleep(MEDIUM_DELAY_MS);
209 <        assertTrue(callable.done);
210 <        assertEquals(Boolean.TRUE, f.get());
211 <        joinPool(p1);
203 >    public void testNewScheduledThreadPool() throws Exception {
204 >        ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
205 >        try {
206 >            final CountDownLatch proceed = new CountDownLatch(1);
207 >            final Runnable task = new CheckedRunnable() {
208 >                public void realRun() {
209 >                    await(proceed);
210 >                }};
211 >            long startTime = System.nanoTime();
212 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
213 >                                  timeoutMillis(), MILLISECONDS);
214 >            assertFalse(f.isDone());
215 >            proceed.countDown();
216 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
217 >            assertSame(Boolean.TRUE, f.get());
218 >            assertTrue(f.isDone());
219 >            assertFalse(f.isCancelled());
220 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
221 >        } finally {
222 >            joinPool(p);
223 >        }
224      }
225  
226      /**
227       * an unconfigurable newScheduledThreadPool successfully runs delayed task
228       */
229 <    public void testunconfigurableScheduledExecutorService() throws Exception {
230 <        TrackedCallable callable = new TrackedCallable();
231 <        ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
232 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
233 <        assertFalse(callable.done);
234 <        Thread.sleep(MEDIUM_DELAY_MS);
235 <        assertTrue(callable.done);
236 <        assertEquals(Boolean.TRUE, f.get());
237 <        joinPool(p1);
229 >    public void testUnconfigurableScheduledExecutorService() throws Exception {
230 >        ScheduledExecutorService p =
231 >            Executors.unconfigurableScheduledExecutorService
232 >            (Executors.newScheduledThreadPool(2));
233 >        try {
234 >            final CountDownLatch proceed = new CountDownLatch(1);
235 >            final Runnable task = new CheckedRunnable() {
236 >                public void realRun() {
237 >                    await(proceed);
238 >                }};
239 >            long startTime = System.nanoTime();
240 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
241 >                                  timeoutMillis(), MILLISECONDS);
242 >            assertFalse(f.isDone());
243 >            proceed.countDown();
244 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
245 >            assertSame(Boolean.TRUE, f.get());
246 >            assertTrue(f.isDone());
247 >            assertFalse(f.isCancelled());
248 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
249 >        } finally {
250 >            joinPool(p);
251 >        }
252      }
253  
254      /**
255 <     *  timeouts from execute will time out if they compute too long.
255 >     * Future.get on submitted tasks will time out if they compute too long.
256       */
257      public void testTimedCallable() throws Exception {
258 <        int N = 10000;
259 <        ExecutorService executor = Executors.newSingleThreadExecutor();
260 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
261 <        try {
262 <            long startTime = System.currentTimeMillis();
263 <
264 <            long i = 0;
265 <            while (tasks.size() < N) {
266 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
267 <                i += 10;
268 <            }
269 <
270 <            int iters = 0;
271 <            BigInteger sum = BigInteger.ZERO;
272 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
273 <                try {
274 <                    ++iters;
275 <                    sum = sum.add(it.next().call());
276 <                }
277 <                catch (TimeoutException success) {
278 <                    assertTrue(iters > 0);
279 <                    return;
280 <                }
281 <            }
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 {
258 >        final ExecutorService[] executors = {
259 >            Executors.newSingleThreadExecutor(),
260 >            Executors.newCachedThreadPool(),
261 >            Executors.newFixedThreadPool(2),
262 >            Executors.newScheduledThreadPool(2),
263 >        };
264 >
265 >        final Runnable sleeper = new CheckedInterruptedRunnable() {
266 >            public void realRun() throws InterruptedException {
267 >                delay(LONG_DELAY_MS);
268 >            }};
269 >
270 >        List<Thread> threads = new ArrayList<Thread>();
271 >        for (final ExecutorService executor : executors) {
272 >            threads.add(newStartedThread(new CheckedRunnable() {
273 >                public void realRun() {
274 >                    long startTime = System.nanoTime();
275 >                    Future future = executor.submit(sleeper);
276 >                    assertFutureTimesOut(future);
277 >                }}));
278 >        }
279 >        for (Thread thread : threads)
280 >            awaitTermination(thread);
281 >        for (ExecutorService executor : executors)
282              joinPool(executor);
296        }
283      }
284  
299
285      /**
286       * ThreadPoolExecutor using defaultThreadFactory has
287       * specified group, priority, daemon status, and name
288       */
289      public void testDefaultThreadFactory() throws Exception {
290          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
291 <        Runnable r = new Runnable() {
292 <                public void run() {
293 <                    try {
294 <                        Thread current = Thread.currentThread();
295 <                        threadAssertTrue(!current.isDaemon());
296 <                        threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
297 <                        ThreadGroup g = current.getThreadGroup();
298 <                        SecurityManager s = System.getSecurityManager();
299 <                        if (s != null)
300 <                            threadAssertTrue(g == s.getThreadGroup());
301 <                        else
302 <                            threadAssertTrue(g == egroup);
303 <                        String name = current.getName();
304 <                        threadAssertTrue(name.endsWith("thread-1"));
305 <                    } catch (SecurityException ok) {
306 <                        // Also pass if not allowed to change setting
307 <                    }
291 >        final CountDownLatch done = new CountDownLatch(1);
292 >        Runnable r = new CheckedRunnable() {
293 >            public void realRun() {
294 >                try {
295 >                    Thread current = Thread.currentThread();
296 >                    assertTrue(!current.isDaemon());
297 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
298 >                    ThreadGroup g = current.getThreadGroup();
299 >                    SecurityManager s = System.getSecurityManager();
300 >                    if (s != null)
301 >                        assertTrue(g == s.getThreadGroup());
302 >                    else
303 >                        assertTrue(g == egroup);
304 >                    String name = current.getName();
305 >                    assertTrue(name.endsWith("thread-1"));
306 >                } catch (SecurityException ok) {
307 >                    // Also pass if not allowed to change setting
308                  }
309 <            };
309 >                done.countDown();
310 >            }};
311          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
312  
313          e.execute(r);
314 +        await(done);
315 +
316          try {
317              e.shutdown();
318          } catch (SecurityException ok) {
319          }
320  
321 <        try {
334 <            Thread.sleep(SHORT_DELAY_MS);
335 <        } finally {
336 <            joinPool(e);
337 <        }
321 >        joinPool(e);
322      }
323  
324      /**
# Line 343 | Line 327 | public class ExecutorsTest extends JSR16
327       * access control context and context class loader
328       */
329      public void testPrivilegedThreadFactory() throws Exception {
330 <        Policy savedPolicy = null;
331 <        try {
332 <            savedPolicy = Policy.getPolicy();
333 <            AdjustablePolicy policy = new AdjustablePolicy();
334 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
335 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
336 <            Policy.setPolicy(policy);
337 <        } catch (AccessControlException ok) {
354 <            return;
355 <        }
356 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
357 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
358 <        final AccessControlContext thisacc = AccessController.getContext();
359 <        Runnable r = new Runnable() {
360 <                public void run() {
361 <                    try {
330 >        final CountDownLatch done = new CountDownLatch(1);
331 >        Runnable r = new CheckedRunnable() {
332 >            public void realRun() throws Exception {
333 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
334 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
335 >                final AccessControlContext thisacc = AccessController.getContext();
336 >                Runnable r = new CheckedRunnable() {
337 >                    public void realRun() {
338                          Thread current = Thread.currentThread();
339 <                        threadAssertTrue(!current.isDaemon());
340 <                        threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
339 >                        assertTrue(!current.isDaemon());
340 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
341                          ThreadGroup g = current.getThreadGroup();
342                          SecurityManager s = System.getSecurityManager();
343                          if (s != null)
344 <                            threadAssertTrue(g == s.getThreadGroup());
344 >                            assertTrue(g == s.getThreadGroup());
345                          else
346 <                            threadAssertTrue(g == egroup);
346 >                            assertTrue(g == egroup);
347                          String name = current.getName();
348 <                        threadAssertTrue(name.endsWith("thread-1"));
349 <                        threadAssertTrue(thisccl == current.getContextClassLoader());
350 <                        threadAssertTrue(thisacc.equals(AccessController.getContext()));
351 <                    } catch (SecurityException ok) {
352 <                        // Also pass if not allowed to change settings
353 <                    }
354 <                }
355 <            };
356 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
348 >                        assertTrue(name.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 >                e.execute(r);
355 >                await(done);
356 >                e.shutdown();
357 >                joinPool(e);
358 >            }};
359 >
360 >        runWithPermissions(r,
361 >                           new RuntimePermission("getClassLoader"),
362 >                           new RuntimePermission("setContextClassLoader"),
363 >                           new RuntimePermission("modifyThread"));
364 >    }
365  
366 <        Policy.setPolicy(savedPolicy);
367 <        e.execute(r);
368 <        try {
369 <            e.shutdown();
370 <        } catch (SecurityException ok) {
371 <        }
372 <        try {
373 <            Thread.sleep(SHORT_DELAY_MS);
374 <        } finally {
391 <            joinPool(e);
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 <
376 >        return true;
377      }
378  
379      void checkCCL() {
# Line 408 | Line 391 | public class ExecutorsTest extends JSR16
391          }
392      }
393  
411
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 <        }
407 <
426 <        // Check if program still has too many permissions to run test
427 <        try {
428 <            checkCCL();
429 <            // too many privileges to test; so return
430 <            Policy.setPolicy(savedPolicy);
431 <            return;
432 <        } catch (AccessControlException ok) {
433 <        }
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 {
436 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
437 <            shouldThrow();
438 <        } catch (AccessControlException success) {
439 <        } finally {
440 <            Policy.setPolicy(savedPolicy);
441 <        }
409 >        runWithoutPermissions(r);
410      }
411  
412      /**
413       * With class loader permissions, calling
414       * privilegedCallableUsingCurrentClassLoader does not throw ACE
415       */
416 <    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
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"));
423 <            Policy.setPolicy(policy);
424 <        } catch (AccessControlException ok) {
425 <            return;
426 <        }
459 <
460 <        try {
461 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
462 <            task.call();
463 <        }
464 <        finally {
465 <            Policy.setPolicy(savedPolicy);
466 <        }
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 >        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() throws Exception {
433 <        Callable task;
434 <        Policy savedPolicy = null;
435 <        AdjustablePolicy policy = null;
436 <        AccessControlContext noprivAcc = null;
437 <        try {
438 <            savedPolicy = Policy.getPolicy();
439 <            policy = new AdjustablePolicy();
440 <            Policy.setPolicy(policy);
441 <            noprivAcc = AccessController.getContext();
442 <            task = Executors.privilegedCallable(new CheckCCL());
443 <            Policy.setPolicy(savedPolicy);
444 <        } catch (AccessControlException ok) {
445 <            return; // program has too few permissions to set up test
446 <        }
447 <
448 <        // Make sure that program doesn't have too many permissions
449 <        try {
450 <            AccessController.doPrivileged(new PrivilegedAction() {
451 <                    public Object run() {
452 <                        checkCCL();
453 <                        return null;
454 <                    }}, noprivAcc);
455 <            // too many permssions; skip test
456 <            return;
457 <        } catch (AccessControlException ok) {
458 <        }
459 <
460 <        try {
461 <            task.call();
462 <            shouldThrow();
463 <        } catch (AccessControlException success) {}
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() throws Exception {
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) {
518 <            return;
519 <        }
520 <
521 <        Callable task = Executors.privilegedCallable(new CheckCCL());
522 <        try {
523 <            task.call();
524 <        } finally {
525 <            Policy.setPolicy(savedPolicy);
526 <        }
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      /**
# Line 539 | Line 525 | public class ExecutorsTest extends JSR16
525       */
526      public void testCallable2() throws Exception {
527          Callable c = Executors.callable(new NoOpRunnable(), one);
528 <        assertEquals(one, c.call());
528 >        assertSame(one, c.call());
529      }
530  
531      /**
# Line 548 | Line 534 | public class ExecutorsTest extends JSR16
534      public void testCallable3() throws Exception {
535          Callable c = Executors.callable(new PrivilegedAction() {
536                  public Object run() { return one; }});
537 <        assertEquals(one, c.call());
537 >        assertSame(one, c.call());
538      }
539  
540      /**
# Line 557 | Line 543 | public class ExecutorsTest extends JSR16
543      public void testCallable4() throws Exception {
544          Callable c = Executors.callable(new PrivilegedExceptionAction() {
545                  public Object run() { return one; }});
546 <        assertEquals(one, c.call());
546 >        assertSame(one, c.call());
547      }
548  
563
549      /**
550       * callable(null Runnable) throws NPE
551       */
# Line 601 | Line 586 | public class ExecutorsTest extends JSR16
586          } catch (NullPointerException success) {}
587      }
588  
604
589   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines