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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.92 by jsr166, Sun Nov 18 18:03:11 2012 UTC vs.
Revision 1.94 by jsr166, Mon Jan 21 19:32:19 2013 UTC

# Line 11 | Line 11 | import java.io.ByteArrayInputStream;
11   import java.io.ByteArrayOutputStream;
12   import java.io.ObjectInputStream;
13   import java.io.ObjectOutputStream;
14 + import java.util.ArrayList;
15   import java.util.Arrays;
16   import java.util.Date;
17 + import java.util.Enumeration;
18 + import java.util.List;
19   import java.util.NoSuchElementException;
20   import java.util.PropertyPermission;
21   import java.util.concurrent.*;
# Line 142 | Line 145 | public class JSR166TestCase extends Test
145      }
146  
147      /**
148 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
148 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
149 >     * Optional command line arg provides the number of iterations to
150 >     * repeat running the tests.
151       */
152      public static void main(String[] args) {
153          if (useSecurityManager) {
# Line 623 | Line 628 | public class JSR166TestCase extends Test
628          SecurityManager sm = System.getSecurityManager();
629          if (sm == null) {
630              r.run();
631 +        }
632 +        runWithSecurityManagerWithPermissions(r, permissions);
633 +    }
634 +
635 +    /**
636 +     * Runs Runnable r with a security policy that permits precisely
637 +     * the specified permissions.  If there is no current security
638 +     * manager, a temporary one is set for the duration of the
639 +     * Runnable.  We require that any security manager permit
640 +     * getPolicy/setPolicy.
641 +     */
642 +    public void runWithSecurityManagerWithPermissions(Runnable r,
643 +                                                      Permission... permissions) {
644 +        SecurityManager sm = System.getSecurityManager();
645 +        if (sm == null) {
646              Policy savedPolicy = Policy.getPolicy();
647              try {
648                  Policy.setPolicy(permissivePolicy());
649                  System.setSecurityManager(new SecurityManager());
650 <                runWithPermissions(r, permissions);
650 >                runWithSecurityManagerWithPermissions(r, permissions);
651              } finally {
652                  System.setSecurityManager(null);
653                  Policy.setPolicy(savedPolicy);
# Line 675 | Line 695 | public class JSR166TestCase extends Test
695              return perms.implies(p);
696          }
697          public void refresh() {}
698 +        public String toString() {
699 +            List<Permission> ps = new ArrayList<Permission>();
700 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
701 +                ps.add(e.nextElement());
702 +            return "AdjustablePolicy with permissions " + ps;
703 +        }
704      }
705  
706      /**

Diff Legend

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