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.30 by jsr166, Wed Dec 23 00:47:16 2009 UTC vs.
Revision 1.96 by jsr166, Wed Jan 27 02:55:18 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);
67	<	}
48	<	public boolean equals(PDelay other) {
49	<	return other.pseudodelay == pseudodelay;
66	>	return (other instanceof PDelay) &&
67	>	this.pseudodelay == ((PDelay)other).pseudodelay;
68		}
69	<
70	<
69	>	// suppress [overrides] javac warning
70	>	public int hashCode() { return pseudodelay; }
71		public long getDelay(TimeUnit ignore) {
72	<	return pseudodelay;
55	<	}
56	<	public int intValue() {
57	<	return pseudodelay;
72	>	return (long) Integer.MIN_VALUE + pseudodelay;
73		}
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<>(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<>();
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<>();
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<>();
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	–	/**
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<>();
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();
294	<	PDelay[] ints = new PDelay[SIZE];
295	<	for (int i = 0; i < SIZE-1; ++i)
296	<	ints[i] = new PDelay(i);
297	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(a));
258		shouldThrow();
259		} catch (NullPointerException success) {}
260		}
#	Line 304 | 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<>();
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		/**
318	–	* put(null) throws NPE
319	–	*/
320	–	public void testPutNull() {
321	–	try {
322	–	DelayQueue q = new DelayQueue();
323	–	q.put(null);
324	–	shouldThrow();
325	–	} catch (NullPointerException success) {}
326	–	}
327	–
328	–	/**
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<>();
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<>();
295	>	Thread t = newStartedThread(new CheckedRunnable() {
296		public void realRun() {
297		q.put(new PDelay(0));
298		q.put(new PDelay(0));
#	Line 351 | Line 300 | public class DelayQueueTest extends JSR1
300		q.put(new PDelay(0));
301		}});
302
303	<	t.start();
304	<	Thread.sleep(SHORT_DELAY_MS);
356	<	q.take();
357	<	t.interrupt();
358	<	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<>();
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 371 | Line 317 | public class DelayQueueTest extends JSR1
317		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
318		}});
319
320	<	t.start();
375	<	Thread.sleep(SMALL_DELAY_MS);
376	<	t.interrupt();
377	<	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		/**
391	–	* take blocks interruptibly when empty
392	–	*/
393	–	public void testTakeFromEmpty() throws InterruptedException {
394	–	final DelayQueue q = new DelayQueue();
395	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
396	–	public void realRun() throws InterruptedException {
397	–	q.take();
398	–	}};
399	–
400	–	t.start();
401	–	Thread.sleep(SHORT_DELAY_MS);
402	–	t.interrupt();
403	–	t.join();
404	–	}
405	–
406	–	/**
334		* Take removes existing elements until empty, then blocks interruptibly
335		*/
336		public void testBlockingTake() throws InterruptedException {
337	<	final DelayQueue q = populatedQueue(SIZE);
338	<	Thread t = new Thread(new CheckedRunnable() {
337	>	final DelayQueue<PDelay> q = populatedQueue(SIZE);
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) {
342	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
343	<	}
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 success) {}
349	>	assertFalse(Thread.interrupted());
350	>
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
428	–
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		}
375
376		/**
377	<	* timed pool with zero timeout succeeds when non-empty, else times out
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		}
386
387		/**
388	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
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 464 | 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() {
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	<	DelayQueue q = populatedQueue(SIZE);
413	<	for (int i = 0; i < SIZE; ++i) {
414	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
415	<	}
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(SMALL_DELAY_MS, MILLISECONDS);
418	>	q.poll(randomTimeout(), randomTimeUnit());
419		shouldThrow();
420		} catch (InterruptedException success) {}
421	<	}});
421	>	assertFalse(Thread.interrupted());
422
423	<	t.start();
480	<	Thread.sleep(SHORT_DELAY_MS);
481	<	t.interrupt();
482	<	t.join();
483	<	}
484	<
485	<	/**
486	<	*  timed poll before a delayed offer fails; after offer succeeds;
487	<	*  on interruption throws
488	<	*/
489	<	public void testTimedPollWithOffer() throws InterruptedException {
490	<	final DelayQueue q = new DelayQueue();
491	<	final PDelay pdelay = new PDelay(0);
492	<	Thread t = new Thread(new CheckedRunnable() {
493	<	public void realRun() throws InterruptedException {
494	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
495	<	assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
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	<	t.start();
432	<	Thread.sleep(SMALL_DELAY_MS);
504	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
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
509	–
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 527 | 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 542 | 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 553 | Line 481 | public class DelayQueueTest extends JSR1
481		}
482
483		/**
556	–	* remove(x) removes x and returns true if present
557	–	*/
558	–	public void testRemoveElement() {
559	–	DelayQueue q = populatedQueue(SIZE);
560	–	for (int i = 1; i < SIZE; i+=2) {
561	–	assertTrue(q.remove(new PDelay(i)));
562	–	}
563	–	for (int i = 0; i < SIZE; i+=2) {
564	–	assertTrue(q.remove(new PDelay(i)));
565	–	assertFalse(q.remove(new PDelay(i+1)));
566	–	}
567	–	assertTrue(q.isEmpty());
568	–	}
569	–
570	–	/**
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 583 | 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 600 | 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<>();
518		for (int i = 0; i < SIZE; ++i) {
519		assertTrue(q.containsAll(p));
520		assertFalse(p.containsAll(q));
#	Line 614 | 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 624 | 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 634 | 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());
643	<	assertFalse(q.contains(I));
555	>	assertFalse(q.contains(p.remove()));
556		}
557		}
558		}
#	Line 649 | 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	<
671	<
672	<	/**
673	<	* toArray(null) throws NPE
674	<	*/
675	<	public void testToArray_BadArg() {
676	<	DelayQueue q = populatedQueue(SIZE);
677	<	try {
678	<	Object o[] = q.toArray(null);
679	<	shouldThrow();
680	<	} 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);
590	>	@SuppressWarnings("CollectionToArraySafeParameter")
591	>	public void testToArray_incompatibleArrayType() {
592	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
593		try {
594	<	Object o[] = q.toArray(new String[10]);
594	>	q.toArray(new String[10]);
595		shouldThrow();
596		} catch (ArrayStoreException success) {}
597		}
#	Line 695 | Line 600 | public class DelayQueueTest extends JSR1
600		* iterator iterates through all elements
601		*/
602		public void testIterator() {
603	<	DelayQueue q = populatedQueue(SIZE);
603	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
604		int i = 0;
605	<	Iterator it = q.iterator();
605	>	Iterator<PDelay> it = q.iterator();
606		while (it.hasNext()) {
607		assertTrue(q.contains(it.next()));
608		++i;
609		}
610	<	assertEquals(i, SIZE);
610	>	mustEqual(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<PDelay>().iterator());
619		}
620
621		/**
622		* iterator.remove removes current element
623		*/
624	<	public void testIteratorRemove () {
625	<	final DelayQueue q = new DelayQueue();
624	>	public void testIteratorRemove() {
625	>	final DelayQueue<PDelay> q = new DelayQueue<>();
626		q.add(new PDelay(2));
627		q.add(new PDelay(1));
628		q.add(new PDelay(3));
629	<	Iterator it = q.iterator();
629	>	Iterator<PDelay> it = q.iterator();
630		it.next();
631		it.remove();
632		it = q.iterator();
633	<	assertEquals(it.next(), new PDelay(2));
634	<	assertEquals(it.next(), new PDelay(3));
633	>	mustEqual(new PDelay(2), it.next());
634	>	mustEqual(new PDelay(3), it.next());
635		assertFalse(it.hasNext());
636		}
637
725	–
638		/**
639		* toString contains toStrings of elements
640		*/
641		public void testToString() {
642	<	DelayQueue q = populatedQueue(SIZE);
642	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
643		String s = q.toString();
644	<	for (int i = 0; i < SIZE; ++i) {
645	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
734	<	}
644	>	for (Object e : q)
645	>	assertTrue(s.contains(e.toString()));
646		}
647
648		/**
649	<	* offer transfers elements across Executor tasks
649	>	* timed poll transfers elements across Executor tasks
650		*/
651		public void testPollInExecutor() {
652	<	final DelayQueue q = new DelayQueue();
653	<	ExecutorService executor = Executors.newFixedThreadPool(2);
654	<	executor.execute(new CheckedRunnable() {
655	<	public void realRun() throws InterruptedException {
656	<	assertNull(q.poll());
657	<	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
658	<	assertTrue(q.isEmpty());
659	<	}});
660	<
661	<	executor.execute(new CheckedRunnable() {
662	<	public void realRun() throws InterruptedException {
663	<	Thread.sleep(SHORT_DELAY_MS);
664	<	q.put(new PDelay(1));
665	<	}});
666	<
667	<	joinPool(executor);
652	>	final DelayQueue<PDelay> q = new DelayQueue<>();
653	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
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
759	–
672		/**
673		* Delayed actions do not occur until their delay elapses
674		*/
675		public void testDelay() throws InterruptedException {
676	<	DelayQueue q = new DelayQueue();
677	<	NanoDelay[] elements = new NanoDelay[SIZE];
678	<	for (int i = 0; i < SIZE; ++i) {
767	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
768	<	}
769	<	for (int i = 0; i < SIZE; ++i) {
770	<	q.add(elements[i]);
771	<	}
676	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
677	>	for (int i = 0; i < SIZE; ++i)
678	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
679
680		long last = 0;
681		for (int i = 0; i < SIZE; ++i) {
682	<	NanoDelay e = (NanoDelay)(q.take());
682	>	NanoDelay e = q.take();
683		long tt = e.getTriggerTime();
684	<	assertTrue(tt <= System.nanoTime());
684	>	assertTrue(System.nanoTime() - tt >= 0);
685		if (i != 0)
686		assertTrue(tt >= last);
687		last = tt;
688		}
689	+	assertTrue(q.isEmpty());
690		}
691
692		/**
693		* peek of a non-empty queue returns non-null even if not expired
694		*/
695		public void testPeekDelayed() {
696	<	DelayQueue q = new DelayQueue();
696	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
697		q.add(new NanoDelay(Long.MAX_VALUE));
698	<	assert(q.peek() != null);
698	>	assertNotNull(q.peek());
699		}
700
793	–
701		/**
702		* poll of a non-empty queue returns null if no expired elements.
703		*/
704		public void testPollDelayed() {
705	<	DelayQueue q = new DelayQueue();
705	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
706		q.add(new NanoDelay(Long.MAX_VALUE));
707		assertNull(q.poll());
708		}
#	Line 804 | Line 711 | public class DelayQueueTest extends JSR1
711		* timed poll of a non-empty queue returns null if no expired elements.
712		*/
713		public void testTimedPollDelayed() throws InterruptedException {
714	<	DelayQueue q = new DelayQueue();
714	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
715		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
716	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
717	<	}
718	<
812	<	/**
813	<	* drainTo(null) throws NPE
814	<	*/
815	<	public void testDrainToNull() {
816	<	DelayQueue q = populatedQueue(SIZE);
817	<	try {
818	<	q.drainTo(null);
819	<	shouldThrow();
820	<	} catch (NullPointerException success) {}
821	<	}
822	<
823	<	/**
824	<	* drainTo(this) throws IAE
825	<	*/
826	<	public void testDrainToSelf() {
827	<	DelayQueue q = populatedQueue(SIZE);
828	<	try {
829	<	q.drainTo(q);
830	<	shouldThrow();
831	<	} catch (IllegalArgumentException success) {}
716	>	long startTime = System.nanoTime();
717	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
718	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
719		}
720
721		/**
722		* drainTo(c) empties queue into another collection c
723		*/
724		public void testDrainTo() {
725	<	DelayQueue q = new DelayQueue();
725	>	DelayQueue<PDelay> q = new DelayQueue<>();
726		PDelay[] elems = new PDelay[SIZE];
727		for (int i = 0; i < SIZE; ++i) {
728		elems[i] = new PDelay(i);
729		q.add(elems[i]);
730		}
731	<	ArrayList l = new ArrayList();
731	>	ArrayList<PDelay> l = new ArrayList<>();
732		q.drainTo(l);
733	<	assertEquals(q.size(), 0);
733	>	mustEqual(0, q.size());
734		for (int i = 0; i < SIZE; ++i)
735	<	assertEquals(l.get(i), elems[i]);
735	>	mustEqual(elems[i], l.get(i));
736		q.add(elems[0]);
737		q.add(elems[1]);
738		assertFalse(q.isEmpty());
#	Line 853 | Line 740 | public class DelayQueueTest extends JSR1
740		assertTrue(q.contains(elems[1]));
741		l.clear();
742		q.drainTo(l);
743	<	assertEquals(q.size(), 0);
744	<	assertEquals(l.size(), 2);
743	>	mustEqual(0, q.size());
744	>	mustEqual(2, l.size());
745		for (int i = 0; i < 2; ++i)
746	<	assertEquals(l.get(i), elems[i]);
746	>	mustEqual(elems[i], l.get(i));
747		}
748
749		/**
750		* drainTo empties queue
751		*/
752		public void testDrainToWithActivePut() throws InterruptedException {
753	<	final DelayQueue q = populatedQueue(SIZE);
753	>	final DelayQueue<PDelay> 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();
760	<	ArrayList l = new ArrayList();
760	>	ArrayList<PDelay> l = new ArrayList<>();
761		q.drainTo(l);
762		assertTrue(l.size() >= SIZE);
763		t.join();
#	Line 878 | Line 765 | public class DelayQueueTest extends JSR1
765		}
766
767		/**
768	<	* drainTo(null, n) throws NPE
882	<	*/
883	<	public void testDrainToNullN() {
884	<	DelayQueue q = populatedQueue(SIZE);
885	<	try {
886	<	q.drainTo(null, 0);
887	<	shouldThrow();
888	<	} catch (NullPointerException success) {}
889	<	}
890	<
891	<	/**
892	<	* drainTo(this, n) throws IAE
893	<	*/
894	<	public void testDrainToSelfN() {
895	<	DelayQueue q = populatedQueue(SIZE);
896	<	try {
897	<	q.drainTo(q, 0);
898	<	shouldThrow();
899	<	} catch (IllegalArgumentException success) {}
900	<	}
901	<
902	<	/**
903	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
768	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
769		*/
770		public void testDrainToN() {
771		for (int i = 0; i < SIZE + 2; ++i) {
772	<	DelayQueue q = populatedQueue(SIZE);
773	<	ArrayList l = new ArrayList();
772	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
773	>	ArrayList<PDelay> l = new ArrayList<>();
774		q.drainTo(l, i);
775	<	int k = (i < SIZE)? i : SIZE;
776	<	assertEquals(q.size(), SIZE-k);
777	<	assertEquals(l.size(), k);
775	>	int k = (i < SIZE) ? i : SIZE;
776	>	mustEqual(SIZE - k, q.size());
777	>	mustEqual(k, l.size());
778		}
779		}
780
781	<
781	>	/**
782	>	* remove(null), contains(null) always return false
783	>	*/
784	>	public void testNeverContainsNull() {
785	>	Collection<?> q = populatedQueue(SIZE);
786	>	assertFalse(q.contains(null));
787	>	assertFalse(q.remove(null));
788	>	}
789		}

Diff Legend

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