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.44 by jsr166, Fri May 27 20:07:24 2011 UTC vs.
Revision 1.84 by jsr166, Thu Sep 5 21:11:13 2019 UTC

#	Line 6 | Line 6
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	>	import java.util.concurrent.ThreadLocalRandom;
24	>
25	>	import junit.framework.Test;
26
27		public class PriorityBlockingQueueTest extends JSR166TestCase {
28
#	Line 22 | Line 34 | public class PriorityBlockingQueueTest e
34
35		public static class InitialCapacity extends BlockingQueueTest {
36		protected BlockingQueue emptyCollection() {
37	<	return new PriorityBlockingQueue(20);
37	>	ThreadLocalRandom rnd = ThreadLocalRandom.current();
38	>	int initialCapacity = rnd.nextInt(1, SIZE);
39	>	return new PriorityBlockingQueue(initialCapacity);
40		}
41		}
42
43		public static void main(String[] args) {
44	<	junit.textui.TestRunner.run(suite());
44	>	main(suite(), args);
45		}
46
47		public static Test suite() {
48	<	return newTestSuite(PriorityBlockingQueueTest.class,
49	<	new Generic().testSuite(),
50	<	new InitialCapacity().testSuite());
48	>	class Implementation implements CollectionImplementation {
49	>	public Class<?> klazz() { return PriorityBlockingQueue.class; }
50	>	public Collection emptyCollection() {
51	>	return new PriorityBlockingQueue();
52	>	}
53	>	public Object makeElement(int i) { return i; }
54	>	public boolean isConcurrent() { return true; }
55	>	public boolean permitsNulls() { return false; }
56	>	}
57	>	class ComparatorImplementation implements CollectionImplementation {
58	>	public Class<?> klazz() { return PriorityBlockingQueue.class; }
59	>	public Collection emptyCollection() {
60	>	ThreadLocalRandom rnd = ThreadLocalRandom.current();
61	>	int initialCapacity = rnd.nextInt(1, 10);
62	>	return new PriorityBlockingQueue(
63	>	initialCapacity, new MyReverseComparator());
64	>	}
65	>	public Object makeElement(int i) { return i; }
66	>	public boolean isConcurrent() { return true; }
67	>	public boolean permitsNulls() { return false; }
68	>	}
69	>	return newTestSuite(
70	>	PriorityBlockingQueueTest.class,
71	>	new Generic().testSuite(),
72	>	new InitialCapacity().testSuite(),
73	>	CollectionTest.testSuite(new Implementation()),
74	>	CollectionTest.testSuite(new ComparatorImplementation()));
75		}
76
39	–	private static final int NOCAP = Integer.MAX_VALUE;
40	–
77		/** Sample Comparator */
78	<	static class MyReverseComparator implements Comparator {
78	>	static class MyReverseComparator implements Comparator, java.io.Serializable {
79		public int compare(Object x, Object y) {
80		return ((Comparable)y).compareTo(x);
81		}
82		}
83
84		/**
85	<	* Create a queue of given size containing consecutive
86	<	* Integers 0 ... n.
85	>	* Returns a new queue of given size containing consecutive
86	>	* Integers 0 ... n - 1.
87		*/
88	<	private PriorityBlockingQueue<Integer> populatedQueue(int n) {
88	>	private static PriorityBlockingQueue<Integer> populatedQueue(int n) {
89		PriorityBlockingQueue<Integer> q =
90		new PriorityBlockingQueue<Integer>(n);
91		assertTrue(q.isEmpty());
92	<	for (int i = n-1; i >= 0; i-=2)
92	>	for (int i = n - 1; i >= 0; i -= 2)
93		assertTrue(q.offer(new Integer(i)));
94	<	for (int i = (n & 1); i < n; i+=2)
94	>	for (int i = (n & 1); i < n; i += 2)
95		assertTrue(q.offer(new Integer(i)));
96		assertFalse(q.isEmpty());
97	<	assertEquals(NOCAP, q.remainingCapacity());
97	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
98		assertEquals(n, q.size());
99	+	assertEquals((Integer) 0, q.peek());
100		return q;
101		}
102
#	Line 67 | Line 104 | public class PriorityBlockingQueueTest e
104		* A new queue has unbounded capacity
105		*/
106		public void testConstructor1() {
107	<	assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
107	>	assertEquals(Integer.MAX_VALUE,
108	>	new PriorityBlockingQueue(SIZE).remainingCapacity());
109		}
110
111		/**
112	<	* Constructor throws IAE if capacity argument nonpositive
112	>	* Constructor throws IllegalArgumentException if capacity argument nonpositive
113		*/
114		public void testConstructor2() {
115		try {
116	<	PriorityBlockingQueue q = new PriorityBlockingQueue(0);
116	>	new PriorityBlockingQueue(0);
117		shouldThrow();
118		} catch (IllegalArgumentException success) {}
119		}
#	Line 85 | Line 123 | public class PriorityBlockingQueueTest e
123		*/
124		public void testConstructor3() {
125		try {
126	<	PriorityBlockingQueue q = new PriorityBlockingQueue(null);
126	>	new PriorityBlockingQueue(null);
127		shouldThrow();
128		} catch (NullPointerException success) {}
129		}
#	Line 94 | Line 132 | public class PriorityBlockingQueueTest e
132		* Initializing from Collection of null elements throws NPE
133		*/
134		public void testConstructor4() {
135	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
136		try {
137	<	Integer[] ints = new Integer[SIZE];
99	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
137	>	new PriorityBlockingQueue(elements);
138		shouldThrow();
139		} catch (NullPointerException success) {}
140		}
#	Line 105 | Line 143 | public class PriorityBlockingQueueTest e
143		* Initializing from Collection with some null elements throws NPE
144		*/
145		public void testConstructor5() {
146	+	Integer[] ints = new Integer[SIZE];
147	+	for (int i = 0; i < SIZE - 1; ++i)
148	+	ints[i] = i;
149	+	Collection<Integer> elements = Arrays.asList(ints);
150		try {
151	<	Integer[] ints = new Integer[SIZE];
110	<	for (int i = 0; i < SIZE-1; ++i)
111	<	ints[i] = new Integer(i);
112	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
151	>	new PriorityBlockingQueue(elements);
152		shouldThrow();
153		} catch (NullPointerException success) {}
154		}
#	Line 120 | Line 159 | public class PriorityBlockingQueueTest e
159		public void testConstructor6() {
160		Integer[] ints = new Integer[SIZE];
161		for (int i = 0; i < SIZE; ++i)
162	<	ints[i] = new Integer(i);
162	>	ints[i] = i;
163		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
164		for (int i = 0; i < SIZE; ++i)
165		assertEquals(ints[i], q.poll());
#	Line 137 | Line 176 | public class PriorityBlockingQueueTest e
176		for (int i = 0; i < SIZE; ++i)
177		ints[i] = new Integer(i);
178		q.addAll(Arrays.asList(ints));
179	<	for (int i = SIZE-1; i >= 0; --i)
179	>	for (int i = SIZE - 1; i >= 0; --i)
180		assertEquals(ints[i], q.poll());
181		}
182
#	Line 147 | Line 186 | public class PriorityBlockingQueueTest e
186		public void testEmpty() {
187		PriorityBlockingQueue q = new PriorityBlockingQueue(2);
188		assertTrue(q.isEmpty());
189	<	assertEquals(NOCAP, q.remainingCapacity());
189	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
190		q.add(one);
191		assertFalse(q.isEmpty());
192		q.add(two);
#	Line 157 | Line 196 | public class PriorityBlockingQueueTest e
196		}
197
198		/**
199	<	* remainingCapacity does not change when elements added or removed,
161	<	* but size does
199	>	* remainingCapacity() always returns Integer.MAX_VALUE
200		*/
201		public void testRemainingCapacity() {
202	<	PriorityBlockingQueue q = populatedQueue(SIZE);
202	>	BlockingQueue q = populatedQueue(SIZE);
203		for (int i = 0; i < SIZE; ++i) {
204	<	assertEquals(NOCAP, q.remainingCapacity());
205	<	assertEquals(SIZE-i, q.size());
206	<	q.remove();
204	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
205	>	assertEquals(SIZE - i, q.size());
206	>	assertEquals(i, q.remove());
207		}
208		for (int i = 0; i < SIZE; ++i) {
209	<	assertEquals(NOCAP, q.remainingCapacity());
209	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
210		assertEquals(i, q.size());
211	<	q.add(new Integer(i));
211	>	assertTrue(q.add(i));
212		}
213		}
214
215		/**
178	–	* offer(null) throws NPE
179	–	*/
180	–	public void testOfferNull() {
181	–	try {
182	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
183	–	q.offer(null);
184	–	shouldThrow();
185	–	} catch (NullPointerException success) {}
186	–	}
187	–
188	–	/**
189	–	* add(null) throws NPE
190	–	*/
191	–	public void testAddNull() {
192	–	try {
193	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
194	–	q.add(null);
195	–	shouldThrow();
196	–	} catch (NullPointerException success) {}
197	–	}
198	–
199	–	/**
216		* Offer of comparable element succeeds
217		*/
218		public void testOffer() {
#	Line 209 | Line 225 | public class PriorityBlockingQueueTest e
225		* Offer of non-Comparable throws CCE
226		*/
227		public void testOfferNonComparable() {
228	+	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
229		try {
213	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
214	–	q.offer(new Object());
215	–	q.offer(new Object());
230		q.offer(new Object());
231		shouldThrow();
232	<	} catch (ClassCastException success) {}
232	>	} catch (ClassCastException success) {
233	>	assertTrue(q.isEmpty());
234	>	assertEquals(0, q.size());
235	>	assertNull(q.poll());
236	>	}
237		}
238
239		/**
#	Line 230 | Line 248 | public class PriorityBlockingQueueTest e
248		}
249
250		/**
251	<	* addAll(null) throws NPE
234	<	*/
235	<	public void testAddAll1() {
236	<	try {
237	<	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
238	<	q.addAll(null);
239	<	shouldThrow();
240	<	} catch (NullPointerException success) {}
241	<	}
242	<
243	<	/**
244	<	* addAll(this) throws IAE
251	>	* addAll(this) throws IllegalArgumentException
252		*/
253		public void testAddAllSelf() {
254	+	PriorityBlockingQueue q = populatedQueue(SIZE);
255		try {
248	–	PriorityBlockingQueue q = populatedQueue(SIZE);
256		q.addAll(q);
257		shouldThrow();
258		} catch (IllegalArgumentException success) {}
259		}
260
261		/**
255	–	* addAll of a collection with null elements throws NPE
256	–	*/
257	–	public void testAddAll2() {
258	–	try {
259	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
260	–	Integer[] ints = new Integer[SIZE];
261	–	q.addAll(Arrays.asList(ints));
262	–	shouldThrow();
263	–	} catch (NullPointerException success) {}
264	–	}
265	–
266	–	/**
262		* addAll of a collection with any null elements throws NPE after
263		* possibly adding some elements
264		*/
265		public void testAddAll3() {
266	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
267	+	Integer[] ints = new Integer[SIZE];
268	+	for (int i = 0; i < SIZE - 1; ++i)
269	+	ints[i] = new Integer(i);
270		try {
272	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
273	–	Integer[] ints = new Integer[SIZE];
274	–	for (int i = 0; i < SIZE-1; ++i)
275	–	ints[i] = new Integer(i);
271		q.addAll(Arrays.asList(ints));
272		shouldThrow();
273		} catch (NullPointerException success) {}
#	Line 284 | Line 279 | public class PriorityBlockingQueueTest e
279		public void testAddAll5() {
280		Integer[] empty = new Integer[0];
281		Integer[] ints = new Integer[SIZE];
282	<	for (int i = SIZE-1; i >= 0; --i)
282	>	for (int i = SIZE - 1; i >= 0; --i)
283		ints[i] = new Integer(i);
284		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
285		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 294 | Line 289 | public class PriorityBlockingQueueTest e
289		}
290
291		/**
297	–	* put(null) throws NPE
298	–	*/
299	–	public void testPutNull() {
300	–	try {
301	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
302	–	q.put(null);
303	–	shouldThrow();
304	–	} catch (NullPointerException success) {}
305	–	}
306	–
307	–	/**
292		* all elements successfully put are contained
293		*/
294		public void testPut() {
295		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
296		for (int i = 0; i < SIZE; ++i) {
297	<	Integer I = new Integer(i);
298	<	q.put(I);
299	<	assertTrue(q.contains(I));
297	>	Integer x = new Integer(i);
298	>	q.put(x);
299	>	assertTrue(q.contains(x));
300		}
301		assertEquals(SIZE, q.size());
302		}
#	Line 335 | Line 319 | public class PriorityBlockingQueueTest e
319		}
320
321		/**
322	<	* timed offer does not time out
322	>	* Queue is unbounded, so timed offer never times out
323		*/
324	<	public void testTimedOffer() throws InterruptedException {
324	>	public void testTimedOffer() {
325		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
326		Thread t = newStartedThread(new CheckedRunnable() {
327		public void realRun() {
#	Line 368 | Line 352 | public class PriorityBlockingQueueTest e
352		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
353		Thread t = newStartedThread(new CheckedRunnable() {
354		public void realRun() throws InterruptedException {
355	<	for (int i = 0; i < SIZE; ++i) {
372	<	assertEquals(i, q.take());
373	<	}
355	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
356
357		Thread.currentThread().interrupt();
358		try {
#	Line 388 | Line 370 | public class PriorityBlockingQueueTest e
370		}});
371
372		await(pleaseInterrupt);
373	<	assertThreadStaysAlive(t);
373	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
374		t.interrupt();
375		awaitTermination(t);
376		}
#	Line 437 | Line 419 | public class PriorityBlockingQueueTest e
419		*/
420		public void testInterruptedTimedPoll() throws InterruptedException {
421		final BlockingQueue<Integer> q = populatedQueue(SIZE);
422	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
422	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
423		Thread t = newStartedThread(new CheckedRunnable() {
424		public void realRun() throws InterruptedException {
425	<	for (int i = 0; i < SIZE; ++i) {
444	<	long t0 = System.nanoTime();
425	>	for (int i = 0; i < SIZE; i++)
426		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
427	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
428	<	}
448	<	long t0 = System.nanoTime();
449	<	aboutToWait.countDown();
427	>
428	>	Thread.currentThread().interrupt();
429		try {
430	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
430	>	q.poll(randomTimeout(), randomTimeUnit());
431		shouldThrow();
432	<	} catch (InterruptedException success) {
433	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
434	<	}
432	>	} catch (InterruptedException success) {}
433	>	assertFalse(Thread.interrupted());
434	>
435	>	pleaseInterrupt.countDown();
436	>	try {
437	>	q.poll(LONGER_DELAY_MS, MILLISECONDS);
438	>	shouldThrow();
439	>	} catch (InterruptedException success) {}
440	>	assertFalse(Thread.interrupted());
441		}});
442
443	<	aboutToWait.await();
444	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
443	>	await(pleaseInterrupt);
444	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
445		t.interrupt();
446	<	awaitTermination(t, MEDIUM_DELAY_MS);
446	>	awaitTermination(t);
447		}
448
449		/**
#	Line 505 | Line 490 | public class PriorityBlockingQueueTest e
490		}
491
492		/**
508	–	* remove(x) removes x and returns true if present
509	–	*/
510	–	public void testRemoveElement() {
511	–	PriorityBlockingQueue q = populatedQueue(SIZE);
512	–	for (int i = 1; i < SIZE; i+=2) {
513	–	assertTrue(q.contains(i));
514	–	assertTrue(q.remove(i));
515	–	assertFalse(q.contains(i));
516	–	assertTrue(q.contains(i-1));
517	–	}
518	–	for (int i = 0; i < SIZE; i+=2) {
519	–	assertTrue(q.contains(i));
520	–	assertTrue(q.remove(i));
521	–	assertFalse(q.contains(i));
522	–	assertFalse(q.remove(i+1));
523	–	assertFalse(q.contains(i+1));
524	–	}
525	–	assertTrue(q.isEmpty());
526	–	}
527	–
528	–	/**
493		* contains(x) reports true when elements added but not yet removed
494		*/
495		public void testContains() {
#	Line 580 | Line 544 | public class PriorityBlockingQueueTest e
544		assertTrue(changed);
545
546		assertTrue(q.containsAll(p));
547	<	assertEquals(SIZE-i, q.size());
547	>	assertEquals(SIZE - i, q.size());
548		p.remove();
549		}
550		}
#	Line 593 | Line 557 | public class PriorityBlockingQueueTest e
557		PriorityBlockingQueue q = populatedQueue(SIZE);
558		PriorityBlockingQueue p = populatedQueue(i);
559		assertTrue(q.removeAll(p));
560	<	assertEquals(SIZE-i, q.size());
560	>	assertEquals(SIZE - i, q.size());
561		for (int j = 0; j < i; ++j) {
562	<	Integer I = (Integer)(p.remove());
563	<	assertFalse(q.contains(I));
562	>	Integer x = (Integer)(p.remove());
563	>	assertFalse(q.contains(x));
564		}
565		}
566		}
#	Line 606 | Line 570 | public class PriorityBlockingQueueTest e
570		*/
571		public void testToArray() throws InterruptedException {
572		PriorityBlockingQueue q = populatedQueue(SIZE);
573	<	Object[] o = q.toArray();
574	<	Arrays.sort(o);
575	<	for (int i = 0; i < o.length; i++)
576	<	assertSame(o[i], q.take());
573	>	Object[] a = q.toArray();
574	>	assertSame(Object[].class, a.getClass());
575	>	Arrays.sort(a);
576	>	for (Object o : a)
577	>	assertSame(o, q.take());
578	>	assertTrue(q.isEmpty());
579		}
580
581		/**
#	Line 621 | Line 587 | public class PriorityBlockingQueueTest e
587		Integer[] array = q.toArray(ints);
588		assertSame(ints, array);
589		Arrays.sort(ints);
590	<	for (int i = 0; i < ints.length; i++)
591	<	assertSame(ints[i], q.take());
592	<	}
627	<
628	<	/**
629	<	* toArray(null) throws NullPointerException
630	<	*/
631	<	public void testToArray_NullArg() {
632	<	PriorityBlockingQueue q = populatedQueue(SIZE);
633	<	try {
634	<	q.toArray(null);
635	<	shouldThrow();
636	<	} catch (NullPointerException success) {}
590	>	for (Integer o : ints)
591	>	assertSame(o, q.take());
592	>	assertTrue(q.isEmpty());
593		}
594
595		/**
#	Line 652 | Line 608 | public class PriorityBlockingQueueTest e
608		*/
609		public void testIterator() {
610		PriorityBlockingQueue q = populatedQueue(SIZE);
655	–	int i = 0;
611		Iterator it = q.iterator();
612	<	while (it.hasNext()) {
612	>	int i;
613	>	for (i = 0; it.hasNext(); i++)
614		assertTrue(q.contains(it.next()));
659	–	++i;
660	–	}
615		assertEquals(i, SIZE);
616	+	assertIteratorExhausted(it);
617	+	}
618	+
619	+	/**
620	+	* iterator of empty collection has no elements
621	+	*/
622	+	public void testEmptyIterator() {
623	+	assertIteratorExhausted(new PriorityBlockingQueue().iterator());
624		}
625
626		/**
#	Line 697 | Line 659 | public class PriorityBlockingQueueTest e
659		public void testPollInExecutor() {
660		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
661		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
662	<	ExecutorService executor = Executors.newFixedThreadPool(2);
663	<	executor.execute(new CheckedRunnable() {
664	<	public void realRun() throws InterruptedException {
665	<	assertNull(q.poll());
666	<	threadsStarted.await();
667	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
668	<	checkEmpty(q);
669	<	}});
670	<
671	<	executor.execute(new CheckedRunnable() {
672	<	public void realRun() throws InterruptedException {
673	<	threadsStarted.await();
674	<	q.put(one);
675	<	}});
676	<
677	<	joinPool(executor);
662	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
663	>	try (PoolCleaner cleaner = cleaner(executor)) {
664	>	executor.execute(new CheckedRunnable() {
665	>	public void realRun() throws InterruptedException {
666	>	assertNull(q.poll());
667	>	threadsStarted.await();
668	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
669	>	checkEmpty(q);
670	>	}});
671	>
672	>	executor.execute(new CheckedRunnable() {
673	>	public void realRun() throws InterruptedException {
674	>	threadsStarted.await();
675	>	q.put(one);
676	>	}});
677	>	}
678		}
679
680		/**
681	<	* A deserialized serialized queue has same elements
681	>	* A deserialized/reserialized queue has same elements
682		*/
683		public void testSerialization() throws Exception {
684	<	PriorityBlockingQueue q = populatedQueue(SIZE);
685	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
724	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
725	<	out.writeObject(q);
726	<	out.close();
727	<
728	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
729	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
730	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
731	<	assertEquals(q.size(), r.size());
732	<	while (!q.isEmpty())
733	<	assertEquals(q.remove(), r.remove());
734	<	}
684	>	Queue x = populatedQueue(SIZE);
685	>	Queue y = serialClone(x);
686
687	<	/**
688	<	* drainTo(null) throws NPE
689	<	*/
690	<	public void testDrainToNull() {
691	<	PriorityBlockingQueue q = populatedQueue(SIZE);
692	<	try {
693	<	q.drainTo(null);
743	<	shouldThrow();
744	<	} catch (NullPointerException success) {}
745	<	}
746	<
747	<	/**
748	<	* drainTo(this) throws IAE
749	<	*/
750	<	public void testDrainToSelf() {
751	<	PriorityBlockingQueue q = populatedQueue(SIZE);
752	<	try {
753	<	q.drainTo(q);
754	<	shouldThrow();
755	<	} catch (IllegalArgumentException success) {}
687	>	assertNotSame(x, y);
688	>	assertEquals(x.size(), y.size());
689	>	while (!x.isEmpty()) {
690	>	assertFalse(y.isEmpty());
691	>	assertEquals(x.remove(), y.remove());
692	>	}
693	>	assertTrue(y.isEmpty());
694		}
695
696		/**
#	Line 762 | Line 700 | public class PriorityBlockingQueueTest e
700		PriorityBlockingQueue q = populatedQueue(SIZE);
701		ArrayList l = new ArrayList();
702		q.drainTo(l);
703	<	assertEquals(q.size(), 0);
704	<	assertEquals(l.size(), SIZE);
703	>	assertEquals(0, q.size());
704	>	assertEquals(SIZE, l.size());
705		for (int i = 0; i < SIZE; ++i)
706		assertEquals(l.get(i), new Integer(i));
707		q.add(zero);
#	Line 773 | Line 711 | public class PriorityBlockingQueueTest e
711		assertTrue(q.contains(one));
712		l.clear();
713		q.drainTo(l);
714	<	assertEquals(q.size(), 0);
715	<	assertEquals(l.size(), 2);
714	>	assertEquals(0, q.size());
715	>	assertEquals(2, l.size());
716		for (int i = 0; i < 2; ++i)
717		assertEquals(l.get(i), new Integer(i));
718		}
#	Line 786 | Line 724 | public class PriorityBlockingQueueTest e
724		final PriorityBlockingQueue q = populatedQueue(SIZE);
725		Thread t = new Thread(new CheckedRunnable() {
726		public void realRun() {
727	<	q.put(new Integer(SIZE+1));
727	>	q.put(new Integer(SIZE + 1));
728		}});
729
730		t.start();
#	Line 800 | Line 738 | public class PriorityBlockingQueueTest e
738		}
739
740		/**
803	–	* drainTo(null, n) throws NPE
804	–	*/
805	–	public void testDrainToNullN() {
806	–	PriorityBlockingQueue q = populatedQueue(SIZE);
807	–	try {
808	–	q.drainTo(null, 0);
809	–	shouldThrow();
810	–	} catch (NullPointerException success) {}
811	–	}
812	–
813	–	/**
814	–	* drainTo(this, n) throws IAE
815	–	*/
816	–	public void testDrainToSelfN() {
817	–	PriorityBlockingQueue q = populatedQueue(SIZE);
818	–	try {
819	–	q.drainTo(q, 0);
820	–	shouldThrow();
821	–	} catch (IllegalArgumentException success) {}
822	–	}
823	–
824	–	/**
741		* drainTo(c, n) empties first min(n, size) elements of queue into c
742		*/
743		public void testDrainToN() {
744	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
744	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
745		for (int i = 0; i < SIZE + 2; ++i) {
746		for (int j = 0; j < SIZE; j++)
747		assertTrue(q.offer(new Integer(j)));
748		ArrayList l = new ArrayList();
749		q.drainTo(l, i);
750		int k = (i < SIZE) ? i : SIZE;
751	<	assertEquals(l.size(), k);
752	<	assertEquals(q.size(), SIZE-k);
751	>	assertEquals(k, l.size());
752	>	assertEquals(SIZE - k, q.size());
753		for (int j = 0; j < k; ++j)
754		assertEquals(l.get(j), new Integer(j));
755	<	while (q.poll() != null) ;
755	>	do {} while (q.poll() != null);
756	>	}
757	>	}
758	>
759	>	/**
760	>	* remove(null), contains(null) always return false
761	>	*/
762	>	public void testNeverContainsNull() {
763	>	Collection<?>[] qs = {
764	>	new PriorityBlockingQueue<Object>(),
765	>	populatedQueue(2),
766	>	};
767	>
768	>	for (Collection<?> q : qs) {
769	>	assertFalse(q.contains(null));
770	>	assertFalse(q.remove(null));
771		}
772		}
773

Diff Legend

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