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.80 by jsr166, Tue Jan 3 07:29:30 2017 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
10	–	import java.util.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.util.concurrent.*;
10	>
11	>	import java.util.ArrayList;
12	>	import java.util.Arrays;
13	>	import java.util.Collection;
14	>	import java.util.Iterator;
15	>	import java.util.NoSuchElementException;
16	>	import java.util.concurrent.BlockingQueue;
17	>	import java.util.concurrent.CountDownLatch;
18	>	import java.util.concurrent.Delayed;
19	>	import java.util.concurrent.DelayQueue;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.TimeUnit;
23	>
24	>	import junit.framework.Test;
25
26		public class DelayQueueTest extends JSR166TestCase {
27	+
28	+	public static class Generic extends BlockingQueueTest {
29	+	protected BlockingQueue emptyCollection() {
30	+	return new DelayQueue();
31	+	}
32	+	protected PDelay makeElement(int i) {
33	+	return new PDelay(i);
34	+	}
35	+	}
36	+
37		public static void main(String[] args) {
38	<	junit.textui.TestRunner.run (suite());
38	>	main(suite(), args);
39		}
40
41		public static Test suite() {
42	<	return new TestSuite(DelayQueueTest.class);
42	>	class Implementation implements CollectionImplementation {
43	>	public Class<?> klazz() { return DelayQueue.class; }
44	>	public Collection emptyCollection() { return new DelayQueue(); }
45	>	public Object makeElement(int i) { return new PDelay(i); }
46	>	public boolean isConcurrent() { return true; }
47	>	public boolean permitsNulls() { return false; }
48	>	}
49	>	return newTestSuite(DelayQueueTest.class,
50	>	new Generic().testSuite(),
51	>	CollectionTest.testSuite(new Implementation()));
52		}
53
23	–	private static final int NOCAP = Integer.MAX_VALUE;
24	–
54		/**
55	<	* A delayed implementation for testing.
56	<	* Most  tests use Pseudodelays, where delays are all elapsed
55	>	* A fake Delayed implementation for testing.
56	>	* Most tests use PDelays, where delays are all elapsed
57		* (so, no blocking solely for delays) but are still ordered
58		*/
59		static class PDelay implements Delayed {
60	<	int pseudodelay;
61	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
33	<	public int compareTo(PDelay y) {
34	<	int i = pseudodelay;
35	<	int j = ((PDelay)y).pseudodelay;
36	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
39	<	}
40	<
60	>	final int pseudodelay;
61	>	PDelay(int pseudodelay) { this.pseudodelay = pseudodelay; }
62		public int compareTo(Delayed y) {
63	<	int i = pseudodelay;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	return 0;
63	>	return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay);
64		}
48	–
65		public boolean equals(Object other) {
66	<	return ((PDelay)other).pseudodelay == pseudodelay;
66	>	return (other instanceof PDelay) &&
67	>	this.pseudodelay == ((PDelay)other).pseudodelay;
68		}
69	<	public boolean equals(PDelay other) {
70	<	return ((PDelay)other).pseudodelay == pseudodelay;
54	<	}
55	<
56	<
69	>	// suppress [overrides] javac warning
70	>	public int hashCode() { return pseudodelay; }
71		public long getDelay(TimeUnit ignore) {
72	<	return pseudodelay;
59	<	}
60	<	public int intValue() {
61	<	return pseudodelay;
72	>	return Integer.MIN_VALUE + pseudodelay;
73		}
63	–
74		public String toString() {
75		return String.valueOf(pseudodelay);
76		}
77		}
78
69	–
79		/**
80		* Delayed implementation that actually delays
81		*/
82		static class NanoDelay implements Delayed {
83	<	long trigger;
83	>	final long trigger;
84		NanoDelay(long i) {
85		trigger = System.nanoTime() + i;
86		}
78	–	public int compareTo(NanoDelay y) {
79	–	long i = trigger;
80	–	long j = ((NanoDelay)y).trigger;
81	–	if (i < j) return -1;
82	–	if (i > j) return 1;
83	–	return 0;
84	–	}
87
88		public int compareTo(Delayed y) {
89	<	long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	return 0;
89	>	return Long.compare(trigger, ((NanoDelay)y).trigger);
90		}
91
92		public boolean equals(Object other) {
93	<	return ((NanoDelay)other).trigger == trigger;
94	<	}
97	<	public boolean equals(NanoDelay other) {
98	<	return ((NanoDelay)other).trigger == trigger;
93	>	return (other instanceof NanoDelay) &&
94	>	this.trigger == ((NanoDelay)other).trigger;
95		}
96
97	+	// suppress [overrides] javac warning
98	+	public int hashCode() { return (int) trigger; }
99	+
100		public long getDelay(TimeUnit unit) {
101		long n = trigger - System.nanoTime();
102		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 112 | Line 111 | public class DelayQueueTest extends JSR1
111		}
112		}
113
115	–
114		/**
115	<	* Create a queue of given size containing consecutive
116	<	* PDelays 0 ... n.
115	>	* Returns a new queue of given size containing consecutive
116	>	* PDelays 0 ... n - 1.
117		*/
118	<	private DelayQueue populatedQueue(int n) {
119	<	DelayQueue q = new DelayQueue();
118	>	private DelayQueue<PDelay> populatedQueue(int n) {
119	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
120		assertTrue(q.isEmpty());
121	<	for (int i = n-1; i >= 0; i-=2)
121	>	for (int i = n - 1; i >= 0; i -= 2)
122		assertTrue(q.offer(new PDelay(i)));
123	<	for (int i = (n & 1); i < n; i+=2)
123	>	for (int i = (n & 1); i < n; i += 2)
124		assertTrue(q.offer(new PDelay(i)));
125		assertFalse(q.isEmpty());
126	<	assertEquals(NOCAP, q.remainingCapacity());
126	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
127		assertEquals(n, q.size());
128	+	assertEquals(new PDelay(0), q.peek());
129		return q;
130		}
131
#	Line 134 | Line 133 | public class DelayQueueTest extends JSR1
133		* A new queue has unbounded capacity
134		*/
135		public void testConstructor1() {
136	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
136	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
137		}
138
139		/**
#	Line 142 | Line 141 | public class DelayQueueTest extends JSR1
141		*/
142		public void testConstructor3() {
143		try {
144	<	DelayQueue q = new DelayQueue(null);
144	>	new DelayQueue(null);
145		shouldThrow();
146	<	}
148	<	catch (NullPointerException success) {}
146	>	} catch (NullPointerException success) {}
147		}
148
149		/**
#	Line 153 | Line 151 | public class DelayQueueTest extends JSR1
151		*/
152		public void testConstructor4() {
153		try {
154	<	PDelay[] ints = new PDelay[SIZE];
157	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
154	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
155		shouldThrow();
156	<	}
160	<	catch (NullPointerException success) {}
156	>	} catch (NullPointerException success) {}
157		}
158
159		/**
160		* Initializing from Collection with some null elements throws NPE
161		*/
162		public void testConstructor5() {
163	+	PDelay[] a = new PDelay[SIZE];
164	+	for (int i = 0; i < SIZE - 1; ++i)
165	+	a[i] = new PDelay(i);
166		try {
167	<	PDelay[] ints = new PDelay[SIZE];
169	<	for (int i = 0; i < SIZE-1; ++i)
170	<	ints[i] = new PDelay(i);
171	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
167	>	new DelayQueue(Arrays.asList(a));
168		shouldThrow();
169	<	}
174	<	catch (NullPointerException success) {}
169	>	} catch (NullPointerException success) {}
170		}
171
172		/**
173		* Queue contains all elements of collection used to initialize
174		*/
175		public void testConstructor6() {
176	<	try {
177	<	PDelay[] ints = new PDelay[SIZE];
178	<	for (int i = 0; i < SIZE; ++i)
179	<	ints[i] = new PDelay(i);
180	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
181	<	for (int i = 0; i < SIZE; ++i)
187	<	assertEquals(ints[i], q.poll());
188	<	}
189	<	finally {}
176	>	PDelay[] ints = new PDelay[SIZE];
177	>	for (int i = 0; i < SIZE; ++i)
178	>	ints[i] = new PDelay(i);
179	>	DelayQueue q = new DelayQueue(Arrays.asList(ints));
180	>	for (int i = 0; i < SIZE; ++i)
181	>	assertEquals(ints[i], q.poll());
182		}
183
184		/**
#	Line 195 | Line 187 | public class DelayQueueTest extends JSR1
187		public void testEmpty() {
188		DelayQueue q = new DelayQueue();
189		assertTrue(q.isEmpty());
190	<	assertEquals(NOCAP, q.remainingCapacity());
190	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
191		q.add(new PDelay(1));
192		assertFalse(q.isEmpty());
193		q.add(new PDelay(2));
#	Line 205 | Line 197 | public class DelayQueueTest extends JSR1
197		}
198
199		/**
200	<	* remainingCapacity does not change when elementa added or removed,
209	<	* but size does
200	>	* remainingCapacity() always returns Integer.MAX_VALUE
201		*/
202		public void testRemainingCapacity() {
203	<	DelayQueue q = populatedQueue(SIZE);
203	>	BlockingQueue q = populatedQueue(SIZE);
204		for (int i = 0; i < SIZE; ++i) {
205	<	assertEquals(NOCAP, q.remainingCapacity());
206	<	assertEquals(SIZE-i, q.size());
207	<	q.remove();
205	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
206	>	assertEquals(SIZE - i, q.size());
207	>	assertTrue(q.remove() instanceof PDelay);
208		}
209		for (int i = 0; i < SIZE; ++i) {
210	<	assertEquals(NOCAP, q.remainingCapacity());
210	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211		assertEquals(i, q.size());
212	<	q.add(new PDelay(i));
212	>	assertTrue(q.add(new PDelay(i)));
213		}
214		}
215
216		/**
226	–	* offer(null) throws NPE
227	–	*/
228	–	public void testOfferNull() {
229	–	try {
230	–	DelayQueue q = new DelayQueue();
231	–	q.offer(null);
232	–	shouldThrow();
233	–	} catch (NullPointerException success) { }
234	–	}
235	–
236	–	/**
237	–	* add(null) throws NPE
238	–	*/
239	–	public void testAddNull() {
240	–	try {
241	–	DelayQueue q = new DelayQueue();
242	–	q.add(null);
243	–	shouldThrow();
244	–	} catch (NullPointerException success) { }
245	–	}
246	–
247	–	/**
217		* offer non-null succeeds
218		*/
219		public void testOffer() {
#	Line 265 | Line 234 | public class DelayQueueTest extends JSR1
234		}
235
236		/**
268	–	* addAll(null) throws NPE
269	–	*/
270	–	public void testAddAll1() {
271	–	try {
272	–	DelayQueue q = new DelayQueue();
273	–	q.addAll(null);
274	–	shouldThrow();
275	–	}
276	–	catch (NullPointerException success) {}
277	–	}
278	–
279	–
280	–	/**
237		* addAll(this) throws IAE
238		*/
239		public void testAddAllSelf() {
240	+	DelayQueue q = populatedQueue(SIZE);
241		try {
285	–	DelayQueue q = populatedQueue(SIZE);
242		q.addAll(q);
243		shouldThrow();
244	<	}
289	<	catch (IllegalArgumentException success) {}
244	>	} catch (IllegalArgumentException success) {}
245		}
246
247		/**
293	–	* addAll of a collection with null elements throws NPE
294	–	*/
295	–	public void testAddAll2() {
296	–	try {
297	–	DelayQueue q = new DelayQueue();
298	–	PDelay[] ints = new PDelay[SIZE];
299	–	q.addAll(Arrays.asList(ints));
300	–	shouldThrow();
301	–	}
302	–	catch (NullPointerException success) {}
303	–	}
304	–	/**
248		* addAll of a collection with any null elements throws NPE after
249		* possibly adding some elements
250		*/
251		public void testAddAll3() {
252	+	DelayQueue q = new DelayQueue();
253	+	PDelay[] a = new PDelay[SIZE];
254	+	for (int i = 0; i < SIZE - 1; ++i)
255	+	a[i] = new PDelay(i);
256		try {
257	<	DelayQueue q = new DelayQueue();
311	<	PDelay[] ints = new PDelay[SIZE];
312	<	for (int i = 0; i < SIZE-1; ++i)
313	<	ints[i] = new PDelay(i);
314	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(a));
258		shouldThrow();
259	<	}
317	<	catch (NullPointerException success) {}
259	>	} catch (NullPointerException success) {}
260		}
261
262		/**
263		* Queue contains all elements of successful addAll
264		*/
265		public void testAddAll5() {
266	<	try {
267	<	PDelay[] empty = new PDelay[0];
268	<	PDelay[] ints = new PDelay[SIZE];
269	<	for (int i = SIZE-1; i >= 0; --i)
270	<	ints[i] = new PDelay(i);
271	<	DelayQueue q = new DelayQueue();
272	<	assertFalse(q.addAll(Arrays.asList(empty)));
273	<	assertTrue(q.addAll(Arrays.asList(ints)));
274	<	for (int i = 0; i < SIZE; ++i)
333	<	assertEquals(ints[i], q.poll());
334	<	}
335	<	finally {}
266	>	PDelay[] empty = new PDelay[0];
267	>	PDelay[] ints = new PDelay[SIZE];
268	>	for (int i = SIZE - 1; i >= 0; --i)
269	>	ints[i] = new PDelay(i);
270	>	DelayQueue q = new DelayQueue();
271	>	assertFalse(q.addAll(Arrays.asList(empty)));
272	>	assertTrue(q.addAll(Arrays.asList(ints)));
273	>	for (int i = 0; i < SIZE; ++i)
274	>	assertEquals(ints[i], q.poll());
275		}
276
277		/**
339	–	* put(null) throws NPE
340	–	*/
341	–	public void testPutNull() {
342	–	try {
343	–	DelayQueue q = new DelayQueue();
344	–	q.put(null);
345	–	shouldThrow();
346	–	}
347	–	catch (NullPointerException success) {
348	–	}
349	–	}
350	–
351	–	/**
278		* all elements successfully put are contained
279		*/
280	<	public void testPut() {
281	<	try {
282	<	DelayQueue q = new DelayQueue();
283	<	for (int i = 0; i < SIZE; ++i) {
284	<	PDelay I = new PDelay(i);
285	<	q.put(I);
360	<	assertTrue(q.contains(I));
361	<	}
362	<	assertEquals(SIZE, q.size());
363	<	}
364	<	finally {
280	>	public void testPut() {
281	>	DelayQueue q = new DelayQueue();
282	>	for (int i = 0; i < SIZE; ++i) {
283	>	PDelay x = new PDelay(i);
284	>	q.put(x);
285	>	assertTrue(q.contains(x));
286		}
287	+	assertEquals(SIZE, q.size());
288		}
289
290		/**
291		* put doesn't block waiting for take
292		*/
293	<	public void testPutWithTake() {
293	>	public void testPutWithTake() throws InterruptedException {
294		final DelayQueue q = new DelayQueue();
295	<	Thread t = new Thread(new Runnable() {
296	<	public void run() {
297	<	int added = 0;
298	<	try {
299	<	q.put(new PDelay(0));
300	<	++added;
301	<	q.put(new PDelay(0));
302	<	++added;
303	<	q.put(new PDelay(0));
304	<	++added;
383	<	q.put(new PDelay(0));
384	<	++added;
385	<	threadAssertTrue(added == 4);
386	<	} finally {
387	<	}
388	<	}
389	<	});
390	<	try {
391	<	t.start();
392	<	Thread.sleep(SHORT_DELAY_MS);
393	<	q.take();
394	<	t.interrupt();
395	<	t.join();
396	<	} catch (Exception e) {
397	<	unexpectedException();
398	<	}
295	>	Thread t = newStartedThread(new CheckedRunnable() {
296	>	public void realRun() {
297	>	q.put(new PDelay(0));
298	>	q.put(new PDelay(0));
299	>	q.put(new PDelay(0));
300	>	q.put(new PDelay(0));
301	>	}});
302	>
303	>	awaitTermination(t);
304	>	assertEquals(4, q.size());
305		}
306
307		/**
308		* timed offer does not time out
309		*/
310	<	public void testTimedOffer() {
310	>	public void testTimedOffer() throws InterruptedException {
311		final DelayQueue q = new DelayQueue();
312	<	Thread t = new Thread(new Runnable() {
313	<	public void run() {
314	<	try {
315	<	q.put(new PDelay(0));
316	<	q.put(new PDelay(0));
317	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
318	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
413	<	} finally { }
414	<	}
415	<	});
312	>	Thread t = newStartedThread(new CheckedRunnable() {
313	>	public void realRun() throws InterruptedException {
314	>	q.put(new PDelay(0));
315	>	q.put(new PDelay(0));
316	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
317	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
318	>	}});
319
320	<	try {
418	<	t.start();
419	<	Thread.sleep(SMALL_DELAY_MS);
420	<	t.interrupt();
421	<	t.join();
422	<	} catch (Exception e) {
423	<	unexpectedException();
424	<	}
320	>	awaitTermination(t);
321		}
322
323		/**
324		* take retrieves elements in priority order
325		*/
326	<	public void testTake() {
327	<	try {
328	<	DelayQueue q = populatedQueue(SIZE);
329	<	for (int i = 0; i < SIZE; ++i) {
434	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
435	<	}
436	<	} catch (InterruptedException e) {
437	<	unexpectedException();
326	>	public void testTake() throws InterruptedException {
327	>	DelayQueue q = populatedQueue(SIZE);
328	>	for (int i = 0; i < SIZE; ++i) {
329	>	assertEquals(new PDelay(i), q.take());
330		}
331		}
332
333		/**
334	<	* take blocks interruptibly when empty
334	>	* Take removes existing elements until empty, then blocks interruptibly
335		*/
336	<	public void testTakeFromEmpty() {
337	<	final DelayQueue q = new DelayQueue();
338	<	Thread t = new Thread(new Runnable() {
339	<	public void run() {
340	<	try {
341	<	q.take();
342	<	threadShouldThrow();
451	<	} catch (InterruptedException success) { }
336	>	public void testBlockingTake() throws InterruptedException {
337	>	final DelayQueue q = populatedQueue(SIZE);
338	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
339	>	Thread t = newStartedThread(new CheckedRunnable() {
340	>	public void realRun() throws InterruptedException {
341	>	for (int i = 0; i < SIZE; ++i) {
342	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
343		}
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	–	}
344
345	<	/**
346	<	* Take removes existing elements until empty, then blocks interruptibly
347	<	*/
348	<	public void testBlockingTake() {
349	<	Thread t = new Thread(new Runnable() {
350	<	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	<	}
345	>	Thread.currentThread().interrupt();
346	>	try {
347	>	q.take();
348	>	shouldThrow();
349	>	} catch (InterruptedException success) {}
350	>	assertFalse(Thread.interrupted());
351
352	+	pleaseInterrupt.countDown();
353	+	try {
354	+	q.take();
355	+	shouldThrow();
356	+	} catch (InterruptedException success) {}
357	+	assertFalse(Thread.interrupted());
358	+	}});
359	+
360	+	await(pleaseInterrupt);
361	+	assertThreadStaysAlive(t);
362	+	t.interrupt();
363	+	awaitTermination(t);
364	+	}
365
366		/**
367		* poll succeeds unless empty
#	Line 495 | Line 369 | public class DelayQueueTest extends JSR1
369		public void testPoll() {
370		DelayQueue q = populatedQueue(SIZE);
371		for (int i = 0; i < SIZE; ++i) {
372	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
372	>	assertEquals(new PDelay(i), q.poll());
373		}
374		assertNull(q.poll());
375		}
376
377		/**
378	<	* timed pool with zero timeout succeeds when non-empty, else times out
378	>	* timed poll with zero timeout succeeds when non-empty, else times out
379		*/
380	<	public void testTimedPoll0() {
381	<	try {
382	<	DelayQueue q = populatedQueue(SIZE);
383	<	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();
380	>	public void testTimedPoll0() throws InterruptedException {
381	>	DelayQueue q = populatedQueue(SIZE);
382	>	for (int i = 0; i < SIZE; ++i) {
383	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
384		}
385	+	assertNull(q.poll(0, MILLISECONDS));
386		}
387
388		/**
389	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
389	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
390		*/
391	<	public void testTimedPoll() {
392	<	try {
393	<	DelayQueue q = populatedQueue(SIZE);
394	<	for (int i = 0; i < SIZE; ++i) {
395	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
396	<	}
527	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
528	<	} catch (InterruptedException e) {
529	<	unexpectedException();
391	>	public void testTimedPoll() throws InterruptedException {
392	>	DelayQueue q = populatedQueue(SIZE);
393	>	for (int i = 0; i < SIZE; ++i) {
394	>	long startTime = System.nanoTime();
395	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
396	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
397		}
398	+	long startTime = System.nanoTime();
399	+	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
400	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
401	+	checkEmpty(q);
402		}
403
404		/**
405		* Interrupted timed poll throws InterruptedException instead of
406		* returning timeout status
407		*/
408	<	public void testInterruptedTimedPoll() {
409	<	Thread t = new Thread(new Runnable() {
410	<	public void run() {
411	<	try {
412	<	DelayQueue q = populatedQueue(SIZE);
413	<	for (int i = 0; i < SIZE; ++i) {
414	<	threadAssertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
415	<	}
416	<	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) { }
408	>	public void testInterruptedTimedPoll() throws InterruptedException {
409	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
410	>	final DelayQueue q = populatedQueue(SIZE);
411	>	Thread t = newStartedThread(new CheckedRunnable() {
412	>	public void realRun() throws InterruptedException {
413	>	long startTime = System.nanoTime();
414	>	for (int i = 0; i < SIZE; ++i) {
415	>	assertEquals(new PDelay(i),
416	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
417		}
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	–	}
418
419	+	Thread.currentThread().interrupt();
420	+	try {
421	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
422	+	shouldThrow();
423	+	} catch (InterruptedException success) {}
424	+	assertFalse(Thread.interrupted());
425	+
426	+	pleaseInterrupt.countDown();
427	+	try {
428	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
429	+	shouldThrow();
430	+	} catch (InterruptedException success) {}
431	+	assertFalse(Thread.interrupted());
432	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
433	+	}});
434	+
435	+	await(pleaseInterrupt);
436	+	assertThreadStaysAlive(t);
437	+	t.interrupt();
438	+	awaitTermination(t);
439	+	checkEmpty(q);
440	+	}
441
442		/**
443		* peek returns next element, or null if empty
#	Line 591 | Line 445 | public class DelayQueueTest extends JSR1
445		public void testPeek() {
446		DelayQueue q = populatedQueue(SIZE);
447		for (int i = 0; i < SIZE; ++i) {
448	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
449	<	q.poll();
448	>	assertEquals(new PDelay(i), q.peek());
449	>	assertEquals(new PDelay(i), q.poll());
450		if (q.isEmpty())
451		assertNull(q.peek());
452		else
453	<	assertTrue(i != ((PDelay)q.peek()).intValue());
453	>	assertFalse(new PDelay(i).equals(q.peek()));
454		}
455		assertNull(q.peek());
456		}
#	Line 607 | Line 461 | public class DelayQueueTest extends JSR1
461		public void testElement() {
462		DelayQueue q = populatedQueue(SIZE);
463		for (int i = 0; i < SIZE; ++i) {
464	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
464	>	assertEquals(new PDelay(i), q.element());
465		q.poll();
466		}
467		try {
468		q.element();
469		shouldThrow();
470	<	}
617	<	catch (NoSuchElementException success) {}
470	>	} catch (NoSuchElementException success) {}
471		}
472
473		/**
#	Line 623 | Line 476 | public class DelayQueueTest extends JSR1
476		public void testRemove() {
477		DelayQueue q = populatedQueue(SIZE);
478		for (int i = 0; i < SIZE; ++i) {
479	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
479	>	assertEquals(new PDelay(i), q.remove());
480		}
481		try {
482		q.remove();
483		shouldThrow();
484	<	} catch (NoSuchElementException success) {
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());
484	>	} catch (NoSuchElementException success) {}
485		}
486
487		/**
#	Line 667 | Line 504 | public class DelayQueueTest extends JSR1
504		q.clear();
505		assertTrue(q.isEmpty());
506		assertEquals(0, q.size());
507	<	assertEquals(NOCAP, q.remainingCapacity());
507	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
508		PDelay x = new PDelay(1);
509		q.add(x);
510		assertFalse(q.isEmpty());
#	Line 704 | Line 541 | public class DelayQueueTest extends JSR1
541		assertTrue(changed);
542
543		assertTrue(q.containsAll(p));
544	<	assertEquals(SIZE-i, q.size());
544	>	assertEquals(SIZE - i, q.size());
545		p.remove();
546		}
547		}
#	Line 717 | Line 554 | public class DelayQueueTest extends JSR1
554		DelayQueue q = populatedQueue(SIZE);
555		DelayQueue p = populatedQueue(i);
556		assertTrue(q.removeAll(p));
557	<	assertEquals(SIZE-i, q.size());
557	>	assertEquals(SIZE - i, q.size());
558		for (int j = 0; j < i; ++j) {
559	<	PDelay I = (PDelay)(p.remove());
560	<	assertFalse(q.contains(I));
559	>	PDelay x = (PDelay)(p.remove());
560	>	assertFalse(q.contains(x));
561		}
562		}
563		}
#	Line 728 | Line 565 | public class DelayQueueTest extends JSR1
565		/**
566		* toArray contains all elements
567		*/
568	<	public void testToArray() {
568	>	public void testToArray() throws InterruptedException {
569		DelayQueue q = populatedQueue(SIZE);
570		Object[] o = q.toArray();
571		Arrays.sort(o);
735	–	try {
572		for (int i = 0; i < o.length; i++)
573	<	assertEquals(o[i], q.take());
738	<	} catch (InterruptedException e) {
739	<	unexpectedException();
740	<	}
573	>	assertSame(o[i], q.take());
574		}
575
576		/**
577		* toArray(a) contains all elements
578		*/
579		public void testToArray2() {
580	<	DelayQueue q = populatedQueue(SIZE);
580	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
581		PDelay[] ints = new PDelay[SIZE];
582	<	ints = (PDelay[])q.toArray(ints);
582	>	PDelay[] array = q.toArray(ints);
583	>	assertSame(ints, array);
584		Arrays.sort(ints);
585	<	try {
586	<	for (int i = 0; i < ints.length; i++)
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) {}
585	>	for (int i = 0; i < ints.length; i++)
586	>	assertSame(ints[i], q.remove());
587		}
588
589		/**
590	<	* toArray with incompatible array type throws CCE
590	>	* toArray(incompatible array type) throws ArrayStoreException
591		*/
592		public void testToArray1_BadArg() {
593	+	DelayQueue q = populatedQueue(SIZE);
594		try {
595	<	DelayQueue q = populatedQueue(SIZE);
777	<	Object o[] = q.toArray(new String[10] );
595	>	q.toArray(new String[10]);
596		shouldThrow();
597	<	} catch (ArrayStoreException  success) {}
597	>	} catch (ArrayStoreException success) {}
598		}
599
600		/**
#	Line 791 | Line 609 | public class DelayQueueTest extends JSR1
609		++i;
610		}
611		assertEquals(i, SIZE);
612	+	assertIteratorExhausted(it);
613	+	}
614	+
615	+	/**
616	+	* iterator of empty collection has no elements
617	+	*/
618	+	public void testEmptyIterator() {
619	+	assertIteratorExhausted(new DelayQueue().iterator());
620		}
621
622		/**
623		* iterator.remove removes current element
624		*/
625	<	public void testIteratorRemove () {
625	>	public void testIteratorRemove() {
626		final DelayQueue q = new DelayQueue();
627		q.add(new PDelay(2));
628		q.add(new PDelay(1));
#	Line 805 | Line 631 | public class DelayQueueTest extends JSR1
631		it.next();
632		it.remove();
633		it = q.iterator();
634	<	assertEquals(it.next(), new PDelay(2));
635	<	assertEquals(it.next(), new PDelay(3));
634	>	assertEquals(new PDelay(2), it.next());
635	>	assertEquals(new PDelay(3), it.next());
636		assertFalse(it.hasNext());
637		}
638
813	–
639		/**
640		* toString contains toStrings of elements
641		*/
642		public void testToString() {
643		DelayQueue q = populatedQueue(SIZE);
644		String s = q.toString();
645	<	for (int i = 0; i < SIZE; ++i) {
646	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
822	<	}
645	>	for (Object e : q)
646	>	assertTrue(s.contains(e.toString()));
647		}
648
649		/**
650	<	* offer transfers elements across Executor tasks
650	>	* timed poll transfers elements across Executor tasks
651		*/
652		public void testPollInExecutor() {
653		final DelayQueue q = new DelayQueue();
654	<	ExecutorService executor = Executors.newFixedThreadPool(2);
655	<	executor.execute(new Runnable() {
656	<	public void run() {
657	<	threadAssertNull(q.poll());
658	<	try {
659	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
660	<	threadAssertTrue(q.isEmpty());
661	<	}
662	<	catch (InterruptedException e) {
663	<	threadUnexpectedException();
840	<	}
841	<	}
842	<	});
654	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
655	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
656	>	try (PoolCleaner cleaner = cleaner(executor)) {
657	>	executor.execute(new CheckedRunnable() {
658	>	public void realRun() throws InterruptedException {
659	>	assertNull(q.poll());
660	>	threadsStarted.await();
661	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
662	>	checkEmpty(q);
663	>	}});
664
665	<	executor.execute(new Runnable() {
666	<	public void run() {
667	<	try {
847	<	Thread.sleep(SHORT_DELAY_MS);
665	>	executor.execute(new CheckedRunnable() {
666	>	public void realRun() throws InterruptedException {
667	>	threadsStarted.await();
668		q.put(new PDelay(1));
669	<	}
670	<	catch (InterruptedException e) {
851	<	threadUnexpectedException();
852	<	}
853	<	}
854	<	});
855	<	joinPool(executor);
856	<
669	>	}});
670	>	}
671		}
672
859	–
673		/**
674		* Delayed actions do not occur until their delay elapses
675		*/
676	<	public void testDelay() {
677	<	DelayQueue q = new DelayQueue();
678	<	NanoDelay[] elements = new NanoDelay[SIZE];
679	<	for (int i = 0; i < SIZE; ++i) {
867	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
868	<	}
869	<	for (int i = 0; i < SIZE; ++i) {
870	<	q.add(elements[i]);
871	<	}
676	>	public void testDelay() throws InterruptedException {
677	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
678	>	for (int i = 0; i < SIZE; ++i)
679	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
680
681	<	try {
682	<	long last = 0;
683	<	for (int i = 0; i < SIZE; ++i) {
684	<	NanoDelay e = (NanoDelay)(q.take());
685	<	long tt = e.getTriggerTime();
686	<	assertTrue(tt <= System.nanoTime());
687	<	if (i != 0)
688	<	assertTrue(tt >= last);
881	<	last = tt;
882	<	}
883	<	}
884	<	catch (InterruptedException ie) {
885	<	unexpectedException();
681	>	long last = 0;
682	>	for (int i = 0; i < SIZE; ++i) {
683	>	NanoDelay e = q.take();
684	>	long tt = e.getTriggerTime();
685	>	assertTrue(System.nanoTime() - tt >= 0);
686	>	if (i != 0)
687	>	assertTrue(tt >= last);
688	>	last = tt;
689		}
690	+	assertTrue(q.isEmpty());
691		}
692
693		/**
#	Line 892 | Line 696 | public class DelayQueueTest extends JSR1
696		public void testPeekDelayed() {
697		DelayQueue q = new DelayQueue();
698		q.add(new NanoDelay(Long.MAX_VALUE));
699	<	assert(q.peek() != null);
699	>	assertNotNull(q.peek());
700		}
701
898	–
702		/**
703		* poll of a non-empty queue returns null if no expired elements.
704		*/
#	Line 908 | Line 711 | public class DelayQueueTest extends JSR1
711		/**
712		* timed poll of a non-empty queue returns null if no expired elements.
713		*/
714	<	public void testTimedPollDelayed() {
714	>	public void testTimedPollDelayed() throws InterruptedException {
715		DelayQueue q = new DelayQueue();
716		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
717	<	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	<	}
717	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
718		}
719
720		/**
#	Line 954 | Line 729 | public class DelayQueueTest extends JSR1
729		}
730		ArrayList l = new ArrayList();
731		q.drainTo(l);
732	<	assertEquals(q.size(), 0);
732	>	assertEquals(0, q.size());
733		for (int i = 0; i < SIZE; ++i)
734	<	assertEquals(l.get(i), elems[i]);
734	>	assertEquals(elems[i], l.get(i));
735		q.add(elems[0]);
736		q.add(elems[1]);
737		assertFalse(q.isEmpty());
#	Line 964 | Line 739 | public class DelayQueueTest extends JSR1
739		assertTrue(q.contains(elems[1]));
740		l.clear();
741		q.drainTo(l);
742	<	assertEquals(q.size(), 0);
743	<	assertEquals(l.size(), 2);
742	>	assertEquals(0, q.size());
743	>	assertEquals(2, l.size());
744		for (int i = 0; i < 2; ++i)
745	<	assertEquals(l.get(i), elems[i]);
745	>	assertEquals(elems[i], l.get(i));
746		}
747
748		/**
749		* drainTo empties queue
750		*/
751	<	public void testDrainToWithActivePut() {
751	>	public void testDrainToWithActivePut() throws InterruptedException {
752		final DelayQueue q = populatedQueue(SIZE);
753	<	Thread t = new Thread(new Runnable() {
754	<	public void run() {
755	<	q.put(new PDelay(SIZE+1));
756	<	}
982	<	});
983	<	try {
984	<	t.start();
985	<	ArrayList l = new ArrayList();
986	<	q.drainTo(l);
987	<	assertTrue(l.size() >= SIZE);
988	<	t.join();
989	<	assertTrue(q.size() + l.size() >= SIZE);
990	<	} catch (Exception e) {
991	<	unexpectedException();
992	<	}
993	<	}
994	<
995	<	/**
996	<	* drainTo(null, n) throws NPE
997	<	*/
998	<	public void testDrainToNullN() {
999	<	DelayQueue q = populatedQueue(SIZE);
1000	<	try {
1001	<	q.drainTo(null, 0);
1002	<	shouldThrow();
1003	<	} catch (NullPointerException success) {
1004	<	}
1005	<	}
753	>	Thread t = new Thread(new CheckedRunnable() {
754	>	public void realRun() {
755	>	q.put(new PDelay(SIZE + 1));
756	>	}});
757
758	<	/**
759	<	* drainTo(this, n) throws IAE
760	<	*/
761	<	public void testDrainToSelfN() {
762	<	DelayQueue q = populatedQueue(SIZE);
763	<	try {
1013	<	q.drainTo(q, 0);
1014	<	shouldThrow();
1015	<	} catch (IllegalArgumentException success) {
1016	<	}
758	>	t.start();
759	>	ArrayList l = new ArrayList();
760	>	q.drainTo(l);
761	>	assertTrue(l.size() >= SIZE);
762	>	t.join();
763	>	assertTrue(q.size() + l.size() >= SIZE);
764		}
765
766		/**
767	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
767	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
768		*/
769		public void testDrainToN() {
770		for (int i = 0; i < SIZE + 2; ++i) {
771		DelayQueue q = populatedQueue(SIZE);
772		ArrayList l = new ArrayList();
773		q.drainTo(l, i);
774	<	int k = (i < SIZE)? i : SIZE;
775	<	assertEquals(q.size(), SIZE-k);
776	<	assertEquals(l.size(), k);
774	>	int k = (i < SIZE) ? i : SIZE;
775	>	assertEquals(SIZE - k, q.size());
776	>	assertEquals(k, l.size());
777		}
778		}
779
780	<
780	>	/**
781	>	* remove(null), contains(null) always return false
782	>	*/
783	>	public void testNeverContainsNull() {
784	>	Collection<?> q = populatedQueue(SIZE);
785	>	assertFalse(q.contains(null));
786	>	assertFalse(q.remove(null));
787	>	}
788		}

Diff Legend

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