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.105 by dl, Thu Sep 3 16:30:05 2015 UTC

#	Line 3359 | Line 3359 | public class CompletableFutureTest exten
3359		}
3360
3361		// jdk9
3362	<
3362	>
3363		/**
3364		* newIncompleteFuture returns an incomplete CompletableFuture
3365		*/
#	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 3410 | Line 3410 | public class CompletableFutureTest exten
3410		public void testFailedFuture2() {
3411		try {
3412		CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3413	<	} catch(NullPointerException success) {
3414	<	}
3413	>	shouldThrow();
3414	>	} catch (NullPointerException success) {}
3415		}
3416
3417		/**
#	Line 3512 | Line 3512 | public class CompletableFutureTest exten
3512		try {
3513		f.join();
3514		shouldThrow();
3515	<	} catch(Exception success) {
3516	<	}
3515	>	} catch (Exception success) {}
3516		checkCompletedWithWrappedCFException(f);
3517		}
3518
#	Line 3538 | Line 3537 | public class CompletableFutureTest exten
3537		try {
3538		f.join();
3539		shouldThrow();
3540	<	} catch(Exception success) {
3542	<	}
3540	>	} catch (Exception success) {}
3541		checkCompletedWithWrappedCFException(f);
3542		}
3543

Diff Legend

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