--- jsr166/src/test/tck/JSR166TestCase.java	2009/12/01 05:41:40	1.46
+++ jsr166/src/test/tck/JSR166TestCase.java	2010/01/05 02:08:37	1.49
@@ -87,10 +87,18 @@ import java.security.*;
  * </ul>
  */
 public class JSR166TestCase extends TestCase {
+    private static final boolean useSecurityManager =
+        Boolean.getBoolean("jsr166.useSecurityManager");
+
     /**
      * Runs all JSR166 unit tests using junit.textui.TestRunner
      */
     public static void main(String[] args) {
+        if (useSecurityManager) {
+            System.err.println("Setting a permissive security manager");
+            Policy.setPolicy(permissivePolicy());
+            System.setSecurityManager(new SecurityManager());
+        }
         int iters = 1;
         if (args.length > 0)
             iters = Integer.parseInt(args[0]);
@@ -370,32 +378,76 @@ public class JSR166TestCase extends Test
 
     // Some convenient Integer constants
 
-    public static final Integer zero = new Integer(0);
-    public static final Integer one = new Integer(1);
-    public static final Integer two = new Integer(2);
-    public static final Integer three  = new Integer(3);
+    public static final Integer zero  = new Integer(0);
+    public static final Integer one   = new Integer(1);
+    public static final Integer two   = new Integer(2);
+    public static final Integer three = new Integer(3);
     public static final Integer four  = new Integer(4);
     public static final Integer five  = new Integer(5);
-    public static final Integer six = new Integer(6);
+    public static final Integer six   = new Integer(6);
     public static final Integer seven = new Integer(7);
     public static final Integer eight = new Integer(8);
-    public static final Integer nine = new Integer(9);
+    public static final Integer nine  = new Integer(9);
     public static final Integer m1  = new Integer(-1);
     public static final Integer m2  = new Integer(-2);
     public static final Integer m3  = new Integer(-3);
-    public static final Integer m4 = new Integer(-4);
-    public static final Integer m5 = new Integer(-5);
-    public static final Integer m6 = new Integer(-6);
+    public static final Integer m4  = new Integer(-4);
+    public static final Integer m5  = new Integer(-5);
+    public static final Integer m6  = new Integer(-6);
     public static final Integer m10 = new Integer(-10);
 
 
     /**
+     * Runs Runnable r with a security policy that permits precisely
+     * the specified permissions.  If there is no current security
+     * manager, the runnable is run twice, both with and without a
+     * security manager.  We require that any security manager permit
+     * getPolicy/setPolicy.
+     */
+    public void runWithPermissions(Runnable r, Permission... permissions) {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm == null) {
+            r.run();
+            Policy savedPolicy = Policy.getPolicy();
+            try {
+                Policy.setPolicy(permissivePolicy());
+                System.setSecurityManager(new SecurityManager());
+                runWithPermissions(r, permissions);
+            } finally {
+                System.setSecurityManager(null);
+                Policy.setPolicy(savedPolicy);
+            }
+        } else {
+            Policy savedPolicy = Policy.getPolicy();
+            AdjustablePolicy policy = new AdjustablePolicy(permissions);
+            Policy.setPolicy(policy);
+
+            try {
+                r.run();
+            } finally {
+                policy.addPermission(new SecurityPermission("setPolicy"));
+                Policy.setPolicy(savedPolicy);
+            }
+        }
+    }
+
+    /**
+     * Runs a runnable without any permissions.
+     */
+    public void runWithoutPermissions(Runnable r) {
+        runWithPermissions(r);
+    }
+
+    /**
      * A security policy where new permissions can be dynamically added
      * or all cleared.
      */
     public static class AdjustablePolicy extends java.security.Policy {
         Permissions perms = new Permissions();
-        AdjustablePolicy() { }
+        AdjustablePolicy(Permission... permissions) {
+            for (Permission permission : permissions)
+                perms.add(permission);
+        }
         void addPermission(Permission perm) { perms.add(perm); }
         void clearPermissions() { perms = new Permissions(); }
         public PermissionCollection getPermissions(CodeSource cs) {
@@ -411,6 +463,25 @@ public class JSR166TestCase extends Test
     }
 
     /**
+     * Returns a policy containing all the permissions we ever need.
+     */
+    public static Policy permissivePolicy() {
+        return new AdjustablePolicy
+            // Permissions j.u.c. needs directly
+            (new RuntimePermission("modifyThread"),
+             new RuntimePermission("getClassLoader"),
+             new RuntimePermission("setContextClassLoader"),
+             // Permissions needed to change permissions!
+             new SecurityPermission("getPolicy"),
+             new SecurityPermission("setPolicy"),
+             new RuntimePermission("setSecurityManager"),
+             // Permissions needed by the junit test harness
+             new RuntimePermission("accessDeclaredMembers"),
+             new PropertyPermission("*", "read"),
+             new java.io.FilePermission("<<ALL FILES>>", "read"));
+    }
+
+    /**
      * Sleep until the timeout has elapsed, or interrupted.
      * Does <em>NOT</em> throw InterruptedException.
      */
@@ -540,6 +611,16 @@ public class JSR166TestCase extends Test
         public String call() { return TEST_STRING; }
     }
 
+    public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
+        return new CheckedCallable<String>() {
+            public String realCall() {
+                try {
+                    latch.await();
+                } catch (InterruptedException quittingTime) {}
+                return TEST_STRING;
+            }};
+    }
+
     public static class NPETask implements Callable<String> {
         public String call() { throw new NullPointerException(); }
     }