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.5 by dl, Thu Sep 25 11:02:41 2003 UTC vs.
Revision 1.69 by jsr166, Sun Feb 22 04:34:44 2015 UTC

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

Diff Legend

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