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.104 by jsr166, Thu Sep 3 14:17:25 2015 UTC vs.
Revision 1.106 by jsr166, Thu Sep 3 17:01:22 2015 UTC

#	Line 3390 | Line 3390 | public class CompletableFutureTest exten
3390		CompletableFuture<Integer> f = new CompletableFuture<>();
3391		Executor e = f.defaultExecutor();
3392		Executor c =  ForkJoinPool.commonPool();
3393	<	if (ForkJoinPool.getCommonPoolParallelism() > 0)
3393	>	if (ForkJoinPool.getCommonPoolParallelism() > 1)
3394		assertSame(e, c);
3395		}
3396
#	Line 3542 | Line 3542 | public class CompletableFutureTest exten
3542		}
3543
3544		/**
3545	<	*  orTimeout completes with TimeoutException if not complete
3545	>	* orTimeout completes with TimeoutException if not complete
3546		*/
3547		public void testOrTimeout() {
3548		CompletableFuture<Integer> f = new CompletableFuture<>();
#	Line 3551 | Line 3551 | public class CompletableFutureTest exten
3551		}
3552
3553		/**
3554	<	*  orTimeout completes normally if completed before timeout
3554	>	* orTimeout completes normally if completed before timeout
3555		*/
3556		public void testOrTimeout2() {
3557		CompletableFuture<Integer> f = new CompletableFuture<>();
#	Line 3561 | Line 3561 | public class CompletableFutureTest exten
3561		}
3562
3563		/**
3564	<	*  completeOnTimeout completes with given value if not complete
3564	>	* completeOnTimeout completes with given value if not complete
3565		*/
3566		public void testCompleteOnTimeout() {
3567		CompletableFuture<Integer> f = new CompletableFuture<>();
#	Line 3571 | Line 3571 | public class CompletableFutureTest exten
3571		}
3572
3573		/**
3574	<	*  completeOnTimeout has no effect if completed within timeout
3574	>	* completeOnTimeout has no effect if completed within timeout
3575		*/
3576		public void testCompleteOnTimeout2() {
3577		CompletableFuture<Integer> f = new CompletableFuture<>();

Diff Legend

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