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.77 by jsr166, Thu Sep 15 17:07:16 2016 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	>	return newTestSuite(DelayQueueTest.class,
43	>	new Generic().testSuite());
44		}
45
23	–	private static final int NOCAP = Integer.MAX_VALUE;
24	–
46		/**
47		* A delayed implementation for testing.
48	<	* Most  tests use Pseudodelays, where delays are all elapsed
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 {
52		int pseudodelay;
53	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
54	<	public int compareTo(PDelay y) {
55	<	int i = pseudodelay;
56	<	int j = ((PDelay)y).pseudodelay;
57	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	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		}
40	–
59		public int compareTo(Delayed y) {
60	<	int i = pseudodelay;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	return 0;
60	>	return compareTo((PDelay)y);
61		}
48	–
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;
54	<	}
55	<
56	<
66	>	// suppress [overrides] javac warning
67	>	public int hashCode() { return pseudodelay; }
68		public long getDelay(TimeUnit ignore) {
69	<	return pseudodelay;
59	<	}
60	<	public int intValue() {
61	<	return pseudodelay;
69	>	return Integer.MIN_VALUE + pseudodelay;
70		}
63	–
71		public String toString() {
72		return String.valueOf(pseudodelay);
73		}
74		}
75
69	–
76		/**
77		* Delayed implementation that actually delays
78		*/
#	Line 77 | Line 83 | public class DelayQueueTest extends JSR1
83		}
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(Delayed y) {
93	<	long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	return 0;
93	>	return compareTo((NanoDelay)y);
94		}
95
96		public boolean equals(Object other) {
97	<	return ((NanoDelay)other).trigger == trigger;
98	<	}
97	<	public boolean equals(NanoDelay other) {
98	<	return ((NanoDelay)other).trigger == trigger;
97	>	return (other instanceof NanoDelay) &&
98	>	this.trigger == ((NanoDelay)other).trigger;
99		}
100
101	+	// suppress [overrides] javac warning
102	+	public int hashCode() { return (int) trigger; }
103	+
104		public long getDelay(TimeUnit unit) {
105		long n = trigger - System.nanoTime();
106		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 112 | Line 115 | public class DelayQueueTest extends JSR1
115		}
116		}
117
115	–
118		/**
119	<	* Create a queue of given size containing consecutive
119	>	* Returns a new queue of given size containing consecutive
120		* PDelays 0 ... n.
121		*/
122	<	private DelayQueue populatedQueue(int n) {
123	<	DelayQueue q = new DelayQueue();
122	>	private DelayQueue<PDelay> populatedQueue(int n) {
123	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
124		assertTrue(q.isEmpty());
125	<	for (int i = n-1; i >= 0; i-=2)
125	>	for (int i = n - 1; i >= 0; i -= 2)
126		assertTrue(q.offer(new PDelay(i)));
127	<	for (int i = (n & 1); i < n; i+=2)
127	>	for (int i = (n & 1); i < n; i += 2)
128		assertTrue(q.offer(new PDelay(i)));
129		assertFalse(q.isEmpty());
130	<	assertEquals(NOCAP, q.remainingCapacity());
130	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
131		assertEquals(n, q.size());
132		return q;
133		}
#	Line 134 | Line 136 | public class DelayQueueTest extends JSR1
136		* A new queue has unbounded capacity
137		*/
138		public void testConstructor1() {
139	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
139	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
140		}
141
142		/**
#	Line 142 | Line 144 | public class DelayQueueTest extends JSR1
144		*/
145		public void testConstructor3() {
146		try {
147	<	DelayQueue q = new DelayQueue(null);
147	>	new DelayQueue(null);
148		shouldThrow();
149	<	}
148	<	catch (NullPointerException success) {}
149	>	} catch (NullPointerException success) {}
150		}
151
152		/**
#	Line 153 | Line 154 | public class DelayQueueTest extends JSR1
154		*/
155		public void testConstructor4() {
156		try {
157	<	PDelay[] ints = new PDelay[SIZE];
157	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
157	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
158		shouldThrow();
159	<	}
160	<	catch (NullPointerException success) {}
159	>	} catch (NullPointerException success) {}
160		}
161
162		/**
163		* Initializing from Collection with some null elements throws NPE
164		*/
165		public void testConstructor5() {
166	+	PDelay[] a = new PDelay[SIZE];
167	+	for (int i = 0; i < SIZE - 1; ++i)
168	+	a[i] = new PDelay(i);
169		try {
170	<	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));
170	>	new DelayQueue(Arrays.asList(a));
171		shouldThrow();
172	<	}
174	<	catch (NullPointerException success) {}
172	>	} catch (NullPointerException success) {}
173		}
174
175		/**
176		* Queue contains all elements of collection used to initialize
177		*/
178		public void testConstructor6() {
179	<	try {
180	<	PDelay[] ints = new PDelay[SIZE];
181	<	for (int i = 0; i < SIZE; ++i)
182	<	ints[i] = new PDelay(i);
183	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
184	<	for (int i = 0; i < SIZE; ++i)
187	<	assertEquals(ints[i], q.poll());
188	<	}
189	<	finally {}
179	>	PDelay[] ints = new PDelay[SIZE];
180	>	for (int i = 0; i < SIZE; ++i)
181	>	ints[i] = new PDelay(i);
182	>	DelayQueue q = new DelayQueue(Arrays.asList(ints));
183	>	for (int i = 0; i < SIZE; ++i)
184	>	assertEquals(ints[i], q.poll());
185		}
186
187		/**
#	Line 195 | Line 190 | public class DelayQueueTest extends JSR1
190		public void testEmpty() {
191		DelayQueue q = new DelayQueue();
192		assertTrue(q.isEmpty());
193	<	assertEquals(NOCAP, q.remainingCapacity());
193	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
194		q.add(new PDelay(1));
195		assertFalse(q.isEmpty());
196		q.add(new PDelay(2));
#	Line 205 | Line 200 | public class DelayQueueTest extends JSR1
200		}
201
202		/**
203	<	* remainingCapacity does not change when elementa added or removed,
209	<	* but size does
203	>	* remainingCapacity() always returns Integer.MAX_VALUE
204		*/
205		public void testRemainingCapacity() {
206	<	DelayQueue q = populatedQueue(SIZE);
206	>	BlockingQueue q = populatedQueue(SIZE);
207		for (int i = 0; i < SIZE; ++i) {
208	<	assertEquals(NOCAP, q.remainingCapacity());
209	<	assertEquals(SIZE-i, q.size());
210	<	q.remove();
208	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
209	>	assertEquals(SIZE - i, q.size());
210	>	assertTrue(q.remove() instanceof PDelay);
211		}
212		for (int i = 0; i < SIZE; ++i) {
213	<	assertEquals(NOCAP, q.remainingCapacity());
213	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
214		assertEquals(i, q.size());
215	<	q.add(new PDelay(i));
215	>	assertTrue(q.add(new PDelay(i)));
216		}
217		}
218
219		/**
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	–	/**
220		* offer non-null succeeds
221		*/
222		public void testOffer() {
#	Line 265 | Line 237 | public class DelayQueueTest extends JSR1
237		}
238
239		/**
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	–	/**
240		* addAll(this) throws IAE
241		*/
242		public void testAddAllSelf() {
243	+	DelayQueue q = populatedQueue(SIZE);
244		try {
285	–	DelayQueue q = populatedQueue(SIZE);
245		q.addAll(q);
246		shouldThrow();
247	<	}
289	<	catch (IllegalArgumentException success) {}
247	>	} catch (IllegalArgumentException success) {}
248		}
249
250		/**
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	–	/**
251		* addAll of a collection with any null elements throws NPE after
252		* possibly adding some elements
253		*/
254		public void testAddAll3() {
255	+	DelayQueue q = new DelayQueue();
256	+	PDelay[] a = new PDelay[SIZE];
257	+	for (int i = 0; i < SIZE - 1; ++i)
258	+	a[i] = new PDelay(i);
259		try {
260	<	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));
260	>	q.addAll(Arrays.asList(a));
261		shouldThrow();
262	<	}
317	<	catch (NullPointerException success) {}
262	>	} catch (NullPointerException success) {}
263		}
264
265		/**
266		* Queue contains all elements of successful addAll
267		*/
268		public void testAddAll5() {
269	<	try {
270	<	PDelay[] empty = new PDelay[0];
271	<	PDelay[] ints = new PDelay[SIZE];
272	<	for (int i = SIZE-1; i >= 0; --i)
273	<	ints[i] = new PDelay(i);
274	<	DelayQueue q = new DelayQueue();
275	<	assertFalse(q.addAll(Arrays.asList(empty)));
276	<	assertTrue(q.addAll(Arrays.asList(ints)));
277	<	for (int i = 0; i < SIZE; ++i)
333	<	assertEquals(ints[i], q.poll());
334	<	}
335	<	finally {}
269	>	PDelay[] empty = new PDelay[0];
270	>	PDelay[] ints = new PDelay[SIZE];
271	>	for (int i = SIZE - 1; i >= 0; --i)
272	>	ints[i] = new PDelay(i);
273	>	DelayQueue q = new DelayQueue();
274	>	assertFalse(q.addAll(Arrays.asList(empty)));
275	>	assertTrue(q.addAll(Arrays.asList(ints)));
276	>	for (int i = 0; i < SIZE; ++i)
277	>	assertEquals(ints[i], q.poll());
278		}
279
280		/**
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	–	/**
281		* all elements successfully put are contained
282		*/
283	<	public void testPut() {
284	<	try {
285	<	DelayQueue q = new DelayQueue();
286	<	for (int i = 0; i < SIZE; ++i) {
287	<	PDelay I = new PDelay(i);
288	<	q.put(I);
360	<	assertTrue(q.contains(I));
361	<	}
362	<	assertEquals(SIZE, q.size());
363	<	}
364	<	finally {
283	>	public void testPut() {
284	>	DelayQueue q = new DelayQueue();
285	>	for (int i = 0; i < SIZE; ++i) {
286	>	PDelay x = new PDelay(i);
287	>	q.put(x);
288	>	assertTrue(q.contains(x));
289		}
290	+	assertEquals(SIZE, q.size());
291		}
292
293		/**
294		* put doesn't block waiting for take
295		*/
296	<	public void testPutWithTake() {
296	>	public void testPutWithTake() throws InterruptedException {
297		final DelayQueue q = new DelayQueue();
298	<	Thread t = new Thread(new Runnable() {
299	<	public void run() {
300	<	int added = 0;
301	<	try {
302	<	q.put(new PDelay(0));
303	<	++added;
304	<	q.put(new PDelay(0));
305	<	++added;
306	<	q.put(new PDelay(0));
307	<	++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	<	}
298	>	Thread t = newStartedThread(new CheckedRunnable() {
299	>	public void realRun() {
300	>	q.put(new PDelay(0));
301	>	q.put(new PDelay(0));
302	>	q.put(new PDelay(0));
303	>	q.put(new PDelay(0));
304	>	}});
305	>
306	>	awaitTermination(t);
307	>	assertEquals(4, q.size());
308		}
309
310		/**
311		* timed offer does not time out
312		*/
313	<	public void testTimedOffer() {
313	>	public void testTimedOffer() throws InterruptedException {
314		final DelayQueue q = new DelayQueue();
315	<	Thread t = new Thread(new Runnable() {
316	<	public void run() {
317	<	try {
318	<	q.put(new PDelay(0));
319	<	q.put(new PDelay(0));
320	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
321	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
413	<	} finally { }
414	<	}
415	<	});
315	>	Thread t = newStartedThread(new CheckedRunnable() {
316	>	public void realRun() throws InterruptedException {
317	>	q.put(new PDelay(0));
318	>	q.put(new PDelay(0));
319	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
320	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
321	>	}});
322
323	<	try {
418	<	t.start();
419	<	Thread.sleep(SMALL_DELAY_MS);
420	<	t.interrupt();
421	<	t.join();
422	<	} catch (Exception e) {
423	<	unexpectedException();
424	<	}
323	>	awaitTermination(t);
324		}
325
326		/**
327		* take retrieves elements in priority order
328		*/
329	<	public void testTake() {
330	<	try {
331	<	DelayQueue q = populatedQueue(SIZE);
332	<	for (int i = 0; i < SIZE; ++i) {
434	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
435	<	}
436	<	} catch (InterruptedException e) {
437	<	unexpectedException();
329	>	public void testTake() throws InterruptedException {
330	>	DelayQueue q = populatedQueue(SIZE);
331	>	for (int i = 0; i < SIZE; ++i) {
332	>	assertEquals(new PDelay(i), q.take());
333		}
334		}
335
336		/**
337	<	* take blocks interruptibly when empty
337	>	* Take removes existing elements until empty, then blocks interruptibly
338		*/
339	<	public void testTakeFromEmpty() {
340	<	final DelayQueue q = new DelayQueue();
341	<	Thread t = new Thread(new Runnable() {
342	<	public void run() {
343	<	try {
344	<	q.take();
345	<	threadShouldThrow();
451	<	} catch (InterruptedException success) { }
339	>	public void testBlockingTake() throws InterruptedException {
340	>	final DelayQueue q = populatedQueue(SIZE);
341	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
342	>	Thread t = newStartedThread(new CheckedRunnable() {
343	>	public void realRun() throws InterruptedException {
344	>	for (int i = 0; i < SIZE; ++i) {
345	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
346		}
453	–	});
454	–	try {
455	–	t.start();
456	–	Thread.sleep(SHORT_DELAY_MS);
457	–	t.interrupt();
458	–	t.join();
459	–	} catch (Exception e) {
460	–	unexpectedException();
461	–	}
462	–	}
347
348	<	/**
349	<	* Take removes existing elements until empty, then blocks interruptibly
350	<	*/
351	<	public void testBlockingTake() {
352	<	Thread t = new Thread(new Runnable() {
353	<	public void run() {
470	<	try {
471	<	DelayQueue q = populatedQueue(SIZE);
472	<	for (int i = 0; i < SIZE; ++i) {
473	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
474	<	}
475	<	q.take();
476	<	threadShouldThrow();
477	<	} catch (InterruptedException success) {
478	<	}
479	<	}});
480	<	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	<	}
348	>	Thread.currentThread().interrupt();
349	>	try {
350	>	q.take();
351	>	shouldThrow();
352	>	} catch (InterruptedException success) {}
353	>	assertFalse(Thread.interrupted());
354
355	+	pleaseInterrupt.countDown();
356	+	try {
357	+	q.take();
358	+	shouldThrow();
359	+	} catch (InterruptedException success) {}
360	+	assertFalse(Thread.interrupted());
361	+	}});
362	+
363	+	await(pleaseInterrupt);
364	+	assertThreadStaysAlive(t);
365	+	t.interrupt();
366	+	awaitTermination(t);
367	+	}
368
369		/**
370		* poll succeeds unless empty
#	Line 495 | Line 372 | public class DelayQueueTest extends JSR1
372		public void testPoll() {
373		DelayQueue q = populatedQueue(SIZE);
374		for (int i = 0; i < SIZE; ++i) {
375	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
375	>	assertEquals(new PDelay(i), q.poll());
376		}
377		assertNull(q.poll());
378		}
379
380		/**
381	<	* timed pool with zero timeout succeeds when non-empty, else times out
381	>	* timed poll with zero timeout succeeds when non-empty, else times out
382		*/
383	<	public void testTimedPoll0() {
384	<	try {
385	<	DelayQueue q = populatedQueue(SIZE);
386	<	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();
383	>	public void testTimedPoll0() throws InterruptedException {
384	>	DelayQueue q = populatedQueue(SIZE);
385	>	for (int i = 0; i < SIZE; ++i) {
386	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
387		}
388	+	assertNull(q.poll(0, MILLISECONDS));
389		}
390
391		/**
392	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
392	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
393		*/
394	<	public void testTimedPoll() {
395	<	try {
396	<	DelayQueue q = populatedQueue(SIZE);
397	<	for (int i = 0; i < SIZE; ++i) {
398	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
399	<	}
527	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
528	<	} catch (InterruptedException e) {
529	<	unexpectedException();
394	>	public void testTimedPoll() throws InterruptedException {
395	>	DelayQueue q = populatedQueue(SIZE);
396	>	for (int i = 0; i < SIZE; ++i) {
397	>	long startTime = System.nanoTime();
398	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
399	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
400		}
401	+	long startTime = System.nanoTime();
402	+	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
403	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
404	+	checkEmpty(q);
405		}
406
407		/**
408		* Interrupted timed poll throws InterruptedException instead of
409		* returning timeout status
410		*/
411	<	public void testInterruptedTimedPoll() {
412	<	Thread t = new Thread(new Runnable() {
413	<	public void run() {
414	<	try {
415	<	DelayQueue q = populatedQueue(SIZE);
416	<	for (int i = 0; i < SIZE; ++i) {
417	<	threadAssertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
418	<	}
419	<	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) { }
411	>	public void testInterruptedTimedPoll() throws InterruptedException {
412	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
413	>	final DelayQueue q = populatedQueue(SIZE);
414	>	Thread t = newStartedThread(new CheckedRunnable() {
415	>	public void realRun() throws InterruptedException {
416	>	long startTime = System.nanoTime();
417	>	for (int i = 0; i < SIZE; ++i) {
418	>	assertEquals(new PDelay(i),
419	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
420		}
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	–	}
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	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
436	+	}});
437	+
438	+	await(pleaseInterrupt);
439	+	assertThreadStaysAlive(t);
440	+	t.interrupt();
441	+	awaitTermination(t);
442	+	checkEmpty(q);
443	+	}
444
445		/**
446		* peek returns next element, or null if empty
#	Line 591 | Line 448 | public class DelayQueueTest extends JSR1
448		public void testPeek() {
449		DelayQueue q = populatedQueue(SIZE);
450		for (int i = 0; i < SIZE; ++i) {
451	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
452	<	q.poll();
451	>	assertEquals(new PDelay(i), q.peek());
452	>	assertEquals(new PDelay(i), q.poll());
453		if (q.isEmpty())
454		assertNull(q.peek());
455		else
456	<	assertTrue(i != ((PDelay)q.peek()).intValue());
456	>	assertFalse(new PDelay(i).equals(q.peek()));
457		}
458		assertNull(q.peek());
459		}
#	Line 607 | Line 464 | public class DelayQueueTest extends JSR1
464		public void testElement() {
465		DelayQueue q = populatedQueue(SIZE);
466		for (int i = 0; i < SIZE; ++i) {
467	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
467	>	assertEquals(new PDelay(i), q.element());
468		q.poll();
469		}
470		try {
471		q.element();
472		shouldThrow();
473	<	}
617	<	catch (NoSuchElementException success) {}
473	>	} catch (NoSuchElementException success) {}
474		}
475
476		/**
#	Line 623 | Line 479 | public class DelayQueueTest extends JSR1
479		public void testRemove() {
480		DelayQueue q = populatedQueue(SIZE);
481		for (int i = 0; i < SIZE; ++i) {
482	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
482	>	assertEquals(new PDelay(i), q.remove());
483		}
484		try {
485		q.remove();
486		shouldThrow();
487	<	} 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());
487	>	} catch (NoSuchElementException success) {}
488		}
489
490		/**
#	Line 667 | Line 507 | public class DelayQueueTest extends JSR1
507		q.clear();
508		assertTrue(q.isEmpty());
509		assertEquals(0, q.size());
510	<	assertEquals(NOCAP, q.remainingCapacity());
510	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
511		PDelay x = new PDelay(1);
512		q.add(x);
513		assertFalse(q.isEmpty());
#	Line 704 | Line 544 | public class DelayQueueTest extends JSR1
544		assertTrue(changed);
545
546		assertTrue(q.containsAll(p));
547	<	assertEquals(SIZE-i, q.size());
547	>	assertEquals(SIZE - i, q.size());
548		p.remove();
549		}
550		}
#	Line 717 | Line 557 | public class DelayQueueTest extends JSR1
557		DelayQueue q = populatedQueue(SIZE);
558		DelayQueue p = populatedQueue(i);
559		assertTrue(q.removeAll(p));
560	<	assertEquals(SIZE-i, q.size());
560	>	assertEquals(SIZE - i, q.size());
561		for (int j = 0; j < i; ++j) {
562	<	PDelay I = (PDelay)(p.remove());
563	<	assertFalse(q.contains(I));
562	>	PDelay x = (PDelay)(p.remove());
563	>	assertFalse(q.contains(x));
564		}
565		}
566		}
#	Line 728 | Line 568 | public class DelayQueueTest extends JSR1
568		/**
569		* toArray contains all elements
570		*/
571	<	public void testToArray() {
571	>	public void testToArray() throws InterruptedException {
572		DelayQueue q = populatedQueue(SIZE);
573		Object[] o = q.toArray();
574		Arrays.sort(o);
735	–	try {
575		for (int i = 0; i < o.length; i++)
576	<	assertEquals(o[i], q.take());
738	<	} catch (InterruptedException e) {
739	<	unexpectedException();
740	<	}
576	>	assertSame(o[i], q.take());
577		}
578
579		/**
580		* toArray(a) contains all elements
581		*/
582		public void testToArray2() {
583	<	DelayQueue q = populatedQueue(SIZE);
583	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
584		PDelay[] ints = new PDelay[SIZE];
585	<	ints = (PDelay[])q.toArray(ints);
585	>	PDelay[] array = q.toArray(ints);
586	>	assertSame(ints, array);
587		Arrays.sort(ints);
588	<	try {
589	<	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) {}
588	>	for (int i = 0; i < ints.length; i++)
589	>	assertSame(ints[i], q.remove());
590		}
591
592		/**
593	<	* toArray with incompatible array type throws CCE
593	>	* toArray(incompatible array type) throws ArrayStoreException
594		*/
595		public void testToArray1_BadArg() {
596	+	DelayQueue q = populatedQueue(SIZE);
597		try {
598	<	DelayQueue q = populatedQueue(SIZE);
777	<	Object o[] = q.toArray(new String[10] );
598	>	q.toArray(new String[10]);
599		shouldThrow();
600	<	} catch (ArrayStoreException  success) {}
600	>	} catch (ArrayStoreException success) {}
601		}
602
603		/**
#	Line 791 | Line 612 | public class DelayQueueTest extends JSR1
612		++i;
613		}
614		assertEquals(i, SIZE);
615	+	assertIteratorExhausted(it);
616	+	}
617	+
618	+	/**
619	+	* iterator of empty collection has no elements
620	+	*/
621	+	public void testEmptyIterator() {
622	+	assertIteratorExhausted(new DelayQueue().iterator());
623		}
624
625		/**
626		* iterator.remove removes current element
627		*/
628	<	public void testIteratorRemove () {
628	>	public void testIteratorRemove() {
629		final DelayQueue q = new DelayQueue();
630		q.add(new PDelay(2));
631		q.add(new PDelay(1));
#	Line 805 | Line 634 | public class DelayQueueTest extends JSR1
634		it.next();
635		it.remove();
636		it = q.iterator();
637	<	assertEquals(it.next(), new PDelay(2));
638	<	assertEquals(it.next(), new PDelay(3));
637	>	assertEquals(new PDelay(2), it.next());
638	>	assertEquals(new PDelay(3), it.next());
639		assertFalse(it.hasNext());
640		}
641
813	–
642		/**
643		* toString contains toStrings of elements
644		*/
645		public void testToString() {
646		DelayQueue q = populatedQueue(SIZE);
647		String s = q.toString();
648	<	for (int i = 0; i < SIZE; ++i) {
649	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
822	<	}
648	>	for (Object e : q)
649	>	assertTrue(s.contains(e.toString()));
650		}
651
652		/**
653	<	* offer transfers elements across Executor tasks
653	>	* timed poll transfers elements across Executor tasks
654		*/
655		public void testPollInExecutor() {
656		final DelayQueue q = new DelayQueue();
657	<	ExecutorService executor = Executors.newFixedThreadPool(2);
658	<	executor.execute(new Runnable() {
659	<	public void run() {
660	<	threadAssertNull(q.poll());
661	<	try {
662	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
663	<	threadAssertTrue(q.isEmpty());
664	<	}
665	<	catch (InterruptedException e) {
666	<	threadUnexpectedException();
840	<	}
841	<	}
842	<	});
657	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
658	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
659	>	try (PoolCleaner cleaner = cleaner(executor)) {
660	>	executor.execute(new CheckedRunnable() {
661	>	public void realRun() throws InterruptedException {
662	>	assertNull(q.poll());
663	>	threadsStarted.await();
664	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
665	>	checkEmpty(q);
666	>	}});
667
668	<	executor.execute(new Runnable() {
669	<	public void run() {
670	<	try {
847	<	Thread.sleep(SHORT_DELAY_MS);
668	>	executor.execute(new CheckedRunnable() {
669	>	public void realRun() throws InterruptedException {
670	>	threadsStarted.await();
671		q.put(new PDelay(1));
672	<	}
673	<	catch (InterruptedException e) {
851	<	threadUnexpectedException();
852	<	}
853	<	}
854	<	});
855	<	joinPool(executor);
856	<
672	>	}});
673	>	}
674		}
675
859	–
676		/**
677		* Delayed actions do not occur until their delay elapses
678		*/
679	<	public void testDelay() {
680	<	DelayQueue q = new DelayQueue();
681	<	NanoDelay[] elements = new NanoDelay[SIZE];
682	<	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	<	}
679	>	public void testDelay() throws InterruptedException {
680	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
681	>	for (int i = 0; i < SIZE; ++i)
682	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
683
684	<	try {
685	<	long last = 0;
686	<	for (int i = 0; i < SIZE; ++i) {
687	<	NanoDelay e = (NanoDelay)(q.take());
688	<	long tt = e.getTriggerTime();
689	<	assertTrue(tt <= System.nanoTime());
690	<	if (i != 0)
691	<	assertTrue(tt >= last);
881	<	last = tt;
882	<	}
883	<	}
884	<	catch (InterruptedException ie) {
885	<	unexpectedException();
684	>	long last = 0;
685	>	for (int i = 0; i < SIZE; ++i) {
686	>	NanoDelay e = q.take();
687	>	long tt = e.getTriggerTime();
688	>	assertTrue(System.nanoTime() - tt >= 0);
689	>	if (i != 0)
690	>	assertTrue(tt >= last);
691	>	last = tt;
692		}
693	+	assertTrue(q.isEmpty());
694		}
695
696		/**
#	Line 892 | Line 699 | public class DelayQueueTest extends JSR1
699		public void testPeekDelayed() {
700		DelayQueue q = new DelayQueue();
701		q.add(new NanoDelay(Long.MAX_VALUE));
702	<	assert(q.peek() != null);
702	>	assertNotNull(q.peek());
703		}
704
898	–
705		/**
706		* poll of a non-empty queue returns null if no expired elements.
707		*/
#	Line 908 | Line 714 | public class DelayQueueTest extends JSR1
714		/**
715		* timed poll of a non-empty queue returns null if no expired elements.
716		*/
717	<	public void testTimedPollDelayed() {
717	>	public void testTimedPollDelayed() throws InterruptedException {
718		DelayQueue q = new DelayQueue();
719		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
720	<	try {
915	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
916	<	} 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	<	}
720	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
721		}
722
723		/**
#	Line 954 | Line 732 | public class DelayQueueTest extends JSR1
732		}
733		ArrayList l = new ArrayList();
734		q.drainTo(l);
735	<	assertEquals(q.size(), 0);
735	>	assertEquals(0, q.size());
736		for (int i = 0; i < SIZE; ++i)
737	<	assertEquals(l.get(i), elems[i]);
737	>	assertEquals(elems[i], l.get(i));
738		q.add(elems[0]);
739		q.add(elems[1]);
740		assertFalse(q.isEmpty());
#	Line 964 | Line 742 | public class DelayQueueTest extends JSR1
742		assertTrue(q.contains(elems[1]));
743		l.clear();
744		q.drainTo(l);
745	<	assertEquals(q.size(), 0);
746	<	assertEquals(l.size(), 2);
745	>	assertEquals(0, q.size());
746	>	assertEquals(2, l.size());
747		for (int i = 0; i < 2; ++i)
748	<	assertEquals(l.get(i), elems[i]);
748	>	assertEquals(elems[i], l.get(i));
749		}
750
751		/**
752		* drainTo empties queue
753		*/
754	<	public void testDrainToWithActivePut() {
754	>	public void testDrainToWithActivePut() throws InterruptedException {
755		final DelayQueue q = populatedQueue(SIZE);
756	<	Thread t = new Thread(new Runnable() {
757	<	public void run() {
758	<	q.put(new PDelay(SIZE+1));
759	<	}
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	<	}
756	>	Thread t = new Thread(new CheckedRunnable() {
757	>	public void realRun() {
758	>	q.put(new PDelay(SIZE + 1));
759	>	}});
760
761	<	/**
762	<	* drainTo(null, n) throws NPE
763	<	*/
764	<	public void testDrainToNullN() {
765	<	DelayQueue q = populatedQueue(SIZE);
766	<	try {
1001	<	q.drainTo(null, 0);
1002	<	shouldThrow();
1003	<	} catch (NullPointerException success) {
1004	<	}
1005	<	}
1006	<
1007	<	/**
1008	<	* drainTo(this, n) throws IAE
1009	<	*/
1010	<	public void testDrainToSelfN() {
1011	<	DelayQueue q = populatedQueue(SIZE);
1012	<	try {
1013	<	q.drainTo(q, 0);
1014	<	shouldThrow();
1015	<	} catch (IllegalArgumentException success) {
1016	<	}
761	>	t.start();
762	>	ArrayList l = new ArrayList();
763	>	q.drainTo(l);
764	>	assertTrue(l.size() >= SIZE);
765	>	t.join();
766	>	assertTrue(q.size() + l.size() >= SIZE);
767		}
768
769		/**
770	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
770	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
771		*/
772		public void testDrainToN() {
773		for (int i = 0; i < SIZE + 2; ++i) {
774		DelayQueue q = populatedQueue(SIZE);
775		ArrayList l = new ArrayList();
776		q.drainTo(l, i);
777	<	int k = (i < SIZE)? i : SIZE;
778	<	assertEquals(q.size(), SIZE-k);
779	<	assertEquals(l.size(), k);
777	>	int k = (i < SIZE) ? i : SIZE;
778	>	assertEquals(SIZE - k, q.size());
779	>	assertEquals(k, l.size());
780		}
781		}
782
783	<
783	>	/**
784	>	* remove(null), contains(null) always return false
785	>	*/
786	>	public void testNeverContainsNull() {
787	>	Collection<?> q = populatedQueue(SIZE);
788	>	assertFalse(q.contains(null));
789	>	assertFalse(q.remove(null));
790	>	}
791		}

Diff Legend

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