ViewVC Help

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

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

Comparing jsr166/src/test/tck/ForkJoinTaskTest.java (file contents):
Revision 1.28 by jsr166, Mon Nov 22 22:45:49 2010 UTC vs.
Revision 1.30 by dl, Tue Feb 22 01:18:59 2011 UTC

#	Line 99 | Line 99 | public class ForkJoinTaskTest extends JS
99		long t0 = System.nanoTime();
100		assertSame(expected, a.join());
101		assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
102	<	assertTrue(Thread.interrupted());
102	>	Thread.interrupted();
103		}
104
105		{
#	Line 107 | Line 107 | public class ForkJoinTaskTest extends JS
107		long t0 = System.nanoTime();
108		a.quietlyJoin();        // should be no-op
109		assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
110	<	assertTrue(Thread.interrupted());
110	>	Thread.interrupted();
111		}
112
113		assertFalse(a.cancel(false));
#	Line 135 | Line 135 | public class ForkJoinTaskTest extends JS
135		a.join();
136		shouldThrow();
137		} catch (CancellationException success) {
138	–	assertTrue(Thread.interrupted());
138		} catch (Throwable fail) { threadUnexpectedException(fail); }
139	+	Thread.interrupted();
140
141		{
142		long t0 = System.nanoTime();
#	Line 162 | Line 162 | public class ForkJoinTaskTest extends JS
162		assertFalse(a.isCancelled());
163		assertFalse(a.isCompletedNormally());
164		assertTrue(a.isCompletedAbnormally());
165	<	assertSame(t, a.getException());
165	>	assertSame(t.getClass(), a.getException().getClass());
166		assertNull(a.getRawResult());
167		assertFalse(a.cancel(false));
168		assertFalse(a.cancel(true));
#	Line 172 | Line 172 | public class ForkJoinTaskTest extends JS
172		a.join();
173		shouldThrow();
174		} catch (Throwable expected) {
175	<	assertTrue(Thread.interrupted());
176	<	assertSame(t, expected);
175	>	assertSame(t.getClass(), expected.getClass());
176		}
177	+	Thread.interrupted();
178
179		{
180		long t0 = System.nanoTime();
#	Line 186 | Line 186 | public class ForkJoinTaskTest extends JS
186		a.get();
187		shouldThrow();
188		} catch (ExecutionException success) {
189	<	assertSame(t, success.getCause());
189	>	assertSame(t.getClass(), success.getCause().getClass());
190		} catch (Throwable fail) { threadUnexpectedException(fail); }
191
192		try {
193		a.get(5L, SECONDS);
194		shouldThrow();
195		} catch (ExecutionException success) {
196	<	assertSame(t, success.getCause());
196	>	assertSame(t.getClass(), success.getCause().getClass());
197		} catch (Throwable fail) { threadUnexpectedException(fail); }
198		}
199
#	Line 205 | Line 205 | public class ForkJoinTaskTest extends JS
205		* differently than supplied Recursive forms.
206		*/
207
208	<	static final class FJException extends RuntimeException {
208	>	public static final class FJException extends RuntimeException {
209		FJException() { super(); }
210		}
211

Diff Legend

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