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.103 by dl, Thu Sep 3 11:45:34 2015 UTC vs.
Revision 1.111 by jsr166, Fri Sep 4 13:43:25 2015 UTC

#	Line 3333 | Line 3333 | public class CompletableFutureTest exten
3333		() -> f.exceptionally(null),
3334
3335		() -> f.handle(null),
3336	+
3337		() -> CompletableFuture.allOf((CompletableFuture<?>)null),
3338		() -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3339		() -> CompletableFuture.allOf(f, null),
#	Line 3359 | Line 3360 | public class CompletableFutureTest exten
3360		}
3361
3362		// jdk9
3363	<
3363	>
3364		/**
3365		* newIncompleteFuture returns an incomplete CompletableFuture
3366		*/
#	Line 3384 | 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<>();
3392		Executor e = f.defaultExecutor();
3393	<	Executor c =  ForkJoinPool.commonPool();
3394	<	if (ForkJoinPool.getCommonPoolParallelism() > 0)
3393	>	Executor c = ForkJoinPool.commonPool();
3394	>	if (ForkJoinPool.getCommonPoolParallelism() > 1)
3395		assertSame(e, c);
3396	+	else
3397	+	assertNotSame(e, c);
3398		}
3399
3400		/**
#	Line 3410 | Line 3413 | public class CompletableFutureTest exten
3413		public void testFailedFuture2() {
3414		try {
3415		CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3416	<	} catch(NullPointerException success) {
3417	<	}
3416	>	shouldThrow();
3417	>	} catch (NullPointerException success) {}
3418		}
3419
3420		/**
#	Line 3479 | Line 3482 | public class CompletableFutureTest exten
3482		}
3483
3484		/**
3485	<	* failedStage returns a Completionstage completed
3485	>	* failedStage returns a CompletionStage completed
3486		* exceptionally with the given Exception
3487		*/
3488		public void testFailedStage() {
#	Line 3512 | Line 3515 | public class CompletableFutureTest exten
3515		try {
3516		f.join();
3517		shouldThrow();
3518	<	} catch(Exception success) {
3516	<	}
3518	>	} catch (Exception success) {}
3519		checkCompletedWithWrappedCFException(f);
3520		}
3521
#	Line 3538 | Line 3540 | public class CompletableFutureTest exten
3540		try {
3541		f.join();
3542		shouldThrow();
3543	<	} catch(Exception success) {
3542	<	}
3543	>	} catch (Exception success) {}
3544		checkCompletedWithWrappedCFException(f);
3545		}
3546
3547		/**
3548	<	*  orTimeout completes with TimeoutException if not complete
3548	>	* orTimeout completes with TimeoutException if not complete
3549		*/
3550		public void testOrTimeout() {
3551		CompletableFuture<Integer> f = new CompletableFuture<>();
#	Line 3553 | Line 3554 | public class CompletableFutureTest exten
3554		}
3555
3556		/**
3557	<	*  orTimeout completes normally if completed before timeout
3557	>	* orTimeout completes normally if completed before timeout
3558		*/
3559		public void testOrTimeout2() {
3560		CompletableFuture<Integer> f = new CompletableFuture<>();
#	Line 3563 | Line 3564 | public class CompletableFutureTest exten
3564		}
3565
3566		/**
3567	<	*  completeOnTimeout completes with given value if not complete
3567	>	* completeOnTimeout completes with given value if not complete
3568		*/
3569		public void testCompleteOnTimeout() {
3570		CompletableFuture<Integer> f = new CompletableFuture<>();
#	Line 3573 | Line 3574 | public class CompletableFutureTest exten
3574		}
3575
3576		/**
3577	<	*  completeOnTimeout has no effect if completed within timeout
3577	>	* completeOnTimeout has no effect if completed within timeout
3578		*/
3579		public void testCompleteOnTimeout2() {
3580		CompletableFuture<Integer> f = new CompletableFuture<>();

Diff Legend

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