--- jsr166/src/test/tck/ForkJoinPoolTest.java	2010/11/19 00:20:47	1.35
+++ jsr166/src/test/tck/ForkJoinPoolTest.java	2011/05/29 13:45:35	1.43
@@ -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;
@@ -164,7 +165,6 @@ public class ForkJoinPoolTest extends JS
         try {
             assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
                        p.getFactory());
-            assertTrue(p.isQuiescent());
             assertFalse(p.getAsyncMode());
             assertEquals(0, p.getActiveThreadCount());
             assertEquals(0, p.getStealCount());
@@ -199,7 +199,6 @@ public class ForkJoinPoolTest extends JS
         } catch (NullPointerException success) {}
     }
 
-
     /**
      * getParallelism returns size set in constructor
      */
@@ -252,18 +251,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());
@@ -273,6 +284,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);
         }
@@ -328,15 +341,17 @@ public class ForkJoinPoolTest extends JS
      * pollSubmission returns unexecuted submitted task, if present
      */
     public void testPollSubmission() {
+        final CountDownLatch done = new CountDownLatch(1);
         SubFJP p = new SubFJP();
         try {
-            ForkJoinTask a = p.submit(new ShortRunnable());
-            ForkJoinTask b = p.submit(new ShortRunnable());
-            ForkJoinTask c = p.submit(new ShortRunnable());
+            ForkJoinTask a = p.submit(awaiter(done));
+            ForkJoinTask b = p.submit(awaiter(done));
+            ForkJoinTask c = p.submit(awaiter(done));
             ForkJoinTask r = p.pollSubmission();
             assertTrue(r == a || r == b || r == c);
             assertFalse(r.isDone());
         } finally {
+            done.countDown();
             joinPool(p);
         }
     }
@@ -345,11 +360,12 @@ public class ForkJoinPoolTest extends JS
      * drainTasksTo transfers unexecuted submitted tasks, if present
      */
     public void testDrainTasksTo() {
+        final CountDownLatch done = new CountDownLatch(1);
         SubFJP p = new SubFJP();
         try {
-            ForkJoinTask a = p.submit(new ShortRunnable());
-            ForkJoinTask b = p.submit(new ShortRunnable());
-            ForkJoinTask c = p.submit(new ShortRunnable());
+            ForkJoinTask a = p.submit(awaiter(done));
+            ForkJoinTask b = p.submit(awaiter(done));
+            ForkJoinTask c = p.submit(awaiter(done));
             ArrayList<ForkJoinTask> al = new ArrayList();
             p.drainTasksTo(al);
             assertTrue(al.size() > 0);
@@ -358,11 +374,11 @@ public class ForkJoinPoolTest extends JS
                 assertFalse(r.isDone());
             }
         } finally {
+            done.countDown();
             joinPool(p);
         }
     }
 
-
     // FJ Versions of AbstractExecutorService tests
 
     /**
@@ -371,18 +387,22 @@ 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());
-            assertTrue(task.isDone());
+            assertNull(future.get(0, MILLISECONDS));
+            assertTrue(done.get());
+            assertTrue(future.isDone());
             assertFalse(future.isCancelled());
         } finally {
             joinPool(e);
         }
     }
 
-
     /**
      * Completed submit(callable) returns result
      */
@@ -501,7 +521,6 @@ public class ForkJoinPoolTest extends JS
         }
     }
 
-
     /**
      * submit(null callable) throws NullPointerException
      */
@@ -516,7 +535,6 @@ public class ForkJoinPoolTest extends JS
         }
     }
 
-
     /**
      * submit(callable).get() throws InterruptedException if interrupted
      */
@@ -745,7 +763,6 @@ public class ForkJoinPoolTest extends JS
         }
     }
 
-
     /**
      * timed invokeAny(null) throws NullPointerException
      */