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

Diff Legend

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