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.109 by jsr166, Fri Sep 4 02:50:00 2015 UTC vs.
Revision 1.112 by jsr166, Fri Sep 4 19:46:22 2015 UTC

#	Line 3385 | Line 3385 | public class CompletableFutureTest exten
3385
3386		/**
3387		* defaultExecutor by default returns the commonPool if
3388	<	* it supports at least one thread.
3388	>	* it supports more than one thread.
3389		*/
3390		public void testDefaultExecutor() {
3391		CompletableFuture<Integer> f = new CompletableFuture<>();
#	Line 3393 | Line 3393 | public class CompletableFutureTest exten
3393		Executor c = ForkJoinPool.commonPool();
3394		if (ForkJoinPool.getCommonPoolParallelism() > 1)
3395		assertSame(e, c);
3396	+	else
3397	+	assertNotSame(e, c);
3398		}
3399
3400		/**
#	Line 3547 | Line 3549 | public class CompletableFutureTest exten
3549		*/
3550		public void testOrTimeout() {
3551		CompletableFuture<Integer> f = new CompletableFuture<>();
3552	<	f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3552	>	f.orTimeout(SHORT_DELAY_MS, MILLISECONDS);
3553		checkCompletedExceptionallyWithTimeout(f);
3554		}
3555
#	Line 3557 | Line 3559 | public class CompletableFutureTest exten
3559		public void testOrTimeout2() {
3560		CompletableFuture<Integer> f = new CompletableFuture<>();
3561		f.complete(1);
3562	<	f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3562	>	f.orTimeout(SHORT_DELAY_MS, MILLISECONDS);
3563		checkCompletedNormally(f, 1);
3564		}
3565
#	Line 3566 | Line 3568 | public class CompletableFutureTest exten
3568		*/
3569		public void testCompleteOnTimeout() {
3570		CompletableFuture<Integer> f = new CompletableFuture<>();
3571	<	f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3571	>	f.completeOnTimeout(-1, SHORT_DELAY_MS, MILLISECONDS);
3572		f.join();
3573		checkCompletedNormally(f, -1);
3574		}
#	Line 3577 | Line 3579 | public class CompletableFutureTest exten
3579		public void testCompleteOnTimeout2() {
3580		CompletableFuture<Integer> f = new CompletableFuture<>();
3581		f.complete(1);
3582	<	f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3582	>	f.completeOnTimeout(-1, SHORT_DELAY_MS, MILLISECONDS);
3583		checkCompletedNormally(f, 1);
3584		}
3585

Diff Legend

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