ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ExecutorsTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.15 by dl, Thu Jan 22 14:07:50 2004 UTC vs.
Revision 1.33 by jsr166, Mon Oct 4 05:45:44 2010 UTC

# Line 2 | Line 2
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4   * http://creativecommons.org/licenses/publicdomain
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9  
10   import junit.framework.*;
11   import java.util.*;
12   import java.util.concurrent.*;
13 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
14   import java.math.BigInteger;
15   import java.security.*;
16  
17 < public class ExecutorsTest extends JSR166TestCase{
17 > public class ExecutorsTest extends JSR166TestCase {
18      public static void main(String[] args) {
19 <        junit.textui.TestRunner.run (suite());  
19 >        junit.textui.TestRunner.run(suite());
20      }
21      public static Test suite() {
22          return new TestSuite(ExecutorsTest.class);
23      }
24  
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
25      /**
26       * A newCachedThreadPool can execute runnables
27       */
# Line 90 | Line 51 | public class ExecutorsTest extends JSR16
51          try {
52              ExecutorService e = Executors.newCachedThreadPool(null);
53              shouldThrow();
54 <        }
94 <        catch(NullPointerException success) {
95 <        }
54 >        } catch (NullPointerException success) {}
55      }
56  
57  
# Line 125 | Line 84 | public class ExecutorsTest extends JSR16
84          try {
85              ExecutorService e = Executors.newSingleThreadExecutor(null);
86              shouldThrow();
87 <        }
129 <        catch(NullPointerException success) {
130 <        }
87 >        } catch (NullPointerException success) {}
88      }
89  
90      /**
# Line 137 | Line 94 | public class ExecutorsTest extends JSR16
94          ExecutorService e = Executors.newSingleThreadExecutor();
95          try {
96              ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
97 +            shouldThrow();
98          } catch (ClassCastException success) {
99          } finally {
100              joinPool(e);
# Line 173 | Line 131 | public class ExecutorsTest extends JSR16
131          try {
132              ExecutorService e = Executors.newFixedThreadPool(2, null);
133              shouldThrow();
134 <        }
177 <        catch(NullPointerException success) {
178 <        }
134 >        } catch (NullPointerException success) {}
135      }
136  
137      /**
# Line 185 | Line 141 | public class ExecutorsTest extends JSR16
141          try {
142              ExecutorService e = Executors.newFixedThreadPool(0);
143              shouldThrow();
144 <        }
189 <        catch(IllegalArgumentException success) {
190 <        }
144 >        } catch (IllegalArgumentException success) {}
145      }
146  
147  
# Line 208 | Line 162 | public class ExecutorsTest extends JSR16
162      public void testunconfigurableExecutorServiceNPE() {
163          try {
164              ExecutorService e = Executors.unconfigurableExecutorService(null);
165 <        }
166 <        catch (NullPointerException success) {
213 <        }
165 >            shouldThrow();
166 >        } catch (NullPointerException success) {}
167      }
168  
169      /**
# Line 219 | Line 172 | public class ExecutorsTest extends JSR16
172      public void testunconfigurableScheduledExecutorServiceNPE() {
173          try {
174              ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
175 <        }
176 <        catch (NullPointerException success) {
224 <        }
175 >            shouldThrow();
176 >        } catch (NullPointerException success) {}
177      }
178  
179  
180      /**
181       * a newSingleThreadScheduledExecutor successfully runs delayed task
182       */
183 <    public void testNewSingleThreadScheduledExecutor() {
184 <        try {
185 <            TrackedCallable callable = new TrackedCallable();
186 <            ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
187 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
188 <            assertFalse(callable.done);
189 <            Thread.sleep(MEDIUM_DELAY_MS);
190 <            assertTrue(callable.done);
191 <            assertEquals(Boolean.TRUE, f.get());
240 <            joinPool(p1);
241 <        } catch(RejectedExecutionException e){}
242 <        catch(Exception e){
243 <            e.printStackTrace();
244 <            unexpectedException();
245 <        }
183 >    public void testNewSingleThreadScheduledExecutor() throws Exception {
184 >        TrackedCallable callable = new TrackedCallable();
185 >        ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
186 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
187 >        assertFalse(callable.done);
188 >        Thread.sleep(MEDIUM_DELAY_MS);
189 >        assertTrue(callable.done);
190 >        assertEquals(Boolean.TRUE, f.get());
191 >        joinPool(p1);
192      }
193  
194      /**
195       * a newScheduledThreadPool successfully runs delayed task
196       */
197 <    public void testnewScheduledThreadPool() {
198 <        try {
199 <            TrackedCallable callable = new TrackedCallable();
200 <            ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
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());
260 <            joinPool(p1);
261 <        } catch(RejectedExecutionException e){}
262 <        catch(Exception e){
263 <            e.printStackTrace();
264 <            unexpectedException();
265 <        }
197 >    public void testnewScheduledThreadPool() throws Exception {
198 >        TrackedCallable callable = new TrackedCallable();
199 >        ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
200 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
201 >        assertFalse(callable.done);
202 >        Thread.sleep(MEDIUM_DELAY_MS);
203 >        assertTrue(callable.done);
204 >        assertEquals(Boolean.TRUE, f.get());
205 >        joinPool(p1);
206      }
207  
208      /**
209 <     * an unconfigurable  newScheduledThreadPool successfully runs delayed task
210 <     */
211 <    public void testunconfigurableScheduledExecutorService() {
212 <        try {
213 <            TrackedCallable callable = new TrackedCallable();
214 <            ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
215 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
216 <            assertFalse(callable.done);
217 <            Thread.sleep(MEDIUM_DELAY_MS);
218 <            assertTrue(callable.done);
219 <            assertEquals(Boolean.TRUE, f.get());
280 <            joinPool(p1);
281 <        } catch(RejectedExecutionException e){}
282 <        catch(Exception e){
283 <            e.printStackTrace();
284 <            unexpectedException();
285 <        }
209 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
210 >     */
211 >    public void testunconfigurableScheduledExecutorService() throws Exception {
212 >        TrackedCallable callable = new TrackedCallable();
213 >        ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
214 >        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
215 >        assertFalse(callable.done);
216 >        Thread.sleep(MEDIUM_DELAY_MS);
217 >        assertTrue(callable.done);
218 >        assertEquals(Boolean.TRUE, f.get());
219 >        joinPool(p1);
220      }
221  
222      /**
223 <     *  timeouts from execute will time out if they compute too long.
224 <     */
225 <    public void testTimedCallable() {
226 <        int N = 10000;
227 <        ExecutorService executor = Executors.newSingleThreadExecutor();
228 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
229 <        try {
230 <            long startTime = System.currentTimeMillis();
231 <            
232 <            long i = 0;
233 <            while (tasks.size() < N) {
234 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
235 <                i += 10;
236 <            }
237 <            
238 <            int iters = 0;
305 <            BigInteger sum = BigInteger.ZERO;
306 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
223 >     *  Future.get on submitted tasks will time out if they compute too long.
224 >     */
225 >    public void testTimedCallable() throws Exception {
226 >        final Runnable sleeper = new CheckedInterruptedRunnable() {
227 >            public void realRun() throws InterruptedException {
228 >                Thread.sleep(LONG_DELAY_MS);
229 >            }};
230 >        for (ExecutorService executor :
231 >                 new ExecutorService[] {
232 >                     Executors.newSingleThreadExecutor(),
233 >                     Executors.newCachedThreadPool(),
234 >                     Executors.newFixedThreadPool(2),
235 >                     Executors.newScheduledThreadPool(2),
236 >                 }) {
237 >            try {
238 >                Future future = executor.submit(sleeper);
239                  try {
240 <                    ++iters;
241 <                    sum = sum.add(it.next().call());
242 <                }
243 <                catch (TimeoutException success) {
244 <                    assertTrue(iters > 0);
313 <                    return;
314 <                }
315 <                catch (Exception e) {
316 <                    unexpectedException();
240 >                    future.get(SHORT_DELAY_MS, MILLISECONDS);
241 >                    shouldThrow();
242 >                } catch (TimeoutException success) {
243 >                } finally {
244 >                    future.cancel(true);
245                  }
246              }
247 <            // if by chance we didn't ever time out, total time must be small
248 <            long elapsed = System.currentTimeMillis() - startTime;
249 <            assertTrue(elapsed < N);
322 <        }
323 <        finally {
324 <            joinPool(executor);
247 >            finally {
248 >                joinPool(executor);
249 >            }
250          }
251      }
252  
253 <    
253 >
254      /**
255       * ThreadPoolExecutor using defaultThreadFactory has
256       * specified group, priority, daemon status, and name
257       */
258 <    public void testDefaultThreadFactory() {
258 >    public void testDefaultThreadFactory() throws Exception {
259          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
260 <        Runnable r = new Runnable() {
261 <                public void run() {
262 <                    try {
263 <                        Thread current = Thread.currentThread();
264 <                        threadAssertTrue(!current.isDaemon());
265 <                        threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
266 <                        ThreadGroup g = current.getThreadGroup();
267 <                        SecurityManager s = System.getSecurityManager();
268 <                        if (s != null)
269 <                            threadAssertTrue(g == s.getThreadGroup());
270 <                        else
271 <                            threadAssertTrue(g == egroup);
272 <                        String name = current.getName();
273 <                        threadAssertTrue(name.endsWith("thread-1"));
274 <                    } catch (SecurityException ok) {
275 <                        // Also pass if not allowed to change setting
351 <                    }
260 >        Runnable r = new CheckedRunnable() {
261 >            public void realRun() {
262 >                try {
263 >                    Thread current = Thread.currentThread();
264 >                    assertTrue(!current.isDaemon());
265 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
266 >                    ThreadGroup g = current.getThreadGroup();
267 >                    SecurityManager s = System.getSecurityManager();
268 >                    if (s != null)
269 >                        assertTrue(g == s.getThreadGroup());
270 >                    else
271 >                        assertTrue(g == egroup);
272 >                    String name = current.getName();
273 >                    assertTrue(name.endsWith("thread-1"));
274 >                } catch (SecurityException ok) {
275 >                    // Also pass if not allowed to change setting
276                  }
277 <            };
277 >            }};
278          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
279 <        
279 >
280          e.execute(r);
281          try {
282              e.shutdown();
283 <        } catch(SecurityException ok) {
283 >        } catch (SecurityException ok) {
284          }
285 <        
285 >
286          try {
287              Thread.sleep(SHORT_DELAY_MS);
364        } catch (Exception eX) {
365            unexpectedException();
288          } finally {
289              joinPool(e);
290          }
# Line 373 | Line 295 | public class ExecutorsTest extends JSR16
295       * specified group, priority, daemon status, name,
296       * access control context and context class loader
297       */
298 <    public void testPrivilegedThreadFactory() {
299 <        Policy savedPolicy = null;
300 <        try {
301 <            savedPolicy = Policy.getPolicy();
302 <            AdjustablePolicy policy = new AdjustablePolicy();
303 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
304 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
305 <            Policy.setPolicy(policy);
306 <        } catch (AccessControlException ok) {
307 <            return;
308 <        }
309 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
310 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
311 <        final AccessControlContext thisacc = AccessController.getContext();
312 <        Runnable r = new Runnable() {
313 <                public void run() {
314 <                    try {
315 <                        Thread current = Thread.currentThread();
316 <                        threadAssertTrue(!current.isDaemon());
317 <                        threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
318 <                        ThreadGroup g = current.getThreadGroup();
319 <                        SecurityManager s = System.getSecurityManager();
320 <                        if (s != null)
321 <                            threadAssertTrue(g == s.getThreadGroup());
322 <                        else
323 <                            threadAssertTrue(g == egroup);
324 <                        String name = current.getName();
325 <                        threadAssertTrue(name.endsWith("thread-1"));
326 <                        threadAssertTrue(thisccl == current.getContextClassLoader());
327 <                        threadAssertTrue(thisacc.equals(AccessController.getContext()));
328 <                    } catch(SecurityException ok) {
329 <                        // Also pass if not allowed to change settings
330 <                    }
331 <                }
332 <            };
333 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
334 <        
335 <        Policy.setPolicy(savedPolicy);
336 <        e.execute(r);
337 <        try {
338 <            e.shutdown();
339 <        } catch(SecurityException ok) {
340 <        }
341 <        try {
420 <            Thread.sleep(SHORT_DELAY_MS);
421 <        } catch (Exception ex) {
422 <            unexpectedException();
423 <        } finally {
424 <            joinPool(e);
298 >    public void testPrivilegedThreadFactory() throws Exception {
299 >        Runnable r = new CheckedRunnable() {
300 >            public void realRun() throws Exception {
301 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
302 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
303 >                final AccessControlContext thisacc = AccessController.getContext();
304 >                Runnable r = new CheckedRunnable() {
305 >                    public void realRun() {
306 >                        Thread current = Thread.currentThread();
307 >                        assertTrue(!current.isDaemon());
308 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
309 >                        ThreadGroup g = current.getThreadGroup();
310 >                        SecurityManager s = System.getSecurityManager();
311 >                        if (s != null)
312 >                            assertTrue(g == s.getThreadGroup());
313 >                        else
314 >                            assertTrue(g == egroup);
315 >                        String name = current.getName();
316 >                        assertTrue(name.endsWith("thread-1"));
317 >                        assertSame(thisccl, current.getContextClassLoader());
318 >                        assertEquals(thisacc, AccessController.getContext());
319 >                    }};
320 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
321 >                e.execute(r);
322 >                e.shutdown();
323 >                Thread.sleep(SHORT_DELAY_MS);
324 >                joinPool(e);
325 >            }};
326 >
327 >        runWithPermissions(r,
328 >                           new RuntimePermission("getClassLoader"),
329 >                           new RuntimePermission("setContextClassLoader"),
330 >                           new RuntimePermission("modifyThread"));
331 >    }
332 >
333 >    boolean haveCCLPermissions() {
334 >        SecurityManager sm = System.getSecurityManager();
335 >        if (sm != null) {
336 >            try {
337 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
338 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
339 >            } catch (AccessControlException e) {
340 >                return false;
341 >            }
342          }
343 +        return true;
344 +    }
345  
346 +    void checkCCL() {
347 +        SecurityManager sm = System.getSecurityManager();
348 +        if (sm != null) {
349 +            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
350 +            sm.checkPermission(new RuntimePermission("getClassLoader"));
351 +        }
352      }
353  
354 <    static class CheckCCL implements Callable<Object> {
354 >    class CheckCCL implements Callable<Object> {
355          public Object call() {
356 <            AccessControlContext acc = AccessController.getContext();
432 <            acc.checkPermission(new RuntimePermission("getContextClassLoader"));
356 >            checkCCL();
357              return null;
358          }
359      }
# Line 440 | Line 364 | public class ExecutorsTest extends JSR16
364       * privilegedCallableUsingCurrentClassLoader throws ACE
365       */
366      public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
367 <        Policy savedPolicy = null;
368 <        try {
369 <            savedPolicy = Policy.getPolicy();
370 <            AdjustablePolicy policy = new AdjustablePolicy();
371 <            Policy.setPolicy(policy);
372 <        } catch (AccessControlException ok) {
373 <            return;
374 <        }
367 >        Runnable r = new CheckedRunnable() {
368 >            public void realRun() throws Exception {
369 >                if (System.getSecurityManager() == null)
370 >                    return;
371 >                try {
372 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
373 >                    shouldThrow();
374 >                } catch (AccessControlException success) {}
375 >            }};
376  
377 <        try {
453 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
454 <            shouldThrow();
455 <        } catch(AccessControlException success) {
456 <        } catch(Exception ex) {
457 <            unexpectedException();
458 <        }
459 <        finally {
460 <            Policy.setPolicy(savedPolicy);
461 <        }
377 >        runWithoutPermissions(r);
378      }
379  
380      /**
381 <     * Without class loader permissions, calling
382 <     * privilegedCallableUsingCurrentClassLoader throws ACE
381 >     * With class loader permissions, calling
382 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
383       */
384 <    public void testprivilegedCallableUsingCCLWithPrivs() {
385 <        Policy savedPolicy = null;
386 <        try {
387 <            savedPolicy = Policy.getPolicy();
388 <            AdjustablePolicy policy = new AdjustablePolicy();
389 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
390 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
475 <            Policy.setPolicy(policy);
476 <        } catch (AccessControlException ok) {
477 <            return;
478 <        }
479 <            
480 <        try {
481 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
482 <            task.call();
483 <        } catch(Exception ex) {
484 <            unexpectedException();
485 <        }
486 <        finally {
487 <            Policy.setPolicy(savedPolicy);
488 <        }
489 <    }
384 >    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
385 >        Runnable r = new CheckedRunnable() {
386 >            public void realRun() throws Exception {
387 >                Executors.privilegedCallableUsingCurrentClassLoader
388 >                    (new NoOpCallable())
389 >                    .call();
390 >            }};
391  
392 <    class CallCCL implements Runnable {
393 <        final Callable task;
394 <        CallCCL(Callable t) { task = t; }
494 <        public void run() {
495 <            try {
496 <                task.call();
497 <                threadShouldThrow();
498 <            } catch(AccessControlException success) {
499 <            } catch(Exception ex) {
500 <                threadUnexpectedException();
501 <            }
502 <        }
392 >        runWithPermissions(r,
393 >                           new RuntimePermission("getClassLoader"),
394 >                           new RuntimePermission("setContextClassLoader"));
395      }
396  
397      /**
398       * Without permissions, calling privilegedCallable throws ACE
399       */
400 <    public void testprivilegedCallableWithNoPrivs() {
401 <        Thread t1;
402 <        try {
403 <            Policy savedPolicy = Policy.getPolicy();
404 <            AdjustablePolicy policy = new AdjustablePolicy();
405 <            Policy.setPolicy(policy);
406 <            Callable task = Executors.privilegedCallable(new CheckCCL());
407 <            t1 = new Thread(new CallCCL(task));
408 <            Policy.setPolicy(savedPolicy);
409 <        } catch (AccessControlException ok) {
410 <            return;
411 <        }
412 <
413 <        try {
414 <            t1.start();
415 <            t1.join();
416 <        } catch(Exception ex) {
417 <            unexpectedException();
418 <        }
400 >    public void testprivilegedCallableWithNoPrivs() throws Exception {
401 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
402 >        Executors.privilegedCallable(new CheckCCL());
403 >
404 >        Runnable r = new CheckedRunnable() {
405 >            public void realRun() throws Exception {
406 >                if (System.getSecurityManager() == null)
407 >                    return;
408 >                Callable task = Executors.privilegedCallable(new CheckCCL());
409 >                try {
410 >                    task.call();
411 >                    shouldThrow();
412 >                } catch (AccessControlException success) {}
413 >            }};
414 >
415 >        runWithoutPermissions(r);
416 >
417 >        // It seems rather difficult to test that the
418 >        // AccessControlContext of the privilegedCallable is used
419 >        // instead of its caller.  Below is a failed attempt to do
420 >        // that, which does not work because the AccessController
421 >        // cannot capture the internal state of the current Policy.
422 >        // It would be much more work to differentiate based on,
423 >        // e.g. CodeSource.
424 >
425 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
426 > //         final Callable[] task = new Callable[1];
427 >
428 > //         runWithPermissions
429 > //             (new CheckedRunnable() {
430 > //                 public void realRun() {
431 > //                     if (System.getSecurityManager() == null)
432 > //                         return;
433 > //                     noprivAcc[0] = AccessController.getContext();
434 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
435 > //                     try {
436 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
437 > //                                                           public Void run() {
438 > //                                                               checkCCL();
439 > //                                                               return null;
440 > //                                                           }}, noprivAcc[0]);
441 > //                         shouldThrow();
442 > //                     } catch (AccessControlException success) {}
443 > //                 }});
444 >
445 > //         runWithPermissions
446 > //             (new CheckedRunnable() {
447 > //                 public void realRun() throws Exception {
448 > //                     if (System.getSecurityManager() == null)
449 > //                         return;
450 > //                     // Verify that we have an underprivileged ACC
451 > //                     try {
452 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
453 > //                                                           public Void run() {
454 > //                                                               checkCCL();
455 > //                                                               return null;
456 > //                                                           }}, noprivAcc[0]);
457 > //                         shouldThrow();
458 > //                     } catch (AccessControlException success) {}
459 >
460 > //                     try {
461 > //                         task[0].call();
462 > //                         shouldThrow();
463 > //                     } catch (AccessControlException success) {}
464 > //                 }},
465 > //              new RuntimePermission("getClassLoader"),
466 > //              new RuntimePermission("setContextClassLoader"));
467      }
468  
469      /**
470       * With permissions, calling privilegedCallable succeeds
471       */
472 <    public void testprivilegedCallableWithPrivs() {
473 <        Policy savedPolicy = null;
474 <        try {
475 <            savedPolicy = Policy.getPolicy();
476 <            AdjustablePolicy policy = new AdjustablePolicy();
477 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
478 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
479 <            Policy.setPolicy(policy);
480 <        } catch (AccessControlException ok) {
541 <            return;
542 <        }
543 <            
544 <        Callable task = Executors.privilegedCallable(new CheckCCL());
545 <        try {
546 <            task.call();
547 <        } catch(Exception ex) {
548 <            unexpectedException();
549 <        } finally {
550 <            Policy.setPolicy(savedPolicy);
551 <        }
472 >    public void testprivilegedCallableWithPrivs() throws Exception {
473 >        Runnable r = new CheckedRunnable() {
474 >            public void realRun() throws Exception {
475 >                Executors.privilegedCallable(new CheckCCL()).call();
476 >            }};
477 >
478 >         runWithPermissions(r,
479 >                           new RuntimePermission("getClassLoader"),
480 >                           new RuntimePermission("setContextClassLoader"));
481      }
482  
483      /**
484       * callable(Runnable) returns null when called
485 <     */
486 <    public void testCallable1() {
487 <        try {
488 <            Callable c = Executors.callable(new NoOpRunnable());
560 <            assertNull(c.call());
561 <        } catch(Exception ex) {
562 <            unexpectedException();
563 <        }
564 <        
485 >     */
486 >    public void testCallable1() throws Exception {
487 >        Callable c = Executors.callable(new NoOpRunnable());
488 >        assertNull(c.call());
489      }
490  
491      /**
492       * callable(Runnable, result) returns result when called
493 <     */
494 <    public void testCallable2() {
495 <        try {
496 <            Callable c = Executors.callable(new NoOpRunnable(), one);
573 <            assertEquals(one, c.call());
574 <        } catch(Exception ex) {
575 <            unexpectedException();
576 <        }
493 >     */
494 >    public void testCallable2() throws Exception {
495 >        Callable c = Executors.callable(new NoOpRunnable(), one);
496 >        assertSame(one, c.call());
497      }
498  
499      /**
500       * callable(PrivilegedAction) returns its result when called
501 <     */
502 <    public void testCallable3() {
503 <        try {
504 <            Callable c = Executors.callable(new PrivilegedAction() {
505 <                    public Object run() { return one; }});
586 <        assertEquals(one, c.call());
587 <        } catch(Exception ex) {
588 <            unexpectedException();
589 <        }
501 >     */
502 >    public void testCallable3() throws Exception {
503 >        Callable c = Executors.callable(new PrivilegedAction() {
504 >                public Object run() { return one; }});
505 >        assertSame(one, c.call());
506      }
507  
508      /**
509       * callable(PrivilegedExceptionAction) returns its result when called
510 <     */
511 <    public void testCallable4() {
512 <        try {
513 <            Callable c = Executors.callable(new PrivilegedExceptionAction() {
514 <                    public Object run() { return one; }});
599 <            assertEquals(one, c.call());
600 <        } catch(Exception ex) {
601 <            unexpectedException();
602 <        }
510 >     */
511 >    public void testCallable4() throws Exception {
512 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
513 >                public Object run() { return one; }});
514 >        assertSame(one, c.call());
515      }
516  
517  
518      /**
519       * callable(null Runnable) throws NPE
520 <     */
520 >     */
521      public void testCallableNPE1() {
522          try {
523 <            Runnable r = null;
524 <            Callable c = Executors.callable(r);
525 <        } catch (NullPointerException success) {
614 <        }
523 >            Callable c = Executors.callable((Runnable) null);
524 >            shouldThrow();
525 >        } catch (NullPointerException success) {}
526      }
527  
528      /**
529       * callable(null, result) throws NPE
530 <     */
530 >     */
531      public void testCallableNPE2() {
532          try {
533 <            Runnable r = null;
534 <            Callable c = Executors.callable(r, one);
535 <        } catch (NullPointerException success) {
625 <        }
533 >            Callable c = Executors.callable((Runnable) null, one);
534 >            shouldThrow();
535 >        } catch (NullPointerException success) {}
536      }
537  
538      /**
539       * callable(null PrivilegedAction) throws NPE
540 <     */
540 >     */
541      public void testCallableNPE3() {
542          try {
543 <            PrivilegedAction r = null;
544 <            Callable c = Executors.callable(r);
545 <        } catch (NullPointerException success) {
636 <        }
543 >            Callable c = Executors.callable((PrivilegedAction) null);
544 >            shouldThrow();
545 >        } catch (NullPointerException success) {}
546      }
547  
548      /**
549       * callable(null PrivilegedExceptionAction) throws NPE
550 <     */
550 >     */
551      public void testCallableNPE4() {
552          try {
553 <            PrivilegedExceptionAction r = null;
554 <            Callable c = Executors.callable(r);
555 <        } catch (NullPointerException success) {
647 <        }
553 >            Callable c = Executors.callable((PrivilegedExceptionAction) null);
554 >            shouldThrow();
555 >        } catch (NullPointerException success) {}
556      }
557  
558  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines