ViewVC Help

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

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

Comparing jsr166/src/test/tck/ForkJoinPoolTest.java (file contents):
Revision 1.51 by jsr166, Fri Jul 26 16:36:21 2013 UTC vs.
Revision 1.57 by jsr166, Sat Oct 3 16:57:25 2015 UTC

#	Line 4 | Line 4
4		* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7	<	import junit.framework.*;
7	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
8	>	import static java.util.concurrent.TimeUnit.NANOSECONDS;
9	>
10	>	import java.security.PrivilegedAction;
11	>	import java.security.PrivilegedExceptionAction;
12		import java.util.ArrayList;
13		import java.util.Collection;
14		import java.util.List;
11	–	import java.util.concurrent.Executors;
12	–	import java.util.concurrent.ExecutorService;
13	–	import java.util.concurrent.AbstractExecutorService;
14	–	import java.util.concurrent.CountDownLatch;
15		import java.util.concurrent.Callable;
16	<	import java.util.concurrent.Future;
16	>	import java.util.concurrent.CountDownLatch;
17		import java.util.concurrent.ExecutionException;
18	<	import java.util.concurrent.CancellationException;
19	<	import java.util.concurrent.RejectedExecutionException;
18	>	import java.util.concurrent.Executors;
19	>	import java.util.concurrent.ExecutorService;
20		import java.util.concurrent.ForkJoinPool;
21		import java.util.concurrent.ForkJoinTask;
22		import java.util.concurrent.ForkJoinWorkerThread;
23	+	import java.util.concurrent.Future;
24		import java.util.concurrent.RecursiveTask;
25	<	import java.util.concurrent.TimeUnit;
25	>	import java.util.concurrent.RejectedExecutionException;
26		import java.util.concurrent.atomic.AtomicBoolean;
27		import java.util.concurrent.locks.ReentrantLock;
28	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
29	<	import static java.util.concurrent.TimeUnit.NANOSECONDS;
30	<	import java.security.AccessControlException;
31	<	import java.security.Policy;
31	<	import java.security.PrivilegedAction;
32	<	import java.security.PrivilegedExceptionAction;
28	>
29	>	import junit.framework.AssertionFailedError;
30	>	import junit.framework.Test;
31	>	import junit.framework.TestSuite;
32
33		public class ForkJoinPoolTest extends JSR166TestCase {
34		public static void main(String[] args) {
35	<	junit.textui.TestRunner.run(suite());
35	>	main(suite(), args);
36		}
37
38		public static Test suite() {
#	Line 419 | Line 418 | public class ForkJoinPoolTest extends JS
418		ExecutorService e = new ForkJoinPool(1);
419		try {
420		final AtomicBoolean done = new AtomicBoolean(false);
421	<	CheckedRunnable task = new CheckedRunnable() {
421	>	Future<?> future = e.submit(new CheckedRunnable() {
422		public void realRun() {
423		done.set(true);
424	<	}};
426	<	Future<?> future = e.submit(task);
424	>	}});
425		assertNull(future.get());
426		assertNull(future.get(0, MILLISECONDS));
427		assertTrue(done.get());
#	Line 983 | Line 981 | public class ForkJoinPoolTest extends JS
981		* timed invokeAll(c) returns results of all completed tasks in c
982		*/
983		public void testTimedInvokeAll5() throws Throwable {
984	<	ExecutorService e = new ForkJoinPool(1);
985	<	try {
984	>	try (PoolCloser<ForkJoinPool> poolCloser
985	>	= new PoolCloser(new ForkJoinPool(1))) {
986	>	ForkJoinPool e = poolCloser.pool;
987		List<Callable<String>> l = new ArrayList<Callable<String>>();
988		l.add(new StringTask());
989		l.add(new StringTask());
990		List<Future<String>> futures
991	<	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
991	>	= e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
992		assertEquals(2, futures.size());
993		for (Future<String> future : futures)
994		assertSame(TEST_STRING, future.get());
996	–	} finally {
997	–	joinPool(e);
995		}
996		}
997

Diff Legend

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