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.9 by dl, Wed Jan 7 01:13:50 2004 UTC vs.
Revision 1.70 by jsr166, Sat Feb 28 19:59:23 2015 UTC

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

Diff Legend

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