ViewVC Help

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

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

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.95 by jsr166, Wed Jun 25 15:32:10 2014 UTC vs.
Revision 1.97 by jsr166, Wed Dec 31 16:44:01 2014 UTC

#	Line 8 | Line 8
8		import junit.framework.*;
9		import java.util.concurrent.Callable;
10		import java.util.concurrent.Executor;
11	–	import java.util.concurrent.ExecutorService;
12	–	import java.util.concurrent.Executors;
11		import java.util.concurrent.CancellationException;
14	–	import java.util.concurrent.CountDownLatch;
12		import java.util.concurrent.ExecutionException;
16	–	import java.util.concurrent.Future;
13		import java.util.concurrent.CompletableFuture;
14		import java.util.concurrent.CompletionException;
15		import java.util.concurrent.CompletionStage;
#	Line 584 | Line 580 | public class CompletableFutureTest exten
580		}
581		}
582
583	+	static final boolean defaultExecutorIsCommonPool
584	+	= ForkJoinPool.getCommonPoolParallelism() > 1;
585	+
586		/**
587		* Permits the testing of parallel code for the 3 different
588		* execution modes without copy/pasting all the test methods.
#	Line 665 | Line 664 | public class CompletableFutureTest exten
664
665		ASYNC {
666		public void checkExecutionMode() {
667	<	assertSame(ForkJoinPool.commonPool(),
668	<	ForkJoinTask.getPool());
667	>	assertEquals(defaultExecutorIsCommonPool,
668	>	(ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
669		}
670		public CompletableFuture<Void> runAsync(Runnable a) {
671		return CompletableFuture.runAsync(a);

Diff Legend

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