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.100 by jsr166, Thu Jan 15 18:34:19 2015 UTC vs.
Revision 1.101 by jsr166, Sun Feb 22 04:34:44 2015 UTC

#	Line 273 | Line 273 | public class CompletableFutureTest exten
273		{
274		CompletableFuture<Integer> f = new CompletableFuture<>();
275		checkIncomplete(f);
276	<	assertTrue(f.cancel(true));
277	<	assertTrue(f.cancel(true));
276	>	assertTrue(f.cancel(mayInterruptIfRunning));
277	>	assertTrue(f.cancel(mayInterruptIfRunning));
278	>	assertTrue(f.cancel(!mayInterruptIfRunning));
279		checkCancelled(f);
280		}}
281
#	Line 906 | Line 907 | public class CompletableFutureTest exten
907
908		public void testExceptionally_exceptionalCompletionActionFailed() {
909		for (boolean createIncomplete : new boolean[] { true, false })
909	–	for (Integer v1 : new Integer[] { 1, null })
910		{
911		final AtomicInteger a = new AtomicInteger(0);
912		final CFException ex1 = new CFException();
#	Line 960 | Line 960 | public class CompletableFutureTest exten
960		public void testWhenComplete_exceptionalCompletion() {
961		for (ExecutionMode m : ExecutionMode.values())
962		for (boolean createIncomplete : new boolean[] { true, false })
963	–	for (Integer v1 : new Integer[] { 1, null })
963		{
964		final AtomicInteger a = new AtomicInteger(0);
965		final CFException ex = new CFException();
#	Line 1045 | Line 1044 | public class CompletableFutureTest exten
1044		public void testWhenComplete_actionFailedSourceFailed() {
1045		for (boolean createIncomplete : new boolean[] { true, false })
1046		for (ExecutionMode m : ExecutionMode.values())
1048	–	for (Integer v1 : new Integer[] { 1, null })
1047		{
1048		final AtomicInteger a = new AtomicInteger(0);
1049		final CFException ex1 = new CFException();
#	Line 3212 | Line 3210 | public class CompletableFutureTest exten
3210		CompletableFuture<Integer> f = new CompletableFuture<>();
3211		CompletableFuture<Integer> g = new CompletableFuture<>();
3212		CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3215	–	CompletableFuture<?> h;
3213		ThreadExecutor exec = new ThreadExecutor();
3214
3215		Runnable[] throwingActions = {

Diff Legend

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