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.7 by dl, Sat Dec 27 19:26:43 2003 UTC vs.
Revision 1.95 by jsr166, Wed Jan 27 01:57:24 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
5	<	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	<	* Pat Fisher, Mike Judd.
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.*;
11	<	import java.util.concurrent.*;
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;
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
22	–	private static final int NOCAP = Integer.MAX_VALUE;
23	–
54		/**
55	<	* A delayed implmentation 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; }
62	<	public int compareTo(Object y) {
63	<	int i = pseudodelay;
34	<	int j = ((PDelay)y).pseudodelay;
35	<	if (i < j) return -1;
36	<	if (i > j) return 1;
37	<	return 0;
38	<	}
39	<
40	<	public int compareTo(PDelay y) {
41	<	int i = pseudodelay;
42	<	int j = ((PDelay)y).pseudodelay;
43	<	if (i < j) return -1;
44	<	if (i > j) return 1;
45	<	return 0;
58	>	*/
59	>	static class PDelay implements Delayed {
60	>	final int pseudodelay;
61	>	PDelay(int pseudodelay) { this.pseudodelay = pseudodelay; }
62	>	public int compareTo(Delayed y) {
63	>	return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay);
64		}
47	–
65		public boolean equals(Object other) {
66	<	return ((PDelay)other).pseudodelay == pseudodelay;
67	<	}
51	<	public boolean equals(PDelay other) {
52	<	return ((PDelay)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;
58	<	}
59	<	public int intValue() {
60	<	return pseudodelay;
72	>	return (long) Integer.MIN_VALUE + pseudodelay;
73		}
62	–
74		public String toString() {
75		return String.valueOf(pseudodelay);
76		}
77		}
78
68	–
79		/**
80		* Delayed implementation that actually delays
81		*/
82	<	static class NanoDelay implements Delayed {
83	<	long trigger;
84	<	NanoDelay(long i) {
82	>	static class NanoDelay implements Delayed {
83	>	final long trigger;
84	>	NanoDelay(long i) {
85		trigger = System.nanoTime() + i;
86		}
77	–	public int compareTo(Object y) {
78	–	long i = trigger;
79	–	long j = ((NanoDelay)y).trigger;
80	–	if (i < j) return -1;
81	–	if (i > j) return 1;
82	–	return 0;
83	–	}
87
88	<	public int compareTo(NanoDelay y) {
89	<	long i = trigger;
87	<	long j = ((NanoDelay)y).trigger;
88	<	if (i < j) return -1;
89	<	if (i > j) return 1;
90	<	return 0;
88	>	public int compareTo(Delayed y) {
89	>	return Long.compare(trigger, ((NanoDelay)y).trigger);
90		}
91
92		public boolean equals(Object other) {
93	<	return ((NanoDelay)other).trigger == trigger;
94	<	}
96	<	public boolean equals(NanoDelay other) {
97	<	return ((NanoDelay)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 111 | Line 111 | public class DelayQueueTest extends JSR1
111		}
112		}
113
114	–
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)
122	<	assertTrue(q.offer(new PDelay(i)));
123	<	for(int i = (n & 1); i < n; i+=2)
124	<	assertTrue(q.offer(new PDelay(i)));
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)
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	<
131	>
132		/**
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 141 | 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	<	}
147	<	catch (NullPointerException success) {}
146	>	} catch (NullPointerException success) {}
147		}
148
149		/**
#	Line 152 | Line 151 | public class DelayQueueTest extends JSR1
151		*/
152		public void testConstructor4() {
153		try {
154	<	PDelay[] ints = new PDelay[SIZE];
156	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
154	>	new DelayQueue<PDelay>(Arrays.asList(new PDelay[SIZE]));
155		shouldThrow();
156	<	}
159	<	catch (NullPointerException success) {}
156	>	} catch (NullPointerException success) {}
157		}
158
159		/**
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];
168	<	for (int i = 0; i < SIZE-1; ++i)
169	<	ints[i] = new PDelay(i);
170	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
167	>	new DelayQueue<PDelay>(Arrays.asList(a));
168		shouldThrow();
169	<	}
173	<	catch (NullPointerException success) {}
169	>	} catch (NullPointerException success) {}
170		}
171
172		/**
173		* Queue contains all elements of collection used to initialize
174		*/
175		public void testConstructor6() {
176	<	try {
177	<	PDelay[] ints = new PDelay[SIZE];
178	<	for (int i = 0; i < SIZE; ++i)
179	<	ints[i] = new PDelay(i);
180	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
181	<	for (int i = 0; i < SIZE; ++i)
186	<	assertEquals(ints[i], q.poll());
187	<	}
188	<	finally {}
176	>	PDelay[] items = new PDelay[SIZE];
177	>	for (int i = 0; i < SIZE; ++i)
178	>	items[i] = new PDelay(i);
179	>	DelayQueue<PDelay> q = new DelayQueue<>(Arrays.asList(items));
180	>	for (int i = 0; i < SIZE; ++i)
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 204 | Line 197 | public class DelayQueueTest extends JSR1
197		}
198
199		/**
200	<	* remainingCapacity does not change when elementa added or removed,
208	<	* 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		/**
225	–	* offer(null) throws NPE
226	–	*/
227	–	public void testOfferNull() {
228	–	try {
229	–	DelayQueue q = new DelayQueue();
230	–	q.offer(null);
231	–	shouldThrow();
232	–	} catch (NullPointerException success) { }
233	–	}
234	–
235	–	/**
236	–	* add(null) throws NPE
237	–	*/
238	–	public void testAddNull() {
239	–	try {
240	–	DelayQueue q = new DelayQueue();
241	–	q.add(null);
242	–	shouldThrow();
243	–	} catch (NullPointerException success) { }
244	–	}
245	–
246	–	/**
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 256 | 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
268	<	*/
269	<	public void testAddAll1() {
270	<	try {
271	<	DelayQueue q = new DelayQueue();
272	<	q.addAll(null);
273	<	shouldThrow();
274	<	}
275	<	catch (NullPointerException success) {}
276	<	}
277	<
278	<
279	<	/**
280	<	* addAll(this) throws IAE
237	>	* addAll(this) throws IllegalArgumentException
238		*/
239		public void testAddAllSelf() {
240	+	DelayQueue<PDelay> q = populatedQueue(SIZE);
241		try {
284	–	DelayQueue q = populatedQueue(SIZE);
242		q.addAll(q);
243		shouldThrow();
244	<	}
288	<	catch (IllegalArgumentException success) {}
244	>	} catch (IllegalArgumentException success) {}
245		}
246
247		/**
292	–	* addAll of a collection with null elements throws NPE
293	–	*/
294	–	public void testAddAll2() {
295	–	try {
296	–	DelayQueue q = new DelayQueue();
297	–	PDelay[] ints = new PDelay[SIZE];
298	–	q.addAll(Arrays.asList(ints));
299	–	shouldThrow();
300	–	}
301	–	catch (NullPointerException success) {}
302	–	}
303	–	/**
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();
310	<	PDelay[] ints = new PDelay[SIZE];
311	<	for (int i = 0; i < SIZE-1; ++i)
312	<	ints[i] = new PDelay(i);
313	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(a));
258		shouldThrow();
259	<	}
316	<	catch (NullPointerException success) {}
259	>	} catch (NullPointerException success) {}
260		}
261
262		/**
263		* Queue contains all elements of successful addAll
264		*/
265		public void testAddAll5() {
266	<	try {
267	<	PDelay[] empty = new PDelay[0];
268	<	PDelay[] ints = new PDelay[SIZE];
269	<	for (int i = SIZE-1; i >= 0; --i)
270	<	ints[i] = new PDelay(i);
271	<	DelayQueue q = new DelayQueue();
272	<	assertFalse(q.addAll(Arrays.asList(empty)));
273	<	assertTrue(q.addAll(Arrays.asList(ints)));
274	<	for (int i = 0; i < SIZE; ++i)
332	<	assertEquals(ints[i], q.poll());
333	<	}
334	<	finally {}
266	>	PDelay[] empty = new PDelay[0];
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(items)));
273	>	for (int i = 0; i < SIZE; ++i)
274	>	mustEqual(items[i], q.poll());
275		}
276
277		/**
338	–	* put(null) throws NPE
339	–	*/
340	–	public void testPutNull() {
341	–	try {
342	–	DelayQueue q = new DelayQueue();
343	–	q.put(null);
344	–	shouldThrow();
345	–	}
346	–	catch (NullPointerException success){
347	–	}
348	–	}
349	–
350	–	/**
278		* all elements successfully put are contained
279		*/
280	<	public void testPut() {
281	<	try {
282	<	DelayQueue q = new DelayQueue();
283	<	for (int i = 0; i < SIZE; ++i) {
284	<	PDelay I = new PDelay(i);
285	<	q.put(I);
359	<	assertTrue(q.contains(I));
360	<	}
361	<	assertEquals(SIZE, q.size());
362	<	}
363	<	finally {
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() {
294	<	final DelayQueue q = new DelayQueue();
295	<	Thread t = new Thread(new Runnable() {
296	<	public void run() {
297	<	int added = 0;
298	<	try {
299	<	q.put(new PDelay(0));
300	<	++added;
301	<	q.put(new PDelay(0));
302	<	++added;
303	<	q.put(new PDelay(0));
304	<	++added;
382	<	q.put(new PDelay(0));
383	<	++added;
384	<	threadAssertTrue(added == 4);
385	<	} finally {
386	<	}
387	<	}
388	<	});
389	<	try {
390	<	t.start();
391	<	Thread.sleep(SHORT_DELAY_MS);
392	<	q.take();
393	<	t.interrupt();
394	<	t.join();
395	<	} catch (Exception e){
396	<	unexpectedException();
397	<	}
293	>	public void testPutWithTake() throws InterruptedException {
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));
299	>	q.put(new PDelay(0));
300	>	q.put(new PDelay(0));
301	>	}});
302	>
303	>	awaitTermination(t);
304	>	mustEqual(4, q.size());
305		}
306
307		/**
308	<	* timed offer does not time out
309	<	*/
310	<	public void testTimedOffer() {
311	<	final DelayQueue q = new DelayQueue();
312	<	Thread t = new Thread(new Runnable() {
313	<	public void run() {
314	<	try {
315	<	q.put(new PDelay(0));
316	<	q.put(new PDelay(0));
317	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
318	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
319	<	} finally { }
320	<	}
414	<	});
415	<
416	<	try {
417	<	t.start();
418	<	Thread.sleep(SMALL_DELAY_MS);
419	<	t.interrupt();
420	<	t.join();
421	<	} catch (Exception e){
422	<	unexpectedException();
423	<	}
308	>	* Queue is unbounded, so timed offer never times out
309	>	*/
310	>	public void testTimedOffer() throws InterruptedException {
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));
316	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
317	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
318	>	}});
319	>
320	>	awaitTermination(t);
321		}
322
323		/**
324		* take retrieves elements in priority order
325		*/
326	<	public void testTake() {
327	<	try {
328	<	DelayQueue q = populatedQueue(SIZE);
329	<	for (int i = 0; i < SIZE; ++i) {
433	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
434	<	}
435	<	} catch (InterruptedException e){
436	<	unexpectedException();
437	<	}
438	<	}
439	<
440	<	/**
441	<	* take blocks interruptibly when empty
442	<	*/
443	<	public void testTakeFromEmpty() {
444	<	final DelayQueue q = new DelayQueue();
445	<	Thread t = new Thread(new Runnable() {
446	<	public void run() {
447	<	try {
448	<	q.take();
449	<	threadShouldThrow();
450	<	} catch (InterruptedException success){ }
451	<	}
452	<	});
453	<	try {
454	<	t.start();
455	<	Thread.sleep(SHORT_DELAY_MS);
456	<	t.interrupt();
457	<	t.join();
458	<	} catch (Exception e){
459	<	unexpectedException();
326	>	public void testTake() throws InterruptedException {
327	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
328	>	for (int i = 0; i < SIZE; ++i) {
329	>	mustEqual(new PDelay(i), q.take());
330		}
331		}
332
333		/**
334		* Take removes existing elements until empty, then blocks interruptibly
335		*/
336	<	public void testBlockingTake() {
337	<	Thread t = new Thread(new Runnable() {
338	<	public void run() {
339	<	try {
340	<	DelayQueue q = populatedQueue(SIZE);
341	<	for (int i = 0; i < SIZE; ++i) {
342	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
343	<	}
344	<	q.take();
345	<	threadShouldThrow();
346	<	} catch (InterruptedException success){
347	<	}
348	<	}});
349	<	t.start();
480	<	try {
481	<	Thread.sleep(SHORT_DELAY_MS);
482	<	t.interrupt();
483	<	t.join();
484	<	}
485	<	catch (InterruptedException ie) {
486	<	unexpectedException();
487	<	}
488	<	}
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() 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 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	+	await(pleaseInterrupt);
360	+	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
361	+	t.interrupt();
362	+	awaitTermination(t);
363	+	}
364
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());
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() {
380	<	try {
381	<	DelayQueue q = populatedQueue(SIZE);
382	<	for (int i = 0; i < SIZE; ++i) {
383	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, TimeUnit.MILLISECONDS)));
384	<	}
511	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
512	<	} catch (InterruptedException e){
513	<	unexpectedException();
514	<	}
379	>	public void testTimedPoll0() throws InterruptedException {
380	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
381	>	for (int i = 0; i < SIZE; ++i) {
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() {
391	<	try {
392	<	DelayQueue q = populatedQueue(SIZE);
393	<	for (int i = 0; i < SIZE; ++i) {
394	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
395	<	}
396	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
397	<	} catch (InterruptedException e){
398	<	unexpectedException();
399	<	}
390	>	public void testTimedPoll() throws InterruptedException {
391	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
392	>	for (int i = 0; i < SIZE; ++i) {
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		/**
404		* Interrupted timed poll throws InterruptedException instead of
405		* returning timeout status
406		*/
407	<	public void testInterruptedTimedPoll() {
408	<	Thread t = new Thread(new Runnable() {
409	<	public void run() {
410	<	try {
411	<	DelayQueue q = populatedQueue(SIZE);
412	<	for (int i = 0; i < SIZE; ++i) {
413	<	threadAssertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
414	<	}
544	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
545	<	} catch (InterruptedException success){
546	<	}
547	<	}});
548	<	t.start();
549	<	try {
550	<	Thread.sleep(SHORT_DELAY_MS);
551	<	t.interrupt();
552	<	t.join();
553	<	}
554	<	catch (InterruptedException ie) {
555	<	unexpectedException();
556	<	}
557	<	}
407	>	public void testInterruptedTimedPoll() throws InterruptedException {
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	>	for (int i = 0; i < SIZE; i++)
413	>	mustEqual(new PDelay(i),
414	>	q.poll(LONG_DELAY_MS, MILLISECONDS));
415
416	<	/**
417	<	*  timed poll before a delayed offer fails; after offer succeeds;
418	<	*  on interruption throws
419	<	*/
420	<	public void testTimedPollWithOffer() {
421	<	final DelayQueue q = new DelayQueue();
565	<	Thread t = new Thread(new Runnable() {
566	<	public void run() {
567	<	try {
568	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
569	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
570	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
571	<	threadFail("Should block");
572	<	} catch (InterruptedException success) { }
573	<	}
574	<	});
575	<	try {
576	<	t.start();
577	<	Thread.sleep(SMALL_DELAY_MS);
578	<	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
579	<	t.interrupt();
580	<	t.join();
581	<	} catch (Exception e){
582	<	unexpectedException();
583	<	}
584	<	}
416	>	Thread.currentThread().interrupt();
417	>	try {
418	>	q.poll(randomTimeout(), randomTimeUnit());
419	>	shouldThrow();
420	>	} catch (InterruptedException success) {}
421	>	assertFalse(Thread.interrupted());
422
423	+	pleaseInterrupt.countDown();
424	+	try {
425	+	q.poll(LONGER_DELAY_MS, MILLISECONDS);
426	+	shouldThrow();
427	+	} catch (InterruptedException success) {}
428	+	assertFalse(Thread.interrupted());
429	+	}});
430	+
431	+	await(pleaseInterrupt);
432	+	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
433	+	t.interrupt();
434	+	awaitTermination(t);
435	+	checkEmpty(q);
436	+	}
437
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	<	q.poll();
446	<	assertTrue(q.peek() == null ||
447	<	i != ((PDelay)q.peek()).intValue());
444	>	mustEqual(new PDelay(i), q.peek());
445	>	mustEqual(new PDelay(i), q.poll());
446	>	if (q.isEmpty())
447	>	assertNull(q.peek());
448	>	else
449	>	assertFalse(new PDelay(i).equals(q.peek()));
450		}
451	<	assertNull(q.peek());
451	>	assertNull(q.peek());
452		}
453
454		/**
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 {
464		q.element();
465		shouldThrow();
466	<	}
614	<	catch (NoSuchElementException success) {}
466	>	} catch (NoSuchElementException success) {}
467		}
468
469		/**
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();
479		shouldThrow();
480	<	} catch (NoSuchElementException success){
629	<	}
480	>	} catch (NoSuchElementException success) {}
481		}
482
483		/**
633	–	* remove(x) removes x and returns true if present
634	–	*/
635	–	public void testRemoveElement() {
636	–	DelayQueue q = populatedQueue(SIZE);
637	–	for (int i = 1; i < SIZE; i+=2) {
638	–	assertTrue(q.remove(new PDelay(i)));
639	–	}
640	–	for (int i = 0; i < SIZE; i+=2) {
641	–	assertTrue(q.remove(new PDelay(i)));
642	–	assertFalse(q.remove(new PDelay(i+1)));
643	–	}
644	–	assertTrue(q.isEmpty());
645	–	}
646	–
647	–	/**
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 660 | 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());
504	<	q.add(new PDelay(1));
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());
507	+	assertTrue(q.contains(x));
508		q.clear();
509		assertTrue(q.isEmpty());
510		}
#	Line 675 | 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 689 | 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 699 | 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 709 | 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());
718	<	assertFalse(q.contains(I));
555	>	assertFalse(q.contains(p.remove()));
556		}
557		}
558		}
#	Line 723 | Line 560 | public class DelayQueueTest extends JSR1
560		/**
561		* toArray contains all elements
562		*/
563	<	public void testToArray() {
564	<	DelayQueue q = populatedQueue(SIZE);
565	<	Object[] o = q.toArray();
566	<	Arrays.sort(o);
567	<	try {
568	<	for(int i = 0; i < o.length; i++)
569	<	assertEquals(o[i], q.take());
570	<	} catch (InterruptedException e){
734	<	unexpectedException();
735	<	}
563	>	public void testToArray() throws InterruptedException {
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() {
577	<	DelayQueue q = populatedQueue(SIZE);
578	<	PDelay[] ints = new PDelay[SIZE];
579	<	ints = (PDelay[])q.toArray(ints);
580	<	Arrays.sort(ints);
581	<	try {
582	<	for(int i = 0; i < ints.length; i++)
583	<	assertEquals(ints[i], q.take());
584	<	} catch (InterruptedException e){
750	<	unexpectedException();
751	<	}
752	<	}
753	<
754	<
755	<	/**
756	<	* toArray(null) throws NPE
757	<	*/
758	<	public void testToArray_BadArg() {
759	<	try {
760	<	DelayQueue q = populatedQueue(SIZE);
761	<	Object o[] = q.toArray(null);
762	<	shouldThrow();
763	<	} catch(NullPointerException success){}
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 incompatable array type throws CCE
588	>	* toArray(incompatible array type) throws ArrayStoreException
589		*/
590		public void testToArray1_BadArg() {
591	<	try {
592	<	DelayQueue q = populatedQueue(SIZE);
593	<	Object o[] = q.toArray(new String[10] );
594	<	shouldThrow();
595	<	} catch(ArrayStoreException  success){}
591	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
592	>	try {
593	>	q.toArray(new String[10]);
594	>	shouldThrow();
595	>	} catch (ArrayStoreException success) {}
596		}
597	<
597	>
598		/**
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();
605	<	while(it.hasNext()) {
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();
623	>	public void testIteratorRemove() {
624	>	final DelayQueue<PDelay> q = new DelayQueue<>();
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
808	–
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);
645	<	}
818	<	}
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 Runnable() {
654	<	public void run() {
655	<	threadAssertNull(q.poll());
656	<	try {
657	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
658	<	threadAssertTrue(q.isEmpty());
659	<	}
660	<	catch (InterruptedException e) {
661	<	threadUnexpectedException();
835	<	}
836	<	}
837	<	});
651	>	final DelayQueue<PDelay> q = new DelayQueue<>();
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 Runnable() {
664	<	public void run() {
665	<	try {
842	<	Thread.sleep(SHORT_DELAY_MS);
663	>	executor.execute(new CheckedRunnable() {
664	>	public void realRun() throws InterruptedException {
665	>	threadsStarted.await();
666		q.put(new PDelay(1));
667	<	}
668	<	catch (InterruptedException e) {
846	<	threadUnexpectedException();
847	<	}
848	<	}
849	<	});
850	<	joinPool(executor);
851	<
667	>	}});
668	>	}
669		}
670
854	–
671		/**
672	<	* Dekayed actions do not occur until their delay elapses
672	>	* Delayed actions do not occur until their delay elapses
673		*/
674	<	public void testDelay() {
675	<	DelayQueue q = new DelayQueue();
676	<	NanoDelay[] elements = new NanoDelay[SIZE];
677	<	for (int i = 0; i < SIZE; ++i) {
678	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
679	<	}
680	<	for (int i = 0; i < SIZE; ++i) {
681	<	q.add(elements[i]);
682	<	}
683	<
684	<	try {
685	<	long last = 0;
686	<	for (int i = 0; i < SIZE; ++i) {
871	<	NanoDelay e = (NanoDelay)(q.take());
872	<	long tt = e.getTriggerTime();
873	<	assertTrue(tt <= System.nanoTime());
874	<	if (i != 0)
875	<	assertTrue(tt >= last);
876	<	last = tt;
877	<	}
878	<	}
879	<	catch(InterruptedException ie) {
880	<	unexpectedException();
674	>	public void testDelay() throws InterruptedException {
675	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
676	>	for (int i = 0; i < SIZE; ++i)
677	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
678	>
679	>	long last = 0;
680	>	for (int i = 0; i < SIZE; ++i) {
681	>	NanoDelay e = q.take();
682	>	long tt = e.getTriggerTime();
683	>	assertTrue(System.nanoTime() - tt >= 0);
684	>	if (i != 0)
685	>	assertTrue(tt >= last);
686	>	last = tt;
687		}
688	+	assertTrue(q.isEmpty());
689		}
690
691	+	/**
692	+	* peek of a non-empty queue returns non-null even if not expired
693	+	*/
694	+	public void testPeekDelayed() {
695	+	DelayQueue<NanoDelay> q = new DelayQueue<>();
696	+	q.add(new NanoDelay(Long.MAX_VALUE));
697	+	assertNotNull(q.peek());
698	+	}
699
700		/**
701	<	* drainTo(null) throws NPE
702	<	*/
703	<	public void testDrainToNull() {
704	<	DelayQueue q = populatedQueue(SIZE);
705	<	try {
706	<	q.drainTo(null);
892	<	shouldThrow();
893	<	} catch(NullPointerException success) {
894	<	}
701	>	* poll of a non-empty queue returns null if no expired elements.
702	>	*/
703	>	public void testPollDelayed() {
704	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
705	>	q.add(new NanoDelay(Long.MAX_VALUE));
706	>	assertNull(q.poll());
707		}
708
709		/**
710	<	* drainTo(this) throws IAE
711	<	*/
712	<	public void testDrainToSelf() {
713	<	DelayQueue q = populatedQueue(SIZE);
714	<	try {
715	<	q.drainTo(q);
716	<	shouldThrow();
717	<	} catch(IllegalArgumentException success) {
906	<	}
710	>	* timed poll of a non-empty queue returns null if no expired elements.
711	>	*/
712	>	public void testTimedPollDelayed() throws InterruptedException {
713	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
714	>	q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
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	<	*/
722	>	*/
723		public void testDrainTo() {
724	<	DelayQueue q = populatedQueue(SIZE);
725	<	ArrayList l = new ArrayList();
724	>	DelayQueue<PDelay> q = new DelayQueue<>();
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<PDelay> l = new ArrayList<>();
731		q.drainTo(l);
732	<	assertEquals(q.size(), 0);
733	<	assertEquals(l.size(), SIZE);
732	>	mustEqual(0, q.size());
733	>	for (int i = 0; i < SIZE; ++i)
734	>	mustEqual(elems[i], l.get(i));
735	>	q.add(elems[0]);
736	>	q.add(elems[1]);
737	>	assertFalse(q.isEmpty());
738	>	assertTrue(q.contains(elems[0]));
739	>	assertTrue(q.contains(elems[1]));
740	>	l.clear();
741	>	q.drainTo(l);
742	>	mustEqual(0, q.size());
743	>	mustEqual(2, l.size());
744	>	for (int i = 0; i < 2; ++i)
745	>	mustEqual(elems[i], l.get(i));
746		}
747
748		/**
749		* drainTo empties queue
750	<	*/
751	<	public void testDrainToWithActivePut() {
752	<	final DelayQueue q = populatedQueue(SIZE);
753	<	Thread t = new Thread(new Runnable() {
754	<	public void run() {
755	<	q.put(new PDelay(SIZE+1));
756	<	}
929	<	});
930	<	try {
931	<	t.start();
932	<	ArrayList l = new ArrayList();
933	<	q.drainTo(l);
934	<	assertTrue(l.size() >= SIZE);
935	<	t.join();
936	<	assertTrue(q.size() + l.size() == SIZE+1);
937	<	} catch(Exception e){
938	<	unexpectedException();
939	<	}
940	<	}
941	<
942	<	/**
943	<	* drainTo(null, n) throws NPE
944	<	*/
945	<	public void testDrainToNullN() {
946	<	DelayQueue q = populatedQueue(SIZE);
947	<	try {
948	<	q.drainTo(null, 0);
949	<	shouldThrow();
950	<	} catch(NullPointerException success) {
951	<	}
952	<	}
750	>	*/
751	>	public void testDrainToWithActivePut() throws InterruptedException {
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));
756	>	}});
757
758	<	/**
759	<	* drainTo(this, n) throws IAE
760	<	*/
761	<	public void testDrainToSelfN() {
762	<	DelayQueue q = populatedQueue(SIZE);
763	<	try {
960	<	q.drainTo(q, 0);
961	<	shouldThrow();
962	<	} catch(IllegalArgumentException success) {
963	<	}
758	>	t.start();
759	>	ArrayList<PDelay> l = new ArrayList<>();
760	>	q.drainTo(l);
761	>	assertTrue(l.size() >= SIZE);
762	>	t.join();
763	>	assertTrue(q.size() + l.size() >= SIZE);
764		}
765
766		/**
767	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
768	<	*/
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<>();
773		q.drainTo(l, i);
774	<	int k = (i < SIZE)? i : SIZE;
775	<	assertEquals(q.size(), SIZE-k);
776	<	assertEquals(l.size(), k);
774	>	int k = (i < SIZE) ? i : SIZE;
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