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.7 by dl, Sat Dec 27 19:26:43 2003 UTC vs.
Revision 1.62 by jsr166, Thu May 30 03:28:55 2013 UTC

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

Diff Legend

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