ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/FutureTaskTest.java

Comparing jsr166/src/test/tck/FutureTaskTest.java (file contents):
Revision 1.39 by jsr166, Fri Aug 22 03:30:56 2014 UTC vs.
Revision 1.42 by jsr166, Sat Feb 28 18:18:56 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	>	import static java.util.concurrent.TimeUnit.NANOSECONDS;
11	>	import static java.util.concurrent.TimeUnit.SECONDS;
12	>
13	>	import java.util.ArrayList;
14	>	import java.util.List;
15	>	import java.util.NoSuchElementException;
16		import java.util.concurrent.Callable;
17		import java.util.concurrent.CancellationException;
18		import java.util.concurrent.CountDownLatch;
13	–	import java.util.concurrent.ExecutorService;
14	–	import java.util.concurrent.Executors;
19		import java.util.concurrent.ExecutionException;
20	+	import java.util.concurrent.Executors;
21	+	import java.util.concurrent.ExecutorService;
22		import java.util.concurrent.Future;
23		import java.util.concurrent.FutureTask;
24		import java.util.concurrent.TimeoutException;
25		import java.util.concurrent.atomic.AtomicInteger;
26	<	import static java.util.concurrent.TimeUnit.*;
27	<	import java.util.*;
26	>
27	>	import junit.framework.Test;
28	>	import junit.framework.TestSuite;
29
30		public class FutureTaskTest extends JSR166TestCase {
31
#	Line 128 | Line 135 | public class FutureTaskTest extends JSR1
135		pf.set(new Object());
136		pf.setException(new Error());
137		for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
138	<	pf.cancel(true);
138	>	pf.cancel(mayInterruptIfRunning);
139		}
140		}
141
#	Line 479 | Line 486 | public class FutureTaskTest extends JSR1
486		final PublicFutureTask task =
487		new PublicFutureTask(new Runnable() {
488		public void run() {
489	+	pleaseCancel.countDown();
490		try {
483	–	pleaseCancel.countDown();
491		delay(LONG_DELAY_MS);
492		threadShouldThrow();
493		} catch (InterruptedException success) {

Diff Legend

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