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.19 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.61 by jsr166, Fri Apr 5 19:27:23 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
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.*;
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;
12	–	import java.util.concurrent.*;
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 implementation for testing.
47	<	* Most  tests use Pseudodelays, where delays are all elapsed
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 {
51		int pseudodelay;
52	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
53	<	public int compareTo(PDelay y) {
54	<	int i = pseudodelay;
55	<	int j = ((PDelay)y).pseudodelay;
56	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	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		}
40	–
58		public int compareTo(Delayed y) {
59	<	int i = pseudodelay;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	return 0;
59	>	return compareTo((PDelay)y);
60		}
48	–
61		public boolean equals(Object other) {
62	<	return ((PDelay)other).pseudodelay == pseudodelay;
63	<	}
52	<	public boolean equals(PDelay other) {
53	<	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		}
60	–	public int intValue() {
61	–	return pseudodelay;
62	–	}
63	–
70		public String toString() {
71		return String.valueOf(pseudodelay);
72		}
73		}
74
69	–
75		/**
76		* Delayed implementation that actually delays
77		*/
#	Line 77 | Line 82 | public class DelayQueueTest extends JSR1
82		}
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(Delayed y) {
92	<	long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	return 0;
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 112 | Line 116 | public class DelayQueueTest extends JSR1
116		}
117		}
118
115	–
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)));
#	Line 144 | Line 147 | public class DelayQueueTest extends JSR1
147		try {
148		DelayQueue q = new DelayQueue(null);
149		shouldThrow();
150	<	}
148	<	catch (NullPointerException success) {}
150	>	} catch (NullPointerException success) {}
151		}
152
153		/**
#	Line 156 | Line 158 | public class DelayQueueTest extends JSR1
158		PDelay[] ints = new PDelay[SIZE];
159		DelayQueue q = new DelayQueue(Arrays.asList(ints));
160		shouldThrow();
161	<	}
160	<	catch (NullPointerException success) {}
161	>	} catch (NullPointerException success) {}
162		}
163
164		/**
#	Line 170 | Line 171 | public class DelayQueueTest extends JSR1
171		ints[i] = new PDelay(i);
172		DelayQueue q = new DelayQueue(Arrays.asList(ints));
173		shouldThrow();
174	<	}
174	<	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)
187	<	assertEquals(ints[i], q.poll());
188	<	}
189	<	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 205 | 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 223 | Line 220 | public class DelayQueueTest extends JSR1
220		}
221
222		/**
226	–	* offer(null) throws NPE
227	–	*/
228	–	public void testOfferNull() {
229	–	try {
230	–	DelayQueue q = new DelayQueue();
231	–	q.offer(null);
232	–	shouldThrow();
233	–	} catch (NullPointerException success) { }
234	–	}
235	–
236	–	/**
237	–	* add(null) throws NPE
238	–	*/
239	–	public void testAddNull() {
240	–	try {
241	–	DelayQueue q = new DelayQueue();
242	–	q.add(null);
243	–	shouldThrow();
244	–	} catch (NullPointerException success) { }
245	–	}
246	–
247	–	/**
223		* offer non-null succeeds
224		*/
225		public void testOffer() {
#	Line 265 | Line 240 | public class DelayQueueTest extends JSR1
240		}
241
242		/**
268	–	* addAll(null) throws NPE
269	–	*/
270	–	public void testAddAll1() {
271	–	try {
272	–	DelayQueue q = new DelayQueue();
273	–	q.addAll(null);
274	–	shouldThrow();
275	–	}
276	–	catch (NullPointerException success) {}
277	–	}
278	–
279	–
280	–	/**
243		* addAll(this) throws IAE
244		*/
245		public void testAddAllSelf() {
#	Line 285 | Line 247 | public class DelayQueueTest extends JSR1
247		DelayQueue q = populatedQueue(SIZE);
248		q.addAll(q);
249		shouldThrow();
250	<	}
289	<	catch (IllegalArgumentException success) {}
250	>	} catch (IllegalArgumentException success) {}
251		}
252
253		/**
293	–	* addAll of a collection with null elements throws NPE
294	–	*/
295	–	public void testAddAll2() {
296	–	try {
297	–	DelayQueue q = new DelayQueue();
298	–	PDelay[] ints = new PDelay[SIZE];
299	–	q.addAll(Arrays.asList(ints));
300	–	shouldThrow();
301	–	}
302	–	catch (NullPointerException success) {}
303	–	}
304	–	/**
254		* addAll of a collection with any null elements throws NPE after
255		* possibly adding some elements
256		*/
#	Line 313 | Line 262 | public class DelayQueueTest extends JSR1
262		ints[i] = new PDelay(i);
263		q.addAll(Arrays.asList(ints));
264		shouldThrow();
265	<	}
317	<	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)
333	<	assertEquals(ints[i], q.poll());
334	<	}
335	<	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		/**
339	–	* put(null) throws NPE
340	–	*/
341	–	public void testPutNull() {
342	–	try {
343	–	DelayQueue q = new DelayQueue();
344	–	q.put(null);
345	–	shouldThrow();
346	–	}
347	–	catch (NullPointerException success) {
348	–	}
349	–	}
350	–
351	–	/**
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);
360	<	assertTrue(q.contains(I));
361	<	}
362	<	assertEquals(SIZE, q.size());
363	<	}
364	<	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;
383	<	q.put(new PDelay(0));
384	<	++added;
385	<	threadAssertTrue(added == 4);
386	<	} finally {
387	<	}
388	<	}
389	<	});
390	<	try {
391	<	t.start();
392	<	Thread.sleep(SHORT_DELAY_MS);
393	<	q.take();
394	<	t.interrupt();
395	<	t.join();
396	<	} catch (Exception e) {
397	<	unexpectedException();
398	<	}
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, MILLISECONDS));
324	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
413	<	} finally { }
414	<	}
415	<	});
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	<	try {
418	<	t.start();
419	<	Thread.sleep(SMALL_DELAY_MS);
420	<	t.interrupt();
421	<	t.join();
422	<	} catch (Exception e) {
423	<	unexpectedException();
424	<	}
326	>	awaitTermination(t);
327		}
328
329		/**
330		* take retrieves elements in priority order
331		*/
332	<	public void testTake() {
333	<	try {
334	<	DelayQueue q = populatedQueue(SIZE);
335	<	for (int i = 0; i < SIZE; ++i) {
434	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
435	<	}
436	<	} catch (InterruptedException e) {
437	<	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 blocks interruptibly when empty
340	>	* Take removes existing elements until empty, then blocks interruptibly
341		*/
342	<	public void testTakeFromEmpty() {
343	<	final DelayQueue q = new DelayQueue();
344	<	Thread t = new Thread(new Runnable() {
345	<	public void run() {
346	<	try {
347	<	q.take();
348	<	threadShouldThrow();
451	<	} catch (InterruptedException success) { }
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		}
453	–	});
454	–	try {
455	–	t.start();
456	–	Thread.sleep(SHORT_DELAY_MS);
457	–	t.interrupt();
458	–	t.join();
459	–	} catch (Exception e) {
460	–	unexpectedException();
461	–	}
462	–	}
350
351	<	/**
352	<	* Take removes existing elements until empty, then blocks interruptibly
353	<	*/
354	<	public void testBlockingTake() {
355	<	Thread t = new Thread(new Runnable() {
356	<	public void run() {
470	<	try {
471	<	DelayQueue q = populatedQueue(SIZE);
472	<	for (int i = 0; i < SIZE; ++i) {
473	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
474	<	}
475	<	q.take();
476	<	threadShouldThrow();
477	<	} catch (InterruptedException success) {
478	<	}
479	<	}});
480	<	t.start();
481	<	try {
482	<	Thread.sleep(SHORT_DELAY_MS);
483	<	t.interrupt();
484	<	t.join();
485	<	}
486	<	catch (InterruptedException ie) {
487	<	unexpectedException();
488	<	}
489	<	}
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 501 | Line 381 | public class DelayQueueTest extends JSR1
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) {
510	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
511	<	}
512	<	assertNull(q.poll(0, MILLISECONDS));
513	<	} catch (InterruptedException e) {
514	<	unexpectedException();
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, MILLISECONDS)));
402	<	}
527	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
528	<	} catch (InterruptedException e) {
529	<	unexpectedException();
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, MILLISECONDS)));
544	<	}
545	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
546	<	} catch (InterruptedException success) {
547	<	}
548	<	}});
549	<	t.start();
550	<	try {
551	<	Thread.sleep(SHORT_DELAY_MS);
552	<	t.interrupt();
553	<	t.join();
554	<	}
555	<	catch (InterruptedException ie) {
556	<	unexpectedException();
557	<	}
558	<	}
559	<
560	<	/**
561	<	*  timed poll before a delayed offer fails; after offer succeeds;
562	<	*  on interruption throws
563	<	*/
564	<	public void testTimedPollWithOffer() {
565	<	final DelayQueue q = new DelayQueue();
566	<	Thread t = new Thread(new Runnable() {
567	<	public void run() {
568	<	try {
569	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
570	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
571	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
572	<	threadFail("Should block");
573	<	} 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		}
575	–	});
576	–	try {
577	–	t.start();
578	–	Thread.sleep(SMALL_DELAY_MS);
579	–	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
580	–	t.interrupt();
581	–	t.join();
582	–	} catch (Exception e) {
583	–	unexpectedException();
584	–	}
585	–	}
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 592 | 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();
451	>	assertEquals(new PDelay(i), ((PDelay)q.poll()));
452		if (q.isEmpty())
453		assertNull(q.peek());
454		else
455	<	assertTrue(i != ((PDelay)q.peek()).intValue());
455	>	assertFalse(new PDelay(i).equals(q.peek()));
456		}
457		assertNull(q.peek());
458		}
#	Line 613 | Line 469 | public class DelayQueueTest extends JSR1
469		try {
470		q.element();
471		shouldThrow();
472	<	}
617	<	catch (NoSuchElementException success) {}
472	>	} catch (NoSuchElementException success) {}
473		}
474
475		/**
#	Line 628 | Line 483 | public class DelayQueueTest extends JSR1
483		try {
484		q.remove();
485		shouldThrow();
486	<	} catch (NoSuchElementException success) {
632	<	}
633	<	}
634	<
635	<	/**
636	<	* remove(x) removes x and returns true if present
637	<	*/
638	<	public void testRemoveElement() {
639	<	DelayQueue q = populatedQueue(SIZE);
640	<	for (int i = 1; i < SIZE; i+=2) {
641	<	assertTrue(q.remove(new PDelay(i)));
642	<	}
643	<	for (int i = 0; i < SIZE; i+=2) {
644	<	assertTrue(q.remove(new PDelay(i)));
645	<	assertFalse(q.remove(new PDelay(i+1)));
646	<	}
647	<	assertTrue(q.isEmpty());
486	>	} catch (NoSuchElementException success) {}
487		}
488
489		/**
#	Line 728 | 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();
573		Arrays.sort(o);
735	–	try {
574		for (int i = 0; i < o.length; i++)
575	<	assertEquals(o[i], q.take());
738	<	} catch (InterruptedException e) {
739	<	unexpectedException();
740	<	}
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);
582	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
583		PDelay[] ints = new PDelay[SIZE];
584	<	ints = (PDelay[])q.toArray(ints);
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++)
753	<	assertEquals(ints[i], q.take());
754	<	} catch (InterruptedException e) {
755	<	unexpectedException();
756	<	}
757	<	}
758	<
759	<
760	<	/**
761	<	* toArray(null) throws NPE
762	<	*/
763	<	public void testToArray_BadArg() {
764	<	try {
765	<	DelayQueue q = populatedQueue(SIZE);
766	<	Object o[] = q.toArray(null);
767	<	shouldThrow();
768	<	} catch (NullPointerException success) {}
587	>	for (int i = 0; i < ints.length; i++)
588	>	assertSame(ints[i], q.remove());
589		}
590
591		/**
592	<	* toArray with incompatible array type throws CCE
592	>	* toArray(incompatible array type) throws ArrayStoreException
593		*/
594		public void testToArray1_BadArg() {
595	+	DelayQueue q = populatedQueue(SIZE);
596		try {
597	<	DelayQueue q = populatedQueue(SIZE);
777	<	Object o[] = q.toArray(new String[10] );
597	>	q.toArray(new String[10]);
598		shouldThrow();
599	<	} catch (ArrayStoreException  success) {}
599	>	} catch (ArrayStoreException success) {}
600		}
601
602		/**
#	Line 796 | 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 805 | 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
813	–
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);
822	<	}
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, 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	>	assertTrue(null != 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
844	–	executor.execute(new Runnable() {
845	–	public void run() {
846	–	try {
847	–	Thread.sleep(SHORT_DELAY_MS);
848	–	q.put(new PDelay(1));
849	–	}
850	–	catch (InterruptedException e) {
851	–	threadUnexpectedException();
852	–	}
853	–	}
854	–	});
664		joinPool(executor);
856	–
665		}
666
859	–
667		/**
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) {
867	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
868	<	}
869	<	for (int i = 0; i < SIZE; ++i) {
870	<	q.add(elements[i]);
871	<	}
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	<	try {
676	<	long last = 0;
677	<	for (int i = 0; i < SIZE; ++i) {
678	<	NanoDelay e = (NanoDelay)(q.take());
679	<	long tt = e.getTriggerTime();
680	<	assertTrue(tt <= System.nanoTime());
681	<	if (i != 0)
682	<	assertTrue(tt >= last);
881	<	last = tt;
882	<	}
883	<	}
884	<	catch (InterruptedException ie) {
885	<	unexpectedException();
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		/**
#	Line 892 | Line 690 | public class DelayQueueTest extends JSR1
690		public void testPeekDelayed() {
691		DelayQueue q = new DelayQueue();
692		q.add(new NanoDelay(Long.MAX_VALUE));
693	<	assert(q.peek() != null);
693	>	assertNotNull(q.peek());
694		}
695
898	–
696		/**
697		* poll of a non-empty queue returns null if no expired elements.
698		*/
#	Line 908 | Line 705 | public class DelayQueueTest extends JSR1
705		/**
706		* timed poll of a non-empty queue returns null if no expired elements.
707		*/
708	<	public void testTimedPollDelayed() {
708	>	public void testTimedPollDelayed() throws InterruptedException {
709		DelayQueue q = new DelayQueue();
710		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
711	<	try {
915	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
916	<	} catch (Exception ex) {
917	<	unexpectedException();
918	<	}
919	<	}
920	<
921	<	/**
922	<	* drainTo(null) throws NPE
923	<	*/
924	<	public void testDrainToNull() {
925	<	DelayQueue q = populatedQueue(SIZE);
926	<	try {
927	<	q.drainTo(null);
928	<	shouldThrow();
929	<	} catch (NullPointerException success) {
930	<	}
931	<	}
932	<
933	<	/**
934	<	* drainTo(this) throws IAE
935	<	*/
936	<	public void testDrainToSelf() {
937	<	DelayQueue q = populatedQueue(SIZE);
938	<	try {
939	<	q.drainTo(q);
940	<	shouldThrow();
941	<	} catch (IllegalArgumentException success) {
942	<	}
711	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
712		}
713
714		/**
#	Line 954 | Line 723 | public class DelayQueueTest extends JSR1
723		}
724		ArrayList l = new ArrayList();
725		q.drainTo(l);
726	<	assertEquals(q.size(), 0);
726	>	assertEquals(0, q.size());
727		for (int i = 0; i < SIZE; ++i)
728	<	assertEquals(l.get(i), elems[i]);
728	>	assertEquals(elems[i], l.get(i));
729		q.add(elems[0]);
730		q.add(elems[1]);
731		assertFalse(q.isEmpty());
#	Line 964 | Line 733 | public class DelayQueueTest extends JSR1
733		assertTrue(q.contains(elems[1]));
734		l.clear();
735		q.drainTo(l);
736	<	assertEquals(q.size(), 0);
737	<	assertEquals(l.size(), 2);
736	>	assertEquals(0, q.size());
737	>	assertEquals(2, l.size());
738		for (int i = 0; i < 2; ++i)
739	<	assertEquals(l.get(i), elems[i]);
739	>	assertEquals(elems[i], l.get(i));
740		}
741
742		/**
743		* drainTo empties queue
744		*/
745	<	public void testDrainToWithActivePut() {
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	<	}
982	<	});
983	<	try {
984	<	t.start();
985	<	ArrayList l = new ArrayList();
986	<	q.drainTo(l);
987	<	assertTrue(l.size() >= SIZE);
988	<	t.join();
989	<	assertTrue(q.size() + l.size() >= SIZE);
990	<	} catch (Exception e) {
991	<	unexpectedException();
992	<	}
993	<	}
994	<
995	<	/**
996	<	* drainTo(null, n) throws NPE
997	<	*/
998	<	public void testDrainToNullN() {
999	<	DelayQueue q = populatedQueue(SIZE);
1000	<	try {
1001	<	q.drainTo(null, 0);
1002	<	shouldThrow();
1003	<	} catch (NullPointerException success) {
1004	<	}
1005	<	}
747	>	Thread t = new Thread(new CheckedRunnable() {
748	>	public void realRun() {
749	>	q.put(new PDelay(SIZE+1));
750	>	}});
751
752	<	/**
753	<	* drainTo(this, n) throws IAE
754	<	*/
755	<	public void testDrainToSelfN() {
756	<	DelayQueue q = populatedQueue(SIZE);
757	<	try {
1013	<	q.drainTo(q, 0);
1014	<	shouldThrow();
1015	<	} catch (IllegalArgumentException success) {
1016	<	}
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
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
1033	–
774		}

Diff Legend

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