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.50 by jsr166, Fri May 27 20:07:24 2011 UTC vs.
Revision 1.76 by jsr166, Tue Oct 6 00:03:55 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
10	–	import java.util.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.util.concurrent.*;
10	>
11	>	import java.util.ArrayList;
12	>	import java.util.Arrays;
13	>	import java.util.Collection;
14	>	import java.util.Iterator;
15	>	import java.util.NoSuchElementException;
16	>	import java.util.concurrent.BlockingQueue;
17	>	import java.util.concurrent.CountDownLatch;
18	>	import java.util.concurrent.Delayed;
19	>	import java.util.concurrent.DelayQueue;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.TimeUnit;
23	>
24	>	import junit.framework.Test;
25
26		public class DelayQueueTest extends JSR166TestCase {
27	+
28	+	public static class Generic extends BlockingQueueTest {
29	+	protected BlockingQueue emptyCollection() {
30	+	return new DelayQueue();
31	+	}
32	+	protected PDelay makeElement(int i) {
33	+	return new PDelay(i);
34	+	}
35	+	}
36	+
37		public static void main(String[] args) {
38	<	junit.textui.TestRunner.run(suite());
38	>	main(suite(), args);
39		}
40
41		public static Test suite() {
42	<	return new TestSuite(DelayQueueTest.class);
42	>	return newTestSuite(DelayQueueTest.class,
43	>	new Generic().testSuite());
44		}
45
23	–	private static final int NOCAP = Integer.MAX_VALUE;
24	–
46		/**
47		* A delayed implementation for testing.
48		* Most tests use Pseudodelays, where delays are all elapsed
#	Line 29 | Line 50 | public class DelayQueueTest extends JSR1
50		*/
51		static class PDelay implements Delayed {
52		int pseudodelay;
53	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
54	<	public int compareTo(PDelay y) {
55	<	int i = pseudodelay;
56	<	int j = y.pseudodelay;
57	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	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		}
40	–
59		public int compareTo(Delayed y) {
60		return compareTo((PDelay)y);
61		}
44	–
62		public boolean equals(Object other) {
63	<	return equals((PDelay)other);
64	<	}
48	<	public boolean equals(PDelay other) {
49	<	return other.pseudodelay == pseudodelay;
63	>	return (other instanceof PDelay) &&
64	>	this.pseudodelay == ((PDelay)other).pseudodelay;
65		}
66	<
66	>	// suppress [overrides] javac warning
67	>	public int hashCode() { return pseudodelay; }
68		public long getDelay(TimeUnit ignore) {
69	<	return pseudodelay;
54	<	}
55	<	public int intValue() {
56	<	return pseudodelay;
69	>	return Integer.MIN_VALUE + pseudodelay;
70		}
58	–
71		public String toString() {
72		return String.valueOf(pseudodelay);
73		}
#	Line 88 | Line 100 | public class DelayQueueTest extends JSR1
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 103 | Line 118 | public class DelayQueueTest extends JSR1
118		}
119
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<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)
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)
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());
132	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
133		assertEquals(n, q.size());
134		return q;
135		}
#	Line 123 | Line 138 | public class DelayQueueTest extends JSR1
138		* A new queue has unbounded capacity
139		*/
140		public void testConstructor1() {
141	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
141	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
142		}
143
144		/**
#	Line 131 | Line 146 | public class DelayQueueTest extends JSR1
146		*/
147		public void testConstructor3() {
148		try {
149	<	DelayQueue q = new DelayQueue(null);
149	>	new DelayQueue(null);
150		shouldThrow();
151		} catch (NullPointerException success) {}
152		}
#	Line 141 | Line 156 | public class DelayQueueTest extends JSR1
156		*/
157		public void testConstructor4() {
158		try {
159	<	PDelay[] ints = new PDelay[SIZE];
145	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
159	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
160		shouldThrow();
161		} catch (NullPointerException success) {}
162		}
#	Line 151 | Line 165 | public class DelayQueueTest extends JSR1
165		* Initializing from Collection with some null elements throws NPE
166		*/
167		public void testConstructor5() {
168	+	PDelay[] a = new PDelay[SIZE];
169	+	for (int i = 0; i < SIZE - 1; ++i)
170	+	a[i] = new PDelay(i);
171		try {
172	<	PDelay[] ints = new PDelay[SIZE];
156	<	for (int i = 0; i < SIZE-1; ++i)
157	<	ints[i] = new PDelay(i);
158	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
172	>	new DelayQueue(Arrays.asList(a));
173		shouldThrow();
174		} catch (NullPointerException success) {}
175		}
#	Line 178 | Line 192 | public class DelayQueueTest extends JSR1
192		public void testEmpty() {
193		DelayQueue q = new DelayQueue();
194		assertTrue(q.isEmpty());
195	<	assertEquals(NOCAP, q.remainingCapacity());
195	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
196		q.add(new PDelay(1));
197		assertFalse(q.isEmpty());
198		q.add(new PDelay(2));
#	Line 188 | Line 202 | public class DelayQueueTest extends JSR1
202		}
203
204		/**
205	<	* remainingCapacity does not change when elements added or removed,
192	<	* but size does
205	>	* remainingCapacity() always returns Integer.MAX_VALUE
206		*/
207		public void testRemainingCapacity() {
208	<	DelayQueue q = populatedQueue(SIZE);
208	>	BlockingQueue q = populatedQueue(SIZE);
209		for (int i = 0; i < SIZE; ++i) {
210	<	assertEquals(NOCAP, q.remainingCapacity());
211	<	assertEquals(SIZE-i, q.size());
212	<	q.remove();
210	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211	>	assertEquals(SIZE - i, q.size());
212	>	assertTrue(q.remove() instanceof PDelay);
213		}
214		for (int i = 0; i < SIZE; ++i) {
215	<	assertEquals(NOCAP, q.remainingCapacity());
215	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
216		assertEquals(i, q.size());
217	<	q.add(new PDelay(i));
217	>	assertTrue(q.add(new PDelay(i)));
218		}
219		}
220
221		/**
209	–	* offer(null) throws NPE
210	–	*/
211	–	public void testOfferNull() {
212	–	try {
213	–	DelayQueue q = new DelayQueue();
214	–	q.offer(null);
215	–	shouldThrow();
216	–	} catch (NullPointerException success) {}
217	–	}
218	–
219	–	/**
220	–	* add(null) throws NPE
221	–	*/
222	–	public void testAddNull() {
223	–	try {
224	–	DelayQueue q = new DelayQueue();
225	–	q.add(null);
226	–	shouldThrow();
227	–	} catch (NullPointerException success) {}
228	–	}
229	–
230	–	/**
222		* offer non-null succeeds
223		*/
224		public void testOffer() {
#	Line 248 | Line 239 | public class DelayQueueTest extends JSR1
239		}
240
241		/**
251	–	* addAll(null) throws NPE
252	–	*/
253	–	public void testAddAll1() {
254	–	try {
255	–	DelayQueue q = new DelayQueue();
256	–	q.addAll(null);
257	–	shouldThrow();
258	–	} catch (NullPointerException success) {}
259	–	}
260	–
261	–	/**
242		* addAll(this) throws IAE
243		*/
244		public void testAddAllSelf() {
245	+	DelayQueue q = populatedQueue(SIZE);
246		try {
266	–	DelayQueue q = populatedQueue(SIZE);
247		q.addAll(q);
248		shouldThrow();
249		} catch (IllegalArgumentException success) {}
250		}
251
252		/**
273	–	* addAll of a collection with null elements throws NPE
274	–	*/
275	–	public void testAddAll2() {
276	–	try {
277	–	DelayQueue q = new DelayQueue();
278	–	PDelay[] ints = new PDelay[SIZE];
279	–	q.addAll(Arrays.asList(ints));
280	–	shouldThrow();
281	–	} catch (NullPointerException success) {}
282	–	}
283	–
284	–	/**
253		* addAll of a collection with any null elements throws NPE after
254		* possibly adding some elements
255		*/
256		public void testAddAll3() {
257	+	DelayQueue q = new DelayQueue();
258	+	PDelay[] a = new PDelay[SIZE];
259	+	for (int i = 0; i < SIZE - 1; ++i)
260	+	a[i] = new PDelay(i);
261		try {
262	<	DelayQueue q = new DelayQueue();
291	<	PDelay[] ints = new PDelay[SIZE];
292	<	for (int i = 0; i < SIZE-1; ++i)
293	<	ints[i] = new PDelay(i);
294	<	q.addAll(Arrays.asList(ints));
262	>	q.addAll(Arrays.asList(a));
263		shouldThrow();
264		} catch (NullPointerException success) {}
265		}
#	Line 302 | Line 270 | public class DelayQueueTest extends JSR1
270		public void testAddAll5() {
271		PDelay[] empty = new PDelay[0];
272		PDelay[] ints = new PDelay[SIZE];
273	<	for (int i = SIZE-1; i >= 0; --i)
273	>	for (int i = SIZE - 1; i >= 0; --i)
274		ints[i] = new PDelay(i);
275		DelayQueue q = new DelayQueue();
276		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 312 | Line 280 | public class DelayQueueTest extends JSR1
280		}
281
282		/**
315	–	* put(null) throws NPE
316	–	*/
317	–	public void testPutNull() {
318	–	try {
319	–	DelayQueue q = new DelayQueue();
320	–	q.put(null);
321	–	shouldThrow();
322	–	} catch (NullPointerException success) {}
323	–	}
324	–
325	–	/**
283		* all elements successfully put are contained
284		*/
285		public void testPut() {
286		DelayQueue q = new DelayQueue();
287		for (int i = 0; i < SIZE; ++i) {
288	<	PDelay I = new PDelay(i);
289	<	q.put(I);
290	<	assertTrue(q.contains(I));
288	>	PDelay x = new PDelay(i);
289	>	q.put(x);
290	>	assertTrue(q.contains(x));
291		}
292		assertEquals(SIZE, q.size());
293		}
#	Line 374 | Line 331 | public class DelayQueueTest extends JSR1
331		public void testTake() throws InterruptedException {
332		DelayQueue q = populatedQueue(SIZE);
333		for (int i = 0; i < SIZE; ++i) {
334	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
334	>	assertEquals(new PDelay(i), q.take());
335		}
336		}
337
338		/**
382	–	* take blocks interruptibly when empty
383	–	*/
384	–	public void testTakeFromEmptyBlocksInterruptibly()
385	–	throws InterruptedException {
386	–	final BlockingQueue q = new DelayQueue();
387	–	final CountDownLatch threadStarted = new CountDownLatch(1);
388	–	Thread t = newStartedThread(new CheckedRunnable() {
389	–	public void realRun() {
390	–	threadStarted.countDown();
391	–	try {
392	–	q.take();
393	–	shouldThrow();
394	–	} catch (InterruptedException success) {}
395	–	assertFalse(Thread.interrupted());
396	–	}});
397	–
398	–	await(threadStarted);
399	–	assertThreadStaysAlive(t);
400	–	t.interrupt();
401	–	awaitTermination(t);
402	–	}
403	–
404	–	/**
339		* Take removes existing elements until empty, then blocks interruptibly
340		*/
341		public void testBlockingTake() throws InterruptedException {
#	Line 440 | Line 374 | public class DelayQueueTest extends JSR1
374		public void testPoll() {
375		DelayQueue q = populatedQueue(SIZE);
376		for (int i = 0; i < SIZE; ++i) {
377	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
377	>	assertEquals(new PDelay(i), q.poll());
378		}
379		assertNull(q.poll());
380		}
#	Line 451 | Line 385 | public class DelayQueueTest extends JSR1
385		public void testTimedPoll0() throws InterruptedException {
386		DelayQueue q = populatedQueue(SIZE);
387		for (int i = 0; i < SIZE; ++i) {
388	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
388	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
389		}
390		assertNull(q.poll(0, MILLISECONDS));
391		}
#	Line 462 | Line 396 | public class DelayQueueTest extends JSR1
396		public void testTimedPoll() throws InterruptedException {
397		DelayQueue q = populatedQueue(SIZE);
398		for (int i = 0; i < SIZE; ++i) {
399	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
399	>	long startTime = System.nanoTime();
400	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
401	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
402		}
403	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
403	>	long startTime = System.nanoTime();
404	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
405	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
406	>	checkEmpty(q);
407		}
408
409		/**
#	Line 473 | Line 412 | public class DelayQueueTest extends JSR1
412		*/
413		public void testInterruptedTimedPoll() throws InterruptedException {
414		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
415	+	final DelayQueue q = populatedQueue(SIZE);
416		Thread t = newStartedThread(new CheckedRunnable() {
417		public void realRun() throws InterruptedException {
418	<	DelayQueue q = populatedQueue(SIZE);
418	>	long startTime = System.nanoTime();
419		for (int i = 0; i < SIZE; ++i) {
420	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
420	>	assertEquals(new PDelay(i),
421	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
422		}
423
424		Thread.currentThread().interrupt();
#	Line 493 | Line 434 | public class DelayQueueTest extends JSR1
434		shouldThrow();
435		} catch (InterruptedException success) {}
436		assertFalse(Thread.interrupted());
437	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
438		}});
439
440		await(pleaseInterrupt);
441		assertThreadStaysAlive(t);
442		t.interrupt();
443		awaitTermination(t);
444	<	}
503	<
504	<	/**
505	<	* timed poll before a delayed offer fails; after offer succeeds;
506	<	* on interruption throws
507	<	*/
508	<	public void testTimedPollWithOffer() throws InterruptedException {
509	<	final DelayQueue q = new DelayQueue();
510	<	final PDelay pdelay = new PDelay(0);
511	<	final CheckedBarrier barrier = new CheckedBarrier(2);
512	<	Thread t = newStartedThread(new CheckedRunnable() {
513	<	public void realRun() throws InterruptedException {
514	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
515	<
516	<	barrier.await();
517	<	assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
518	<
519	<	Thread.currentThread().interrupt();
520	<	try {
521	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
522	<	shouldThrow();
523	<	} catch (InterruptedException success) {}
524	<	assertFalse(Thread.interrupted());
525	<
526	<	barrier.await();
527	<	try {
528	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
529	<	shouldThrow();
530	<	} catch (InterruptedException success) {}
531	<	assertFalse(Thread.interrupted());
532	<	}});
533	<
534	<	barrier.await();
535	<	long startTime = System.nanoTime();
536	<	assertTrue(q.offer(pdelay, LONG_DELAY_MS, MILLISECONDS));
537	<	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
538	<
539	<	barrier.await();
540	<	assertThreadStaysAlive(t);
541	<	t.interrupt();
542	<	awaitTermination(t);
444	>	checkEmpty(q);
445		}
446
447		/**
#	Line 548 | Line 450 | public class DelayQueueTest extends JSR1
450		public void testPeek() {
451		DelayQueue q = populatedQueue(SIZE);
452		for (int i = 0; i < SIZE; ++i) {
453	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
454	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
453	>	assertEquals(new PDelay(i), q.peek());
454	>	assertEquals(new PDelay(i), q.poll());
455		if (q.isEmpty())
456		assertNull(q.peek());
457		else
#	Line 564 | Line 466 | public class DelayQueueTest extends JSR1
466		public void testElement() {
467		DelayQueue q = populatedQueue(SIZE);
468		for (int i = 0; i < SIZE; ++i) {
469	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
469	>	assertEquals(new PDelay(i), q.element());
470		q.poll();
471		}
472		try {
#	Line 579 | Line 481 | public class DelayQueueTest extends JSR1
481		public void testRemove() {
482		DelayQueue q = populatedQueue(SIZE);
483		for (int i = 0; i < SIZE; ++i) {
484	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
484	>	assertEquals(new PDelay(i), q.remove());
485		}
486		try {
487		q.remove();
#	Line 588 | Line 490 | public class DelayQueueTest extends JSR1
490		}
491
492		/**
591	–	* remove(x) removes x and returns true if present
592	–	*/
593	–	public void testRemoveElement() {
594	–	DelayQueue q = populatedQueue(SIZE);
595	–	for (int i = 1; i < SIZE; i+=2) {
596	–	assertTrue(q.remove(new PDelay(i)));
597	–	}
598	–	for (int i = 0; i < SIZE; i+=2) {
599	–	assertTrue(q.remove(new PDelay(i)));
600	–	assertFalse(q.remove(new PDelay(i+1)));
601	–	}
602	–	assertTrue(q.isEmpty());
603	–	}
604	–
605	–	/**
493		* contains(x) reports true when elements added but not yet removed
494		*/
495		public void testContains() {
#	Line 622 | Line 509 | public class DelayQueueTest extends JSR1
509		q.clear();
510		assertTrue(q.isEmpty());
511		assertEquals(0, q.size());
512	<	assertEquals(NOCAP, q.remainingCapacity());
512	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
513		PDelay x = new PDelay(1);
514		q.add(x);
515		assertFalse(q.isEmpty());
#	Line 659 | Line 546 | public class DelayQueueTest extends JSR1
546		assertTrue(changed);
547
548		assertTrue(q.containsAll(p));
549	<	assertEquals(SIZE-i, q.size());
549	>	assertEquals(SIZE - i, q.size());
550		p.remove();
551		}
552		}
#	Line 672 | Line 559 | public class DelayQueueTest extends JSR1
559		DelayQueue q = populatedQueue(SIZE);
560		DelayQueue p = populatedQueue(i);
561		assertTrue(q.removeAll(p));
562	<	assertEquals(SIZE-i, q.size());
562	>	assertEquals(SIZE - i, q.size());
563		for (int j = 0; j < i; ++j) {
564	<	PDelay I = (PDelay)(p.remove());
565	<	assertFalse(q.contains(I));
564	>	PDelay x = (PDelay)(p.remove());
565	>	assertFalse(q.contains(x));
566		}
567		}
568		}
#	Line 705 | Line 592 | public class DelayQueueTest extends JSR1
592		}
593
594		/**
708	–	* toArray(null) throws NullPointerException
709	–	*/
710	–	public void testToArray_NullArg() {
711	–	DelayQueue q = populatedQueue(SIZE);
712	–	try {
713	–	q.toArray(null);
714	–	shouldThrow();
715	–	} catch (NullPointerException success) {}
716	–	}
717	–
718	–	/**
595		* toArray(incompatible array type) throws ArrayStoreException
596		*/
597		public void testToArray1_BadArg() {
#	Line 738 | Line 614 | public class DelayQueueTest extends JSR1
614		++i;
615		}
616		assertEquals(i, SIZE);
617	+	assertIteratorExhausted(it);
618	+	}
619	+
620	+	/**
621	+	* iterator of empty collection has no elements
622	+	*/
623	+	public void testEmptyIterator() {
624	+	assertIteratorExhausted(new DelayQueue().iterator());
625		}
626
627		/**
#	Line 752 | Line 636 | public class DelayQueueTest extends JSR1
636		it.next();
637		it.remove();
638		it = q.iterator();
639	<	assertEquals(it.next(), new PDelay(2));
640	<	assertEquals(it.next(), new PDelay(3));
639	>	assertEquals(new PDelay(2), it.next());
640	>	assertEquals(new PDelay(3), it.next());
641		assertFalse(it.hasNext());
642		}
643
#	Line 763 | Line 647 | public class DelayQueueTest extends JSR1
647		public void testToString() {
648		DelayQueue q = populatedQueue(SIZE);
649		String s = q.toString();
650	<	for (int i = 0; i < SIZE; ++i) {
651	<	assertTrue(s.contains(String.valueOf(Integer.MIN_VALUE+i)));
768	<	}
650	>	for (Object e : q)
651	>	assertTrue(s.contains(e.toString()));
652		}
653
654		/**
#	Line 774 | Line 657 | public class DelayQueueTest extends JSR1
657		public void testPollInExecutor() {
658		final DelayQueue q = new DelayQueue();
659		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
660	<	ExecutorService executor = Executors.newFixedThreadPool(2);
661	<	executor.execute(new CheckedRunnable() {
662	<	public void realRun() throws InterruptedException {
663	<	assertNull(q.poll());
664	<	threadsStarted.await();
665	<	assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS));
666	<	checkEmpty(q);
667	<	}});
668	<
669	<	executor.execute(new CheckedRunnable() {
670	<	public void realRun() throws InterruptedException {
671	<	threadsStarted.await();
672	<	q.put(new PDelay(1));
673	<	}});
674	<
675	<	joinPool(executor);
660	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
661	>	try (PoolCleaner cleaner = cleaner(executor)) {
662	>	executor.execute(new CheckedRunnable() {
663	>	public void realRun() throws InterruptedException {
664	>	assertNull(q.poll());
665	>	threadsStarted.await();
666	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
667	>	checkEmpty(q);
668	>	}});
669	>
670	>	executor.execute(new CheckedRunnable() {
671	>	public void realRun() throws InterruptedException {
672	>	threadsStarted.await();
673	>	q.put(new PDelay(1));
674	>	}});
675	>	}
676		}
677
678		/**
#	Line 836 | Line 719 | public class DelayQueueTest extends JSR1
719		public void testTimedPollDelayed() throws InterruptedException {
720		DelayQueue q = new DelayQueue();
721		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
722	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
840	<	}
841	<
842	<	/**
843	<	* drainTo(null) throws NPE
844	<	*/
845	<	public void testDrainToNull() {
846	<	DelayQueue q = populatedQueue(SIZE);
847	<	try {
848	<	q.drainTo(null);
849	<	shouldThrow();
850	<	} catch (NullPointerException success) {}
851	<	}
852	<
853	<	/**
854	<	* drainTo(this) throws IAE
855	<	*/
856	<	public void testDrainToSelf() {
857	<	DelayQueue q = populatedQueue(SIZE);
858	<	try {
859	<	q.drainTo(q);
860	<	shouldThrow();
861	<	} catch (IllegalArgumentException success) {}
722	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
723		}
724
725		/**
#	Line 873 | Line 734 | public class DelayQueueTest extends JSR1
734		}
735		ArrayList l = new ArrayList();
736		q.drainTo(l);
737	<	assertEquals(q.size(), 0);
737	>	assertEquals(0, q.size());
738		for (int i = 0; i < SIZE; ++i)
739	<	assertEquals(l.get(i), elems[i]);
739	>	assertEquals(elems[i], l.get(i));
740		q.add(elems[0]);
741		q.add(elems[1]);
742		assertFalse(q.isEmpty());
#	Line 883 | Line 744 | public class DelayQueueTest extends JSR1
744		assertTrue(q.contains(elems[1]));
745		l.clear();
746		q.drainTo(l);
747	<	assertEquals(q.size(), 0);
748	<	assertEquals(l.size(), 2);
747	>	assertEquals(0, q.size());
748	>	assertEquals(2, l.size());
749		for (int i = 0; i < 2; ++i)
750	<	assertEquals(l.get(i), elems[i]);
750	>	assertEquals(elems[i], l.get(i));
751		}
752
753		/**
#	Line 896 | Line 757 | public class DelayQueueTest extends JSR1
757		final DelayQueue q = populatedQueue(SIZE);
758		Thread t = new Thread(new CheckedRunnable() {
759		public void realRun() {
760	<	q.put(new PDelay(SIZE+1));
760	>	q.put(new PDelay(SIZE + 1));
761		}});
762
763		t.start();
#	Line 908 | Line 769 | public class DelayQueueTest extends JSR1
769		}
770
771		/**
911	–	* drainTo(null, n) throws NPE
912	–	*/
913	–	public void testDrainToNullN() {
914	–	DelayQueue q = populatedQueue(SIZE);
915	–	try {
916	–	q.drainTo(null, 0);
917	–	shouldThrow();
918	–	} catch (NullPointerException success) {}
919	–	}
920	–
921	–	/**
922	–	* drainTo(this, n) throws IAE
923	–	*/
924	–	public void testDrainToSelfN() {
925	–	DelayQueue q = populatedQueue(SIZE);
926	–	try {
927	–	q.drainTo(q, 0);
928	–	shouldThrow();
929	–	} catch (IllegalArgumentException success) {}
930	–	}
931	–
932	–	/**
772		* drainTo(c, n) empties first min(n, size) elements of queue into c
773		*/
774		public void testDrainToN() {
#	Line 938 | Line 777 | public class DelayQueueTest extends JSR1
777		ArrayList l = new ArrayList();
778		q.drainTo(l, i);
779		int k = (i < SIZE) ? i : SIZE;
780	<	assertEquals(q.size(), SIZE-k);
781	<	assertEquals(l.size(), k);
780	>	assertEquals(SIZE - k, q.size());
781	>	assertEquals(k, l.size());
782		}
783		}
784
785	+	/**
786	+	* remove(null), contains(null) always return false
787	+	*/
788	+	public void testNeverContainsNull() {
789	+	Collection<?> q = populatedQueue(SIZE);
790	+	assertFalse(q.contains(null));
791	+	assertFalse(q.remove(null));
792	+	}
793		}

Diff Legend

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