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.97 by jsr166, Wed Dec 31 16:44:01 2014 UTC vs.
Revision 1.98 by jsr166, Wed Dec 31 19:05:42 2014 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;
15		import java.util.concurrent.CancellationException;
12	–	import java.util.concurrent.ExecutionException;
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.atomic.AtomicInteger;
20	–	import static java.util.concurrent.TimeUnit.MILLISECONDS;
21	–	import static java.util.concurrent.TimeUnit.SECONDS;
22	–	import java.util.*;
23	–	import java.util.function.Supplier;
24	–	import java.util.function.Consumer;
25		import java.util.function.BiConsumer;
26	–	import java.util.function.Function;
26		import java.util.function.BiFunction;
27	+	import java.util.function.Consumer;
28	+	import java.util.function.Function;
29	+	import java.util.function.Supplier;
30	+
31	+	import junit.framework.Test;
32	+	import junit.framework.TestSuite;
33
34		public class CompletableFutureTest extends JSR166TestCase {
35

Diff Legend

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