ViewVC Help

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

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

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.35 by jsr166, Mon Oct 11 08:47:04 2010 UTC vs.
Revision 1.36 by jsr166, Tue Nov 9 15:29:11 2010 UTC

#	Line 191 | Line 191 | public class ExecutorsTest extends JSR16
191		Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
192		SHORT_DELAY_MS, MILLISECONDS);
193		assertFalse(f.isDone());
194	<	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
194	>	assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
195	>	assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
196	>	assertSame(Boolean.TRUE, f.get());
197		assertTrue(f.isDone());
196	–	assertEquals(Boolean.TRUE, f.get());
198		} finally {
199		joinPool(p);
200		}
#	Line 213 | Line 214 | public class ExecutorsTest extends JSR16
214		Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
215		SHORT_DELAY_MS, MILLISECONDS);
216		assertFalse(f.isDone());
217	<	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
217	>	assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
218	>	assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
219	>	assertSame(Boolean.TRUE, f.get());
220		assertTrue(f.isDone());
218	–	assertEquals(Boolean.TRUE, f.get());
221		} finally {
222		joinPool(p);
223		}
#	Line 237 | Line 239 | public class ExecutorsTest extends JSR16
239		Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
240		SHORT_DELAY_MS, MILLISECONDS);
241		assertFalse(f.isDone());
242	<	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
242	>	assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
243	>	assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
244	>	assertSame(Boolean.TRUE, f.get());
245		assertTrue(f.isDone());
242	–	assertEquals(Boolean.TRUE, f.get());
246		} finally {
247		joinPool(p);
248		}

Diff Legend

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