--- jsr166/src/test/tck/ExecutorsTest.java 2009/08/04 13:58:09 1.18 +++ jsr166/src/test/tck/ExecutorsTest.java 2009/11/16 04:57:10 1.21 @@ -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. */ @@ -12,11 +12,10 @@ 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) { - junit.textui.TestRunner.run (suite()); + junit.textui.TestRunner.run (suite()); } public static Test suite() { return new TestSuite(ExecutorsTest.class); @@ -26,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 { @@ -92,7 +91,7 @@ public class ExecutorsTest extends JSR16 ExecutorService e = Executors.newCachedThreadPool(null); shouldThrow(); } - catch(NullPointerException success) { + catch (NullPointerException success) { } } @@ -127,7 +126,7 @@ public class ExecutorsTest extends JSR16 ExecutorService e = Executors.newSingleThreadExecutor(null); shouldThrow(); } - catch(NullPointerException success) { + catch (NullPointerException success) { } } @@ -175,7 +174,7 @@ public class ExecutorsTest extends JSR16 ExecutorService e = Executors.newFixedThreadPool(2, null); shouldThrow(); } - catch(NullPointerException success) { + catch (NullPointerException success) { } } @@ -187,7 +186,7 @@ public class ExecutorsTest extends JSR16 ExecutorService e = Executors.newFixedThreadPool(0); shouldThrow(); } - catch(IllegalArgumentException success) { + catch (IllegalArgumentException success) { } } @@ -239,8 +238,8 @@ public class ExecutorsTest extends JSR16 assertTrue(callable.done); assertEquals(Boolean.TRUE, f.get()); joinPool(p1); - } catch(RejectedExecutionException e){} - catch(Exception e){ + } catch (RejectedExecutionException e){} + catch (Exception e){ e.printStackTrace(); unexpectedException(); } @@ -259,8 +258,8 @@ public class ExecutorsTest extends JSR16 assertTrue(callable.done); assertEquals(Boolean.TRUE, f.get()); joinPool(p1); - } catch(RejectedExecutionException e){} - catch(Exception e){ + } catch (RejectedExecutionException e){} + catch (Exception e){ e.printStackTrace(); unexpectedException(); } @@ -279,8 +278,8 @@ public class ExecutorsTest extends JSR16 assertTrue(callable.done); assertEquals(Boolean.TRUE, f.get()); joinPool(p1); - } catch(RejectedExecutionException e){} - catch(Exception e){ + } catch (RejectedExecutionException e){} + catch (Exception e){ e.printStackTrace(); unexpectedException(); } @@ -295,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();) { @@ -326,7 +325,7 @@ public class ExecutorsTest extends JSR16 } } - + /** * ThreadPoolExecutor using defaultThreadFactory has * specified group, priority, daemon status, and name @@ -353,13 +352,13 @@ public class ExecutorsTest extends JSR16 } }; ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory()); - + e.execute(r); try { e.shutdown(); - } catch(SecurityException ok) { + } catch (SecurityException ok) { } - + try { Thread.sleep(SHORT_DELAY_MS); } catch (Exception eX) { @@ -404,18 +403,18 @@ public class ExecutorsTest extends JSR16 threadAssertTrue(name.endsWith("thread-1")); threadAssertTrue(thisccl == current.getContextClassLoader()); threadAssertTrue(thisacc.equals(AccessController.getContext())); - } catch(SecurityException ok) { + } catch (SecurityException ok) { // Also pass if not allowed to change settings } } }; ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); - + Policy.setPolicy(savedPolicy); e.execute(r); try { e.shutdown(); - } catch(SecurityException ok) { + } catch (SecurityException ok) { } try { Thread.sleep(SHORT_DELAY_MS); @@ -431,7 +430,7 @@ public class ExecutorsTest extends JSR16 SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(new RuntimePermission("setContextClassLoader")); - sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION); + sm.checkPermission(new RuntimePermission("getClassLoader")); } } @@ -463,16 +462,16 @@ public class ExecutorsTest extends JSR16 // too many privileges to test; so return Policy.setPolicy(savedPolicy); return; - } catch(AccessControlException ok) { - } + } catch (AccessControlException ok) { + } try { Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); shouldThrow(); - } catch(AccessControlException success) { - } catch(Exception ex) { + } catch (AccessControlException success) { + } catch (Exception ex) { unexpectedException(); - } + } finally { Policy.setPolicy(savedPolicy); } @@ -493,13 +492,13 @@ public class ExecutorsTest extends JSR16 } catch (AccessControlException ok) { return; } - + try { Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); task.call(); - } catch(Exception ex) { + } catch (Exception ex) { unexpectedException(); - } + } finally { Policy.setPolicy(savedPolicy); } @@ -524,7 +523,7 @@ public class ExecutorsTest extends JSR16 return; // program has too few permissions to set up test } - // Make sure that program doesn't have too many permissions + // Make sure that program doesn't have too many permissions try { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { @@ -533,16 +532,16 @@ public class ExecutorsTest extends JSR16 }}, noprivAcc); // too many permssions; skip test return; - } catch(AccessControlException ok) { + } catch (AccessControlException ok) { } try { task.call(); shouldThrow(); - } catch(AccessControlException success) { - } catch(Exception ex) { + } catch (AccessControlException success) { + } catch (Exception ex) { unexpectedException(); - } + } } /** @@ -559,11 +558,11 @@ public class ExecutorsTest extends JSR16 } catch (AccessControlException ok) { return; } - + Callable task = Executors.privilegedCallable(new CheckCCL()); try { task.call(); - } catch(Exception ex) { + } catch (Exception ex) { unexpectedException(); } finally { Policy.setPolicy(savedPolicy); @@ -572,51 +571,51 @@ public class ExecutorsTest extends JSR16 /** * callable(Runnable) returns null when called - */ + */ public void testCallable1() { try { Callable c = Executors.callable(new NoOpRunnable()); assertNull(c.call()); - } catch(Exception ex) { + } catch (Exception ex) { unexpectedException(); } - + } /** * callable(Runnable, result) returns result when called - */ + */ public void testCallable2() { try { Callable c = Executors.callable(new NoOpRunnable(), one); assertEquals(one, c.call()); - } catch(Exception ex) { + } catch (Exception ex) { unexpectedException(); } } /** * callable(PrivilegedAction) returns its result when called - */ + */ public void testCallable3() { try { Callable c = Executors.callable(new PrivilegedAction() { public Object run() { return one; }}); assertEquals(one, c.call()); - } catch(Exception ex) { + } catch (Exception ex) { unexpectedException(); } } /** * callable(PrivilegedExceptionAction) returns its result when called - */ + */ public void testCallable4() { try { Callable c = Executors.callable(new PrivilegedExceptionAction() { public Object run() { return one; }}); assertEquals(one, c.call()); - } catch(Exception ex) { + } catch (Exception ex) { unexpectedException(); } } @@ -624,7 +623,7 @@ public class ExecutorsTest extends JSR16 /** * callable(null Runnable) throws NPE - */ + */ public void testCallableNPE1() { try { Runnable r = null; @@ -635,7 +634,7 @@ public class ExecutorsTest extends JSR16 /** * callable(null, result) throws NPE - */ + */ public void testCallableNPE2() { try { Runnable r = null; @@ -646,7 +645,7 @@ public class ExecutorsTest extends JSR16 /** * callable(null PrivilegedAction) throws NPE - */ + */ public void testCallableNPE3() { try { PrivilegedAction r = null; @@ -657,7 +656,7 @@ public class ExecutorsTest extends JSR16 /** * callable(null PrivilegedExceptionAction) throws NPE - */ + */ public void testCallableNPE4() { try { PrivilegedExceptionAction r = null;