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.11 by dl, Mon Dec 22 00:48:55 2003 UTC vs.
Revision 1.15 by dl, Thu Jan 22 14:07:50 2004 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
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.
7   */
8  
9  
# Line 68 | Line 69 | public class ExecutorsTest extends JSR16
69          e.execute(new NoOpRunnable());
70          e.execute(new NoOpRunnable());
71          e.execute(new NoOpRunnable());
72 <        e.shutdown();
72 >        joinPool(e);
73      }
74  
75      /**
# Line 79 | Line 80 | public class ExecutorsTest extends JSR16
80          e.execute(new NoOpRunnable());
81          e.execute(new NoOpRunnable());
82          e.execute(new NoOpRunnable());
83 <        e.shutdown();
83 >        joinPool(e);
84      }
85  
86      /**
# Line 103 | Line 104 | public class ExecutorsTest extends JSR16
104          e.execute(new NoOpRunnable());
105          e.execute(new NoOpRunnable());
106          e.execute(new NoOpRunnable());
107 <        e.shutdown();
107 >        joinPool(e);
108      }
109  
110      /**
# Line 114 | Line 115 | public class ExecutorsTest extends JSR16
115          e.execute(new NoOpRunnable());
116          e.execute(new NoOpRunnable());
117          e.execute(new NoOpRunnable());
118 <        e.shutdown();
118 >        joinPool(e);
119      }
120  
121      /**
# Line 151 | Line 152 | public class ExecutorsTest extends JSR16
152          e.execute(new NoOpRunnable());
153          e.execute(new NoOpRunnable());
154          e.execute(new NoOpRunnable());
155 <        e.shutdown();
155 >        joinPool(e);
156      }
157  
158      /**
# Line 162 | Line 163 | public class ExecutorsTest extends JSR16
163          e.execute(new NoOpRunnable());
164          e.execute(new NoOpRunnable());
165          e.execute(new NoOpRunnable());
166 <        e.shutdown();
166 >        joinPool(e);
167      }
168  
169      /**
# Line 198 | Line 199 | public class ExecutorsTest extends JSR16
199          e.execute(new NoOpRunnable());
200          e.execute(new NoOpRunnable());
201          e.execute(new NoOpRunnable());
202 <        e.shutdown();
202 >        joinPool(e);
203      }
204  
205      /**
# Line 236 | Line 237 | public class ExecutorsTest extends JSR16
237              Thread.sleep(MEDIUM_DELAY_MS);
238              assertTrue(callable.done);
239              assertEquals(Boolean.TRUE, f.get());
239 –            p1.shutdown();
240              joinPool(p1);
241          } catch(RejectedExecutionException e){}
242          catch(Exception e){
# Line 257 | Line 257 | public class ExecutorsTest extends JSR16
257              Thread.sleep(MEDIUM_DELAY_MS);
258              assertTrue(callable.done);
259              assertEquals(Boolean.TRUE, f.get());
260 –            p1.shutdown();
260              joinPool(p1);
261          } catch(RejectedExecutionException e){}
262          catch(Exception e){
# Line 278 | Line 277 | public class ExecutorsTest extends JSR16
277              Thread.sleep(MEDIUM_DELAY_MS);
278              assertTrue(callable.done);
279              assertEquals(Boolean.TRUE, f.get());
281 –            p1.shutdown();
280              joinPool(p1);
281          } catch(RejectedExecutionException e){}
282          catch(Exception e){
# Line 336 | Line 334 | public class ExecutorsTest extends JSR16
334          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
335          Runnable r = new Runnable() {
336                  public void run() {
337 <                    Thread current = Thread.currentThread();
338 <                    threadAssertTrue(!current.isDaemon());
339 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
340 <                    ThreadGroup g = current.getThreadGroup();
341 <                    SecurityManager s = System.getSecurityManager();
342 <                    if (s != null)
343 <                        threadAssertTrue(g == s.getThreadGroup());
344 <                    else
345 <                        threadAssertTrue(g == egroup);
346 <                    String name = current.getName();
347 <                    threadAssertTrue(name.endsWith("thread-1"));
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 >                    } catch (SecurityException ok) {
350 >                        // Also pass if not allowed to change setting
351 >                    }
352                  }
353              };
354          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
355          
356          e.execute(r);
357 <        e.shutdown();
357 >        try {
358 >            e.shutdown();
359 >        } catch(SecurityException ok) {
360 >        }
361 >        
362          try {
363              Thread.sleep(SHORT_DELAY_MS);
364          } catch (Exception eX) {
# Line 368 | Line 374 | public class ExecutorsTest extends JSR16
374       * access control context and context class loader
375       */
376      public void testPrivilegedThreadFactory() {
377 <        Policy savedPolicy = Policy.getPolicy();
378 <        AdjustablePolicy policy = new AdjustablePolicy();
379 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
380 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
381 <        Policy.setPolicy(policy);
377 >        Policy savedPolicy = null;
378 >        try {
379 >            savedPolicy = Policy.getPolicy();
380 >            AdjustablePolicy policy = new AdjustablePolicy();
381 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
382 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
383 >            Policy.setPolicy(policy);
384 >        } catch (AccessControlException ok) {
385 >            return;
386 >        }
387          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
388          final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
389          final AccessControlContext thisacc = AccessController.getContext();
390          Runnable r = new Runnable() {
391                  public void run() {
392 <                    Thread current = Thread.currentThread();
393 <                    threadAssertTrue(!current.isDaemon());
394 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
395 <                    ThreadGroup g = current.getThreadGroup();
396 <                    SecurityManager s = System.getSecurityManager();
397 <                    if (s != null)
398 <                        threadAssertTrue(g == s.getThreadGroup());
399 <                    else
400 <                        threadAssertTrue(g == egroup);
401 <                    String name = current.getName();
402 <                    threadAssertTrue(name.endsWith("thread-1"));
403 <                    threadAssertTrue(thisccl == current.getContextClassLoader());
404 <                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
392 >                    try {
393 >                        Thread current = Thread.currentThread();
394 >                        threadAssertTrue(!current.isDaemon());
395 >                        threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
396 >                        ThreadGroup g = current.getThreadGroup();
397 >                        SecurityManager s = System.getSecurityManager();
398 >                        if (s != null)
399 >                            threadAssertTrue(g == s.getThreadGroup());
400 >                        else
401 >                            threadAssertTrue(g == egroup);
402 >                        String name = current.getName();
403 >                        threadAssertTrue(name.endsWith("thread-1"));
404 >                        threadAssertTrue(thisccl == current.getContextClassLoader());
405 >                        threadAssertTrue(thisacc.equals(AccessController.getContext()));
406 >                    } catch(SecurityException ok) {
407 >                        // Also pass if not allowed to change settings
408 >                    }
409                  }
410              };
411          ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
412          
413          Policy.setPolicy(savedPolicy);
414          e.execute(r);
415 <        e.shutdown();
415 >        try {
416 >            e.shutdown();
417 >        } catch(SecurityException ok) {
418 >        }
419          try {
420              Thread.sleep(SHORT_DELAY_MS);
421          } catch (Exception ex) {
# Line 422 | Line 440 | public class ExecutorsTest extends JSR16
440       * privilegedCallableUsingCurrentClassLoader throws ACE
441       */
442      public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
443 <        Policy savedPolicy = Policy.getPolicy();
444 <        AdjustablePolicy policy = new AdjustablePolicy();
445 <        Policy.setPolicy(policy);
443 >        Policy savedPolicy = null;
444 >        try {
445 >            savedPolicy = Policy.getPolicy();
446 >            AdjustablePolicy policy = new AdjustablePolicy();
447 >            Policy.setPolicy(policy);
448 >        } catch (AccessControlException ok) {
449 >            return;
450 >        }
451 >
452          try {
453              Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
454              shouldThrow();
# Line 442 | Line 466 | public class ExecutorsTest extends JSR16
466       * privilegedCallableUsingCurrentClassLoader throws ACE
467       */
468      public void testprivilegedCallableUsingCCLWithPrivs() {
469 <        Policy savedPolicy = Policy.getPolicy();
470 <        AdjustablePolicy policy = new AdjustablePolicy();
471 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
472 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
473 <        Policy.setPolicy(policy);
469 >        Policy savedPolicy = null;
470 >        try {
471 >            savedPolicy = Policy.getPolicy();
472 >            AdjustablePolicy policy = new AdjustablePolicy();
473 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
474 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
475 >            Policy.setPolicy(policy);
476 >        } catch (AccessControlException ok) {
477 >            return;
478 >        }
479 >            
480          try {
481              Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
482              task.call();
# Line 458 | Line 488 | public class ExecutorsTest extends JSR16
488          }
489      }
490  
491 +    class CallCCL implements Runnable {
492 +        final Callable task;
493 +        CallCCL(Callable t) { task = t; }
494 +        public void run() {
495 +            try {
496 +                task.call();
497 +                threadShouldThrow();
498 +            } catch(AccessControlException success) {
499 +            } catch(Exception ex) {
500 +                threadUnexpectedException();
501 +            }
502 +        }
503 +    }
504 +
505      /**
506       * Without permissions, calling privilegedCallable throws ACE
507       */
508      public void testprivilegedCallableWithNoPrivs() {
509 <        Policy savedPolicy = Policy.getPolicy();
466 <        AdjustablePolicy policy = new AdjustablePolicy();
467 <        Policy.setPolicy(policy);
468 <        Callable task = Executors.privilegedCallable(new CheckCCL());
469 <        Policy.setPolicy(savedPolicy);
509 >        Thread t1;
510          try {
511 <            task.call();
512 <            shouldThrow();
513 <        } catch(AccessControlException success) {
511 >            Policy savedPolicy = Policy.getPolicy();
512 >            AdjustablePolicy policy = new AdjustablePolicy();
513 >            Policy.setPolicy(policy);
514 >            Callable task = Executors.privilegedCallable(new CheckCCL());
515 >            t1 = new Thread(new CallCCL(task));
516 >            Policy.setPolicy(savedPolicy);
517 >        } catch (AccessControlException ok) {
518 >            return;
519 >        }
520 >
521 >        try {
522 >            t1.start();
523 >            t1.join();
524          } catch(Exception ex) {
525              unexpectedException();
526 <        } finally {
477 <        }
526 >        }
527      }
528  
529      /**
530       * With permissions, calling privilegedCallable succeeds
531       */
532      public void testprivilegedCallableWithPrivs() {
533 <        Policy savedPolicy = Policy.getPolicy();
534 <        AdjustablePolicy policy = new AdjustablePolicy();
535 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
536 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
537 <        Policy.setPolicy(policy);
533 >        Policy savedPolicy = null;
534 >        try {
535 >            savedPolicy = Policy.getPolicy();
536 >            AdjustablePolicy policy = new AdjustablePolicy();
537 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
538 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
539 >            Policy.setPolicy(policy);
540 >        } catch (AccessControlException ok) {
541 >            return;
542 >        }
543 >            
544          Callable task = Executors.privilegedCallable(new CheckCCL());
545          try {
546              task.call();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines