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.45 by jsr166, Sun May 14 00:56:43 2017 UTC vs.
Revision 1.46 by jsr166, Mon May 29 19:15:02 2017 UTC

#	Line 8 | Line 8
8
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10		import static java.util.concurrent.TimeUnit.NANOSECONDS;
11	–	import static java.util.concurrent.TimeUnit.SECONDS;
11
12		import java.util.ArrayList;
13		import java.util.List;
#	Line 108 | Line 107 | public class FutureTaskTest extends JSR1
107
108		try {
109		assertSame(expected, f.get());
110	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
112	<	try {
113	<	assertSame(expected, f.get(5L, SECONDS));
110	>	assertSame(expected, f.get(randomTimeout(), randomTimeUnit()));
111		} catch (Throwable fail) { threadUnexpectedException(fail); }
112		}
113
#	Line 125 | Line 122 | public class FutureTaskTest extends JSR1
122		} catch (Throwable fail) { threadUnexpectedException(fail); }
123
124		try {
125	<	f.get(5L, SECONDS);
125	>	f.get(randomTimeout(), randomTimeUnit());
126		shouldThrow();
127		} catch (CancellationException success) {
128		} catch (Throwable fail) { threadUnexpectedException(fail); }
#	Line 151 | Line 148 | public class FutureTaskTest extends JSR1
148		} catch (Throwable fail) { threadUnexpectedException(fail); }
149
150		try {
151	<	f.get(5L, SECONDS);
151	>	f.get(randomTimeout(), randomTimeUnit());
152		shouldThrow();
153		} catch (ExecutionException success) {
154		assertSame(t, success.getCause());

Diff Legend

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