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.63 by jsr166, Sun Nov 23 22:27:06 2014 UTC vs.
Revision 1.93 by jsr166, Thu Sep 5 21:11:13 2019 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
10	<	import java.util.Arrays;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	>
11		import java.util.ArrayList;
12	+	import java.util.Arrays;
13		import java.util.Collection;
14		import java.util.Iterator;
15		import java.util.NoSuchElementException;
#	Line 19 | Line 20 | import java.util.concurrent.DelayQueue;
20		import java.util.concurrent.Executors;
21		import java.util.concurrent.ExecutorService;
22		import java.util.concurrent.TimeUnit;
23	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
23	>
24	>	import junit.framework.Test;
25
26		public class DelayQueueTest extends JSR166TestCase {
27
#	Line 33 | Line 35 | public class DelayQueueTest extends JSR1
35		}
36
37		public static void main(String[] args) {
38	<	junit.textui.TestRunner.run(suite());
38	>	main(suite(), args);
39		}
40
41		public static Test suite() {
42	+	class Implementation implements CollectionImplementation {
43	+	public Class<?> klazz() { return DelayQueue.class; }
44	+	public Collection emptyCollection() { return new DelayQueue(); }
45	+	public Object makeElement(int i) { return new PDelay(i); }
46	+	public boolean isConcurrent() { return true; }
47	+	public boolean permitsNulls() { return false; }
48	+	}
49		return newTestSuite(DelayQueueTest.class,
50	<	new Generic().testSuite());
50	>	new Generic().testSuite(),
51	>	CollectionTest.testSuite(new Implementation()));
52		}
53
44	–	private static final int NOCAP = Integer.MAX_VALUE;
45	–
54		/**
55	<	* A delayed implementation for testing.
56	<	* Most tests use Pseudodelays, where delays are all elapsed
55	>	* A fake Delayed implementation for testing.
56	>	* Most tests use PDelays, where delays are all elapsed
57		* (so, no blocking solely for delays) but are still ordered
58		*/
59		static class PDelay implements Delayed {
60	<	int pseudodelay;
61	<	PDelay(int i) { pseudodelay = i; }
54	<	public int compareTo(PDelay other) {
55	<	int a = this.pseudodelay;
56	<	int b = other.pseudodelay;
57	<	return (a < b) ? -1 : (a > b) ? 1 : 0;
58	<	}
60	>	final int pseudodelay;
61	>	PDelay(int pseudodelay) { this.pseudodelay = pseudodelay; }
62		public int compareTo(Delayed y) {
63	<	return compareTo((PDelay)y);
63	>	return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay);
64		}
65		public boolean equals(Object other) {
66		return (other instanceof PDelay) &&
#	Line 66 | 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 77 | Line 80 | public class DelayQueueTest extends JSR1
80		* Delayed implementation that actually delays
81		*/
82		static class NanoDelay implements Delayed {
83	<	long trigger;
83	>	final long trigger;
84		NanoDelay(long i) {
85		trigger = System.nanoTime() + i;
86		}
84	–	public int compareTo(NanoDelay y) {
85	–	long i = trigger;
86	–	long j = y.trigger;
87	–	if (i < j) return -1;
88	–	if (i > j) return 1;
89	–	return 0;
90	–	}
87
88		public int compareTo(Delayed y) {
89	<	return compareTo((NanoDelay)y);
89	>	return Long.compare(trigger, ((NanoDelay)y).trigger);
90		}
91
92		public boolean equals(Object other) {
93	<	return equals((NanoDelay)other);
94	<	}
99	<	public boolean equals(NanoDelay other) {
100	<	return other.trigger == trigger;
93	>	return (other instanceof NanoDelay) &&
94	>	this.trigger == ((NanoDelay)other).trigger;
95		}
96
97		// suppress [overrides] javac warning
#	Line 119 | Line 113 | public class DelayQueueTest extends JSR1
113
114		/**
115		* Returns a new queue of given size containing consecutive
116	<	* PDelays 0 ... n.
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)
121	>	for (int i = n - 1; i >= 0; i -= 2)
122		assertTrue(q.offer(new PDelay(i)));
123	<	for (int i = (n & 1); i < n; i+=2)
123	>	for (int i = (n & 1); i < n; i += 2)
124		assertTrue(q.offer(new PDelay(i)));
125		assertFalse(q.isEmpty());
126	<	assertEquals(NOCAP, q.remainingCapacity());
126	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
127		assertEquals(n, q.size());
128	+	assertEquals(new PDelay(0), q.peek());
129		return q;
130		}
131
#	Line 138 | Line 133 | public class DelayQueueTest extends JSR1
133		* A new queue has unbounded capacity
134		*/
135		public void testConstructor1() {
136	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
136	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
137		}
138
139		/**
#	Line 146 | Line 141 | public class DelayQueueTest extends JSR1
141		*/
142		public void testConstructor3() {
143		try {
144	<	DelayQueue q = new DelayQueue(null);
144	>	new DelayQueue(null);
145		shouldThrow();
146		} catch (NullPointerException success) {}
147		}
#	Line 156 | Line 151 | public class DelayQueueTest extends JSR1
151		*/
152		public void testConstructor4() {
153		try {
154	<	PDelay[] ints = new PDelay[SIZE];
160	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
154	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
155		shouldThrow();
156		} catch (NullPointerException success) {}
157		}
#	Line 166 | Line 160 | public class DelayQueueTest extends JSR1
160		* Initializing from Collection with some null elements throws NPE
161		*/
162		public void testConstructor5() {
163	+	PDelay[] a = new PDelay[SIZE];
164	+	for (int i = 0; i < SIZE - 1; ++i)
165	+	a[i] = new PDelay(i);
166		try {
167	<	PDelay[] ints = new PDelay[SIZE];
171	<	for (int i = 0; i < SIZE-1; ++i)
172	<	ints[i] = new PDelay(i);
173	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
167	>	new DelayQueue(Arrays.asList(a));
168		shouldThrow();
169		} catch (NullPointerException success) {}
170		}
#	Line 193 | Line 187 | public class DelayQueueTest extends JSR1
187		public void testEmpty() {
188		DelayQueue q = new DelayQueue();
189		assertTrue(q.isEmpty());
190	<	assertEquals(NOCAP, q.remainingCapacity());
190	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
191		q.add(new PDelay(1));
192		assertFalse(q.isEmpty());
193		q.add(new PDelay(2));
#	Line 203 | Line 197 | public class DelayQueueTest extends JSR1
197		}
198
199		/**
200	<	* remainingCapacity does not change when elements added or removed,
207	<	* but size does
200	>	* remainingCapacity() always returns Integer.MAX_VALUE
201		*/
202		public void testRemainingCapacity() {
203	<	DelayQueue q = populatedQueue(SIZE);
203	>	BlockingQueue q = populatedQueue(SIZE);
204		for (int i = 0; i < SIZE; ++i) {
205	<	assertEquals(NOCAP, q.remainingCapacity());
206	<	assertEquals(SIZE-i, q.size());
207	<	q.remove();
205	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
206	>	assertEquals(SIZE - i, q.size());
207	>	assertTrue(q.remove() instanceof PDelay);
208		}
209		for (int i = 0; i < SIZE; ++i) {
210	<	assertEquals(NOCAP, q.remainingCapacity());
210	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211		assertEquals(i, q.size());
212	<	q.add(new PDelay(i));
212	>	assertTrue(q.add(new PDelay(i)));
213		}
214		}
215
#	Line 241 | 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);
241		try {
248	–	DelayQueue q = populatedQueue(SIZE);
242		q.addAll(q);
243		shouldThrow();
244		} catch (IllegalArgumentException success) {}
#	Line 256 | Line 249 | public class DelayQueueTest extends JSR1
249		* possibly adding some elements
250		*/
251		public void testAddAll3() {
252	+	DelayQueue q = new DelayQueue();
253	+	PDelay[] a = new PDelay[SIZE];
254	+	for (int i = 0; i < SIZE - 1; ++i)
255	+	a[i] = new PDelay(i);
256		try {
257	<	DelayQueue q = new DelayQueue();
261	<	PDelay[] ints = new PDelay[SIZE];
262	<	for (int i = 0; i < SIZE-1; ++i)
263	<	ints[i] = new PDelay(i);
264	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(a));
258		shouldThrow();
259		} catch (NullPointerException success) {}
260		}
#	Line 272 | Line 265 | public class DelayQueueTest extends JSR1
265		public void testAddAll5() {
266		PDelay[] empty = new PDelay[0];
267		PDelay[] ints = new PDelay[SIZE];
268	<	for (int i = SIZE-1; i >= 0; --i)
268	>	for (int i = SIZE - 1; i >= 0; --i)
269		ints[i] = new PDelay(i);
270		DelayQueue q = new DelayQueue();
271		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 287 | Line 280 | public class DelayQueueTest extends JSR1
280		public void testPut() {
281		DelayQueue q = new DelayQueue();
282		for (int i = 0; i < SIZE; ++i) {
283	<	PDelay I = new PDelay(i);
284	<	q.put(I);
285	<	assertTrue(q.contains(I));
283	>	PDelay x = new PDelay(i);
284	>	q.put(x);
285	>	assertTrue(q.contains(x));
286		}
287		assertEquals(SIZE, q.size());
288		}
#	Line 312 | Line 305 | public class DelayQueueTest extends JSR1
305		}
306
307		/**
308	<	* timed offer does not time out
308	>	* Queue is unbounded, so timed offer never times out
309		*/
310		public void testTimedOffer() throws InterruptedException {
311		final DelayQueue q = new DelayQueue();
#	Line 333 | Line 326 | public class DelayQueueTest extends JSR1
326		public void testTake() throws InterruptedException {
327		DelayQueue q = populatedQueue(SIZE);
328		for (int i = 0; i < SIZE; ++i) {
329	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
329	>	assertEquals(new PDelay(i), q.take());
330		}
331		}
332
#	Line 345 | 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()));
350	–	}
343
344		Thread.currentThread().interrupt();
345		try {
#	Line 365 | Line 357 | public class DelayQueueTest extends JSR1
357		}});
358
359		await(pleaseInterrupt);
360	<	assertThreadStaysAlive(t);
360	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
361		t.interrupt();
362		awaitTermination(t);
363		}
#	Line 376 | Line 368 | public class DelayQueueTest extends JSR1
368		public void testPoll() {
369		DelayQueue q = populatedQueue(SIZE);
370		for (int i = 0; i < SIZE; ++i) {
371	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
371	>	assertEquals(new PDelay(i), q.poll());
372		}
373		assertNull(q.poll());
374		}
#	Line 387 | Line 379 | public class DelayQueueTest extends JSR1
379		public void testTimedPoll0() throws InterruptedException {
380		DelayQueue q = populatedQueue(SIZE);
381		for (int i = 0; i < SIZE; ++i) {
382	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
382	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
383		}
384		assertNull(q.poll(0, MILLISECONDS));
385		}
#	Line 399 | Line 391 | public class DelayQueueTest extends JSR1
391		DelayQueue q = populatedQueue(SIZE);
392		for (int i = 0; i < SIZE; ++i) {
393		long startTime = System.nanoTime();
394	<	assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
394	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
395		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
396		}
397		long startTime = System.nanoTime();
#	Line 414 | Line 406 | public class DelayQueueTest extends JSR1
406		*/
407		public void testInterruptedTimedPoll() throws InterruptedException {
408		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
409	+	final DelayQueue q = populatedQueue(SIZE);
410		Thread t = newStartedThread(new CheckedRunnable() {
411		public void realRun() throws InterruptedException {
412	<	DelayQueue q = populatedQueue(SIZE);
413	<	for (int i = 0; i < SIZE; ++i) {
414	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
422	<	}
412	>	for (int i = 0; i < SIZE; i++)
413	>	assertEquals(new PDelay(i),
414	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
415
416		Thread.currentThread().interrupt();
417		try {
418	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
418	>	q.poll(randomTimeout(), randomTimeUnit());
419		shouldThrow();
420		} catch (InterruptedException success) {}
421		assertFalse(Thread.interrupted());
422
423		pleaseInterrupt.countDown();
424		try {
425	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
425	>	q.poll(LONGER_DELAY_MS, MILLISECONDS);
426		shouldThrow();
427		} catch (InterruptedException success) {}
428		assertFalse(Thread.interrupted());
429		}});
430
431		await(pleaseInterrupt);
432	<	assertThreadStaysAlive(t);
432	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
433		t.interrupt();
434		awaitTermination(t);
435	+	checkEmpty(q);
436		}
437
438		/**
#	Line 448 | Line 441 | public class DelayQueueTest extends JSR1
441		public void testPeek() {
442		DelayQueue q = populatedQueue(SIZE);
443		for (int i = 0; i < SIZE; ++i) {
444	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
445	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
444	>	assertEquals(new PDelay(i), q.peek());
445	>	assertEquals(new PDelay(i), q.poll());
446		if (q.isEmpty())
447		assertNull(q.peek());
448		else
#	Line 464 | Line 457 | public class DelayQueueTest extends JSR1
457		public void testElement() {
458		DelayQueue q = populatedQueue(SIZE);
459		for (int i = 0; i < SIZE; ++i) {
460	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
460	>	assertEquals(new PDelay(i), q.element());
461		q.poll();
462		}
463		try {
#	Line 479 | Line 472 | public class DelayQueueTest extends JSR1
472		public void testRemove() {
473		DelayQueue q = populatedQueue(SIZE);
474		for (int i = 0; i < SIZE; ++i) {
475	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
475	>	assertEquals(new PDelay(i), q.remove());
476		}
477		try {
478		q.remove();
#	Line 507 | Line 500 | public class DelayQueueTest extends JSR1
500		q.clear();
501		assertTrue(q.isEmpty());
502		assertEquals(0, q.size());
503	<	assertEquals(NOCAP, q.remainingCapacity());
503	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
504		PDelay x = new PDelay(1);
505		q.add(x);
506		assertFalse(q.isEmpty());
#	Line 544 | Line 537 | public class DelayQueueTest extends JSR1
537		assertTrue(changed);
538
539		assertTrue(q.containsAll(p));
540	<	assertEquals(SIZE-i, q.size());
540	>	assertEquals(SIZE - i, q.size());
541		p.remove();
542		}
543		}
#	Line 557 | Line 550 | public class DelayQueueTest extends JSR1
550		DelayQueue q = populatedQueue(SIZE);
551		DelayQueue p = populatedQueue(i);
552		assertTrue(q.removeAll(p));
553	<	assertEquals(SIZE-i, q.size());
553	>	assertEquals(SIZE - i, q.size());
554		for (int j = 0; j < i; ++j) {
555	<	PDelay I = (PDelay)(p.remove());
556	<	assertFalse(q.contains(I));
555	>	PDelay x = (PDelay)(p.remove());
556	>	assertFalse(q.contains(x));
557		}
558		}
559		}
#	Line 570 | Line 563 | public class DelayQueueTest extends JSR1
563		*/
564		public void testToArray() throws InterruptedException {
565		DelayQueue q = populatedQueue(SIZE);
566	<	Object[] o = q.toArray();
567	<	Arrays.sort(o);
568	<	for (int i = 0; i < o.length; i++)
569	<	assertSame(o[i], q.take());
566	>	Object[] a = q.toArray();
567	>	assertSame(Object[].class, a.getClass());
568	>	Arrays.sort(a);
569	>	for (Object o : a)
570	>	assertSame(o, q.take());
571	>	assertTrue(q.isEmpty());
572		}
573
574		/**
#	Line 585 | Line 580 | public class DelayQueueTest extends JSR1
580		PDelay[] array = q.toArray(ints);
581		assertSame(ints, array);
582		Arrays.sort(ints);
583	<	for (int i = 0; i < ints.length; i++)
584	<	assertSame(ints[i], q.remove());
583	>	for (PDelay o : ints)
584	>	assertSame(o, q.remove());
585	>	assertTrue(q.isEmpty());
586		}
587
588		/**
#	Line 612 | Line 608 | public class DelayQueueTest extends JSR1
608		++i;
609		}
610		assertEquals(i, SIZE);
611	+	assertIteratorExhausted(it);
612	+	}
613	+
614	+	/**
615	+	* iterator of empty collection has no elements
616	+	*/
617	+	public void testEmptyIterator() {
618	+	assertIteratorExhausted(new DelayQueue().iterator());
619		}
620
621		/**
#	Line 647 | Line 651 | public class DelayQueueTest extends JSR1
651		public void testPollInExecutor() {
652		final DelayQueue q = new DelayQueue();
653		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
654	<	ExecutorService executor = Executors.newFixedThreadPool(2);
655	<	executor.execute(new CheckedRunnable() {
656	<	public void realRun() throws InterruptedException {
657	<	assertNull(q.poll());
658	<	threadsStarted.await();
659	<	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
660	<	checkEmpty(q);
661	<	}});
662	<
663	<	executor.execute(new CheckedRunnable() {
664	<	public void realRun() throws InterruptedException {
665	<	threadsStarted.await();
666	<	q.put(new PDelay(1));
667	<	}});
668	<
669	<	joinPool(executor);
654	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
655	>	try (PoolCleaner cleaner = cleaner(executor)) {
656	>	executor.execute(new CheckedRunnable() {
657	>	public void realRun() throws InterruptedException {
658	>	assertNull(q.poll());
659	>	threadsStarted.await();
660	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
661	>	checkEmpty(q);
662	>	}});
663	>
664	>	executor.execute(new CheckedRunnable() {
665	>	public void realRun() throws InterruptedException {
666	>	threadsStarted.await();
667	>	q.put(new PDelay(1));
668	>	}});
669	>	}
670		}
671
672		/**
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
#	Line 709 | Line 713 | public class DelayQueueTest extends JSR1
713		public void testTimedPollDelayed() throws InterruptedException {
714		DelayQueue q = new DelayQueue();
715		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
716	+	long startTime = System.nanoTime();
717		assertNull(q.poll(timeoutMillis(), MILLISECONDS));
718	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
719		}
720
721		/**
#	Line 747 | Line 753 | public class DelayQueueTest extends JSR1
753		final DelayQueue q = populatedQueue(SIZE);
754		Thread t = new Thread(new CheckedRunnable() {
755		public void realRun() {
756	<	q.put(new PDelay(SIZE+1));
756	>	q.put(new PDelay(SIZE + 1));
757		}});
758
759		t.start();
#	Line 767 | Line 773 | public class DelayQueueTest extends JSR1
773		ArrayList l = new ArrayList();
774		q.drainTo(l, i);
775		int k = (i < SIZE) ? i : SIZE;
776	<	assertEquals(SIZE-k, q.size());
776	>	assertEquals(SIZE - k, q.size());
777		assertEquals(k, l.size());
778		}
779		}

Diff Legend

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