--- jsr166/src/test/tck/ExecutorsTest.java	2004/01/19 15:49:02	1.13
+++ jsr166/src/test/tck/ExecutorsTest.java	2009/08/04 13:58:09	1.18
@@ -12,6 +12,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.math.BigInteger;
 import java.security.*;
+import sun.security.util.SecurityConstants;
 
 public class ExecutorsTest extends JSR166TestCase{
     public static void main(String[] args) {
@@ -69,7 +70,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -80,7 +81,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -104,7 +105,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -115,7 +116,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -152,7 +153,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -163,7 +164,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -199,7 +200,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -237,7 +238,6 @@ public class ExecutorsTest extends JSR16
 	    Thread.sleep(MEDIUM_DELAY_MS);
 	    assertTrue(callable.done);
 	    assertEquals(Boolean.TRUE, f.get());
-            p1.shutdown();
             joinPool(p1);
 	} catch(RejectedExecutionException e){}
 	catch(Exception e){
@@ -258,7 +258,6 @@ public class ExecutorsTest extends JSR16
 	    Thread.sleep(MEDIUM_DELAY_MS);
 	    assertTrue(callable.done);
 	    assertEquals(Boolean.TRUE, f.get());
-            p1.shutdown();
             joinPool(p1);
 	} catch(RejectedExecutionException e){}
 	catch(Exception e){
@@ -279,7 +278,6 @@ public class ExecutorsTest extends JSR16
 	    Thread.sleep(MEDIUM_DELAY_MS);
 	    assertTrue(callable.done);
 	    assertEquals(Boolean.TRUE, f.get());
-            p1.shutdown();
             joinPool(p1);
 	} catch(RejectedExecutionException e){}
 	catch(Exception e){
@@ -340,7 +338,7 @@ public class ExecutorsTest extends JSR16
 		    try {
 			Thread current = Thread.currentThread();
 			threadAssertTrue(!current.isDaemon());
-			threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
+			threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
 			ThreadGroup g = current.getThreadGroup();
 			SecurityManager s = System.getSecurityManager();
 			if (s != null)
@@ -357,7 +355,11 @@ public class ExecutorsTest extends JSR16
         ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
         
         e.execute(r);
-        e.shutdown();
+        try {
+            e.shutdown();
+        } catch(SecurityException ok) {
+        }
+        
         try {
             Thread.sleep(SHORT_DELAY_MS);
         } catch (Exception eX) {
@@ -373,11 +375,16 @@ public class ExecutorsTest extends JSR16
      * access control context and context class loader
      */
     public void testPrivilegedThreadFactory() {
-        Policy savedPolicy = Policy.getPolicy();
-        AdjustablePolicy policy = new AdjustablePolicy();
-        policy.addPermission(new RuntimePermission("getContextClassLoader"));
-        policy.addPermission(new RuntimePermission("setContextClassLoader"));
-        Policy.setPolicy(policy);
+        Policy savedPolicy = null;
+        try {
+            savedPolicy = Policy.getPolicy();
+            AdjustablePolicy policy = new AdjustablePolicy();
+            policy.addPermission(new RuntimePermission("getContextClassLoader"));
+            policy.addPermission(new RuntimePermission("setContextClassLoader"));
+            Policy.setPolicy(policy);
+        } catch (AccessControlException ok) {
+            return;
+        }
         final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
         final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
         final AccessControlContext thisacc = AccessController.getContext();
@@ -386,7 +393,7 @@ public class ExecutorsTest extends JSR16
 		    try {
 			Thread current = Thread.currentThread();
 			threadAssertTrue(!current.isDaemon());
-			threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
+			threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
 			ThreadGroup g = current.getThreadGroup();
 			SecurityManager s = System.getSecurityManager();
 			if (s != null)
@@ -400,12 +407,16 @@ public class ExecutorsTest extends JSR16
 		    } catch(SecurityException ok) {
 			// Also pass if not allowed to change settings
 		    }
+                }
             };
         ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
         
         Policy.setPolicy(savedPolicy);
         e.execute(r);
-        e.shutdown();
+        try {
+            e.shutdown();
+        } catch(SecurityException ok) {
+        }
         try {
             Thread.sleep(SHORT_DELAY_MS);
         } catch (Exception ex) {
@@ -416,10 +427,17 @@ public class ExecutorsTest extends JSR16
 
     }
 
-    static class CheckCCL implements Callable<Object> {
+    void checkCCL() {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
+            sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION);
+        }
+    }
+
+    class CheckCCL implements Callable<Object> {
         public Object call() {
-            AccessControlContext acc = AccessController.getContext();
-            acc.checkPermission(new RuntimePermission("getContextClassLoader"));
+            checkCCL();
             return null;
         }
     }
@@ -430,9 +448,24 @@ public class ExecutorsTest extends JSR16
      * privilegedCallableUsingCurrentClassLoader throws ACE
      */
     public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
-	Policy savedPolicy = Policy.getPolicy();
-        AdjustablePolicy policy = new AdjustablePolicy();
-	Policy.setPolicy(policy);
+	Policy savedPolicy = null;
+        try {
+            savedPolicy = Policy.getPolicy();
+            AdjustablePolicy policy = new AdjustablePolicy();
+            Policy.setPolicy(policy);
+        } catch (AccessControlException ok) {
+            return;
+        }
+
+        // Check if program still has too many permissions to run test
+        try {
+            checkCCL();
+            // too many privileges to test; so return
+            Policy.setPolicy(savedPolicy);
+            return;
+        } catch(AccessControlException ok) {
+        } 
+
         try {
             Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
             shouldThrow();
@@ -446,15 +479,21 @@ public class ExecutorsTest extends JSR16
     }
 
     /**
-     * Without class loader permissions, calling
-     * privilegedCallableUsingCurrentClassLoader throws ACE
+     * With class loader permissions, calling
+     * privilegedCallableUsingCurrentClassLoader does not throw ACE
      */
     public void testprivilegedCallableUsingCCLWithPrivs() {
-	Policy savedPolicy = Policy.getPolicy();
-        AdjustablePolicy policy = new AdjustablePolicy();
-        policy.addPermission(new RuntimePermission("getContextClassLoader"));
-        policy.addPermission(new RuntimePermission("setContextClassLoader"));
-	Policy.setPolicy(policy);
+	Policy savedPolicy = null;
+        try {
+            savedPolicy = Policy.getPolicy();
+            AdjustablePolicy policy = new AdjustablePolicy();
+            policy.addPermission(new RuntimePermission("getContextClassLoader"));
+            policy.addPermission(new RuntimePermission("setContextClassLoader"));
+            Policy.setPolicy(policy);
+        } catch (AccessControlException ok) {
+            return;
+        }
+            
         try {
             Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
             task.call();
@@ -470,30 +509,57 @@ public class ExecutorsTest extends JSR16
      * Without permissions, calling privilegedCallable throws ACE
      */
     public void testprivilegedCallableWithNoPrivs() {
-        Policy savedPolicy = Policy.getPolicy();
-        AdjustablePolicy policy = new AdjustablePolicy();
-        Policy.setPolicy(policy);
-        Callable task = Executors.privilegedCallable(new CheckCCL());
-        Policy.setPolicy(savedPolicy);
+        Callable task;
+        Policy savedPolicy = null;
+        AdjustablePolicy policy = null;
+        AccessControlContext noprivAcc = null;
+        try {
+            savedPolicy = Policy.getPolicy();
+            policy = new AdjustablePolicy();
+            Policy.setPolicy(policy);
+            noprivAcc = AccessController.getContext();
+            task = Executors.privilegedCallable(new CheckCCL());
+            Policy.setPolicy(savedPolicy);
+        } catch (AccessControlException ok) {
+            return; // program has too few permissions to set up test
+        }
+
+        // Make sure that program doesn't have too many permissions 
+        try {
+            AccessController.doPrivileged(new PrivilegedAction() {
+                    public Object run() {
+                        checkCCL();
+                        return null;
+                    }}, noprivAcc);
+            // too many permssions; skip test
+            return;
+        } catch(AccessControlException ok) {
+        }
+
         try {
             task.call();
             shouldThrow();
         } catch(AccessControlException success) {
         } catch(Exception ex) {
             unexpectedException();
-        } finally {
-        }
+        } 
     }
 
     /**
      * With permissions, calling privilegedCallable succeeds
      */
     public void testprivilegedCallableWithPrivs() {
-	Policy savedPolicy = Policy.getPolicy();
-        AdjustablePolicy policy = new AdjustablePolicy();
-        policy.addPermission(new RuntimePermission("getContextClassLoader"));
-        policy.addPermission(new RuntimePermission("setContextClassLoader"));
-	Policy.setPolicy(policy);
+	Policy savedPolicy = null;
+        try {
+            savedPolicy = Policy.getPolicy();
+            AdjustablePolicy policy = new AdjustablePolicy();
+            policy.addPermission(new RuntimePermission("getContextClassLoader"));
+            policy.addPermission(new RuntimePermission("setContextClassLoader"));
+            Policy.setPolicy(policy);
+        } catch (AccessControlException ok) {
+            return;
+        }
+            
         Callable task = Executors.privilegedCallable(new CheckCCL());
         try {
             task.call();