--- jsr166/src/test/tck/ForkJoinPoolTest.java 2009/07/31 23:38:15 1.3 +++ jsr166/src/test/tck/ForkJoinPoolTest.java 2010/02/28 13:35:22 1.19 @@ -8,6 +8,7 @@ import junit.framework.*; import java.util.*; import java.util.concurrent.*; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import java.util.concurrent.locks.*; import java.security.*; @@ -50,7 +51,8 @@ public class ForkJoinPoolTest extends JS protected void onStart() { throw new Error(); } } - static class FailingThreadFactory implements ForkJoinPool.ForkJoinWorkerThreadFactory { + static class FailingThreadFactory + implements ForkJoinPool.ForkJoinWorkerThreadFactory { int calls = 0; public ForkJoinWorkerThread newThread(ForkJoinPool p) { if (++calls > 1) return null; @@ -135,7 +137,7 @@ public class ForkJoinPoolTest extends JS } /** - * Succesfully constructed pool reports default factory, + * Successfully constructed pool reports default factory, * parallelism and async mode policies, no active threads or * tasks, and quiescent running state. */ @@ -143,7 +145,8 @@ public class ForkJoinPoolTest extends JS ForkJoinPool p = null; try { p = new ForkJoinPool(1); - assertTrue(p.getFactory() == ForkJoinPool.defaultForkJoinWorkerThreadFactory); + assertTrue(p.getFactory() == + ForkJoinPool.defaultForkJoinWorkerThreadFactory); assertTrue(p.isQuiescent()); assertTrue(p.getMaintainsParallelism()); assertFalse(p.getAsyncMode()); @@ -167,8 +170,7 @@ public class ForkJoinPoolTest extends JS try { new ForkJoinPool(-1); shouldThrow(); - } - catch (IllegalArgumentException success) {} + } catch (IllegalArgumentException success) {} } /** @@ -178,8 +180,7 @@ public class ForkJoinPoolTest extends JS try { new ForkJoinPool(1, null); shouldThrow(); - } - catch (NullPointerException success) {} + } catch (NullPointerException success) {} } @@ -234,7 +235,7 @@ public class ForkJoinPoolTest extends JS ForkJoinPool p = null; try { p = new ForkJoinPool(1); - assertTrue(p.getPoolSize() == 0); + assertTrue(p.getActiveThreadCount() == 0); Future future = p.submit(new StringTask()); assertTrue(p.getPoolSize() == 1); @@ -308,7 +309,7 @@ public class ForkJoinPoolTest extends JS * Additionally tests: Overriding ForkJoinWorkerThread.onStart * performs its defined action */ - public void testSetUncaughtExceptionHandler() { + public void testSetUncaughtExceptionHandler() throws InterruptedException { ForkJoinPool p = null; try { p = new ForkJoinPool(1, new FailingThreadFactory()); @@ -318,9 +319,8 @@ public class ForkJoinPoolTest extends JS p.execute(new FailingTask()); Thread.sleep(MEDIUM_DELAY_MS); assertTrue(eh.catches > 0); - } catch (InterruptedException e) { - unexpectedException(); } finally { + p.shutdownNow(); joinPool(p); } } @@ -345,12 +345,13 @@ public class ForkJoinPoolTest extends JS * queues are empty, threads are not active, and * construction parameters continue to hold */ - public void testisQuiescent() { + public void testisQuiescent() throws InterruptedException { ForkJoinPool p = null; try { p = new ForkJoinPool(2); p.invoke(new FibTask(20)); - assertTrue(p.getFactory() == ForkJoinPool.defaultForkJoinWorkerThreadFactory); + assertTrue(p.getFactory() == + ForkJoinPool.defaultForkJoinWorkerThreadFactory); Thread.sleep(MEDIUM_DELAY_MS); assertTrue(p.isQuiescent()); assertTrue(p.getMaintainsParallelism()); @@ -362,8 +363,6 @@ public class ForkJoinPoolTest extends JS assertFalse(p.isShutdown()); assertFalse(p.isTerminating()); assertFalse(p.isTerminated()); - } catch (InterruptedException e) { - unexpectedException(); } finally { joinPool(p); } @@ -372,17 +371,13 @@ public class ForkJoinPoolTest extends JS /** * Completed submit(ForkJoinTask) returns result */ - public void testSubmitForkJoinTask() { + public void testSubmitForkJoinTask() throws Throwable { ForkJoinPool p = null; try { p = new ForkJoinPool(1); ForkJoinTask f = p.submit(new FibTask(8)); int r = f.get(); assertTrue(r == 21); - } catch (ExecutionException ex) { - unexpectedException(); - } catch (InterruptedException ex) { - unexpectedException(); } finally { joinPool(p); } @@ -408,7 +403,7 @@ public class ForkJoinPoolTest extends JS /** * Pool maintains parallelism when using ManagedBlocker */ - public void testBlockingForkJoinTask() { + public void testBlockingForkJoinTask() throws Throwable { ForkJoinPool p = null; try { p = new ForkJoinPool(4); @@ -418,13 +413,9 @@ public class ForkJoinPoolTest extends JS p.execute(f); assertTrue(p.getPoolSize() >= 4); int r = f.get(); - assertTrue(r == 832040); - } catch (ExecutionException ex) { - unexpectedException(); - } catch (InterruptedException ex) { - unexpectedException(); + assertTrue(r == 832040); } finally { - joinPool(p); + p.shutdownNow(); // don't wait out shutdown } } @@ -474,192 +465,108 @@ public class ForkJoinPoolTest extends JS /** * execute(runnable) runs it to completion */ - public void testExecuteRunnable() { - try { - ExecutorService e = new ForkJoinPool(1); - TrackedShortRunnable task = new TrackedShortRunnable(); - assertFalse(task.done); - Future future = e.submit(task); - future.get(); - assertTrue(task.done); - } - catch (ExecutionException ex) { - unexpectedException(); - } - catch (InterruptedException ex) { - unexpectedException(); - } + public void testExecuteRunnable() throws Throwable { + ExecutorService e = new ForkJoinPool(1); + TrackedShortRunnable task = new TrackedShortRunnable(); + assertFalse(task.done); + Future future = e.submit(task); + future.get(); + assertTrue(task.done); } /** * Completed submit(callable) returns result */ - public void testSubmitCallable() { - try { - ExecutorService e = new ForkJoinPool(1); - Future future = e.submit(new StringTask()); - String result = future.get(); - assertSame(TEST_STRING, result); - } - catch (ExecutionException ex) { - unexpectedException(); - } - catch (InterruptedException ex) { - unexpectedException(); - } + public void testSubmitCallable() throws Throwable { + ExecutorService e = new ForkJoinPool(1); + Future future = e.submit(new StringTask()); + String result = future.get(); + assertSame(TEST_STRING, result); } /** * Completed submit(runnable) returns successfully */ - public void testSubmitRunnable() { - try { - ExecutorService e = new ForkJoinPool(1); - Future future = e.submit(new NoOpRunnable()); - future.get(); - assertTrue(future.isDone()); - } - catch (ExecutionException ex) { - unexpectedException(); - } - catch (InterruptedException ex) { - unexpectedException(); - } + public void testSubmitRunnable() throws Throwable { + ExecutorService e = new ForkJoinPool(1); + Future future = e.submit(new NoOpRunnable()); + future.get(); + assertTrue(future.isDone()); } /** * Completed submit(runnable, result) returns result */ - public void testSubmitRunnable2() { - try { - ExecutorService e = new ForkJoinPool(1); - Future future = e.submit(new NoOpRunnable(), TEST_STRING); - String result = future.get(); - assertSame(TEST_STRING, result); - } - catch (ExecutionException ex) { - unexpectedException(); - } - catch (InterruptedException ex) { - unexpectedException(); - } + public void testSubmitRunnable2() throws Throwable { + ExecutorService e = new ForkJoinPool(1); + Future future = e.submit(new NoOpRunnable(), TEST_STRING); + String result = future.get(); + assertSame(TEST_STRING, result); } - /** - * A submitted privileged action to completion + * A submitted privileged action runs to completion */ - public void testSubmitPrivilegedAction() { - 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 { - ExecutorService e = new ForkJoinPool(1); - Future future = e.submit(Executors.callable(new PrivilegedAction() { + public void testSubmitPrivilegedAction() throws Throwable { + Runnable r = new CheckedRunnable() { + public void realRun() throws Exception { + ExecutorService e = new ForkJoinPool(1); + Future future = e.submit(Executors.callable(new PrivilegedAction() { public Object run() { return TEST_STRING; }})); - Object result = future.get(); - assertSame(TEST_STRING, result); - } - catch (ExecutionException ex) { - unexpectedException(); - } - catch (InterruptedException ex) { - unexpectedException(); - } - finally { - try { - Policy.setPolicy(savedPolicy); - } catch (AccessControlException ok) { - return; - } - } + Object result = future.get(); + assertSame(TEST_STRING, result); + }}; + + runWithPermissions(r, new RuntimePermission("modifyThread")); } /** - * A submitted a privileged exception action runs to completion + * A submitted privileged exception action runs to completion */ - public void testSubmitPrivilegedExceptionAction() { - 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 { - ExecutorService e = new ForkJoinPool(1); - Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() { + public void testSubmitPrivilegedExceptionAction() throws Throwable { + Runnable r = new CheckedRunnable() { + public void realRun() throws Exception { + ExecutorService e = new ForkJoinPool(1); + Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() { public Object run() { return TEST_STRING; }})); - Object result = future.get(); - assertSame(TEST_STRING, result); - } - catch (ExecutionException ex) { - unexpectedException(); - } - catch (InterruptedException ex) { - unexpectedException(); - } - finally { - Policy.setPolicy(savedPolicy); - } + Object result = future.get(); + assertSame(TEST_STRING, result); + }}; + + runWithPermissions(r, new RuntimePermission("modifyThread")); } /** * A submitted failed privileged exception action reports exception */ - public void testSubmitFailedPrivilegedExceptionAction() { - 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 { - ExecutorService e = new ForkJoinPool(1); - Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() { + public void testSubmitFailedPrivilegedExceptionAction() throws Throwable { + Runnable r = new CheckedRunnable() { + public void realRun() throws Exception { + ExecutorService e = new ForkJoinPool(1); + Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() { public Object run() throws Exception { throw new IndexOutOfBoundsException(); }})); - Object result = future.get(); - shouldThrow(); - } - catch (ExecutionException success) { - } catch (CancellationException success) { - } catch (InterruptedException ex) { - unexpectedException(); - } - finally { - Policy.setPolicy(savedPolicy); - } + try { + Object result = future.get(); + shouldThrow(); + } catch (ExecutionException success) { + assertTrue(success.getCause() instanceof IndexOutOfBoundsException); + }}}; + + runWithPermissions(r, new RuntimePermission("modifyThread")); } /** - * execute(null runnable) throws NPE + * execute(null runnable) throws NullPointerException */ public void testExecuteNullRunnable() { try { @@ -667,17 +574,12 @@ public class ForkJoinPoolTest extends JS TrackedShortRunnable task = null; Future future = e.submit(task); shouldThrow(); - } - catch (NullPointerException success) { - } - catch (Exception ex) { - unexpectedException(); - } + } catch (NullPointerException success) {} } /** - * submit(null callable) throws NPE + * submit(null callable) throws NullPointerException */ public void testSubmitNullCallable() { try { @@ -685,124 +587,116 @@ public class ForkJoinPoolTest extends JS StringTask t = null; Future future = e.submit(t); shouldThrow(); - } - catch (NullPointerException success) { - } - catch (Exception ex) { - unexpectedException(); - } + } catch (NullPointerException success) {} } /** - * Blocking on submit(callable) throws InterruptedException if - * caller interrupted. + * Blocking on submit(callable) throws InterruptedException if + * caller interrupted. */ - public void testInterruptedSubmit() { + public void testInterruptedSubmit() throws InterruptedException { final ForkJoinPool p = new ForkJoinPool(1); - Thread t = new Thread(new Runnable() { - public void run() { - try { - p.submit(new Callable() { - public Object call() { - try { - Thread.sleep(MEDIUM_DELAY_MS); - shouldThrow(); - } catch (InterruptedException e) { - } - return null; - } - }).get(); - } catch (InterruptedException success) { - } catch (Exception e) { - unexpectedException(); - } - - } - }); - try { - t.start(); - Thread.sleep(SHORT_DELAY_MS); - t.interrupt(); - } catch (Exception e) { - unexpectedException(); - } + + Thread t = new Thread(new CheckedInterruptedRunnable() { + public void realRun() throws Throwable { + p.submit(new CheckedCallable() { + public Object realCall() throws Throwable { + try { + Thread.sleep(MEDIUM_DELAY_MS); + } catch (InterruptedException ok) { + } + return null; + }}).get(); + }}); + + t.start(); + Thread.sleep(SHORT_DELAY_MS); + t.interrupt(); + t.join(); + p.shutdownNow(); joinPool(p); } /** - * get of submit(callable) throws ExecutionException if callable - * throws exception + * get of submit(callable) throws ExecutionException if callable + * throws exception */ - public void testSubmitEE() { + public void testSubmitEE() throws Throwable { ForkJoinPool p = new ForkJoinPool(1); - try { - Callable c = new Callable() { - public Object call() { - int i = 5/0; - return Boolean.TRUE; - } - }; - - for (int i = 0; i < 5; i++) { - p.submit(c).get(); - } - + p.submit(new Callable() { + public Object call() { + int i = 5/0; + return Boolean.TRUE; + }}).get(); shouldThrow(); } catch (ExecutionException success) { - } catch (CancellationException success) { - } catch (Exception e) { - unexpectedException(); + assertTrue(success.getCause() instanceof ArithmeticException); } + joinPool(p); } /** - * invokeAny(null) throws NPE + * invokeAny(null) throws NullPointerException */ - public void testInvokeAny1() { + public void testInvokeAny1() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { e.invokeAny(null); + shouldThrow(); } catch (NullPointerException success) { - } catch (Exception ex) { - unexpectedException(); } finally { joinPool(e); } } /** - * invokeAny(empty collection) throws IAE + * invokeAny(empty collection) throws IllegalArgumentException */ - public void testInvokeAny2() { + public void testInvokeAny2() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { e.invokeAny(new ArrayList>()); + shouldThrow(); } catch (IllegalArgumentException success) { - } catch (Exception ex) { - unexpectedException(); } finally { joinPool(e); } } /** - * invokeAny(c) throws NPE if c has null elements + * invokeAny(c) throws NullPointerException if c has a single null element */ - public void testInvokeAny3() { + public void testInvokeAny3() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(null); + try { + e.invokeAny(l); + shouldThrow(); + } catch (NullPointerException success) { + } finally { + joinPool(e); + } + } + + /** + * invokeAny(c) throws NullPointerException if c has null elements + */ + public void testInvokeAny4() throws Throwable { + CountDownLatch latch = new CountDownLatch(1); + ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(latchAwaitingStringTask(latch)); + l.add(null); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); - l.add(null); e.invokeAny(l); + shouldThrow(); } catch (NullPointerException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); } finally { + latch.countDown(); joinPool(e); } } @@ -810,16 +704,15 @@ public class ForkJoinPoolTest extends JS /** * invokeAny(c) throws ExecutionException if no task in c completes */ - public void testInvokeAny4() { + public void testInvokeAny5() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new NPETask()); try { - ArrayList> l = new ArrayList>(); - l.add(new NPETask()); e.invokeAny(l); + shouldThrow(); } catch (ExecutionException success) { - } catch (CancellationException success) { - } catch (Exception ex) { - unexpectedException(); + assertTrue(success.getCause() instanceof NullPointerException); } finally { joinPool(e); } @@ -828,33 +721,28 @@ public class ForkJoinPoolTest extends JS /** * invokeAny(c) returns result of some task in c if at least one completes */ - public void testInvokeAny5() { + public void testInvokeAny6() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - ArrayList> l = new ArrayList>(); + List> l = new ArrayList>(); l.add(new StringTask()); l.add(new StringTask()); String result = e.invokeAny(l); assertSame(TEST_STRING, result); - } catch (ExecutionException success) { - } catch (CancellationException success) { - } catch (Exception ex) { - unexpectedException(); } finally { joinPool(e); } } /** - * invokeAll(null) throws NPE + * invokeAll(null) throws NullPointerException */ - public void testInvokeAll1() { + public void testInvokeAll1() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { e.invokeAll(null); + shouldThrow(); } catch (NullPointerException success) { - } catch (Exception ex) { - unexpectedException(); } finally { joinPool(e); } @@ -863,53 +751,49 @@ public class ForkJoinPoolTest extends JS /** * invokeAll(empty collection) returns empty collection */ - public void testInvokeAll2() { + public void testInvokeAll2() throws InterruptedException { ExecutorService e = new ForkJoinPool(1); try { - List> r = e.invokeAll(new ArrayList>()); + List> r + = e.invokeAll(new ArrayList>()); assertTrue(r.isEmpty()); - } catch (Exception ex) { - unexpectedException(); } finally { joinPool(e); } } /** - * invokeAll(c) throws NPE if c has null elements + * invokeAll(c) throws NullPointerException if c has null elements */ - public void testInvokeAll3() { + public void testInvokeAll3() throws InterruptedException { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new StringTask()); + l.add(null); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); - l.add(null); e.invokeAll(l); + shouldThrow(); } catch (NullPointerException success) { - } catch (Exception ex) { - unexpectedException(); } finally { joinPool(e); } } /** - * get of returned element of invokeAll(c) throws exception on failed task + * get of returned element of invokeAll(c) throws + * ExecutionException on failed task */ - public void testInvokeAll4() { + public void testInvokeAll4() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new NPETask()); + List> futures = e.invokeAll(l); + assertEquals(1, futures.size()); try { - ArrayList> l = new ArrayList>(); - l.add(new NPETask()); - List> result = e.invokeAll(l); - assertEquals(1, result.size()); - for (Iterator> it = result.iterator(); it.hasNext();) - it.next().get(); + futures.get(0).get(); + shouldThrow(); } catch (ExecutionException success) { - } catch (CancellationException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); + assertTrue(success.getCause() instanceof NullPointerException); } finally { joinPool(e); } @@ -918,21 +802,16 @@ public class ForkJoinPoolTest extends JS /** * invokeAll(c) returns results of all completed tasks in c */ - public void testInvokeAll5() { + public void testInvokeAll5() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - ArrayList> l = new ArrayList>(); + List> l = new ArrayList>(); l.add(new StringTask()); l.add(new StringTask()); - List> result = e.invokeAll(l); - assertEquals(2, result.size()); - for (Iterator> it = result.iterator(); it.hasNext();) - assertSame(TEST_STRING, it.next().get()); - } catch (ExecutionException success) { - } catch (CancellationException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); + List> futures = e.invokeAll(l); + assertEquals(2, futures.size()); + for (Future future : futures) + assertSame(TEST_STRING, future.get()); } finally { joinPool(e); } @@ -940,70 +819,65 @@ public class ForkJoinPoolTest extends JS /** - * timed invokeAny(null) throws NPE + * timed invokeAny(null) throws NullPointerException */ - public void testTimedInvokeAny1() { + public void testTimedInvokeAny1() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); + e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS); + shouldThrow(); } catch (NullPointerException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); } finally { joinPool(e); } } /** - * timed invokeAny(null time unit) throws NPE + * timed invokeAny(null time unit) throws NullPointerException */ - public void testTimedInvokeAnyNullTimeUnit() { + public void testTimedInvokeAnyNullTimeUnit() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new StringTask()); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); e.invokeAny(l, MEDIUM_DELAY_MS, null); + shouldThrow(); } catch (NullPointerException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); } finally { joinPool(e); } } /** - * timed invokeAny(empty collection) throws IAE + * timed invokeAny(empty collection) throws IllegalArgumentException */ - public void testTimedInvokeAny2() { + public void testTimedInvokeAny2() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - e.invokeAny(new ArrayList>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); + e.invokeAny(new ArrayList>(), + MEDIUM_DELAY_MS, MILLISECONDS); + shouldThrow(); } catch (IllegalArgumentException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); } finally { joinPool(e); } } /** - * timed invokeAny(c) throws NPE if c has null elements + * timed invokeAny(c) throws NullPointerException if c has null elements */ - public void testTimedInvokeAny3() { + public void testTimedInvokeAny3() throws Throwable { + CountDownLatch latch = new CountDownLatch(1); ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(latchAwaitingStringTask(latch)); + l.add(null); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); - l.add(null); - e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); + e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS); + shouldThrow(); } catch (NullPointerException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); } finally { + latch.countDown(); joinPool(e); } } @@ -1011,17 +885,15 @@ public class ForkJoinPoolTest extends JS /** * timed invokeAny(c) throws ExecutionException if no task completes */ - public void testTimedInvokeAny4() { + public void testTimedInvokeAny4() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new NPETask()); try { - ArrayList> l = new ArrayList>(); - l.add(new NPETask()); - e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); + e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS); + shouldThrow(); } catch (ExecutionException success) { - } catch (CancellationException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); + assertTrue(success.getCause() instanceof NullPointerException); } finally { joinPool(e); } @@ -1030,53 +902,44 @@ public class ForkJoinPoolTest extends JS /** * timed invokeAny(c) returns result of some task in c */ - public void testTimedInvokeAny5() { + public void testTimedInvokeAny5() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - ArrayList> l = new ArrayList>(); + List> l = new ArrayList>(); l.add(new StringTask()); l.add(new StringTask()); - String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); + String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS); assertSame(TEST_STRING, result); - } catch (ExecutionException success) { - } catch (CancellationException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); } finally { joinPool(e); } } /** - * timed invokeAll(null) throws NPE + * timed invokeAll(null) throws NullPointerException */ - public void testTimedInvokeAll1() { + public void testTimedInvokeAll1() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); + e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS); + shouldThrow(); } catch (NullPointerException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); } finally { joinPool(e); } } /** - * timed invokeAll(null time unit) throws NPE + * timed invokeAll(null time unit) throws NullPointerException */ - public void testTimedInvokeAllNullTimeUnit() { + public void testTimedInvokeAllNullTimeUnit() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new StringTask()); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); e.invokeAll(l, MEDIUM_DELAY_MS, null); + shouldThrow(); } catch (NullPointerException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); } finally { joinPool(e); } @@ -1085,33 +948,30 @@ public class ForkJoinPoolTest extends JS /** * timed invokeAll(empty collection) returns empty collection */ - public void testTimedInvokeAll2() { + public void testTimedInvokeAll2() throws InterruptedException { ExecutorService e = new ForkJoinPool(1); try { - List> r = e.invokeAll(new ArrayList>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); + List> r + = e.invokeAll(new ArrayList>(), + MEDIUM_DELAY_MS, MILLISECONDS); assertTrue(r.isEmpty()); - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); } finally { joinPool(e); } } /** - * timed invokeAll(c) throws NPE if c has null elements + * timed invokeAll(c) throws NullPointerException if c has null elements */ - public void testTimedInvokeAll3() { + public void testTimedInvokeAll3() throws InterruptedException { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new StringTask()); + l.add(null); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); - l.add(null); - e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); + e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS); + shouldThrow(); } catch (NullPointerException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); } finally { joinPool(e); } @@ -1120,20 +980,18 @@ public class ForkJoinPoolTest extends JS /** * get of returned element of invokeAll(c) throws exception on failed task */ - public void testTimedInvokeAll4() { + public void testTimedInvokeAll4() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new NPETask()); + List> futures + = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS); + assertEquals(1, futures.size()); try { - ArrayList> l = new ArrayList>(); - l.add(new NPETask()); - List> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); - assertEquals(1, result.size()); - for (Iterator> it = result.iterator(); it.hasNext();) - it.next().get(); + futures.get(0).get(); + shouldThrow(); } catch (ExecutionException success) { - } catch (CancellationException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); + assertTrue(success.getCause() instanceof NullPointerException); } finally { joinPool(e); } @@ -1142,21 +1000,17 @@ public class ForkJoinPoolTest extends JS /** * timed invokeAll(c) returns results of all completed tasks in c */ - public void testTimedInvokeAll5() { + public void testTimedInvokeAll5() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - ArrayList> l = new ArrayList>(); + List> l = new ArrayList>(); l.add(new StringTask()); l.add(new StringTask()); - List> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); - assertEquals(2, result.size()); - for (Iterator> it = result.iterator(); it.hasNext();) - assertSame(TEST_STRING, it.next().get()); - } catch (ExecutionException success) { - } catch (CancellationException success) { - } catch (Exception ex) { - ex.printStackTrace(); - unexpectedException(); + List> futures + = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS); + assertEquals(2, futures.size()); + for (Future future : futures) + assertSame(TEST_STRING, future.get()); } finally { joinPool(e); }