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.41 by jsr166, Thu Oct 28 22:20:47 2010 UTC vs.
Revision 1.94 by dl, Tue Jan 26 13:33:05 2021 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
10	–	import java.util.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.util.concurrent.*;
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;
16	>	import java.util.concurrent.BlockingQueue;
17	>	import java.util.concurrent.CountDownLatch;
18	>	import java.util.concurrent.Delayed;
19	>	import java.util.concurrent.DelayQueue;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.TimeUnit;
23	>
24	>	import junit.framework.Test;
25
26		public class DelayQueueTest extends JSR166TestCase {
27	+
28	+	public static class Generic extends BlockingQueueTest {
29	+	protected BlockingQueue emptyCollection() {
30	+	return new DelayQueue();
31	+	}
32	+	protected PDelay makeElement(int i) {
33	+	return new PDelay(i);
34	+	}
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	<	return new TestSuite(DelayQueueTest.class);
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(),
51	>	CollectionTest.testSuite(new Implementation()));
52		}
53
23	–	private static final int NOCAP = Integer.MAX_VALUE;
24	–
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 = Integer.MIN_VALUE + i; }
33	<	public int compareTo(PDelay y) {
34	<	int i = pseudodelay;
35	<	int j = y.pseudodelay;
36	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
39	<	}
40	<
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		}
44	–
65		public boolean equals(Object other) {
66	<	return equals((PDelay)other);
66	>	return (other instanceof PDelay) &&
67	>	this.pseudodelay == ((PDelay)other).pseudodelay;
68		}
69	<	public boolean equals(PDelay other) {
70	<	return other.pseudodelay == pseudodelay;
50	<	}
51	<
52	<
69	>	// suppress [overrides] javac warning
70	>	public int hashCode() { return pseudodelay; }
71		public long getDelay(TimeUnit ignore) {
72	<	return pseudodelay;
72	>	return (long) Integer.MIN_VALUE + pseudodelay;
73		}
56	–	public int intValue() {
57	–	return pseudodelay;
58	–	}
59	–
74		public String toString() {
75		return String.valueOf(pseudodelay);
76		}
77		}
78
65	–
79		/**
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		}
74	–	public int compareTo(NanoDelay y) {
75	–	long i = trigger;
76	–	long j = y.trigger;
77	–	if (i < j) return -1;
78	–	if (i > j) return 1;
79	–	return 0;
80	–	}
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	<	}
89	<	public boolean equals(NanoDelay other) {
90	<	return other.trigger == trigger;
93	>	return (other instanceof NanoDelay) &&
94	>	this.trigger == ((NanoDelay)other).trigger;
95		}
96
97	+	// suppress [overrides] javac warning
98	+	public int hashCode() { return (int) trigger; }
99	+
100		public long getDelay(TimeUnit unit) {
101		long n = trigger - System.nanoTime();
102		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 104 | Line 111 | public class DelayQueueTest extends JSR1
111		}
112		}
113
107	–
114		/**
115	<	* Create a queue of given size containing consecutive
116	<	* PDelays 0 ... n.
115	>	* Returns a new queue of given size containing consecutive
116	>	* PDelays 0 ... n - 1.
117		*/
118	<	private DelayQueue populatedQueue(int n) {
119	<	DelayQueue q = new DelayQueue();
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());
127	<	assertEquals(n, q.size());
126	>	mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
127	>	mustEqual(n, q.size());
128	>	mustEqual(new PDelay(0), q.peek());
129		return q;
130		}
131
#	Line 126 | 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	>	mustEqual(Integer.MAX_VALUE, new DelayQueue<PDelay>().remainingCapacity());
137		}
138
139		/**
#	Line 134 | Line 141 | public class DelayQueueTest extends JSR1
141		*/
142		public void testConstructor3() {
143		try {
144	<	DelayQueue q = new DelayQueue(null);
144	>	new DelayQueue<PDelay>(null);
145		shouldThrow();
146		} catch (NullPointerException success) {}
147		}
#	Line 144 | Line 151 | public class DelayQueueTest extends JSR1
151		*/
152		public void testConstructor4() {
153		try {
154	<	PDelay[] ints = new PDelay[SIZE];
148	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
154	>	new DelayQueue<PDelay>(Arrays.asList(new PDelay[SIZE]));
155		shouldThrow();
156		} catch (NullPointerException success) {}
157		}
#	Line 154 | 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];
159	<	for (int i = 0; i < SIZE-1; ++i)
160	<	ints[i] = new PDelay(i);
161	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
167	>	new DelayQueue<PDelay>(Arrays.asList(a));
168		shouldThrow();
169		} catch (NullPointerException success) {}
170		}
#	Line 167 | Line 173 | public class DelayQueueTest extends JSR1
173		* Queue contains all elements of collection used to initialize
174		*/
175		public void testConstructor6() {
176	<	PDelay[] ints = new PDelay[SIZE];
176	>	PDelay[] items = new PDelay[SIZE];
177		for (int i = 0; i < SIZE; ++i)
178	<	ints[i] = new PDelay(i);
179	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
178	>	items[i] = new PDelay(i);
179	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>(Arrays.asList(items));
180		for (int i = 0; i < SIZE; ++i)
181	<	assertEquals(ints[i], q.poll());
181	>	mustEqual(items[i], q.poll());
182		}
183
184		/**
185		* isEmpty is true before add, false after
186		*/
187		public void testEmpty() {
188	<	DelayQueue q = new DelayQueue();
188	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
189		assertTrue(q.isEmpty());
190	<	assertEquals(NOCAP, q.remainingCapacity());
190	>	mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
191		q.add(new PDelay(1));
192		assertFalse(q.isEmpty());
193		q.add(new PDelay(2));
#	Line 191 | Line 197 | public class DelayQueueTest extends JSR1
197		}
198
199		/**
200	<	* remainingCapacity does not change when elements added or removed,
195	<	* but size does
200	>	* remainingCapacity() always returns Integer.MAX_VALUE
201		*/
202		public void testRemainingCapacity() {
203	<	DelayQueue q = populatedQueue(SIZE);
203	>	BlockingQueue<PDelay> 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	>	mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
206	>	mustEqual(SIZE - i, q.size());
207	>	assertTrue(q.remove() instanceof PDelay);
208		}
209		for (int i = 0; i < SIZE; ++i) {
210	<	assertEquals(NOCAP, q.remainingCapacity());
211	<	assertEquals(i, q.size());
212	<	q.add(new PDelay(i));
210	>	mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
211	>	mustEqual(i, q.size());
212	>	assertTrue(q.add(new PDelay(i)));
213		}
214		}
215
216		/**
212	–	* offer(null) throws NPE
213	–	*/
214	–	public void testOfferNull() {
215	–	try {
216	–	DelayQueue q = new DelayQueue();
217	–	q.offer(null);
218	–	shouldThrow();
219	–	} catch (NullPointerException success) {}
220	–	}
221	–
222	–	/**
223	–	* add(null) throws NPE
224	–	*/
225	–	public void testAddNull() {
226	–	try {
227	–	DelayQueue q = new DelayQueue();
228	–	q.add(null);
229	–	shouldThrow();
230	–	} catch (NullPointerException success) {}
231	–	}
232	–
233	–	/**
217		* offer non-null succeeds
218		*/
219		public void testOffer() {
220	<	DelayQueue q = new DelayQueue();
220	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
221		assertTrue(q.offer(new PDelay(0)));
222		assertTrue(q.offer(new PDelay(1)));
223		}
#	Line 243 | Line 226 | public class DelayQueueTest extends JSR1
226		* add succeeds
227		*/
228		public void testAdd() {
229	<	DelayQueue q = new DelayQueue();
229	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
230		for (int i = 0; i < SIZE; ++i) {
231	<	assertEquals(i, q.size());
231	>	mustEqual(i, q.size());
232		assertTrue(q.add(new PDelay(i)));
233		}
234		}
235
236		/**
237	<	* addAll(null) throws NPE
255	<	*/
256	<	public void testAddAll1() {
257	<	try {
258	<	DelayQueue q = new DelayQueue();
259	<	q.addAll(null);
260	<	shouldThrow();
261	<	} catch (NullPointerException success) {}
262	<	}
263	<
264	<
265	<	/**
266	<	* addAll(this) throws IAE
237	>	* addAll(this) throws IllegalArgumentException
238		*/
239		public void testAddAllSelf() {
240	+	DelayQueue<PDelay> q = populatedQueue(SIZE);
241		try {
270	–	DelayQueue q = populatedQueue(SIZE);
242		q.addAll(q);
243		shouldThrow();
244		} catch (IllegalArgumentException success) {}
245		}
246
247		/**
277	–	* addAll of a collection with null elements throws NPE
278	–	*/
279	–	public void testAddAll2() {
280	–	try {
281	–	DelayQueue q = new DelayQueue();
282	–	PDelay[] ints = new PDelay[SIZE];
283	–	q.addAll(Arrays.asList(ints));
284	–	shouldThrow();
285	–	} catch (NullPointerException success) {}
286	–	}
287	–
288	–	/**
248		* addAll of a collection with any null elements throws NPE after
249		* possibly adding some elements
250		*/
251		public void testAddAll3() {
252	+	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
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();
295	<	PDelay[] ints = new PDelay[SIZE];
296	<	for (int i = 0; i < SIZE-1; ++i)
297	<	ints[i] = new PDelay(i);
298	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(a));
258		shouldThrow();
259		} catch (NullPointerException success) {}
260		}
#	Line 305 | Line 264 | public class DelayQueueTest extends JSR1
264		*/
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)
269	<	ints[i] = new PDelay(i);
270	<	DelayQueue q = new DelayQueue();
267	>	PDelay[] items = new PDelay[SIZE];
268	>	for (int i = SIZE - 1; i >= 0; --i)
269	>	items[i] = new PDelay(i);
270	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
271		assertFalse(q.addAll(Arrays.asList(empty)));
272	<	assertTrue(q.addAll(Arrays.asList(ints)));
272	>	assertTrue(q.addAll(Arrays.asList(items)));
273		for (int i = 0; i < SIZE; ++i)
274	<	assertEquals(ints[i], q.poll());
274	>	mustEqual(items[i], q.poll());
275		}
276
277		/**
319	–	* put(null) throws NPE
320	–	*/
321	–	public void testPutNull() {
322	–	try {
323	–	DelayQueue q = new DelayQueue();
324	–	q.put(null);
325	–	shouldThrow();
326	–	} catch (NullPointerException success) {}
327	–	}
328	–
329	–	/**
278		* all elements successfully put are contained
279		*/
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));
286	<	}
287	<	assertEquals(SIZE, q.size());
280	>	public void testPut() {
281	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
282	>	for (int i = 0; i < SIZE; ++i) {
283	>	PDelay x = new PDelay(i);
284	>	q.put(x);
285	>	assertTrue(q.contains(x));
286	>	}
287	>	mustEqual(SIZE, q.size());
288		}
289
290		/**
291		* put doesn't block waiting for take
292		*/
293		public void testPutWithTake() throws InterruptedException {
294	<	final DelayQueue q = new DelayQueue();
295	<	Thread t = new Thread(new CheckedRunnable() {
294	>	final DelayQueue<PDelay> q = new DelayQueue<PDelay>();
295	>	Thread t = newStartedThread(new CheckedRunnable() {
296		public void realRun() {
297		q.put(new PDelay(0));
298		q.put(new PDelay(0));
#	Line 352 | Line 300 | public class DelayQueueTest extends JSR1
300		q.put(new PDelay(0));
301		}});
302
303	<	t.start();
304	<	Thread.sleep(SHORT_DELAY_MS);
357	<	q.take();
358	<	t.interrupt();
359	<	t.join();
303	>	awaitTermination(t);
304	>	mustEqual(4, q.size());
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();
312	<	Thread t = new Thread(new CheckedRunnable() {
311	>	final DelayQueue<PDelay> q = new DelayQueue<PDelay>();
312	>	Thread t = newStartedThread(new CheckedRunnable() {
313		public void realRun() throws InterruptedException {
314		q.put(new PDelay(0));
315		q.put(new PDelay(0));
#	Line 372 | Line 317 | public class DelayQueueTest extends JSR1
317		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
318		}});
319
320	<	t.start();
376	<	Thread.sleep(SMALL_DELAY_MS);
377	<	t.interrupt();
378	<	t.join();
320	>	awaitTermination(t);
321		}
322
323		/**
324		* take retrieves elements in priority order
325		*/
326		public void testTake() throws InterruptedException {
327	<	DelayQueue q = populatedQueue(SIZE);
327	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
328		for (int i = 0; i < SIZE; ++i) {
329	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
329	>	mustEqual(new PDelay(i), q.take());
330		}
331		}
332
333		/**
334	<	* take blocks interruptibly when empty
334	>	* Take removes existing elements until empty, then blocks interruptibly
335		*/
336	<	public void testTakeFromEmptyBlocksInterruptibly()
337	<	throws InterruptedException {
338	<	final BlockingQueue q = new DelayQueue();
397	<	final CountDownLatch threadStarted = new CountDownLatch(1);
336	>	public void testBlockingTake() throws InterruptedException {
337	>	final DelayQueue<PDelay> q = populatedQueue(SIZE);
338	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
339		Thread t = newStartedThread(new CheckedRunnable() {
340	<	public void realRun() {
341	<	long t0 = System.nanoTime();
342	<	threadStarted.countDown();
340	>	public void realRun() throws InterruptedException {
341	>	for (int i = 0; i < SIZE; i++)
342	>	mustEqual(new PDelay(i), q.take());
343	>
344	>	Thread.currentThread().interrupt();
345		try {
346		q.take();
347		shouldThrow();
348	<	} catch (InterruptedException expected) {}
349	<	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
407	<	}});
408	<	threadStarted.await();
409	<	Thread.sleep(SHORT_DELAY_MS);
410	<	assertTrue(t.isAlive());
411	<	t.interrupt();
412	<	awaitTermination(t, MEDIUM_DELAY_MS);
413	<	assertFalse(t.isAlive());
414	<	}
348	>	} catch (InterruptedException success) {}
349	>	assertFalse(Thread.interrupted());
350
351	<	/**
417	<	* Take removes existing elements until empty, then blocks interruptibly
418	<	*/
419	<	public void testBlockingTake() throws InterruptedException {
420	<	final DelayQueue q = populatedQueue(SIZE);
421	<	Thread t = new Thread(new CheckedRunnable() {
422	<	public void realRun() throws InterruptedException {
423	<	for (int i = 0; i < SIZE; ++i) {
424	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
425	<	}
351	>	pleaseInterrupt.countDown();
352		try {
353		q.take();
354		shouldThrow();
355		} catch (InterruptedException success) {}
356	+	assertFalse(Thread.interrupted());
357		}});
358
359	<	t.start();
360	<	Thread.sleep(SHORT_DELAY_MS);
359	>	await(pleaseInterrupt);
360	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
361		t.interrupt();
362	<	t.join();
362	>	awaitTermination(t);
363		}
364
438	–
365		/**
366		* poll succeeds unless empty
367		*/
368		public void testPoll() {
369	<	DelayQueue q = populatedQueue(SIZE);
369	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
370		for (int i = 0; i < SIZE; ++i) {
371	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
371	>	mustEqual(new PDelay(i), q.poll());
372		}
373		assertNull(q.poll());
374		}
#	Line 451 | Line 377 | public class DelayQueueTest extends JSR1
377		* timed poll with zero timeout succeeds when non-empty, else times out
378		*/
379		public void testTimedPoll0() throws InterruptedException {
380	<	DelayQueue q = populatedQueue(SIZE);
380	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
381		for (int i = 0; i < SIZE; ++i) {
382	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
382	>	mustEqual(new PDelay(i), q.poll(0, MILLISECONDS));
383		}
384		assertNull(q.poll(0, MILLISECONDS));
385		}
#	Line 462 | Line 388 | public class DelayQueueTest extends JSR1
388		* timed poll with nonzero timeout succeeds when non-empty, else times out
389		*/
390		public void testTimedPoll() throws InterruptedException {
391	<	DelayQueue q = populatedQueue(SIZE);
391	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
392		for (int i = 0; i < SIZE; ++i) {
393	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
394	<	}
395	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
393	>	long startTime = System.nanoTime();
394	>	mustEqual(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
395	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
396	>	}
397	>	long startTime = System.nanoTime();
398	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
399	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
400	>	checkEmpty(q);
401		}
402
403		/**
#	Line 474 | Line 405 | public class DelayQueueTest extends JSR1
405		* returning timeout status
406		*/
407		public void testInterruptedTimedPoll() throws InterruptedException {
408	<	Thread t = new Thread(new CheckedRunnable() {
409	<	public void realRun() throws InterruptedException {
410	<	DelayQueue q = populatedQueue(SIZE);
480	<	for (int i = 0; i < SIZE; ++i) {
481	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
482	<	}
483	<	try {
484	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
485	<	shouldThrow();
486	<	} catch (InterruptedException success) {}
487	<	}});
488	<
489	<	t.start();
490	<	Thread.sleep(SHORT_DELAY_MS);
491	<	t.interrupt();
492	<	t.join();
493	<	}
494	<
495	<	/**
496	<	* timed poll before a delayed offer fails; after offer succeeds;
497	<	* on interruption throws
498	<	*/
499	<	public void testTimedPollWithOffer() throws InterruptedException {
500	<	final DelayQueue q = new DelayQueue();
501	<	final PDelay pdelay = new PDelay(0);
502	<	final CheckedBarrier barrier = new CheckedBarrier(2);
503	<	Thread t = new Thread(new CheckedRunnable() {
408	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
409	>	final DelayQueue<PDelay> q = populatedQueue(SIZE);
410	>	Thread t = newStartedThread(new CheckedRunnable() {
411		public void realRun() throws InterruptedException {
412	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
413	<
414	<	barrier.await();
508	<	assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
412	>	for (int i = 0; i < SIZE; i++)
413	>	mustEqual(new PDelay(i),
414	>	q.poll(LONG_DELAY_MS, MILLISECONDS));
415
416		Thread.currentThread().interrupt();
417		try {
418	<	q.poll(SHORT_DELAY_MS, MILLISECONDS);
418	>	q.poll(randomTimeout(), randomTimeUnit());
419		shouldThrow();
420		} catch (InterruptedException success) {}
421	+	assertFalse(Thread.interrupted());
422
423	<	barrier.await();
423	>	pleaseInterrupt.countDown();
424		try {
425	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
425	>	q.poll(LONGER_DELAY_MS, MILLISECONDS);
426		shouldThrow();
427		} catch (InterruptedException success) {}
428	+	assertFalse(Thread.interrupted());
429		}});
430
431	<	t.start();
432	<	barrier.await();
525	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
526	<	barrier.await();
527	<	sleep(SHORT_DELAY_MS);
431	>	await(pleaseInterrupt);
432	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
433		t.interrupt();
434	<	t.join();
434	>	awaitTermination(t);
435	>	checkEmpty(q);
436		}
437
532	–
438		/**
439		* peek returns next element, or null if empty
440		*/
441		public void testPeek() {
442	<	DelayQueue q = populatedQueue(SIZE);
442	>	DelayQueue<PDelay> 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	>	mustEqual(new PDelay(i), q.peek());
445	>	mustEqual(new PDelay(i), q.poll());
446		if (q.isEmpty())
447		assertNull(q.peek());
448		else
#	Line 550 | Line 455 | public class DelayQueueTest extends JSR1
455		* element returns next element, or throws NSEE if empty
456		*/
457		public void testElement() {
458	<	DelayQueue q = populatedQueue(SIZE);
458	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
459		for (int i = 0; i < SIZE; ++i) {
460	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
460	>	mustEqual(new PDelay(i), q.element());
461		q.poll();
462		}
463		try {
#	Line 565 | Line 470 | public class DelayQueueTest extends JSR1
470		* remove removes next element, or throws NSEE if empty
471		*/
472		public void testRemove() {
473	<	DelayQueue q = populatedQueue(SIZE);
473	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
474		for (int i = 0; i < SIZE; ++i) {
475	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
475	>	mustEqual(new PDelay(i), q.remove());
476		}
477		try {
478		q.remove();
#	Line 576 | Line 481 | public class DelayQueueTest extends JSR1
481		}
482
483		/**
579	–	* remove(x) removes x and returns true if present
580	–	*/
581	–	public void testRemoveElement() {
582	–	DelayQueue q = populatedQueue(SIZE);
583	–	for (int i = 1; i < SIZE; i+=2) {
584	–	assertTrue(q.remove(new PDelay(i)));
585	–	}
586	–	for (int i = 0; i < SIZE; i+=2) {
587	–	assertTrue(q.remove(new PDelay(i)));
588	–	assertFalse(q.remove(new PDelay(i+1)));
589	–	}
590	–	assertTrue(q.isEmpty());
591	–	}
592	–
593	–	/**
484		* contains(x) reports true when elements added but not yet removed
485		*/
486		public void testContains() {
487	<	DelayQueue q = populatedQueue(SIZE);
487	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
488		for (int i = 0; i < SIZE; ++i) {
489		assertTrue(q.contains(new PDelay(i)));
490		q.poll();
#	Line 606 | Line 496 | public class DelayQueueTest extends JSR1
496		* clear removes all elements
497		*/
498		public void testClear() {
499	<	DelayQueue q = populatedQueue(SIZE);
499	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
500		q.clear();
501		assertTrue(q.isEmpty());
502	<	assertEquals(0, q.size());
503	<	assertEquals(NOCAP, q.remainingCapacity());
502	>	mustEqual(0, q.size());
503	>	mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
504		PDelay x = new PDelay(1);
505		q.add(x);
506		assertFalse(q.isEmpty());
#	Line 623 | Line 513 | public class DelayQueueTest extends JSR1
513		* containsAll(c) is true when c contains a subset of elements
514		*/
515		public void testContainsAll() {
516	<	DelayQueue q = populatedQueue(SIZE);
517	<	DelayQueue p = new DelayQueue();
516	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
517	>	DelayQueue<PDelay> p = new DelayQueue<PDelay>();
518		for (int i = 0; i < SIZE; ++i) {
519		assertTrue(q.containsAll(p));
520		assertFalse(p.containsAll(q));
#	Line 637 | Line 527 | public class DelayQueueTest extends JSR1
527		* retainAll(c) retains only those elements of c and reports true if changed
528		*/
529		public void testRetainAll() {
530	<	DelayQueue q = populatedQueue(SIZE);
531	<	DelayQueue p = populatedQueue(SIZE);
530	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
531	>	DelayQueue<PDelay> p = populatedQueue(SIZE);
532		for (int i = 0; i < SIZE; ++i) {
533		boolean changed = q.retainAll(p);
534		if (i == 0)
#	Line 647 | Line 537 | public class DelayQueueTest extends JSR1
537		assertTrue(changed);
538
539		assertTrue(q.containsAll(p));
540	<	assertEquals(SIZE-i, q.size());
540	>	mustEqual(SIZE - i, q.size());
541		p.remove();
542		}
543		}
#	Line 657 | Line 547 | public class DelayQueueTest extends JSR1
547		*/
548		public void testRemoveAll() {
549		for (int i = 1; i < SIZE; ++i) {
550	<	DelayQueue q = populatedQueue(SIZE);
551	<	DelayQueue p = populatedQueue(i);
550	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
551	>	DelayQueue<PDelay> p = populatedQueue(i);
552		assertTrue(q.removeAll(p));
553	<	assertEquals(SIZE-i, q.size());
553	>	mustEqual(SIZE - i, q.size());
554		for (int j = 0; j < i; ++j) {
555	<	PDelay I = (PDelay)(p.remove());
666	<	assertFalse(q.contains(I));
555	>	assertFalse(q.contains(p.remove()));
556		}
557		}
558		}
#	Line 672 | Line 561 | public class DelayQueueTest extends JSR1
561		* toArray contains all elements
562		*/
563		public void testToArray() throws InterruptedException {
564	<	DelayQueue q = populatedQueue(SIZE);
565	<	Object[] o = q.toArray();
566	<	Arrays.sort(o);
567	<	for (int i = 0; i < o.length; i++)
568	<	assertEquals(o[i], q.take());
564	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
565	>	Object[] a = q.toArray();
566	>	assertSame(Object[].class, a.getClass());
567	>	Arrays.sort(a);
568	>	for (Object o : a)
569	>	assertSame(o, q.take());
570	>	assertTrue(q.isEmpty());
571		}
572
573		/**
574		* toArray(a) contains all elements
575		*/
576	<	public void testToArray2() throws InterruptedException {
577	<	DelayQueue q = populatedQueue(SIZE);
578	<	PDelay[] ints = new PDelay[SIZE];
579	<	ints = (PDelay[])q.toArray(ints);
580	<	Arrays.sort(ints);
581	<	for (int i = 0; i < ints.length; i++)
582	<	assertEquals(ints[i], q.take());
583	<	}
584	<
694	<
695	<	/**
696	<	* toArray(null) throws NPE
697	<	*/
698	<	public void testToArray_BadArg() {
699	<	DelayQueue q = populatedQueue(SIZE);
700	<	try {
701	<	Object o[] = q.toArray(null);
702	<	shouldThrow();
703	<	} catch (NullPointerException success) {}
576	>	public void testToArray2() {
577	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
578	>	PDelay[] items = new PDelay[SIZE];
579	>	PDelay[] array = q.toArray(items);
580	>	assertSame(items, array);
581	>	Arrays.sort(items);
582	>	for (PDelay o : items)
583	>	assertSame(o, q.remove());
584	>	assertTrue(q.isEmpty());
585		}
586
587		/**
588	<	* toArray with incompatible array type throws CCE
588	>	* toArray(incompatible array type) throws ArrayStoreException
589		*/
590		public void testToArray1_BadArg() {
591	<	DelayQueue q = populatedQueue(SIZE);
591	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
592		try {
593	<	Object o[] = q.toArray(new String[10]);
593	>	q.toArray(new String[10]);
594		shouldThrow();
595		} catch (ArrayStoreException success) {}
596		}
#	Line 718 | Line 599 | public class DelayQueueTest extends JSR1
599		* iterator iterates through all elements
600		*/
601		public void testIterator() {
602	<	DelayQueue q = populatedQueue(SIZE);
602	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
603		int i = 0;
604	<	Iterator it = q.iterator();
604	>	Iterator<PDelay> it = q.iterator();
605		while (it.hasNext()) {
606		assertTrue(q.contains(it.next()));
607		++i;
608		}
609	<	assertEquals(i, SIZE);
609	>	mustEqual(i, SIZE);
610	>	assertIteratorExhausted(it);
611	>	}
612	>
613	>	/**
614	>	* iterator of empty collection has no elements
615	>	*/
616	>	public void testEmptyIterator() {
617	>	assertIteratorExhausted(new DelayQueue<PDelay>().iterator());
618		}
619
620		/**
621		* iterator.remove removes current element
622		*/
623		public void testIteratorRemove() {
624	<	final DelayQueue q = new DelayQueue();
624	>	final DelayQueue<PDelay> q = new DelayQueue<PDelay>();
625		q.add(new PDelay(2));
626		q.add(new PDelay(1));
627		q.add(new PDelay(3));
628	<	Iterator it = q.iterator();
628	>	Iterator<PDelay> it = q.iterator();
629		it.next();
630		it.remove();
631		it = q.iterator();
632	<	assertEquals(it.next(), new PDelay(2));
633	<	assertEquals(it.next(), new PDelay(3));
632	>	mustEqual(new PDelay(2), it.next());
633	>	mustEqual(new PDelay(3), it.next());
634		assertFalse(it.hasNext());
635		}
636
748	–
637		/**
638		* toString contains toStrings of elements
639		*/
640		public void testToString() {
641	<	DelayQueue q = populatedQueue(SIZE);
641	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
642		String s = q.toString();
643	<	for (int i = 0; i < SIZE; ++i) {
644	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
757	<	}
643	>	for (Object e : q)
644	>	assertTrue(s.contains(e.toString()));
645		}
646
647		/**
648	<	* offer transfers elements across Executor tasks
648	>	* timed poll transfers elements across Executor tasks
649		*/
650		public void testPollInExecutor() {
651	<	final DelayQueue q = new DelayQueue();
652	<	ExecutorService executor = Executors.newFixedThreadPool(2);
653	<	executor.execute(new CheckedRunnable() {
654	<	public void realRun() throws InterruptedException {
655	<	assertNull(q.poll());
656	<	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
657	<	assertTrue(q.isEmpty());
658	<	}});
659	<
660	<	executor.execute(new CheckedRunnable() {
661	<	public void realRun() throws InterruptedException {
662	<	Thread.sleep(SHORT_DELAY_MS);
663	<	q.put(new PDelay(1));
664	<	}});
665	<
666	<	joinPool(executor);
651	>	final DelayQueue<PDelay> q = new DelayQueue<PDelay>();
652	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
653	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
654	>	try (PoolCleaner cleaner = cleaner(executor)) {
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		}
670
782	–
671		/**
672		* Delayed actions do not occur until their delay elapses
673		*/
674		public void testDelay() throws InterruptedException {
675	<	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
675	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
676		for (int i = 0; i < SIZE; ++i)
677		q.add(new NanoDelay(1000000L * (SIZE - i)));
678
#	Line 804 | Line 692 | public class DelayQueueTest extends JSR1
692		* peek of a non-empty queue returns non-null even if not expired
693		*/
694		public void testPeekDelayed() {
695	<	DelayQueue q = new DelayQueue();
695	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
696		q.add(new NanoDelay(Long.MAX_VALUE));
697		assertNotNull(q.peek());
698		}
699
812	–
700		/**
701		* poll of a non-empty queue returns null if no expired elements.
702		*/
703		public void testPollDelayed() {
704	<	DelayQueue q = new DelayQueue();
704	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
705		q.add(new NanoDelay(Long.MAX_VALUE));
706		assertNull(q.poll());
707		}
#	Line 823 | Line 710 | public class DelayQueueTest extends JSR1
710		* timed poll of a non-empty queue returns null if no expired elements.
711		*/
712		public void testTimedPollDelayed() throws InterruptedException {
713	<	DelayQueue q = new DelayQueue();
713	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
714		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
715	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
716	<	}
717	<
831	<	/**
832	<	* drainTo(null) throws NPE
833	<	*/
834	<	public void testDrainToNull() {
835	<	DelayQueue q = populatedQueue(SIZE);
836	<	try {
837	<	q.drainTo(null);
838	<	shouldThrow();
839	<	} catch (NullPointerException success) {}
840	<	}
841	<
842	<	/**
843	<	* drainTo(this) throws IAE
844	<	*/
845	<	public void testDrainToSelf() {
846	<	DelayQueue q = populatedQueue(SIZE);
847	<	try {
848	<	q.drainTo(q);
849	<	shouldThrow();
850	<	} catch (IllegalArgumentException success) {}
715	>	long startTime = System.nanoTime();
716	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
717	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
718		}
719
720		/**
721		* drainTo(c) empties queue into another collection c
722		*/
723		public void testDrainTo() {
724	<	DelayQueue q = new DelayQueue();
724	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
725		PDelay[] elems = new PDelay[SIZE];
726		for (int i = 0; i < SIZE; ++i) {
727		elems[i] = new PDelay(i);
728		q.add(elems[i]);
729		}
730	<	ArrayList l = new ArrayList();
730	>	ArrayList<PDelay> l = new ArrayList<PDelay>();
731		q.drainTo(l);
732	<	assertEquals(q.size(), 0);
732	>	mustEqual(0, q.size());
733		for (int i = 0; i < SIZE; ++i)
734	<	assertEquals(l.get(i), elems[i]);
734	>	mustEqual(elems[i], l.get(i));
735		q.add(elems[0]);
736		q.add(elems[1]);
737		assertFalse(q.isEmpty());
#	Line 872 | Line 739 | public class DelayQueueTest extends JSR1
739		assertTrue(q.contains(elems[1]));
740		l.clear();
741		q.drainTo(l);
742	<	assertEquals(q.size(), 0);
743	<	assertEquals(l.size(), 2);
742	>	mustEqual(0, q.size());
743	>	mustEqual(2, l.size());
744		for (int i = 0; i < 2; ++i)
745	<	assertEquals(l.get(i), elems[i]);
745	>	mustEqual(elems[i], l.get(i));
746		}
747
748		/**
749		* drainTo empties queue
750		*/
751		public void testDrainToWithActivePut() throws InterruptedException {
752	<	final DelayQueue q = populatedQueue(SIZE);
752	>	final DelayQueue<PDelay> q = populatedQueue(SIZE);
753		Thread t = new Thread(new CheckedRunnable() {
754		public void realRun() {
755	<	q.put(new PDelay(SIZE+1));
755	>	q.put(new PDelay(SIZE + 1));
756		}});
757
758		t.start();
759	<	ArrayList l = new ArrayList();
759	>	ArrayList<PDelay> l = new ArrayList<PDelay>();
760		q.drainTo(l);
761		assertTrue(l.size() >= SIZE);
762		t.join();
#	Line 897 | Line 764 | public class DelayQueueTest extends JSR1
764		}
765
766		/**
900	–	* drainTo(null, n) throws NPE
901	–	*/
902	–	public void testDrainToNullN() {
903	–	DelayQueue q = populatedQueue(SIZE);
904	–	try {
905	–	q.drainTo(null, 0);
906	–	shouldThrow();
907	–	} catch (NullPointerException success) {}
908	–	}
909	–
910	–	/**
911	–	* drainTo(this, n) throws IAE
912	–	*/
913	–	public void testDrainToSelfN() {
914	–	DelayQueue q = populatedQueue(SIZE);
915	–	try {
916	–	q.drainTo(q, 0);
917	–	shouldThrow();
918	–	} catch (IllegalArgumentException success) {}
919	–	}
920	–
921	–	/**
767		* drainTo(c, n) empties first min(n, size) elements of queue into c
768		*/
769		public void testDrainToN() {
770		for (int i = 0; i < SIZE + 2; ++i) {
771	<	DelayQueue q = populatedQueue(SIZE);
772	<	ArrayList l = new ArrayList();
771	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
772	>	ArrayList<PDelay> l = new ArrayList<PDelay>();
773		q.drainTo(l, i);
774		int k = (i < SIZE) ? i : SIZE;
775	<	assertEquals(q.size(), SIZE-k);
776	<	assertEquals(l.size(), k);
775	>	mustEqual(SIZE - k, q.size());
776	>	mustEqual(k, l.size());
777		}
778		}
779
780	<
780	>	/**
781	>	* remove(null), contains(null) always return false
782	>	*/
783	>	public void testNeverContainsNull() {
784	>	Collection<?> q = populatedQueue(SIZE);
785	>	assertFalse(q.contains(null));
786	>	assertFalse(q.remove(null));
787	>	}
788		}

Diff Legend

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