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.90 by jsr166, Sun Jul 22 21:42:14 2018 UTC

#	Line 69 | Line 69 | public class DelayQueueTest extends JSR1
69		// suppress [overrides] javac warning
70		public int hashCode() { return pseudodelay; }
71		public long getDelay(TimeUnit ignore) {
72	<	return Integer.MIN_VALUE + pseudodelay;
72	>	return (long) Integer.MIN_VALUE + pseudodelay;
73		}
74		public String toString() {
75		return String.valueOf(pseudodelay);
#	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 234 | Line 234 | public class DelayQueueTest extends JSR1
234		}
235
236		/**
237	<	* addAll(this) throws IAE
237	>	* addAll(this) throws IllegalArgumentException
238		*/
239		public void testAddAllSelf() {
240		DelayQueue q = populatedQueue(SIZE);
#	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 411 | Line 410 | public class DelayQueueTest extends JSR1
410		Thread t = newStartedThread(new CheckedRunnable() {
411		public void realRun() throws InterruptedException {
412		long startTime = System.nanoTime();
413	<	for (int i = 0; i < SIZE; ++i) {
413	>	for (int i = 0; i < SIZE; i++)
414		assertEquals(new PDelay(i),
415		((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
417	–	}
416
417		Thread.currentThread().interrupt();
418		try {
#	Line 429 | Line 427 | public class DelayQueueTest extends JSR1
427		shouldThrow();
428		} catch (InterruptedException success) {}
429		assertFalse(Thread.interrupted());
430	+
431		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
432		}});
433
434		await(pleaseInterrupt);
435	<	assertThreadStaysAlive(t);
435	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
436		t.interrupt();
437		awaitTermination(t);
438		checkEmpty(q);
#	Line 567 | Line 566 | public class DelayQueueTest extends JSR1
566		*/
567		public void testToArray() throws InterruptedException {
568		DelayQueue q = populatedQueue(SIZE);
569	<	Object[] o = q.toArray();
570	<	Arrays.sort(o);
571	<	for (int i = 0; i < o.length; i++)
572	<	assertSame(o[i], q.take());
569	>	Object[] a = q.toArray();
570	>	assertSame(Object[].class, a.getClass());
571	>	Arrays.sort(a);
572	>	for (Object o : a)
573	>	assertSame(o, q.take());
574	>	assertTrue(q.isEmpty());
575		}
576
577		/**
#	Line 582 | Line 583 | public class DelayQueueTest extends JSR1
583		PDelay[] array = q.toArray(ints);
584		assertSame(ints, array);
585		Arrays.sort(ints);
586	<	for (int i = 0; i < ints.length; i++)
587	<	assertSame(ints[i], q.remove());
586	>	for (PDelay o : ints)
587	>	assertSame(o, q.remove());
588	>	assertTrue(q.isEmpty());
589		}
590
591		/**
#	Line 674 | Line 676 | public class DelayQueueTest extends JSR1
676		* Delayed actions do not occur until their delay elapses
677		*/
678		public void testDelay() throws InterruptedException {
679	<	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
679	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
680		for (int i = 0; i < SIZE; ++i)
681		q.add(new NanoDelay(1000000L * (SIZE - i)));
682
#	Line 714 | Line 716 | public class DelayQueueTest extends JSR1
716		public void testTimedPollDelayed() throws InterruptedException {
717		DelayQueue q = new DelayQueue();
718		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
719	+	long startTime = System.nanoTime();
720		assertNull(q.poll(timeoutMillis(), MILLISECONDS));
721	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
722		}
723
724		/**

Diff Legend

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