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

Diff Legend

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