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.33 by jsr166, Thu Sep 16 00:52:49 2010 UTC vs.
Revision 1.62 by jsr166, Thu May 30 03:28:55 2013 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9		import junit.framework.*;
10	<	import java.util.*;
10	>	import java.util.Arrays;
11	>	import java.util.ArrayList;
12	>	import java.util.Iterator;
13	>	import java.util.NoSuchElementException;
14	>	import java.util.concurrent.BlockingQueue;
15	>	import java.util.concurrent.CountDownLatch;
16	>	import java.util.concurrent.Delayed;
17	>	import java.util.concurrent.DelayQueue;
18	>	import java.util.concurrent.Executors;
19	>	import java.util.concurrent.ExecutorService;
20	>	import java.util.concurrent.TimeUnit;
21		import static java.util.concurrent.TimeUnit.MILLISECONDS;
12	–	import java.util.concurrent.*;
22
23		public class DelayQueueTest extends JSR166TestCase {
24	+
25	+	public static class Generic extends BlockingQueueTest {
26	+	protected BlockingQueue emptyCollection() {
27	+	return new DelayQueue();
28	+	}
29	+	protected PDelay makeElement(int i) {
30	+	return new PDelay(i);
31	+	}
32	+	}
33	+
34		public static void main(String[] args) {
35		junit.textui.TestRunner.run(suite());
36		}
37
38		public static Test suite() {
39	<	return new TestSuite(DelayQueueTest.class);
39	>	return newTestSuite(DelayQueueTest.class,
40	>	new Generic().testSuite());
41		}
42
43		private static final int NOCAP = Integer.MAX_VALUE;
#	Line 29 | Line 49 | public class DelayQueueTest extends JSR1
49		*/
50		static class PDelay implements Delayed {
51		int pseudodelay;
52	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
53	<	public int compareTo(PDelay y) {
54	<	int i = pseudodelay;
55	<	int j = y.pseudodelay;
56	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
52	>	PDelay(int i) { pseudodelay = i; }
53	>	public int compareTo(PDelay other) {
54	>	int a = this.pseudodelay;
55	>	int b = other.pseudodelay;
56	>	return (a < b) ? -1 : (a > b) ? 1 : 0;
57		}
40	–
58		public int compareTo(Delayed y) {
59		return compareTo((PDelay)y);
60		}
44	–
61		public boolean equals(Object other) {
62	<	return equals((PDelay)other);
63	<	}
48	<	public boolean equals(PDelay other) {
49	<	return other.pseudodelay == pseudodelay;
62	>	return (other instanceof PDelay) &&
63	>	this.pseudodelay == ((PDelay)other).pseudodelay;
64		}
65	<
66	<
65	>	// suppress [overrides] javac warning
66	>	public int hashCode() { return pseudodelay; }
67		public long getDelay(TimeUnit ignore) {
68	<	return pseudodelay;
55	<	}
56	<	public int intValue() {
57	<	return pseudodelay;
68	>	return Integer.MIN_VALUE + pseudodelay;
69		}
59	–
70		public String toString() {
71		return String.valueOf(pseudodelay);
72		}
73		}
74
65	–
75		/**
76		* Delayed implementation that actually delays
77		*/
#	Line 90 | Line 99 | public class DelayQueueTest extends JSR1
99		return other.trigger == trigger;
100		}
101
102	+	// suppress [overrides] javac warning
103	+	public int hashCode() { return (int) trigger; }
104	+
105		public long getDelay(TimeUnit unit) {
106		long n = trigger - System.nanoTime();
107		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 104 | Line 116 | public class DelayQueueTest extends JSR1
116		}
117		}
118
107	–
119		/**
120	<	* Create a queue of given size containing consecutive
120	>	* Returns a new queue of given size containing consecutive
121		* PDelays 0 ... n.
122		*/
123	<	private DelayQueue populatedQueue(int n) {
124	<	DelayQueue q = new DelayQueue();
123	>	private DelayQueue<PDelay> populatedQueue(int n) {
124	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
125		assertTrue(q.isEmpty());
126		for (int i = n-1; i >= 0; i-=2)
127		assertTrue(q.offer(new PDelay(i)));
#	Line 209 | Line 220 | public class DelayQueueTest extends JSR1
220		}
221
222		/**
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	–	/**
223		* offer non-null succeeds
224		*/
225		public void testOffer() {
#	Line 251 | Line 240 | public class DelayQueueTest extends JSR1
240		}
241
242		/**
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	–	/**
243		* addAll(this) throws IAE
244		*/
245		public void testAddAllSelf() {
#	Line 274 | Line 251 | public class DelayQueueTest extends JSR1
251		}
252
253		/**
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	–	/**
254		* addAll of a collection with any null elements throws NPE after
255		* possibly adding some elements
256		*/
#	Line 316 | Line 281 | public class DelayQueueTest extends JSR1
281		}
282
283		/**
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	–	/**
284		* all elements successfully put are contained
285		*/
286	<	public void testPut() {
287	<	DelayQueue q = new DelayQueue();
288	<	for (int i = 0; i < SIZE; ++i) {
289	<	PDelay I = new PDelay(i);
290	<	q.put(I);
291	<	assertTrue(q.contains(I));
292	<	}
293	<	assertEquals(SIZE, q.size());
286	>	public void testPut() {
287	>	DelayQueue q = new DelayQueue();
288	>	for (int i = 0; i < SIZE; ++i) {
289	>	PDelay I = new PDelay(i);
290	>	q.put(I);
291	>	assertTrue(q.contains(I));
292	>	}
293	>	assertEquals(SIZE, q.size());
294		}
295
296		/**
#	Line 344 | Line 298 | public class DelayQueueTest extends JSR1
298		*/
299		public void testPutWithTake() throws InterruptedException {
300		final DelayQueue q = new DelayQueue();
301	<	Thread t = new Thread(new CheckedRunnable() {
301	>	Thread t = newStartedThread(new CheckedRunnable() {
302		public void realRun() {
303		q.put(new PDelay(0));
304		q.put(new PDelay(0));
#	Line 352 | Line 306 | public class DelayQueueTest extends JSR1
306		q.put(new PDelay(0));
307		}});
308
309	<	t.start();
310	<	Thread.sleep(SHORT_DELAY_MS);
357	<	q.take();
358	<	t.interrupt();
359	<	t.join();
309	>	awaitTermination(t);
310	>	assertEquals(4, q.size());
311		}
312
313		/**
#	Line 364 | Line 315 | public class DelayQueueTest extends JSR1
315		*/
316		public void testTimedOffer() throws InterruptedException {
317		final DelayQueue q = new DelayQueue();
318	<	Thread t = new Thread(new CheckedRunnable() {
318	>	Thread t = newStartedThread(new CheckedRunnable() {
319		public void realRun() throws InterruptedException {
320		q.put(new PDelay(0));
321		q.put(new PDelay(0));
#	Line 372 | Line 323 | public class DelayQueueTest extends JSR1
323		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
324		}});
325
326	<	t.start();
376	<	Thread.sleep(SMALL_DELAY_MS);
377	<	t.interrupt();
378	<	t.join();
326	>	awaitTermination(t);
327		}
328
329		/**
#	Line 389 | Line 337 | public class DelayQueueTest extends JSR1
337		}
338
339		/**
392	–	* take blocks interruptibly when empty
393	–	*/
394	–	public void testTakeFromEmpty() throws InterruptedException {
395	–	final DelayQueue q = new DelayQueue();
396	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
397	–	public void realRun() throws InterruptedException {
398	–	q.take();
399	–	}};
400	–
401	–	t.start();
402	–	Thread.sleep(SHORT_DELAY_MS);
403	–	t.interrupt();
404	–	t.join();
405	–	}
406	–
407	–	/**
340		* Take removes existing elements until empty, then blocks interruptibly
341		*/
342		public void testBlockingTake() throws InterruptedException {
343		final DelayQueue q = populatedQueue(SIZE);
344	<	Thread t = new Thread(new CheckedRunnable() {
344	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
345	>	Thread t = newStartedThread(new CheckedRunnable() {
346		public void realRun() throws InterruptedException {
347		for (int i = 0; i < SIZE; ++i) {
348		assertEquals(new PDelay(i), ((PDelay)q.take()));
349		}
350	+
351	+	Thread.currentThread().interrupt();
352		try {
353		q.take();
354		shouldThrow();
355		} catch (InterruptedException success) {}
356	+	assertFalse(Thread.interrupted());
357	+
358	+	pleaseInterrupt.countDown();
359	+	try {
360	+	q.take();
361	+	shouldThrow();
362	+	} catch (InterruptedException success) {}
363	+	assertFalse(Thread.interrupted());
364		}});
365
366	<	t.start();
367	<	Thread.sleep(SHORT_DELAY_MS);
366	>	await(pleaseInterrupt);
367	>	assertThreadStaysAlive(t);
368		t.interrupt();
369	<	t.join();
369	>	awaitTermination(t);
370		}
371
429	–
372		/**
373		* poll succeeds unless empty
374		*/
#	Line 439 | Line 381 | public class DelayQueueTest extends JSR1
381		}
382
383		/**
384	<	* timed pool with zero timeout succeeds when non-empty, else times out
384	>	* timed poll with zero timeout succeeds when non-empty, else times out
385		*/
386		public void testTimedPoll0() throws InterruptedException {
387		DelayQueue q = populatedQueue(SIZE);
#	Line 450 | Line 392 | public class DelayQueueTest extends JSR1
392		}
393
394		/**
395	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
395	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
396		*/
397		public void testTimedPoll() throws InterruptedException {
398		DelayQueue q = populatedQueue(SIZE);
399		for (int i = 0; i < SIZE; ++i) {
400	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
401	<	}
402	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
400	>	long startTime = System.nanoTime();
401	>	assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
402	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
403	>	}
404	>	long startTime = System.nanoTime();
405	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
406	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
407	>	checkEmpty(q);
408		}
409
410		/**
#	Line 465 | Line 412 | public class DelayQueueTest extends JSR1
412		* returning timeout status
413		*/
414		public void testInterruptedTimedPoll() throws InterruptedException {
415	<	Thread t = new Thread(new CheckedRunnable() {
415	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
416	>	Thread t = newStartedThread(new CheckedRunnable() {
417		public void realRun() throws InterruptedException {
418		DelayQueue q = populatedQueue(SIZE);
419		for (int i = 0; i < SIZE; ++i) {
420		assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
421		}
422	+
423	+	Thread.currentThread().interrupt();
424		try {
425	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
425	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
426		shouldThrow();
427		} catch (InterruptedException success) {}
428	<	}});
479	<
480	<	t.start();
481	<	Thread.sleep(SHORT_DELAY_MS);
482	<	t.interrupt();
483	<	t.join();
484	<	}
428	>	assertFalse(Thread.interrupted());
429
430	<	/**
487	<	*  timed poll before a delayed offer fails; after offer succeeds;
488	<	*  on interruption throws
489	<	*/
490	<	public void testTimedPollWithOffer() throws InterruptedException {
491	<	final DelayQueue q = new DelayQueue();
492	<	final PDelay pdelay = new PDelay(0);
493	<	Thread t = new Thread(new CheckedRunnable() {
494	<	public void realRun() throws InterruptedException {
495	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
496	<	assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
430	>	pleaseInterrupt.countDown();
431		try {
432		q.poll(LONG_DELAY_MS, MILLISECONDS);
433		shouldThrow();
434		} catch (InterruptedException success) {}
435	+	assertFalse(Thread.interrupted());
436		}});
437
438	<	t.start();
439	<	Thread.sleep(SMALL_DELAY_MS);
505	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
438	>	await(pleaseInterrupt);
439	>	assertThreadStaysAlive(t);
440		t.interrupt();
441	<	t.join();
441	>	awaitTermination(t);
442		}
443
510	–
444		/**
445		* peek returns next element, or null if empty
446		*/
#	Line 554 | Line 487 | public class DelayQueueTest extends JSR1
487		}
488
489		/**
557	–	* remove(x) removes x and returns true if present
558	–	*/
559	–	public void testRemoveElement() {
560	–	DelayQueue q = populatedQueue(SIZE);
561	–	for (int i = 1; i < SIZE; i+=2) {
562	–	assertTrue(q.remove(new PDelay(i)));
563	–	}
564	–	for (int i = 0; i < SIZE; i+=2) {
565	–	assertTrue(q.remove(new PDelay(i)));
566	–	assertFalse(q.remove(new PDelay(i+1)));
567	–	}
568	–	assertTrue(q.isEmpty());
569	–	}
570	–
571	–	/**
490		* contains(x) reports true when elements added but not yet removed
491		*/
492		public void testContains() {
#	Line 654 | Line 572 | public class DelayQueueTest extends JSR1
572		Object[] o = q.toArray();
573		Arrays.sort(o);
574		for (int i = 0; i < o.length; i++)
575	<	assertEquals(o[i], q.take());
575	>	assertSame(o[i], q.take());
576		}
577
578		/**
579		* toArray(a) contains all elements
580		*/
581	<	public void testToArray2() throws InterruptedException {
582	<	DelayQueue q = populatedQueue(SIZE);
581	>	public void testToArray2() {
582	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
583		PDelay[] ints = new PDelay[SIZE];
584	<	ints = (PDelay[])q.toArray(ints);
584	>	PDelay[] array = q.toArray(ints);
585	>	assertSame(ints, array);
586		Arrays.sort(ints);
587		for (int i = 0; i < ints.length; i++)
588	<	assertEquals(ints[i], q.take());
670	<	}
671	<
672	<
673	<	/**
674	<	* toArray(null) throws NPE
675	<	*/
676	<	public void testToArray_BadArg() {
677	<	DelayQueue q = populatedQueue(SIZE);
678	<	try {
679	<	Object o[] = q.toArray(null);
680	<	shouldThrow();
681	<	} catch (NullPointerException success) {}
588	>	assertSame(ints[i], q.remove());
589		}
590
591		/**
592	<	* toArray with incompatible array type throws CCE
592	>	* toArray(incompatible array type) throws ArrayStoreException
593		*/
594		public void testToArray1_BadArg() {
595		DelayQueue q = populatedQueue(SIZE);
596		try {
597	<	Object o[] = q.toArray(new String[10]);
597	>	q.toArray(new String[10]);
598		shouldThrow();
599		} catch (ArrayStoreException success) {}
600		}
#	Line 718 | Line 625 | public class DelayQueueTest extends JSR1
625		it.next();
626		it.remove();
627		it = q.iterator();
628	<	assertEquals(it.next(), new PDelay(2));
629	<	assertEquals(it.next(), new PDelay(3));
628	>	assertEquals(new PDelay(2), it.next());
629	>	assertEquals(new PDelay(3), it.next());
630		assertFalse(it.hasNext());
631		}
632
726	–
633		/**
634		* toString contains toStrings of elements
635		*/
636		public void testToString() {
637		DelayQueue q = populatedQueue(SIZE);
638		String s = q.toString();
639	<	for (int i = 0; i < SIZE; ++i) {
640	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
735	<	}
639	>	for (Object e : q)
640	>	assertTrue(s.contains(e.toString()));
641		}
642
643		/**
644	<	* offer transfers elements across Executor tasks
644	>	* timed poll transfers elements across Executor tasks
645		*/
646		public void testPollInExecutor() {
647		final DelayQueue q = new DelayQueue();
648	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
649		ExecutorService executor = Executors.newFixedThreadPool(2);
650		executor.execute(new CheckedRunnable() {
651		public void realRun() throws InterruptedException {
652		assertNull(q.poll());
653	<	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
654	<	assertTrue(q.isEmpty());
653	>	threadsStarted.await();
654	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
655	>	checkEmpty(q);
656		}});
657
658		executor.execute(new CheckedRunnable() {
659		public void realRun() throws InterruptedException {
660	<	Thread.sleep(SHORT_DELAY_MS);
660	>	threadsStarted.await();
661		q.put(new PDelay(1));
662		}});
663
664		joinPool(executor);
665		}
666
760	–
667		/**
668		* Delayed actions do not occur until their delay elapses
669		*/
670		public void testDelay() throws InterruptedException {
671	<	DelayQueue q = new DelayQueue();
672	<	NanoDelay[] elements = new NanoDelay[SIZE];
673	<	for (int i = 0; i < SIZE; ++i) {
768	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
769	<	}
770	<	for (int i = 0; i < SIZE; ++i) {
771	<	q.add(elements[i]);
772	<	}
671	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
672	>	for (int i = 0; i < SIZE; ++i)
673	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
674
675		long last = 0;
676		for (int i = 0; i < SIZE; ++i) {
677	<	NanoDelay e = (NanoDelay)(q.take());
677	>	NanoDelay e = q.take();
678		long tt = e.getTriggerTime();
679	<	assertTrue(tt <= System.nanoTime());
679	>	assertTrue(System.nanoTime() - tt >= 0);
680		if (i != 0)
681		assertTrue(tt >= last);
682		last = tt;
683		}
684	+	assertTrue(q.isEmpty());
685		}
686
687		/**
#	Line 791 | Line 693 | public class DelayQueueTest extends JSR1
693		assertNotNull(q.peek());
694		}
695
794	–
696		/**
697		* poll of a non-empty queue returns null if no expired elements.
698		*/
#	Line 807 | Line 708 | public class DelayQueueTest extends JSR1
708		public void testTimedPollDelayed() throws InterruptedException {
709		DelayQueue q = new DelayQueue();
710		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
711	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
811	<	}
812	<
813	<	/**
814	<	* drainTo(null) throws NPE
815	<	*/
816	<	public void testDrainToNull() {
817	<	DelayQueue q = populatedQueue(SIZE);
818	<	try {
819	<	q.drainTo(null);
820	<	shouldThrow();
821	<	} catch (NullPointerException success) {}
822	<	}
823	<
824	<	/**
825	<	* drainTo(this) throws IAE
826	<	*/
827	<	public void testDrainToSelf() {
828	<	DelayQueue q = populatedQueue(SIZE);
829	<	try {
830	<	q.drainTo(q);
831	<	shouldThrow();
832	<	} catch (IllegalArgumentException success) {}
711	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
712		}
713
714		/**
#	Line 844 | Line 723 | public class DelayQueueTest extends JSR1
723		}
724		ArrayList l = new ArrayList();
725		q.drainTo(l);
726	<	assertEquals(q.size(), 0);
726	>	assertEquals(0, q.size());
727		for (int i = 0; i < SIZE; ++i)
728	<	assertEquals(l.get(i), elems[i]);
728	>	assertEquals(elems[i], l.get(i));
729		q.add(elems[0]);
730		q.add(elems[1]);
731		assertFalse(q.isEmpty());
#	Line 854 | Line 733 | public class DelayQueueTest extends JSR1
733		assertTrue(q.contains(elems[1]));
734		l.clear();
735		q.drainTo(l);
736	<	assertEquals(q.size(), 0);
737	<	assertEquals(l.size(), 2);
736	>	assertEquals(0, q.size());
737	>	assertEquals(2, l.size());
738		for (int i = 0; i < 2; ++i)
739	<	assertEquals(l.get(i), elems[i]);
739	>	assertEquals(elems[i], l.get(i));
740		}
741
742		/**
#	Line 879 | Line 758 | public class DelayQueueTest extends JSR1
758		}
759
760		/**
761	<	* drainTo(null, n) throws NPE
883	<	*/
884	<	public void testDrainToNullN() {
885	<	DelayQueue q = populatedQueue(SIZE);
886	<	try {
887	<	q.drainTo(null, 0);
888	<	shouldThrow();
889	<	} catch (NullPointerException success) {}
890	<	}
891	<
892	<	/**
893	<	* drainTo(this, n) throws IAE
894	<	*/
895	<	public void testDrainToSelfN() {
896	<	DelayQueue q = populatedQueue(SIZE);
897	<	try {
898	<	q.drainTo(q, 0);
899	<	shouldThrow();
900	<	} catch (IllegalArgumentException success) {}
901	<	}
902	<
903	<	/**
904	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
761	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
762		*/
763		public void testDrainToN() {
764		for (int i = 0; i < SIZE + 2; ++i) {
765		DelayQueue q = populatedQueue(SIZE);
766		ArrayList l = new ArrayList();
767		q.drainTo(l, i);
768	<	int k = (i < SIZE)? i : SIZE;
769	<	assertEquals(q.size(), SIZE-k);
770	<	assertEquals(l.size(), k);
768	>	int k = (i < SIZE) ? i : SIZE;
769	>	assertEquals(SIZE-k, q.size());
770	>	assertEquals(k, l.size());
771		}
772		}
773
917	–
774		}

Diff Legend

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