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.117 by jsr166, Sat Sep 5 15:35:47 2015 UTC vs.
Revision 1.119 by jsr166, Sun Sep 6 16:31:46 2015 UTC

#	Line 3419 | Line 3419 | public class CompletableFutureTest exten
3419		public void testFailedFuture() {
3420		CFException ex = new CFException();
3421		CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3422	<	checkCompletedExceptionallyWithRootCause(f, ex);
3422	>	checkCompletedExceptionally(f, ex);
3423		}
3424
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();
#	Line 3507 | Line 3507 | public class CompletableFutureTest exten
3507		AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3508		f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3509		assertEquals(x.get(), 0);
3510	<	assertEquals(r.get().getCause(), ex);
3510	>	assertEquals(r.get(), ex);
3511		}
3512
3513		/**

Diff Legend

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