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.49 by dl, Fri May 6 11:22:07 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	<
67	<
66	>	// suppress [overrides] javac warning
67	>	public int hashCode() { return pseudodelay; }
68		public long getDelay(TimeUnit ignore) {
69	<	return pseudodelay;
55	<	}
56	<	public int intValue() {
57	<	return pseudodelay;
69	>	return Integer.MIN_VALUE + pseudodelay;
70		}
59	–
71		public String toString() {
72		return String.valueOf(pseudodelay);
73		}
74		}
75
65	–
76		/**
77		* Delayed implementation that actually delays
78		*/
#	Line 90 | 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 104 | Line 117 | public class DelayQueueTest extends JSR1
117		}
118		}
119
107	–
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 126 | 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 134 | 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 144 | Line 156 | public class DelayQueueTest extends JSR1
156		*/
157		public void testConstructor4() {
158		try {
159	<	PDelay[] ints = new PDelay[SIZE];
148	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
159	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
160		shouldThrow();
161		} catch (NullPointerException success) {}
162		}
#	Line 154 | 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];
159	<	for (int i = 0; i < SIZE-1; ++i)
160	<	ints[i] = new PDelay(i);
161	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
172	>	new DelayQueue(Arrays.asList(a));
173		shouldThrow();
174		} catch (NullPointerException success) {}
175		}
#	Line 181 | 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 191 | Line 202 | public class DelayQueueTest extends JSR1
202		}
203
204		/**
205	<	* remainingCapacity does not change when elements added or removed,
195	<	* 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		/**
212	–	* offer(null) throws NPE
213	–	*/
214	–	public void testOfferNull() {
215	–	try {
216	–	DelayQueue q = new DelayQueue();
217	–	q.offer(null);
218	–	shouldThrow();
219	–	} catch (NullPointerException success) {}
220	–	}
221	–
222	–	/**
223	–	* add(null) throws NPE
224	–	*/
225	–	public void testAddNull() {
226	–	try {
227	–	DelayQueue q = new DelayQueue();
228	–	q.add(null);
229	–	shouldThrow();
230	–	} catch (NullPointerException success) {}
231	–	}
232	–
233	–	/**
222		* offer non-null succeeds
223		*/
224		public void testOffer() {
#	Line 251 | Line 239 | public class DelayQueueTest extends JSR1
239		}
240
241		/**
254	–	* addAll(null) throws NPE
255	–	*/
256	–	public void testAddAll1() {
257	–	try {
258	–	DelayQueue q = new DelayQueue();
259	–	q.addAll(null);
260	–	shouldThrow();
261	–	} catch (NullPointerException success) {}
262	–	}
263	–
264	–
265	–	/**
242		* addAll(this) throws IAE
243		*/
244		public void testAddAllSelf() {
245	+	DelayQueue q = populatedQueue(SIZE);
246		try {
270	–	DelayQueue q = populatedQueue(SIZE);
247		q.addAll(q);
248		shouldThrow();
249		} catch (IllegalArgumentException success) {}
250		}
251
252		/**
277	–	* addAll of a collection with null elements throws NPE
278	–	*/
279	–	public void testAddAll2() {
280	–	try {
281	–	DelayQueue q = new DelayQueue();
282	–	PDelay[] ints = new PDelay[SIZE];
283	–	q.addAll(Arrays.asList(ints));
284	–	shouldThrow();
285	–	} catch (NullPointerException success) {}
286	–	}
287	–
288	–	/**
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();
295	<	PDelay[] ints = new PDelay[SIZE];
296	<	for (int i = 0; i < SIZE-1; ++i)
297	<	ints[i] = new PDelay(i);
298	<	q.addAll(Arrays.asList(ints));
262	>	q.addAll(Arrays.asList(a));
263		shouldThrow();
264		} catch (NullPointerException success) {}
265		}
#	Line 306 | 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 316 | Line 280 | public class DelayQueueTest extends JSR1
280		}
281
282		/**
319	–	* put(null) throws NPE
320	–	*/
321	–	public void testPutNull() {
322	–	try {
323	–	DelayQueue q = new DelayQueue();
324	–	q.put(null);
325	–	shouldThrow();
326	–	} catch (NullPointerException success) {}
327	–	}
328	–
329	–	/**
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 344 | Line 297 | public class DelayQueueTest extends JSR1
297		*/
298		public void testPutWithTake() throws InterruptedException {
299		final DelayQueue q = new DelayQueue();
300	<	Thread t = new Thread(new CheckedRunnable() {
300	>	Thread t = newStartedThread(new CheckedRunnable() {
301		public void realRun() {
302		q.put(new PDelay(0));
303		q.put(new PDelay(0));
#	Line 352 | Line 305 | public class DelayQueueTest extends JSR1
305		q.put(new PDelay(0));
306		}});
307
308	<	t.start();
309	<	delay(SHORT_DELAY_MS);
357	<	q.take();
358	<	t.interrupt();
359	<	t.join();
308	>	awaitTermination(t);
309	>	assertEquals(4, q.size());
310		}
311
312		/**
#	Line 364 | Line 314 | public class DelayQueueTest extends JSR1
314		*/
315		public void testTimedOffer() throws InterruptedException {
316		final DelayQueue q = new DelayQueue();
317	<	Thread t = new Thread(new CheckedRunnable() {
317	>	Thread t = newStartedThread(new CheckedRunnable() {
318		public void realRun() throws InterruptedException {
319		q.put(new PDelay(0));
320		q.put(new PDelay(0));
#	Line 372 | Line 322 | public class DelayQueueTest extends JSR1
322		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
323		}});
324
325	<	t.start();
376	<	delay(SMALL_DELAY_MS);
377	<	t.interrupt();
378	<	t.join();
325	>	awaitTermination(t);
326		}
327
328		/**
#	Line 384 | 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		/**
392	–	* take blocks interruptibly when empty
393	–	*/
394	–	public void testTakeFromEmptyBlocksInterruptibly()
395	–	throws InterruptedException {
396	–	final BlockingQueue q = new DelayQueue();
397	–	final CountDownLatch threadStarted = new CountDownLatch(1);
398	–	Thread t = newStartedThread(new CheckedRunnable() {
399	–	public void realRun() {
400	–	long t0 = System.nanoTime();
401	–	threadStarted.countDown();
402	–	try {
403	–	q.take();
404	–	shouldThrow();
405	–	} catch (InterruptedException success) {}
406	–	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
407	–	}});
408	–	threadStarted.await();
409	–	delay(SHORT_DELAY_MS);
410	–	assertTrue(t.isAlive());
411	–	t.interrupt();
412	–	awaitTermination(t, MEDIUM_DELAY_MS);
413	–	assertFalse(t.isAlive());
414	–	}
415	–
416	–	/**
339		* Take removes existing elements until empty, then blocks interruptibly
340		*/
341		public void testBlockingTake() throws InterruptedException {
342		final DelayQueue q = populatedQueue(SIZE);
343	<	Thread t = new Thread(new CheckedRunnable() {
343	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
344	>	Thread t = newStartedThread(new CheckedRunnable() {
345		public void realRun() throws InterruptedException {
346		for (int i = 0; i < SIZE; ++i) {
347		assertEquals(new PDelay(i), ((PDelay)q.take()));
348		}
349	+
350	+	Thread.currentThread().interrupt();
351	+	try {
352	+	q.take();
353	+	shouldThrow();
354	+	} catch (InterruptedException success) {}
355	+	assertFalse(Thread.interrupted());
356	+
357	+	pleaseInterrupt.countDown();
358		try {
359		q.take();
360		shouldThrow();
361		} catch (InterruptedException success) {}
362	+	assertFalse(Thread.interrupted());
363		}});
364
365	<	t.start();
366	<	delay(SHORT_DELAY_MS);
365	>	await(pleaseInterrupt);
366	>	assertThreadStaysAlive(t);
367		t.interrupt();
368	<	t.join();
368	>	awaitTermination(t);
369		}
370
438	–
371		/**
372		* poll succeeds unless empty
373		*/
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 453 | 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 464 | 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)));
400	<	}
401	<	assertNull(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	>	long startTime = System.nanoTime();
404	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
405	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
406	>	checkEmpty(q);
407		}
408
409		/**
#	Line 474 | Line 411 | public class DelayQueueTest extends JSR1
411		* returning timeout status
412		*/
413		public void testInterruptedTimedPoll() throws InterruptedException {
414	<	Thread t = new Thread(new CheckedRunnable() {
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		}
483	–	try {
484	–	q.poll(SMALL_DELAY_MS, MILLISECONDS);
485	–	shouldThrow();
486	–	} catch (InterruptedException success) {}
487	–	}});
488	–
489	–	t.start();
490	–	delay(SHORT_DELAY_MS);
491	–	t.interrupt();
492	–	t.join();
493	–	}
494	–
495	–	/**
496	–	* timed poll before a delayed offer fails; after offer succeeds;
497	–	* on interruption throws
498	–	*/
499	–	public void testTimedPollWithOffer() throws InterruptedException {
500	–	final DelayQueue q = new DelayQueue();
501	–	final PDelay pdelay = new PDelay(0);
502	–	final CheckedBarrier barrier = new CheckedBarrier(2);
503	–	Thread t = new Thread(new CheckedRunnable() {
504	–	public void realRun() throws InterruptedException {
505	–	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
506	–
507	–	barrier.await();
508	–	assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
423
424		Thread.currentThread().interrupt();
425		try {
426	<	q.poll(SHORT_DELAY_MS, MILLISECONDS);
426	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
427		shouldThrow();
428		} catch (InterruptedException success) {}
429	+	assertFalse(Thread.interrupted());
430
431	<	barrier.await();
431	>	pleaseInterrupt.countDown();
432		try {
433	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
433	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
434		shouldThrow();
435		} catch (InterruptedException success) {}
436	+	assertFalse(Thread.interrupted());
437	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
438		}});
439
440	<	t.start();
441	<	barrier.await();
525	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
526	<	barrier.await();
527	<	sleep(SHORT_DELAY_MS);
440	>	await(pleaseInterrupt);
441	>	assertThreadStaysAlive(t);
442		t.interrupt();
443	<	t.join();
443	>	awaitTermination(t);
444	>	checkEmpty(q);
445		}
446
532	–
447		/**
448		* peek returns next element, or null if empty
449		*/
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 552 | 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 567 | 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 576 | Line 490 | public class DelayQueueTest extends JSR1
490		}
491
492		/**
579	–	* remove(x) removes x and returns true if present
580	–	*/
581	–	public void testRemoveElement() {
582	–	DelayQueue q = populatedQueue(SIZE);
583	–	for (int i = 1; i < SIZE; i+=2) {
584	–	assertTrue(q.remove(new PDelay(i)));
585	–	}
586	–	for (int i = 0; i < SIZE; i+=2) {
587	–	assertTrue(q.remove(new PDelay(i)));
588	–	assertFalse(q.remove(new PDelay(i+1)));
589	–	}
590	–	assertTrue(q.isEmpty());
591	–	}
592	–
593	–	/**
493		* contains(x) reports true when elements added but not yet removed
494		*/
495		public void testContains() {
#	Line 610 | 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 647 | 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 660 | 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 692 | Line 591 | public class DelayQueueTest extends JSR1
591		assertSame(ints[i], q.remove());
592		}
593
695	–
696	–	/**
697	–	* toArray(null) throws NullPointerException
698	–	*/
699	–	public void testToArray_NullArg() {
700	–	DelayQueue q = populatedQueue(SIZE);
701	–	try {
702	–	q.toArray(null);
703	–	shouldThrow();
704	–	} catch (NullPointerException success) {}
705	–	}
706	–
594		/**
595		* toArray(incompatible array type) throws ArrayStoreException
596		*/
#	Line 727 | 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 741 | 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
749	–
644		/**
645		* toString contains toStrings of elements
646		*/
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.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
758	<	}
650	>	for (Object e : q)
651	>	assertTrue(s.contains(e.toString()));
652		}
653
654		/**
655	<	* offer transfers elements across Executor tasks
655	>	* timed poll transfers elements across Executor tasks
656		*/
657		public void testPollInExecutor() {
658		final DelayQueue q = new DelayQueue();
659	<	ExecutorService executor = Executors.newFixedThreadPool(2);
660	<	executor.execute(new CheckedRunnable() {
661	<	public void realRun() throws InterruptedException {
662	<	assertNull(q.poll());
663	<	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
664	<	assertTrue(q.isEmpty());
665	<	}});
666	<
667	<	executor.execute(new CheckedRunnable() {
668	<	public void realRun() throws InterruptedException {
669	<	delay(SHORT_DELAY_MS);
670	<	q.put(new PDelay(1));
671	<	}});
672	<
673	<	joinPool(executor);
659	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
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
783	–
678		/**
679		* Delayed actions do not occur until their delay elapses
680		*/
#	Line 810 | Line 704 | public class DelayQueueTest extends JSR1
704		assertNotNull(q.peek());
705		}
706
813	–
707		/**
708		* poll of a non-empty queue returns null if no expired elements.
709		*/
#	Line 826 | 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));
830	<	}
831	<
832	<	/**
833	<	* drainTo(null) throws NPE
834	<	*/
835	<	public void testDrainToNull() {
836	<	DelayQueue q = populatedQueue(SIZE);
837	<	try {
838	<	q.drainTo(null);
839	<	shouldThrow();
840	<	} catch (NullPointerException success) {}
841	<	}
842	<
843	<	/**
844	<	* drainTo(this) throws IAE
845	<	*/
846	<	public void testDrainToSelf() {
847	<	DelayQueue q = populatedQueue(SIZE);
848	<	try {
849	<	q.drainTo(q);
850	<	shouldThrow();
851	<	} catch (IllegalArgumentException success) {}
722	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
723		}
724
725		/**
#	Line 863 | 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 873 | 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 886 | 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 898 | Line 769 | public class DelayQueueTest extends JSR1
769		}
770
771		/**
901	–	* drainTo(null, n) throws NPE
902	–	*/
903	–	public void testDrainToNullN() {
904	–	DelayQueue q = populatedQueue(SIZE);
905	–	try {
906	–	q.drainTo(null, 0);
907	–	shouldThrow();
908	–	} catch (NullPointerException success) {}
909	–	}
910	–
911	–	/**
912	–	* drainTo(this, n) throws IAE
913	–	*/
914	–	public void testDrainToSelfN() {
915	–	DelayQueue q = populatedQueue(SIZE);
916	–	try {
917	–	q.drainTo(q, 0);
918	–	shouldThrow();
919	–	} catch (IllegalArgumentException success) {}
920	–	}
921	–
922	–	/**
772		* drainTo(c, n) empties first min(n, size) elements of queue into c
773		*/
774		public void testDrainToN() {
#	Line 928 | 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	<
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