ViewVC Help

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

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

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.80 by jsr166, Tue Jan 3 07:29:30 2017 UTC vs.
Revision 1.83 by jsr166, Sat May 13 21:43:50 2017 UTC

#	Line 115 | Line 115 | public class DelayQueueTest extends JSR1
115		* Returns a new queue of given size containing consecutive
116		* PDelays 0 ... n - 1.
117		*/
118	<	private DelayQueue<PDelay> populatedQueue(int n) {
119	<	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
118	>	private static DelayQueue<PDelay> populatedQueue(int n) {
119	>	DelayQueue<PDelay> q = new DelayQueue<>();
120		assertTrue(q.isEmpty());
121		for (int i = n - 1; i >= 0; i -= 2)
122		assertTrue(q.offer(new PDelay(i)));
#	Line 338 | Line 338 | public class DelayQueueTest extends JSR1
338		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
339		Thread t = newStartedThread(new CheckedRunnable() {
340		public void realRun() throws InterruptedException {
341	<	for (int i = 0; i < SIZE; ++i) {
341	>	for (int i = 0; i < SIZE; i++)
342		assertEquals(new PDelay(i), ((PDelay)q.take()));
343	–	}
343
344		Thread.currentThread().interrupt();
345		try {
#	Line 358 | Line 357 | public class DelayQueueTest extends JSR1
357		}});
358
359		await(pleaseInterrupt);
360	<	assertThreadStaysAlive(t);
360	>	assertThreadBlocks(t, Thread.State.WAITING);
361		t.interrupt();
362		awaitTermination(t);
363		}
#	Line 674 | Line 673 | public class DelayQueueTest extends JSR1
673		* Delayed actions do not occur until their delay elapses
674		*/
675		public void testDelay() throws InterruptedException {
676	<	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
676	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
677		for (int i = 0; i < SIZE; ++i)
678		q.add(new NanoDelay(1000000L * (SIZE - i)));
679

Diff Legend

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