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.6 by dl, Sun Oct 5 23:00:40 2003 UTC vs.
Revision 1.57 by jsr166, Sat Nov 26 05:19:17 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.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;
35	<	if (i > j) return 1;
36	<	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) {
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;
58	>	public int compareTo(Delayed y) {
59	>	return compareTo((PDelay)y);
60		}
46	–
61		public boolean equals(Object other) {
62	<	return ((PDelay)other).pseudodelay == pseudodelay;
63	<	}
50	<	public boolean equals(PDelay other) {
51	<	return ((PDelay)other).pseudodelay == pseudodelay;
62	>	return (other instanceof PDelay) &&
63	>	this.pseudodelay == ((PDelay)other).pseudodelay;
64		}
53	–
54	–
65		public long getDelay(TimeUnit ignore) {
66	<	return pseudodelay;
66	>	return Integer.MIN_VALUE + pseudodelay;
67		}
58	–	public int intValue() {
59	–	return pseudodelay;
60	–	}
61	–
68		public String toString() {
69		return String.valueOf(pseudodelay);
70		}
71		}
72
67	–
73		/**
74		* Delayed implementation that actually delays
75		*/
76	<	static class NanoDelay implements Delayed {
76	>	static class NanoDelay implements Delayed {
77		long trigger;
78	<	NanoDelay(long i) {
78	>	NanoDelay(long i) {
79		trigger = System.nanoTime() + i;
80		}
81	<	public int compareTo(Object y) {
81	>	public int compareTo(NanoDelay y) {
82		long i = trigger;
83	<	long j = ((NanoDelay)y).trigger;
83	>	long j = y.trigger;
84		if (i < j) return -1;
85		if (i > j) return 1;
86		return 0;
87		}
88
89	<	public int compareTo(NanoDelay y) {
90	<	long i = trigger;
86	<	long j = ((NanoDelay)y).trigger;
87	<	if (i < j) return -1;
88	<	if (i > j) return 1;
89	<	return 0;
89	>	public int compareTo(Delayed y) {
90	>	return compareTo((NanoDelay)y);
91		}
92
93		public boolean equals(Object other) {
94	<	return ((NanoDelay)other).trigger == trigger;
94	>	return equals((NanoDelay)other);
95		}
96		public boolean equals(NanoDelay other) {
97	<	return ((NanoDelay)other).trigger == trigger;
97	>	return other.trigger == trigger;
98		}
99
100		public long getDelay(TimeUnit unit) {
#	Line 110 | Line 111 | public class DelayQueueTest extends JSR1
111		}
112		}
113
113	–
114		/**
115		* Create a queue of given size containing consecutive
116		* PDelays 0 ... n.
117		*/
118	<	private DelayQueue populatedQueue(int n) {
119	<	DelayQueue q = new DelayQueue();
118	>	private DelayQueue<PDelay> populatedQueue(int n) {
119	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
120		assertTrue(q.isEmpty());
121	<	for(int i = n-1; i >= 0; i-=2)
122	<	assertTrue(q.offer(new PDelay(i)));
123	<	for(int i = (n & 1); i < n; i+=2)
124	<	assertTrue(q.offer(new PDelay(i)));
121	>	for (int i = n-1; i >= 0; i-=2)
122	>	assertTrue(q.offer(new PDelay(i)));
123	>	for (int i = (n & 1); i < n; i+=2)
124	>	assertTrue(q.offer(new PDelay(i)));
125		assertFalse(q.isEmpty());
126		assertEquals(NOCAP, q.remainingCapacity());
127	<	assertEquals(n, q.size());
127	>	assertEquals(n, q.size());
128		return q;
129		}
130	<
130	>
131		/**
132		* A new queue has unbounded capacity
133		*/
#	Line 142 | Line 142 | public class DelayQueueTest extends JSR1
142		try {
143		DelayQueue q = new DelayQueue(null);
144		shouldThrow();
145	<	}
146	<	catch (NullPointerException success) {}
145	>	} catch (NullPointerException success) {}
146		}
147
148		/**
#	Line 154 | Line 153 | public class DelayQueueTest extends JSR1
153		PDelay[] ints = new PDelay[SIZE];
154		DelayQueue q = new DelayQueue(Arrays.asList(ints));
155		shouldThrow();
156	<	}
158	<	catch (NullPointerException success) {}
156	>	} catch (NullPointerException success) {}
157		}
158
159		/**
#	Line 168 | Line 166 | public class DelayQueueTest extends JSR1
166		ints[i] = new PDelay(i);
167		DelayQueue q = new DelayQueue(Arrays.asList(ints));
168		shouldThrow();
169	<	}
172	<	catch (NullPointerException success) {}
169	>	} catch (NullPointerException success) {}
170		}
171
172		/**
173		* Queue contains all elements of collection used to initialize
174		*/
175		public void testConstructor6() {
176	<	try {
177	<	PDelay[] ints = new PDelay[SIZE];
178	<	for (int i = 0; i < SIZE; ++i)
179	<	ints[i] = new PDelay(i);
180	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
181	<	for (int i = 0; i < SIZE; ++i)
185	<	assertEquals(ints[i], q.poll());
186	<	}
187	<	finally {}
176	>	PDelay[] ints = new PDelay[SIZE];
177	>	for (int i = 0; i < SIZE; ++i)
178	>	ints[i] = new PDelay(i);
179	>	DelayQueue q = new DelayQueue(Arrays.asList(ints));
180	>	for (int i = 0; i < SIZE; ++i)
181	>	assertEquals(ints[i], q.poll());
182		}
183
184		/**
#	Line 203 | Line 197 | public class DelayQueueTest extends JSR1
197		}
198
199		/**
200	<	* remainingCapacity does not change when elementa added or removed,
200	>	* remainingCapacity does not change when elements added or removed,
201		* but size does
202		*/
203		public void testRemainingCapacity() {
#	Line 221 | Line 215 | public class DelayQueueTest extends JSR1
215		}
216
217		/**
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	–	/**
235	–	* add(null) throws NPE
236	–	*/
237	–	public void testAddNull() {
238	–	try {
239	–	DelayQueue q = new DelayQueue();
240	–	q.add(null);
241	–	shouldThrow();
242	–	} catch (NullPointerException success) { }
243	–	}
244	–
245	–	/**
218		* offer non-null succeeds
219		*/
220		public void testOffer() {
#	Line 263 | Line 235 | public class DelayQueueTest extends JSR1
235		}
236
237		/**
266	–	* addAll(null) throws NPE
267	–	*/
268	–	public void testAddAll1() {
269	–	try {
270	–	DelayQueue q = new DelayQueue();
271	–	q.addAll(null);
272	–	shouldThrow();
273	–	}
274	–	catch (NullPointerException success) {}
275	–	}
276	–
277	–
278	–	/**
238		* addAll(this) throws IAE
239		*/
240		public void testAddAllSelf() {
#	Line 283 | Line 242 | public class DelayQueueTest extends JSR1
242		DelayQueue q = populatedQueue(SIZE);
243		q.addAll(q);
244		shouldThrow();
245	<	}
287	<	catch (IllegalArgumentException success) {}
245	>	} catch (IllegalArgumentException success) {}
246		}
247
248		/**
291	–	* addAll of a collection with null elements throws NPE
292	–	*/
293	–	public void testAddAll2() {
294	–	try {
295	–	DelayQueue q = new DelayQueue();
296	–	PDelay[] ints = new PDelay[SIZE];
297	–	q.addAll(Arrays.asList(ints));
298	–	shouldThrow();
299	–	}
300	–	catch (NullPointerException success) {}
301	–	}
302	–	/**
249		* addAll of a collection with any null elements throws NPE after
250		* possibly adding some elements
251		*/
#	Line 311 | Line 257 | public class DelayQueueTest extends JSR1
257		ints[i] = new PDelay(i);
258		q.addAll(Arrays.asList(ints));
259		shouldThrow();
260	<	}
315	<	catch (NullPointerException success) {}
260	>	} catch (NullPointerException success) {}
261		}
262
263		/**
264		* Queue contains all elements of successful addAll
265		*/
266		public void testAddAll5() {
267	<	try {
268	<	PDelay[] empty = new PDelay[0];
269	<	PDelay[] ints = new PDelay[SIZE];
270	<	for (int i = SIZE-1; i >= 0; --i)
271	<	ints[i] = new PDelay(i);
272	<	DelayQueue q = new DelayQueue();
273	<	assertFalse(q.addAll(Arrays.asList(empty)));
274	<	assertTrue(q.addAll(Arrays.asList(ints)));
275	<	for (int i = 0; i < SIZE; ++i)
331	<	assertEquals(ints[i], q.poll());
332	<	}
333	<	finally {}
267	>	PDelay[] empty = new PDelay[0];
268	>	PDelay[] ints = new PDelay[SIZE];
269	>	for (int i = SIZE-1; i >= 0; --i)
270	>	ints[i] = new PDelay(i);
271	>	DelayQueue q = new DelayQueue();
272	>	assertFalse(q.addAll(Arrays.asList(empty)));
273	>	assertTrue(q.addAll(Arrays.asList(ints)));
274	>	for (int i = 0; i < SIZE; ++i)
275	>	assertEquals(ints[i], q.poll());
276		}
277
278		/**
337	–	* put(null) throws NPE
338	–	*/
339	–	public void testPutNull() {
340	–	try {
341	–	DelayQueue q = new DelayQueue();
342	–	q.put(null);
343	–	shouldThrow();
344	–	}
345	–	catch (NullPointerException success){
346	–	}
347	–	}
348	–
349	–	/**
279		* all elements successfully put are contained
280		*/
281	<	public void testPut() {
282	<	try {
283	<	DelayQueue q = new DelayQueue();
284	<	for (int i = 0; i < SIZE; ++i) {
285	<	PDelay I = new PDelay(i);
286	<	q.put(I);
358	<	assertTrue(q.contains(I));
359	<	}
360	<	assertEquals(SIZE, q.size());
361	<	}
362	<	finally {
281	>	public void testPut() {
282	>	DelayQueue q = new DelayQueue();
283	>	for (int i = 0; i < SIZE; ++i) {
284	>	PDelay I = new PDelay(i);
285	>	q.put(I);
286	>	assertTrue(q.contains(I));
287		}
288	+	assertEquals(SIZE, q.size());
289		}
290
291		/**
292		* put doesn't block waiting for take
293		*/
294	<	public void testPutWithTake() {
294	>	public void testPutWithTake() throws InterruptedException {
295		final DelayQueue q = new DelayQueue();
296	<	Thread t = new Thread(new Runnable() {
297	<	public void run() {
298	<	int added = 0;
299	<	try {
300	<	q.put(new PDelay(0));
301	<	++added;
302	<	q.put(new PDelay(0));
303	<	++added;
304	<	q.put(new PDelay(0));
305	<	++added;
381	<	q.put(new PDelay(0));
382	<	++added;
383	<	threadAssertTrue(added == 4);
384	<	} finally {
385	<	}
386	<	}
387	<	});
388	<	try {
389	<	t.start();
390	<	Thread.sleep(SHORT_DELAY_MS);
391	<	q.take();
392	<	t.interrupt();
393	<	t.join();
394	<	} catch (Exception e){
395	<	unexpectedException();
396	<	}
296	>	Thread t = newStartedThread(new CheckedRunnable() {
297	>	public void realRun() {
298	>	q.put(new PDelay(0));
299	>	q.put(new PDelay(0));
300	>	q.put(new PDelay(0));
301	>	q.put(new PDelay(0));
302	>	}});
303	>
304	>	awaitTermination(t);
305	>	assertEquals(4, q.size());
306		}
307
308		/**
309		* timed offer does not time out
310		*/
311	<	public void testTimedOffer() {
311	>	public void testTimedOffer() throws InterruptedException {
312		final DelayQueue q = new DelayQueue();
313	<	Thread t = new Thread(new Runnable() {
314	<	public void run() {
315	<	try {
316	<	q.put(new PDelay(0));
317	<	q.put(new PDelay(0));
318	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
319	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
411	<	} finally { }
412	<	}
413	<	});
414	<
415	<	try {
416	<	t.start();
417	<	Thread.sleep(SMALL_DELAY_MS);
418	<	t.interrupt();
419	<	t.join();
420	<	} catch (Exception e){
421	<	unexpectedException();
422	<	}
423	<	}
313	>	Thread t = newStartedThread(new CheckedRunnable() {
314	>	public void realRun() throws InterruptedException {
315	>	q.put(new PDelay(0));
316	>	q.put(new PDelay(0));
317	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
318	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
319	>	}});
320
321	<	/**
426	<	* take retrieves elements in priority order
427	<	*/
428	<	public void testTake() {
429	<	try {
430	<	DelayQueue q = populatedQueue(SIZE);
431	<	for (int i = 0; i < SIZE; ++i) {
432	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
433	<	}
434	<	} catch (InterruptedException e){
435	<	unexpectedException();
436	<	}
321	>	awaitTermination(t);
322		}
323
324		/**
325	<	* take blocks interruptibly when empty
325	>	* take retrieves elements in priority order
326		*/
327	<	public void testTakeFromEmpty() {
328	<	final DelayQueue q = new DelayQueue();
329	<	Thread t = new Thread(new Runnable() {
330	<	public void run() {
446	<	try {
447	<	q.take();
448	<	threadShouldThrow();
449	<	} catch (InterruptedException success){ }
450	<	}
451	<	});
452	<	try {
453	<	t.start();
454	<	Thread.sleep(SHORT_DELAY_MS);
455	<	t.interrupt();
456	<	t.join();
457	<	} catch (Exception e){
458	<	unexpectedException();
327	>	public void testTake() throws InterruptedException {
328	>	DelayQueue q = populatedQueue(SIZE);
329	>	for (int i = 0; i < SIZE; ++i) {
330	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
331		}
332		}
333
334		/**
335		* Take removes existing elements until empty, then blocks interruptibly
336		*/
337	<	public void testBlockingTake() {
338	<	Thread t = new Thread(new Runnable() {
339	<	public void run() {
340	<	try {
341	<	DelayQueue q = populatedQueue(SIZE);
342	<	for (int i = 0; i < SIZE; ++i) {
343	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
344	<	}
473	<	q.take();
474	<	threadShouldThrow();
475	<	} catch (InterruptedException success){
476	<	}
477	<	}});
478	<	t.start();
479	<	try {
480	<	Thread.sleep(SHORT_DELAY_MS);
481	<	t.interrupt();
482	<	t.join();
483	<	}
484	<	catch (InterruptedException ie) {
485	<	unexpectedException();
486	<	}
487	<	}
337	>	public void testBlockingTake() throws InterruptedException {
338	>	final DelayQueue q = populatedQueue(SIZE);
339	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
340	>	Thread t = newStartedThread(new CheckedRunnable() {
341	>	public void realRun() throws InterruptedException {
342	>	for (int i = 0; i < SIZE; ++i) {
343	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
344	>	}
345
346	+	Thread.currentThread().interrupt();
347	+	try {
348	+	q.take();
349	+	shouldThrow();
350	+	} catch (InterruptedException success) {}
351	+	assertFalse(Thread.interrupted());
352	+
353	+	pleaseInterrupt.countDown();
354	+	try {
355	+	q.take();
356	+	shouldThrow();
357	+	} catch (InterruptedException success) {}
358	+	assertFalse(Thread.interrupted());
359	+	}});
360	+
361	+	await(pleaseInterrupt);
362	+	assertThreadStaysAlive(t);
363	+	t.interrupt();
364	+	awaitTermination(t);
365	+	}
366
367		/**
368		* poll succeeds unless empty
#	Line 495 | Line 372 | public class DelayQueueTest extends JSR1
372		for (int i = 0; i < SIZE; ++i) {
373		assertEquals(new PDelay(i), ((PDelay)q.poll()));
374		}
375	<	assertNull(q.poll());
375	>	assertNull(q.poll());
376		}
377
378		/**
379	<	* timed pool with zero timeout succeeds when non-empty, else times out
379	>	* timed poll with zero timeout succeeds when non-empty, else times out
380		*/
381	<	public void testTimedPoll0() {
382	<	try {
383	<	DelayQueue q = populatedQueue(SIZE);
384	<	for (int i = 0; i < SIZE; ++i) {
385	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, TimeUnit.MILLISECONDS)));
386	<	}
510	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
511	<	} catch (InterruptedException e){
512	<	unexpectedException();
513	<	}
381	>	public void testTimedPoll0() throws InterruptedException {
382	>	DelayQueue q = populatedQueue(SIZE);
383	>	for (int i = 0; i < SIZE; ++i) {
384	>	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
385	>	}
386	>	assertNull(q.poll(0, MILLISECONDS));
387		}
388
389		/**
390	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
390	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
391		*/
392	<	public void testTimedPoll() {
393	<	try {
394	<	DelayQueue q = populatedQueue(SIZE);
395	<	for (int i = 0; i < SIZE; ++i) {
396	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
397	<	}
398	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
399	<	} catch (InterruptedException e){
400	<	unexpectedException();
401	<	}
392	>	public void testTimedPoll() throws InterruptedException {
393	>	DelayQueue q = populatedQueue(SIZE);
394	>	for (int i = 0; i < SIZE; ++i) {
395	>	long startTime = System.nanoTime();
396	>	assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
397	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
398	>	}
399	>	long startTime = System.nanoTime();
400	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
401	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
402	>	checkEmpty(q);
403		}
404
405		/**
406		* Interrupted timed poll throws InterruptedException instead of
407		* returning timeout status
408		*/
409	<	public void testInterruptedTimedPoll() {
410	<	Thread t = new Thread(new Runnable() {
411	<	public void run() {
412	<	try {
413	<	DelayQueue q = populatedQueue(SIZE);
414	<	for (int i = 0; i < SIZE; ++i) {
415	<	threadAssertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
542	<	}
543	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
544	<	} catch (InterruptedException success){
545	<	}
546	<	}});
547	<	t.start();
548	<	try {
549	<	Thread.sleep(SHORT_DELAY_MS);
550	<	t.interrupt();
551	<	t.join();
552	<	}
553	<	catch (InterruptedException ie) {
554	<	unexpectedException();
555	<	}
556	<	}
557	<
558	<	/**
559	<	*  timed poll before a delayed offer fails; after offer succeeds;
560	<	*  on interruption throws
561	<	*/
562	<	public void testTimedPollWithOffer() {
563	<	final DelayQueue q = new DelayQueue();
564	<	Thread t = new Thread(new Runnable() {
565	<	public void run() {
566	<	try {
567	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
568	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
569	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
570	<	threadFail("Should block");
571	<	} catch (InterruptedException success) { }
409	>	public void testInterruptedTimedPoll() throws InterruptedException {
410	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
411	>	Thread t = newStartedThread(new CheckedRunnable() {
412	>	public void realRun() throws InterruptedException {
413	>	DelayQueue q = populatedQueue(SIZE);
414	>	for (int i = 0; i < SIZE; ++i) {
415	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
416		}
573	–	});
574	–	try {
575	–	t.start();
576	–	Thread.sleep(SMALL_DELAY_MS);
577	–	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
578	–	t.interrupt();
579	–	t.join();
580	–	} catch (Exception e){
581	–	unexpectedException();
582	–	}
583	–	}
417
418	+	Thread.currentThread().interrupt();
419	+	try {
420	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
421	+	shouldThrow();
422	+	} catch (InterruptedException success) {}
423	+	assertFalse(Thread.interrupted());
424	+
425	+	pleaseInterrupt.countDown();
426	+	try {
427	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
428	+	shouldThrow();
429	+	} catch (InterruptedException success) {}
430	+	assertFalse(Thread.interrupted());
431	+	}});
432	+
433	+	await(pleaseInterrupt);
434	+	assertThreadStaysAlive(t);
435	+	t.interrupt();
436	+	awaitTermination(t);
437	+	}
438
439		/**
440		* peek returns next element, or null if empty
#	Line 590 | Line 443 | public class DelayQueueTest extends JSR1
443		DelayQueue q = populatedQueue(SIZE);
444		for (int i = 0; i < SIZE; ++i) {
445		assertEquals(new PDelay(i), ((PDelay)q.peek()));
446	<	q.poll();
447	<	assertTrue(q.peek() == null ||
448	<	i != ((PDelay)q.peek()).intValue());
446	>	assertEquals(new PDelay(i), ((PDelay)q.poll()));
447	>	if (q.isEmpty())
448	>	assertNull(q.peek());
449	>	else
450	>	assertFalse(new PDelay(i).equals(q.peek()));
451		}
452	<	assertNull(q.peek());
452	>	assertNull(q.peek());
453		}
454
455		/**
#	Line 609 | Line 464 | public class DelayQueueTest extends JSR1
464		try {
465		q.element();
466		shouldThrow();
467	<	}
613	<	catch (NoSuchElementException success) {}
467	>	} catch (NoSuchElementException success) {}
468		}
469
470		/**
#	Line 624 | Line 478 | public class DelayQueueTest extends JSR1
478		try {
479		q.remove();
480		shouldThrow();
481	<	} catch (NoSuchElementException success){
628	<	}
481	>	} catch (NoSuchElementException success) {}
482		}
483
484		/**
632	–	* remove(x) removes x and returns true if present
633	–	*/
634	–	public void testRemoveElement() {
635	–	DelayQueue q = populatedQueue(SIZE);
636	–	for (int i = 1; i < SIZE; i+=2) {
637	–	assertTrue(q.remove(new PDelay(i)));
638	–	}
639	–	for (int i = 0; i < SIZE; i+=2) {
640	–	assertTrue(q.remove(new PDelay(i)));
641	–	assertFalse(q.remove(new PDelay(i+1)));
642	–	}
643	–	assertTrue(q.isEmpty());
644	–	}
645	–
646	–	/**
485		* contains(x) reports true when elements added but not yet removed
486		*/
487		public void testContains() {
#	Line 664 | Line 502 | public class DelayQueueTest extends JSR1
502		assertTrue(q.isEmpty());
503		assertEquals(0, q.size());
504		assertEquals(NOCAP, q.remainingCapacity());
505	<	q.add(new PDelay(1));
505	>	PDelay x = new PDelay(1);
506	>	q.add(x);
507		assertFalse(q.isEmpty());
508	+	assertTrue(q.contains(x));
509		q.clear();
510		assertTrue(q.isEmpty());
511		}
#	Line 722 | Line 562 | public class DelayQueueTest extends JSR1
562		/**
563		* toArray contains all elements
564		*/
565	<	public void testToArray() {
565	>	public void testToArray() throws InterruptedException {
566		DelayQueue q = populatedQueue(SIZE);
567	<	Object[] o = q.toArray();
567	>	Object[] o = q.toArray();
568		Arrays.sort(o);
569	<	try {
570	<	for(int i = 0; i < o.length; i++)
731	<	assertEquals(o[i], q.take());
732	<	} catch (InterruptedException e){
733	<	unexpectedException();
734	<	}
569	>	for (int i = 0; i < o.length; i++)
570	>	assertSame(o[i], q.take());
571		}
572
573		/**
574		* toArray(a) contains all elements
575		*/
576		public void testToArray2() {
577	<	DelayQueue q = populatedQueue(SIZE);
578	<	PDelay[] ints = new PDelay[SIZE];
579	<	ints = (PDelay[])q.toArray(ints);
577	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
578	>	PDelay[] ints = new PDelay[SIZE];
579	>	PDelay[] array = q.toArray(ints);
580	>	assertSame(ints, array);
581		Arrays.sort(ints);
582	<	try {
583	<	for(int i = 0; i < ints.length; i++)
747	<	assertEquals(ints[i], q.take());
748	<	} catch (InterruptedException e){
749	<	unexpectedException();
750	<	}
582	>	for (int i = 0; i < ints.length; i++)
583	>	assertSame(ints[i], q.remove());
584		}
585
753	–
586		/**
587	<	* toArray(null) throws NPE
756	<	*/
757	<	public void testToArray_BadArg() {
758	<	try {
759	<	DelayQueue q = populatedQueue(SIZE);
760	<	Object o[] = q.toArray(null);
761	<	shouldThrow();
762	<	} catch(NullPointerException success){}
763	<	}
764	<
765	<	/**
766	<	* toArray with incompatable array type throws CCE
587	>	* toArray(incompatible array type) throws ArrayStoreException
588		*/
589		public void testToArray1_BadArg() {
590	<	try {
591	<	DelayQueue q = populatedQueue(SIZE);
592	<	Object o[] = q.toArray(new String[10] );
593	<	shouldThrow();
594	<	} catch(ArrayStoreException  success){}
590	>	DelayQueue q = populatedQueue(SIZE);
591	>	try {
592	>	q.toArray(new String[10]);
593	>	shouldThrow();
594	>	} catch (ArrayStoreException success) {}
595		}
596	<
596	>
597		/**
598		* iterator iterates through all elements
599		*/
600		public void testIterator() {
601		DelayQueue q = populatedQueue(SIZE);
602		int i = 0;
603	<	Iterator it = q.iterator();
604	<	while(it.hasNext()) {
603	>	Iterator it = q.iterator();
604	>	while (it.hasNext()) {
605		assertTrue(q.contains(it.next()));
606		++i;
607		}
#	Line 790 | Line 611 | public class DelayQueueTest extends JSR1
611		/**
612		* iterator.remove removes current element
613		*/
614	<	public void testIteratorRemove () {
614	>	public void testIteratorRemove() {
615		final DelayQueue q = new DelayQueue();
616		q.add(new PDelay(2));
617		q.add(new PDelay(1));
#	Line 804 | Line 625 | public class DelayQueueTest extends JSR1
625		assertFalse(it.hasNext());
626		}
627
807	–
628		/**
629		* toString contains toStrings of elements
630		*/
631		public void testToString() {
632		DelayQueue q = populatedQueue(SIZE);
633		String s = q.toString();
634	<	for (int i = 0; i < SIZE; ++i) {
635	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
636	<	}
817	<	}
634	>	for (Object e : q)
635	>	assertTrue(s.contains(e.toString()));
636	>	}
637
638		/**
639	<	* offer transfers elements across Executor tasks
639	>	* timed poll transfers elements across Executor tasks
640		*/
641		public void testPollInExecutor() {
642		final DelayQueue q = new DelayQueue();
643	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
644		ExecutorService executor = Executors.newFixedThreadPool(2);
645	<	executor.execute(new Runnable() {
646	<	public void run() {
647	<	threadAssertNull(q.poll());
648	<	try {
649	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
650	<	threadAssertTrue(q.isEmpty());
651	<	}
652	<	catch (InterruptedException e) {
653	<	threadUnexpectedException();
654	<	}
655	<	}
656	<	});
645	>	executor.execute(new CheckedRunnable() {
646	>	public void realRun() throws InterruptedException {
647	>	assertNull(q.poll());
648	>	threadsStarted.await();
649	>	assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS));
650	>	checkEmpty(q);
651	>	}});
652	>
653	>	executor.execute(new CheckedRunnable() {
654	>	public void realRun() throws InterruptedException {
655	>	threadsStarted.await();
656	>	q.put(new PDelay(1));
657	>	}});
658
838	–	executor.execute(new Runnable() {
839	–	public void run() {
840	–	try {
841	–	Thread.sleep(SHORT_DELAY_MS);
842	–	q.put(new PDelay(1));
843	–	}
844	–	catch (InterruptedException e) {
845	–	threadUnexpectedException();
846	–	}
847	–	}
848	–	});
659		joinPool(executor);
850	–
660		}
661
853	–
662		/**
663	<	* Dekayed actions do not occur until their delay elapses
663	>	* Delayed actions do not occur until their delay elapses
664		*/
665	<	public void testDelay() {
666	<	DelayQueue q = new DelayQueue();
667	<	NanoDelay[] elements = new NanoDelay[SIZE];
668	<	for (int i = 0; i < SIZE; ++i) {
669	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
670	<	}
671	<	for (int i = 0; i < SIZE; ++i) {
672	<	q.add(elements[i]);
673	<	}
674	<
675	<	try {
676	<	long last = 0;
677	<	for (int i = 0; i < SIZE; ++i) {
870	<	NanoDelay e = (NanoDelay)(q.take());
871	<	long tt = e.getTriggerTime();
872	<	assertTrue(tt <= System.nanoTime());
873	<	if (i != 0)
874	<	assertTrue(tt >= last);
875	<	last = tt;
876	<	}
877	<	}
878	<	catch(InterruptedException ie) {
879	<	unexpectedException();
665	>	public void testDelay() throws InterruptedException {
666	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
667	>	for (int i = 0; i < SIZE; ++i)
668	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
669	>
670	>	long last = 0;
671	>	for (int i = 0; i < SIZE; ++i) {
672	>	NanoDelay e = q.take();
673	>	long tt = e.getTriggerTime();
674	>	assertTrue(System.nanoTime() - tt >= 0);
675	>	if (i != 0)
676	>	assertTrue(tt >= last);
677	>	last = tt;
678		}
679	+	assertTrue(q.isEmpty());
680		}
681
682	+	/**
683	+	* peek of a non-empty queue returns non-null even if not expired
684	+	*/
685	+	public void testPeekDelayed() {
686	+	DelayQueue q = new DelayQueue();
687	+	q.add(new NanoDelay(Long.MAX_VALUE));
688	+	assertNotNull(q.peek());
689	+	}
690
691		/**
692	<	* drainTo(null) throws NPE
693	<	*/
694	<	public void testDrainToNull() {
695	<	DelayQueue q = populatedQueue(SIZE);
696	<	try {
697	<	q.drainTo(null);
891	<	shouldThrow();
892	<	} catch(NullPointerException success) {
893	<	}
692	>	* poll of a non-empty queue returns null if no expired elements.
693	>	*/
694	>	public void testPollDelayed() {
695	>	DelayQueue q = new DelayQueue();
696	>	q.add(new NanoDelay(Long.MAX_VALUE));
697	>	assertNull(q.poll());
698		}
699
700		/**
701	<	* drainTo(this) throws IAE
702	<	*/
703	<	public void testDrainToSelf() {
704	<	DelayQueue q = populatedQueue(SIZE);
705	<	try {
706	<	q.drainTo(q);
903	<	shouldThrow();
904	<	} catch(IllegalArgumentException success) {
905	<	}
701	>	* timed poll of a non-empty queue returns null if no expired elements.
702	>	*/
703	>	public void testTimedPollDelayed() throws InterruptedException {
704	>	DelayQueue q = new DelayQueue();
705	>	q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
706	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
707		}
708
709		/**
710		* drainTo(c) empties queue into another collection c
711	<	*/
711	>	*/
712		public void testDrainTo() {
713	<	DelayQueue q = populatedQueue(SIZE);
713	>	DelayQueue q = new DelayQueue();
714	>	PDelay[] elems = new PDelay[SIZE];
715	>	for (int i = 0; i < SIZE; ++i) {
716	>	elems[i] = new PDelay(i);
717	>	q.add(elems[i]);
718	>	}
719		ArrayList l = new ArrayList();
720		q.drainTo(l);
721	<	assertEquals(q.size(), 0);
722	<	assertEquals(l.size(), SIZE);
721	>	assertEquals(0, q.size());
722	>	for (int i = 0; i < SIZE; ++i)
723	>	assertEquals(l.get(i), elems[i]);
724	>	q.add(elems[0]);
725	>	q.add(elems[1]);
726	>	assertFalse(q.isEmpty());
727	>	assertTrue(q.contains(elems[0]));
728	>	assertTrue(q.contains(elems[1]));
729	>	l.clear();
730	>	q.drainTo(l);
731	>	assertEquals(0, q.size());
732	>	assertEquals(2, l.size());
733	>	for (int i = 0; i < 2; ++i)
734	>	assertEquals(l.get(i), elems[i]);
735		}
736
737		/**
738		* drainTo empties queue
739	<	*/
740	<	public void testDrainToWithActivePut() {
739	>	*/
740	>	public void testDrainToWithActivePut() throws InterruptedException {
741		final DelayQueue q = populatedQueue(SIZE);
742	<	Thread t = new Thread(new Runnable() {
743	<	public void run() {
744	<	q.put(new PDelay(SIZE+1));
745	<	}
928	<	});
929	<	try {
930	<	t.start();
931	<	ArrayList l = new ArrayList();
932	<	q.drainTo(l);
933	<	assertTrue(l.size() >= SIZE);
934	<	t.join();
935	<	assertTrue(q.size() + l.size() == SIZE+1);
936	<	} catch(Exception e){
937	<	unexpectedException();
938	<	}
939	<	}
742	>	Thread t = new Thread(new CheckedRunnable() {
743	>	public void realRun() {
744	>	q.put(new PDelay(SIZE+1));
745	>	}});
746
747	<	/**
748	<	* drainTo(null, n) throws NPE
749	<	*/
750	<	public void testDrainToNullN() {
751	<	DelayQueue q = populatedQueue(SIZE);
752	<	try {
947	<	q.drainTo(null, 0);
948	<	shouldThrow();
949	<	} catch(NullPointerException success) {
950	<	}
951	<	}
952	<
953	<	/**
954	<	* drainTo(this, n) throws IAE
955	<	*/
956	<	public void testDrainToSelfN() {
957	<	DelayQueue q = populatedQueue(SIZE);
958	<	try {
959	<	q.drainTo(q, 0);
960	<	shouldThrow();
961	<	} catch(IllegalArgumentException success) {
962	<	}
747	>	t.start();
748	>	ArrayList l = new ArrayList();
749	>	q.drainTo(l);
750	>	assertTrue(l.size() >= SIZE);
751	>	t.join();
752	>	assertTrue(q.size() + l.size() >= SIZE);
753		}
754
755		/**
756	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
757	<	*/
756	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
757	>	*/
758		public void testDrainToN() {
759		for (int i = 0; i < SIZE + 2; ++i) {
760		DelayQueue q = populatedQueue(SIZE);
761		ArrayList l = new ArrayList();
762		q.drainTo(l, i);
763	<	int k = (i < SIZE)? i : SIZE;
763	>	int k = (i < SIZE) ? i : SIZE;
764		assertEquals(q.size(), SIZE-k);
765		assertEquals(l.size(), k);
766		}
767		}
768
979	–
769		}

Diff Legend

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