ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/PriorityBlockingQueueTest.java

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.24 by jsr166, Sun Nov 22 18:57:17 2009 UTC vs.
Revision 1.55 by jsr166, Wed Dec 31 19:21:20 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.*;
11	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.io.*;
10	>
11	>	import java.util.ArrayList;
12	>	import java.util.Arrays;
13	>	import java.util.Collection;
14	>	import java.util.Comparator;
15	>	import java.util.Iterator;
16	>	import java.util.NoSuchElementException;
17	>	import java.util.Queue;
18	>	import java.util.concurrent.BlockingQueue;
19	>	import java.util.concurrent.CountDownLatch;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.PriorityBlockingQueue;
23	>
24	>	import junit.framework.Test;
25
26		public class PriorityBlockingQueueTest extends JSR166TestCase {
27	+
28	+	public static class Generic extends BlockingQueueTest {
29	+	protected BlockingQueue emptyCollection() {
30	+	return new PriorityBlockingQueue();
31	+	}
32	+	}
33	+
34	+	public static class InitialCapacity extends BlockingQueueTest {
35	+	protected BlockingQueue emptyCollection() {
36	+	return new PriorityBlockingQueue(SIZE);
37	+	}
38	+	}
39	+
40		public static void main(String[] args) {
41	<	junit.textui.TestRunner.run (suite());
41	>	junit.textui.TestRunner.run(suite());
42		}
43	+
44		public static Test suite() {
45	<	return new TestSuite(PriorityBlockingQueueTest.class);
45	>	return newTestSuite(PriorityBlockingQueueTest.class,
46	>	new Generic().testSuite(),
47	>	new InitialCapacity().testSuite());
48		}
49
50		private static final int NOCAP = Integer.MAX_VALUE;
#	Line 30 | Line 57 | public class PriorityBlockingQueueTest e
57		}
58
59		/**
60	<	* Create a queue of given size containing consecutive
60	>	* Returns a new queue of given size containing consecutive
61		* Integers 0 ... n.
62		*/
63	<	private PriorityBlockingQueue populatedQueue(int n) {
64	<	PriorityBlockingQueue q = new PriorityBlockingQueue(n);
63	>	private PriorityBlockingQueue<Integer> populatedQueue(int n) {
64	>	PriorityBlockingQueue<Integer> q =
65	>	new PriorityBlockingQueue<Integer>(n);
66		assertTrue(q.isEmpty());
67		for (int i = n-1; i >= 0; i-=2)
68		assertTrue(q.offer(new Integer(i)));
#	Line 58 | Line 86 | public class PriorityBlockingQueueTest e
86		*/
87		public void testConstructor2() {
88		try {
89	<	PriorityBlockingQueue q = new PriorityBlockingQueue(0);
89	>	new PriorityBlockingQueue(0);
90		shouldThrow();
91		} catch (IllegalArgumentException success) {}
92		}
#	Line 68 | Line 96 | public class PriorityBlockingQueueTest e
96		*/
97		public void testConstructor3() {
98		try {
99	<	PriorityBlockingQueue q = new PriorityBlockingQueue(null);
99	>	new PriorityBlockingQueue(null);
100		shouldThrow();
101		} catch (NullPointerException success) {}
102		}
#	Line 77 | Line 105 | public class PriorityBlockingQueueTest e
105		* Initializing from Collection of null elements throws NPE
106		*/
107		public void testConstructor4() {
108	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
109		try {
110	<	Integer[] ints = new Integer[SIZE];
82	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
110	>	new PriorityBlockingQueue(elements);
111		shouldThrow();
112		} catch (NullPointerException success) {}
113		}
#	Line 88 | Line 116 | public class PriorityBlockingQueueTest e
116		* Initializing from Collection with some null elements throws NPE
117		*/
118		public void testConstructor5() {
119	+	Integer[] ints = new Integer[SIZE];
120	+	for (int i = 0; i < SIZE-1; ++i)
121	+	ints[i] = i;
122	+	Collection<Integer> elements = Arrays.asList(ints);
123		try {
124	<	Integer[] ints = new Integer[SIZE];
93	<	for (int i = 0; i < SIZE-1; ++i)
94	<	ints[i] = new Integer(i);
95	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
124	>	new PriorityBlockingQueue(elements);
125		shouldThrow();
126		} catch (NullPointerException success) {}
127		}
#	Line 103 | Line 132 | public class PriorityBlockingQueueTest e
132		public void testConstructor6() {
133		Integer[] ints = new Integer[SIZE];
134		for (int i = 0; i < SIZE; ++i)
135	<	ints[i] = new Integer(i);
135	>	ints[i] = i;
136		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
137		for (int i = 0; i < SIZE; ++i)
138		assertEquals(ints[i], q.poll());
#	Line 158 | Line 187 | public class PriorityBlockingQueueTest e
187		}
188
189		/**
161	–	* offer(null) throws NPE
162	–	*/
163	–	public void testOfferNull() {
164	–	try {
165	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
166	–	q.offer(null);
167	–	shouldThrow();
168	–	} catch (NullPointerException success) {}
169	–	}
170	–
171	–	/**
172	–	* add(null) throws NPE
173	–	*/
174	–	public void testAddNull() {
175	–	try {
176	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
177	–	q.add(null);
178	–	shouldThrow();
179	–	} catch (NullPointerException success) {}
180	–	}
181	–
182	–	/**
190		* Offer of comparable element succeeds
191		*/
192		public void testOffer() {
#	Line 213 | Line 220 | public class PriorityBlockingQueueTest e
220		}
221
222		/**
216	–	* addAll(null) throws NPE
217	–	*/
218	–	public void testAddAll1() {
219	–	try {
220	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
221	–	q.addAll(null);
222	–	shouldThrow();
223	–	} catch (NullPointerException success) {}
224	–	}
225	–
226	–	/**
223		* addAll(this) throws IAE
224		*/
225		public void testAddAllSelf() {
#	Line 235 | Line 231 | public class PriorityBlockingQueueTest e
231		}
232
233		/**
238	–	* addAll of a collection with null elements throws NPE
239	–	*/
240	–	public void testAddAll2() {
241	–	try {
242	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
243	–	Integer[] ints = new Integer[SIZE];
244	–	q.addAll(Arrays.asList(ints));
245	–	shouldThrow();
246	–	} catch (NullPointerException success) {}
247	–	}
248	–	/**
234		* addAll of a collection with any null elements throws NPE after
235		* possibly adding some elements
236		*/
#	Line 276 | Line 261 | public class PriorityBlockingQueueTest e
261		}
262
263		/**
279	–	* put(null) throws NPE
280	–	*/
281	–	public void testPutNull() {
282	–	try {
283	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
284	–	q.put(null);
285	–	shouldThrow();
286	–	} catch (NullPointerException success) {}
287	–	}
288	–
289	–	/**
264		* all elements successfully put are contained
265		*/
266	<	public void testPut() {
267	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
268	<	for (int i = 0; i < SIZE; ++i) {
269	<	Integer I = new Integer(i);
270	<	q.put(I);
271	<	assertTrue(q.contains(I));
272	<	}
273	<	assertEquals(SIZE, q.size());
266	>	public void testPut() {
267	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
268	>	for (int i = 0; i < SIZE; ++i) {
269	>	Integer I = new Integer(i);
270	>	q.put(I);
271	>	assertTrue(q.contains(I));
272	>	}
273	>	assertEquals(SIZE, q.size());
274		}
275
276		/**
#	Line 305 | Line 279 | public class PriorityBlockingQueueTest e
279		public void testPutWithTake() throws InterruptedException {
280		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
281		final int size = 4;
282	<	Thread t = new Thread(new CheckedRunnable() {
282	>	Thread t = newStartedThread(new CheckedRunnable() {
283		public void realRun() {
284		for (int i = 0; i < size; i++)
285		q.put(new Integer(0));
286		}});
287
288	<	t.start();
289	<	Thread.sleep(SHORT_DELAY_MS);
316	<	assertEquals(q.size(), size);
288	>	awaitTermination(t);
289	>	assertEquals(size, q.size());
290		q.take();
318	–	t.interrupt();
319	–	t.join();
291		}
292
293		/**
#	Line 324 | Line 295 | public class PriorityBlockingQueueTest e
295		*/
296		public void testTimedOffer() throws InterruptedException {
297		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
298	<	Thread t = new Thread(new CheckedRunnable() {
298	>	Thread t = newStartedThread(new CheckedRunnable() {
299		public void realRun() {
300		q.put(new Integer(0));
301		q.put(new Integer(0));
#	Line 332 | Line 303 | public class PriorityBlockingQueueTest e
303		assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
304		}});
305
306	<	t.start();
336	<	Thread.sleep(SMALL_DELAY_MS);
337	<	t.interrupt();
338	<	t.join();
306	>	awaitTermination(t);
307		}
308
309		/**
#	Line 349 | Line 317 | public class PriorityBlockingQueueTest e
317		}
318
319		/**
352	–	* take blocks interruptibly when empty
353	–	*/
354	–	public void testTakeFromEmpty() throws InterruptedException {
355	–	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
356	–	Thread t = new Thread(new CheckedInterruptedRunnable() {
357	–	public void realRun() throws InterruptedException {
358	–	q.take();
359	–	}});
360	–
361	–	t.start();
362	–	Thread.sleep(SHORT_DELAY_MS);
363	–	t.interrupt();
364	–	t.join();
365	–	}
366	–
367	–	/**
320		* Take removes existing elements until empty, then blocks interruptibly
321		*/
322		public void testBlockingTake() throws InterruptedException {
323		final PriorityBlockingQueue q = populatedQueue(SIZE);
324	<	Thread t = new Thread(new CheckedRunnable() {
324	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
325	>	Thread t = newStartedThread(new CheckedRunnable() {
326		public void realRun() throws InterruptedException {
327		for (int i = 0; i < SIZE; ++i) {
328		assertEquals(i, q.take());
329		}
330	+
331	+	Thread.currentThread().interrupt();
332	+	try {
333	+	q.take();
334	+	shouldThrow();
335	+	} catch (InterruptedException success) {}
336	+	assertFalse(Thread.interrupted());
337	+
338	+	pleaseInterrupt.countDown();
339		try {
340		q.take();
341		shouldThrow();
342		} catch (InterruptedException success) {}
343	+	assertFalse(Thread.interrupted());
344		}});
345
346	<	t.start();
347	<	Thread.sleep(SHORT_DELAY_MS);
346	>	await(pleaseInterrupt);
347	>	assertThreadStaysAlive(t);
348		t.interrupt();
349	<	t.join();
349	>	awaitTermination(t);
350		}
351
389	–
352		/**
353		* poll succeeds unless empty
354		*/
#	Line 399 | Line 361 | public class PriorityBlockingQueueTest e
361		}
362
363		/**
364	<	* timed pool with zero timeout succeeds when non-empty, else times out
364	>	* timed poll with zero timeout succeeds when non-empty, else times out
365		*/
366		public void testTimedPoll0() throws InterruptedException {
367		PriorityBlockingQueue q = populatedQueue(SIZE);
#	Line 410 | Line 372 | public class PriorityBlockingQueueTest e
372		}
373
374		/**
375	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
375	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
376		*/
377		public void testTimedPoll() throws InterruptedException {
378	<	PriorityBlockingQueue q = populatedQueue(SIZE);
378	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
379		for (int i = 0; i < SIZE; ++i) {
380	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
381	<	}
382	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
380	>	long startTime = System.nanoTime();
381	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
382	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
383	>	}
384	>	long startTime = System.nanoTime();
385	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
386	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
387	>	checkEmpty(q);
388		}
389
390		/**
#	Line 425 | Line 392 | public class PriorityBlockingQueueTest e
392		* returning timeout status
393		*/
394		public void testInterruptedTimedPoll() throws InterruptedException {
395	<	Thread t = new Thread(new CheckedRunnable() {
395	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
396	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
397	>	Thread t = newStartedThread(new CheckedRunnable() {
398		public void realRun() throws InterruptedException {
430	–	PriorityBlockingQueue q = populatedQueue(SIZE);
399		for (int i = 0; i < SIZE; ++i) {
400	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
400	>	long t0 = System.nanoTime();
401	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
402	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
403		}
404	<	try {
405	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
436	<	shouldThrow();
437	<	} catch (InterruptedException success) {}
438	<	}});
439	<
440	<	t.start();
441	<	Thread.sleep(SHORT_DELAY_MS);
442	<	t.interrupt();
443	<	t.join();
444	<	}
445	<
446	<	/**
447	<	*  timed poll before a delayed offer fails; after offer succeeds;
448	<	*  on interruption throws
449	<	*/
450	<	public void testTimedPollWithOffer() throws InterruptedException {
451	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
452	<	Thread t = new Thread(new CheckedRunnable() {
453	<	public void realRun() throws InterruptedException {
454	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
455	<	assertSame(zero, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
404	>	long t0 = System.nanoTime();
405	>	aboutToWait.countDown();
406		try {
407		q.poll(LONG_DELAY_MS, MILLISECONDS);
408		shouldThrow();
409	<	} catch (InterruptedException success) {}
409	>	} catch (InterruptedException success) {
410	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
411	>	}
412		}});
413
414	<	t.start();
415	<	Thread.sleep(SMALL_DELAY_MS);
464	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
414	>	aboutToWait.await();
415	>	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
416		t.interrupt();
417	<	t.join();
417	>	awaitTermination(t, MEDIUM_DELAY_MS);
418		}
419
469	–
420		/**
421		* peek returns next element, or null if empty
422		*/
#	Line 511 | Line 461 | public class PriorityBlockingQueueTest e
461		}
462
463		/**
514	–	* remove(x) removes x and returns true if present
515	–	*/
516	–	public void testRemoveElement() {
517	–	PriorityBlockingQueue q = populatedQueue(SIZE);
518	–	for (int i = 1; i < SIZE; i+=2) {
519	–	assertTrue(q.remove(new Integer(i)));
520	–	}
521	–	for (int i = 0; i < SIZE; i+=2) {
522	–	assertTrue(q.remove(new Integer(i)));
523	–	assertFalse(q.remove(new Integer(i+1)));
524	–	}
525	–	assertTrue(q.isEmpty());
526	–	}
527	–
528	–	/**
464		* contains(x) reports true when elements added but not yet removed
465		*/
466		public void testContains() {
#	Line 602 | Line 537 | public class PriorityBlockingQueueTest e
537		}
538
539		/**
540	<	*  toArray contains all elements
540	>	* toArray contains all elements
541		*/
542		public void testToArray() throws InterruptedException {
543		PriorityBlockingQueue q = populatedQueue(SIZE);
544		Object[] o = q.toArray();
545		Arrays.sort(o);
546		for (int i = 0; i < o.length; i++)
547	<	assertEquals(o[i], q.take());
547	>	assertSame(o[i], q.take());
548		}
549
550		/**
551		* toArray(a) contains all elements
552		*/
553		public void testToArray2() throws InterruptedException {
554	<	PriorityBlockingQueue q = populatedQueue(SIZE);
554	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
555		Integer[] ints = new Integer[SIZE];
556	<	ints = (Integer[])q.toArray(ints);
556	>	Integer[] array = q.toArray(ints);
557	>	assertSame(ints, array);
558		Arrays.sort(ints);
559		for (int i = 0; i < ints.length; i++)
560	<	assertEquals(ints[i], q.take());
625	<	}
626	<
627	<	/**
628	<	* toArray(null) throws NPE
629	<	*/
630	<	public void testToArray_BadArg() {
631	<	PriorityBlockingQueue q = populatedQueue(SIZE);
632	<	try {
633	<	Object o[] = q.toArray(null);
634	<	shouldThrow();
635	<	} catch (NullPointerException success) {}
560	>	assertSame(ints[i], q.take());
561		}
562
563		/**
564	<	* toArray with incompatible array type throws CCE
564	>	* toArray(incompatible array type) throws ArrayStoreException
565		*/
566		public void testToArray1_BadArg() {
567		PriorityBlockingQueue q = populatedQueue(SIZE);
568		try {
569	<	Object o[] = q.toArray(new String[10]);
569	>	q.toArray(new String[10]);
570		shouldThrow();
571		} catch (ArrayStoreException success) {}
572		}
#	Line 663 | Line 588 | public class PriorityBlockingQueueTest e
588		/**
589		* iterator.remove removes current element
590		*/
591	<	public void testIteratorRemove () {
591	>	public void testIteratorRemove() {
592		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
593		q.add(new Integer(2));
594		q.add(new Integer(1));
#	Line 679 | Line 604 | public class PriorityBlockingQueueTest e
604		assertFalse(it.hasNext());
605		}
606
682	–
607		/**
608		* toString contains toStrings of elements
609		*/
#	Line 687 | Line 611 | public class PriorityBlockingQueueTest e
611		PriorityBlockingQueue q = populatedQueue(SIZE);
612		String s = q.toString();
613		for (int i = 0; i < SIZE; ++i) {
614	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
614	>	assertTrue(s.contains(String.valueOf(i)));
615		}
616		}
617
618		/**
619	<	* offer transfers elements across Executor tasks
619	>	* timed poll transfers elements across Executor tasks
620		*/
621		public void testPollInExecutor() {
622		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
623	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
624		ExecutorService executor = Executors.newFixedThreadPool(2);
625		executor.execute(new CheckedRunnable() {
626		public void realRun() throws InterruptedException {
627	<	threadAssertNull(q.poll());
628	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
629	<	threadAssertTrue(q.isEmpty());
627	>	assertNull(q.poll());
628	>	threadsStarted.await();
629	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
630	>	checkEmpty(q);
631		}});
632
633		executor.execute(new CheckedRunnable() {
634		public void realRun() throws InterruptedException {
635	<	Thread.sleep(SMALL_DELAY_MS);
636	<	q.put(new Integer(1));
635	>	threadsStarted.await();
636	>	q.put(one);
637		}});
638
639		joinPool(executor);
#	Line 717 | Line 643 | public class PriorityBlockingQueueTest e
643		* A deserialized serialized queue has same elements
644		*/
645		public void testSerialization() throws Exception {
646	<	PriorityBlockingQueue q = populatedQueue(SIZE);
647	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
722	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
723	<	out.writeObject(q);
724	<	out.close();
725	<
726	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
727	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
728	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
729	<	assertEquals(q.size(), r.size());
730	<	while (!q.isEmpty())
731	<	assertEquals(q.remove(), r.remove());
732	<	}
733	<
734	<	/**
735	<	* drainTo(null) throws NPE
736	<	*/
737	<	public void testDrainToNull() {
738	<	PriorityBlockingQueue q = populatedQueue(SIZE);
739	<	try {
740	<	q.drainTo(null);
741	<	shouldThrow();
742	<	} catch (NullPointerException success) {}
743	<	}
646	>	Queue x = populatedQueue(SIZE);
647	>	Queue y = serialClone(x);
648
649	<	/**
650	<	* drainTo(this) throws IAE
651	<	*/
652	<	public void testDrainToSelf() {
653	<	PriorityBlockingQueue q = populatedQueue(SIZE);
654	<	try {
655	<	q.drainTo(q);
752	<	shouldThrow();
753	<	} catch (IllegalArgumentException success) {}
649	>	assertNotSame(x, y);
650	>	assertEquals(x.size(), y.size());
651	>	while (!x.isEmpty()) {
652	>	assertFalse(y.isEmpty());
653	>	assertEquals(x.remove(), y.remove());
654	>	}
655	>	assertTrue(y.isEmpty());
656		}
657
658		/**
#	Line 760 | Line 662 | public class PriorityBlockingQueueTest e
662		PriorityBlockingQueue q = populatedQueue(SIZE);
663		ArrayList l = new ArrayList();
664		q.drainTo(l);
665	<	assertEquals(q.size(), 0);
666	<	assertEquals(l.size(), SIZE);
665	>	assertEquals(0, q.size());
666	>	assertEquals(SIZE, l.size());
667		for (int i = 0; i < SIZE; ++i)
668		assertEquals(l.get(i), new Integer(i));
669		q.add(zero);
#	Line 771 | Line 673 | public class PriorityBlockingQueueTest e
673		assertTrue(q.contains(one));
674		l.clear();
675		q.drainTo(l);
676	<	assertEquals(q.size(), 0);
677	<	assertEquals(l.size(), 2);
676	>	assertEquals(0, q.size());
677	>	assertEquals(2, l.size());
678		for (int i = 0; i < 2; ++i)
679		assertEquals(l.get(i), new Integer(i));
680		}
#	Line 798 | Line 700 | public class PriorityBlockingQueueTest e
700		}
701
702		/**
703	<	* drainTo(null, n) throws NPE
802	<	*/
803	<	public void testDrainToNullN() {
804	<	PriorityBlockingQueue q = populatedQueue(SIZE);
805	<	try {
806	<	q.drainTo(null, 0);
807	<	shouldThrow();
808	<	} catch (NullPointerException success) {}
809	<	}
810	<
811	<	/**
812	<	* drainTo(this, n) throws IAE
813	<	*/
814	<	public void testDrainToSelfN() {
815	<	PriorityBlockingQueue q = populatedQueue(SIZE);
816	<	try {
817	<	q.drainTo(q, 0);
818	<	shouldThrow();
819	<	} catch (IllegalArgumentException success) {}
820	<	}
821	<
822	<	/**
823	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
703	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
704		*/
705		public void testDrainToN() {
706		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
#	Line 829 | Line 709 | public class PriorityBlockingQueueTest e
709		assertTrue(q.offer(new Integer(j)));
710		ArrayList l = new ArrayList();
711		q.drainTo(l, i);
712	<	int k = (i < SIZE)? i : SIZE;
713	<	assertEquals(l.size(), k);
714	<	assertEquals(q.size(), SIZE-k);
712	>	int k = (i < SIZE) ? i : SIZE;
713	>	assertEquals(k, l.size());
714	>	assertEquals(SIZE-k, q.size());
715		for (int j = 0; j < k; ++j)
716		assertEquals(l.get(j), new Integer(j));
717	<	while (q.poll() != null) ;
717	>	do {} while (q.poll() != null);
718	>	}
719	>	}
720	>
721	>	/**
722	>	* remove(null), contains(null) always return false
723	>	*/
724	>	public void testNeverContainsNull() {
725	>	Collection<?>[] qs = {
726	>	new PriorityBlockingQueue<Object>(),
727	>	populatedQueue(2),
728	>	};
729	>
730	>	for (Collection<?> q : qs) {
731	>	assertFalse(q.contains(null));
732	>	assertFalse(q.remove(null));
733		}
734		}
735

Diff Legend

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