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.12 by dl, Sat Dec 27 19:26:43 2003 UTC vs.
Revision 1.30 by jsr166, Wed Aug 25 00:07:03 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 69 | Line 30 | public class ExecutorsTest extends JSR16
30          e.execute(new NoOpRunnable());
31          e.execute(new NoOpRunnable());
32          e.execute(new NoOpRunnable());
33 <        e.shutdown();
33 >        joinPool(e);
34      }
35  
36      /**
# Line 80 | Line 41 | public class ExecutorsTest extends JSR16
41          e.execute(new NoOpRunnable());
42          e.execute(new NoOpRunnable());
43          e.execute(new NoOpRunnable());
44 <        e.shutdown();
44 >        joinPool(e);
45      }
46  
47      /**
# 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 104 | Line 63 | public class ExecutorsTest extends JSR16
63          e.execute(new NoOpRunnable());
64          e.execute(new NoOpRunnable());
65          e.execute(new NoOpRunnable());
66 <        e.shutdown();
66 >        joinPool(e);
67      }
68  
69      /**
# Line 115 | Line 74 | public class ExecutorsTest extends JSR16
74          e.execute(new NoOpRunnable());
75          e.execute(new NoOpRunnable());
76          e.execute(new NoOpRunnable());
77 <        e.shutdown();
77 >        joinPool(e);
78      }
79  
80      /**
# 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 152 | Line 110 | public class ExecutorsTest extends JSR16
110          e.execute(new NoOpRunnable());
111          e.execute(new NoOpRunnable());
112          e.execute(new NoOpRunnable());
113 <        e.shutdown();
113 >        joinPool(e);
114      }
115  
116      /**
# Line 163 | Line 121 | public class ExecutorsTest extends JSR16
121          e.execute(new NoOpRunnable());
122          e.execute(new NoOpRunnable());
123          e.execute(new NoOpRunnable());
124 <        e.shutdown();
124 >        joinPool(e);
125      }
126  
127      /**
# 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 199 | Line 153 | public class ExecutorsTest extends JSR16
153          e.execute(new NoOpRunnable());
154          e.execute(new NoOpRunnable());
155          e.execute(new NoOpRunnable());
156 <        e.shutdown();
156 >        joinPool(e);
157      }
158  
159      /**
# 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 <            p1.shutdown();
241 <            joinPool(p1);
242 <        } catch(RejectedExecutionException e){}
243 <        catch(Exception e){
244 <            e.printStackTrace();
245 <            unexpectedException();
246 <        }
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());
261 <            p1.shutdown();
262 <            joinPool(p1);
263 <        } catch(RejectedExecutionException e){}
264 <        catch(Exception e){
265 <            e.printStackTrace();
266 <            unexpectedException();
267 <        }
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());
282 <            p1.shutdown();
283 <            joinPool(p1);
284 <        } catch(RejectedExecutionException e){}
285 <        catch(Exception e){
286 <            e.printStackTrace();
287 <            unexpectedException();
288 <        }
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;
239 <            BigInteger sum = BigInteger.ZERO;
309 <            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 =
227 >            new RunnableShouldThrow(InterruptedException.class) {
228 >                public void realRun() throws InterruptedException {
229 >                    Thread.sleep(LONG_DELAY_MS);
230 >                }};
231 >        for (ExecutorService executor :
232 >                 new ExecutorService[] {
233 >                     Executors.newSingleThreadExecutor(),
234 >                     Executors.newCachedThreadPool(),
235 >                     Executors.newFixedThreadPool(2),
236 >                     Executors.newScheduledThreadPool(2),
237 >                 }) {
238 >            try {
239 >                Future future = executor.submit(sleeper);
240                  try {
241 <                    ++iters;
242 <                    sum = sum.add(it.next().call());
243 <                }
244 <                catch (TimeoutException success) {
245 <                    assertTrue(iters > 0);
316 <                    return;
317 <                }
318 <                catch (Exception e) {
319 <                    unexpectedException();
241 >                    future.get(SHORT_DELAY_MS, MILLISECONDS);
242 >                    shouldThrow();
243 >                } catch (TimeoutException success) {
244 >                } finally {
245 >                    future.cancel(true);
246                  }
247              }
248 <            // if by chance we didn't ever time out, total time must be small
249 <            long elapsed = System.currentTimeMillis() - startTime;
250 <            assertTrue(elapsed < N);
325 <        }
326 <        finally {
327 <            joinPool(executor);
248 >            finally {
249 >                joinPool(executor);
250 >            }
251          }
252      }
253  
254 <    
254 >
255      /**
256       * ThreadPoolExecutor using defaultThreadFactory has
257       * specified group, priority, daemon status, and name
258       */
259 <    public void testDefaultThreadFactory() {
259 >    public void testDefaultThreadFactory() throws Exception {
260          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
261          Runnable r = new Runnable() {
262                  public void run() {
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"));
263 >                    try {
264 >                        Thread current = Thread.currentThread();
265 >                        threadAssertTrue(!current.isDaemon());
266 >                        threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
267 >                        ThreadGroup g = current.getThreadGroup();
268 >                        SecurityManager s = System.getSecurityManager();
269 >                        if (s != null)
270 >                            threadAssertTrue(g == s.getThreadGroup());
271 >                        else
272 >                            threadAssertTrue(g == egroup);
273 >                        String name = current.getName();
274 >                        threadAssertTrue(name.endsWith("thread-1"));
275 >                    } catch (SecurityException ok) {
276 >                        // Also pass if not allowed to change setting
277 >                    }
278                  }
279              };
280          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
281 <        
281 >
282          e.execute(r);
283 <        e.shutdown();
283 >        try {
284 >            e.shutdown();
285 >        } catch (SecurityException ok) {
286 >        }
287 >
288          try {
289              Thread.sleep(SHORT_DELAY_MS);
359        } catch (Exception eX) {
360            unexpectedException();
290          } finally {
291              joinPool(e);
292          }
# Line 368 | Line 297 | public class ExecutorsTest extends JSR16
297       * specified group, priority, daemon status, name,
298       * access control context and context class loader
299       */
300 <    public void testPrivilegedThreadFactory() {
301 <        Policy 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 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
307 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
308 <        final AccessControlContext thisacc = AccessController.getContext();
309 <        Runnable r = new Runnable() {
310 <                public void run() {
311 <                    Thread current = Thread.currentThread();
312 <                    threadAssertTrue(!current.isDaemon());
313 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
314 <                    ThreadGroup g = current.getThreadGroup();
315 <                    SecurityManager s = System.getSecurityManager();
316 <                    if (s != null)
317 <                        threadAssertTrue(g == s.getThreadGroup());
318 <                    else
319 <                        threadAssertTrue(g == egroup);
320 <                    String name = current.getName();
321 <                    threadAssertTrue(name.endsWith("thread-1"));
322 <                    threadAssertTrue(thisccl == current.getContextClassLoader());
323 <                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
324 <                }
325 <            };
326 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
327 <        
328 <        Policy.setPolicy(savedPolicy);
329 <        e.execute(r);
330 <        e.shutdown();
331 <        try {
332 <            Thread.sleep(SHORT_DELAY_MS);
333 <        } catch (Exception ex) {
334 <            unexpectedException();
335 <        } finally {
336 <            joinPool(e);
300 >    public void testPrivilegedThreadFactory() throws Exception {
301 >        Runnable r = new CheckedRunnable() {
302 >            public void realRun() throws Exception {
303 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
304 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
305 >                final AccessControlContext thisacc = AccessController.getContext();
306 >                Runnable r = new CheckedRunnable() {
307 >                    public void realRun() {
308 >                        Thread current = Thread.currentThread();
309 >                        assertTrue(!current.isDaemon());
310 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
311 >                        ThreadGroup g = current.getThreadGroup();
312 >                        SecurityManager s = System.getSecurityManager();
313 >                        if (s != null)
314 >                            assertTrue(g == s.getThreadGroup());
315 >                        else
316 >                            assertTrue(g == egroup);
317 >                        String name = current.getName();
318 >                        assertTrue(name.endsWith("thread-1"));
319 >                        assertTrue(thisccl == current.getContextClassLoader());
320 >                        assertTrue(thisacc.equals(AccessController.getContext()));
321 >                    }};
322 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
323 >                e.execute(r);
324 >                e.shutdown();
325 >                Thread.sleep(SHORT_DELAY_MS);
326 >                joinPool(e);
327 >            }};
328 >
329 >        runWithPermissions(r,
330 >                           new RuntimePermission("getClassLoader"),
331 >                           new RuntimePermission("setContextClassLoader"),
332 >                           new RuntimePermission("modifyThread"));
333 >    }
334 >
335 >    boolean haveCCLPermissions() {
336 >        SecurityManager sm = System.getSecurityManager();
337 >        if (sm != null) {
338 >            try {
339 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
340 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
341 >            } catch (AccessControlException e) {
342 >                return false;
343 >            }
344          }
345 +        return true;
346 +    }
347  
348 +    void checkCCL() {
349 +        SecurityManager sm = System.getSecurityManager();
350 +        if (sm != null) {
351 +            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
352 +            sm.checkPermission(new RuntimePermission("getClassLoader"));
353 +        }
354      }
355  
356 <    static class CheckCCL implements Callable<Object> {
356 >    class CheckCCL implements Callable<Object> {
357          public Object call() {
358 <            AccessControlContext acc = AccessController.getContext();
415 <            acc.checkPermission(new RuntimePermission("getContextClassLoader"));
358 >            checkCCL();
359              return null;
360          }
361      }
# Line 423 | Line 366 | public class ExecutorsTest extends JSR16
366       * privilegedCallableUsingCurrentClassLoader throws ACE
367       */
368      public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
369 <        Policy savedPolicy = Policy.getPolicy();
370 <        AdjustablePolicy policy = new AdjustablePolicy();
371 <        Policy.setPolicy(policy);
372 <        try {
373 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
374 <            shouldThrow();
375 <        } catch(AccessControlException success) {
376 <        } catch(Exception ex) {
377 <            unexpectedException();
378 <        }
379 <        finally {
437 <            Policy.setPolicy(savedPolicy);
438 <        }
369 >        Runnable r = new CheckedRunnable() {
370 >            public void realRun() throws Exception {
371 >                if (System.getSecurityManager() == null)
372 >                    return;
373 >                try {
374 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
375 >                    shouldThrow();
376 >                } catch (AccessControlException success) {}
377 >            }};
378 >
379 >        runWithoutPermissions(r);
380      }
381  
382      /**
383 <     * Without class loader permissions, calling
384 <     * privilegedCallableUsingCurrentClassLoader throws ACE
383 >     * With class loader permissions, calling
384 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
385       */
386 <    public void testprivilegedCallableUsingCCLWithPrivs() {
387 <        Policy savedPolicy = Policy.getPolicy();
388 <        AdjustablePolicy policy = new AdjustablePolicy();
389 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
390 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
391 <        Policy.setPolicy(policy);
392 <        try {
393 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
394 <            task.call();
395 <        } catch(Exception ex) {
396 <            unexpectedException();
456 <        }
457 <        finally {
458 <            Policy.setPolicy(savedPolicy);
459 <        }
386 >    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
387 >        Runnable r = new CheckedRunnable() {
388 >            public void realRun() throws Exception {
389 >                Executors.privilegedCallableUsingCurrentClassLoader
390 >                    (new NoOpCallable())
391 >                    .call();
392 >            }};
393 >
394 >        runWithPermissions(r,
395 >                           new RuntimePermission("getClassLoader"),
396 >                           new RuntimePermission("setContextClassLoader"));
397      }
398  
399      /**
400       * Without permissions, calling privilegedCallable throws ACE
401       */
402 <    public void testprivilegedCallableWithNoPrivs() {
403 <        Policy savedPolicy = Policy.getPolicy();
404 <        AdjustablePolicy policy = new AdjustablePolicy();
405 <        Policy.setPolicy(policy);
406 <        Callable task = Executors.privilegedCallable(new CheckCCL());
407 <        Policy.setPolicy(savedPolicy);
408 <        try {
409 <            task.call();
410 <            shouldThrow();
411 <        } catch(AccessControlException success) {
412 <        } catch(Exception ex) {
413 <            unexpectedException();
414 <        } finally {
415 <        }
402 >    public void testprivilegedCallableWithNoPrivs() throws Exception {
403 >        Runnable r = new CheckedRunnable() {
404 >            public void realRun() throws Exception {
405 >                if (System.getSecurityManager() == null)
406 >                    return;
407 >                Callable task = Executors.privilegedCallable(new CheckCCL());
408 >                try {
409 >                    task.call();
410 >                    shouldThrow();
411 >                } catch (AccessControlException success) {}
412 >            }};
413 >
414 >        runWithoutPermissions(r);
415 >
416 >        // It seems rather difficult to test that the
417 >        // AccessControlContext of the privilegedCallable is used
418 >        // instead of its caller.  Below is a failed attempt to do
419 >        // that, which does not work because the AccessController
420 >        // cannot capture the internal state of the current Policy.
421 >        // It would be much more work to differentiate based on,
422 >        // e.g. CodeSource.
423 >
424 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
425 > //         final Callable[] task = new Callable[1];
426 >
427 > //         runWithPermissions
428 > //             (new CheckedRunnable() {
429 > //                 public void realRun() {
430 > //                     if (System.getSecurityManager() == null)
431 > //                         return;
432 > //                     noprivAcc[0] = AccessController.getContext();
433 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
434 > //                     try {
435 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
436 > //                                                           public Void run() {
437 > //                                                               checkCCL();
438 > //                                                               return null;
439 > //                                                           }}, noprivAcc[0]);
440 > //                         shouldThrow();
441 > //                     } catch (AccessControlException success) {}
442 > //                 }});
443 >
444 > //         runWithPermissions
445 > //             (new CheckedRunnable() {
446 > //                 public void realRun() throws Exception {
447 > //                     if (System.getSecurityManager() == null)
448 > //                         return;
449 > //                     // Verify that we have an underprivileged ACC
450 > //                     try {
451 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
452 > //                                                           public Void run() {
453 > //                                                               checkCCL();
454 > //                                                               return null;
455 > //                                                           }}, noprivAcc[0]);
456 > //                         shouldThrow();
457 > //                     } catch (AccessControlException success) {}
458 >
459 > //                     try {
460 > //                         task[0].call();
461 > //                         shouldThrow();
462 > //                     } catch (AccessControlException success) {}
463 > //                 }},
464 > //              new RuntimePermission("getClassLoader"),
465 > //              new RuntimePermission("setContextClassLoader"));
466      }
467  
468      /**
469       * With permissions, calling privilegedCallable succeeds
470       */
471 <    public void testprivilegedCallableWithPrivs() {
472 <        Policy savedPolicy = Policy.getPolicy();
473 <        AdjustablePolicy policy = new AdjustablePolicy();
474 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
475 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
476 <        Policy.setPolicy(policy);
477 <        Callable task = Executors.privilegedCallable(new CheckCCL());
478 <        try {
479 <            task.call();
493 <        } catch(Exception ex) {
494 <            unexpectedException();
495 <        } finally {
496 <            Policy.setPolicy(savedPolicy);
497 <        }
471 >    public void testprivilegedCallableWithPrivs() throws Exception {
472 >        Runnable r = new CheckedRunnable() {
473 >            public void realRun() throws Exception {
474 >                Executors.privilegedCallable(new CheckCCL()).call();
475 >            }};
476 >
477 >         runWithPermissions(r,
478 >                           new RuntimePermission("getClassLoader"),
479 >                           new RuntimePermission("setContextClassLoader"));
480      }
481  
482      /**
483       * callable(Runnable) returns null when called
484 <     */
485 <    public void testCallable1() {
486 <        try {
487 <            Callable c = Executors.callable(new NoOpRunnable());
506 <            assertNull(c.call());
507 <        } catch(Exception ex) {
508 <            unexpectedException();
509 <        }
510 <        
484 >     */
485 >    public void testCallable1() throws Exception {
486 >        Callable c = Executors.callable(new NoOpRunnable());
487 >        assertNull(c.call());
488      }
489  
490      /**
491       * callable(Runnable, result) returns result when called
492 <     */
493 <    public void testCallable2() {
494 <        try {
495 <            Callable c = Executors.callable(new NoOpRunnable(), one);
519 <            assertEquals(one, c.call());
520 <        } catch(Exception ex) {
521 <            unexpectedException();
522 <        }
492 >     */
493 >    public void testCallable2() throws Exception {
494 >        Callable c = Executors.callable(new NoOpRunnable(), one);
495 >        assertSame(one, c.call());
496      }
497  
498      /**
499       * callable(PrivilegedAction) returns its result when called
500 <     */
501 <    public void testCallable3() {
502 <        try {
503 <            Callable c = Executors.callable(new PrivilegedAction() {
504 <                    public Object run() { return one; }});
532 <        assertEquals(one, c.call());
533 <        } catch(Exception ex) {
534 <            unexpectedException();
535 <        }
500 >     */
501 >    public void testCallable3() throws Exception {
502 >        Callable c = Executors.callable(new PrivilegedAction() {
503 >                public Object run() { return one; }});
504 >        assertSame(one, c.call());
505      }
506  
507      /**
508       * callable(PrivilegedExceptionAction) returns its result when called
509 <     */
510 <    public void testCallable4() {
511 <        try {
512 <            Callable c = Executors.callable(new PrivilegedExceptionAction() {
513 <                    public Object run() { return one; }});
545 <            assertEquals(one, c.call());
546 <        } catch(Exception ex) {
547 <            unexpectedException();
548 <        }
509 >     */
510 >    public void testCallable4() throws Exception {
511 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
512 >                public Object run() { return one; }});
513 >        assertSame(one, c.call());
514      }
515  
516  
517      /**
518       * callable(null Runnable) throws NPE
519 <     */
519 >     */
520      public void testCallableNPE1() {
521          try {
522 <            Runnable r = null;
523 <            Callable c = Executors.callable(r);
524 <        } catch (NullPointerException success) {
560 <        }
522 >            Callable c = Executors.callable((Runnable) null);
523 >            shouldThrow();
524 >        } catch (NullPointerException success) {}
525      }
526  
527      /**
528       * callable(null, result) throws NPE
529 <     */
529 >     */
530      public void testCallableNPE2() {
531          try {
532 <            Runnable r = null;
533 <            Callable c = Executors.callable(r, one);
534 <        } catch (NullPointerException success) {
571 <        }
532 >            Callable c = Executors.callable((Runnable) null, one);
533 >            shouldThrow();
534 >        } catch (NullPointerException success) {}
535      }
536  
537      /**
538       * callable(null PrivilegedAction) throws NPE
539 <     */
539 >     */
540      public void testCallableNPE3() {
541          try {
542 <            PrivilegedAction r = null;
543 <            Callable c = Executors.callable(r);
544 <        } catch (NullPointerException success) {
582 <        }
542 >            Callable c = Executors.callable((PrivilegedAction) null);
543 >            shouldThrow();
544 >        } catch (NullPointerException success) {}
545      }
546  
547      /**
548       * callable(null PrivilegedExceptionAction) throws NPE
549 <     */
549 >     */
550      public void testCallableNPE4() {
551          try {
552 <            PrivilegedExceptionAction r = null;
553 <            Callable c = Executors.callable(r);
554 <        } catch (NullPointerException success) {
593 <        }
552 >            Callable c = Executors.callable((PrivilegedExceptionAction) null);
553 >            shouldThrow();
554 >        } catch (NullPointerException success) {}
555      }
556  
557  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines