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.23 by jsr166, Fri Jan 7 07:46:26 2011 UTC vs.
Revision 1.26 by jsr166, Tue May 31 16:16:23 2011 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9		import junit.framework.*;
10	<	import java.util.concurrent.*;
10	>	import java.util.concurrent.Callable;
11	>	import java.util.concurrent.CancellationException;
12	>	import java.util.concurrent.CountDownLatch;
13	>	import java.util.concurrent.ExecutionException;
14	>	import java.util.concurrent.Future;
15	>	import java.util.concurrent.FutureTask;
16	>	import java.util.concurrent.TimeoutException;
17		import static java.util.concurrent.TimeUnit.MILLISECONDS;
18		import static java.util.concurrent.TimeUnit.SECONDS;
19		import java.util.*;
#	Line 366 | Line 372 | public class FutureTaskTest extends JSR1
372		new FutureTask(new CheckedInterruptedCallable<Object>() {
373		public Object realCall() throws InterruptedException {
374		threadStarted.countDown();
375	<	Thread.sleep(LONG_DELAY_MS);
375	>	delay(LONG_DELAY_MS);
376		return Boolean.TRUE;
377		}});
378
#	Line 395 | Line 401 | public class FutureTaskTest extends JSR1
401		new FutureTask(new CheckedInterruptedCallable<Object>() {
402		public Object realCall() throws InterruptedException {
403		threadStarted.countDown();
404	<	Thread.sleep(LONG_DELAY_MS);
404	>	delay(LONG_DELAY_MS);
405		return Boolean.TRUE;
406		}});
407

Diff Legend

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