--- jsr166/src/test/tck/ExecutorsTest.java 2004/01/22 14:07:50 1.15 +++ jsr166/src/test/tck/ExecutorsTest.java 2009/08/05 00:40:11 1.20 @@ -2,8 +2,8 @@ * 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. + * Other contributors include Andrew Wright, Jeffrey Hayes, + * Pat Fisher, Mike Judd. */ @@ -15,7 +15,7 @@ import java.security.*; public class ExecutorsTest extends JSR166TestCase{ public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); + junit.textui.TestRunner.run (suite()); } public static Test suite() { return new TestSuite(ExecutorsTest.class); @@ -25,13 +25,13 @@ public class ExecutorsTest extends JSR16 private final ExecutorService exec; private final Callable func; private final long msecs; - + TimedCallable(ExecutorService exec, Callable func, long msecs) { this.exec = exec; this.func = func; this.msecs = msecs; } - + public T call() throws Exception { Future ftask = exec.submit(func); try { @@ -294,13 +294,13 @@ public class ExecutorsTest extends JSR16 List> tasks = new ArrayList>(N); try { long startTime = System.currentTimeMillis(); - + long i = 0; while (tasks.size() < N) { tasks.add(new TimedCallable(executor, new Fib(i), 1)); i += 10; } - + int iters = 0; BigInteger sum = BigInteger.ZERO; for (Iterator> it = tasks.iterator(); it.hasNext();) { @@ -325,7 +325,7 @@ public class ExecutorsTest extends JSR16 } } - + /** * ThreadPoolExecutor using defaultThreadFactory has * specified group, priority, daemon status, and name @@ -337,7 +337,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) @@ -352,13 +352,13 @@ public class ExecutorsTest extends JSR16 } }; ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory()); - + e.execute(r); try { e.shutdown(); } catch(SecurityException ok) { } - + try { Thread.sleep(SHORT_DELAY_MS); } catch (Exception eX) { @@ -392,7 +392,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) @@ -409,7 +409,7 @@ public class ExecutorsTest extends JSR16 } }; ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); - + Policy.setPolicy(savedPolicy); e.execute(r); try { @@ -426,10 +426,17 @@ public class ExecutorsTest extends JSR16 } - static class CheckCCL implements Callable { + void checkCCL() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission("setContextClassLoader")); + sm.checkPermission(new RuntimePermission("getClassLoader")); + } + } + + class CheckCCL implements Callable { public Object call() { - AccessControlContext acc = AccessController.getContext(); - acc.checkPermission(new RuntimePermission("getContextClassLoader")); + checkCCL(); return null; } } @@ -449,21 +456,30 @@ public class ExecutorsTest extends JSR16 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(); } catch(AccessControlException success) { } catch(Exception ex) { unexpectedException(); - } + } finally { Policy.setPolicy(savedPolicy); } } /** - * Without class loader permissions, calling - * privilegedCallableUsingCurrentClassLoader throws ACE + * With class loader permissions, calling + * privilegedCallableUsingCurrentClassLoader does not throw ACE */ public void testprivilegedCallableUsingCCLWithPrivs() { Policy savedPolicy = null; @@ -476,54 +492,56 @@ public class ExecutorsTest extends JSR16 } catch (AccessControlException ok) { return; } - + try { Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); task.call(); } catch(Exception ex) { unexpectedException(); - } + } finally { Policy.setPolicy(savedPolicy); } } - 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() { - Thread t1; + Callable task; + Policy savedPolicy = null; + AdjustablePolicy policy = null; + AccessControlContext noprivAcc = null; try { - Policy savedPolicy = Policy.getPolicy(); - AdjustablePolicy policy = new AdjustablePolicy(); + savedPolicy = Policy.getPolicy(); + policy = new AdjustablePolicy(); Policy.setPolicy(policy); - Callable task = Executors.privilegedCallable(new CheckCCL()); - t1 = new Thread(new CallCCL(task)); + 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 { - t1.start(); - t1.join(); + task.call(); + shouldThrow(); + } catch(AccessControlException success) { } catch(Exception ex) { unexpectedException(); - } + } } /** @@ -540,7 +558,7 @@ public class ExecutorsTest extends JSR16 } catch (AccessControlException ok) { return; } - + Callable task = Executors.privilegedCallable(new CheckCCL()); try { task.call(); @@ -553,7 +571,7 @@ public class ExecutorsTest extends JSR16 /** * callable(Runnable) returns null when called - */ + */ public void testCallable1() { try { Callable c = Executors.callable(new NoOpRunnable()); @@ -561,12 +579,12 @@ public class ExecutorsTest extends JSR16 } catch(Exception ex) { unexpectedException(); } - + } /** * callable(Runnable, result) returns result when called - */ + */ public void testCallable2() { try { Callable c = Executors.callable(new NoOpRunnable(), one); @@ -578,7 +596,7 @@ public class ExecutorsTest extends JSR16 /** * callable(PrivilegedAction) returns its result when called - */ + */ public void testCallable3() { try { Callable c = Executors.callable(new PrivilegedAction() { @@ -591,7 +609,7 @@ public class ExecutorsTest extends JSR16 /** * callable(PrivilegedExceptionAction) returns its result when called - */ + */ public void testCallable4() { try { Callable c = Executors.callable(new PrivilegedExceptionAction() { @@ -605,7 +623,7 @@ public class ExecutorsTest extends JSR16 /** * callable(null Runnable) throws NPE - */ + */ public void testCallableNPE1() { try { Runnable r = null; @@ -616,7 +634,7 @@ public class ExecutorsTest extends JSR16 /** * callable(null, result) throws NPE - */ + */ public void testCallableNPE2() { try { Runnable r = null; @@ -627,7 +645,7 @@ public class ExecutorsTest extends JSR16 /** * callable(null PrivilegedAction) throws NPE - */ + */ public void testCallableNPE3() { try { PrivilegedAction r = null; @@ -638,7 +656,7 @@ public class ExecutorsTest extends JSR16 /** * callable(null PrivilegedExceptionAction) throws NPE - */ + */ public void testCallableNPE4() { try { PrivilegedExceptionAction r = null;