--- jsr166/src/test/tck/ExecutorsTest.java	2003/12/22 00:48:55	1.11
+++ jsr166/src/test/tck/ExecutorsTest.java	2004/01/22 14:07:50	1.15
@@ -1,8 +1,9 @@
 /*
- * Written by members of JCP JSR-166 Expert Group and released to the
- * public domain. Use, modify, and redistribute this code in any way
- * without acknowledgement. Other contributors include Andrew Wright,
- * Jeffrey Hayes, Pat Fischer, Mike Judd.
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/licenses/publicdomain
+ * Other contributors include Andrew Wright, Jeffrey Hayes, 
+ * Pat Fisher, Mike Judd. 
  */
 
 
@@ -68,7 +69,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -79,7 +80,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -103,7 +104,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -114,7 +115,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -151,7 +152,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -162,7 +163,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -198,7 +199,7 @@ public class ExecutorsTest extends JSR16
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
-        e.shutdown();
+        joinPool(e);
     }
 
     /**
@@ -236,7 +237,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){
@@ -257,7 +257,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){
@@ -278,7 +277,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){
@@ -336,23 +334,31 @@ public class ExecutorsTest extends JSR16
         final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
         Runnable r = new Runnable() {
                 public void run() {
-                    Thread current = Thread.currentThread();
-                    threadAssertTrue(!current.isDaemon());
-                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
-                    ThreadGroup g = current.getThreadGroup();
-                    SecurityManager s = System.getSecurityManager();
-                    if (s != null)
-                        threadAssertTrue(g == s.getThreadGroup());
-                    else
-                        threadAssertTrue(g == egroup);
-                    String name = current.getName();
-                    threadAssertTrue(name.endsWith("thread-1"));
+		    try {
+			Thread current = Thread.currentThread();
+			threadAssertTrue(!current.isDaemon());
+			threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
+			ThreadGroup g = current.getThreadGroup();
+			SecurityManager s = System.getSecurityManager();
+			if (s != null)
+			    threadAssertTrue(g == s.getThreadGroup());
+			else
+			    threadAssertTrue(g == egroup);
+			String name = current.getName();
+			threadAssertTrue(name.endsWith("thread-1"));
+		    } catch (SecurityException ok) {
+			// Also pass if not allowed to change setting
+		    }
                 }
             };
         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) {
@@ -368,36 +374,48 @@ 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();
         Runnable r = new Runnable() {
                 public void run() {
-                    Thread current = Thread.currentThread();
-                    threadAssertTrue(!current.isDaemon());
-                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
-                    ThreadGroup g = current.getThreadGroup();
-                    SecurityManager s = System.getSecurityManager();
-                    if (s != null)
-                        threadAssertTrue(g == s.getThreadGroup());
-                    else
-                        threadAssertTrue(g == egroup);
-                    String name = current.getName();
-                    threadAssertTrue(name.endsWith("thread-1"));
-                    threadAssertTrue(thisccl == current.getContextClassLoader());
-                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
+		    try {
+			Thread current = Thread.currentThread();
+			threadAssertTrue(!current.isDaemon());
+			threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
+			ThreadGroup g = current.getThreadGroup();
+			SecurityManager s = System.getSecurityManager();
+			if (s != null)
+			    threadAssertTrue(g == s.getThreadGroup());
+			else
+			    threadAssertTrue(g == egroup);
+			String name = current.getName();
+			threadAssertTrue(name.endsWith("thread-1"));
+			threadAssertTrue(thisccl == current.getContextClassLoader());
+			threadAssertTrue(thisacc.equals(AccessController.getContext()));
+		    } 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) {
@@ -422,9 +440,15 @@ 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;
+        }
+
         try {
             Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
             shouldThrow();
@@ -442,11 +466,17 @@ public class ExecutorsTest extends JSR16
      * privilegedCallableUsingCurrentClassLoader throws 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();
@@ -458,34 +488,59 @@ public class ExecutorsTest extends JSR16
         }
     }
 
+    class CallCCL implements Runnable {
+        final Callable task;
+        CallCCL(Callable t) { task = t; }
+        public void run() {
+            try {
+                task.call();
+                threadShouldThrow();
+            } catch(AccessControlException success) {
+            } catch(Exception ex) {
+                threadUnexpectedException();
+            } 
+        }
+    }
+
     /**
      * 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);
+        Thread t1;
         try {
-            task.call();
-            shouldThrow();
-        } catch(AccessControlException success) {
+            Policy savedPolicy = Policy.getPolicy();
+            AdjustablePolicy policy = new AdjustablePolicy();
+            Policy.setPolicy(policy);
+            Callable task = Executors.privilegedCallable(new CheckCCL());
+            t1 = new Thread(new CallCCL(task));
+            Policy.setPolicy(savedPolicy);
+        } catch (AccessControlException ok) {
+            return;
+        }
+
+        try {
+            t1.start();
+            t1.join();
         } 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();