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.32 by jsr166, Tue Oct 19 00:43:49 2010 UTC vs.
Revision 1.61 by jsr166, Sat Apr 25 04:55:31 2015 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
#	Line 22 | Line 33 | public class PriorityBlockingQueueTest e
33
34		public static class InitialCapacity extends BlockingQueueTest {
35		protected BlockingQueue emptyCollection() {
36	<	return new PriorityBlockingQueue(20);
36	>	return new PriorityBlockingQueue(SIZE);
37		}
38		}
39
40		public static void main(String[] args) {
41	<	junit.textui.TestRunner.run(suite());
41	>	main(suite(), args);
42		}
43
44		public static Test suite() {
#	Line 36 | Line 47 | public class PriorityBlockingQueueTest e
47		new InitialCapacity().testSuite());
48		}
49
39	–	private static final int NOCAP = Integer.MAX_VALUE;
40	–
50		/** Sample Comparator */
51		static class MyReverseComparator implements Comparator {
52		public int compare(Object x, Object y) {
#	Line 46 | Line 55 | public class PriorityBlockingQueueTest e
55		}
56
57		/**
58	<	* Create a queue of given size containing consecutive
58	>	* Returns a new queue of given size containing consecutive
59		* Integers 0 ... n.
60		*/
61	<	private PriorityBlockingQueue populatedQueue(int n) {
62	<	PriorityBlockingQueue q = new PriorityBlockingQueue(n);
61	>	private PriorityBlockingQueue<Integer> populatedQueue(int n) {
62	>	PriorityBlockingQueue<Integer> q =
63	>	new PriorityBlockingQueue<Integer>(n);
64		assertTrue(q.isEmpty());
65	<	for (int i = n-1; i >= 0; i-=2)
65	>	for (int i = n-1; i >= 0; i -= 2)
66		assertTrue(q.offer(new Integer(i)));
67	<	for (int i = (n & 1); i < n; i+=2)
67	>	for (int i = (n & 1); i < n; i += 2)
68		assertTrue(q.offer(new Integer(i)));
69		assertFalse(q.isEmpty());
70	<	assertEquals(NOCAP, q.remainingCapacity());
70	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
71		assertEquals(n, q.size());
72		return q;
73		}
#	Line 66 | Line 76 | public class PriorityBlockingQueueTest e
76		* A new queue has unbounded capacity
77		*/
78		public void testConstructor1() {
79	<	assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
79	>	assertEquals(Integer.MAX_VALUE,
80	>	new PriorityBlockingQueue(SIZE).remainingCapacity());
81		}
82
83		/**
#	Line 74 | Line 85 | public class PriorityBlockingQueueTest e
85		*/
86		public void testConstructor2() {
87		try {
88	<	PriorityBlockingQueue q = new PriorityBlockingQueue(0);
88	>	new PriorityBlockingQueue(0);
89		shouldThrow();
90		} catch (IllegalArgumentException success) {}
91		}
#	Line 84 | Line 95 | public class PriorityBlockingQueueTest e
95		*/
96		public void testConstructor3() {
97		try {
98	<	PriorityBlockingQueue q = new PriorityBlockingQueue(null);
98	>	new PriorityBlockingQueue(null);
99		shouldThrow();
100		} catch (NullPointerException success) {}
101		}
#	Line 93 | Line 104 | public class PriorityBlockingQueueTest e
104		* Initializing from Collection of null elements throws NPE
105		*/
106		public void testConstructor4() {
107	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
108		try {
109	<	Integer[] ints = new Integer[SIZE];
98	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
109	>	new PriorityBlockingQueue(elements);
110		shouldThrow();
111		} catch (NullPointerException success) {}
112		}
#	Line 104 | Line 115 | public class PriorityBlockingQueueTest e
115		* Initializing from Collection with some null elements throws NPE
116		*/
117		public void testConstructor5() {
118	+	Integer[] ints = new Integer[SIZE];
119	+	for (int i = 0; i < SIZE-1; ++i)
120	+	ints[i] = i;
121	+	Collection<Integer> elements = Arrays.asList(ints);
122		try {
123	<	Integer[] ints = new Integer[SIZE];
109	<	for (int i = 0; i < SIZE-1; ++i)
110	<	ints[i] = new Integer(i);
111	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
123	>	new PriorityBlockingQueue(elements);
124		shouldThrow();
125		} catch (NullPointerException success) {}
126		}
#	Line 119 | Line 131 | public class PriorityBlockingQueueTest e
131		public void testConstructor6() {
132		Integer[] ints = new Integer[SIZE];
133		for (int i = 0; i < SIZE; ++i)
134	<	ints[i] = new Integer(i);
134	>	ints[i] = i;
135		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
136		for (int i = 0; i < SIZE; ++i)
137		assertEquals(ints[i], q.poll());
#	Line 146 | Line 158 | public class PriorityBlockingQueueTest e
158		public void testEmpty() {
159		PriorityBlockingQueue q = new PriorityBlockingQueue(2);
160		assertTrue(q.isEmpty());
161	<	assertEquals(NOCAP, q.remainingCapacity());
161	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
162		q.add(one);
163		assertFalse(q.isEmpty());
164		q.add(two);
#	Line 156 | Line 168 | public class PriorityBlockingQueueTest e
168		}
169
170		/**
171	<	* remainingCapacity does not change when elements added or removed,
160	<	* but size does
171	>	* remainingCapacity() always returns Integer.MAX_VALUE
172		*/
173		public void testRemainingCapacity() {
174	<	PriorityBlockingQueue q = populatedQueue(SIZE);
174	>	BlockingQueue q = populatedQueue(SIZE);
175		for (int i = 0; i < SIZE; ++i) {
176	<	assertEquals(NOCAP, q.remainingCapacity());
177	<	assertEquals(SIZE-i, q.size());
178	<	q.remove();
176	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
177	>	assertEquals(SIZE - i, q.size());
178	>	assertEquals(i, q.remove());
179		}
180		for (int i = 0; i < SIZE; ++i) {
181	<	assertEquals(NOCAP, q.remainingCapacity());
181	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
182		assertEquals(i, q.size());
183	<	q.add(new Integer(i));
183	>	assertTrue(q.add(i));
184		}
185		}
186
187		/**
177	–	* offer(null) throws NPE
178	–	*/
179	–	public void testOfferNull() {
180	–	try {
181	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
182	–	q.offer(null);
183	–	shouldThrow();
184	–	} catch (NullPointerException success) {}
185	–	}
186	–
187	–	/**
188	–	* add(null) throws NPE
189	–	*/
190	–	public void testAddNull() {
191	–	try {
192	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
193	–	q.add(null);
194	–	shouldThrow();
195	–	} catch (NullPointerException success) {}
196	–	}
197	–
198	–	/**
188		* Offer of comparable element succeeds
189		*/
190		public void testOffer() {
#	Line 208 | Line 197 | public class PriorityBlockingQueueTest e
197		* Offer of non-Comparable throws CCE
198		*/
199		public void testOfferNonComparable() {
200	+	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
201		try {
212	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
213	–	q.offer(new Object());
202		q.offer(new Object());
203		q.offer(new Object());
204		shouldThrow();
#	Line 229 | Line 217 | public class PriorityBlockingQueueTest e
217		}
218
219		/**
232	–	* addAll(null) throws NPE
233	–	*/
234	–	public void testAddAll1() {
235	–	try {
236	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
237	–	q.addAll(null);
238	–	shouldThrow();
239	–	} catch (NullPointerException success) {}
240	–	}
241	–
242	–	/**
220		* addAll(this) throws IAE
221		*/
222		public void testAddAllSelf() {
#	Line 251 | Line 228 | public class PriorityBlockingQueueTest e
228		}
229
230		/**
254	–	* addAll of a collection with null elements throws NPE
255	–	*/
256	–	public void testAddAll2() {
257	–	try {
258	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
259	–	Integer[] ints = new Integer[SIZE];
260	–	q.addAll(Arrays.asList(ints));
261	–	shouldThrow();
262	–	} catch (NullPointerException success) {}
263	–	}
264	–
265	–	/**
231		* addAll of a collection with any null elements throws NPE after
232		* possibly adding some elements
233		*/
#	Line 293 | Line 258 | public class PriorityBlockingQueueTest e
258		}
259
260		/**
296	–	* put(null) throws NPE
297	–	*/
298	–	public void testPutNull() {
299	–	try {
300	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
301	–	q.put(null);
302	–	shouldThrow();
303	–	} catch (NullPointerException success) {}
304	–	}
305	–
306	–	/**
261		* all elements successfully put are contained
262		*/
263	<	public void testPut() {
264	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
265	<	for (int i = 0; i < SIZE; ++i) {
266	<	Integer I = new Integer(i);
267	<	q.put(I);
268	<	assertTrue(q.contains(I));
269	<	}
270	<	assertEquals(SIZE, q.size());
263	>	public void testPut() {
264	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
265	>	for (int i = 0; i < SIZE; ++i) {
266	>	Integer x = new Integer(i);
267	>	q.put(x);
268	>	assertTrue(q.contains(x));
269	>	}
270	>	assertEquals(SIZE, q.size());
271		}
272
273		/**
#	Line 322 | Line 276 | public class PriorityBlockingQueueTest e
276		public void testPutWithTake() throws InterruptedException {
277		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
278		final int size = 4;
279	<	Thread t = new Thread(new CheckedRunnable() {
279	>	Thread t = newStartedThread(new CheckedRunnable() {
280		public void realRun() {
281		for (int i = 0; i < size; i++)
282		q.put(new Integer(0));
283		}});
284
285	<	t.start();
286	<	Thread.sleep(SHORT_DELAY_MS);
333	<	assertEquals(q.size(), size);
285	>	awaitTermination(t);
286	>	assertEquals(size, q.size());
287		q.take();
335	–	t.interrupt();
336	–	t.join();
288		}
289
290		/**
#	Line 341 | Line 292 | public class PriorityBlockingQueueTest e
292		*/
293		public void testTimedOffer() throws InterruptedException {
294		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
295	<	Thread t = new Thread(new CheckedRunnable() {
295	>	Thread t = newStartedThread(new CheckedRunnable() {
296		public void realRun() {
297		q.put(new Integer(0));
298		q.put(new Integer(0));
#	Line 349 | Line 300 | public class PriorityBlockingQueueTest e
300		assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
301		}});
302
303	<	t.start();
353	<	Thread.sleep(SMALL_DELAY_MS);
354	<	t.interrupt();
355	<	t.join();
303	>	awaitTermination(t);
304		}
305
306		/**
#	Line 366 | Line 314 | public class PriorityBlockingQueueTest e
314		}
315
316		/**
369	–	* take blocks interruptibly when empty
370	–	*/
371	–	public void testTakeFromEmpty() throws InterruptedException {
372	–	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
373	–	Thread t = new Thread(new CheckedInterruptedRunnable() {
374	–	public void realRun() throws InterruptedException {
375	–	q.take();
376	–	}});
377	–
378	–	t.start();
379	–	Thread.sleep(SHORT_DELAY_MS);
380	–	t.interrupt();
381	–	t.join();
382	–	}
383	–
384	–	/**
317		* Take removes existing elements until empty, then blocks interruptibly
318		*/
319		public void testBlockingTake() throws InterruptedException {
320		final PriorityBlockingQueue q = populatedQueue(SIZE);
321	<	Thread t = new Thread(new CheckedRunnable() {
321	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
322	>	Thread t = newStartedThread(new CheckedRunnable() {
323		public void realRun() throws InterruptedException {
324		for (int i = 0; i < SIZE; ++i) {
325		assertEquals(i, q.take());
326		}
327	+
328	+	Thread.currentThread().interrupt();
329		try {
330		q.take();
331		shouldThrow();
332		} catch (InterruptedException success) {}
333	+	assertFalse(Thread.interrupted());
334	+
335	+	pleaseInterrupt.countDown();
336	+	try {
337	+	q.take();
338	+	shouldThrow();
339	+	} catch (InterruptedException success) {}
340	+	assertFalse(Thread.interrupted());
341		}});
342
343	<	t.start();
344	<	Thread.sleep(SHORT_DELAY_MS);
343	>	await(pleaseInterrupt);
344	>	assertThreadStaysAlive(t);
345		t.interrupt();
346	<	t.join();
346	>	awaitTermination(t);
347		}
348
406	–
349		/**
350		* poll succeeds unless empty
351		*/
#	Line 416 | Line 358 | public class PriorityBlockingQueueTest e
358		}
359
360		/**
361	<	* timed pool with zero timeout succeeds when non-empty, else times out
361	>	* timed poll with zero timeout succeeds when non-empty, else times out
362		*/
363		public void testTimedPoll0() throws InterruptedException {
364		PriorityBlockingQueue q = populatedQueue(SIZE);
#	Line 427 | Line 369 | public class PriorityBlockingQueueTest e
369		}
370
371		/**
372	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
372	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
373		*/
374		public void testTimedPoll() throws InterruptedException {
375	<	PriorityBlockingQueue q = populatedQueue(SIZE);
375	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
376		for (int i = 0; i < SIZE; ++i) {
377	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
378	<	}
379	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
377	>	long startTime = System.nanoTime();
378	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
379	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
380	>	}
381	>	long startTime = System.nanoTime();
382	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
383	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
384	>	checkEmpty(q);
385		}
386
387		/**
#	Line 442 | Line 389 | public class PriorityBlockingQueueTest e
389		* returning timeout status
390		*/
391		public void testInterruptedTimedPoll() throws InterruptedException {
392	<	Thread t = new Thread(new CheckedRunnable() {
392	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
393	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
394	>	Thread t = newStartedThread(new CheckedRunnable() {
395		public void realRun() throws InterruptedException {
447	–	PriorityBlockingQueue q = populatedQueue(SIZE);
396		for (int i = 0; i < SIZE; ++i) {
397	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
397	>	long t0 = System.nanoTime();
398	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
399	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
400		}
401	+	long t0 = System.nanoTime();
402	+	aboutToWait.countDown();
403		try {
404	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
404	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
405		shouldThrow();
406	<	} catch (InterruptedException success) {}
406	>	} catch (InterruptedException success) {
407	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
408	>	}
409		}});
410
411	<	t.start();
412	<	Thread.sleep(SHORT_DELAY_MS);
411	>	aboutToWait.await();
412	>	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
413		t.interrupt();
414	<	t.join();
414	>	awaitTermination(t, MEDIUM_DELAY_MS);
415		}
416
417		/**
#	Line 504 | Line 458 | public class PriorityBlockingQueueTest e
458		}
459
460		/**
507	–	* remove(x) removes x and returns true if present
508	–	*/
509	–	public void testRemoveElement() {
510	–	PriorityBlockingQueue q = populatedQueue(SIZE);
511	–	for (int i = 1; i < SIZE; i+=2) {
512	–	assertTrue(q.remove(new Integer(i)));
513	–	}
514	–	for (int i = 0; i < SIZE; i+=2) {
515	–	assertTrue(q.remove(new Integer(i)));
516	–	assertFalse(q.remove(new Integer(i+1)));
517	–	}
518	–	assertTrue(q.isEmpty());
519	–	}
520	–
521	–	/**
461		* contains(x) reports true when elements added but not yet removed
462		*/
463		public void testContains() {
#	Line 588 | Line 527 | public class PriorityBlockingQueueTest e
527		assertTrue(q.removeAll(p));
528		assertEquals(SIZE-i, q.size());
529		for (int j = 0; j < i; ++j) {
530	<	Integer I = (Integer)(p.remove());
531	<	assertFalse(q.contains(I));
530	>	Integer x = (Integer)(p.remove());
531	>	assertFalse(q.contains(x));
532		}
533		}
534		}
#	Line 602 | Line 541 | public class PriorityBlockingQueueTest e
541		Object[] o = q.toArray();
542		Arrays.sort(o);
543		for (int i = 0; i < o.length; i++)
544	<	assertEquals(o[i], q.take());
544	>	assertSame(o[i], q.take());
545		}
546
547		/**
548		* toArray(a) contains all elements
549		*/
550		public void testToArray2() throws InterruptedException {
551	<	PriorityBlockingQueue q = populatedQueue(SIZE);
551	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
552		Integer[] ints = new Integer[SIZE];
553	<	ints = (Integer[])q.toArray(ints);
553	>	Integer[] array = q.toArray(ints);
554	>	assertSame(ints, array);
555		Arrays.sort(ints);
556		for (int i = 0; i < ints.length; i++)
557	<	assertEquals(ints[i], q.take());
618	<	}
619	<
620	<	/**
621	<	* toArray(null) throws NPE
622	<	*/
623	<	public void testToArray_BadArg() {
624	<	PriorityBlockingQueue q = populatedQueue(SIZE);
625	<	try {
626	<	Object o[] = q.toArray(null);
627	<	shouldThrow();
628	<	} catch (NullPointerException success) {}
557	>	assertSame(ints[i], q.take());
558		}
559
560		/**
561	<	* toArray with incompatible array type throws CCE
561	>	* toArray(incompatible array type) throws ArrayStoreException
562		*/
563		public void testToArray1_BadArg() {
564		PriorityBlockingQueue q = populatedQueue(SIZE);
565		try {
566	<	Object o[] = q.toArray(new String[10]);
566	>	q.toArray(new String[10]);
567		shouldThrow();
568		} catch (ArrayStoreException success) {}
569		}
#	Line 644 | Line 573 | public class PriorityBlockingQueueTest e
573		*/
574		public void testIterator() {
575		PriorityBlockingQueue q = populatedQueue(SIZE);
647	–	int i = 0;
576		Iterator it = q.iterator();
577	<	while (it.hasNext()) {
577	>	int i;
578	>	for (i = 0; it.hasNext(); i++)
579		assertTrue(q.contains(it.next()));
651	–	++i;
652	–	}
580		assertEquals(i, SIZE);
581	+	assertIteratorExhausted(it);
582	+	}
583	+
584	+	/**
585	+	* iterator of empty collection has no elements
586	+	*/
587	+	public void testEmptyIterator() {
588	+	assertIteratorExhausted(new PriorityBlockingQueue().iterator());
589		}
590
591		/**
#	Line 672 | Line 607 | public class PriorityBlockingQueueTest e
607		assertFalse(it.hasNext());
608		}
609
675	–
610		/**
611		* toString contains toStrings of elements
612		*/
#	Line 680 | Line 614 | public class PriorityBlockingQueueTest e
614		PriorityBlockingQueue q = populatedQueue(SIZE);
615		String s = q.toString();
616		for (int i = 0; i < SIZE; ++i) {
617	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
617	>	assertTrue(s.contains(String.valueOf(i)));
618		}
619		}
620
621		/**
622	<	* offer transfers elements across Executor tasks
622	>	* timed poll transfers elements across Executor tasks
623		*/
624		public void testPollInExecutor() {
625		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
626	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
627		ExecutorService executor = Executors.newFixedThreadPool(2);
628		executor.execute(new CheckedRunnable() {
629		public void realRun() throws InterruptedException {
630		assertNull(q.poll());
631	<	assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
632	<	assertTrue(q.isEmpty());
631	>	threadsStarted.await();
632	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
633	>	checkEmpty(q);
634		}});
635
636		executor.execute(new CheckedRunnable() {
637		public void realRun() throws InterruptedException {
638	<	Thread.sleep(SMALL_DELAY_MS);
638	>	threadsStarted.await();
639		q.put(one);
640		}});
641
#	Line 710 | Line 646 | public class PriorityBlockingQueueTest e
646		* A deserialized serialized queue has same elements
647		*/
648		public void testSerialization() throws Exception {
649	<	PriorityBlockingQueue q = populatedQueue(SIZE);
650	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
715	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
716	<	out.writeObject(q);
717	<	out.close();
718	<
719	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
720	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
721	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
722	<	assertEquals(q.size(), r.size());
723	<	while (!q.isEmpty())
724	<	assertEquals(q.remove(), r.remove());
725	<	}
649	>	Queue x = populatedQueue(SIZE);
650	>	Queue y = serialClone(x);
651
652	<	/**
653	<	* drainTo(null) throws NPE
654	<	*/
655	<	public void testDrainToNull() {
656	<	PriorityBlockingQueue q = populatedQueue(SIZE);
657	<	try {
658	<	q.drainTo(null);
734	<	shouldThrow();
735	<	} catch (NullPointerException success) {}
736	<	}
737	<
738	<	/**
739	<	* drainTo(this) throws IAE
740	<	*/
741	<	public void testDrainToSelf() {
742	<	PriorityBlockingQueue q = populatedQueue(SIZE);
743	<	try {
744	<	q.drainTo(q);
745	<	shouldThrow();
746	<	} catch (IllegalArgumentException success) {}
652	>	assertNotSame(x, y);
653	>	assertEquals(x.size(), y.size());
654	>	while (!x.isEmpty()) {
655	>	assertFalse(y.isEmpty());
656	>	assertEquals(x.remove(), y.remove());
657	>	}
658	>	assertTrue(y.isEmpty());
659		}
660
661		/**
#	Line 753 | Line 665 | public class PriorityBlockingQueueTest e
665		PriorityBlockingQueue q = populatedQueue(SIZE);
666		ArrayList l = new ArrayList();
667		q.drainTo(l);
668	<	assertEquals(q.size(), 0);
669	<	assertEquals(l.size(), SIZE);
668	>	assertEquals(0, q.size());
669	>	assertEquals(SIZE, l.size());
670		for (int i = 0; i < SIZE; ++i)
671		assertEquals(l.get(i), new Integer(i));
672		q.add(zero);
#	Line 764 | Line 676 | public class PriorityBlockingQueueTest e
676		assertTrue(q.contains(one));
677		l.clear();
678		q.drainTo(l);
679	<	assertEquals(q.size(), 0);
680	<	assertEquals(l.size(), 2);
679	>	assertEquals(0, q.size());
680	>	assertEquals(2, l.size());
681		for (int i = 0; i < 2; ++i)
682		assertEquals(l.get(i), new Integer(i));
683		}
#	Line 791 | Line 703 | public class PriorityBlockingQueueTest e
703		}
704
705		/**
794	–	* drainTo(null, n) throws NPE
795	–	*/
796	–	public void testDrainToNullN() {
797	–	PriorityBlockingQueue q = populatedQueue(SIZE);
798	–	try {
799	–	q.drainTo(null, 0);
800	–	shouldThrow();
801	–	} catch (NullPointerException success) {}
802	–	}
803	–
804	–	/**
805	–	* drainTo(this, n) throws IAE
806	–	*/
807	–	public void testDrainToSelfN() {
808	–	PriorityBlockingQueue q = populatedQueue(SIZE);
809	–	try {
810	–	q.drainTo(q, 0);
811	–	shouldThrow();
812	–	} catch (IllegalArgumentException success) {}
813	–	}
814	–
815	–	/**
706		* drainTo(c, n) empties first min(n, size) elements of queue into c
707		*/
708		public void testDrainToN() {
#	Line 823 | Line 713 | public class PriorityBlockingQueueTest e
713		ArrayList l = new ArrayList();
714		q.drainTo(l, i);
715		int k = (i < SIZE) ? i : SIZE;
716	<	assertEquals(l.size(), k);
717	<	assertEquals(q.size(), SIZE-k);
716	>	assertEquals(k, l.size());
717	>	assertEquals(SIZE-k, q.size());
718		for (int j = 0; j < k; ++j)
719		assertEquals(l.get(j), new Integer(j));
720	<	while (q.poll() != null) ;
720	>	do {} while (q.poll() != null);
721	>	}
722	>	}
723	>
724	>	/**
725	>	* remove(null), contains(null) always return false
726	>	*/
727	>	public void testNeverContainsNull() {
728	>	Collection<?>[] qs = {
729	>	new PriorityBlockingQueue<Object>(),
730	>	populatedQueue(2),
731	>	};
732	>
733	>	for (Collection<?> q : qs) {
734	>	assertFalse(q.contains(null));
735	>	assertFalse(q.remove(null));
736		}
737		}
738

Diff Legend

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