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.23 by jsr166, Sat Nov 21 21:00:34 2009 UTC vs.
Revision 1.63 by jsr166, Sun Nov 23 22:27:06 2014 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.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;
12	–	import java.util.concurrent.*;
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 implementation for testing.
48	<	* Most  tests use Pseudodelays, where delays are all elapsed
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 {
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 = ((PDelay)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	<	int i = pseudodelay;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	return 0;
60	>	return compareTo((PDelay)y);
61		}
48	–
62		public boolean equals(Object other) {
63	<	return ((PDelay)other).pseudodelay == pseudodelay;
63	>	return (other instanceof PDelay) &&
64	>	this.pseudodelay == ((PDelay)other).pseudodelay;
65		}
66	<	public boolean equals(PDelay other) {
67	<	return ((PDelay)other).pseudodelay == pseudodelay;
54	<	}
55	<
56	<
66	>	// suppress [overrides] javac warning
67	>	public int hashCode() { return pseudodelay; }
68		public long getDelay(TimeUnit ignore) {
69	<	return pseudodelay;
69	>	return Integer.MIN_VALUE + pseudodelay;
70		}
60	–	public int intValue() {
61	–	return pseudodelay;
62	–	}
63	–
71		public String toString() {
72		return String.valueOf(pseudodelay);
73		}
74		}
75
69	–
76		/**
77		* Delayed implementation that actually delays
78		*/
#	Line 77 | Line 83 | public class DelayQueueTest extends JSR1
83		}
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(Delayed y) {
93	<	long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	return 0;
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 112 | Line 117 | public class DelayQueueTest extends JSR1
117		}
118		}
119
115	–
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)));
#	Line 199 | 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 217 | Line 221 | public class DelayQueueTest extends JSR1
221		}
222
223		/**
220	–	* offer(null) throws NPE
221	–	*/
222	–	public void testOfferNull() {
223	–	try {
224	–	DelayQueue q = new DelayQueue();
225	–	q.offer(null);
226	–	shouldThrow();
227	–	} catch (NullPointerException success) {}
228	–	}
229	–
230	–	/**
231	–	* add(null) throws NPE
232	–	*/
233	–	public void testAddNull() {
234	–	try {
235	–	DelayQueue q = new DelayQueue();
236	–	q.add(null);
237	–	shouldThrow();
238	–	} catch (NullPointerException success) {}
239	–	}
240	–
241	–	/**
224		* offer non-null succeeds
225		*/
226		public void testOffer() {
#	Line 259 | Line 241 | public class DelayQueueTest extends JSR1
241		}
242
243		/**
262	–	* addAll(null) throws NPE
263	–	*/
264	–	public void testAddAll1() {
265	–	try {
266	–	DelayQueue q = new DelayQueue();
267	–	q.addAll(null);
268	–	shouldThrow();
269	–	} catch (NullPointerException success) {}
270	–	}
271	–
272	–
273	–	/**
244		* addAll(this) throws IAE
245		*/
246		public void testAddAllSelf() {
#	Line 282 | Line 252 | public class DelayQueueTest extends JSR1
252		}
253
254		/**
285	–	* addAll of a collection with null elements throws NPE
286	–	*/
287	–	public void testAddAll2() {
288	–	try {
289	–	DelayQueue q = new DelayQueue();
290	–	PDelay[] ints = new PDelay[SIZE];
291	–	q.addAll(Arrays.asList(ints));
292	–	shouldThrow();
293	–	} catch (NullPointerException success) {}
294	–	}
295	–	/**
255		* addAll of a collection with any null elements throws NPE after
256		* possibly adding some elements
257		*/
#	Line 323 | Line 282 | public class DelayQueueTest extends JSR1
282		}
283
284		/**
326	–	* put(null) throws NPE
327	–	*/
328	–	public void testPutNull() {
329	–	try {
330	–	DelayQueue q = new DelayQueue();
331	–	q.put(null);
332	–	shouldThrow();
333	–	} catch (NullPointerException success) {}
334	–	}
335	–
336	–	/**
285		* all elements successfully put are contained
286		*/
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());
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		/**
#	Line 351 | Line 299 | public class DelayQueueTest extends JSR1
299		*/
300		public void testPutWithTake() throws InterruptedException {
301		final DelayQueue q = new DelayQueue();
302	<	Thread t = new Thread(new CheckedRunnable() {
302	>	Thread t = newStartedThread(new CheckedRunnable() {
303		public void realRun() {
304		q.put(new PDelay(0));
305		q.put(new PDelay(0));
#	Line 359 | Line 307 | public class DelayQueueTest extends JSR1
307		q.put(new PDelay(0));
308		}});
309
310	<	t.start();
311	<	Thread.sleep(SHORT_DELAY_MS);
364	<	q.take();
365	<	t.interrupt();
366	<	t.join();
310	>	awaitTermination(t);
311	>	assertEquals(4, q.size());
312		}
313
314		/**
#	Line 371 | Line 316 | public class DelayQueueTest extends JSR1
316		*/
317		public void testTimedOffer() throws InterruptedException {
318		final DelayQueue q = new DelayQueue();
319	<	Thread t = new Thread(new CheckedRunnable() {
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	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
324	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
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	<	t.start();
383	<	Thread.sleep(SMALL_DELAY_MS);
384	<	t.interrupt();
385	<	t.join();
327	>	awaitTermination(t);
328		}
329
330		/**
#	Line 396 | Line 338 | public class DelayQueueTest extends JSR1
338		}
339
340		/**
399	–	* take blocks interruptibly when empty
400	–	*/
401	–	public void testTakeFromEmpty() throws InterruptedException {
402	–	final DelayQueue q = new DelayQueue();
403	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
404	–	public void realRun() throws InterruptedException {
405	–	q.take();
406	–	}};
407	–
408	–	t.start();
409	–	Thread.sleep(SHORT_DELAY_MS);
410	–	t.interrupt();
411	–	t.join();
412	–	}
413	–
414	–	/**
341		* Take removes existing elements until empty, then blocks interruptibly
342		*/
343		public void testBlockingTake() throws InterruptedException {
344	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
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 {
420	–	DelayQueue q = populatedQueue(SIZE);
348		for (int i = 0; i < SIZE; ++i) {
349	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
349	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
350		}
424	–	q.take();
425	–	}};
351
352	<	t.start();
353	<	Thread.sleep(SHORT_DELAY_MS);
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	<	t.join();
370	>	awaitTermination(t);
371		}
372
433	–
373		/**
374		* poll succeeds unless empty
375		*/
#	Line 443 | Line 382 | public class DelayQueueTest extends JSR1
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() throws InterruptedException {
388		DelayQueue q = populatedQueue(SIZE);
#	Line 454 | Line 393 | public class DelayQueueTest extends JSR1
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() throws InterruptedException {
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	<	}
403	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
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		/**
#	Line 469 | Line 413 | public class DelayQueueTest extends JSR1
413		* returning timeout status
414		*/
415		public void testInterruptedTimedPoll() throws InterruptedException {
416	<	Thread t = new Thread(new CheckedRunnable() {
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		}
423	+
424	+	Thread.currentThread().interrupt();
425		try {
426	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
426	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
427		shouldThrow();
428		} catch (InterruptedException success) {}
429	<	}});
483	<
484	<	t.start();
485	<	Thread.sleep(SHORT_DELAY_MS);
486	<	t.interrupt();
487	<	t.join();
488	<	}
429	>	assertFalse(Thread.interrupted());
430
431	<	/**
491	<	*  timed poll before a delayed offer fails; after offer succeeds;
492	<	*  on interruption throws
493	<	*/
494	<	public void testTimedPollWithOffer() throws InterruptedException {
495	<	final DelayQueue q = new DelayQueue();
496	<	final PDelay pdelay = new PDelay(0);
497	<	Thread t = new Thread(new CheckedRunnable() {
498	<	public void realRun() throws InterruptedException {
499	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
500	<	assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
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	<	t.start();
440	<	Thread.sleep(SMALL_DELAY_MS);
509	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
439	>	await(pleaseInterrupt);
440	>	assertThreadStaysAlive(t);
441		t.interrupt();
442	<	t.join();
442	>	awaitTermination(t);
443		}
444
514	–
445		/**
446		* peek returns next element, or null if empty
447		*/
#	Line 519 | 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();
452	>	assertEquals(new PDelay(i), ((PDelay)q.poll()));
453		if (q.isEmpty())
454		assertNull(q.peek());
455		else
456	<	assertTrue(i != ((PDelay)q.peek()).intValue());
456	>	assertFalse(new PDelay(i).equals(q.peek()));
457		}
458		assertNull(q.peek());
459		}
#	Line 558 | Line 488 | public class DelayQueueTest extends JSR1
488		}
489
490		/**
561	–	* remove(x) removes x and returns true if present
562	–	*/
563	–	public void testRemoveElement() {
564	–	DelayQueue q = populatedQueue(SIZE);
565	–	for (int i = 1; i < SIZE; i+=2) {
566	–	assertTrue(q.remove(new PDelay(i)));
567	–	}
568	–	for (int i = 0; i < SIZE; i+=2) {
569	–	assertTrue(q.remove(new PDelay(i)));
570	–	assertFalse(q.remove(new PDelay(i+1)));
571	–	}
572	–	assertTrue(q.isEmpty());
573	–	}
574	–
575	–	/**
491		* contains(x) reports true when elements added but not yet removed
492		*/
493		public void testContains() {
#	Line 658 | Line 573 | public class DelayQueueTest extends JSR1
573		Object[] o = q.toArray();
574		Arrays.sort(o);
575		for (int i = 0; i < o.length; i++)
576	<	assertEquals(o[i], q.take());
576	>	assertSame(o[i], q.take());
577		}
578
579		/**
580		* toArray(a) contains all elements
581		*/
582	<	public void testToArray2() throws InterruptedException {
583	<	DelayQueue q = populatedQueue(SIZE);
582	>	public void testToArray2() {
583	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
584		PDelay[] ints = new PDelay[SIZE];
585	<	ints = (PDelay[])q.toArray(ints);
585	>	PDelay[] array = q.toArray(ints);
586	>	assertSame(ints, array);
587		Arrays.sort(ints);
588		for (int i = 0; i < ints.length; i++)
589	<	assertEquals(ints[i], q.take());
674	<	}
675	<
676	<
677	<	/**
678	<	* toArray(null) throws NPE
679	<	*/
680	<	public void testToArray_BadArg() {
681	<	try {
682	<	DelayQueue q = populatedQueue(SIZE);
683	<	Object o[] = q.toArray(null);
684	<	shouldThrow();
685	<	} catch (NullPointerException success) {}
589	>	assertSame(ints[i], q.remove());
590		}
591
592		/**
593	<	* toArray with incompatible array type throws CCE
593	>	* toArray(incompatible array type) throws ArrayStoreException
594		*/
595		public void testToArray1_BadArg() {
596	+	DelayQueue q = populatedQueue(SIZE);
597		try {
598	<	DelayQueue q = populatedQueue(SIZE);
694	<	Object o[] = q.toArray(new String[10] );
598	>	q.toArray(new String[10]);
599		shouldThrow();
600		} catch (ArrayStoreException success) {}
601		}
#	Line 713 | 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 722 | 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
730	–
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);
739	<	}
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 CheckedRunnable() {
652		public void realRun() throws InterruptedException {
653	<	threadAssertNull(q.poll());
654	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
655	<	threadAssertTrue(q.isEmpty());
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	<	Thread.sleep(SHORT_DELAY_MS);
661	>	threadsStarted.await();
662		q.put(new PDelay(1));
663		}});
664
665		joinPool(executor);
762	–
666		}
667
765	–
668		/**
669		* Delayed actions do not occur until their delay elapses
670		*/
671		public void testDelay() throws InterruptedException {
672	<	DelayQueue q = new DelayQueue();
673	<	NanoDelay[] elements = new NanoDelay[SIZE];
674	<	for (int i = 0; i < SIZE; ++i) {
773	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
774	<	}
775	<	for (int i = 0; i < SIZE; ++i) {
776	<	q.add(elements[i]);
777	<	}
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 = (NanoDelay)(q.take());
678	>	NanoDelay e = q.take();
679		long tt = e.getTriggerTime();
680	<	assertTrue(tt <= System.nanoTime());
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		/**
#	Line 793 | Line 691 | public class DelayQueueTest extends JSR1
691		public void testPeekDelayed() {
692		DelayQueue q = new DelayQueue();
693		q.add(new NanoDelay(Long.MAX_VALUE));
694	<	assert(q.peek() != null);
694	>	assertNotNull(q.peek());
695		}
696
799	–
697		/**
698		* poll of a non-empty queue returns null if no expired elements.
699		*/
#	Line 812 | Line 709 | public class DelayQueueTest extends JSR1
709		public void testTimedPollDelayed() throws InterruptedException {
710		DelayQueue q = new DelayQueue();
711		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
712	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
816	<	}
817	<
818	<	/**
819	<	* drainTo(null) throws NPE
820	<	*/
821	<	public void testDrainToNull() {
822	<	DelayQueue q = populatedQueue(SIZE);
823	<	try {
824	<	q.drainTo(null);
825	<	shouldThrow();
826	<	} catch (NullPointerException success) {}
827	<	}
828	<
829	<	/**
830	<	* drainTo(this) throws IAE
831	<	*/
832	<	public void testDrainToSelf() {
833	<	DelayQueue q = populatedQueue(SIZE);
834	<	try {
835	<	q.drainTo(q);
836	<	shouldThrow();
837	<	} catch (IllegalArgumentException success) {}
712	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
713		}
714
715		/**
#	Line 849 | Line 724 | public class DelayQueueTest extends JSR1
724		}
725		ArrayList l = new ArrayList();
726		q.drainTo(l);
727	<	assertEquals(q.size(), 0);
727	>	assertEquals(0, q.size());
728		for (int i = 0; i < SIZE; ++i)
729	<	assertEquals(l.get(i), elems[i]);
729	>	assertEquals(elems[i], l.get(i));
730		q.add(elems[0]);
731		q.add(elems[1]);
732		assertFalse(q.isEmpty());
#	Line 859 | Line 734 | public class DelayQueueTest extends JSR1
734		assertTrue(q.contains(elems[1]));
735		l.clear();
736		q.drainTo(l);
737	<	assertEquals(q.size(), 0);
738	<	assertEquals(l.size(), 2);
737	>	assertEquals(0, q.size());
738	>	assertEquals(2, l.size());
739		for (int i = 0; i < 2; ++i)
740	<	assertEquals(l.get(i), elems[i]);
740	>	assertEquals(elems[i], l.get(i));
741		}
742
743		/**
#	Line 884 | Line 759 | public class DelayQueueTest extends JSR1
759		}
760
761		/**
762	<	* drainTo(null, n) throws NPE
888	<	*/
889	<	public void testDrainToNullN() {
890	<	DelayQueue q = populatedQueue(SIZE);
891	<	try {
892	<	q.drainTo(null, 0);
893	<	shouldThrow();
894	<	} catch (NullPointerException success) {}
895	<	}
896	<
897	<	/**
898	<	* drainTo(this, n) throws IAE
899	<	*/
900	<	public void testDrainToSelfN() {
901	<	DelayQueue q = populatedQueue(SIZE);
902	<	try {
903	<	q.drainTo(q, 0);
904	<	shouldThrow();
905	<	} catch (IllegalArgumentException success) {}
906	<	}
907	<
908	<	/**
909	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
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(q.size(), SIZE-k);
771	<	assertEquals(l.size(), k);
769	>	int k = (i < SIZE) ? i : SIZE;
770	>	assertEquals(SIZE-k, q.size());
771	>	assertEquals(k, l.size());
772		}
773		}
774
775	<
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