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.25 by jsr166, Sun Nov 22 00:17:37 2009 UTC vs.
Revision 1.64 by jsr166, Wed Dec 31 19:05:42 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.*;
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	>	junit.textui.TestRunner.run(suite());
39		}
40
41		public static Test suite() {
42	<	return new TestSuite(DelayQueueTest.class);
42	>	return newTestSuite(DelayQueueTest.class,
43	>	new Generic().testSuite());
44		}
45
46		private static final int NOCAP = Integer.MAX_VALUE;
47
48		/**
49		* A delayed implementation for testing.
50	<	* Most  tests use Pseudodelays, where delays are all elapsed
50	>	* Most tests use Pseudodelays, where delays are all elapsed
51		* (so, no blocking solely for delays) but are still ordered
52		*/
53		static class PDelay implements Delayed {
54		int pseudodelay;
55	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
56	<	public int compareTo(PDelay y) {
57	<	int i = pseudodelay;
58	<	int j = ((PDelay)y).pseudodelay;
59	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
55	>	PDelay(int i) { pseudodelay = i; }
56	>	public int compareTo(PDelay other) {
57	>	int a = this.pseudodelay;
58	>	int b = other.pseudodelay;
59	>	return (a < b) ? -1 : (a > b) ? 1 : 0;
60		}
40	–
61		public int compareTo(Delayed y) {
62	<	int i = pseudodelay;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	return 0;
62	>	return compareTo((PDelay)y);
63		}
48	–
64		public boolean equals(Object other) {
65	<	return ((PDelay)other).pseudodelay == pseudodelay;
65	>	return (other instanceof PDelay) &&
66	>	this.pseudodelay == ((PDelay)other).pseudodelay;
67		}
68	<	public boolean equals(PDelay other) {
69	<	return ((PDelay)other).pseudodelay == pseudodelay;
54	<	}
55	<
56	<
68	>	// suppress [overrides] javac warning
69	>	public int hashCode() { return pseudodelay; }
70		public long getDelay(TimeUnit ignore) {
71	<	return pseudodelay;
71	>	return Integer.MIN_VALUE + pseudodelay;
72		}
60	–	public int intValue() {
61	–	return pseudodelay;
62	–	}
63	–
73		public String toString() {
74		return String.valueOf(pseudodelay);
75		}
76		}
77
69	–
78		/**
79		* Delayed implementation that actually delays
80		*/
#	Line 77 | Line 85 | public class DelayQueueTest extends JSR1
85		}
86		public int compareTo(NanoDelay y) {
87		long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
88	>	long j = y.trigger;
89		if (i < j) return -1;
90		if (i > j) return 1;
91		return 0;
92		}
93
94		public int compareTo(Delayed y) {
95	<	long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	return 0;
95	>	return compareTo((NanoDelay)y);
96		}
97
98		public boolean equals(Object other) {
99	<	return ((NanoDelay)other).trigger == trigger;
99	>	return equals((NanoDelay)other);
100		}
101		public boolean equals(NanoDelay other) {
102	<	return ((NanoDelay)other).trigger == trigger;
102	>	return other.trigger == trigger;
103		}
104
105	+	// suppress [overrides] javac warning
106	+	public int hashCode() { return (int) trigger; }
107	+
108		public long getDelay(TimeUnit unit) {
109		long n = trigger - System.nanoTime();
110		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 112 | Line 119 | public class DelayQueueTest extends JSR1
119		}
120		}
121
115	–
122		/**
123	<	* Create a queue of given size containing consecutive
123	>	* Returns a new queue of given size containing consecutive
124		* PDelays 0 ... n.
125		*/
126	<	private DelayQueue populatedQueue(int n) {
127	<	DelayQueue q = new DelayQueue();
126	>	private DelayQueue<PDelay> populatedQueue(int n) {
127	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
128		assertTrue(q.isEmpty());
129		for (int i = n-1; i >= 0; i-=2)
130		assertTrue(q.offer(new PDelay(i)));
#	Line 199 | Line 205 | public class DelayQueueTest extends JSR1
205		}
206
207		/**
208	<	* remainingCapacity does not change when elementa added or removed,
208	>	* remainingCapacity does not change when elements added or removed,
209		* but size does
210		*/
211		public void testRemainingCapacity() {
#	Line 217 | Line 223 | public class DelayQueueTest extends JSR1
223		}
224
225		/**
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	–	/**
226		* offer non-null succeeds
227		*/
228		public void testOffer() {
#	Line 259 | Line 243 | public class DelayQueueTest extends JSR1
243		}
244
245		/**
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	–	/**
246		* addAll(this) throws IAE
247		*/
248		public void testAddAllSelf() {
#	Line 282 | Line 254 | public class DelayQueueTest extends JSR1
254		}
255
256		/**
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	–	/**
257		* addAll of a collection with any null elements throws NPE after
258		* possibly adding some elements
259		*/
#	Line 323 | Line 284 | public class DelayQueueTest extends JSR1
284		}
285
286		/**
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	–	/**
287		* all elements successfully put are contained
288		*/
289	<	public void testPut() {
290	<	DelayQueue q = new DelayQueue();
291	<	for (int i = 0; i < SIZE; ++i) {
292	<	PDelay I = new PDelay(i);
293	<	q.put(I);
294	<	assertTrue(q.contains(I));
295	<	}
296	<	assertEquals(SIZE, q.size());
289	>	public void testPut() {
290	>	DelayQueue q = new DelayQueue();
291	>	for (int i = 0; i < SIZE; ++i) {
292	>	PDelay I = new PDelay(i);
293	>	q.put(I);
294	>	assertTrue(q.contains(I));
295	>	}
296	>	assertEquals(SIZE, q.size());
297		}
298
299		/**
#	Line 351 | Line 301 | public class DelayQueueTest extends JSR1
301		*/
302		public void testPutWithTake() throws InterruptedException {
303		final DelayQueue q = new DelayQueue();
304	<	Thread t = new Thread(new CheckedRunnable() {
304	>	Thread t = newStartedThread(new CheckedRunnable() {
305		public void realRun() {
306		q.put(new PDelay(0));
307		q.put(new PDelay(0));
#	Line 359 | Line 309 | public class DelayQueueTest extends JSR1
309		q.put(new PDelay(0));
310		}});
311
312	<	t.start();
313	<	Thread.sleep(SHORT_DELAY_MS);
364	<	q.take();
365	<	t.interrupt();
366	<	t.join();
312	>	awaitTermination(t);
313	>	assertEquals(4, q.size());
314		}
315
316		/**
#	Line 371 | Line 318 | public class DelayQueueTest extends JSR1
318		*/
319		public void testTimedOffer() throws InterruptedException {
320		final DelayQueue q = new DelayQueue();
321	<	Thread t = new Thread(new CheckedRunnable() {
321	>	Thread t = newStartedThread(new CheckedRunnable() {
322		public void realRun() throws InterruptedException {
323		q.put(new PDelay(0));
324		q.put(new PDelay(0));
#	Line 379 | Line 326 | public class DelayQueueTest extends JSR1
326		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
327		}});
328
329	<	t.start();
383	<	Thread.sleep(SMALL_DELAY_MS);
384	<	t.interrupt();
385	<	t.join();
329	>	awaitTermination(t);
330		}
331
332		/**
#	Line 396 | Line 340 | public class DelayQueueTest extends JSR1
340		}
341
342		/**
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	–	/**
343		* Take removes existing elements until empty, then blocks interruptibly
344		*/
345		public void testBlockingTake() throws InterruptedException {
346		final DelayQueue q = populatedQueue(SIZE);
347	<	Thread t = new Thread(new CheckedRunnable() {
347	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
348	>	Thread t = newStartedThread(new CheckedRunnable() {
349		public void realRun() throws InterruptedException {
350		for (int i = 0; i < SIZE; ++i) {
351		assertEquals(new PDelay(i), ((PDelay)q.take()));
352		}
353	+
354	+	Thread.currentThread().interrupt();
355		try {
356		q.take();
357		shouldThrow();
358		} catch (InterruptedException success) {}
359	+	assertFalse(Thread.interrupted());
360	+
361	+	pleaseInterrupt.countDown();
362	+	try {
363	+	q.take();
364	+	shouldThrow();
365	+	} catch (InterruptedException success) {}
366	+	assertFalse(Thread.interrupted());
367		}});
368
369	<	t.start();
370	<	Thread.sleep(SHORT_DELAY_MS);
369	>	await(pleaseInterrupt);
370	>	assertThreadStaysAlive(t);
371		t.interrupt();
372	<	t.join();
372	>	awaitTermination(t);
373		}
374
436	–
375		/**
376		* poll succeeds unless empty
377		*/
#	Line 446 | Line 384 | public class DelayQueueTest extends JSR1
384		}
385
386		/**
387	<	* timed pool with zero timeout succeeds when non-empty, else times out
387	>	* timed poll with zero timeout succeeds when non-empty, else times out
388		*/
389		public void testTimedPoll0() throws InterruptedException {
390		DelayQueue q = populatedQueue(SIZE);
#	Line 457 | Line 395 | public class DelayQueueTest extends JSR1
395		}
396
397		/**
398	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
398	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
399		*/
400		public void testTimedPoll() throws InterruptedException {
401		DelayQueue q = populatedQueue(SIZE);
402		for (int i = 0; i < SIZE; ++i) {
403	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
404	<	}
405	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
403	>	long startTime = System.nanoTime();
404	>	assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
405	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
406	>	}
407	>	long startTime = System.nanoTime();
408	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
409	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
410	>	checkEmpty(q);
411		}
412
413		/**
#	Line 472 | Line 415 | public class DelayQueueTest extends JSR1
415		* returning timeout status
416		*/
417		public void testInterruptedTimedPoll() throws InterruptedException {
418	<	Thread t = new Thread(new CheckedRunnable() {
418	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
419	>	Thread t = newStartedThread(new CheckedRunnable() {
420		public void realRun() throws InterruptedException {
421		DelayQueue q = populatedQueue(SIZE);
422		for (int i = 0; i < SIZE; ++i) {
423		assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
424		}
425	+
426	+	Thread.currentThread().interrupt();
427		try {
428	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
428	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
429		shouldThrow();
430		} catch (InterruptedException success) {}
431	<	}});
486	<
487	<	t.start();
488	<	Thread.sleep(SHORT_DELAY_MS);
489	<	t.interrupt();
490	<	t.join();
491	<	}
431	>	assertFalse(Thread.interrupted());
432
433	<	/**
494	<	*  timed poll before a delayed offer fails; after offer succeeds;
495	<	*  on interruption throws
496	<	*/
497	<	public void testTimedPollWithOffer() throws InterruptedException {
498	<	final DelayQueue q = new DelayQueue();
499	<	final PDelay pdelay = new PDelay(0);
500	<	Thread t = new Thread(new CheckedRunnable() {
501	<	public void realRun() throws InterruptedException {
502	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
503	<	assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
433	>	pleaseInterrupt.countDown();
434		try {
435		q.poll(LONG_DELAY_MS, MILLISECONDS);
436		shouldThrow();
437		} catch (InterruptedException success) {}
438	+	assertFalse(Thread.interrupted());
439		}});
440
441	<	t.start();
442	<	Thread.sleep(SMALL_DELAY_MS);
512	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
441	>	await(pleaseInterrupt);
442	>	assertThreadStaysAlive(t);
443		t.interrupt();
444	<	t.join();
444	>	awaitTermination(t);
445		}
446
517	–
447		/**
448		* peek returns next element, or null if empty
449		*/
#	Line 522 | Line 451 | public class DelayQueueTest extends JSR1
451		DelayQueue q = populatedQueue(SIZE);
452		for (int i = 0; i < SIZE; ++i) {
453		assertEquals(new PDelay(i), ((PDelay)q.peek()));
454	<	q.poll();
454	>	assertEquals(new PDelay(i), ((PDelay)q.poll()));
455		if (q.isEmpty())
456		assertNull(q.peek());
457		else
458	<	assertTrue(i != ((PDelay)q.peek()).intValue());
458	>	assertFalse(new PDelay(i).equals(q.peek()));
459		}
460		assertNull(q.peek());
461		}
#	Line 561 | Line 490 | public class DelayQueueTest extends JSR1
490		}
491
492		/**
564	–	* remove(x) removes x and returns true if present
565	–	*/
566	–	public void testRemoveElement() {
567	–	DelayQueue q = populatedQueue(SIZE);
568	–	for (int i = 1; i < SIZE; i+=2) {
569	–	assertTrue(q.remove(new PDelay(i)));
570	–	}
571	–	for (int i = 0; i < SIZE; i+=2) {
572	–	assertTrue(q.remove(new PDelay(i)));
573	–	assertFalse(q.remove(new PDelay(i+1)));
574	–	}
575	–	assertTrue(q.isEmpty());
576	–	}
577	–
578	–	/**
493		* contains(x) reports true when elements added but not yet removed
494		*/
495		public void testContains() {
#	Line 661 | Line 575 | public class DelayQueueTest extends JSR1
575		Object[] o = q.toArray();
576		Arrays.sort(o);
577		for (int i = 0; i < o.length; i++)
578	<	assertEquals(o[i], q.take());
578	>	assertSame(o[i], q.take());
579		}
580
581		/**
582		* toArray(a) contains all elements
583		*/
584	<	public void testToArray2() throws InterruptedException {
585	<	DelayQueue q = populatedQueue(SIZE);
584	>	public void testToArray2() {
585	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
586		PDelay[] ints = new PDelay[SIZE];
587	<	ints = (PDelay[])q.toArray(ints);
587	>	PDelay[] array = q.toArray(ints);
588	>	assertSame(ints, array);
589		Arrays.sort(ints);
590		for (int i = 0; i < ints.length; i++)
591	<	assertEquals(ints[i], q.take());
677	<	}
678	<
679	<
680	<	/**
681	<	* toArray(null) throws NPE
682	<	*/
683	<	public void testToArray_BadArg() {
684	<	try {
685	<	DelayQueue q = populatedQueue(SIZE);
686	<	Object o[] = q.toArray(null);
687	<	shouldThrow();
688	<	} catch (NullPointerException success) {}
591	>	assertSame(ints[i], q.remove());
592		}
593
594		/**
595	<	* toArray with incompatible array type throws CCE
595	>	* toArray(incompatible array type) throws ArrayStoreException
596		*/
597		public void testToArray1_BadArg() {
598	+	DelayQueue q = populatedQueue(SIZE);
599		try {
600	<	DelayQueue q = populatedQueue(SIZE);
697	<	Object o[] = q.toArray(new String[10] );
600	>	q.toArray(new String[10]);
601		shouldThrow();
602		} catch (ArrayStoreException success) {}
603		}
#	Line 716 | Line 619 | public class DelayQueueTest extends JSR1
619		/**
620		* iterator.remove removes current element
621		*/
622	<	public void testIteratorRemove () {
622	>	public void testIteratorRemove() {
623		final DelayQueue q = new DelayQueue();
624		q.add(new PDelay(2));
625		q.add(new PDelay(1));
#	Line 725 | Line 628 | public class DelayQueueTest extends JSR1
628		it.next();
629		it.remove();
630		it = q.iterator();
631	<	assertEquals(it.next(), new PDelay(2));
632	<	assertEquals(it.next(), new PDelay(3));
631	>	assertEquals(new PDelay(2), it.next());
632	>	assertEquals(new PDelay(3), it.next());
633		assertFalse(it.hasNext());
634		}
635
733	–
636		/**
637		* toString contains toStrings of elements
638		*/
639		public void testToString() {
640		DelayQueue q = populatedQueue(SIZE);
641		String s = q.toString();
642	<	for (int i = 0; i < SIZE; ++i) {
643	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
742	<	}
642	>	for (Object e : q)
643	>	assertTrue(s.contains(e.toString()));
644		}
645
646		/**
647	<	* offer transfers elements across Executor tasks
647	>	* timed poll transfers elements across Executor tasks
648		*/
649		public void testPollInExecutor() {
650		final DelayQueue q = new DelayQueue();
651	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
652		ExecutorService executor = Executors.newFixedThreadPool(2);
653		executor.execute(new CheckedRunnable() {
654		public void realRun() throws InterruptedException {
655	<	threadAssertNull(q.poll());
656	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
657	<	threadAssertTrue(q.isEmpty());
655	>	assertNull(q.poll());
656	>	threadsStarted.await();
657	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
658	>	checkEmpty(q);
659		}});
660
661		executor.execute(new CheckedRunnable() {
662		public void realRun() throws InterruptedException {
663	<	Thread.sleep(SHORT_DELAY_MS);
663	>	threadsStarted.await();
664		q.put(new PDelay(1));
665		}});
666
667		joinPool(executor);
765	–
668		}
669
768	–
670		/**
671		* Delayed actions do not occur until their delay elapses
672		*/
673		public void testDelay() throws InterruptedException {
674	<	DelayQueue q = new DelayQueue();
675	<	NanoDelay[] elements = new NanoDelay[SIZE];
676	<	for (int i = 0; i < SIZE; ++i) {
776	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
777	<	}
778	<	for (int i = 0; i < SIZE; ++i) {
779	<	q.add(elements[i]);
780	<	}
674	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
675	>	for (int i = 0; i < SIZE; ++i)
676	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
677
678		long last = 0;
679		for (int i = 0; i < SIZE; ++i) {
680	<	NanoDelay e = (NanoDelay)(q.take());
680	>	NanoDelay e = q.take();
681		long tt = e.getTriggerTime();
682	<	assertTrue(tt <= System.nanoTime());
682	>	assertTrue(System.nanoTime() - tt >= 0);
683		if (i != 0)
684		assertTrue(tt >= last);
685		last = tt;
686		}
687	+	assertTrue(q.isEmpty());
688		}
689
690		/**
#	Line 796 | Line 693 | public class DelayQueueTest extends JSR1
693		public void testPeekDelayed() {
694		DelayQueue q = new DelayQueue();
695		q.add(new NanoDelay(Long.MAX_VALUE));
696	<	assert(q.peek() != null);
696	>	assertNotNull(q.peek());
697		}
698
802	–
699		/**
700		* poll of a non-empty queue returns null if no expired elements.
701		*/
#	Line 815 | Line 711 | public class DelayQueueTest extends JSR1
711		public void testTimedPollDelayed() throws InterruptedException {
712		DelayQueue q = new DelayQueue();
713		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
714	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
819	<	}
820	<
821	<	/**
822	<	* drainTo(null) throws NPE
823	<	*/
824	<	public void testDrainToNull() {
825	<	DelayQueue q = populatedQueue(SIZE);
826	<	try {
827	<	q.drainTo(null);
828	<	shouldThrow();
829	<	} catch (NullPointerException success) {}
830	<	}
831	<
832	<	/**
833	<	* drainTo(this) throws IAE
834	<	*/
835	<	public void testDrainToSelf() {
836	<	DelayQueue q = populatedQueue(SIZE);
837	<	try {
838	<	q.drainTo(q);
839	<	shouldThrow();
840	<	} catch (IllegalArgumentException success) {}
714	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
715		}
716
717		/**
#	Line 852 | Line 726 | public class DelayQueueTest extends JSR1
726		}
727		ArrayList l = new ArrayList();
728		q.drainTo(l);
729	<	assertEquals(q.size(), 0);
729	>	assertEquals(0, q.size());
730		for (int i = 0; i < SIZE; ++i)
731	<	assertEquals(l.get(i), elems[i]);
731	>	assertEquals(elems[i], l.get(i));
732		q.add(elems[0]);
733		q.add(elems[1]);
734		assertFalse(q.isEmpty());
#	Line 862 | Line 736 | public class DelayQueueTest extends JSR1
736		assertTrue(q.contains(elems[1]));
737		l.clear();
738		q.drainTo(l);
739	<	assertEquals(q.size(), 0);
740	<	assertEquals(l.size(), 2);
739	>	assertEquals(0, q.size());
740	>	assertEquals(2, l.size());
741		for (int i = 0; i < 2; ++i)
742	<	assertEquals(l.get(i), elems[i]);
742	>	assertEquals(elems[i], l.get(i));
743		}
744
745		/**
#	Line 887 | Line 761 | public class DelayQueueTest extends JSR1
761		}
762
763		/**
764	<	* drainTo(null, n) throws NPE
891	<	*/
892	<	public void testDrainToNullN() {
893	<	DelayQueue q = populatedQueue(SIZE);
894	<	try {
895	<	q.drainTo(null, 0);
896	<	shouldThrow();
897	<	} catch (NullPointerException success) {}
898	<	}
899	<
900	<	/**
901	<	* drainTo(this, n) throws IAE
902	<	*/
903	<	public void testDrainToSelfN() {
904	<	DelayQueue q = populatedQueue(SIZE);
905	<	try {
906	<	q.drainTo(q, 0);
907	<	shouldThrow();
908	<	} catch (IllegalArgumentException success) {}
909	<	}
910	<
911	<	/**
912	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
764	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
765		*/
766		public void testDrainToN() {
767		for (int i = 0; i < SIZE + 2; ++i) {
768		DelayQueue q = populatedQueue(SIZE);
769		ArrayList l = new ArrayList();
770		q.drainTo(l, i);
771	<	int k = (i < SIZE)? i : SIZE;
772	<	assertEquals(q.size(), SIZE-k);
773	<	assertEquals(l.size(), k);
771	>	int k = (i < SIZE) ? i : SIZE;
772	>	assertEquals(SIZE-k, q.size());
773	>	assertEquals(k, l.size());
774		}
775		}
776
777	<
777	>	/**
778	>	* remove(null), contains(null) always return false
779	>	*/
780	>	public void testNeverContainsNull() {
781	>	Collection<?> q = populatedQueue(SIZE);
782	>	assertFalse(q.contains(null));
783	>	assertFalse(q.remove(null));
784	>	}
785		}

Diff Legend

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