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.94 by jsr166, Wed Jun 18 02:37:38 2014 UTC vs.
Revision 1.110 by dl, Fri Sep 4 10:56:14 2015 UTC

#	Line 5 | Line 5
5		* http://creativecommons.org/publicdomain/zero/1.0/
6		*/
7
8	<	import junit.framework.*;
8	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
9	>	import static java.util.concurrent.TimeUnit.SECONDS;
10	>
11	>	import java.util.ArrayList;
12	>	import java.util.List;
13	>	import java.util.Objects;
14		import java.util.concurrent.Callable;
10	–	import java.util.concurrent.Executor;
11	–	import java.util.concurrent.ExecutorService;
12	–	import java.util.concurrent.Executors;
15		import java.util.concurrent.CancellationException;
14	–	import java.util.concurrent.CountDownLatch;
15	–	import java.util.concurrent.ExecutionException;
16	–	import java.util.concurrent.Future;
16		import java.util.concurrent.CompletableFuture;
17		import java.util.concurrent.CompletionException;
18		import java.util.concurrent.CompletionStage;
19	+	import java.util.concurrent.ExecutionException;
20	+	import java.util.concurrent.Executor;
21		import java.util.concurrent.ForkJoinPool;
22		import java.util.concurrent.ForkJoinTask;
23		import java.util.concurrent.TimeoutException;
24	+	import java.util.concurrent.TimeUnit;
25		import java.util.concurrent.atomic.AtomicInteger;
26	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
25	<	import static java.util.concurrent.TimeUnit.SECONDS;
26	<	import java.util.*;
27	<	import java.util.function.Supplier;
28	<	import java.util.function.Consumer;
26	>	import java.util.concurrent.atomic.AtomicReference;
27		import java.util.function.BiConsumer;
30	–	import java.util.function.Function;
28		import java.util.function.BiFunction;
29	+	import java.util.function.Consumer;
30	+	import java.util.function.Function;
31	+	import java.util.function.Supplier;
32	+
33	+	import junit.framework.Test;
34	+	import junit.framework.TestSuite;
35
36		public class CompletableFutureTest extends JSR166TestCase {
37
38		public static void main(String[] args) {
39	<	junit.textui.TestRunner.run(suite());
39	>	main(suite(), args);
40		}
41		public static Test suite() {
42		return new TestSuite(CompletableFutureTest.class);
#	Line 44 | Line 47 | public class CompletableFutureTest exten
47		void checkIncomplete(CompletableFuture<?> f) {
48		assertFalse(f.isDone());
49		assertFalse(f.isCancelled());
50	<	assertTrue(f.toString().contains("[Not completed]"));
50	>	assertTrue(f.toString().contains("Not completed"));
51		try {
52		assertNull(f.getNow(null));
53		} catch (Throwable fail) { threadUnexpectedException(fail); }
#	Line 57 | Line 60 | public class CompletableFutureTest exten
60		}
61
62		<T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
63	<	try {
64	<	assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
63	>	checkTimedGet(f, value);
64	>
65		try {
66		assertEquals(value, f.join());
67		} catch (Throwable fail) { threadUnexpectedException(fail); }
#	Line 76 | Line 78 | public class CompletableFutureTest exten
78		}
79
80		void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
81	+	long startTime = System.nanoTime();
82	+	long timeoutMillis = LONG_DELAY_MS;
83		try {
84	<	f.get(LONG_DELAY_MS, MILLISECONDS);
84	>	f.get(timeoutMillis, MILLISECONDS);
85		shouldThrow();
86		} catch (ExecutionException success) {
87		assertTrue(success.getCause() instanceof CFException);
88		} catch (Throwable fail) { threadUnexpectedException(fail); }
89	+	assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
90	+
91		try {
92		f.join();
93		shouldThrow();
#	Line 107 | Line 113 | public class CompletableFutureTest exten
113
114		<U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
115		Throwable ex) {
116	+	long startTime = System.nanoTime();
117	+	long timeoutMillis = LONG_DELAY_MS;
118		try {
119	<	f.get(LONG_DELAY_MS, MILLISECONDS);
119	>	f.get(timeoutMillis, MILLISECONDS);
120		shouldThrow();
121		} catch (ExecutionException success) {
122		assertSame(ex, success.getCause());
123		} catch (Throwable fail) { threadUnexpectedException(fail); }
124	+	assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
125	+
126		try {
127		f.join();
128		shouldThrow();
#	Line 137 | Line 147 | public class CompletableFutureTest exten
147		assertTrue(f.toString().contains("[Completed exceptionally]"));
148		}
149
150	+	<U> void checkCompletedExceptionallyWithTimeout(CompletableFuture<U> f) {
151	+	long startTime = System.nanoTime();
152	+	long timeoutMillis = LONG_DELAY_MS;
153	+	try {
154	+	f.get(timeoutMillis, MILLISECONDS);
155	+	shouldThrow();
156	+	} catch (ExecutionException ex) {
157	+	assertTrue(ex.getCause() instanceof TimeoutException);
158	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
159	+	assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
160	+
161	+	try {
162	+	f.join();
163	+	shouldThrow();
164	+	} catch (Throwable ex) {
165	+	assertTrue(ex.getCause() instanceof TimeoutException);
166	+	}
167	+
168	+	try {
169	+	f.getNow(null);
170	+	shouldThrow();
171	+	} catch (Throwable ex) {
172	+	assertTrue(ex.getCause() instanceof TimeoutException);
173	+	}
174	+
175	+	try {
176	+	f.get();
177	+	shouldThrow();
178	+	} catch (ExecutionException ex) {
179	+	assertTrue(ex.getCause() instanceof TimeoutException);
180	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
181	+
182	+	assertTrue(f.isDone());
183	+	assertFalse(f.isCancelled());
184	+	assertTrue(f.toString().contains("[Completed exceptionally]"));
185	+	}
186	+
187		<U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
188		Throwable ex) {
189		checkCompletedExceptionallyWithRootCause(f, ex);
#	Line 158 | Line 205 | public class CompletableFutureTest exten
205		}
206
207		void checkCancelled(CompletableFuture<?> f) {
208	+	long startTime = System.nanoTime();
209	+	long timeoutMillis = LONG_DELAY_MS;
210		try {
211	<	f.get(LONG_DELAY_MS, MILLISECONDS);
211	>	f.get(timeoutMillis, MILLISECONDS);
212		shouldThrow();
213		} catch (CancellationException success) {
214		} catch (Throwable fail) { threadUnexpectedException(fail); }
215	+	assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
216	+
217		try {
218		f.join();
219		shouldThrow();
#	Line 183 | Line 234 | public class CompletableFutureTest exten
234		}
235
236		void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
237	+	long startTime = System.nanoTime();
238	+	long timeoutMillis = LONG_DELAY_MS;
239		try {
240	<	f.get(LONG_DELAY_MS, MILLISECONDS);
240	>	f.get(timeoutMillis, MILLISECONDS);
241		shouldThrow();
242		} catch (ExecutionException success) {
243		assertTrue(success.getCause() instanceof CancellationException);
244		} catch (Throwable fail) { threadUnexpectedException(fail); }
245	+	assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
246	+
247		try {
248		f.join();
249		shouldThrow();
#	Line 257 | Line 312 | public class CompletableFutureTest exten
312		{
313		CompletableFuture<Integer> f = new CompletableFuture<>();
314		checkIncomplete(f);
315	<	assertTrue(f.cancel(true));
316	<	assertTrue(f.cancel(true));
315	>	assertTrue(f.cancel(mayInterruptIfRunning));
316	>	assertTrue(f.cancel(mayInterruptIfRunning));
317	>	assertTrue(f.cancel(!mayInterruptIfRunning));
318		checkCancelled(f);
319		}}
320
#	Line 530 | Line 586 | public class CompletableFutureTest exten
586		}
587		}
588
533	–
589		class CompletableFutureInc extends CheckedIntegerAction
590		implements Function<Integer, CompletableFuture<Integer>>
591		{
#	Line 569 | Line 624 | public class CompletableFutureTest exten
624		}
625		}
626
627	+	static final boolean defaultExecutorIsCommonPool
628	+	= ForkJoinPool.getCommonPoolParallelism() > 1;
629	+
630		/**
631		* Permits the testing of parallel code for the 3 different
632		* execution modes without copy/pasting all the test methods.
633		*/
634		enum ExecutionMode {
635	<	DEFAULT {
635	>	SYNC {
636		public void checkExecutionMode() {
637		assertFalse(ThreadExecutor.startedCurrentThread());
638		assertNull(ForkJoinTask.getPool());
#	Line 650 | Line 708 | public class CompletableFutureTest exten
708
709		ASYNC {
710		public void checkExecutionMode() {
711	<	assertSame(ForkJoinPool.commonPool(),
712	<	ForkJoinTask.getPool());
711	>	assertEquals(defaultExecutorIsCommonPool,
712	>	(ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
713		}
714		public CompletableFuture<Void> runAsync(Runnable a) {
715		return CompletableFuture.runAsync(a);
#	Line 875 | Line 933 | public class CompletableFutureTest exten
933		if (!createIncomplete) f.completeExceptionally(ex);
934		final CompletableFuture<Integer> g = f.exceptionally
935		((Throwable t) -> {
936	<	ExecutionMode.DEFAULT.checkExecutionMode();
936	>	ExecutionMode.SYNC.checkExecutionMode();
937		threadAssertSame(t, ex);
938		a.getAndIncrement();
939		return v1;
#	Line 888 | Line 946 | public class CompletableFutureTest exten
946
947		public void testExceptionally_exceptionalCompletionActionFailed() {
948		for (boolean createIncomplete : new boolean[] { true, false })
891	–	for (Integer v1 : new Integer[] { 1, null })
949		{
950		final AtomicInteger a = new AtomicInteger(0);
951		final CFException ex1 = new CFException();
#	Line 897 | Line 954 | public class CompletableFutureTest exten
954		if (!createIncomplete) f.completeExceptionally(ex1);
955		final CompletableFuture<Integer> g = f.exceptionally
956		((Throwable t) -> {
957	<	ExecutionMode.DEFAULT.checkExecutionMode();
957	>	ExecutionMode.SYNC.checkExecutionMode();
958		threadAssertSame(t, ex1);
959		a.getAndIncrement();
960		throw ex2;
#	Line 942 | Line 999 | public class CompletableFutureTest exten
999		public void testWhenComplete_exceptionalCompletion() {
1000		for (ExecutionMode m : ExecutionMode.values())
1001		for (boolean createIncomplete : new boolean[] { true, false })
945	–	for (Integer v1 : new Integer[] { 1, null })
1002		{
1003		final AtomicInteger a = new AtomicInteger(0);
1004		final CFException ex = new CFException();
#	Line 1027 | Line 1083 | public class CompletableFutureTest exten
1083		public void testWhenComplete_actionFailedSourceFailed() {
1084		for (boolean createIncomplete : new boolean[] { true, false })
1085		for (ExecutionMode m : ExecutionMode.values())
1030	–	for (Integer v1 : new Integer[] { 1, null })
1086		{
1087		final AtomicInteger a = new AtomicInteger(0);
1088		final CFException ex1 = new CFException();
#	Line 2975 | Line 3030 | public class CompletableFutureTest exten
3030		checkCancelled(f);
3031		}}
3032
3033	+	/**
3034	+	* thenCompose result completes exceptionally if the result of the action does
3035	+	*/
3036	+	public void testThenCompose_actionReturnsFailingFuture() {
3037	+	for (ExecutionMode m : ExecutionMode.values())
3038	+	for (int order = 0; order < 6; order++)
3039	+	for (Integer v1 : new Integer[] { 1, null })
3040	+	{
3041	+	final CFException ex = new CFException();
3042	+	final CompletableFuture<Integer> f = new CompletableFuture<>();
3043	+	final CompletableFuture<Integer> g = new CompletableFuture<>();
3044	+	final CompletableFuture<Integer> h;
3045	+	// Test all permutations of orders
3046	+	switch (order) {
3047	+	case 0:
3048	+	assertTrue(f.complete(v1));
3049	+	assertTrue(g.completeExceptionally(ex));
3050	+	h = m.thenCompose(f, (x -> g));
3051	+	break;
3052	+	case 1:
3053	+	assertTrue(f.complete(v1));
3054	+	h = m.thenCompose(f, (x -> g));
3055	+	assertTrue(g.completeExceptionally(ex));
3056	+	break;
3057	+	case 2:
3058	+	assertTrue(g.completeExceptionally(ex));
3059	+	assertTrue(f.complete(v1));
3060	+	h = m.thenCompose(f, (x -> g));
3061	+	break;
3062	+	case 3:
3063	+	assertTrue(g.completeExceptionally(ex));
3064	+	h = m.thenCompose(f, (x -> g));
3065	+	assertTrue(f.complete(v1));
3066	+	break;
3067	+	case 4:
3068	+	h = m.thenCompose(f, (x -> g));
3069	+	assertTrue(f.complete(v1));
3070	+	assertTrue(g.completeExceptionally(ex));
3071	+	break;
3072	+	case 5:
3073	+	h = m.thenCompose(f, (x -> g));
3074	+	assertTrue(f.complete(v1));
3075	+	assertTrue(g.completeExceptionally(ex));
3076	+	break;
3077	+	default: throw new AssertionError();
3078	+	}
3079	+
3080	+	checkCompletedExceptionally(g, ex);
3081	+	checkCompletedWithWrappedException(h, ex);
3082	+	checkCompletedNormally(f, v1);
3083	+	}}
3084	+
3085		// other static methods
3086
3087		/**
#	Line 3142 | Line 3249 | public class CompletableFutureTest exten
3249		CompletableFuture<Integer> f = new CompletableFuture<>();
3250		CompletableFuture<Integer> g = new CompletableFuture<>();
3251		CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3145	–	CompletableFuture<?> h;
3252		ThreadExecutor exec = new ThreadExecutor();
3253
3254		Runnable[] throwingActions = {
3255		() -> CompletableFuture.supplyAsync(null),
3256		() -> CompletableFuture.supplyAsync(null, exec),
3257	<	() -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3257	>	() -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3258
3259		() -> CompletableFuture.runAsync(null),
3260		() -> CompletableFuture.runAsync(null, exec),
#	Line 3253 | Line 3359 | public class CompletableFutureTest exten
3359		assertSame(f, f.toCompletableFuture());
3360		}
3361
3362	+	// jdk9
3363	+
3364	+	/**
3365	+	* newIncompleteFuture returns an incomplete CompletableFuture
3366	+	*/
3367	+	public void testNewIncompleteFuture() {
3368	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3369	+	CompletableFuture<Integer> g = f.newIncompleteFuture();
3370	+	checkIncomplete(f);
3371	+	checkIncomplete(g);
3372	+	}
3373	+
3374	+	/**
3375	+	* completedStage returns a completed CompletionStage
3376	+	*/
3377	+	public void testCompletedStage() {
3378	+	AtomicInteger x = new AtomicInteger();
3379	+	AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3380	+	CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3381	+	f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3382	+	assertEquals(x.get(), 1);
3383	+	assertNull(r.get());
3384	+	}
3385	+
3386	+	/**
3387	+	* defaultExecutor by default returns the commonPool if
3388	+	* it supports more than one thread.
3389	+	*/
3390	+	public void testDefaultExecutor() {
3391	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3392	+	Executor e = f.defaultExecutor();
3393	+	Executor c = ForkJoinPool.commonPool();
3394	+	if (ForkJoinPool.getCommonPoolParallelism() > 1)
3395	+	assertSame(e, c);
3396	+	}
3397	+
3398	+	/**
3399	+	* failedFuture returns a CompletableFuture completed
3400	+	* exceptionally with the given Exception
3401	+	*/
3402	+	public void testFailedFuture() {
3403	+	CFException ex = new CFException();
3404	+	CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3405	+	checkCompletedExceptionallyWithRootCause(f, ex);
3406	+	}
3407	+
3408	+	/**
3409	+	* failedFuture(null) throws NPE
3410	+	*/
3411	+	public void testFailedFuture2() {
3412	+	try {
3413	+	CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3414	+	shouldThrow();
3415	+	} catch (NullPointerException success) {}
3416	+	}
3417	+
3418	+	/**
3419	+	* copy returns a CompletableFuture that is completed normally,
3420	+	* with the same value, when source is.
3421	+	*/
3422	+	public void testCopy() {
3423	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3424	+	CompletableFuture<Integer> g = f.copy();
3425	+	checkIncomplete(f);
3426	+	checkIncomplete(g);
3427	+	f.complete(1);
3428	+	checkCompletedNormally(f, 1);
3429	+	checkCompletedNormally(g, 1);
3430	+	}
3431	+
3432	+	/**
3433	+	* copy returns a CompletableFuture that is completed exceptionally
3434	+	* when source is.
3435	+	*/
3436	+	public void testCopy2() {
3437	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3438	+	CompletableFuture<Integer> g = f.copy();
3439	+	checkIncomplete(f);
3440	+	checkIncomplete(g);
3441	+	CFException ex = new CFException();
3442	+	f.completeExceptionally(ex);
3443	+	checkCompletedExceptionally(f, ex);
3444	+	checkCompletedWithWrappedCFException(g);
3445	+	}
3446	+
3447	+	/**
3448	+	* minimalCompletionStage returns a CompletableFuture that is
3449	+	* completed normally, with the same value, when source is.
3450	+	*/
3451	+	public void testMinimalCompletionStage() {
3452	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3453	+	CompletionStage<Integer> g = f.minimalCompletionStage();
3454	+	AtomicInteger x = new AtomicInteger();
3455	+	AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3456	+	checkIncomplete(f);
3457	+	g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3458	+	f.complete(1);
3459	+	checkCompletedNormally(f, 1);
3460	+	assertEquals(x.get(), 1);
3461	+	assertNull(r.get());
3462	+	}
3463	+
3464	+	/**
3465	+	* minimalCompletionStage returns a CompletableFuture that is
3466	+	* completed exceptionally when source is.
3467	+	*/
3468	+	public void testMinimalCompletionStage2() {
3469	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3470	+	CompletionStage<Integer> g = f.minimalCompletionStage();
3471	+	AtomicInteger x = new AtomicInteger();
3472	+	AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3473	+	g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3474	+	checkIncomplete(f);
3475	+	CFException ex = new CFException();
3476	+	f.completeExceptionally(ex);
3477	+	checkCompletedExceptionally(f, ex);
3478	+	assertEquals(x.get(), 0);
3479	+	assertEquals(r.get().getCause(), ex);
3480	+	}
3481	+
3482	+	/**
3483	+	* failedStage returns a CompletionStage completed
3484	+	* exceptionally with the given Exception
3485	+	*/
3486	+	public void testFailedStage() {
3487	+	CFException ex = new CFException();
3488	+	CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3489	+	AtomicInteger x = new AtomicInteger();
3490	+	AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3491	+	f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3492	+	assertEquals(x.get(), 0);
3493	+	assertEquals(r.get().getCause(), ex);
3494	+	}
3495	+
3496	+	/**
3497	+	* completeAsync completes with value of given supplier
3498	+	*/
3499	+	public void testCompleteAsync() {
3500	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3501	+	f.completeAsync(() -> 1);
3502	+	f.join();
3503	+	checkCompletedNormally(f, 1);
3504	+	}
3505	+
3506	+	/**
3507	+	* completeAsync completes exceptionally if given supplier throws
3508	+	*/
3509	+	public void testCompleteAsync2() {
3510	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3511	+	CFException ex = new CFException();
3512	+	f.completeAsync(() -> {if (true) throw ex; return 1;});
3513	+	try {
3514	+	f.join();
3515	+	shouldThrow();
3516	+	} catch (Exception success) {}
3517	+	checkCompletedWithWrappedCFException(f);
3518	+	}
3519	+
3520	+	/**
3521	+	* completeAsync with given executor completes with value of given supplier
3522	+	*/
3523	+	public void testCompleteAsync3() {
3524	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3525	+	f.completeAsync(() -> 1, new ThreadExecutor());
3526	+	f.join();
3527	+	checkCompletedNormally(f, 1);
3528	+	}
3529	+
3530	+	/**
3531	+	* completeAsync with given executor completes exceptionally if
3532	+	* given supplier throws
3533	+	*/
3534	+	public void testCompleteAsync4() {
3535	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3536	+	CFException ex = new CFException();
3537	+	f.completeAsync(() -> {if (true) throw ex; return 1;}, new ThreadExecutor());
3538	+	try {
3539	+	f.join();
3540	+	shouldThrow();
3541	+	} catch (Exception success) {}
3542	+	checkCompletedWithWrappedCFException(f);
3543	+	}
3544	+
3545	+	/**
3546	+	* orTimeout completes with TimeoutException if not complete
3547	+	*/
3548	+	public void testOrTimeout() {
3549	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3550	+	f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3551	+	checkCompletedExceptionallyWithTimeout(f);
3552	+	}
3553	+
3554	+	/**
3555	+	* orTimeout completes normally if completed before timeout
3556	+	*/
3557	+	public void testOrTimeout2() {
3558	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3559	+	f.complete(1);
3560	+	f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3561	+	checkCompletedNormally(f, 1);
3562	+	}
3563	+
3564	+	/**
3565	+	* completeOnTimeout completes with given value if not complete
3566	+	*/
3567	+	public void testCompleteOnTimeout() {
3568	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3569	+	f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3570	+	f.join();
3571	+	checkCompletedNormally(f, -1);
3572	+	}
3573	+
3574	+	/**
3575	+	* completeOnTimeout has no effect if completed within timeout
3576	+	*/
3577	+	public void testCompleteOnTimeout2() {
3578	+	CompletableFuture<Integer> f = new CompletableFuture<>();
3579	+	f.complete(1);
3580	+	f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3581	+	checkCompletedNormally(f, 1);
3582	+	}
3583	+
3584	+	/**
3585	+	* delayedExecutor returns an executor that delays submission
3586	+	*/
3587	+	public void testDelayedExecutor() {
3588	+	long timeoutMillis = SMALL_DELAY_MS;
3589	+	Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3590	+	MILLISECONDS);
3591	+	long startTime = System.nanoTime();
3592	+	CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3593	+	assertNull(f.getNow(null));
3594	+	try {
3595	+	f.get(LONG_DELAY_MS, MILLISECONDS);
3596	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
3597	+	assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3598	+	checkCompletedNormally(f, 1);
3599	+	}
3600	+
3601	+	/**
3602	+	* delayedExecutor for a given executor returns an executor that
3603	+	* delays submission
3604	+	*/
3605	+	public void testDelayedExecutor2() {
3606	+	long timeoutMillis = SMALL_DELAY_MS;
3607	+	Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3608	+	MILLISECONDS,
3609	+	new ThreadExecutor());
3610	+	long startTime = System.nanoTime();
3611	+	CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3612	+	assertNull(f.getNow(null));
3613	+	try {
3614	+	f.get(LONG_DELAY_MS, MILLISECONDS);
3615	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
3616	+	assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3617	+	checkCompletedNormally(f, 1);
3618	+	}
3619	+
3620		//--- tests of implementation details; not part of official tck ---
3621
3622		Object resultOf(CompletableFuture<?> f) {

Diff Legend

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