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.35 by jsr166, Wed Nov 3 07:54:52 2010 UTC vs.
Revision 1.69 by jsr166, Sun Oct 16 20:44:18 2016 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
59	<	* Integers 0 ... n.
58	>	* Returns a new queue of given size containing consecutive
59	>	* Integers 0 ... n - 1.
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	+	assertEquals((Integer) 0, q.peek());
73		return q;
74		}
75
#	Line 66 | Line 77 | public class PriorityBlockingQueueTest e
77		* A new queue has unbounded capacity
78		*/
79		public void testConstructor1() {
80	<	assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
80	>	assertEquals(Integer.MAX_VALUE,
81	>	new PriorityBlockingQueue(SIZE).remainingCapacity());
82		}
83
84		/**
#	Line 74 | 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 84 | 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 93 | 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];
98	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
110	>	new PriorityBlockingQueue(elements);
111		shouldThrow();
112		} catch (NullPointerException success) {}
113		}
#	Line 104 | 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];
109	<	for (int i = 0; i < SIZE-1; ++i)
110	<	ints[i] = new Integer(i);
111	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
124	>	new PriorityBlockingQueue(elements);
125		shouldThrow();
126		} catch (NullPointerException success) {}
127		}
#	Line 119 | 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 136 | Line 149 | public class PriorityBlockingQueueTest e
149		for (int i = 0; i < SIZE; ++i)
150		ints[i] = new Integer(i);
151		q.addAll(Arrays.asList(ints));
152	<	for (int i = SIZE-1; i >= 0; --i)
152	>	for (int i = SIZE - 1; i >= 0; --i)
153		assertEquals(ints[i], q.poll());
154		}
155
#	Line 146 | Line 159 | public class PriorityBlockingQueueTest e
159		public void testEmpty() {
160		PriorityBlockingQueue q = new PriorityBlockingQueue(2);
161		assertTrue(q.isEmpty());
162	<	assertEquals(NOCAP, q.remainingCapacity());
162	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
163		q.add(one);
164		assertFalse(q.isEmpty());
165		q.add(two);
#	Line 156 | Line 169 | public class PriorityBlockingQueueTest e
169		}
170
171		/**
172	<	* remainingCapacity does not change when elements added or removed,
160	<	* but size does
172	>	* remainingCapacity() always returns Integer.MAX_VALUE
173		*/
174		public void testRemainingCapacity() {
175	<	PriorityBlockingQueue q = populatedQueue(SIZE);
175	>	BlockingQueue q = populatedQueue(SIZE);
176		for (int i = 0; i < SIZE; ++i) {
177	<	assertEquals(NOCAP, q.remainingCapacity());
178	<	assertEquals(SIZE-i, q.size());
179	<	q.remove();
177	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
178	>	assertEquals(SIZE - i, q.size());
179	>	assertEquals(i, q.remove());
180		}
181		for (int i = 0; i < SIZE; ++i) {
182	<	assertEquals(NOCAP, q.remainingCapacity());
182	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
183		assertEquals(i, q.size());
184	<	q.add(new Integer(i));
184	>	assertTrue(q.add(i));
185		}
186		}
187
188		/**
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	–	/**
189		* Offer of comparable element succeeds
190		*/
191		public void testOffer() {
#	Line 208 | Line 198 | public class PriorityBlockingQueueTest e
198		* Offer of non-Comparable throws CCE
199		*/
200		public void testOfferNonComparable() {
201	+	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
202		try {
212	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
213	–	q.offer(new Object());
214	–	q.offer(new Object());
203		q.offer(new Object());
204		shouldThrow();
205	<	} catch (ClassCastException success) {}
205	>	} catch (ClassCastException success) {
206	>	assertTrue(q.isEmpty());
207	>	assertEquals(0, q.size());
208	>	assertNull(q.poll());
209	>	}
210		}
211
212		/**
#	Line 229 | Line 221 | public class PriorityBlockingQueueTest e
221		}
222
223		/**
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	–	/**
224		* addAll(this) throws IAE
225		*/
226		public void testAddAllSelf() {
227	+	PriorityBlockingQueue q = populatedQueue(SIZE);
228		try {
247	–	PriorityBlockingQueue q = populatedQueue(SIZE);
229		q.addAll(q);
230		shouldThrow();
231		} catch (IllegalArgumentException success) {}
232		}
233
234		/**
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	–	/**
235		* addAll of a collection with any null elements throws NPE after
236		* possibly adding some elements
237		*/
238		public void testAddAll3() {
239	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
240	+	Integer[] ints = new Integer[SIZE];
241	+	for (int i = 0; i < SIZE - 1; ++i)
242	+	ints[i] = new Integer(i);
243		try {
271	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
272	–	Integer[] ints = new Integer[SIZE];
273	–	for (int i = 0; i < SIZE-1; ++i)
274	–	ints[i] = new Integer(i);
244		q.addAll(Arrays.asList(ints));
245		shouldThrow();
246		} catch (NullPointerException success) {}
#	Line 283 | Line 252 | public class PriorityBlockingQueueTest e
252		public void testAddAll5() {
253		Integer[] empty = new Integer[0];
254		Integer[] ints = new Integer[SIZE];
255	<	for (int i = SIZE-1; i >= 0; --i)
255	>	for (int i = SIZE - 1; i >= 0; --i)
256		ints[i] = new Integer(i);
257		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
258		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 293 | Line 262 | public class PriorityBlockingQueueTest e
262		}
263
264		/**
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	–	/**
265		* all elements successfully put are contained
266		*/
267	<	public void testPut() {
268	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
269	<	for (int i = 0; i < SIZE; ++i) {
270	<	Integer I = new Integer(i);
271	<	q.put(I);
272	<	assertTrue(q.contains(I));
273	<	}
274	<	assertEquals(SIZE, q.size());
267	>	public void testPut() {
268	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
269	>	for (int i = 0; i < SIZE; ++i) {
270	>	Integer x = new Integer(i);
271	>	q.put(x);
272	>	assertTrue(q.contains(x));
273	>	}
274	>	assertEquals(SIZE, q.size());
275		}
276
277		/**
#	Line 322 | Line 280 | public class PriorityBlockingQueueTest e
280		public void testPutWithTake() throws InterruptedException {
281		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
282		final int size = 4;
283	<	Thread t = new Thread(new CheckedRunnable() {
283	>	Thread t = newStartedThread(new CheckedRunnable() {
284		public void realRun() {
285		for (int i = 0; i < size; i++)
286		q.put(new Integer(0));
287		}});
288
289	<	t.start();
290	<	Thread.sleep(SHORT_DELAY_MS);
333	<	assertEquals(q.size(), size);
289	>	awaitTermination(t);
290	>	assertEquals(size, q.size());
291		q.take();
335	–	t.interrupt();
336	–	t.join();
292		}
293
294		/**
#	Line 341 | Line 296 | public class PriorityBlockingQueueTest e
296		*/
297		public void testTimedOffer() throws InterruptedException {
298		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
299	<	Thread t = new Thread(new CheckedRunnable() {
299	>	Thread t = newStartedThread(new CheckedRunnable() {
300		public void realRun() {
301		q.put(new Integer(0));
302		q.put(new Integer(0));
#	Line 349 | Line 304 | public class PriorityBlockingQueueTest e
304		assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
305		}});
306
307	<	t.start();
353	<	Thread.sleep(SMALL_DELAY_MS);
354	<	t.interrupt();
355	<	t.join();
307	>	awaitTermination(t);
308		}
309
310		/**
#	Line 370 | Line 322 | public class PriorityBlockingQueueTest e
322		*/
323		public void testBlockingTake() throws InterruptedException {
324		final PriorityBlockingQueue q = populatedQueue(SIZE);
325	<	Thread t = new Thread(new CheckedRunnable() {
325	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
326	>	Thread t = newStartedThread(new CheckedRunnable() {
327		public void realRun() throws InterruptedException {
328		for (int i = 0; i < SIZE; ++i) {
329		assertEquals(i, q.take());
330		}
331	+
332	+	Thread.currentThread().interrupt();
333		try {
334		q.take();
335		shouldThrow();
336		} catch (InterruptedException success) {}
337	+	assertFalse(Thread.interrupted());
338	+
339	+	pleaseInterrupt.countDown();
340	+	try {
341	+	q.take();
342	+	shouldThrow();
343	+	} catch (InterruptedException success) {}
344	+	assertFalse(Thread.interrupted());
345		}});
346
347	<	t.start();
348	<	Thread.sleep(SHORT_DELAY_MS);
347	>	await(pleaseInterrupt);
348	>	assertThreadStaysAlive(t);
349		t.interrupt();
350	<	t.join();
350	>	awaitTermination(t);
351		}
352
390	–
353		/**
354		* poll succeeds unless empty
355		*/
#	Line 414 | Line 376 | public class PriorityBlockingQueueTest e
376		* timed poll with nonzero timeout succeeds when non-empty, else times out
377		*/
378		public void testTimedPoll() throws InterruptedException {
379	<	PriorityBlockingQueue q = populatedQueue(SIZE);
379	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
380		for (int i = 0; i < SIZE; ++i) {
381	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
382	<	}
383	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
381	>	long startTime = System.nanoTime();
382	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
383	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
384	>	}
385	>	long startTime = System.nanoTime();
386	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
387	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
388	>	checkEmpty(q);
389		}
390
391		/**
#	Line 426 | Line 393 | public class PriorityBlockingQueueTest e
393		* returning timeout status
394		*/
395		public void testInterruptedTimedPoll() throws InterruptedException {
396	<	Thread t = new Thread(new CheckedRunnable() {
396	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
397	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
398	>	Thread t = newStartedThread(new CheckedRunnable() {
399		public void realRun() throws InterruptedException {
400	<	PriorityBlockingQueue q = populatedQueue(SIZE);
400	>	long startTime = System.nanoTime();
401		for (int i = 0; i < SIZE; ++i) {
402	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
402	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
403		}
404	+	aboutToWait.countDown();
405		try {
406	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
406	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
407		shouldThrow();
408	<	} catch (InterruptedException success) {}
408	>	} catch (InterruptedException success) {
409	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
410	>	}
411		}});
412
413	<	t.start();
414	<	Thread.sleep(SHORT_DELAY_MS);
413	>	aboutToWait.await();
414	>	waitForThreadToEnterWaitState(t);
415		t.interrupt();
416	<	t.join();
416	>	awaitTermination(t);
417		}
418
419		/**
#	Line 488 | Line 460 | public class PriorityBlockingQueueTest e
460		}
461
462		/**
491	–	* remove(x) removes x and returns true if present
492	–	*/
493	–	public void testRemoveElement() {
494	–	PriorityBlockingQueue q = populatedQueue(SIZE);
495	–	for (int i = 1; i < SIZE; i+=2) {
496	–	assertTrue(q.remove(new Integer(i)));
497	–	}
498	–	for (int i = 0; i < SIZE; i+=2) {
499	–	assertTrue(q.remove(new Integer(i)));
500	–	assertFalse(q.remove(new Integer(i+1)));
501	–	}
502	–	assertTrue(q.isEmpty());
503	–	}
504	–
505	–	/**
463		* contains(x) reports true when elements added but not yet removed
464		*/
465		public void testContains() {
#	Line 557 | Line 514 | public class PriorityBlockingQueueTest e
514		assertTrue(changed);
515
516		assertTrue(q.containsAll(p));
517	<	assertEquals(SIZE-i, q.size());
517	>	assertEquals(SIZE - i, q.size());
518		p.remove();
519		}
520		}
#	Line 570 | Line 527 | public class PriorityBlockingQueueTest e
527		PriorityBlockingQueue q = populatedQueue(SIZE);
528		PriorityBlockingQueue p = populatedQueue(i);
529		assertTrue(q.removeAll(p));
530	<	assertEquals(SIZE-i, q.size());
530	>	assertEquals(SIZE - i, q.size());
531		for (int j = 0; j < i; ++j) {
532	<	Integer I = (Integer)(p.remove());
533	<	assertFalse(q.contains(I));
532	>	Integer x = (Integer)(p.remove());
533	>	assertFalse(q.contains(x));
534		}
535		}
536		}
#	Line 586 | Line 543 | public class PriorityBlockingQueueTest e
543		Object[] o = q.toArray();
544		Arrays.sort(o);
545		for (int i = 0; i < o.length; i++)
546	<	assertEquals(o[i], q.take());
546	>	assertSame(o[i], q.take());
547		}
548
549		/**
550		* toArray(a) contains all elements
551		*/
552		public void testToArray2() throws InterruptedException {
553	<	PriorityBlockingQueue q = populatedQueue(SIZE);
553	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
554		Integer[] ints = new Integer[SIZE];
555	<	ints = (Integer[])q.toArray(ints);
555	>	Integer[] array = q.toArray(ints);
556	>	assertSame(ints, array);
557		Arrays.sort(ints);
558		for (int i = 0; i < ints.length; i++)
559	<	assertEquals(ints[i], q.take());
602	<	}
603	<
604	<	/**
605	<	* toArray(null) throws NPE
606	<	*/
607	<	public void testToArray_BadArg() {
608	<	PriorityBlockingQueue q = populatedQueue(SIZE);
609	<	try {
610	<	Object o[] = q.toArray(null);
611	<	shouldThrow();
612	<	} catch (NullPointerException success) {}
559	>	assertSame(ints[i], q.take());
560		}
561
562		/**
#	Line 628 | Line 575 | public class PriorityBlockingQueueTest e
575		*/
576		public void testIterator() {
577		PriorityBlockingQueue q = populatedQueue(SIZE);
631	–	int i = 0;
578		Iterator it = q.iterator();
579	<	while (it.hasNext()) {
579	>	int i;
580	>	for (i = 0; it.hasNext(); i++)
581		assertTrue(q.contains(it.next()));
635	–	++i;
636	–	}
582		assertEquals(i, SIZE);
583	+	assertIteratorExhausted(it);
584	+	}
585	+
586	+	/**
587	+	* iterator of empty collection has no elements
588	+	*/
589	+	public void testEmptyIterator() {
590	+	assertIteratorExhausted(new PriorityBlockingQueue().iterator());
591		}
592
593		/**
#	Line 656 | Line 609 | public class PriorityBlockingQueueTest e
609		assertFalse(it.hasNext());
610		}
611
659	–
612		/**
613		* toString contains toStrings of elements
614		*/
#	Line 664 | Line 616 | public class PriorityBlockingQueueTest e
616		PriorityBlockingQueue q = populatedQueue(SIZE);
617		String s = q.toString();
618		for (int i = 0; i < SIZE; ++i) {
619	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
619	>	assertTrue(s.contains(String.valueOf(i)));
620		}
621		}
622
623		/**
624	<	* offer transfers elements across Executor tasks
624	>	* timed poll transfers elements across Executor tasks
625		*/
626		public void testPollInExecutor() {
627		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
628	<	ExecutorService executor = Executors.newFixedThreadPool(2);
629	<	executor.execute(new CheckedRunnable() {
630	<	public void realRun() throws InterruptedException {
631	<	assertNull(q.poll());
632	<	assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
633	<	assertTrue(q.isEmpty());
634	<	}});
635	<
636	<	executor.execute(new CheckedRunnable() {
637	<	public void realRun() throws InterruptedException {
638	<	Thread.sleep(SMALL_DELAY_MS);
639	<	q.put(one);
640	<	}});
641	<
642	<	joinPool(executor);
628	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
629	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
630	>	try (PoolCleaner cleaner = cleaner(executor)) {
631	>	executor.execute(new CheckedRunnable() {
632	>	public void realRun() throws InterruptedException {
633	>	assertNull(q.poll());
634	>	threadsStarted.await();
635	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
636	>	checkEmpty(q);
637	>	}});
638	>
639	>	executor.execute(new CheckedRunnable() {
640	>	public void realRun() throws InterruptedException {
641	>	threadsStarted.await();
642	>	q.put(one);
643	>	}});
644	>	}
645		}
646
647		/**
648		* A deserialized serialized queue has same elements
649		*/
650		public void testSerialization() throws Exception {
651	<	PriorityBlockingQueue q = populatedQueue(SIZE);
652	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
699	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
700	<	out.writeObject(q);
701	<	out.close();
702	<
703	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
704	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
705	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
706	<	assertEquals(q.size(), r.size());
707	<	while (!q.isEmpty())
708	<	assertEquals(q.remove(), r.remove());
709	<	}
710	<
711	<	/**
712	<	* drainTo(null) throws NPE
713	<	*/
714	<	public void testDrainToNull() {
715	<	PriorityBlockingQueue q = populatedQueue(SIZE);
716	<	try {
717	<	q.drainTo(null);
718	<	shouldThrow();
719	<	} catch (NullPointerException success) {}
720	<	}
651	>	Queue x = populatedQueue(SIZE);
652	>	Queue y = serialClone(x);
653
654	<	/**
655	<	* drainTo(this) throws IAE
656	<	*/
657	<	public void testDrainToSelf() {
658	<	PriorityBlockingQueue q = populatedQueue(SIZE);
659	<	try {
660	<	q.drainTo(q);
729	<	shouldThrow();
730	<	} catch (IllegalArgumentException success) {}
654	>	assertNotSame(x, y);
655	>	assertEquals(x.size(), y.size());
656	>	while (!x.isEmpty()) {
657	>	assertFalse(y.isEmpty());
658	>	assertEquals(x.remove(), y.remove());
659	>	}
660	>	assertTrue(y.isEmpty());
661		}
662
663		/**
#	Line 737 | Line 667 | public class PriorityBlockingQueueTest e
667		PriorityBlockingQueue q = populatedQueue(SIZE);
668		ArrayList l = new ArrayList();
669		q.drainTo(l);
670	<	assertEquals(q.size(), 0);
671	<	assertEquals(l.size(), SIZE);
670	>	assertEquals(0, q.size());
671	>	assertEquals(SIZE, l.size());
672		for (int i = 0; i < SIZE; ++i)
673		assertEquals(l.get(i), new Integer(i));
674		q.add(zero);
#	Line 748 | Line 678 | public class PriorityBlockingQueueTest e
678		assertTrue(q.contains(one));
679		l.clear();
680		q.drainTo(l);
681	<	assertEquals(q.size(), 0);
682	<	assertEquals(l.size(), 2);
681	>	assertEquals(0, q.size());
682	>	assertEquals(2, l.size());
683		for (int i = 0; i < 2; ++i)
684		assertEquals(l.get(i), new Integer(i));
685		}
#	Line 761 | Line 691 | public class PriorityBlockingQueueTest e
691		final PriorityBlockingQueue q = populatedQueue(SIZE);
692		Thread t = new Thread(new CheckedRunnable() {
693		public void realRun() {
694	<	q.put(new Integer(SIZE+1));
694	>	q.put(new Integer(SIZE + 1));
695		}});
696
697		t.start();
#	Line 775 | Line 705 | public class PriorityBlockingQueueTest e
705		}
706
707		/**
778	–	* drainTo(null, n) throws NPE
779	–	*/
780	–	public void testDrainToNullN() {
781	–	PriorityBlockingQueue q = populatedQueue(SIZE);
782	–	try {
783	–	q.drainTo(null, 0);
784	–	shouldThrow();
785	–	} catch (NullPointerException success) {}
786	–	}
787	–
788	–	/**
789	–	* drainTo(this, n) throws IAE
790	–	*/
791	–	public void testDrainToSelfN() {
792	–	PriorityBlockingQueue q = populatedQueue(SIZE);
793	–	try {
794	–	q.drainTo(q, 0);
795	–	shouldThrow();
796	–	} catch (IllegalArgumentException success) {}
797	–	}
798	–
799	–	/**
708		* drainTo(c, n) empties first min(n, size) elements of queue into c
709		*/
710		public void testDrainToN() {
711	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
711	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
712		for (int i = 0; i < SIZE + 2; ++i) {
713		for (int j = 0; j < SIZE; j++)
714		assertTrue(q.offer(new Integer(j)));
715		ArrayList l = new ArrayList();
716		q.drainTo(l, i);
717		int k = (i < SIZE) ? i : SIZE;
718	<	assertEquals(l.size(), k);
719	<	assertEquals(q.size(), SIZE-k);
718	>	assertEquals(k, l.size());
719	>	assertEquals(SIZE - k, q.size());
720		for (int j = 0; j < k; ++j)
721		assertEquals(l.get(j), new Integer(j));
722	<	while (q.poll() != null) ;
722	>	do {} while (q.poll() != null);
723	>	}
724	>	}
725	>
726	>	/**
727	>	* remove(null), contains(null) always return false
728	>	*/
729	>	public void testNeverContainsNull() {
730	>	Collection<?>[] qs = {
731	>	new PriorityBlockingQueue<Object>(),
732	>	populatedQueue(2),
733	>	};
734	>
735	>	for (Collection<?> q : qs) {
736	>	assertFalse(q.contains(null));
737	>	assertFalse(q.remove(null));
738		}
739		}
740

Diff Legend

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