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.193 by jsr166, Tue Jan 30 04:07:09 2018 UTC vs.
Revision 1.197 by jsr166, Sun Jul 22 22:08:49 2018 UTC

#	Line 59 | Line 59 | public class CompletableFutureTest exten
59		assertFalse(f.isDone());
60		assertFalse(f.isCancelled());
61		assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
62	+
63	+	Object result = null;
64		try {
65	<	assertNull(f.getNow(null));
65	>	result = f.getNow(null);
66		} catch (Throwable fail) { threadUnexpectedException(fail); }
67	+	assertNull(result);
68	+
69		try {
70		f.get(randomExpiredTimeout(), randomTimeUnit());
71		shouldThrow();
#	Line 70 | Line 74 | public class CompletableFutureTest exten
74		catch (Throwable fail) { threadUnexpectedException(fail); }
75		}
76
77	<	<T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
78	<	checkTimedGet(f, value);
77	>	<T> void checkCompletedNormally(CompletableFuture<T> f, T expectedValue) {
78	>	checkTimedGet(f, expectedValue);
79
80	+	assertEquals(expectedValue, f.join());
81	+	assertEquals(expectedValue, f.getNow(null));
82	+
83	+	T result = null;
84		try {
85	<	assertEquals(value, f.join());
78	<	assertEquals(value, f.getNow(null));
79	<	assertEquals(value, f.get());
85	>	result = f.get();
86		} catch (Throwable fail) { threadUnexpectedException(fail); }
87	+	assertEquals(expectedValue, result);
88	+
89		assertTrue(f.isDone());
90		assertFalse(f.isCancelled());
91		assertFalse(f.isCompletedExceptionally());
#	Line 4388 | Line 4396 | public class CompletableFutureTest exten
4396		f.complete(null);
4397
4398		f = new CompletableFuture<>();
4399	<	CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4399	>	CompletableFuture.anyOf(f, incomplete);
4400		f.complete(null);
4401		}
4402
#	Line 4406 | Line 4414 | public class CompletableFutureTest exten
4414		f.complete(null);
4415
4416		f = new CompletableFuture<>();
4417	<	CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4417	>	CompletableFuture.anyOf(incomplete, f);
4418		f.complete(null);
4419		}
4420		}

Diff Legend

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