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.4 by dl, Sat Sep 20 18:20:07 2003 UTC vs.
Revision 1.50 by jsr166, Fri May 27 20:07:24 2011 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 static java.util.concurrent.TimeUnit.MILLISECONDS;
12		import java.util.concurrent.*;
13
14		public class DelayQueueTest extends JSR166TestCase {
15		public static void main(String[] args) {
16	<	junit.textui.TestRunner.run (suite());
16	>	junit.textui.TestRunner.run(suite());
17		}
18
19		public static Test suite() {
20	<	return new TestSuite(DelayQueueTest.class);
20	>	return new TestSuite(DelayQueueTest.class);
21		}
22
23		private static final int NOCAP = Integer.MAX_VALUE;
24
25		/**
26	<	* A delayed implmentation for testing.
27	<	* Most Q/BQ tests use Pseudodelays, where delays are all elapsed
26	>	* A delayed implementation for testing.
27	>	* Most tests use Pseudodelays, where delays are all elapsed
28		* (so, no blocking solely for delays) but are still ordered
29	<	*/
30	<	static class PDelay implements Delayed {
29	>	*/
30	>	static class PDelay implements Delayed {
31		int pseudodelay;
32		PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
33	<	public int compareTo(Object y) {
33	>	public int compareTo(PDelay y) {
34		int i = pseudodelay;
35	<	int j = ((PDelay)y).pseudodelay;
35	>	int j = y.pseudodelay;
36		if (i < j) return -1;
37		if (i > j) return 1;
38		return 0;
39		}
40
41	<	public int compareTo(PDelay y) {
42	<	int i = pseudodelay;
41	<	int j = ((PDelay)y).pseudodelay;
42	<	if (i < j) return -1;
43	<	if (i > j) return 1;
44	<	return 0;
41	>	public int compareTo(Delayed y) {
42	>	return compareTo((PDelay)y);
43		}
44
45		public boolean equals(Object other) {
46	<	return ((PDelay)other).pseudodelay == pseudodelay;
46	>	return equals((PDelay)other);
47		}
48		public boolean equals(PDelay other) {
49	<	return ((PDelay)other).pseudodelay == pseudodelay;
49	>	return other.pseudodelay == pseudodelay;
50		}
51
54	–
52		public long getDelay(TimeUnit ignore) {
53		return pseudodelay;
54		}
#	Line 64 | Line 61 | public class DelayQueueTest extends JSR1
61		}
62		}
63
67	–
64		/**
65		* Delayed implementation that actually delays
66		*/
67	<	static class NanoDelay implements Delayed {
67	>	static class NanoDelay implements Delayed {
68		long trigger;
69	<	NanoDelay(long i) {
69	>	NanoDelay(long i) {
70		trigger = System.nanoTime() + i;
71		}
72	<	public int compareTo(Object y) {
72	>	public int compareTo(NanoDelay y) {
73		long i = trigger;
74	<	long j = ((NanoDelay)y).trigger;
74	>	long j = y.trigger;
75		if (i < j) return -1;
76		if (i > j) return 1;
77		return 0;
78		}
79
80	<	public int compareTo(NanoDelay y) {
81	<	long i = trigger;
86	<	long j = ((NanoDelay)y).trigger;
87	<	if (i < j) return -1;
88	<	if (i > j) return 1;
89	<	return 0;
80	>	public int compareTo(Delayed y) {
81	>	return compareTo((NanoDelay)y);
82		}
83
84		public boolean equals(Object other) {
85	<	return ((NanoDelay)other).trigger == trigger;
85	>	return equals((NanoDelay)other);
86		}
87		public boolean equals(NanoDelay other) {
88	<	return ((NanoDelay)other).trigger == trigger;
88	>	return other.trigger == trigger;
89		}
90
91		public long getDelay(TimeUnit unit) {
#	Line 110 | Line 102 | public class DelayQueueTest extends JSR1
102		}
103		}
104
113	–
105		/**
106		* Create a queue of given size containing consecutive
107		* PDelays 0 ... n.
108		*/
109	<	private DelayQueue populatedQueue(int n) {
110	<	DelayQueue q = new DelayQueue();
109	>	private DelayQueue<PDelay> populatedQueue(int n) {
110	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
111		assertTrue(q.isEmpty());
112	<	for(int i = n-1; i >= 0; i-=2)
113	<	assertTrue(q.offer(new PDelay(i)));
114	<	for(int i = (n & 1); i < n; i+=2)
115	<	assertTrue(q.offer(new PDelay(i)));
112	>	for (int i = n-1; i >= 0; i-=2)
113	>	assertTrue(q.offer(new PDelay(i)));
114	>	for (int i = (n & 1); i < n; i+=2)
115	>	assertTrue(q.offer(new PDelay(i)));
116		assertFalse(q.isEmpty());
117		assertEquals(NOCAP, q.remainingCapacity());
118	<	assertEquals(n, q.size());
118	>	assertEquals(n, q.size());
119		return q;
120		}
121	<
121	>
122		/**
123	<	*
123	>	* A new queue has unbounded capacity
124		*/
125		public void testConstructor1() {
126		assertEquals(NOCAP, new DelayQueue().remainingCapacity());
127		}
128
129		/**
130	<	*
130	>	* Initializing from null Collection throws NPE
131		*/
132		public void testConstructor3() {
133		try {
134		DelayQueue q = new DelayQueue(null);
135		shouldThrow();
136	<	}
146	<	catch (NullPointerException success) {}
136	>	} catch (NullPointerException success) {}
137		}
138
139		/**
140	<	*
140	>	* Initializing from Collection of null elements throws NPE
141		*/
142		public void testConstructor4() {
143		try {
144		PDelay[] ints = new PDelay[SIZE];
145		DelayQueue q = new DelayQueue(Arrays.asList(ints));
146		shouldThrow();
147	<	}
158	<	catch (NullPointerException success) {}
147	>	} catch (NullPointerException success) {}
148		}
149
150		/**
151	<	*
151	>	* Initializing from Collection with some null elements throws NPE
152		*/
153		public void testConstructor5() {
154		try {
#	Line 168 | Line 157 | public class DelayQueueTest extends JSR1
157		ints[i] = new PDelay(i);
158		DelayQueue q = new DelayQueue(Arrays.asList(ints));
159		shouldThrow();
160	<	}
172	<	catch (NullPointerException success) {}
160	>	} catch (NullPointerException success) {}
161		}
162
163		/**
164	<	*
164	>	* Queue contains all elements of collection used to initialize
165		*/
166		public void testConstructor6() {
167	<	try {
168	<	PDelay[] ints = new PDelay[SIZE];
169	<	for (int i = 0; i < SIZE; ++i)
170	<	ints[i] = new PDelay(i);
171	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
172	<	for (int i = 0; i < SIZE; ++i)
185	<	assertEquals(ints[i], q.poll());
186	<	}
187	<	finally {}
167	>	PDelay[] ints = new PDelay[SIZE];
168	>	for (int i = 0; i < SIZE; ++i)
169	>	ints[i] = new PDelay(i);
170	>	DelayQueue q = new DelayQueue(Arrays.asList(ints));
171	>	for (int i = 0; i < SIZE; ++i)
172	>	assertEquals(ints[i], q.poll());
173		}
174
175		/**
176	<	*
176	>	* isEmpty is true before add, false after
177		*/
178		public void testEmpty() {
179		DelayQueue q = new DelayQueue();
#	Line 203 | Line 188 | public class DelayQueueTest extends JSR1
188		}
189
190		/**
191	<	*
191	>	* remainingCapacity does not change when elements added or removed,
192	>	* but size does
193		*/
194		public void testRemainingCapacity() {
195		DelayQueue q = populatedQueue(SIZE);
#	Line 220 | Line 206 | public class DelayQueueTest extends JSR1
206		}
207
208		/**
209	<	*
209	>	* offer(null) throws NPE
210		*/
211		public void testOfferNull() {
212	<	try {
212	>	try {
213		DelayQueue q = new DelayQueue();
214		q.offer(null);
215		shouldThrow();
216	<	} catch (NullPointerException success) { }
216	>	} catch (NullPointerException success) {}
217		}
218
219		/**
220	<	*
220	>	* add(null) throws NPE
221	>	*/
222	>	public void testAddNull() {
223	>	try {
224	>	DelayQueue q = new DelayQueue();
225	>	q.add(null);
226	>	shouldThrow();
227	>	} catch (NullPointerException success) {}
228	>	}
229	>
230	>	/**
231	>	* offer non-null succeeds
232		*/
233		public void testOffer() {
234		DelayQueue q = new DelayQueue();
#	Line 240 | Line 237 | public class DelayQueueTest extends JSR1
237		}
238
239		/**
240	<	*
240	>	* add succeeds
241		*/
242		public void testAdd() {
243		DelayQueue q = new DelayQueue();
#	Line 251 | Line 248 | public class DelayQueueTest extends JSR1
248		}
249
250		/**
251	<	*
251	>	* addAll(null) throws NPE
252		*/
253		public void testAddAll1() {
254		try {
255		DelayQueue q = new DelayQueue();
256		q.addAll(null);
257		shouldThrow();
258	<	}
262	<	catch (NullPointerException success) {}
258	>	} catch (NullPointerException success) {}
259		}
260	+
261		/**
262	<	*
262	>	* addAll(this) throws IAE
263	>	*/
264	>	public void testAddAllSelf() {
265	>	try {
266	>	DelayQueue q = populatedQueue(SIZE);
267	>	q.addAll(q);
268	>	shouldThrow();
269	>	} catch (IllegalArgumentException success) {}
270	>	}
271	>
272	>	/**
273	>	* addAll of a collection with null elements throws NPE
274		*/
275		public void testAddAll2() {
276		try {
#	Line 270 | Line 278 | public class DelayQueueTest extends JSR1
278		PDelay[] ints = new PDelay[SIZE];
279		q.addAll(Arrays.asList(ints));
280		shouldThrow();
281	<	}
274	<	catch (NullPointerException success) {}
281	>	} catch (NullPointerException success) {}
282		}
283	+
284		/**
285	<	*
285	>	* addAll of a collection with any null elements throws NPE after
286	>	* possibly adding some elements
287		*/
288		public void testAddAll3() {
289		try {
#	Line 284 | Line 293 | public class DelayQueueTest extends JSR1
293		ints[i] = new PDelay(i);
294		q.addAll(Arrays.asList(ints));
295		shouldThrow();
296	<	}
288	<	catch (NullPointerException success) {}
296	>	} catch (NullPointerException success) {}
297		}
298
299		/**
300	<	*
300	>	* Queue contains all elements of successful addAll
301		*/
302		public void testAddAll5() {
303	<	try {
304	<	PDelay[] empty = new PDelay[0];
305	<	PDelay[] ints = new PDelay[SIZE];
306	<	for (int i = SIZE-1; i >= 0; --i)
307	<	ints[i] = new PDelay(i);
308	<	DelayQueue q = new DelayQueue();
309	<	assertFalse(q.addAll(Arrays.asList(empty)));
310	<	assertTrue(q.addAll(Arrays.asList(ints)));
311	<	for (int i = 0; i < SIZE; ++i)
304	<	assertEquals(ints[i], q.poll());
305	<	}
306	<	finally {}
303	>	PDelay[] empty = new PDelay[0];
304	>	PDelay[] ints = new PDelay[SIZE];
305	>	for (int i = SIZE-1; i >= 0; --i)
306	>	ints[i] = new PDelay(i);
307	>	DelayQueue q = new DelayQueue();
308	>	assertFalse(q.addAll(Arrays.asList(empty)));
309	>	assertTrue(q.addAll(Arrays.asList(ints)));
310	>	for (int i = 0; i < SIZE; ++i)
311	>	assertEquals(ints[i], q.poll());
312		}
313
314		/**
315	<	*
315	>	* put(null) throws NPE
316		*/
317	<	public void testPutNull() {
318	<	try {
317	>	public void testPutNull() {
318	>	try {
319		DelayQueue q = new DelayQueue();
320		q.put(null);
321		shouldThrow();
322	<	}
323	<	catch (NullPointerException success){
319	<	}
320	<	}
322	>	} catch (NullPointerException success) {}
323	>	}
324
325		/**
326	<	*
326	>	* all elements successfully put are contained
327		*/
328	<	public void testPut() {
329	<	try {
330	<	DelayQueue q = new DelayQueue();
331	<	for (int i = 0; i < SIZE; ++i) {
332	<	PDelay I = new PDelay(i);
333	<	q.put(I);
331	<	assertTrue(q.contains(I));
332	<	}
333	<	assertEquals(SIZE, q.size());
334	<	}
335	<	finally {
328	>	public void testPut() {
329	>	DelayQueue q = new DelayQueue();
330	>	for (int i = 0; i < SIZE; ++i) {
331	>	PDelay I = new PDelay(i);
332	>	q.put(I);
333	>	assertTrue(q.contains(I));
334		}
335	+	assertEquals(SIZE, q.size());
336		}
337
338		/**
339	<	*
339	>	* put doesn't block waiting for take
340		*/
341	<	public void testPutWithTake() {
341	>	public void testPutWithTake() throws InterruptedException {
342		final DelayQueue q = new DelayQueue();
343	<	Thread t = new Thread(new Runnable() {
344	<	public void run() {
345	<	int added = 0;
346	<	try {
347	<	q.put(new PDelay(0));
348	<	++added;
349	<	q.put(new PDelay(0));
350	<	++added;
351	<	q.put(new PDelay(0));
352	<	++added;
354	<	q.put(new PDelay(0));
355	<	++added;
356	<	threadAssertTrue(added == 4);
357	<	} finally {
358	<	}
359	<	}
360	<	});
361	<	try {
362	<	t.start();
363	<	Thread.sleep(SHORT_DELAY_MS);
364	<	q.take();
365	<	t.interrupt();
366	<	t.join();
367	<	} catch (Exception e){
368	<	unexpectedException();
369	<	}
343	>	Thread t = newStartedThread(new CheckedRunnable() {
344	>	public void realRun() {
345	>	q.put(new PDelay(0));
346	>	q.put(new PDelay(0));
347	>	q.put(new PDelay(0));
348	>	q.put(new PDelay(0));
349	>	}});
350	>
351	>	awaitTermination(t);
352	>	assertEquals(4, q.size());
353		}
354
355		/**
356	<	*
356	>	* timed offer does not time out
357		*/
358	<	public void testTimedOffer() {
358	>	public void testTimedOffer() throws InterruptedException {
359		final DelayQueue q = new DelayQueue();
360	<	Thread t = new Thread(new Runnable() {
361	<	public void run() {
362	<	try {
363	<	q.put(new PDelay(0));
364	<	q.put(new PDelay(0));
365	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
366	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
367	<	} finally { }
368	<	}
386	<	});
387	<
388	<	try {
389	<	t.start();
390	<	Thread.sleep(SMALL_DELAY_MS);
391	<	t.interrupt();
392	<	t.join();
393	<	} catch (Exception e){
394	<	unexpectedException();
395	<	}
360	>	Thread t = newStartedThread(new CheckedRunnable() {
361	>	public void realRun() throws InterruptedException {
362	>	q.put(new PDelay(0));
363	>	q.put(new PDelay(0));
364	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
365	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
366	>	}});
367	>
368	>	awaitTermination(t);
369		}
370
371		/**
372	<	*
372	>	* take retrieves elements in priority order
373		*/
374	<	public void testTake() {
375	<	try {
376	<	DelayQueue q = populatedQueue(SIZE);
377	<	for (int i = 0; i < SIZE; ++i) {
378	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
406	<	}
407	<	} catch (InterruptedException e){
408	<	unexpectedException();
409	<	}
374	>	public void testTake() throws InterruptedException {
375	>	DelayQueue q = populatedQueue(SIZE);
376	>	for (int i = 0; i < SIZE; ++i) {
377	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
378	>	}
379		}
380
381		/**
382	<	*
382	>	* take blocks interruptibly when empty
383		*/
384	<	public void testTakeFromEmpty() {
385	<	final DelayQueue q = new DelayQueue();
386	<	Thread t = new Thread(new Runnable() {
387	<	public void run() {
388	<	try {
389	<	q.take();
390	<	threadShouldThrow();
391	<	} catch (InterruptedException success){ }
392	<	}
393	<	});
394	<	try {
395	<	t.start();
396	<	Thread.sleep(SHORT_DELAY_MS);
397	<	t.interrupt();
398	<	t.join();
399	<	} catch (Exception e){
400	<	unexpectedException();
401	<	}
384	>	public void testTakeFromEmptyBlocksInterruptibly()
385	>	throws InterruptedException {
386	>	final BlockingQueue q = new DelayQueue();
387	>	final CountDownLatch threadStarted = new CountDownLatch(1);
388	>	Thread t = newStartedThread(new CheckedRunnable() {
389	>	public void realRun() {
390	>	threadStarted.countDown();
391	>	try {
392	>	q.take();
393	>	shouldThrow();
394	>	} catch (InterruptedException success) {}
395	>	assertFalse(Thread.interrupted());
396	>	}});
397	>
398	>	await(threadStarted);
399	>	assertThreadStaysAlive(t);
400	>	t.interrupt();
401	>	awaitTermination(t);
402		}
403
404		/**
405	<	*
406	<	*/
407	<	public void testBlockingTake() {
408	<	Thread t = new Thread(new Runnable() {
409	<	public void run() {
410	<	try {
411	<	DelayQueue q = populatedQueue(SIZE);
412	<	for (int i = 0; i < SIZE; ++i) {
413	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
414	<	}
415	<	q.take();
416	<	threadShouldThrow();
417	<	} catch (InterruptedException success){
418	<	}
419	<	}});
420	<	t.start();
421	<	try {
453	<	Thread.sleep(SHORT_DELAY_MS);
454	<	t.interrupt();
455	<	t.join();
456	<	}
457	<	catch (InterruptedException ie) {
458	<	unexpectedException();
459	<	}
460	<	}
405	>	* Take removes existing elements until empty, then blocks interruptibly
406	>	*/
407	>	public void testBlockingTake() throws InterruptedException {
408	>	final DelayQueue q = populatedQueue(SIZE);
409	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
410	>	Thread t = newStartedThread(new CheckedRunnable() {
411	>	public void realRun() throws InterruptedException {
412	>	for (int i = 0; i < SIZE; ++i) {
413	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
414	>	}
415	>
416	>	Thread.currentThread().interrupt();
417	>	try {
418	>	q.take();
419	>	shouldThrow();
420	>	} catch (InterruptedException success) {}
421	>	assertFalse(Thread.interrupted());
422
423	+	pleaseInterrupt.countDown();
424	+	try {
425	+	q.take();
426	+	shouldThrow();
427	+	} catch (InterruptedException success) {}
428	+	assertFalse(Thread.interrupted());
429	+	}});
430	+
431	+	await(pleaseInterrupt);
432	+	assertThreadStaysAlive(t);
433	+	t.interrupt();
434	+	awaitTermination(t);
435	+	}
436
437		/**
438	<	*
438	>	* poll succeeds unless empty
439		*/
440		public void testPoll() {
441		DelayQueue q = populatedQueue(SIZE);
442		for (int i = 0; i < SIZE; ++i) {
443		assertEquals(new PDelay(i), ((PDelay)q.poll()));
444		}
445	<	assertNull(q.poll());
445	>	assertNull(q.poll());
446		}
447
448		/**
449	<	*
449	>	* timed poll with zero timeout succeeds when non-empty, else times out
450		*/
451	<	public void testTimedPoll0() {
452	<	try {
453	<	DelayQueue q = populatedQueue(SIZE);
454	<	for (int i = 0; i < SIZE; ++i) {
455	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, TimeUnit.MILLISECONDS)));
456	<	}
483	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
484	<	} catch (InterruptedException e){
485	<	unexpectedException();
486	<	}
451	>	public void testTimedPoll0() throws InterruptedException {
452	>	DelayQueue q = populatedQueue(SIZE);
453	>	for (int i = 0; i < SIZE; ++i) {
454	>	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
455	>	}
456	>	assertNull(q.poll(0, MILLISECONDS));
457		}
458
459		/**
460	<	*
460	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
461		*/
462	<	public void testTimedPoll() {
463	<	try {
464	<	DelayQueue q = populatedQueue(SIZE);
465	<	for (int i = 0; i < SIZE; ++i) {
466	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
467	<	}
498	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
499	<	} catch (InterruptedException e){
500	<	unexpectedException();
501	<	}
462	>	public void testTimedPoll() throws InterruptedException {
463	>	DelayQueue q = populatedQueue(SIZE);
464	>	for (int i = 0; i < SIZE; ++i) {
465	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
466	>	}
467	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
468		}
469
470		/**
471	<	*
472	<	*/
473	<	public void testInterruptedTimedPoll() {
474	<	Thread t = new Thread(new Runnable() {
475	<	public void run() {
476	<	try {
477	<	DelayQueue q = populatedQueue(SIZE);
478	<	for (int i = 0; i < SIZE; ++i) {
479	<	threadAssertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
480	<	}
481	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
482	<	} catch (InterruptedException success){
483	<	}
484	<	}});
485	<	t.start();
486	<	try {
487	<	Thread.sleep(SHORT_DELAY_MS);
488	<	t.interrupt();
489	<	t.join();
490	<	}
491	<	catch (InterruptedException ie) {
492	<	unexpectedException();
493	<	}
471	>	* Interrupted timed poll throws InterruptedException instead of
472	>	* returning timeout status
473	>	*/
474	>	public void testInterruptedTimedPoll() throws InterruptedException {
475	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
476	>	Thread t = newStartedThread(new CheckedRunnable() {
477	>	public void realRun() throws InterruptedException {
478	>	DelayQueue q = populatedQueue(SIZE);
479	>	for (int i = 0; i < SIZE; ++i) {
480	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
481	>	}
482	>
483	>	Thread.currentThread().interrupt();
484	>	try {
485	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
486	>	shouldThrow();
487	>	} catch (InterruptedException success) {}
488	>	assertFalse(Thread.interrupted());
489	>
490	>	pleaseInterrupt.countDown();
491	>	try {
492	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
493	>	shouldThrow();
494	>	} catch (InterruptedException success) {}
495	>	assertFalse(Thread.interrupted());
496	>	}});
497	>
498	>	await(pleaseInterrupt);
499	>	assertThreadStaysAlive(t);
500	>	t.interrupt();
501	>	awaitTermination(t);
502		}
503
504		/**
505	<	*
505	>	* timed poll before a delayed offer fails; after offer succeeds;
506	>	* on interruption throws
507		*/
508	<	public void testTimedPollWithOffer() {
508	>	public void testTimedPollWithOffer() throws InterruptedException {
509		final DelayQueue q = new DelayQueue();
510	<	Thread t = new Thread(new Runnable() {
511	<	public void run() {
512	<	try {
513	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
514	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
515	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
516	<	threadFail("Should block");
517	<	} catch (InterruptedException success) { }
518	<	}
519	<	});
520	<	try {
521	<	t.start();
522	<	Thread.sleep(SMALL_DELAY_MS);
523	<	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
524	<	t.interrupt();
525	<	t.join();
526	<	} catch (Exception e){
527	<	unexpectedException();
528	<	}
529	<	}
510	>	final PDelay pdelay = new PDelay(0);
511	>	final CheckedBarrier barrier = new CheckedBarrier(2);
512	>	Thread t = newStartedThread(new CheckedRunnable() {
513	>	public void realRun() throws InterruptedException {
514	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
515	>
516	>	barrier.await();
517	>	assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
518	>
519	>	Thread.currentThread().interrupt();
520	>	try {
521	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
522	>	shouldThrow();
523	>	} catch (InterruptedException success) {}
524	>	assertFalse(Thread.interrupted());
525	>
526	>	barrier.await();
527	>	try {
528	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
529	>	shouldThrow();
530	>	} catch (InterruptedException success) {}
531	>	assertFalse(Thread.interrupted());
532	>	}});
533	>
534	>	barrier.await();
535	>	long startTime = System.nanoTime();
536	>	assertTrue(q.offer(pdelay, LONG_DELAY_MS, MILLISECONDS));
537	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
538
539	+	barrier.await();
540	+	assertThreadStaysAlive(t);
541	+	t.interrupt();
542	+	awaitTermination(t);
543	+	}
544
545		/**
546	<	*
546	>	* peek returns next element, or null if empty
547		*/
548		public void testPeek() {
549		DelayQueue q = populatedQueue(SIZE);
550		for (int i = 0; i < SIZE; ++i) {
551		assertEquals(new PDelay(i), ((PDelay)q.peek()));
552	<	q.poll();
553	<	assertTrue(q.peek() == null ||
554	<	i != ((PDelay)q.peek()).intValue());
552	>	assertEquals(new PDelay(i), ((PDelay)q.poll()));
553	>	if (q.isEmpty())
554	>	assertNull(q.peek());
555	>	else
556	>	assertFalse(new PDelay(i).equals(q.peek()));
557		}
558	<	assertNull(q.peek());
558	>	assertNull(q.peek());
559		}
560
561		/**
562	<	*
562	>	* element returns next element, or throws NSEE if empty
563		*/
564		public void testElement() {
565		DelayQueue q = populatedQueue(SIZE);
#	Line 580 | Line 570 | public class DelayQueueTest extends JSR1
570		try {
571		q.element();
572		shouldThrow();
573	<	}
584	<	catch (NoSuchElementException success) {}
573	>	} catch (NoSuchElementException success) {}
574		}
575
576		/**
577	<	*
577	>	* remove removes next element, or throws NSEE if empty
578		*/
579		public void testRemove() {
580		DelayQueue q = populatedQueue(SIZE);
#	Line 595 | Line 584 | public class DelayQueueTest extends JSR1
584		try {
585		q.remove();
586		shouldThrow();
587	<	} catch (NoSuchElementException success){
599	<	}
587	>	} catch (NoSuchElementException success) {}
588		}
589
590		/**
591	<	*
591	>	* remove(x) removes x and returns true if present
592		*/
593		public void testRemoveElement() {
594		DelayQueue q = populatedQueue(SIZE);
#	Line 613 | Line 601 | public class DelayQueueTest extends JSR1
601		}
602		assertTrue(q.isEmpty());
603		}
604	<
604	>
605		/**
606	<	*
606	>	* contains(x) reports true when elements added but not yet removed
607		*/
608		public void testContains() {
609		DelayQueue q = populatedQueue(SIZE);
#	Line 627 | Line 615 | public class DelayQueueTest extends JSR1
615		}
616
617		/**
618	<	*
618	>	* clear removes all elements
619		*/
620		public void testClear() {
621		DelayQueue q = populatedQueue(SIZE);
#	Line 635 | Line 623 | public class DelayQueueTest extends JSR1
623		assertTrue(q.isEmpty());
624		assertEquals(0, q.size());
625		assertEquals(NOCAP, q.remainingCapacity());
626	<	q.add(new PDelay(1));
626	>	PDelay x = new PDelay(1);
627	>	q.add(x);
628		assertFalse(q.isEmpty());
629	+	assertTrue(q.contains(x));
630		q.clear();
631		assertTrue(q.isEmpty());
632		}
633
634		/**
635	<	*
635	>	* containsAll(c) is true when c contains a subset of elements
636		*/
637		public void testContainsAll() {
638		DelayQueue q = populatedQueue(SIZE);
#	Line 656 | Line 646 | public class DelayQueueTest extends JSR1
646		}
647
648		/**
649	<	*
649	>	* retainAll(c) retains only those elements of c and reports true if changed
650		*/
651		public void testRetainAll() {
652		DelayQueue q = populatedQueue(SIZE);
#	Line 675 | Line 665 | public class DelayQueueTest extends JSR1
665		}
666
667		/**
668	<	*
668	>	* removeAll(c) removes only those elements of c and reports true if changed
669		*/
670		public void testRemoveAll() {
671		for (int i = 1; i < SIZE; ++i) {
#	Line 691 | Line 681 | public class DelayQueueTest extends JSR1
681		}
682
683		/**
684	<	*
684	>	* toArray contains all elements
685		*/
686	<	public void testToArray() {
686	>	public void testToArray() throws InterruptedException {
687		DelayQueue q = populatedQueue(SIZE);
688	<	Object[] o = q.toArray();
688	>	Object[] o = q.toArray();
689		Arrays.sort(o);
690	<	try {
691	<	for(int i = 0; i < o.length; i++)
702	<	assertEquals(o[i], q.take());
703	<	} catch (InterruptedException e){
704	<	unexpectedException();
705	<	}
690	>	for (int i = 0; i < o.length; i++)
691	>	assertSame(o[i], q.take());
692		}
693
694		/**
695	<	*
695	>	* toArray(a) contains all elements
696		*/
697		public void testToArray2() {
698	<	DelayQueue q = populatedQueue(SIZE);
699	<	PDelay[] ints = new PDelay[SIZE];
700	<	ints = (PDelay[])q.toArray(ints);
698	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
699	>	PDelay[] ints = new PDelay[SIZE];
700	>	PDelay[] array = q.toArray(ints);
701	>	assertSame(ints, array);
702		Arrays.sort(ints);
703	<	try {
704	<	for(int i = 0; i < ints.length; i++)
705	<	assertEquals(ints[i], q.take());
706	<	} catch (InterruptedException e){
707	<	unexpectedException();
708	<	}
703	>	for (int i = 0; i < ints.length; i++)
704	>	assertSame(ints[i], q.remove());
705	>	}
706	>
707	>	/**
708	>	* toArray(null) throws NullPointerException
709	>	*/
710	>	public void testToArray_NullArg() {
711	>	DelayQueue q = populatedQueue(SIZE);
712	>	try {
713	>	q.toArray(null);
714	>	shouldThrow();
715	>	} catch (NullPointerException success) {}
716	>	}
717	>
718	>	/**
719	>	* toArray(incompatible array type) throws ArrayStoreException
720	>	*/
721	>	public void testToArray1_BadArg() {
722	>	DelayQueue q = populatedQueue(SIZE);
723	>	try {
724	>	q.toArray(new String[10]);
725	>	shouldThrow();
726	>	} catch (ArrayStoreException success) {}
727		}
728	<
728	>
729		/**
730	<	*
730	>	* iterator iterates through all elements
731		*/
732		public void testIterator() {
733		DelayQueue q = populatedQueue(SIZE);
734		int i = 0;
735	<	Iterator it = q.iterator();
736	<	while(it.hasNext()) {
735	>	Iterator it = q.iterator();
736	>	while (it.hasNext()) {
737		assertTrue(q.contains(it.next()));
738		++i;
739		}
#	Line 736 | Line 741 | public class DelayQueueTest extends JSR1
741		}
742
743		/**
744	<	*
744	>	* iterator.remove removes current element
745		*/
746	<	public void testIteratorRemove () {
742	<
746	>	public void testIteratorRemove() {
747		final DelayQueue q = new DelayQueue();
744	–
748		q.add(new PDelay(2));
749		q.add(new PDelay(1));
750		q.add(new PDelay(3));
748	–
751		Iterator it = q.iterator();
752		it.next();
753		it.remove();
752	–
754		it = q.iterator();
755		assertEquals(it.next(), new PDelay(2));
756		assertEquals(it.next(), new PDelay(3));
757		assertFalse(it.hasNext());
758		}
759
759	–
760		/**
761	<	*
761	>	* toString contains toStrings of elements
762		*/
763		public void testToString() {
764		DelayQueue q = populatedQueue(SIZE);
765		String s = q.toString();
766		for (int i = 0; i < SIZE; ++i) {
767	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
767	>	assertTrue(s.contains(String.valueOf(Integer.MIN_VALUE+i)));
768		}
769	<	}
769	>	}
770
771		/**
772	<	*
772	>	* timed poll transfers elements across Executor tasks
773		*/
774		public void testPollInExecutor() {
775	–
775		final DelayQueue q = new DelayQueue();
776	<
776	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
777		ExecutorService executor = Executors.newFixedThreadPool(2);
778	+	executor.execute(new CheckedRunnable() {
779	+	public void realRun() throws InterruptedException {
780	+	assertNull(q.poll());
781	+	threadsStarted.await();
782	+	assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS));
783	+	checkEmpty(q);
784	+	}});
785	+
786	+	executor.execute(new CheckedRunnable() {
787	+	public void realRun() throws InterruptedException {
788	+	threadsStarted.await();
789	+	q.put(new PDelay(1));
790	+	}});
791
780	–	executor.execute(new Runnable() {
781	–	public void run() {
782	–	threadAssertNull(q.poll());
783	–	try {
784	–	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
785	–	threadAssertTrue(q.isEmpty());
786	–	}
787	–	catch (InterruptedException e) {
788	–	threadUnexpectedException();
789	–	}
790	–	}
791	–	});
792	–
793	–	executor.execute(new Runnable() {
794	–	public void run() {
795	–	try {
796	–	Thread.sleep(SHORT_DELAY_MS);
797	–	q.put(new PDelay(1));
798	–	}
799	–	catch (InterruptedException e) {
800	–	threadUnexpectedException();
801	–	}
802	–	}
803	–	});
804	–
792		joinPool(executor);
793	+	}
794	+
795	+	/**
796	+	* Delayed actions do not occur until their delay elapses
797	+	*/
798	+	public void testDelay() throws InterruptedException {
799	+	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
800	+	for (int i = 0; i < SIZE; ++i)
801	+	q.add(new NanoDelay(1000000L * (SIZE - i)));
802	+
803	+	long last = 0;
804	+	for (int i = 0; i < SIZE; ++i) {
805	+	NanoDelay e = q.take();
806	+	long tt = e.getTriggerTime();
807	+	assertTrue(System.nanoTime() - tt >= 0);
808	+	if (i != 0)
809	+	assertTrue(tt >= last);
810	+	last = tt;
811	+	}
812	+	assertTrue(q.isEmpty());
813	+	}
814
815	+	/**
816	+	* peek of a non-empty queue returns non-null even if not expired
817	+	*/
818	+	public void testPeekDelayed() {
819	+	DelayQueue q = new DelayQueue();
820	+	q.add(new NanoDelay(Long.MAX_VALUE));
821	+	assertNotNull(q.peek());
822		}
823
824	+	/**
825	+	* poll of a non-empty queue returns null if no expired elements.
826	+	*/
827	+	public void testPollDelayed() {
828	+	DelayQueue q = new DelayQueue();
829	+	q.add(new NanoDelay(Long.MAX_VALUE));
830	+	assertNull(q.poll());
831	+	}
832
833		/**
834	<	*
834	>	* timed poll of a non-empty queue returns null if no expired elements.
835		*/
836	<	public void testDelay() {
836	>	public void testTimedPollDelayed() throws InterruptedException {
837		DelayQueue q = new DelayQueue();
838	<	NanoDelay[] elements = new NanoDelay[SIZE];
839	<	for (int i = 0; i < SIZE; ++i) {
840	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
841	<	}
838	>	q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
839	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
840	>	}
841	>
842	>	/**
843	>	* drainTo(null) throws NPE
844	>	*/
845	>	public void testDrainToNull() {
846	>	DelayQueue q = populatedQueue(SIZE);
847	>	try {
848	>	q.drainTo(null);
849	>	shouldThrow();
850	>	} catch (NullPointerException success) {}
851	>	}
852	>
853	>	/**
854	>	* drainTo(this) throws IAE
855	>	*/
856	>	public void testDrainToSelf() {
857	>	DelayQueue q = populatedQueue(SIZE);
858	>	try {
859	>	q.drainTo(q);
860	>	shouldThrow();
861	>	} catch (IllegalArgumentException success) {}
862	>	}
863	>
864	>	/**
865	>	* drainTo(c) empties queue into another collection c
866	>	*/
867	>	public void testDrainTo() {
868	>	DelayQueue q = new DelayQueue();
869	>	PDelay[] elems = new PDelay[SIZE];
870		for (int i = 0; i < SIZE; ++i) {
871	<	q.add(elements[i]);
871	>	elems[i] = new PDelay(i);
872	>	q.add(elems[i]);
873		}
874	+	ArrayList l = new ArrayList();
875	+	q.drainTo(l);
876	+	assertEquals(q.size(), 0);
877	+	for (int i = 0; i < SIZE; ++i)
878	+	assertEquals(l.get(i), elems[i]);
879	+	q.add(elems[0]);
880	+	q.add(elems[1]);
881	+	assertFalse(q.isEmpty());
882	+	assertTrue(q.contains(elems[0]));
883	+	assertTrue(q.contains(elems[1]));
884	+	l.clear();
885	+	q.drainTo(l);
886	+	assertEquals(q.size(), 0);
887	+	assertEquals(l.size(), 2);
888	+	for (int i = 0; i < 2; ++i)
889	+	assertEquals(l.get(i), elems[i]);
890	+	}
891	+
892	+	/**
893	+	* drainTo empties queue
894	+	*/
895	+	public void testDrainToWithActivePut() throws InterruptedException {
896	+	final DelayQueue q = populatedQueue(SIZE);
897	+	Thread t = new Thread(new CheckedRunnable() {
898	+	public void realRun() {
899	+	q.put(new PDelay(SIZE+1));
900	+	}});
901	+
902	+	t.start();
903	+	ArrayList l = new ArrayList();
904	+	q.drainTo(l);
905	+	assertTrue(l.size() >= SIZE);
906	+	t.join();
907	+	assertTrue(q.size() + l.size() >= SIZE);
908	+	}
909
910	+	/**
911	+	* drainTo(null, n) throws NPE
912	+	*/
913	+	public void testDrainToNullN() {
914	+	DelayQueue q = populatedQueue(SIZE);
915		try {
916	<	long last = 0;
917	<	for (int i = 0; i < SIZE; ++i) {
918	<	NanoDelay e = (NanoDelay)(q.take());
919	<	long tt = e.getTriggerTime();
920	<	assertTrue(tt <= System.nanoTime());
921	<	if (i != 0)
922	<	assertTrue(tt >= last);
923	<	last = tt;
924	<	}
925	<	}
926	<	catch(InterruptedException ie) {
927	<	unexpectedException();
916	>	q.drainTo(null, 0);
917	>	shouldThrow();
918	>	} catch (NullPointerException success) {}
919	>	}
920	>
921	>	/**
922	>	* drainTo(this, n) throws IAE
923	>	*/
924	>	public void testDrainToSelfN() {
925	>	DelayQueue q = populatedQueue(SIZE);
926	>	try {
927	>	q.drainTo(q, 0);
928	>	shouldThrow();
929	>	} catch (IllegalArgumentException success) {}
930	>	}
931	>
932	>	/**
933	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
934	>	*/
935	>	public void testDrainToN() {
936	>	for (int i = 0; i < SIZE + 2; ++i) {
937	>	DelayQueue q = populatedQueue(SIZE);
938	>	ArrayList l = new ArrayList();
939	>	q.drainTo(l, i);
940	>	int k = (i < SIZE) ? i : SIZE;
941	>	assertEquals(q.size(), SIZE-k);
942	>	assertEquals(l.size(), k);
943		}
944		}
945

Diff Legend

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