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.6 by dl, Sun Oct 5 23:00:40 2003 UTC vs.
Revision 1.79 by jsr166, Mon Oct 17 01:54:51 2016 UTC

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

Diff Legend

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