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.63 by jsr166, Sun Nov 23 22:27:06 2014 UTC

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

Diff Legend

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