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.43 by jsr166, Sun Feb 22 19:16:38 2015 UTC vs.
Revision 1.46 by jsr166, Sun Oct 18 04:48:32 2015 UTC

#	Line 24 | 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 46 | 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);
55	–	} finally {
56	–	joinPool(pool);
55		}
56		}
57
#	Line 425 | Line 423 | public class RecursiveActionTest extends
423
424		t = newStartedThread(r);
425		testInvokeOnPool(mainPool(), a);
426	<	awaitTermination(t, LONG_DELAY_MS);
426	>	awaitTermination(t);
427
428		a.reinitialize();
429		t = newStartedThread(r);
430		testInvokeOnPool(singletonPool(), a);
431	<	awaitTermination(t, LONG_DELAY_MS);
431	>	awaitTermination(t);
432		}
433
434		/**

Diff Legend

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