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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines