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.5 by dl, Thu Sep 25 11:02:41 2003 UTC vs.
Revision 1.76 by jsr166, Tue Oct 6 00:03:55 2015 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	>	return newTestSuite(DelayQueueTest.class,
43	>	new Generic().testSuite());
44		}
45
21	–	private static final int NOCAP = Integer.MAX_VALUE;
22	–
46		/**
47	<	* A delayed implmentation for testing.
48	<	* Most  tests use Pseudodelays, where delays are all elapsed
47	>	* A delayed implementation for testing.
48	>	* Most tests use Pseudodelays, where delays are all elapsed
49		* (so, no blocking solely for delays) but are still ordered
50	<	*/
51	<	static class PDelay implements Delayed {
50	>	*/
51	>	static class PDelay implements Delayed {
52		int pseudodelay;
53	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
54	<	public int compareTo(Object y) {
55	<	int i = pseudodelay;
56	<	int j = ((PDelay)y).pseudodelay;
57	<	if (i < j) return -1;
35	<	if (i > j) return 1;
36	<	return 0;
53	>	PDelay(int i) { pseudodelay = i; }
54	>	public int compareTo(PDelay other) {
55	>	int a = this.pseudodelay;
56	>	int b = other.pseudodelay;
57	>	return (a < b) ? -1 : (a > b) ? 1 : 0;
58		}
59	<
60	<	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;
59	>	public int compareTo(Delayed y) {
60	>	return compareTo((PDelay)y);
61		}
46	–
62		public boolean equals(Object other) {
63	<	return ((PDelay)other).pseudodelay == pseudodelay;
64	<	}
50	<	public boolean equals(PDelay other) {
51	<	return ((PDelay)other).pseudodelay == pseudodelay;
63	>	return (other instanceof PDelay) &&
64	>	this.pseudodelay == ((PDelay)other).pseudodelay;
65		}
66	<
67	<
66	>	// suppress [overrides] javac warning
67	>	public int hashCode() { return pseudodelay; }
68		public long getDelay(TimeUnit ignore) {
69	<	return pseudodelay;
57	<	}
58	<	public int intValue() {
59	<	return pseudodelay;
69	>	return Integer.MIN_VALUE + pseudodelay;
70		}
61	–
71		public String toString() {
72		return String.valueOf(pseudodelay);
73		}
74		}
75
67	–
76		/**
77		* Delayed implementation that actually delays
78		*/
79	<	static class NanoDelay implements Delayed {
79	>	static class NanoDelay implements Delayed {
80		long trigger;
81	<	NanoDelay(long i) {
81	>	NanoDelay(long i) {
82		trigger = System.nanoTime() + i;
83		}
84	<	public int compareTo(Object y) {
84	>	public int compareTo(NanoDelay y) {
85		long i = trigger;
86	<	long j = ((NanoDelay)y).trigger;
86	>	long j = y.trigger;
87		if (i < j) return -1;
88		if (i > j) return 1;
89		return 0;
90		}
91
92	<	public int compareTo(NanoDelay y) {
93	<	long i = trigger;
86	<	long j = ((NanoDelay)y).trigger;
87	<	if (i < j) return -1;
88	<	if (i > j) return 1;
89	<	return 0;
92	>	public int compareTo(Delayed y) {
93	>	return compareTo((NanoDelay)y);
94		}
95
96		public boolean equals(Object other) {
97	<	return ((NanoDelay)other).trigger == trigger;
97	>	return equals((NanoDelay)other);
98		}
99		public boolean equals(NanoDelay other) {
100	<	return ((NanoDelay)other).trigger == trigger;
100	>	return other.trigger == trigger;
101		}
102
103	+	// suppress [overrides] javac warning
104	+	public int hashCode() { return (int) trigger; }
105	+
106		public long getDelay(TimeUnit unit) {
107		long n = trigger - System.nanoTime();
108		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 110 | Line 117 | public class DelayQueueTest extends JSR1
117		}
118		}
119
113	–
120		/**
121	<	* Create a queue of given size containing consecutive
121	>	* Returns a new queue of given size containing consecutive
122		* PDelays 0 ... n.
123		*/
124	<	private DelayQueue populatedQueue(int n) {
125	<	DelayQueue q = new DelayQueue();
124	>	private DelayQueue<PDelay> populatedQueue(int n) {
125	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
126		assertTrue(q.isEmpty());
127	<	for(int i = n-1; i >= 0; i-=2)
128	<	assertTrue(q.offer(new PDelay(i)));
129	<	for(int i = (n & 1); i < n; i+=2)
130	<	assertTrue(q.offer(new PDelay(i)));
127	>	for (int i = n - 1; i >= 0; i -= 2)
128	>	assertTrue(q.offer(new PDelay(i)));
129	>	for (int i = (n & 1); i < n; i += 2)
130	>	assertTrue(q.offer(new PDelay(i)));
131		assertFalse(q.isEmpty());
132	<	assertEquals(NOCAP, q.remainingCapacity());
133	<	assertEquals(n, q.size());
132	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
133	>	assertEquals(n, q.size());
134		return q;
135		}
136	<
136	>
137		/**
138		* A new queue has unbounded capacity
139		*/
140		public void testConstructor1() {
141	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
141	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
142		}
143
144		/**
#	Line 140 | Line 146 | public class DelayQueueTest extends JSR1
146		*/
147		public void testConstructor3() {
148		try {
149	<	DelayQueue q = new DelayQueue(null);
149	>	new DelayQueue(null);
150		shouldThrow();
151	<	}
146	<	catch (NullPointerException success) {}
151	>	} catch (NullPointerException success) {}
152		}
153
154		/**
#	Line 151 | Line 156 | public class DelayQueueTest extends JSR1
156		*/
157		public void testConstructor4() {
158		try {
159	<	PDelay[] ints = new PDelay[SIZE];
155	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
159	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
160		shouldThrow();
161	<	}
158	<	catch (NullPointerException success) {}
161	>	} catch (NullPointerException success) {}
162		}
163
164		/**
165		* Initializing from Collection with some null elements throws NPE
166		*/
167		public void testConstructor5() {
168	+	PDelay[] a = new PDelay[SIZE];
169	+	for (int i = 0; i < SIZE - 1; ++i)
170	+	a[i] = new PDelay(i);
171		try {
172	<	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));
172	>	new DelayQueue(Arrays.asList(a));
173		shouldThrow();
174	<	}
172	<	catch (NullPointerException success) {}
174	>	} catch (NullPointerException success) {}
175		}
176
177		/**
178		* Queue contains all elements of collection used to initialize
179		*/
180		public void testConstructor6() {
181	<	try {
182	<	PDelay[] ints = new PDelay[SIZE];
183	<	for (int i = 0; i < SIZE; ++i)
184	<	ints[i] = new PDelay(i);
185	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
186	<	for (int i = 0; i < SIZE; ++i)
185	<	assertEquals(ints[i], q.poll());
186	<	}
187	<	finally {}
181	>	PDelay[] ints = new PDelay[SIZE];
182	>	for (int i = 0; i < SIZE; ++i)
183	>	ints[i] = new PDelay(i);
184	>	DelayQueue q = new DelayQueue(Arrays.asList(ints));
185	>	for (int i = 0; i < SIZE; ++i)
186	>	assertEquals(ints[i], q.poll());
187		}
188
189		/**
#	Line 193 | Line 192 | public class DelayQueueTest extends JSR1
192		public void testEmpty() {
193		DelayQueue q = new DelayQueue();
194		assertTrue(q.isEmpty());
195	<	assertEquals(NOCAP, q.remainingCapacity());
195	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
196		q.add(new PDelay(1));
197		assertFalse(q.isEmpty());
198		q.add(new PDelay(2));
#	Line 203 | Line 202 | public class DelayQueueTest extends JSR1
202		}
203
204		/**
205	<	* remainingCapacity does not change when elementa added or removed,
207	<	* but size does
205	>	* remainingCapacity() always returns Integer.MAX_VALUE
206		*/
207		public void testRemainingCapacity() {
208	<	DelayQueue q = populatedQueue(SIZE);
208	>	BlockingQueue q = populatedQueue(SIZE);
209		for (int i = 0; i < SIZE; ++i) {
210	<	assertEquals(NOCAP, q.remainingCapacity());
211	<	assertEquals(SIZE-i, q.size());
212	<	q.remove();
210	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211	>	assertEquals(SIZE - i, q.size());
212	>	assertTrue(q.remove() instanceof PDelay);
213		}
214		for (int i = 0; i < SIZE; ++i) {
215	<	assertEquals(NOCAP, q.remainingCapacity());
215	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
216		assertEquals(i, q.size());
217	<	q.add(new PDelay(i));
217	>	assertTrue(q.add(new PDelay(i)));
218		}
219		}
220
221		/**
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	–	/**
222		* offer non-null succeeds
223		*/
224		public void testOffer() {
#	Line 252 | Line 239 | public class DelayQueueTest extends JSR1
239		}
240
241		/**
242	<	* addAll(null) throws NPE
256	<	*/
257	<	public void testAddAll1() {
258	<	try {
259	<	DelayQueue q = new DelayQueue();
260	<	q.addAll(null);
261	<	shouldThrow();
262	<	}
263	<	catch (NullPointerException success) {}
264	<	}
265	<	/**
266	<	* addAll of a collection with null elements throws NPE
242	>	* addAll(this) throws IAE
243		*/
244	<	public void testAddAll2() {
244	>	public void testAddAllSelf() {
245	>	DelayQueue q = populatedQueue(SIZE);
246		try {
247	<	DelayQueue q = new DelayQueue();
271	<	PDelay[] ints = new PDelay[SIZE];
272	<	q.addAll(Arrays.asList(ints));
247	>	q.addAll(q);
248		shouldThrow();
249	<	}
275	<	catch (NullPointerException success) {}
249	>	} catch (IllegalArgumentException success) {}
250		}
251	+
252		/**
253		* addAll of a collection with any null elements throws NPE after
254		* possibly adding some elements
255		*/
256		public void testAddAll3() {
257	+	DelayQueue q = new DelayQueue();
258	+	PDelay[] a = new PDelay[SIZE];
259	+	for (int i = 0; i < SIZE - 1; ++i)
260	+	a[i] = new PDelay(i);
261		try {
262	<	DelayQueue q = new DelayQueue();
284	<	PDelay[] ints = new PDelay[SIZE];
285	<	for (int i = 0; i < SIZE-1; ++i)
286	<	ints[i] = new PDelay(i);
287	<	q.addAll(Arrays.asList(ints));
262	>	q.addAll(Arrays.asList(a));
263		shouldThrow();
264	<	}
290	<	catch (NullPointerException success) {}
264	>	} catch (NullPointerException success) {}
265		}
266
267		/**
268		* Queue contains all elements of successful addAll
269		*/
270		public void testAddAll5() {
271	<	try {
272	<	PDelay[] empty = new PDelay[0];
273	<	PDelay[] ints = new PDelay[SIZE];
274	<	for (int i = SIZE-1; i >= 0; --i)
275	<	ints[i] = new PDelay(i);
276	<	DelayQueue q = new DelayQueue();
277	<	assertFalse(q.addAll(Arrays.asList(empty)));
278	<	assertTrue(q.addAll(Arrays.asList(ints)));
279	<	for (int i = 0; i < SIZE; ++i)
306	<	assertEquals(ints[i], q.poll());
307	<	}
308	<	finally {}
271	>	PDelay[] empty = new PDelay[0];
272	>	PDelay[] ints = new PDelay[SIZE];
273	>	for (int i = SIZE - 1; i >= 0; --i)
274	>	ints[i] = new PDelay(i);
275	>	DelayQueue q = new DelayQueue();
276	>	assertFalse(q.addAll(Arrays.asList(empty)));
277	>	assertTrue(q.addAll(Arrays.asList(ints)));
278	>	for (int i = 0; i < SIZE; ++i)
279	>	assertEquals(ints[i], q.poll());
280		}
281
282		/**
312	–	* put(null) throws NPE
313	–	*/
314	–	public void testPutNull() {
315	–	try {
316	–	DelayQueue q = new DelayQueue();
317	–	q.put(null);
318	–	shouldThrow();
319	–	}
320	–	catch (NullPointerException success){
321	–	}
322	–	}
323	–
324	–	/**
283		* all elements successfully put are contained
284		*/
285	<	public void testPut() {
286	<	try {
287	<	DelayQueue q = new DelayQueue();
288	<	for (int i = 0; i < SIZE; ++i) {
289	<	PDelay I = new PDelay(i);
290	<	q.put(I);
333	<	assertTrue(q.contains(I));
334	<	}
335	<	assertEquals(SIZE, q.size());
336	<	}
337	<	finally {
285	>	public void testPut() {
286	>	DelayQueue q = new DelayQueue();
287	>	for (int i = 0; i < SIZE; ++i) {
288	>	PDelay x = new PDelay(i);
289	>	q.put(x);
290	>	assertTrue(q.contains(x));
291		}
292	+	assertEquals(SIZE, q.size());
293		}
294
295		/**
296		* put doesn't block waiting for take
297		*/
298	<	public void testPutWithTake() {
298	>	public void testPutWithTake() throws InterruptedException {
299		final DelayQueue q = new DelayQueue();
300	<	Thread t = new Thread(new Runnable() {
301	<	public void run() {
302	<	int added = 0;
303	<	try {
304	<	q.put(new PDelay(0));
305	<	++added;
306	<	q.put(new PDelay(0));
307	<	++added;
308	<	q.put(new PDelay(0));
309	<	++added;
356	<	q.put(new PDelay(0));
357	<	++added;
358	<	threadAssertTrue(added == 4);
359	<	} finally {
360	<	}
361	<	}
362	<	});
363	<	try {
364	<	t.start();
365	<	Thread.sleep(SHORT_DELAY_MS);
366	<	q.take();
367	<	t.interrupt();
368	<	t.join();
369	<	} catch (Exception e){
370	<	unexpectedException();
371	<	}
300	>	Thread t = newStartedThread(new CheckedRunnable() {
301	>	public void realRun() {
302	>	q.put(new PDelay(0));
303	>	q.put(new PDelay(0));
304	>	q.put(new PDelay(0));
305	>	q.put(new PDelay(0));
306	>	}});
307	>
308	>	awaitTermination(t);
309	>	assertEquals(4, q.size());
310		}
311
312		/**
313		* timed offer does not time out
314		*/
315	<	public void testTimedOffer() {
315	>	public void testTimedOffer() throws InterruptedException {
316		final DelayQueue q = new DelayQueue();
317	<	Thread t = new Thread(new Runnable() {
318	<	public void run() {
319	<	try {
320	<	q.put(new PDelay(0));
321	<	q.put(new PDelay(0));
322	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
323	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
386	<	} finally { }
387	<	}
388	<	});
389	<
390	<	try {
391	<	t.start();
392	<	Thread.sleep(SMALL_DELAY_MS);
393	<	t.interrupt();
394	<	t.join();
395	<	} catch (Exception e){
396	<	unexpectedException();
397	<	}
398	<	}
317	>	Thread t = newStartedThread(new CheckedRunnable() {
318	>	public void realRun() throws InterruptedException {
319	>	q.put(new PDelay(0));
320	>	q.put(new PDelay(0));
321	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
322	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
323	>	}});
324
325	<	/**
401	<	* take retrieves elements in priority order
402	<	*/
403	<	public void testTake() {
404	<	try {
405	<	DelayQueue q = populatedQueue(SIZE);
406	<	for (int i = 0; i < SIZE; ++i) {
407	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
408	<	}
409	<	} catch (InterruptedException e){
410	<	unexpectedException();
411	<	}
325	>	awaitTermination(t);
326		}
327
328		/**
329	<	* take blocks interruptibly when empty
329	>	* take retrieves elements in priority order
330		*/
331	<	public void testTakeFromEmpty() {
332	<	final DelayQueue q = new DelayQueue();
333	<	Thread t = new Thread(new Runnable() {
334	<	public void run() {
421	<	try {
422	<	q.take();
423	<	threadShouldThrow();
424	<	} catch (InterruptedException success){ }
425	<	}
426	<	});
427	<	try {
428	<	t.start();
429	<	Thread.sleep(SHORT_DELAY_MS);
430	<	t.interrupt();
431	<	t.join();
432	<	} catch (Exception e){
433	<	unexpectedException();
331	>	public void testTake() throws InterruptedException {
332	>	DelayQueue q = populatedQueue(SIZE);
333	>	for (int i = 0; i < SIZE; ++i) {
334	>	assertEquals(new PDelay(i), q.take());
335		}
336		}
337
338		/**
339		* Take removes existing elements until empty, then blocks interruptibly
340		*/
341	<	public void testBlockingTake() {
342	<	Thread t = new Thread(new Runnable() {
343	<	public void run() {
344	<	try {
345	<	DelayQueue q = populatedQueue(SIZE);
346	<	for (int i = 0; i < SIZE; ++i) {
347	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
348	<	}
349	<	q.take();
350	<	threadShouldThrow();
351	<	} catch (InterruptedException success){
352	<	}
353	<	}});
354	<	t.start();
355	<	try {
455	<	Thread.sleep(SHORT_DELAY_MS);
456	<	t.interrupt();
457	<	t.join();
458	<	}
459	<	catch (InterruptedException ie) {
460	<	unexpectedException();
461	<	}
462	<	}
341	>	public void testBlockingTake() throws InterruptedException {
342	>	final DelayQueue q = populatedQueue(SIZE);
343	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
344	>	Thread t = newStartedThread(new CheckedRunnable() {
345	>	public void realRun() throws InterruptedException {
346	>	for (int i = 0; i < SIZE; ++i) {
347	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
348	>	}
349	>
350	>	Thread.currentThread().interrupt();
351	>	try {
352	>	q.take();
353	>	shouldThrow();
354	>	} catch (InterruptedException success) {}
355	>	assertFalse(Thread.interrupted());
356
357	+	pleaseInterrupt.countDown();
358	+	try {
359	+	q.take();
360	+	shouldThrow();
361	+	} catch (InterruptedException success) {}
362	+	assertFalse(Thread.interrupted());
363	+	}});
364	+
365	+	await(pleaseInterrupt);
366	+	assertThreadStaysAlive(t);
367	+	t.interrupt();
368	+	awaitTermination(t);
369	+	}
370
371		/**
372		* poll succeeds unless empty
#	Line 468 | Line 374 | public class DelayQueueTest extends JSR1
374		public void testPoll() {
375		DelayQueue q = populatedQueue(SIZE);
376		for (int i = 0; i < SIZE; ++i) {
377	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
377	>	assertEquals(new PDelay(i), q.poll());
378		}
379	<	assertNull(q.poll());
379	>	assertNull(q.poll());
380		}
381
382		/**
383	<	* timed pool with zero timeout succeeds when non-empty, else times out
383	>	* timed poll with zero timeout succeeds when non-empty, else times out
384		*/
385	<	public void testTimedPoll0() {
386	<	try {
387	<	DelayQueue q = populatedQueue(SIZE);
388	<	for (int i = 0; i < SIZE; ++i) {
389	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, TimeUnit.MILLISECONDS)));
390	<	}
485	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
486	<	} catch (InterruptedException e){
487	<	unexpectedException();
488	<	}
385	>	public void testTimedPoll0() throws InterruptedException {
386	>	DelayQueue q = populatedQueue(SIZE);
387	>	for (int i = 0; i < SIZE; ++i) {
388	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
389	>	}
390	>	assertNull(q.poll(0, MILLISECONDS));
391		}
392
393		/**
394	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
394	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
395		*/
396	<	public void testTimedPoll() {
397	<	try {
398	<	DelayQueue q = populatedQueue(SIZE);
399	<	for (int i = 0; i < SIZE; ++i) {
400	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
401	<	}
402	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
403	<	} catch (InterruptedException e){
404	<	unexpectedException();
405	<	}
396	>	public void testTimedPoll() throws InterruptedException {
397	>	DelayQueue q = populatedQueue(SIZE);
398	>	for (int i = 0; i < SIZE; ++i) {
399	>	long startTime = System.nanoTime();
400	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
401	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
402	>	}
403	>	long startTime = System.nanoTime();
404	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
405	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
406	>	checkEmpty(q);
407		}
408
409		/**
410		* Interrupted timed poll throws InterruptedException instead of
411		* returning timeout status
412		*/
413	<	public void testInterruptedTimedPoll() {
414	<	Thread t = new Thread(new Runnable() {
415	<	public void run() {
416	<	try {
417	<	DelayQueue q = populatedQueue(SIZE);
418	<	for (int i = 0; i < SIZE; ++i) {
419	<	threadAssertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
420	<	}
421	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
519	<	} catch (InterruptedException success){
520	<	}
521	<	}});
522	<	t.start();
523	<	try {
524	<	Thread.sleep(SHORT_DELAY_MS);
525	<	t.interrupt();
526	<	t.join();
527	<	}
528	<	catch (InterruptedException ie) {
529	<	unexpectedException();
530	<	}
531	<	}
532	<
533	<	/**
534	<	*  timed poll before a delayed offer fails; after offer succeeds;
535	<	*  on interruption throws
536	<	*/
537	<	public void testTimedPollWithOffer() {
538	<	final DelayQueue q = new DelayQueue();
539	<	Thread t = new Thread(new Runnable() {
540	<	public void run() {
541	<	try {
542	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
543	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
544	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
545	<	threadFail("Should block");
546	<	} catch (InterruptedException success) { }
413	>	public void testInterruptedTimedPoll() throws InterruptedException {
414	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
415	>	final DelayQueue q = populatedQueue(SIZE);
416	>	Thread t = newStartedThread(new CheckedRunnable() {
417	>	public void realRun() throws InterruptedException {
418	>	long startTime = System.nanoTime();
419	>	for (int i = 0; i < SIZE; ++i) {
420	>	assertEquals(new PDelay(i),
421	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
422		}
548	–	});
549	–	try {
550	–	t.start();
551	–	Thread.sleep(SMALL_DELAY_MS);
552	–	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
553	–	t.interrupt();
554	–	t.join();
555	–	} catch (Exception e){
556	–	unexpectedException();
557	–	}
558	–	}
423
424	+	Thread.currentThread().interrupt();
425	+	try {
426	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
427	+	shouldThrow();
428	+	} catch (InterruptedException success) {}
429	+	assertFalse(Thread.interrupted());
430	+
431	+	pleaseInterrupt.countDown();
432	+	try {
433	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
434	+	shouldThrow();
435	+	} catch (InterruptedException success) {}
436	+	assertFalse(Thread.interrupted());
437	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
438	+	}});
439	+
440	+	await(pleaseInterrupt);
441	+	assertThreadStaysAlive(t);
442	+	t.interrupt();
443	+	awaitTermination(t);
444	+	checkEmpty(q);
445	+	}
446
447		/**
448		* peek returns next element, or null if empty
#	Line 564 | Line 450 | public class DelayQueueTest extends JSR1
450		public void testPeek() {
451		DelayQueue q = populatedQueue(SIZE);
452		for (int i = 0; i < SIZE; ++i) {
453	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
454	<	q.poll();
455	<	assertTrue(q.peek() == null ||
456	<	i != ((PDelay)q.peek()).intValue());
453	>	assertEquals(new PDelay(i), q.peek());
454	>	assertEquals(new PDelay(i), q.poll());
455	>	if (q.isEmpty())
456	>	assertNull(q.peek());
457	>	else
458	>	assertFalse(new PDelay(i).equals(q.peek()));
459		}
460	<	assertNull(q.peek());
460	>	assertNull(q.peek());
461		}
462
463		/**
#	Line 578 | Line 466 | public class DelayQueueTest extends JSR1
466		public void testElement() {
467		DelayQueue q = populatedQueue(SIZE);
468		for (int i = 0; i < SIZE; ++i) {
469	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
469	>	assertEquals(new PDelay(i), q.element());
470		q.poll();
471		}
472		try {
473		q.element();
474		shouldThrow();
475	<	}
588	<	catch (NoSuchElementException success) {}
475	>	} catch (NoSuchElementException success) {}
476		}
477
478		/**
#	Line 594 | Line 481 | public class DelayQueueTest extends JSR1
481		public void testRemove() {
482		DelayQueue q = populatedQueue(SIZE);
483		for (int i = 0; i < SIZE; ++i) {
484	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
484	>	assertEquals(new PDelay(i), q.remove());
485		}
486		try {
487		q.remove();
488		shouldThrow();
489	<	} catch (NoSuchElementException success){
603	<	}
489	>	} catch (NoSuchElementException success) {}
490		}
491
492		/**
607	–	* remove(x) removes x and returns true if present
608	–	*/
609	–	public void testRemoveElement() {
610	–	DelayQueue q = populatedQueue(SIZE);
611	–	for (int i = 1; i < SIZE; i+=2) {
612	–	assertTrue(q.remove(new PDelay(i)));
613	–	}
614	–	for (int i = 0; i < SIZE; i+=2) {
615	–	assertTrue(q.remove(new PDelay(i)));
616	–	assertFalse(q.remove(new PDelay(i+1)));
617	–	}
618	–	assertTrue(q.isEmpty());
619	–	}
620	–
621	–	/**
493		* contains(x) reports true when elements added but not yet removed
494		*/
495		public void testContains() {
#	Line 638 | Line 509 | public class DelayQueueTest extends JSR1
509		q.clear();
510		assertTrue(q.isEmpty());
511		assertEquals(0, q.size());
512	<	assertEquals(NOCAP, q.remainingCapacity());
513	<	q.add(new PDelay(1));
512	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
513	>	PDelay x = new PDelay(1);
514	>	q.add(x);
515		assertFalse(q.isEmpty());
516	+	assertTrue(q.contains(x));
517		q.clear();
518		assertTrue(q.isEmpty());
519		}
#	Line 673 | Line 546 | public class DelayQueueTest extends JSR1
546		assertTrue(changed);
547
548		assertTrue(q.containsAll(p));
549	<	assertEquals(SIZE-i, q.size());
549	>	assertEquals(SIZE - i, q.size());
550		p.remove();
551		}
552		}
#	Line 686 | Line 559 | public class DelayQueueTest extends JSR1
559		DelayQueue q = populatedQueue(SIZE);
560		DelayQueue p = populatedQueue(i);
561		assertTrue(q.removeAll(p));
562	<	assertEquals(SIZE-i, q.size());
562	>	assertEquals(SIZE - i, q.size());
563		for (int j = 0; j < i; ++j) {
564	<	PDelay I = (PDelay)(p.remove());
565	<	assertFalse(q.contains(I));
564	>	PDelay x = (PDelay)(p.remove());
565	>	assertFalse(q.contains(x));
566		}
567		}
568		}
#	Line 697 | Line 570 | public class DelayQueueTest extends JSR1
570		/**
571		* toArray contains all elements
572		*/
573	<	public void testToArray() {
573	>	public void testToArray() throws InterruptedException {
574		DelayQueue q = populatedQueue(SIZE);
575	<	Object[] o = q.toArray();
575	>	Object[] o = q.toArray();
576		Arrays.sort(o);
577	<	try {
578	<	for(int i = 0; i < o.length; i++)
706	<	assertEquals(o[i], q.take());
707	<	} catch (InterruptedException e){
708	<	unexpectedException();
709	<	}
577	>	for (int i = 0; i < o.length; i++)
578	>	assertSame(o[i], q.take());
579		}
580
581		/**
582		* toArray(a) contains all elements
583		*/
584		public void testToArray2() {
585	<	DelayQueue q = populatedQueue(SIZE);
586	<	PDelay[] ints = new PDelay[SIZE];
587	<	ints = (PDelay[])q.toArray(ints);
585	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
586	>	PDelay[] ints = new PDelay[SIZE];
587	>	PDelay[] array = q.toArray(ints);
588	>	assertSame(ints, array);
589		Arrays.sort(ints);
590	<	try {
591	<	for(int i = 0; i < ints.length; i++)
722	<	assertEquals(ints[i], q.take());
723	<	} catch (InterruptedException e){
724	<	unexpectedException();
725	<	}
590	>	for (int i = 0; i < ints.length; i++)
591	>	assertSame(ints[i], q.remove());
592		}
593	<
593	>
594	>	/**
595	>	* toArray(incompatible array type) throws ArrayStoreException
596	>	*/
597	>	public void testToArray1_BadArg() {
598	>	DelayQueue q = populatedQueue(SIZE);
599	>	try {
600	>	q.toArray(new String[10]);
601	>	shouldThrow();
602	>	} catch (ArrayStoreException success) {}
603	>	}
604	>
605		/**
606		* iterator iterates through all elements
607		*/
608		public void testIterator() {
609		DelayQueue q = populatedQueue(SIZE);
610		int i = 0;
611	<	Iterator it = q.iterator();
612	<	while(it.hasNext()) {
611	>	Iterator it = q.iterator();
612	>	while (it.hasNext()) {
613		assertTrue(q.contains(it.next()));
614		++i;
615		}
616		assertEquals(i, SIZE);
617	+	assertIteratorExhausted(it);
618	+	}
619	+
620	+	/**
621	+	* iterator of empty collection has no elements
622	+	*/
623	+	public void testEmptyIterator() {
624	+	assertIteratorExhausted(new DelayQueue().iterator());
625		}
626
627		/**
628		* iterator.remove removes current element
629		*/
630	<	public void testIteratorRemove () {
630	>	public void testIteratorRemove() {
631		final DelayQueue q = new DelayQueue();
632		q.add(new PDelay(2));
633		q.add(new PDelay(1));
#	Line 751 | Line 636 | public class DelayQueueTest extends JSR1
636		it.next();
637		it.remove();
638		it = q.iterator();
639	<	assertEquals(it.next(), new PDelay(2));
640	<	assertEquals(it.next(), new PDelay(3));
639	>	assertEquals(new PDelay(2), it.next());
640	>	assertEquals(new PDelay(3), it.next());
641		assertFalse(it.hasNext());
642		}
643
759	–
644		/**
645		* toString contains toStrings of elements
646		*/
647		public void testToString() {
648		DelayQueue q = populatedQueue(SIZE);
649		String s = q.toString();
650	<	for (int i = 0; i < SIZE; ++i) {
651	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
652	<	}
769	<	}
650	>	for (Object e : q)
651	>	assertTrue(s.contains(e.toString()));
652	>	}
653
654		/**
655	<	* offer transfers elements across Executor tasks
655	>	* timed poll transfers elements across Executor tasks
656		*/
657		public void testPollInExecutor() {
658		final DelayQueue q = new DelayQueue();
659	<	ExecutorService executor = Executors.newFixedThreadPool(2);
660	<	executor.execute(new Runnable() {
661	<	public void run() {
662	<	threadAssertNull(q.poll());
663	<	try {
664	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
665	<	threadAssertTrue(q.isEmpty());
666	<	}
667	<	catch (InterruptedException e) {
668	<	threadUnexpectedException();
786	<	}
787	<	}
788	<	});
659	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
660	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
661	>	try (PoolCleaner cleaner = cleaner(executor)) {
662	>	executor.execute(new CheckedRunnable() {
663	>	public void realRun() throws InterruptedException {
664	>	assertNull(q.poll());
665	>	threadsStarted.await();
666	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
667	>	checkEmpty(q);
668	>	}});
669
670	<	executor.execute(new Runnable() {
671	<	public void run() {
672	<	try {
793	<	Thread.sleep(SHORT_DELAY_MS);
670	>	executor.execute(new CheckedRunnable() {
671	>	public void realRun() throws InterruptedException {
672	>	threadsStarted.await();
673		q.put(new PDelay(1));
674	<	}
675	<	catch (InterruptedException e) {
676	<	threadUnexpectedException();
798	<	}
799	<	}
800	<	});
801	<	joinPool(executor);
674	>	}});
675	>	}
676	>	}
677
678	+	/**
679	+	* Delayed actions do not occur until their delay elapses
680	+	*/
681	+	public void testDelay() throws InterruptedException {
682	+	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
683	+	for (int i = 0; i < SIZE; ++i)
684	+	q.add(new NanoDelay(1000000L * (SIZE - i)));
685	+
686	+	long last = 0;
687	+	for (int i = 0; i < SIZE; ++i) {
688	+	NanoDelay e = q.take();
689	+	long tt = e.getTriggerTime();
690	+	assertTrue(System.nanoTime() - tt >= 0);
691	+	if (i != 0)
692	+	assertTrue(tt >= last);
693	+	last = tt;
694	+	}
695	+	assertTrue(q.isEmpty());
696		}
697
698	+	/**
699	+	* peek of a non-empty queue returns non-null even if not expired
700	+	*/
701	+	public void testPeekDelayed() {
702	+	DelayQueue q = new DelayQueue();
703	+	q.add(new NanoDelay(Long.MAX_VALUE));
704	+	assertNotNull(q.peek());
705	+	}
706
707		/**
708	<	* Dekayed actions do not occur until their delay elapses
708	>	* poll of a non-empty queue returns null if no expired elements.
709		*/
710	<	public void testDelay() {
710	>	public void testPollDelayed() {
711		DelayQueue q = new DelayQueue();
712	<	NanoDelay[] elements = new NanoDelay[SIZE];
713	<	for (int i = 0; i < SIZE; ++i) {
714	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
715	<	}
712	>	q.add(new NanoDelay(Long.MAX_VALUE));
713	>	assertNull(q.poll());
714	>	}
715	>
716	>	/**
717	>	* timed poll of a non-empty queue returns null if no expired elements.
718	>	*/
719	>	public void testTimedPollDelayed() throws InterruptedException {
720	>	DelayQueue q = new DelayQueue();
721	>	q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
722	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
723	>	}
724	>
725	>	/**
726	>	* drainTo(c) empties queue into another collection c
727	>	*/
728	>	public void testDrainTo() {
729	>	DelayQueue q = new DelayQueue();
730	>	PDelay[] elems = new PDelay[SIZE];
731		for (int i = 0; i < SIZE; ++i) {
732	<	q.add(elements[i]);
732	>	elems[i] = new PDelay(i);
733	>	q.add(elems[i]);
734		}
735	+	ArrayList l = new ArrayList();
736	+	q.drainTo(l);
737	+	assertEquals(0, q.size());
738	+	for (int i = 0; i < SIZE; ++i)
739	+	assertEquals(elems[i], l.get(i));
740	+	q.add(elems[0]);
741	+	q.add(elems[1]);
742	+	assertFalse(q.isEmpty());
743	+	assertTrue(q.contains(elems[0]));
744	+	assertTrue(q.contains(elems[1]));
745	+	l.clear();
746	+	q.drainTo(l);
747	+	assertEquals(0, q.size());
748	+	assertEquals(2, l.size());
749	+	for (int i = 0; i < 2; ++i)
750	+	assertEquals(elems[i], l.get(i));
751	+	}
752
753	<	try {
754	<	long last = 0;
755	<	for (int i = 0; i < SIZE; ++i) {
756	<	NanoDelay e = (NanoDelay)(q.take());
757	<	long tt = e.getTriggerTime();
758	<	assertTrue(tt <= System.nanoTime());
759	<	if (i != 0)
760	<	assertTrue(tt >= last);
761	<	last = tt;
762	<	}
763	<	}
764	<	catch(InterruptedException ie) {
765	<	unexpectedException();
753	>	/**
754	>	* drainTo empties queue
755	>	*/
756	>	public void testDrainToWithActivePut() throws InterruptedException {
757	>	final DelayQueue q = populatedQueue(SIZE);
758	>	Thread t = new Thread(new CheckedRunnable() {
759	>	public void realRun() {
760	>	q.put(new PDelay(SIZE + 1));
761	>	}});
762	>
763	>	t.start();
764	>	ArrayList l = new ArrayList();
765	>	q.drainTo(l);
766	>	assertTrue(l.size() >= SIZE);
767	>	t.join();
768	>	assertTrue(q.size() + l.size() >= SIZE);
769	>	}
770	>
771	>	/**
772	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
773	>	*/
774	>	public void testDrainToN() {
775	>	for (int i = 0; i < SIZE + 2; ++i) {
776	>	DelayQueue q = populatedQueue(SIZE);
777	>	ArrayList l = new ArrayList();
778	>	q.drainTo(l, i);
779	>	int k = (i < SIZE) ? i : SIZE;
780	>	assertEquals(SIZE - k, q.size());
781	>	assertEquals(k, l.size());
782		}
783		}
784
785	+	/**
786	+	* remove(null), contains(null) always return false
787	+	*/
788	+	public void testNeverContainsNull() {
789	+	Collection<?> q = populatedQueue(SIZE);
790	+	assertFalse(q.contains(null));
791	+	assertFalse(q.remove(null));
792	+	}
793		}

Diff Legend

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