--- jsr166/src/test/tck/ExecutorsTest.java 2009/11/16 04:57:10 1.21 +++ jsr166/src/test/tck/ExecutorsTest.java 2009/11/20 22:58:48 1.24 @@ -13,7 +13,7 @@ import java.util.concurrent.*; import java.math.BigInteger; import java.security.*; -public class ExecutorsTest extends JSR166TestCase{ +public class ExecutorsTest extends JSR166TestCase { public static void main(String[] args) { junit.textui.TestRunner.run (suite()); } @@ -90,9 +90,7 @@ public class ExecutorsTest extends JSR16 try { ExecutorService e = Executors.newCachedThreadPool(null); shouldThrow(); - } - catch (NullPointerException success) { - } + } catch (NullPointerException success) {} } @@ -125,9 +123,7 @@ public class ExecutorsTest extends JSR16 try { ExecutorService e = Executors.newSingleThreadExecutor(null); shouldThrow(); - } - catch (NullPointerException success) { - } + } catch (NullPointerException success) {} } /** @@ -137,6 +133,7 @@ public class ExecutorsTest extends JSR16 ExecutorService e = Executors.newSingleThreadExecutor(); try { ThreadPoolExecutor tpe = (ThreadPoolExecutor)e; + shouldThrow(); } catch (ClassCastException success) { } finally { joinPool(e); @@ -173,9 +170,7 @@ public class ExecutorsTest extends JSR16 try { ExecutorService e = Executors.newFixedThreadPool(2, null); shouldThrow(); - } - catch (NullPointerException success) { - } + } catch (NullPointerException success) {} } /** @@ -185,9 +180,7 @@ public class ExecutorsTest extends JSR16 try { ExecutorService e = Executors.newFixedThreadPool(0); shouldThrow(); - } - catch (IllegalArgumentException success) { - } + } catch (IllegalArgumentException success) {} } @@ -208,9 +201,8 @@ public class ExecutorsTest extends JSR16 public void testunconfigurableExecutorServiceNPE() { try { ExecutorService e = Executors.unconfigurableExecutorService(null); - } - catch (NullPointerException success) { - } + shouldThrow(); + } catch (NullPointerException success) {} } /** @@ -219,76 +211,57 @@ public class ExecutorsTest extends JSR16 public void testunconfigurableScheduledExecutorServiceNPE() { try { ExecutorService e = Executors.unconfigurableScheduledExecutorService(null); - } - catch (NullPointerException success) { - } + shouldThrow(); + } catch (NullPointerException success) {} } /** * a newSingleThreadScheduledExecutor successfully runs delayed task */ - public void testNewSingleThreadScheduledExecutor() { - try { - TrackedCallable callable = new TrackedCallable(); - ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor(); - Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); - assertFalse(callable.done); - Thread.sleep(MEDIUM_DELAY_MS); - assertTrue(callable.done); - assertEquals(Boolean.TRUE, f.get()); - joinPool(p1); - } catch (RejectedExecutionException e){} - catch (Exception e){ - e.printStackTrace(); - unexpectedException(); - } + public void testNewSingleThreadScheduledExecutor() throws Exception { + TrackedCallable callable = new TrackedCallable(); + ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor(); + Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); + assertFalse(callable.done); + Thread.sleep(MEDIUM_DELAY_MS); + assertTrue(callable.done); + assertEquals(Boolean.TRUE, f.get()); + joinPool(p1); } /** * a newScheduledThreadPool successfully runs delayed task */ - public void testnewScheduledThreadPool() { - try { - TrackedCallable callable = new TrackedCallable(); - ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2); - Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); - assertFalse(callable.done); - Thread.sleep(MEDIUM_DELAY_MS); - assertTrue(callable.done); - assertEquals(Boolean.TRUE, f.get()); - joinPool(p1); - } catch (RejectedExecutionException e){} - catch (Exception e){ - e.printStackTrace(); - unexpectedException(); - } + public void testnewScheduledThreadPool() throws Exception { + TrackedCallable callable = new TrackedCallable(); + ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2); + Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); + assertFalse(callable.done); + Thread.sleep(MEDIUM_DELAY_MS); + assertTrue(callable.done); + assertEquals(Boolean.TRUE, f.get()); + joinPool(p1); } /** - * an unconfigurable newScheduledThreadPool successfully runs delayed task - */ - public void testunconfigurableScheduledExecutorService() { - try { - TrackedCallable callable = new TrackedCallable(); - ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2)); - Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); - assertFalse(callable.done); - Thread.sleep(MEDIUM_DELAY_MS); - assertTrue(callable.done); - assertEquals(Boolean.TRUE, f.get()); - joinPool(p1); - } catch (RejectedExecutionException e){} - catch (Exception e){ - e.printStackTrace(); - unexpectedException(); - } + * an unconfigurable newScheduledThreadPool successfully runs delayed task + */ + public void testunconfigurableScheduledExecutorService() throws Exception { + TrackedCallable callable = new TrackedCallable(); + ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2)); + Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); + assertFalse(callable.done); + Thread.sleep(MEDIUM_DELAY_MS); + assertTrue(callable.done); + assertEquals(Boolean.TRUE, f.get()); + joinPool(p1); } /** * timeouts from execute will time out if they compute too long. */ - public void testTimedCallable() { + public void testTimedCallable() throws Exception { int N = 10000; ExecutorService executor = Executors.newSingleThreadExecutor(); List> tasks = new ArrayList>(N); @@ -312,9 +285,6 @@ public class ExecutorsTest extends JSR16 assertTrue(iters > 0); return; } - catch (Exception e) { - unexpectedException(); - } } // if by chance we didn't ever time out, total time must be small long elapsed = System.currentTimeMillis() - startTime; @@ -330,7 +300,7 @@ public class ExecutorsTest extends JSR16 * ThreadPoolExecutor using defaultThreadFactory has * specified group, priority, daemon status, and name */ - public void testDefaultThreadFactory() { + public void testDefaultThreadFactory() throws Exception { final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); Runnable r = new Runnable() { public void run() { @@ -361,8 +331,6 @@ public class ExecutorsTest extends JSR16 try { Thread.sleep(SHORT_DELAY_MS); - } catch (Exception eX) { - unexpectedException(); } finally { joinPool(e); } @@ -373,7 +341,7 @@ public class ExecutorsTest extends JSR16 * specified group, priority, daemon status, name, * access control context and context class loader */ - public void testPrivilegedThreadFactory() { + public void testPrivilegedThreadFactory() throws Exception { Policy savedPolicy = null; try { savedPolicy = Policy.getPolicy(); @@ -418,8 +386,6 @@ public class ExecutorsTest extends JSR16 } try { Thread.sleep(SHORT_DELAY_MS); - } catch (Exception ex) { - unexpectedException(); } finally { joinPool(e); } @@ -469,10 +435,7 @@ public class ExecutorsTest extends JSR16 Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); shouldThrow(); } catch (AccessControlException success) { - } catch (Exception ex) { - unexpectedException(); - } - finally { + } finally { Policy.setPolicy(savedPolicy); } } @@ -481,7 +444,7 @@ public class ExecutorsTest extends JSR16 * With class loader permissions, calling * privilegedCallableUsingCurrentClassLoader does not throw ACE */ - public void testprivilegedCallableUsingCCLWithPrivs() { + public void testprivilegedCallableUsingCCLWithPrivs() throws Exception { Policy savedPolicy = null; try { savedPolicy = Policy.getPolicy(); @@ -496,8 +459,6 @@ public class ExecutorsTest extends JSR16 try { Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); task.call(); - } catch (Exception ex) { - unexpectedException(); } finally { Policy.setPolicy(savedPolicy); @@ -507,7 +468,7 @@ public class ExecutorsTest extends JSR16 /** * Without permissions, calling privilegedCallable throws ACE */ - public void testprivilegedCallableWithNoPrivs() { + public void testprivilegedCallableWithNoPrivs() throws Exception { Callable task; Policy savedPolicy = null; AdjustablePolicy policy = null; @@ -538,16 +499,13 @@ public class ExecutorsTest extends JSR16 try { task.call(); shouldThrow(); - } catch (AccessControlException success) { - } catch (Exception ex) { - unexpectedException(); - } + } catch (AccessControlException success) {} } /** * With permissions, calling privilegedCallable succeeds */ - public void testprivilegedCallableWithPrivs() { + public void testprivilegedCallableWithPrivs() throws Exception { Policy savedPolicy = null; try { savedPolicy = Policy.getPolicy(); @@ -562,8 +520,6 @@ public class ExecutorsTest extends JSR16 Callable task = Executors.privilegedCallable(new CheckCCL()); try { task.call(); - } catch (Exception ex) { - unexpectedException(); } finally { Policy.setPolicy(savedPolicy); } @@ -572,52 +528,35 @@ 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) { - unexpectedException(); - } - + public void testCallable1() throws Exception { + Callable c = Executors.callable(new NoOpRunnable()); + assertNull(c.call()); } /** * 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) { - unexpectedException(); - } + public void testCallable2() throws Exception { + Callable c = Executors.callable(new NoOpRunnable(), one); + assertEquals(one, c.call()); } /** * callable(PrivilegedAction) returns its result when called */ - public void testCallable3() { - try { - Callable c = Executors.callable(new PrivilegedAction() { - public Object run() { return one; }}); + public void testCallable3() throws Exception { + Callable c = Executors.callable(new PrivilegedAction() { + public Object run() { return one; }}); assertEquals(one, c.call()); - } 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) { - unexpectedException(); - } + public void testCallable4() throws Exception { + Callable c = Executors.callable(new PrivilegedExceptionAction() { + public Object run() { return one; }}); + assertEquals(one, c.call()); } @@ -626,10 +565,9 @@ public class ExecutorsTest extends JSR16 */ public void testCallableNPE1() { try { - Runnable r = null; - Callable c = Executors.callable(r); - } catch (NullPointerException success) { - } + Callable c = Executors.callable((Runnable) null); + shouldThrow(); + } catch (NullPointerException success) {} } /** @@ -637,10 +575,9 @@ public class ExecutorsTest extends JSR16 */ public void testCallableNPE2() { try { - Runnable r = null; - Callable c = Executors.callable(r, one); - } catch (NullPointerException success) { - } + Callable c = Executors.callable((Runnable) null, one); + shouldThrow(); + } catch (NullPointerException success) {} } /** @@ -648,10 +585,9 @@ public class ExecutorsTest extends JSR16 */ public void testCallableNPE3() { try { - PrivilegedAction r = null; - Callable c = Executors.callable(r); - } catch (NullPointerException success) { - } + Callable c = Executors.callable((PrivilegedAction) null); + shouldThrow(); + } catch (NullPointerException success) {} } /** @@ -659,10 +595,9 @@ public class ExecutorsTest extends JSR16 */ public void testCallableNPE4() { try { - PrivilegedExceptionAction r = null; - Callable c = Executors.callable(r); - } catch (NullPointerException success) { - } + Callable c = Executors.callable((PrivilegedExceptionAction) null); + shouldThrow(); + } catch (NullPointerException success) {} }