--- jsr166/src/test/tck/ForkJoinPoolTest.java 2011/02/22 01:18:58 1.37 +++ jsr166/src/test/tck/ForkJoinPoolTest.java 2013/02/16 20:50:29 1.49 @@ -1,7 +1,7 @@ /* * 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 + * http://creativecommons.org/publicdomain/zero/1.0/ */ import junit.framework.*; @@ -22,6 +22,7 @@ import java.util.concurrent.ForkJoinTask import java.util.concurrent.ForkJoinWorkerThread; import java.util.concurrent.RecursiveTask; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantLock; import static java.util.concurrent.TimeUnit.MILLISECONDS; import java.security.AccessControlException; @@ -38,7 +39,7 @@ public class ForkJoinPoolTest extends JS return new TestSuite(ForkJoinPoolTest.class); } - /** + /* * Testing coverage notes: * * 1. shutdown and related methods are tested via super.joinPool. @@ -198,7 +199,6 @@ public class ForkJoinPoolTest extends JS } catch (NullPointerException success) {} } - /** * getParallelism returns size set in constructor */ @@ -242,8 +242,11 @@ public class ForkJoinPoolTest extends JS eh, false); try { assertSame(eh, p.getUncaughtExceptionHandler()); - p.execute(new FibTask(8)); - assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS)); + try { + p.execute(new FibTask(8)); + assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS)); + } catch (RejectedExecutionException ok) { + } } finally { p.shutdownNow(); // failure might have prevented processing task joinPool(p); @@ -251,18 +254,30 @@ public class ForkJoinPoolTest extends JS } /** - * After invoking a single task, isQuiescent is true, - * queues are empty, threads are not active, and - * construction parameters continue to hold + * After invoking a single task, isQuiescent eventually becomes + * true, at which time queues are empty, threads are not active, + * the task has completed successfully, and construction + * parameters continue to hold */ - public void testisQuiescent() throws InterruptedException { + public void testIsQuiescent() throws Exception { ForkJoinPool p = new ForkJoinPool(2); try { assertTrue(p.isQuiescent()); - p.invoke(new FibTask(20)); + long startTime = System.nanoTime(); + FibTask f = new FibTask(20); + p.invoke(f); assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory, p.getFactory()); - Thread.sleep(SMALL_DELAY_MS); + while (! p.isQuiescent()) { + if (millisElapsedSince(startTime) > LONG_DELAY_MS) + throw new AssertionFailedError("timed out"); + assertFalse(p.getAsyncMode()); + assertFalse(p.isShutdown()); + assertFalse(p.isTerminating()); + assertFalse(p.isTerminated()); + Thread.yield(); + } + assertTrue(p.isQuiescent()); assertFalse(p.getAsyncMode()); assertEquals(0, p.getActiveThreadCount()); @@ -272,6 +287,8 @@ public class ForkJoinPoolTest extends JS assertFalse(p.isShutdown()); assertFalse(p.isTerminating()); assertFalse(p.isTerminated()); + assertTrue(f.isDone()); + assertEquals(6765, (int) f.get()); } finally { joinPool(p); } @@ -365,7 +382,6 @@ public class ForkJoinPoolTest extends JS } } - // FJ Versions of AbstractExecutorService tests /** @@ -374,12 +390,15 @@ public class ForkJoinPoolTest extends JS public void testExecuteRunnable() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS); - assertFalse(task.isDone()); + final AtomicBoolean done = new AtomicBoolean(false); + CheckedRunnable task = new CheckedRunnable() { + public void realRun() { + done.set(true); + }}; Future future = e.submit(task); assertNull(future.get()); - assertNull(future.get(MEDIUM_DELAY_MS, MILLISECONDS)); - assertTrue(task.isDone()); + assertNull(future.get(0, MILLISECONDS)); + assertTrue(done.get()); assertTrue(future.isDone()); assertFalse(future.isCancelled()); } finally { @@ -387,7 +406,6 @@ public class ForkJoinPoolTest extends JS } } - /** * Completed submit(callable) returns result */ @@ -437,35 +455,39 @@ public class ForkJoinPoolTest extends JS * A submitted privileged action runs to completion */ public void testSubmitPrivilegedAction() throws Exception { + final Callable callable = Executors.callable(new PrivilegedAction() { + public Object run() { return TEST_STRING; }}); 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; - }})); - + public void realRun() throws Exception { + ExecutorService e = new ForkJoinPool(1); + try { + Future future = e.submit(callable); assertSame(TEST_STRING, future.get()); - }}; + } finally { + joinPool(e); + } + }}; - runWithPermissions(r, - new RuntimePermission("modifyThread")); + runWithPermissions(r, new RuntimePermission("modifyThread")); } /** * A submitted privileged exception action runs to completion */ public void testSubmitPrivilegedExceptionAction() throws Exception { + final Callable callable = + Executors.callable(new PrivilegedExceptionAction() { + public Object run() { return TEST_STRING; }}); 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; - }})); - + public void realRun() throws Exception { + ExecutorService e = new ForkJoinPool(1); + try { + Future future = e.submit(callable); assertSame(TEST_STRING, future.get()); - }}; + } finally { + joinPool(e); + } + }}; runWithPermissions(r, new RuntimePermission("modifyThread")); } @@ -474,20 +496,24 @@ public class ForkJoinPoolTest extends JS * A submitted failed privileged exception action reports exception */ public void testSubmitFailedPrivilegedExceptionAction() throws Exception { + final Callable callable = + Executors.callable(new PrivilegedExceptionAction() { + public Object run() { throw new IndexOutOfBoundsException(); }}); 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(); - }})); - + public void realRun() throws Exception { + ExecutorService e = new ForkJoinPool(1); + try { + Future future = e.submit(callable); try { future.get(); shouldThrow(); } catch (ExecutionException success) { assertTrue(success.getCause() instanceof IndexOutOfBoundsException); - }}}; + } + } finally { + joinPool(e); + } + }}; runWithPermissions(r, new RuntimePermission("modifyThread")); } @@ -506,7 +532,6 @@ public class ForkJoinPoolTest extends JS } } - /** * submit(null callable) throws NullPointerException */ @@ -521,7 +546,6 @@ public class ForkJoinPoolTest extends JS } } - /** * submit(callable).get() throws InterruptedException if interrupted */ @@ -559,10 +583,8 @@ public class ForkJoinPoolTest extends JS ForkJoinPool p = new ForkJoinPool(1); try { p.submit(new Callable() { - public Object call() { - int i = 5/0; - return Boolean.TRUE; - }}).get(); + public Object call() { throw new ArithmeticException(); }}) + .get(); shouldThrow(); } catch (ExecutionException success) { assertTrue(success.getCause() instanceof ArithmeticException); @@ -750,7 +772,6 @@ public class ForkJoinPoolTest extends JS } } - /** * timed invokeAny(null) throws NullPointerException */