ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ForkJoinPoolTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ForkJoinPoolTest.java (file contents):
Revision 1.38 by jsr166, Tue Mar 15 19:47:06 2011 UTC vs.
Revision 1.43 by jsr166, Sun May 29 13:45:35 2011 UTC

# Line 22 | Line 22 | import java.util.concurrent.ForkJoinTask
22   import java.util.concurrent.ForkJoinWorkerThread;
23   import java.util.concurrent.RecursiveTask;
24   import java.util.concurrent.TimeUnit;
25 + import java.util.concurrent.atomic.AtomicBoolean;
26   import java.util.concurrent.locks.ReentrantLock;
27   import static java.util.concurrent.TimeUnit.MILLISECONDS;
28   import java.security.AccessControlException;
# Line 198 | Line 199 | public class ForkJoinPoolTest extends JS
199          } catch (NullPointerException success) {}
200      }
201  
201 –
202      /**
203       * getParallelism returns size set in constructor
204       */
# Line 251 | Line 251 | public class ForkJoinPoolTest extends JS
251      }
252  
253      /**
254 <     * After invoking a single task, isQuiescent is true,
255 <     * queues are empty, threads are not active, and
256 <     * construction parameters continue to hold
254 >     * After invoking a single task, isQuiescent eventually becomes
255 >     * true, at which time queues are empty, threads are not active,
256 >     * the task has completed successfully, and construction
257 >     * parameters continue to hold
258       */
259 <    public void testisQuiescent() throws InterruptedException {
259 >    public void testIsQuiescent() throws Exception {
260          ForkJoinPool p = new ForkJoinPool(2);
261          try {
262              assertTrue(p.isQuiescent());
263 <            p.invoke(new FibTask(20));
263 >            long startTime = System.nanoTime();
264 >            FibTask f = new FibTask(20);
265 >            p.invoke(f);
266              assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
267                         p.getFactory());
268 <            Thread.sleep(SMALL_DELAY_MS);
268 >            while (! p.isQuiescent()) {
269 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
270 >                    throw new AssertionFailedError("timed out");
271 >                assertFalse(p.getAsyncMode());
272 >                assertFalse(p.isShutdown());
273 >                assertFalse(p.isTerminating());
274 >                assertFalse(p.isTerminated());
275 >                Thread.yield();
276 >            }
277 >
278              assertTrue(p.isQuiescent());
279              assertFalse(p.getAsyncMode());
280              assertEquals(0, p.getActiveThreadCount());
# Line 272 | Line 284 | public class ForkJoinPoolTest extends JS
284              assertFalse(p.isShutdown());
285              assertFalse(p.isTerminating());
286              assertFalse(p.isTerminated());
287 +            assertTrue(f.isDone());
288 +            assertEquals(6765, (int) f.get());
289          } finally {
290              joinPool(p);
291          }
# Line 365 | Line 379 | public class ForkJoinPoolTest extends JS
379          }
380      }
381  
368 –
382      // FJ Versions of AbstractExecutorService tests
383  
384      /**
# Line 374 | Line 387 | public class ForkJoinPoolTest extends JS
387      public void testExecuteRunnable() throws Throwable {
388          ExecutorService e = new ForkJoinPool(1);
389          try {
390 <            TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
391 <            assertFalse(task.isDone());
390 >            final AtomicBoolean done = new AtomicBoolean(false);
391 >            CheckedRunnable task = new CheckedRunnable() {
392 >                public void realRun() {
393 >                    done.set(true);
394 >                }};
395              Future<?> future = e.submit(task);
396              assertNull(future.get());
397 <            assertNull(future.get(MEDIUM_DELAY_MS, MILLISECONDS));
398 <            assertTrue(task.isDone());
397 >            assertNull(future.get(0, MILLISECONDS));
398 >            assertTrue(done.get());
399              assertTrue(future.isDone());
400              assertFalse(future.isCancelled());
401          } finally {
# Line 387 | Line 403 | public class ForkJoinPoolTest extends JS
403          }
404      }
405  
390 –
406      /**
407       * Completed submit(callable) returns result
408       */
# Line 506 | Line 521 | public class ForkJoinPoolTest extends JS
521          }
522      }
523  
509 –
524      /**
525       * submit(null callable) throws NullPointerException
526       */
# Line 521 | Line 535 | public class ForkJoinPoolTest extends JS
535          }
536      }
537  
524 –
538      /**
539       * submit(callable).get() throws InterruptedException if interrupted
540       */
# Line 750 | Line 763 | public class ForkJoinPoolTest extends JS
763          }
764      }
765  
753 –
766      /**
767       * timed invokeAny(null) throws NullPointerException
768       */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines