ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/DelayQueueTest.java

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.7 by dl, Sat Dec 27 19:26:43 2003 UTC vs.
Revision 1.72 by jsr166, Fri May 15 18:21:19 2015 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
5	<	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	<	* Pat Fisher, Mike Judd.
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
10	<	import java.util.*;
11	<	import java.util.concurrent.*;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	>
11	>	import java.util.ArrayList;
12	>	import java.util.Arrays;
13	>	import java.util.Collection;
14	>	import java.util.Iterator;
15	>	import java.util.NoSuchElementException;
16	>	import java.util.concurrent.BlockingQueue;
17	>	import java.util.concurrent.CountDownLatch;
18	>	import java.util.concurrent.Delayed;
19	>	import java.util.concurrent.DelayQueue;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.TimeUnit;
23	>
24	>	import junit.framework.Test;
25
26		public class DelayQueueTest extends JSR166TestCase {
27	+
28	+	public static class Generic extends BlockingQueueTest {
29	+	protected BlockingQueue emptyCollection() {
30	+	return new DelayQueue();
31	+	}
32	+	protected PDelay makeElement(int i) {
33	+	return new PDelay(i);
34	+	}
35	+	}
36	+
37		public static void main(String[] args) {
38	<	junit.textui.TestRunner.run (suite());
38	>	main(suite(), args);
39		}
40
41		public static Test suite() {
42	<	return new TestSuite(DelayQueueTest.class);
42	>	return newTestSuite(DelayQueueTest.class,
43	>	new Generic().testSuite());
44		}
45
22	–	private static final int NOCAP = Integer.MAX_VALUE;
23	–
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;
36	<	if (i > j) return 1;
37	<	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) {
41	<	int i = pseudodelay;
42	<	int j = ((PDelay)y).pseudodelay;
43	<	if (i < j) return -1;
44	<	if (i > j) return 1;
45	<	return 0;
59	>	public int compareTo(Delayed y) {
60	>	return compareTo((PDelay)y);
61		}
47	–
62		public boolean equals(Object other) {
63	<	return ((PDelay)other).pseudodelay == pseudodelay;
63	>	return (other instanceof PDelay) &&
64	>	this.pseudodelay == ((PDelay)other).pseudodelay;
65		}
66	<	public boolean equals(PDelay other) {
67	<	return ((PDelay)other).pseudodelay == pseudodelay;
53	<	}
54	<
55	<
66	>	// suppress [overrides] javac warning
67	>	public int hashCode() { return pseudodelay; }
68		public long getDelay(TimeUnit ignore) {
69	<	return pseudodelay;
58	<	}
59	<	public int intValue() {
60	<	return pseudodelay;
69	>	return Integer.MIN_VALUE + pseudodelay;
70		}
62	–
71		public String toString() {
72		return String.valueOf(pseudodelay);
73		}
74		}
75
68	–
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;
87	<	long j = ((NanoDelay)y).trigger;
88	<	if (i < j) return -1;
89	<	if (i > j) return 1;
90	<	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 111 | Line 117 | public class DelayQueueTest extends JSR1
117		}
118		}
119
114	–
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 141 | 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	<	}
147	<	catch (NullPointerException success) {}
151	>	} catch (NullPointerException success) {}
152		}
153
154		/**
#	Line 152 | Line 156 | public class DelayQueueTest extends JSR1
156		*/
157		public void testConstructor4() {
158		try {
159	<	PDelay[] ints = new PDelay[SIZE];
156	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
159	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
160		shouldThrow();
161	<	}
159	<	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];
168	<	for (int i = 0; i < SIZE-1; ++i)
169	<	ints[i] = new PDelay(i);
170	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
172	>	new DelayQueue(Arrays.asList(a));
173		shouldThrow();
174	<	}
173	<	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)
186	<	assertEquals(ints[i], q.poll());
187	<	}
188	<	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 194 | 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 204 | Line 202 | public class DelayQueueTest extends JSR1
202		}
203
204		/**
205	<	* remainingCapacity does not change when elementa added or removed,
208	<	* 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());
210	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211		assertEquals(SIZE-i, q.size());
212	<	q.remove();
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		/**
225	–	* offer(null) throws NPE
226	–	*/
227	–	public void testOfferNull() {
228	–	try {
229	–	DelayQueue q = new DelayQueue();
230	–	q.offer(null);
231	–	shouldThrow();
232	–	} catch (NullPointerException success) { }
233	–	}
234	–
235	–	/**
236	–	* add(null) throws NPE
237	–	*/
238	–	public void testAddNull() {
239	–	try {
240	–	DelayQueue q = new DelayQueue();
241	–	q.add(null);
242	–	shouldThrow();
243	–	} catch (NullPointerException success) { }
244	–	}
245	–
246	–	/**
222		* offer non-null succeeds
223		*/
224		public void testOffer() {
#	Line 264 | Line 239 | public class DelayQueueTest extends JSR1
239		}
240
241		/**
267	–	* addAll(null) throws NPE
268	–	*/
269	–	public void testAddAll1() {
270	–	try {
271	–	DelayQueue q = new DelayQueue();
272	–	q.addAll(null);
273	–	shouldThrow();
274	–	}
275	–	catch (NullPointerException success) {}
276	–	}
277	–
278	–
279	–	/**
242		* addAll(this) throws IAE
243		*/
244		public void testAddAllSelf() {
245	+	DelayQueue q = populatedQueue(SIZE);
246		try {
284	–	DelayQueue q = populatedQueue(SIZE);
247		q.addAll(q);
248		shouldThrow();
249	<	}
288	<	catch (IllegalArgumentException success) {}
249	>	} catch (IllegalArgumentException success) {}
250		}
251
252		/**
292	–	* addAll of a collection with null elements throws NPE
293	–	*/
294	–	public void testAddAll2() {
295	–	try {
296	–	DelayQueue q = new DelayQueue();
297	–	PDelay[] ints = new PDelay[SIZE];
298	–	q.addAll(Arrays.asList(ints));
299	–	shouldThrow();
300	–	}
301	–	catch (NullPointerException success) {}
302	–	}
303	–	/**
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();
310	<	PDelay[] ints = new PDelay[SIZE];
311	<	for (int i = 0; i < SIZE-1; ++i)
312	<	ints[i] = new PDelay(i);
313	<	q.addAll(Arrays.asList(ints));
262	>	q.addAll(Arrays.asList(a));
263		shouldThrow();
264	<	}
316	<	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)
332	<	assertEquals(ints[i], q.poll());
333	<	}
334	<	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		/**
338	–	* put(null) throws NPE
339	–	*/
340	–	public void testPutNull() {
341	–	try {
342	–	DelayQueue q = new DelayQueue();
343	–	q.put(null);
344	–	shouldThrow();
345	–	}
346	–	catch (NullPointerException success){
347	–	}
348	–	}
349	–
350	–	/**
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);
359	<	assertTrue(q.contains(I));
360	<	}
361	<	assertEquals(SIZE, q.size());
362	<	}
363	<	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;
382	<	q.put(new PDelay(0));
383	<	++added;
384	<	threadAssertTrue(added == 4);
385	<	} finally {
386	<	}
387	<	}
388	<	});
389	<	try {
390	<	t.start();
391	<	Thread.sleep(SHORT_DELAY_MS);
392	<	q.take();
393	<	t.interrupt();
394	<	t.join();
395	<	} catch (Exception e){
396	<	unexpectedException();
397	<	}
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));
412	<	} finally { }
413	<	}
414	<	});
415	<
416	<	try {
417	<	t.start();
418	<	Thread.sleep(SMALL_DELAY_MS);
419	<	t.interrupt();
420	<	t.join();
421	<	} catch (Exception e){
422	<	unexpectedException();
423	<	}
424	<	}
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	<	/**
427	<	* take retrieves elements in priority order
428	<	*/
429	<	public void testTake() {
430	<	try {
431	<	DelayQueue q = populatedQueue(SIZE);
432	<	for (int i = 0; i < SIZE; ++i) {
433	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
434	<	}
435	<	} catch (InterruptedException e){
436	<	unexpectedException();
437	<	}
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() {
447	<	try {
448	<	q.take();
449	<	threadShouldThrow();
450	<	} catch (InterruptedException success){ }
451	<	}
452	<	});
453	<	try {
454	<	t.start();
455	<	Thread.sleep(SHORT_DELAY_MS);
456	<	t.interrupt();
457	<	t.join();
458	<	} catch (Exception e){
459	<	unexpectedException();
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	<	}
474	<	q.take();
475	<	threadShouldThrow();
476	<	} catch (InterruptedException success){
477	<	}
478	<	}});
479	<	t.start();
480	<	try {
481	<	Thread.sleep(SHORT_DELAY_MS);
482	<	t.interrupt();
483	<	t.join();
484	<	}
485	<	catch (InterruptedException ie) {
486	<	unexpectedException();
487	<	}
488	<	}
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 494 | 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	<	}
511	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
512	<	} catch (InterruptedException e){
513	<	unexpectedException();
514	<	}
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)));
543	<	}
544	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
545	<	} catch (InterruptedException success){
546	<	}
547	<	}});
548	<	t.start();
549	<	try {
550	<	Thread.sleep(SHORT_DELAY_MS);
551	<	t.interrupt();
552	<	t.join();
553	<	}
554	<	catch (InterruptedException ie) {
555	<	unexpectedException();
556	<	}
557	<	}
558	<
559	<	/**
560	<	*  timed poll before a delayed offer fails; after offer succeeds;
561	<	*  on interruption throws
562	<	*/
563	<	public void testTimedPollWithOffer() {
564	<	final DelayQueue q = new DelayQueue();
565	<	Thread t = new Thread(new Runnable() {
566	<	public void run() {
567	<	try {
568	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
569	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
570	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
571	<	threadFail("Should block");
572	<	} catch (InterruptedException success) { }
413	>	public void testInterruptedTimedPoll() throws InterruptedException {
414	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
415	>	Thread t = newStartedThread(new CheckedRunnable() {
416	>	public void realRun() throws InterruptedException {
417	>	DelayQueue q = populatedQueue(SIZE);
418	>	for (int i = 0; i < SIZE; ++i) {
419	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
420		}
574	–	});
575	–	try {
576	–	t.start();
577	–	Thread.sleep(SMALL_DELAY_MS);
578	–	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
579	–	t.interrupt();
580	–	t.join();
581	–	} catch (Exception e){
582	–	unexpectedException();
583	–	}
584	–	}
421
422	+	Thread.currentThread().interrupt();
423	+	try {
424	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
425	+	shouldThrow();
426	+	} catch (InterruptedException success) {}
427	+	assertFalse(Thread.interrupted());
428	+
429	+	pleaseInterrupt.countDown();
430	+	try {
431	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
432	+	shouldThrow();
433	+	} catch (InterruptedException success) {}
434	+	assertFalse(Thread.interrupted());
435	+	}});
436	+
437	+	await(pleaseInterrupt);
438	+	assertThreadStaysAlive(t);
439	+	t.interrupt();
440	+	awaitTermination(t);
441	+	}
442
443		/**
444		* peek returns next element, or null if empty
#	Line 590 | Line 446 | public class DelayQueueTest extends JSR1
446		public void testPeek() {
447		DelayQueue q = populatedQueue(SIZE);
448		for (int i = 0; i < SIZE; ++i) {
449	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
450	<	q.poll();
451	<	assertTrue(q.peek() == null ||
452	<	i != ((PDelay)q.peek()).intValue());
449	>	assertEquals(new PDelay(i), q.peek());
450	>	assertEquals(new PDelay(i), q.poll());
451	>	if (q.isEmpty())
452	>	assertNull(q.peek());
453	>	else
454	>	assertFalse(new PDelay(i).equals(q.peek()));
455		}
456	<	assertNull(q.peek());
456	>	assertNull(q.peek());
457		}
458
459		/**
#	Line 604 | Line 462 | public class DelayQueueTest extends JSR1
462		public void testElement() {
463		DelayQueue q = populatedQueue(SIZE);
464		for (int i = 0; i < SIZE; ++i) {
465	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
465	>	assertEquals(new PDelay(i), q.element());
466		q.poll();
467		}
468		try {
469		q.element();
470		shouldThrow();
471	<	}
614	<	catch (NoSuchElementException success) {}
471	>	} catch (NoSuchElementException success) {}
472		}
473
474		/**
#	Line 620 | Line 477 | public class DelayQueueTest extends JSR1
477		public void testRemove() {
478		DelayQueue q = populatedQueue(SIZE);
479		for (int i = 0; i < SIZE; ++i) {
480	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
480	>	assertEquals(new PDelay(i), q.remove());
481		}
482		try {
483		q.remove();
484		shouldThrow();
485	<	} catch (NoSuchElementException success){
629	<	}
485	>	} catch (NoSuchElementException success) {}
486		}
487
488		/**
633	–	* remove(x) removes x and returns true if present
634	–	*/
635	–	public void testRemoveElement() {
636	–	DelayQueue q = populatedQueue(SIZE);
637	–	for (int i = 1; i < SIZE; i+=2) {
638	–	assertTrue(q.remove(new PDelay(i)));
639	–	}
640	–	for (int i = 0; i < SIZE; i+=2) {
641	–	assertTrue(q.remove(new PDelay(i)));
642	–	assertFalse(q.remove(new PDelay(i+1)));
643	–	}
644	–	assertTrue(q.isEmpty());
645	–	}
646	–
647	–	/**
489		* contains(x) reports true when elements added but not yet removed
490		*/
491		public void testContains() {
#	Line 664 | Line 505 | public class DelayQueueTest extends JSR1
505		q.clear();
506		assertTrue(q.isEmpty());
507		assertEquals(0, q.size());
508	<	assertEquals(NOCAP, q.remainingCapacity());
509	<	q.add(new PDelay(1));
508	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
509	>	PDelay x = new PDelay(1);
510	>	q.add(x);
511		assertFalse(q.isEmpty());
512	+	assertTrue(q.contains(x));
513		q.clear();
514		assertTrue(q.isEmpty());
515		}
#	Line 714 | Line 557 | public class DelayQueueTest extends JSR1
557		assertTrue(q.removeAll(p));
558		assertEquals(SIZE-i, q.size());
559		for (int j = 0; j < i; ++j) {
560	<	PDelay I = (PDelay)(p.remove());
561	<	assertFalse(q.contains(I));
560	>	PDelay x = (PDelay)(p.remove());
561	>	assertFalse(q.contains(x));
562		}
563		}
564		}
#	Line 723 | Line 566 | public class DelayQueueTest extends JSR1
566		/**
567		* toArray contains all elements
568		*/
569	<	public void testToArray() {
569	>	public void testToArray() throws InterruptedException {
570		DelayQueue q = populatedQueue(SIZE);
571	<	Object[] o = q.toArray();
571	>	Object[] o = q.toArray();
572		Arrays.sort(o);
573	<	try {
574	<	for(int i = 0; i < o.length; i++)
732	<	assertEquals(o[i], q.take());
733	<	} catch (InterruptedException e){
734	<	unexpectedException();
735	<	}
573	>	for (int i = 0; i < o.length; i++)
574	>	assertSame(o[i], q.take());
575		}
576
577		/**
578		* toArray(a) contains all elements
579		*/
580		public void testToArray2() {
581	<	DelayQueue q = populatedQueue(SIZE);
582	<	PDelay[] ints = new PDelay[SIZE];
583	<	ints = (PDelay[])q.toArray(ints);
581	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
582	>	PDelay[] ints = new PDelay[SIZE];
583	>	PDelay[] array = q.toArray(ints);
584	>	assertSame(ints, array);
585		Arrays.sort(ints);
586	<	try {
587	<	for(int i = 0; i < ints.length; i++)
748	<	assertEquals(ints[i], q.take());
749	<	} catch (InterruptedException e){
750	<	unexpectedException();
751	<	}
586	>	for (int i = 0; i < ints.length; i++)
587	>	assertSame(ints[i], q.remove());
588		}
589
754	–
590		/**
591	<	* toArray(null) throws NPE
757	<	*/
758	<	public void testToArray_BadArg() {
759	<	try {
760	<	DelayQueue q = populatedQueue(SIZE);
761	<	Object o[] = q.toArray(null);
762	<	shouldThrow();
763	<	} catch(NullPointerException success){}
764	<	}
765	<
766	<	/**
767	<	* toArray with incompatable array type throws CCE
591	>	* toArray(incompatible array type) throws ArrayStoreException
592		*/
593		public void testToArray1_BadArg() {
594	<	try {
595	<	DelayQueue q = populatedQueue(SIZE);
596	<	Object o[] = q.toArray(new String[10] );
597	<	shouldThrow();
598	<	} catch(ArrayStoreException  success){}
594	>	DelayQueue q = populatedQueue(SIZE);
595	>	try {
596	>	q.toArray(new String[10]);
597	>	shouldThrow();
598	>	} catch (ArrayStoreException success) {}
599		}
600	<
600	>
601		/**
602		* iterator iterates through all elements
603		*/
604		public void testIterator() {
605		DelayQueue q = populatedQueue(SIZE);
606		int i = 0;
607	<	Iterator it = q.iterator();
608	<	while(it.hasNext()) {
607	>	Iterator it = q.iterator();
608	>	while (it.hasNext()) {
609		assertTrue(q.contains(it.next()));
610		++i;
611		}
612		assertEquals(i, SIZE);
613	+	assertIteratorExhausted(it);
614	+	}
615	+
616	+	/**
617	+	* iterator of empty collection has no elements
618	+	*/
619	+	public void testEmptyIterator() {
620	+	assertIteratorExhausted(new DelayQueue().iterator());
621		}
622
623		/**
624		* iterator.remove removes current element
625		*/
626	<	public void testIteratorRemove () {
626	>	public void testIteratorRemove() {
627		final DelayQueue q = new DelayQueue();
628		q.add(new PDelay(2));
629		q.add(new PDelay(1));
#	Line 800 | Line 632 | public class DelayQueueTest extends JSR1
632		it.next();
633		it.remove();
634		it = q.iterator();
635	<	assertEquals(it.next(), new PDelay(2));
636	<	assertEquals(it.next(), new PDelay(3));
635	>	assertEquals(new PDelay(2), it.next());
636	>	assertEquals(new PDelay(3), it.next());
637		assertFalse(it.hasNext());
638		}
639
808	–
640		/**
641		* toString contains toStrings of elements
642		*/
643		public void testToString() {
644		DelayQueue q = populatedQueue(SIZE);
645		String s = q.toString();
646	<	for (int i = 0; i < SIZE; ++i) {
647	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
648	<	}
818	<	}
646	>	for (Object e : q)
647	>	assertTrue(s.contains(e.toString()));
648	>	}
649
650		/**
651	<	* offer transfers elements across Executor tasks
651	>	* timed poll transfers elements across Executor tasks
652		*/
653		public void testPollInExecutor() {
654		final DelayQueue q = new DelayQueue();
655	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
656		ExecutorService executor = Executors.newFixedThreadPool(2);
657	<	executor.execute(new Runnable() {
658	<	public void run() {
659	<	threadAssertNull(q.poll());
660	<	try {
661	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
662	<	threadAssertTrue(q.isEmpty());
663	<	}
664	<	catch (InterruptedException e) {
665	<	threadUnexpectedException();
666	<	}
667	<	}
668	<	});
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 CheckedRunnable() {
666	>	public void realRun() throws InterruptedException {
667	>	threadsStarted.await();
668	>	q.put(new PDelay(1));
669	>	}});
670
839	–	executor.execute(new Runnable() {
840	–	public void run() {
841	–	try {
842	–	Thread.sleep(SHORT_DELAY_MS);
843	–	q.put(new PDelay(1));
844	–	}
845	–	catch (InterruptedException e) {
846	–	threadUnexpectedException();
847	–	}
848	–	}
849	–	});
671		joinPool(executor);
851	–
672		}
673
854	–
674		/**
675	<	* Dekayed actions do not occur until their delay elapses
675	>	* Delayed actions do not occur until their delay elapses
676		*/
677	<	public void testDelay() {
678	<	DelayQueue q = new DelayQueue();
679	<	NanoDelay[] elements = new NanoDelay[SIZE];
680	<	for (int i = 0; i < SIZE; ++i) {
681	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
682	<	}
683	<	for (int i = 0; i < SIZE; ++i) {
684	<	q.add(elements[i]);
685	<	}
686	<
687	<	try {
688	<	long last = 0;
689	<	for (int i = 0; i < SIZE; ++i) {
871	<	NanoDelay e = (NanoDelay)(q.take());
872	<	long tt = e.getTriggerTime();
873	<	assertTrue(tt <= System.nanoTime());
874	<	if (i != 0)
875	<	assertTrue(tt >= last);
876	<	last = tt;
877	<	}
878	<	}
879	<	catch(InterruptedException ie) {
880	<	unexpectedException();
677	>	public void testDelay() throws InterruptedException {
678	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
679	>	for (int i = 0; i < SIZE; ++i)
680	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
681	>
682	>	long last = 0;
683	>	for (int i = 0; i < SIZE; ++i) {
684	>	NanoDelay e = q.take();
685	>	long tt = e.getTriggerTime();
686	>	assertTrue(System.nanoTime() - tt >= 0);
687	>	if (i != 0)
688	>	assertTrue(tt >= last);
689	>	last = tt;
690		}
691	+	assertTrue(q.isEmpty());
692		}
693
694	+	/**
695	+	* peek of a non-empty queue returns non-null even if not expired
696	+	*/
697	+	public void testPeekDelayed() {
698	+	DelayQueue q = new DelayQueue();
699	+	q.add(new NanoDelay(Long.MAX_VALUE));
700	+	assertNotNull(q.peek());
701	+	}
702
703		/**
704	<	* drainTo(null) throws NPE
705	<	*/
706	<	public void testDrainToNull() {
707	<	DelayQueue q = populatedQueue(SIZE);
708	<	try {
709	<	q.drainTo(null);
892	<	shouldThrow();
893	<	} catch(NullPointerException success) {
894	<	}
704	>	* poll of a non-empty queue returns null if no expired elements.
705	>	*/
706	>	public void testPollDelayed() {
707	>	DelayQueue q = new DelayQueue();
708	>	q.add(new NanoDelay(Long.MAX_VALUE));
709	>	assertNull(q.poll());
710		}
711
712		/**
713	<	* drainTo(this) throws IAE
714	<	*/
715	<	public void testDrainToSelf() {
716	<	DelayQueue q = populatedQueue(SIZE);
717	<	try {
718	<	q.drainTo(q);
904	<	shouldThrow();
905	<	} catch(IllegalArgumentException success) {
906	<	}
713	>	* timed poll of a non-empty queue returns null if no expired elements.
714	>	*/
715	>	public void testTimedPollDelayed() throws InterruptedException {
716	>	DelayQueue q = new DelayQueue();
717	>	q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
718	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
719		}
720
721		/**
722		* drainTo(c) empties queue into another collection c
723	<	*/
723	>	*/
724		public void testDrainTo() {
725	<	DelayQueue q = populatedQueue(SIZE);
725	>	DelayQueue q = new DelayQueue();
726	>	PDelay[] elems = new PDelay[SIZE];
727	>	for (int i = 0; i < SIZE; ++i) {
728	>	elems[i] = new PDelay(i);
729	>	q.add(elems[i]);
730	>	}
731		ArrayList l = new ArrayList();
732		q.drainTo(l);
733	<	assertEquals(q.size(), 0);
734	<	assertEquals(l.size(), SIZE);
733	>	assertEquals(0, q.size());
734	>	for (int i = 0; i < SIZE; ++i)
735	>	assertEquals(elems[i], l.get(i));
736	>	q.add(elems[0]);
737	>	q.add(elems[1]);
738	>	assertFalse(q.isEmpty());
739	>	assertTrue(q.contains(elems[0]));
740	>	assertTrue(q.contains(elems[1]));
741	>	l.clear();
742	>	q.drainTo(l);
743	>	assertEquals(0, q.size());
744	>	assertEquals(2, l.size());
745	>	for (int i = 0; i < 2; ++i)
746	>	assertEquals(elems[i], l.get(i));
747		}
748
749		/**
750		* drainTo empties queue
751	<	*/
752	<	public void testDrainToWithActivePut() {
751	>	*/
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	<	}
929	<	});
930	<	try {
931	<	t.start();
932	<	ArrayList l = new ArrayList();
933	<	q.drainTo(l);
934	<	assertTrue(l.size() >= SIZE);
935	<	t.join();
936	<	assertTrue(q.size() + l.size() == SIZE+1);
937	<	} catch(Exception e){
938	<	unexpectedException();
939	<	}
940	<	}
754	>	Thread t = new Thread(new CheckedRunnable() {
755	>	public void realRun() {
756	>	q.put(new PDelay(SIZE+1));
757	>	}});
758
759	<	/**
760	<	* drainTo(null, n) throws NPE
761	<	*/
762	<	public void testDrainToNullN() {
763	<	DelayQueue q = populatedQueue(SIZE);
764	<	try {
948	<	q.drainTo(null, 0);
949	<	shouldThrow();
950	<	} catch(NullPointerException success) {
951	<	}
952	<	}
953	<
954	<	/**
955	<	* drainTo(this, n) throws IAE
956	<	*/
957	<	public void testDrainToSelfN() {
958	<	DelayQueue q = populatedQueue(SIZE);
959	<	try {
960	<	q.drainTo(q, 0);
961	<	shouldThrow();
962	<	} catch(IllegalArgumentException success) {
963	<	}
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
769	<	*/
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