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.114 by jsr166, Fri Sep 4 19:59:18 2015 UTC vs.
Revision 1.118 by jsr166, Sun Sep 6 05:33:14 2015 UTC

#	Line 3345 | Line 3345 | public class CompletableFutureTest exten
3345		() -> CompletableFuture.anyOf(null, f),
3346
3347		() -> f.obtrudeException(null),
3348	+
3349	+	() -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3350	+	() -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3351	+	() -> CompletableFuture.delayedExecutor(1L, null),
3352	+
3353	+	() -> f.orTimeout(1L, null),
3354	+	() -> f.completeOnTimeout(42, 1L, null),
3355		};
3356
3357		assertThrows(NullPointerException.class, throwingActions);
#	Line 3365 | Line 3372 | public class CompletableFutureTest exten
3372		* newIncompleteFuture returns an incomplete CompletableFuture
3373		*/
3374		public void testNewIncompleteFuture() {
3375	+	for (Integer v1 : new Integer[] { 1, null })
3376	+	{
3377		CompletableFuture<Integer> f = new CompletableFuture<>();
3378		CompletableFuture<Integer> g = f.newIncompleteFuture();
3379		checkIncomplete(f);
3380		checkIncomplete(g);
3381	<	}
3381	>	f.complete(v1);
3382	>	checkCompletedNormally(f, v1);
3383	>	checkIncomplete(g);
3384	>	g.complete(v1);
3385	>	checkCompletedNormally(g, v1);
3386	>	assertSame(g.getClass(), CompletableFuture.class);
3387	>	}}
3388
3389		/**
3390		* completedStage returns a completed CompletionStage
#	Line 3410 | Line 3425 | public class CompletableFutureTest exten
3425		/**
3426		* failedFuture(null) throws NPE
3427		*/
3428	<	public void testFailedFuture2() {
3428	>	public void testFailedFuture_null() {
3429		try {
3430		CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3431		shouldThrow();

Diff Legend

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