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.6 by dl, Sun Oct 5 23:00:40 2003 UTC vs.
Revision 1.86 by jsr166, Sun May 14 00:48:20 2017 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by members of JCP JSR-166 Expert Group and released to the
3	<	* public domain. Use, modify, and redistribute this code in any way
4	<	* without acknowledgement. Other contributors include Andrew Wright,
5	<	* Jeffrey Hayes, Pat Fischer, Mike Judd.
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/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
21	–	private static final int NOCAP = Integer.MAX_VALUE;
22	–
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;
33	<	int j = ((PDelay)y).pseudodelay;
34	<	if (i < j) return -1;
35	<	if (i > j) return 1;
36	<	return 0;
37	<	}
38	<
39	<	public int compareTo(PDelay y) {
40	<	int i = pseudodelay;
41	<	int j = ((PDelay)y).pseudodelay;
42	<	if (i < j) return -1;
43	<	if (i > j) return 1;
44	<	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		}
46	–
65		public boolean equals(Object other) {
66	<	return ((PDelay)other).pseudodelay == pseudodelay;
67	<	}
50	<	public boolean equals(PDelay other) {
51	<	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;
57	<	}
58	<	public int intValue() {
59	<	return pseudodelay;
72	>	return Integer.MIN_VALUE + pseudodelay;
73		}
61	–
74		public String toString() {
75		return String.valueOf(pseudodelay);
76		}
77		}
78
67	–
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		}
76	–	public int compareTo(Object y) {
77	–	long i = trigger;
78	–	long j = ((NanoDelay)y).trigger;
79	–	if (i < j) return -1;
80	–	if (i > j) return 1;
81	–	return 0;
82	–	}
87
88	<	public int compareTo(NanoDelay y) {
89	<	long i = trigger;
86	<	long j = ((NanoDelay)y).trigger;
87	<	if (i < j) return -1;
88	<	if (i > j) return 1;
89	<	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	<	}
95	<	public boolean equals(NanoDelay other) {
96	<	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 110 | Line 111 | public class DelayQueueTest extends JSR1
111		}
112		}
113
113	–
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	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
127	>	assertEquals(n, q.size());
128	>	assertEquals(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	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
137		}
138
139		/**
#	Line 140 | Line 141 | public class DelayQueueTest extends JSR1
141		*/
142		public void testConstructor3() {
143		try {
144	<	DelayQueue q = new DelayQueue(null);
144	>	new DelayQueue(null);
145		shouldThrow();
146	<	}
146	<	catch (NullPointerException success) {}
146	>	} catch (NullPointerException success) {}
147		}
148
149		/**
#	Line 151 | Line 151 | public class DelayQueueTest extends JSR1
151		*/
152		public void testConstructor4() {
153		try {
154	<	PDelay[] ints = new PDelay[SIZE];
155	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
154	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
155		shouldThrow();
156	<	}
158	<	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];
167	<	for (int i = 0; i < SIZE-1; ++i)
168	<	ints[i] = new PDelay(i);
169	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
167	>	new DelayQueue(Arrays.asList(a));
168		shouldThrow();
169	<	}
172	<	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)
185	<	assertEquals(ints[i], q.poll());
186	<	}
187	<	finally {}
176	>	PDelay[] ints = 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));
180	>	for (int i = 0; i < SIZE; ++i)
181	>	assertEquals(ints[i], q.poll());
182		}
183
184		/**
#	Line 193 | Line 187 | public class DelayQueueTest extends JSR1
187		public void testEmpty() {
188		DelayQueue q = new DelayQueue();
189		assertTrue(q.isEmpty());
190	<	assertEquals(NOCAP, q.remainingCapacity());
190	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
191		q.add(new PDelay(1));
192		assertFalse(q.isEmpty());
193		q.add(new PDelay(2));
#	Line 203 | Line 197 | public class DelayQueueTest extends JSR1
197		}
198
199		/**
200	<	* remainingCapacity does not change when elementa added or removed,
207	<	* but size does
200	>	* remainingCapacity() always returns Integer.MAX_VALUE
201		*/
202		public void testRemainingCapacity() {
203	<	DelayQueue q = populatedQueue(SIZE);
203	>	BlockingQueue q = populatedQueue(SIZE);
204		for (int i = 0; i < SIZE; ++i) {
205	<	assertEquals(NOCAP, q.remainingCapacity());
206	<	assertEquals(SIZE-i, q.size());
207	<	q.remove();
205	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
206	>	assertEquals(SIZE - i, q.size());
207	>	assertTrue(q.remove() instanceof PDelay);
208		}
209		for (int i = 0; i < SIZE; ++i) {
210	<	assertEquals(NOCAP, q.remainingCapacity());
210	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211		assertEquals(i, q.size());
212	<	q.add(new PDelay(i));
212	>	assertTrue(q.add(new PDelay(i)));
213		}
214		}
215
216		/**
224	–	* offer(null) throws NPE
225	–	*/
226	–	public void testOfferNull() {
227	–	try {
228	–	DelayQueue q = new DelayQueue();
229	–	q.offer(null);
230	–	shouldThrow();
231	–	} catch (NullPointerException success) { }
232	–	}
233	–
234	–	/**
235	–	* add(null) throws NPE
236	–	*/
237	–	public void testAddNull() {
238	–	try {
239	–	DelayQueue q = new DelayQueue();
240	–	q.add(null);
241	–	shouldThrow();
242	–	} catch (NullPointerException success) { }
243	–	}
244	–
245	–	/**
217		* offer non-null succeeds
218		*/
219		public void testOffer() {
#	Line 263 | Line 234 | public class DelayQueueTest extends JSR1
234		}
235
236		/**
266	–	* addAll(null) throws NPE
267	–	*/
268	–	public void testAddAll1() {
269	–	try {
270	–	DelayQueue q = new DelayQueue();
271	–	q.addAll(null);
272	–	shouldThrow();
273	–	}
274	–	catch (NullPointerException success) {}
275	–	}
276	–
277	–
278	–	/**
237		* addAll(this) throws IAE
238		*/
239		public void testAddAllSelf() {
240	+	DelayQueue q = populatedQueue(SIZE);
241		try {
283	–	DelayQueue q = populatedQueue(SIZE);
242		q.addAll(q);
243		shouldThrow();
244	<	}
287	<	catch (IllegalArgumentException success) {}
244	>	} catch (IllegalArgumentException success) {}
245		}
246
247		/**
291	–	* addAll of a collection with null elements throws NPE
292	–	*/
293	–	public void testAddAll2() {
294	–	try {
295	–	DelayQueue q = new DelayQueue();
296	–	PDelay[] ints = new PDelay[SIZE];
297	–	q.addAll(Arrays.asList(ints));
298	–	shouldThrow();
299	–	}
300	–	catch (NullPointerException success) {}
301	–	}
302	–	/**
248		* addAll of a collection with any null elements throws NPE after
249		* possibly adding some elements
250		*/
251		public void testAddAll3() {
252	+	DelayQueue q = new DelayQueue();
253	+	PDelay[] a = new PDelay[SIZE];
254	+	for (int i = 0; i < SIZE - 1; ++i)
255	+	a[i] = new PDelay(i);
256		try {
257	<	DelayQueue q = new DelayQueue();
309	<	PDelay[] ints = new PDelay[SIZE];
310	<	for (int i = 0; i < SIZE-1; ++i)
311	<	ints[i] = new PDelay(i);
312	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(a));
258		shouldThrow();
259	<	}
315	<	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)
331	<	assertEquals(ints[i], q.poll());
332	<	}
333	<	finally {}
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();
271	>	assertFalse(q.addAll(Arrays.asList(empty)));
272	>	assertTrue(q.addAll(Arrays.asList(ints)));
273	>	for (int i = 0; i < SIZE; ++i)
274	>	assertEquals(ints[i], q.poll());
275		}
276
277		/**
337	–	* put(null) throws NPE
338	–	*/
339	–	public void testPutNull() {
340	–	try {
341	–	DelayQueue q = new DelayQueue();
342	–	q.put(null);
343	–	shouldThrow();
344	–	}
345	–	catch (NullPointerException success){
346	–	}
347	–	}
348	–
349	–	/**
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);
358	<	assertTrue(q.contains(I));
359	<	}
360	<	assertEquals(SIZE, q.size());
361	<	}
362	<	finally {
280	>	public void testPut() {
281	>	DelayQueue 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	+	assertEquals(SIZE, q.size());
288		}
289
290		/**
291		* put doesn't block waiting for take
292		*/
293	<	public void testPutWithTake() {
293	>	public void testPutWithTake() throws InterruptedException {
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;
381	<	q.put(new PDelay(0));
382	<	++added;
383	<	threadAssertTrue(added == 4);
384	<	} finally {
385	<	}
386	<	}
387	<	});
388	<	try {
389	<	t.start();
390	<	Thread.sleep(SHORT_DELAY_MS);
391	<	q.take();
392	<	t.interrupt();
393	<	t.join();
394	<	} catch (Exception e){
395	<	unexpectedException();
396	<	}
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	>	assertEquals(4, q.size());
305		}
306
307		/**
308		* timed offer does not time out
309		*/
310	<	public void testTimedOffer() {
310	>	public void testTimedOffer() throws InterruptedException {
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));
411	<	} finally { }
412	<	}
413	<	});
414	<
415	<	try {
416	<	t.start();
417	<	Thread.sleep(SMALL_DELAY_MS);
418	<	t.interrupt();
419	<	t.join();
420	<	} catch (Exception e){
421	<	unexpectedException();
422	<	}
423	<	}
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	<	/**
426	<	* take retrieves elements in priority order
427	<	*/
428	<	public void testTake() {
429	<	try {
430	<	DelayQueue q = populatedQueue(SIZE);
431	<	for (int i = 0; i < SIZE; ++i) {
432	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
433	<	}
434	<	} catch (InterruptedException e){
435	<	unexpectedException();
436	<	}
320	>	awaitTermination(t);
321		}
322
323		/**
324	<	* take blocks interruptibly when empty
324	>	* take retrieves elements in priority order
325		*/
326	<	public void testTakeFromEmpty() {
327	<	final DelayQueue q = new DelayQueue();
328	<	Thread t = new Thread(new Runnable() {
329	<	public void run() {
446	<	try {
447	<	q.take();
448	<	threadShouldThrow();
449	<	} catch (InterruptedException success){ }
450	<	}
451	<	});
452	<	try {
453	<	t.start();
454	<	Thread.sleep(SHORT_DELAY_MS);
455	<	t.interrupt();
456	<	t.join();
457	<	} catch (Exception e){
458	<	unexpectedException();
326	>	public void testTake() throws InterruptedException {
327	>	DelayQueue q = populatedQueue(SIZE);
328	>	for (int i = 0; i < SIZE; ++i) {
329	>	assertEquals(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();
479	<	try {
480	<	Thread.sleep(SHORT_DELAY_MS);
481	<	t.interrupt();
482	<	t.join();
483	<	}
484	<	catch (InterruptedException ie) {
485	<	unexpectedException();
486	<	}
487	<	}
336	>	public void testBlockingTake() throws InterruptedException {
337	>	final DelayQueue 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	>
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	+	assertThreadBlocks(t, Thread.State.WAITING);
361	+	t.interrupt();
362	+	awaitTermination(t);
363	+	}
364
365		/**
366		* poll succeeds unless empty
#	Line 493 | Line 368 | public class DelayQueueTest extends JSR1
368		public void testPoll() {
369		DelayQueue q = populatedQueue(SIZE);
370		for (int i = 0; i < SIZE; ++i) {
371	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
371	>	assertEquals(new PDelay(i), q.poll());
372		}
373	<	assertNull(q.poll());
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	<	}
510	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
511	<	} catch (InterruptedException e){
512	<	unexpectedException();
513	<	}
379	>	public void testTimedPoll0() throws InterruptedException {
380	>	DelayQueue q = populatedQueue(SIZE);
381	>	for (int i = 0; i < SIZE; ++i) {
382	>	assertEquals(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 q = populatedQueue(SIZE);
392	>	for (int i = 0; i < SIZE; ++i) {
393	>	long startTime = System.nanoTime();
394	>	assertEquals(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	<	}
415	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
544	<	} catch (InterruptedException success){
545	<	}
546	<	}});
547	<	t.start();
548	<	try {
549	<	Thread.sleep(SHORT_DELAY_MS);
550	<	t.interrupt();
551	<	t.join();
552	<	}
553	<	catch (InterruptedException ie) {
554	<	unexpectedException();
555	<	}
556	<	}
557	<
558	<	/**
559	<	*  timed poll before a delayed offer fails; after offer succeeds;
560	<	*  on interruption throws
561	<	*/
562	<	public void testTimedPollWithOffer() {
563	<	final DelayQueue q = new DelayQueue();
564	<	Thread t = new Thread(new Runnable() {
565	<	public void run() {
566	<	try {
567	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
568	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
569	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
570	<	threadFail("Should block");
571	<	} catch (InterruptedException success) { }
407	>	public void testInterruptedTimedPoll() throws InterruptedException {
408	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
409	>	final DelayQueue q = populatedQueue(SIZE);
410	>	Thread t = newStartedThread(new CheckedRunnable() {
411	>	public void realRun() throws InterruptedException {
412	>	long startTime = System.nanoTime();
413	>	for (int i = 0; i < SIZE; ++i) {
414	>	assertEquals(new PDelay(i),
415	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
416		}
573	–	});
574	–	try {
575	–	t.start();
576	–	Thread.sleep(SMALL_DELAY_MS);
577	–	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
578	–	t.interrupt();
579	–	t.join();
580	–	} catch (Exception e){
581	–	unexpectedException();
582	–	}
583	–	}
417
418	+	Thread.currentThread().interrupt();
419	+	try {
420	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
421	+	shouldThrow();
422	+	} catch (InterruptedException success) {}
423	+	assertFalse(Thread.interrupted());
424	+
425	+	pleaseInterrupt.countDown();
426	+	try {
427	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
428	+	shouldThrow();
429	+	} catch (InterruptedException success) {}
430	+	assertFalse(Thread.interrupted());
431	+
432	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
433	+	}});
434	+
435	+	await(pleaseInterrupt);
436	+	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
437	+	t.interrupt();
438	+	awaitTermination(t);
439	+	checkEmpty(q);
440	+	}
441
442		/**
443		* peek returns next element, or null if empty
#	Line 589 | Line 445 | public class DelayQueueTest extends JSR1
445		public void testPeek() {
446		DelayQueue q = populatedQueue(SIZE);
447		for (int i = 0; i < SIZE; ++i) {
448	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
449	<	q.poll();
450	<	assertTrue(q.peek() == null ||
451	<	i != ((PDelay)q.peek()).intValue());
448	>	assertEquals(new PDelay(i), q.peek());
449	>	assertEquals(new PDelay(i), q.poll());
450	>	if (q.isEmpty())
451	>	assertNull(q.peek());
452	>	else
453	>	assertFalse(new PDelay(i).equals(q.peek()));
454		}
455	<	assertNull(q.peek());
455	>	assertNull(q.peek());
456		}
457
458		/**
#	Line 603 | Line 461 | public class DelayQueueTest extends JSR1
461		public void testElement() {
462		DelayQueue q = populatedQueue(SIZE);
463		for (int i = 0; i < SIZE; ++i) {
464	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
464	>	assertEquals(new PDelay(i), q.element());
465		q.poll();
466		}
467		try {
468		q.element();
469		shouldThrow();
470	<	}
613	<	catch (NoSuchElementException success) {}
470	>	} catch (NoSuchElementException success) {}
471		}
472
473		/**
#	Line 619 | Line 476 | public class DelayQueueTest extends JSR1
476		public void testRemove() {
477		DelayQueue q = populatedQueue(SIZE);
478		for (int i = 0; i < SIZE; ++i) {
479	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
479	>	assertEquals(new PDelay(i), q.remove());
480		}
481		try {
482		q.remove();
483		shouldThrow();
484	<	} catch (NoSuchElementException success){
628	<	}
484	>	} catch (NoSuchElementException success) {}
485		}
486
487		/**
632	–	* remove(x) removes x and returns true if present
633	–	*/
634	–	public void testRemoveElement() {
635	–	DelayQueue q = populatedQueue(SIZE);
636	–	for (int i = 1; i < SIZE; i+=2) {
637	–	assertTrue(q.remove(new PDelay(i)));
638	–	}
639	–	for (int i = 0; i < SIZE; i+=2) {
640	–	assertTrue(q.remove(new PDelay(i)));
641	–	assertFalse(q.remove(new PDelay(i+1)));
642	–	}
643	–	assertTrue(q.isEmpty());
644	–	}
645	–
646	–	/**
488		* contains(x) reports true when elements added but not yet removed
489		*/
490		public void testContains() {
#	Line 663 | Line 504 | public class DelayQueueTest extends JSR1
504		q.clear();
505		assertTrue(q.isEmpty());
506		assertEquals(0, q.size());
507	<	assertEquals(NOCAP, q.remainingCapacity());
508	<	q.add(new PDelay(1));
507	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
508	>	PDelay x = new PDelay(1);
509	>	q.add(x);
510		assertFalse(q.isEmpty());
511	+	assertTrue(q.contains(x));
512		q.clear();
513		assertTrue(q.isEmpty());
514		}
#	Line 698 | Line 541 | public class DelayQueueTest extends JSR1
541		assertTrue(changed);
542
543		assertTrue(q.containsAll(p));
544	<	assertEquals(SIZE-i, q.size());
544	>	assertEquals(SIZE - i, q.size());
545		p.remove();
546		}
547		}
#	Line 711 | Line 554 | public class DelayQueueTest extends JSR1
554		DelayQueue q = populatedQueue(SIZE);
555		DelayQueue p = populatedQueue(i);
556		assertTrue(q.removeAll(p));
557	<	assertEquals(SIZE-i, q.size());
557	>	assertEquals(SIZE - i, q.size());
558		for (int j = 0; j < i; ++j) {
559	<	PDelay I = (PDelay)(p.remove());
560	<	assertFalse(q.contains(I));
559	>	PDelay x = (PDelay)(p.remove());
560	>	assertFalse(q.contains(x));
561		}
562		}
563		}
#	Line 722 | Line 565 | public class DelayQueueTest extends JSR1
565		/**
566		* toArray contains all elements
567		*/
568	<	public void testToArray() {
568	>	public void testToArray() throws InterruptedException {
569		DelayQueue q = populatedQueue(SIZE);
570	<	Object[] o = q.toArray();
570	>	Object[] o = q.toArray();
571		Arrays.sort(o);
572	<	try {
573	<	for(int i = 0; i < o.length; i++)
731	<	assertEquals(o[i], q.take());
732	<	} catch (InterruptedException e){
733	<	unexpectedException();
734	<	}
572	>	for (int i = 0; i < o.length; i++)
573	>	assertSame(o[i], q.take());
574		}
575
576		/**
577		* toArray(a) contains all elements
578		*/
579		public void testToArray2() {
580	<	DelayQueue q = populatedQueue(SIZE);
581	<	PDelay[] ints = new PDelay[SIZE];
582	<	ints = (PDelay[])q.toArray(ints);
580	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
581	>	PDelay[] ints = new PDelay[SIZE];
582	>	PDelay[] array = q.toArray(ints);
583	>	assertSame(ints, array);
584		Arrays.sort(ints);
585	<	try {
586	<	for(int i = 0; i < ints.length; i++)
747	<	assertEquals(ints[i], q.take());
748	<	} catch (InterruptedException e){
749	<	unexpectedException();
750	<	}
751	<	}
752	<
753	<
754	<	/**
755	<	* toArray(null) throws NPE
756	<	*/
757	<	public void testToArray_BadArg() {
758	<	try {
759	<	DelayQueue q = populatedQueue(SIZE);
760	<	Object o[] = q.toArray(null);
761	<	shouldThrow();
762	<	} catch(NullPointerException success){}
585	>	for (int i = 0; i < ints.length; i++)
586	>	assertSame(ints[i], q.remove());
587		}
588
589		/**
590	<	* toArray with incompatable array type throws CCE
590	>	* toArray(incompatible array type) throws ArrayStoreException
591		*/
592		public void testToArray1_BadArg() {
593	<	try {
594	<	DelayQueue q = populatedQueue(SIZE);
595	<	Object o[] = q.toArray(new String[10] );
596	<	shouldThrow();
597	<	} catch(ArrayStoreException  success){}
593	>	DelayQueue q = populatedQueue(SIZE);
594	>	try {
595	>	q.toArray(new String[10]);
596	>	shouldThrow();
597	>	} catch (ArrayStoreException success) {}
598		}
599	<
599	>
600		/**
601		* iterator iterates through all elements
602		*/
603		public void testIterator() {
604		DelayQueue q = populatedQueue(SIZE);
605		int i = 0;
606	<	Iterator it = q.iterator();
607	<	while(it.hasNext()) {
606	>	Iterator it = q.iterator();
607	>	while (it.hasNext()) {
608		assertTrue(q.contains(it.next()));
609		++i;
610		}
611		assertEquals(i, SIZE);
612	+	assertIteratorExhausted(it);
613	+	}
614	+
615	+	/**
616	+	* iterator of empty collection has no elements
617	+	*/
618	+	public void testEmptyIterator() {
619	+	assertIteratorExhausted(new DelayQueue().iterator());
620		}
621
622		/**
623		* iterator.remove removes current element
624		*/
625	<	public void testIteratorRemove () {
625	>	public void testIteratorRemove() {
626		final DelayQueue q = new DelayQueue();
627		q.add(new PDelay(2));
628		q.add(new PDelay(1));
#	Line 799 | Line 631 | public class DelayQueueTest extends JSR1
631		it.next();
632		it.remove();
633		it = q.iterator();
634	<	assertEquals(it.next(), new PDelay(2));
635	<	assertEquals(it.next(), new PDelay(3));
634	>	assertEquals(new PDelay(2), it.next());
635	>	assertEquals(new PDelay(3), it.next());
636		assertFalse(it.hasNext());
637		}
638
807	–
639		/**
640		* toString contains toStrings of elements
641		*/
642		public void testToString() {
643		DelayQueue q = populatedQueue(SIZE);
644		String s = q.toString();
645	<	for (int i = 0; i < SIZE; ++i) {
646	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
647	<	}
817	<	}
645	>	for (Object e : q)
646	>	assertTrue(s.contains(e.toString()));
647	>	}
648
649		/**
650	<	* offer transfers elements across Executor tasks
650	>	* timed poll transfers elements across Executor tasks
651		*/
652		public void testPollInExecutor() {
653		final DelayQueue q = new DelayQueue();
654	<	ExecutorService executor = Executors.newFixedThreadPool(2);
655	<	executor.execute(new Runnable() {
656	<	public void run() {
657	<	threadAssertNull(q.poll());
658	<	try {
659	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
660	<	threadAssertTrue(q.isEmpty());
661	<	}
662	<	catch (InterruptedException e) {
663	<	threadUnexpectedException();
834	<	}
835	<	}
836	<	});
654	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
655	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
656	>	try (PoolCleaner cleaner = cleaner(executor)) {
657	>	executor.execute(new CheckedRunnable() {
658	>	public void realRun() throws InterruptedException {
659	>	assertNull(q.poll());
660	>	threadsStarted.await();
661	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
662	>	checkEmpty(q);
663	>	}});
664
665	<	executor.execute(new Runnable() {
666	<	public void run() {
667	<	try {
841	<	Thread.sleep(SHORT_DELAY_MS);
665	>	executor.execute(new CheckedRunnable() {
666	>	public void realRun() throws InterruptedException {
667	>	threadsStarted.await();
668		q.put(new PDelay(1));
669	<	}
670	<	catch (InterruptedException e) {
845	<	threadUnexpectedException();
846	<	}
847	<	}
848	<	});
849	<	joinPool(executor);
850	<
669	>	}});
670	>	}
671		}
672
853	–
673		/**
674	<	* Dekayed actions do not occur until their delay elapses
674	>	* Delayed actions do not occur until their delay elapses
675		*/
676	<	public void testDelay() {
677	<	DelayQueue q = new DelayQueue();
678	<	NanoDelay[] elements = new NanoDelay[SIZE];
679	<	for (int i = 0; i < SIZE; ++i) {
680	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
681	<	}
682	<	for (int i = 0; i < SIZE; ++i) {
683	<	q.add(elements[i]);
684	<	}
685	<
686	<	try {
687	<	long last = 0;
688	<	for (int i = 0; i < SIZE; ++i) {
870	<	NanoDelay e = (NanoDelay)(q.take());
871	<	long tt = e.getTriggerTime();
872	<	assertTrue(tt <= System.nanoTime());
873	<	if (i != 0)
874	<	assertTrue(tt >= last);
875	<	last = tt;
876	<	}
877	<	}
878	<	catch(InterruptedException ie) {
879	<	unexpectedException();
676	>	public void testDelay() throws InterruptedException {
677	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
678	>	for (int i = 0; i < SIZE; ++i)
679	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
680	>
681	>	long last = 0;
682	>	for (int i = 0; i < SIZE; ++i) {
683	>	NanoDelay e = q.take();
684	>	long tt = e.getTriggerTime();
685	>	assertTrue(System.nanoTime() - tt >= 0);
686	>	if (i != 0)
687	>	assertTrue(tt >= last);
688	>	last = tt;
689		}
690	+	assertTrue(q.isEmpty());
691		}
692
693	+	/**
694	+	* peek of a non-empty queue returns non-null even if not expired
695	+	*/
696	+	public void testPeekDelayed() {
697	+	DelayQueue q = new DelayQueue();
698	+	q.add(new NanoDelay(Long.MAX_VALUE));
699	+	assertNotNull(q.peek());
700	+	}
701
702		/**
703	<	* drainTo(null) throws NPE
704	<	*/
705	<	public void testDrainToNull() {
706	<	DelayQueue q = populatedQueue(SIZE);
707	<	try {
708	<	q.drainTo(null);
891	<	shouldThrow();
892	<	} catch(NullPointerException success) {
893	<	}
703	>	* poll of a non-empty queue returns null if no expired elements.
704	>	*/
705	>	public void testPollDelayed() {
706	>	DelayQueue q = new DelayQueue();
707	>	q.add(new NanoDelay(Long.MAX_VALUE));
708	>	assertNull(q.poll());
709		}
710
711		/**
712	<	* drainTo(this) throws IAE
713	<	*/
714	<	public void testDrainToSelf() {
715	<	DelayQueue q = populatedQueue(SIZE);
716	<	try {
717	<	q.drainTo(q);
718	<	shouldThrow();
719	<	} catch(IllegalArgumentException success) {
905	<	}
712	>	* timed poll of a non-empty queue returns null if no expired elements.
713	>	*/
714	>	public void testTimedPollDelayed() throws InterruptedException {
715	>	DelayQueue q = new DelayQueue();
716	>	q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
717	>	long startTime = System.nanoTime();
718	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
719	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
720		}
721
722		/**
723		* drainTo(c) empties queue into another collection c
724	<	*/
724	>	*/
725		public void testDrainTo() {
726	<	DelayQueue q = populatedQueue(SIZE);
726	>	DelayQueue q = new DelayQueue();
727	>	PDelay[] elems = new PDelay[SIZE];
728	>	for (int i = 0; i < SIZE; ++i) {
729	>	elems[i] = new PDelay(i);
730	>	q.add(elems[i]);
731	>	}
732		ArrayList l = new ArrayList();
733		q.drainTo(l);
734	<	assertEquals(q.size(), 0);
735	<	assertEquals(l.size(), SIZE);
734	>	assertEquals(0, q.size());
735	>	for (int i = 0; i < SIZE; ++i)
736	>	assertEquals(elems[i], l.get(i));
737	>	q.add(elems[0]);
738	>	q.add(elems[1]);
739	>	assertFalse(q.isEmpty());
740	>	assertTrue(q.contains(elems[0]));
741	>	assertTrue(q.contains(elems[1]));
742	>	l.clear();
743	>	q.drainTo(l);
744	>	assertEquals(0, q.size());
745	>	assertEquals(2, l.size());
746	>	for (int i = 0; i < 2; ++i)
747	>	assertEquals(elems[i], l.get(i));
748		}
749
750		/**
751		* drainTo empties queue
752	<	*/
753	<	public void testDrainToWithActivePut() {
752	>	*/
753	>	public void testDrainToWithActivePut() throws InterruptedException {
754		final DelayQueue q = populatedQueue(SIZE);
755	<	Thread t = new Thread(new Runnable() {
756	<	public void run() {
757	<	q.put(new PDelay(SIZE+1));
758	<	}
928	<	});
929	<	try {
930	<	t.start();
931	<	ArrayList l = new ArrayList();
932	<	q.drainTo(l);
933	<	assertTrue(l.size() >= SIZE);
934	<	t.join();
935	<	assertTrue(q.size() + l.size() == SIZE+1);
936	<	} catch(Exception e){
937	<	unexpectedException();
938	<	}
939	<	}
940	<
941	<	/**
942	<	* drainTo(null, n) throws NPE
943	<	*/
944	<	public void testDrainToNullN() {
945	<	DelayQueue q = populatedQueue(SIZE);
946	<	try {
947	<	q.drainTo(null, 0);
948	<	shouldThrow();
949	<	} catch(NullPointerException success) {
950	<	}
951	<	}
755	>	Thread t = new Thread(new CheckedRunnable() {
756	>	public void realRun() {
757	>	q.put(new PDelay(SIZE + 1));
758	>	}});
759
760	<	/**
761	<	* drainTo(this, n) throws IAE
762	<	*/
763	<	public void testDrainToSelfN() {
764	<	DelayQueue q = populatedQueue(SIZE);
765	<	try {
959	<	q.drainTo(q, 0);
960	<	shouldThrow();
961	<	} catch(IllegalArgumentException success) {
962	<	}
760	>	t.start();
761	>	ArrayList l = new ArrayList();
762	>	q.drainTo(l);
763	>	assertTrue(l.size() >= SIZE);
764	>	t.join();
765	>	assertTrue(q.size() + l.size() >= SIZE);
766		}
767
768		/**
769	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
770	<	*/
769	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
770	>	*/
771		public void testDrainToN() {
772		for (int i = 0; i < SIZE + 2; ++i) {
773		DelayQueue q = populatedQueue(SIZE);
774		ArrayList l = new ArrayList();
775		q.drainTo(l, i);
776	<	int k = (i < SIZE)? i : SIZE;
777	<	assertEquals(q.size(), SIZE-k);
778	<	assertEquals(l.size(), k);
776	>	int k = (i < SIZE) ? i : SIZE;
777	>	assertEquals(SIZE - k, q.size());
778	>	assertEquals(k, l.size());
779		}
780		}
781
782	<
782	>	/**
783	>	* remove(null), contains(null) always return false
784	>	*/
785	>	public void testNeverContainsNull() {
786	>	Collection<?> q = populatedQueue(SIZE);
787	>	assertFalse(q.contains(null));
788	>	assertFalse(q.remove(null));
789	>	}
790		}

Diff Legend

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