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.23 by jsr166, Thu Nov 19 03:55:29 2009 UTC vs.
Revision 1.34 by jsr166, Sat Oct 9 19:30:35 2010 UTC

# Line 10 | Line 10
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 {
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 220 | Line 181 | public class ExecutorsTest extends JSR16
181       * a newSingleThreadScheduledExecutor successfully runs delayed task
182       */
183      public void testNewSingleThreadScheduledExecutor() throws Exception {
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());
231 <            joinPool(p1);
232 <        } catch (RejectedExecutionException e) {}
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() throws Exception {
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());
247 <            joinPool(p1);
248 <        } catch (RejectedExecutionException e) {}
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
209 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
210       */
211      public void testunconfigurableScheduledExecutorService() throws Exception {
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());
263 <            joinPool(p1);
264 <        } catch (RejectedExecutionException e) {}
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.
223 >     * Future.get on submitted tasks will time out if they compute too long.
224       */
225      public void testTimedCallable() throws Exception {
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;
284 <            BigInteger sum = BigInteger.ZERO;
285 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
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);
292 <                    return;
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);
298 <        }
299 <        finally {
300 <            joinPool(executor);
247 >            finally {
248 >                joinPool(executor);
249 >            }
250          }
251      }
252  
# Line 308 | Line 257 | public class ExecutorsTest extends JSR16
257       */
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
327 <                    }
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  
280          e.execute(r);
# Line 348 | Line 296 | public class ExecutorsTest extends JSR16
296       * access control context and context class loader
297       */
298      public void testPrivilegedThreadFactory() throws Exception {
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 <                }
384 <            };
385 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
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 <        Policy.setPolicy(savedPolicy);
334 <        e.execute(r);
335 <        try {
336 <            e.shutdown();
337 <        } catch (SecurityException ok) {
338 <        }
339 <        try {
340 <            Thread.sleep(SHORT_DELAY_MS);
341 <        } finally {
396 <            joinPool(e);
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 <
343 >        return true;
344      }
345  
346      void checkCCL() {
# Line 419 | 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 <        }
375 <
431 <        // Check if program still has too many permissions to run test
432 <        try {
433 <            checkCCL();
434 <            // too many privileges to test; so return
435 <            Policy.setPolicy(savedPolicy);
436 <            return;
437 <        } catch (AccessControlException ok) {
438 <        }
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 {
441 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
442 <            shouldThrow();
443 <        } catch (AccessControlException success) {
444 <        } finally {
445 <            Policy.setPolicy(savedPolicy);
446 <        }
377 >        runWithoutPermissions(r);
378      }
379  
380      /**
# Line 451 | Line 382 | public class ExecutorsTest extends JSR16
382       * privilegedCallableUsingCurrentClassLoader does not throw ACE
383       */
384      public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
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"));
391 <            Policy.setPolicy(policy);
392 <        } catch (AccessControlException ok) {
393 <            return;
394 <        }
464 <
465 <        try {
466 <            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
467 <            task.call();
468 <        }
469 <        finally {
470 <            Policy.setPolicy(savedPolicy);
471 <        }
385 >        Runnable r = new CheckedRunnable() {
386 >            public void realRun() throws Exception {
387 >                Executors.privilegedCallableUsingCurrentClassLoader
388 >                    (new NoOpCallable())
389 >                    .call();
390 >            }};
391 >
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() throws Exception {
401 <        Callable task;
402 <        Policy savedPolicy = null;
480 <        AdjustablePolicy policy = null;
481 <        AccessControlContext noprivAcc = null;
482 <        try {
483 <            savedPolicy = Policy.getPolicy();
484 <            policy = new AdjustablePolicy();
485 <            Policy.setPolicy(policy);
486 <            noprivAcc = AccessController.getContext();
487 <            task = Executors.privilegedCallable(new CheckCCL());
488 <            Policy.setPolicy(savedPolicy);
489 <        } catch (AccessControlException ok) {
490 <            return; // program has too few permissions to set up test
491 <        }
401 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
402 >        Executors.privilegedCallable(new CheckCCL());
403  
404 <        // Make sure that program doesn't have too many permissions
405 <        try {
406 <            AccessController.doPrivileged(new PrivilegedAction() {
407 <                    public Object run() {
408 <                        checkCCL();
409 <                        return null;
410 <                    }}, noprivAcc);
411 <            // too many permssions; skip test
412 <            return;
413 <        } catch (AccessControlException ok) {
414 <        }
415 <
416 <        try {
417 <            task.call();
418 <            shouldThrow();
419 <        } catch (AccessControlException success) {}
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() throws Exception {
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) {
523 <            return;
524 <        }
525 <
526 <        Callable task = Executors.privilegedCallable(new CheckCCL());
527 <        try {
528 <            task.call();
529 <        } finally {
530 <            Policy.setPolicy(savedPolicy);
531 <        }
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      /**
# Line 544 | Line 493 | public class ExecutorsTest extends JSR16
493       */
494      public void testCallable2() throws Exception {
495          Callable c = Executors.callable(new NoOpRunnable(), one);
496 <        assertEquals(one, c.call());
496 >        assertSame(one, c.call());
497      }
498  
499      /**
# Line 553 | Line 502 | public class ExecutorsTest extends JSR16
502      public void testCallable3() throws Exception {
503          Callable c = Executors.callable(new PrivilegedAction() {
504                  public Object run() { return one; }});
505 <        assertEquals(one, c.call());
505 >        assertSame(one, c.call());
506      }
507  
508      /**
# Line 562 | Line 511 | public class ExecutorsTest extends JSR16
511      public void testCallable4() throws Exception {
512          Callable c = Executors.callable(new PrivilegedExceptionAction() {
513                  public Object run() { return one; }});
514 <        assertEquals(one, c.call());
514 >        assertSame(one, c.call());
515      }
516  
517  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines