ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/RecursiveActionTest.java

Comparing jsr166/src/test/tck/RecursiveActionTest.java (file contents):
Revision 1.40 by jsr166, Wed Dec 31 19:05:43 2014 UTC vs.
Revision 1.45 by jsr166, Sun Oct 4 18:18:48 2015 UTC

#	Line 17 | Line 17 | import java.util.concurrent.RecursiveAct
17		import java.util.concurrent.SynchronousQueue;
18		import java.util.concurrent.ThreadLocalRandom;
19		import java.util.concurrent.TimeoutException;
20	–	import java.util.concurrent.TimeUnit;
20
21		import junit.framework.Test;
22		import junit.framework.TestSuite;
#	Line 25 | Line 24 | import junit.framework.TestSuite;
24		public class RecursiveActionTest extends JSR166TestCase {
25
26		public static void main(String[] args) {
27	<	junit.textui.TestRunner.run(suite());
27	>	main(suite(), args);
28		}
29
30		public static Test suite() {
#	Line 47 | Line 46 | public class RecursiveActionTest extends
46		}
47
48		private void testInvokeOnPool(ForkJoinPool pool, RecursiveAction a) {
49	<	try {
49	>	try (PoolCleaner cleaner = cleaner(pool)) {
50		checkNotDone(a);
51
52		assertNull(pool.invoke(a));
53
54		checkCompletedNormally(a);
56	–	} finally {
57	–	joinPool(pool);
55		}
56		}
57
#	Line 505 | Line 502 | public class RecursiveActionTest extends
502		FibAction f = new FibAction(8);
503		assertSame(f, f.fork());
504		helpQuiesce();
505	+	while (!f.isDone()) // wait out race
506	+	;
507		assertEquals(21, f.result);
508		assertEquals(0, getQueuedTaskCount());
509		checkCompletedNormally(f);
#	Line 590 | Line 589 | public class RecursiveActionTest extends
589		FailingFibAction f = new FailingFibAction(8);
590		assertSame(f, f.fork());
591		try {
592	<	f.get(5L, TimeUnit.SECONDS);
592	>	f.get(5L, SECONDS);
593		shouldThrow();
594		} catch (ExecutionException success) {
595		Throwable cause = success.getCause();

Diff Legend

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