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.51 by jsr166, Sun Jan 7 22:59:18 2018 UTC vs.
Revision 1.52 by jsr166, Sun Jul 22 21:04:56 2018 UTC

#	Line 60 | Line 60 | public class FutureTaskTest extends JSR1
60		pf.run();
61		pf.runAndReset();
62		assertEquals(savedRunCount, pf.runCount());
63	+	Object r2 = null;
64		try {
65	<	assertSame(r, f.get());
65	>	r2 = f.get();
66		} catch (CancellationException t) {
67		assertSame(exInfo, CancellationException.class);
68		} catch (ExecutionException t) {
#	Line 69 | Line 70 | public class FutureTaskTest extends JSR1
70		} catch (Throwable t) {
71		threadUnexpectedException(t);
72		}
73	+	if (exInfo == null)
74	+	assertSame(r, r2);
75		assertTrue(f.isDone());
76		}
77		}
#	Line 101 | Line 104 | public class FutureTaskTest extends JSR1
104		}
105		}
106
107	<	<T> void checkCompletedNormally(Future<T> f, T expected) {
107	>	<T> void checkCompletedNormally(Future<T> f, T expectedValue) {
108		checkIsDone(f);
109		assertFalse(f.isCancelled());
110
111	+	T v1 = null, v2 = null;
112		try {
113	<	assertSame(expected, f.get());
114	<	assertSame(expected, f.get(randomTimeout(), randomTimeUnit()));
113	>	v1 = f.get();
114	>	v2 = f.get(randomTimeout(), randomTimeUnit());
115		} catch (Throwable fail) { threadUnexpectedException(fail); }
116	+	assertSame(expectedValue, v1);
117	+	assertSame(expectedValue, v2);
118		}
119
120		void checkCancelled(Future<?> f) {

Diff Legend

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