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.19 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.84 by jsr166, Sat May 13 22:21:55 2017 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 = ((PDelay)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	<	int i = pseudodelay;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	return 0;
63	>	return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay);
64		}
48	–
65		public boolean equals(Object other) {
66	<	return ((PDelay)other).pseudodelay == pseudodelay;
66	>	return (other instanceof PDelay) &&
67	>	this.pseudodelay == ((PDelay)other).pseudodelay;
68		}
69	<	public boolean equals(PDelay other) {
70	<	return ((PDelay)other).pseudodelay == pseudodelay;
54	<	}
55	<
56	<
69	>	// suppress [overrides] javac warning
70	>	public int hashCode() { return pseudodelay; }
71		public long getDelay(TimeUnit ignore) {
72	<	return pseudodelay;
59	<	}
60	<	public int intValue() {
61	<	return pseudodelay;
72	>	return Integer.MIN_VALUE + pseudodelay;
73		}
63	–
74		public String toString() {
75		return String.valueOf(pseudodelay);
76		}
77		}
78
69	–
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		}
78	–	public int compareTo(NanoDelay y) {
79	–	long i = trigger;
80	–	long j = ((NanoDelay)y).trigger;
81	–	if (i < j) return -1;
82	–	if (i > j) return 1;
83	–	return 0;
84	–	}
87
88		public int compareTo(Delayed y) {
89	<	long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	return 0;
89	>	return Long.compare(trigger, ((NanoDelay)y).trigger);
90		}
91
92		public boolean equals(Object other) {
93	<	return ((NanoDelay)other).trigger == trigger;
94	<	}
97	<	public boolean equals(NanoDelay other) {
98	<	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 112 | Line 111 | public class DelayQueueTest extends JSR1
111		}
112		}
113
115	–
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());
126	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
127		assertEquals(n, q.size());
128	+	assertEquals(new PDelay(0), q.peek());
129		return q;
130		}
131
#	Line 134 | Line 133 | public class DelayQueueTest extends JSR1
133		* A new queue has unbounded capacity
134		*/
135		public void testConstructor1() {
136	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
136	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
137		}
138
139		/**
#	Line 142 | 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	<	}
148	<	catch (NullPointerException success) {}
146	>	} catch (NullPointerException success) {}
147		}
148
149		/**
#	Line 153 | Line 151 | public class DelayQueueTest extends JSR1
151		*/
152		public void testConstructor4() {
153		try {
154	<	PDelay[] ints = new PDelay[SIZE];
157	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
154	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
155		shouldThrow();
156	<	}
160	<	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];
169	<	for (int i = 0; i < SIZE-1; ++i)
170	<	ints[i] = new PDelay(i);
171	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
167	>	new DelayQueue(Arrays.asList(a));
168		shouldThrow();
169	<	}
174	<	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)
187	<	assertEquals(ints[i], q.poll());
188	<	}
189	<	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 195 | 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 205 | Line 197 | public class DelayQueueTest extends JSR1
197		}
198
199		/**
200	<	* remainingCapacity does not change when elementa added or removed,
209	<	* 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		/**
226	–	* offer(null) throws NPE
227	–	*/
228	–	public void testOfferNull() {
229	–	try {
230	–	DelayQueue q = new DelayQueue();
231	–	q.offer(null);
232	–	shouldThrow();
233	–	} catch (NullPointerException success) { }
234	–	}
235	–
236	–	/**
237	–	* add(null) throws NPE
238	–	*/
239	–	public void testAddNull() {
240	–	try {
241	–	DelayQueue q = new DelayQueue();
242	–	q.add(null);
243	–	shouldThrow();
244	–	} catch (NullPointerException success) { }
245	–	}
246	–
247	–	/**
217		* offer non-null succeeds
218		*/
219		public void testOffer() {
#	Line 265 | Line 234 | public class DelayQueueTest extends JSR1
234		}
235
236		/**
268	–	* addAll(null) throws NPE
269	–	*/
270	–	public void testAddAll1() {
271	–	try {
272	–	DelayQueue q = new DelayQueue();
273	–	q.addAll(null);
274	–	shouldThrow();
275	–	}
276	–	catch (NullPointerException success) {}
277	–	}
278	–
279	–
280	–	/**
237		* addAll(this) throws IAE
238		*/
239		public void testAddAllSelf() {
240	+	DelayQueue q = populatedQueue(SIZE);
241		try {
285	–	DelayQueue q = populatedQueue(SIZE);
242		q.addAll(q);
243		shouldThrow();
244	<	}
289	<	catch (IllegalArgumentException success) {}
244	>	} catch (IllegalArgumentException success) {}
245		}
246
247		/**
293	–	* addAll of a collection with null elements throws NPE
294	–	*/
295	–	public void testAddAll2() {
296	–	try {
297	–	DelayQueue q = new DelayQueue();
298	–	PDelay[] ints = new PDelay[SIZE];
299	–	q.addAll(Arrays.asList(ints));
300	–	shouldThrow();
301	–	}
302	–	catch (NullPointerException success) {}
303	–	}
304	–	/**
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();
311	<	PDelay[] ints = new PDelay[SIZE];
312	<	for (int i = 0; i < SIZE-1; ++i)
313	<	ints[i] = new PDelay(i);
314	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(a));
258		shouldThrow();
259	<	}
317	<	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)
333	<	assertEquals(ints[i], q.poll());
334	<	}
335	<	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		/**
339	–	* put(null) throws NPE
340	–	*/
341	–	public void testPutNull() {
342	–	try {
343	–	DelayQueue q = new DelayQueue();
344	–	q.put(null);
345	–	shouldThrow();
346	–	}
347	–	catch (NullPointerException success) {
348	–	}
349	–	}
350	–
351	–	/**
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);
360	<	assertTrue(q.contains(I));
361	<	}
362	<	assertEquals(SIZE, q.size());
363	<	}
364	<	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;
383	<	q.put(new PDelay(0));
384	<	++added;
385	<	threadAssertTrue(added == 4);
386	<	} finally {
387	<	}
388	<	}
389	<	});
390	<	try {
391	<	t.start();
392	<	Thread.sleep(SHORT_DELAY_MS);
393	<	q.take();
394	<	t.interrupt();
395	<	t.join();
396	<	} catch (Exception e) {
397	<	unexpectedException();
398	<	}
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, MILLISECONDS));
318	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
413	<	} finally { }
414	<	}
415	<	});
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	<	try {
418	<	t.start();
419	<	Thread.sleep(SMALL_DELAY_MS);
420	<	t.interrupt();
421	<	t.join();
422	<	} catch (Exception e) {
423	<	unexpectedException();
424	<	}
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) {
434	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
435	<	}
436	<	} catch (InterruptedException e) {
437	<	unexpectedException();
438	<	}
439	<	}
440	<
441	<	/**
442	<	* take blocks interruptibly when empty
443	<	*/
444	<	public void testTakeFromEmpty() {
445	<	final DelayQueue q = new DelayQueue();
446	<	Thread t = new Thread(new Runnable() {
447	<	public void run() {
448	<	try {
449	<	q.take();
450	<	threadShouldThrow();
451	<	} catch (InterruptedException success) { }
452	<	}
453	<	});
454	<	try {
455	<	t.start();
456	<	Thread.sleep(SHORT_DELAY_MS);
457	<	t.interrupt();
458	<	t.join();
459	<	} catch (Exception e) {
460	<	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();
481	<	try {
482	<	Thread.sleep(SHORT_DELAY_MS);
483	<	t.interrupt();
484	<	t.join();
485	<	}
486	<	catch (InterruptedException ie) {
487	<	unexpectedException();
488	<	}
489	<	}
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 495 | Line 368 | public class DelayQueueTest extends JSR1
368		public void testPoll() {
369		DelayQueue q = populatedQueue(SIZE);
370		for (int i = 0; i < SIZE; ++i) {
371	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
371	>	assertEquals(new PDelay(i), q.poll());
372		}
373		assertNull(q.poll());
374		}
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) {
510	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
511	<	}
512	<	assertNull(q.poll(0, MILLISECONDS));
513	<	} catch (InterruptedException e) {
514	<	unexpectedException();
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, MILLISECONDS)));
395	<	}
527	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
528	<	} catch (InterruptedException e) {
529	<	unexpectedException();
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, MILLISECONDS)));
414	<	}
415	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
546	<	} catch (InterruptedException success) {
547	<	}
548	<	}});
549	<	t.start();
550	<	try {
551	<	Thread.sleep(SHORT_DELAY_MS);
552	<	t.interrupt();
553	<	t.join();
554	<	}
555	<	catch (InterruptedException ie) {
556	<	unexpectedException();
557	<	}
558	<	}
559	<
560	<	/**
561	<	*  timed poll before a delayed offer fails; after offer succeeds;
562	<	*  on interruption throws
563	<	*/
564	<	public void testTimedPollWithOffer() {
565	<	final DelayQueue q = new DelayQueue();
566	<	Thread t = new Thread(new Runnable() {
567	<	public void run() {
568	<	try {
569	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
570	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
571	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
572	<	threadFail("Should block");
573	<	} 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		}
575	–	});
576	–	try {
577	–	t.start();
578	–	Thread.sleep(SMALL_DELAY_MS);
579	–	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
580	–	t.interrupt();
581	–	t.join();
582	–	} catch (Exception e) {
583	–	unexpectedException();
584	–	}
585	–	}
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	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
432	+	}});
433	+
434	+	await(pleaseInterrupt);
435	+	assertThreadStaysAlive(t);
436	+	t.interrupt();
437	+	awaitTermination(t);
438	+	checkEmpty(q);
439	+	}
440
441		/**
442		* peek returns next element, or null if empty
#	Line 591 | Line 444 | public class DelayQueueTest extends JSR1
444		public void testPeek() {
445		DelayQueue q = populatedQueue(SIZE);
446		for (int i = 0; i < SIZE; ++i) {
447	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
448	<	q.poll();
447	>	assertEquals(new PDelay(i), q.peek());
448	>	assertEquals(new PDelay(i), q.poll());
449		if (q.isEmpty())
450		assertNull(q.peek());
451		else
452	<	assertTrue(i != ((PDelay)q.peek()).intValue());
452	>	assertFalse(new PDelay(i).equals(q.peek()));
453		}
454		assertNull(q.peek());
455		}
#	Line 607 | Line 460 | public class DelayQueueTest extends JSR1
460		public void testElement() {
461		DelayQueue q = populatedQueue(SIZE);
462		for (int i = 0; i < SIZE; ++i) {
463	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
463	>	assertEquals(new PDelay(i), q.element());
464		q.poll();
465		}
466		try {
467		q.element();
468		shouldThrow();
469	<	}
617	<	catch (NoSuchElementException success) {}
469	>	} catch (NoSuchElementException success) {}
470		}
471
472		/**
#	Line 623 | Line 475 | public class DelayQueueTest extends JSR1
475		public void testRemove() {
476		DelayQueue q = populatedQueue(SIZE);
477		for (int i = 0; i < SIZE; ++i) {
478	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
478	>	assertEquals(new PDelay(i), q.remove());
479		}
480		try {
481		q.remove();
482		shouldThrow();
483	<	} catch (NoSuchElementException success) {
632	<	}
633	<	}
634	<
635	<	/**
636	<	* remove(x) removes x and returns true if present
637	<	*/
638	<	public void testRemoveElement() {
639	<	DelayQueue q = populatedQueue(SIZE);
640	<	for (int i = 1; i < SIZE; i+=2) {
641	<	assertTrue(q.remove(new PDelay(i)));
642	<	}
643	<	for (int i = 0; i < SIZE; i+=2) {
644	<	assertTrue(q.remove(new PDelay(i)));
645	<	assertFalse(q.remove(new PDelay(i+1)));
646	<	}
647	<	assertTrue(q.isEmpty());
483	>	} catch (NoSuchElementException success) {}
484		}
485
486		/**
#	Line 667 | Line 503 | public class DelayQueueTest extends JSR1
503		q.clear();
504		assertTrue(q.isEmpty());
505		assertEquals(0, q.size());
506	<	assertEquals(NOCAP, q.remainingCapacity());
506	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
507		PDelay x = new PDelay(1);
508		q.add(x);
509		assertFalse(q.isEmpty());
#	Line 704 | Line 540 | public class DelayQueueTest extends JSR1
540		assertTrue(changed);
541
542		assertTrue(q.containsAll(p));
543	<	assertEquals(SIZE-i, q.size());
543	>	assertEquals(SIZE - i, q.size());
544		p.remove();
545		}
546		}
#	Line 717 | Line 553 | public class DelayQueueTest extends JSR1
553		DelayQueue q = populatedQueue(SIZE);
554		DelayQueue p = populatedQueue(i);
555		assertTrue(q.removeAll(p));
556	<	assertEquals(SIZE-i, q.size());
556	>	assertEquals(SIZE - i, q.size());
557		for (int j = 0; j < i; ++j) {
558	<	PDelay I = (PDelay)(p.remove());
559	<	assertFalse(q.contains(I));
558	>	PDelay x = (PDelay)(p.remove());
559	>	assertFalse(q.contains(x));
560		}
561		}
562		}
#	Line 728 | Line 564 | public class DelayQueueTest extends JSR1
564		/**
565		* toArray contains all elements
566		*/
567	<	public void testToArray() {
567	>	public void testToArray() throws InterruptedException {
568		DelayQueue q = populatedQueue(SIZE);
569		Object[] o = q.toArray();
570		Arrays.sort(o);
735	–	try {
571		for (int i = 0; i < o.length; i++)
572	<	assertEquals(o[i], q.take());
738	<	} catch (InterruptedException e) {
739	<	unexpectedException();
740	<	}
572	>	assertSame(o[i], q.take());
573		}
574
575		/**
576		* toArray(a) contains all elements
577		*/
578		public void testToArray2() {
579	<	DelayQueue q = populatedQueue(SIZE);
579	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
580		PDelay[] ints = new PDelay[SIZE];
581	<	ints = (PDelay[])q.toArray(ints);
581	>	PDelay[] array = q.toArray(ints);
582	>	assertSame(ints, array);
583		Arrays.sort(ints);
584	<	try {
585	<	for (int i = 0; i < ints.length; i++)
753	<	assertEquals(ints[i], q.take());
754	<	} catch (InterruptedException e) {
755	<	unexpectedException();
756	<	}
757	<	}
758	<
759	<
760	<	/**
761	<	* toArray(null) throws NPE
762	<	*/
763	<	public void testToArray_BadArg() {
764	<	try {
765	<	DelayQueue q = populatedQueue(SIZE);
766	<	Object o[] = q.toArray(null);
767	<	shouldThrow();
768	<	} catch (NullPointerException success) {}
584	>	for (int i = 0; i < ints.length; i++)
585	>	assertSame(ints[i], q.remove());
586		}
587
588		/**
589	<	* toArray with incompatible array type throws CCE
589	>	* toArray(incompatible array type) throws ArrayStoreException
590		*/
591		public void testToArray1_BadArg() {
592	+	DelayQueue q = populatedQueue(SIZE);
593		try {
594	<	DelayQueue q = populatedQueue(SIZE);
777	<	Object o[] = q.toArray(new String[10] );
594	>	q.toArray(new String[10]);
595		shouldThrow();
596	<	} catch (ArrayStoreException  success) {}
596	>	} catch (ArrayStoreException success) {}
597		}
598
599		/**
#	Line 791 | Line 608 | public class DelayQueueTest extends JSR1
608		++i;
609		}
610		assertEquals(i, SIZE);
611	+	assertIteratorExhausted(it);
612	+	}
613	+
614	+	/**
615	+	* iterator of empty collection has no elements
616	+	*/
617	+	public void testEmptyIterator() {
618	+	assertIteratorExhausted(new DelayQueue().iterator());
619		}
620
621		/**
622		* iterator.remove removes current element
623		*/
624	<	public void testIteratorRemove () {
624	>	public void testIteratorRemove() {
625		final DelayQueue q = new DelayQueue();
626		q.add(new PDelay(2));
627		q.add(new PDelay(1));
#	Line 805 | Line 630 | public class DelayQueueTest extends JSR1
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	>	assertEquals(new PDelay(2), it.next());
634	>	assertEquals(new PDelay(3), it.next());
635		assertFalse(it.hasNext());
636		}
637
813	–
638		/**
639		* toString contains toStrings of elements
640		*/
641		public void testToString() {
642		DelayQueue 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);
822	<	}
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 Runnable() {
655	<	public void run() {
656	<	threadAssertNull(q.poll());
657	<	try {
658	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
659	<	threadAssertTrue(q.isEmpty());
660	<	}
661	<	catch (InterruptedException e) {
662	<	threadUnexpectedException();
840	<	}
841	<	}
842	<	});
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 Runnable() {
665	<	public void run() {
666	<	try {
847	<	Thread.sleep(SHORT_DELAY_MS);
664	>	executor.execute(new CheckedRunnable() {
665	>	public void realRun() throws InterruptedException {
666	>	threadsStarted.await();
667		q.put(new PDelay(1));
668	<	}
669	<	catch (InterruptedException e) {
851	<	threadUnexpectedException();
852	<	}
853	<	}
854	<	});
855	<	joinPool(executor);
856	<
668	>	}});
669	>	}
670		}
671
859	–
672		/**
673		* Delayed actions do not occur until their delay elapses
674		*/
675	<	public void testDelay() {
676	<	DelayQueue q = new DelayQueue();
677	<	NanoDelay[] elements = new NanoDelay[SIZE];
678	<	for (int i = 0; i < SIZE; ++i) {
867	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
868	<	}
869	<	for (int i = 0; i < SIZE; ++i) {
870	<	q.add(elements[i]);
871	<	}
675	>	public void testDelay() throws InterruptedException {
676	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
677	>	for (int i = 0; i < SIZE; ++i)
678	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
679
680	<	try {
681	<	long last = 0;
682	<	for (int i = 0; i < SIZE; ++i) {
683	<	NanoDelay e = (NanoDelay)(q.take());
684	<	long tt = e.getTriggerTime();
685	<	assertTrue(tt <= System.nanoTime());
686	<	if (i != 0)
687	<	assertTrue(tt >= last);
881	<	last = tt;
882	<	}
883	<	}
884	<	catch (InterruptedException ie) {
885	<	unexpectedException();
680	>	long last = 0;
681	>	for (int i = 0; i < SIZE; ++i) {
682	>	NanoDelay e = q.take();
683	>	long tt = e.getTriggerTime();
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		/**
#	Line 892 | Line 695 | public class DelayQueueTest extends JSR1
695		public void testPeekDelayed() {
696		DelayQueue q = new DelayQueue();
697		q.add(new NanoDelay(Long.MAX_VALUE));
698	<	assert(q.peek() != null);
698	>	assertNotNull(q.peek());
699		}
700
898	–
701		/**
702		* poll of a non-empty queue returns null if no expired elements.
703		*/
#	Line 908 | Line 710 | public class DelayQueueTest extends JSR1
710		/**
711		* timed poll of a non-empty queue returns null if no expired elements.
712		*/
713	<	public void testTimedPollDelayed() {
713	>	public void testTimedPollDelayed() throws InterruptedException {
714		DelayQueue q = new DelayQueue();
715		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
716	<	try {
717	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
718	<	} catch (Exception ex) {
917	<	unexpectedException();
918	<	}
919	<	}
920	<
921	<	/**
922	<	* drainTo(null) throws NPE
923	<	*/
924	<	public void testDrainToNull() {
925	<	DelayQueue q = populatedQueue(SIZE);
926	<	try {
927	<	q.drainTo(null);
928	<	shouldThrow();
929	<	} catch (NullPointerException success) {
930	<	}
931	<	}
932	<
933	<	/**
934	<	* drainTo(this) throws IAE
935	<	*/
936	<	public void testDrainToSelf() {
937	<	DelayQueue q = populatedQueue(SIZE);
938	<	try {
939	<	q.drainTo(q);
940	<	shouldThrow();
941	<	} catch (IllegalArgumentException success) {
942	<	}
716	>	long startTime = System.nanoTime();
717	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
718	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
719		}
720
721		/**
#	Line 954 | Line 730 | public class DelayQueueTest extends JSR1
730		}
731		ArrayList l = new ArrayList();
732		q.drainTo(l);
733	<	assertEquals(q.size(), 0);
733	>	assertEquals(0, q.size());
734		for (int i = 0; i < SIZE; ++i)
735	<	assertEquals(l.get(i), elems[i]);
735	>	assertEquals(elems[i], l.get(i));
736		q.add(elems[0]);
737		q.add(elems[1]);
738		assertFalse(q.isEmpty());
#	Line 964 | 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	>	assertEquals(0, q.size());
744	>	assertEquals(2, l.size());
745		for (int i = 0; i < 2; ++i)
746	<	assertEquals(l.get(i), elems[i]);
746	>	assertEquals(elems[i], l.get(i));
747		}
748
749		/**
750		* drainTo empties queue
751		*/
752	<	public void testDrainToWithActivePut() {
752	>	public void testDrainToWithActivePut() throws InterruptedException {
753		final DelayQueue q = populatedQueue(SIZE);
754	<	Thread t = new Thread(new Runnable() {
755	<	public void run() {
756	<	q.put(new PDelay(SIZE+1));
757	<	}
982	<	});
983	<	try {
984	<	t.start();
985	<	ArrayList l = new ArrayList();
986	<	q.drainTo(l);
987	<	assertTrue(l.size() >= SIZE);
988	<	t.join();
989	<	assertTrue(q.size() + l.size() >= SIZE);
990	<	} catch (Exception e) {
991	<	unexpectedException();
992	<	}
993	<	}
994	<
995	<	/**
996	<	* drainTo(null, n) throws NPE
997	<	*/
998	<	public void testDrainToNullN() {
999	<	DelayQueue q = populatedQueue(SIZE);
1000	<	try {
1001	<	q.drainTo(null, 0);
1002	<	shouldThrow();
1003	<	} catch (NullPointerException success) {
1004	<	}
1005	<	}
754	>	Thread t = new Thread(new CheckedRunnable() {
755	>	public void realRun() {
756	>	q.put(new PDelay(SIZE + 1));
757	>	}});
758
759	<	/**
760	<	* drainTo(this, n) throws IAE
761	<	*/
762	<	public void testDrainToSelfN() {
763	<	DelayQueue q = populatedQueue(SIZE);
764	<	try {
1013	<	q.drainTo(q, 0);
1014	<	shouldThrow();
1015	<	} catch (IllegalArgumentException success) {
1016	<	}
759	>	t.start();
760	>	ArrayList l = new ArrayList();
761	>	q.drainTo(l);
762	>	assertTrue(l.size() >= SIZE);
763	>	t.join();
764	>	assertTrue(q.size() + l.size() >= SIZE);
765		}
766
767		/**
768	<	* 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();
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	>	assertEquals(SIZE - k, q.size());
777	>	assertEquals(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