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.20 by jsr166, Sat Nov 21 19:11:53 2009 UTC vs.
Revision 1.66 by jsr166, Tue Oct 6 00:03:55 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	+
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	>	main(suite(), args);
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
23	–	private static final int NOCAP = Integer.MAX_VALUE;
24	–
50		/** Sample Comparator */
51		static class MyReverseComparator implements Comparator {
52		public int compare(Object x, Object y) {
53	<	int i = ((Integer)x).intValue();
29	<	int j = ((Integer)y).intValue();
30	<	if (i < j) return 1;
31	<	if (i > j) return -1;
32	<	return 0;
53	>	return ((Comparable)y).compareTo(x);
54		}
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 54 | 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 62 | 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 72 | 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 81 | 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];
86	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
109	>	new PriorityBlockingQueue(elements);
110		shouldThrow();
111		} catch (NullPointerException success) {}
112		}
#	Line 92 | 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];
97	<	for (int i = 0; i < SIZE-1; ++i)
98	<	ints[i] = new Integer(i);
99	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
123	>	new PriorityBlockingQueue(elements);
124		shouldThrow();
125		} catch (NullPointerException success) {}
126		}
#	Line 107 | 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 124 | Line 148 | public class PriorityBlockingQueueTest e
148		for (int i = 0; i < SIZE; ++i)
149		ints[i] = new Integer(i);
150		q.addAll(Arrays.asList(ints));
151	<	for (int i = SIZE-1; i >= 0; --i)
151	>	for (int i = SIZE - 1; i >= 0; --i)
152		assertEquals(ints[i], q.poll());
153		}
154
#	Line 134 | 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 144 | Line 168 | public class PriorityBlockingQueueTest e
168		}
169
170		/**
171	<	* remainingCapacity does not change when elements added or removed,
148	<	* 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		/**
165	–	* offer(null) throws NPE
166	–	*/
167	–	public void testOfferNull() {
168	–	try {
169	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
170	–	q.offer(null);
171	–	shouldThrow();
172	–	} catch (NullPointerException success) {}
173	–	}
174	–
175	–	/**
176	–	* add(null) throws NPE
177	–	*/
178	–	public void testAddNull() {
179	–	try {
180	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
181	–	q.add(null);
182	–	shouldThrow();
183	–	} catch (NullPointerException success) {}
184	–	}
185	–
186	–	/**
188		* Offer of comparable element succeeds
189		*/
190		public void testOffer() {
#	Line 196 | 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 {
200	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
201	–	q.offer(new Object());
202		q.offer(new Object());
203		q.offer(new Object());
204		shouldThrow();
#	Line 217 | Line 217 | public class PriorityBlockingQueueTest e
217		}
218
219		/**
220	–	* addAll(null) throws NPE
221	–	*/
222	–	public void testAddAll1() {
223	–	try {
224	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
225	–	q.addAll(null);
226	–	shouldThrow();
227	–	} catch (NullPointerException success) {}
228	–	}
229	–
230	–	/**
220		* addAll(this) throws IAE
221		*/
222		public void testAddAllSelf() {
223	+	PriorityBlockingQueue q = populatedQueue(SIZE);
224		try {
235	–	PriorityBlockingQueue q = populatedQueue(SIZE);
225		q.addAll(q);
226		shouldThrow();
227		} catch (IllegalArgumentException success) {}
228		}
229
230		/**
242	–	* addAll of a collection with null elements throws NPE
243	–	*/
244	–	public void testAddAll2() {
245	–	try {
246	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
247	–	Integer[] ints = new Integer[SIZE];
248	–	q.addAll(Arrays.asList(ints));
249	–	shouldThrow();
250	–	} catch (NullPointerException success) {}
251	–	}
252	–	/**
231		* addAll of a collection with any null elements throws NPE after
232		* possibly adding some elements
233		*/
234		public void testAddAll3() {
235	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
236	+	Integer[] ints = new Integer[SIZE];
237	+	for (int i = 0; i < SIZE - 1; ++i)
238	+	ints[i] = new Integer(i);
239		try {
258	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
259	–	Integer[] ints = new Integer[SIZE];
260	–	for (int i = 0; i < SIZE-1; ++i)
261	–	ints[i] = new Integer(i);
240		q.addAll(Arrays.asList(ints));
241		shouldThrow();
242		} catch (NullPointerException success) {}
#	Line 270 | Line 248 | public class PriorityBlockingQueueTest e
248		public void testAddAll5() {
249		Integer[] empty = new Integer[0];
250		Integer[] ints = new Integer[SIZE];
251	<	for (int i = SIZE-1; i >= 0; --i)
251	>	for (int i = SIZE - 1; i >= 0; --i)
252		ints[i] = new Integer(i);
253		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
254		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 280 | Line 258 | public class PriorityBlockingQueueTest e
258		}
259
260		/**
283	–	* put(null) throws NPE
284	–	*/
285	–	public void testPutNull() {
286	–	try {
287	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
288	–	q.put(null);
289	–	shouldThrow();
290	–	} catch (NullPointerException success) {}
291	–	}
292	–
293	–	/**
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 309 | 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);
320	<	assertEquals(q.size(), size);
285	>	awaitTermination(t);
286	>	assertEquals(size, q.size());
287		q.take();
322	–	t.interrupt();
323	–	t.join();
288		}
289
290		/**
#	Line 328 | 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));
299	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
300	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
299	>	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
300	>	assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
301		}});
302
303	<	t.start();
340	<	Thread.sleep(SMALL_DELAY_MS);
341	<	t.interrupt();
342	<	t.join();
303	>	awaitTermination(t);
304		}
305
306		/**
#	Line 348 | Line 309 | public class PriorityBlockingQueueTest e
309		public void testTake() throws InterruptedException {
310		PriorityBlockingQueue q = populatedQueue(SIZE);
311		for (int i = 0; i < SIZE; ++i) {
312	<	assertEquals(i, ((Integer)q.take()).intValue());
312	>	assertEquals(i, q.take());
313		}
314		}
315
316		/**
356	–	* take blocks interruptibly when empty
357	–	*/
358	–	public void testTakeFromEmpty() throws InterruptedException {
359	–	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
360	–	Thread t = new Thread(new CheckedInterruptedRunnable() {
361	–	public void realRun() throws InterruptedException {
362	–	q.take();
363	–	}});
364	–
365	–	t.start();
366	–	Thread.sleep(SHORT_DELAY_MS);
367	–	t.interrupt();
368	–	t.join();
369	–	}
370	–
371	–	/**
317		* Take removes existing elements until empty, then blocks interruptibly
318		*/
319		public void testBlockingTake() throws InterruptedException {
320	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
320	>	final PriorityBlockingQueue q = populatedQueue(SIZE);
321	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
322	>	Thread t = newStartedThread(new CheckedRunnable() {
323		public void realRun() throws InterruptedException {
377	–	PriorityBlockingQueue q = populatedQueue(SIZE);
324		for (int i = 0; i < SIZE; ++i) {
325	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
325	>	assertEquals(i, q.take());
326		}
327	<	q.take();
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
390	–
349		/**
350		* poll succeeds unless empty
351		*/
352		public void testPoll() {
353		PriorityBlockingQueue q = populatedQueue(SIZE);
354		for (int i = 0; i < SIZE; ++i) {
355	<	assertEquals(i, ((Integer)q.poll()).intValue());
355	>	assertEquals(i, q.poll());
356		}
357		assertNull(q.poll());
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);
365		for (int i = 0; i < SIZE; ++i) {
366	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
366	>	assertEquals(i, q.poll(0, MILLISECONDS));
367		}
368		assertNull(q.poll(0, MILLISECONDS));
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, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
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 426 | 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 {
396	<	PriorityBlockingQueue q = populatedQueue(SIZE);
396	>	long startTime = System.nanoTime();
397		for (int i = 0; i < SIZE; ++i) {
398	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
398	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
399		}
400	<	try {
436	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
437	<	shouldThrow();
438	<	} catch (InterruptedException success) {}
439	<	}});
440	<
441	<	t.start();
442	<	Thread.sleep(SHORT_DELAY_MS);
443	<	t.interrupt();
444	<	t.join();
445	<	}
446	<
447	<	/**
448	<	*  timed poll before a delayed offer fails; after offer succeeds;
449	<	*  on interruption throws
450	<	*/
451	<	public void testTimedPollWithOffer() throws InterruptedException {
452	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
453	<	Thread t = new Thread(new CheckedRunnable() {
454	<	public void realRun() throws InterruptedException {
455	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
456	<	assertEquals(0, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
400	>	aboutToWait.countDown();
401		try {
402		q.poll(LONG_DELAY_MS, MILLISECONDS);
403	<	threadShouldThrow();
404	<	} catch (InterruptedException success) {}
403	>	shouldThrow();
404	>	} catch (InterruptedException success) {
405	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
406	>	}
407		}});
408
409	<	t.start();
410	<	Thread.sleep(SMALL_DELAY_MS);
465	<	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
409	>	aboutToWait.await();
410	>	waitForThreadToEnterWaitState(t, LONG_DELAY_MS);
411		t.interrupt();
412	<	t.join();
412	>	awaitTermination(t);
413		}
414
470	–
415		/**
416		* peek returns next element, or null if empty
417		*/
418		public void testPeek() {
419		PriorityBlockingQueue q = populatedQueue(SIZE);
420		for (int i = 0; i < SIZE; ++i) {
421	<	assertEquals(i, ((Integer)q.peek()).intValue());
422	<	q.poll();
421	>	assertEquals(i, q.peek());
422	>	assertEquals(i, q.poll());
423		assertTrue(q.peek() == null ||
424	<	i != ((Integer)q.peek()).intValue());
424	>	!q.peek().equals(i));
425		}
426		assertNull(q.peek());
427		}
#	Line 488 | Line 432 | public class PriorityBlockingQueueTest e
432		public void testElement() {
433		PriorityBlockingQueue q = populatedQueue(SIZE);
434		for (int i = 0; i < SIZE; ++i) {
435	<	assertEquals(i, ((Integer)q.element()).intValue());
436	<	q.poll();
435	>	assertEquals(i, q.element());
436	>	assertEquals(i, q.poll());
437		}
438		try {
439		q.element();
#	Line 503 | Line 447 | public class PriorityBlockingQueueTest e
447		public void testRemove() {
448		PriorityBlockingQueue q = populatedQueue(SIZE);
449		for (int i = 0; i < SIZE; ++i) {
450	<	assertEquals(i, ((Integer)q.remove()).intValue());
450	>	assertEquals(i, q.remove());
451		}
452		try {
453		q.remove();
#	Line 512 | Line 456 | public class PriorityBlockingQueueTest e
456		}
457
458		/**
515	–	* remove(x) removes x and returns true if present
516	–	*/
517	–	public void testRemoveElement() {
518	–	PriorityBlockingQueue q = populatedQueue(SIZE);
519	–	for (int i = 1; i < SIZE; i+=2) {
520	–	assertTrue(q.remove(new Integer(i)));
521	–	}
522	–	for (int i = 0; i < SIZE; i+=2) {
523	–	assertTrue(q.remove(new Integer(i)));
524	–	assertFalse(q.remove(new Integer(i+1)));
525	–	}
526	–	assertTrue(q.isEmpty());
527	–	}
528	–
529	–	/**
459		* contains(x) reports true when elements added but not yet removed
460		*/
461		public void testContains() {
#	Line 581 | Line 510 | public class PriorityBlockingQueueTest e
510		assertTrue(changed);
511
512		assertTrue(q.containsAll(p));
513	<	assertEquals(SIZE-i, q.size());
513	>	assertEquals(SIZE - i, q.size());
514		p.remove();
515		}
516		}
#	Line 594 | Line 523 | public class PriorityBlockingQueueTest e
523		PriorityBlockingQueue q = populatedQueue(SIZE);
524		PriorityBlockingQueue p = populatedQueue(i);
525		assertTrue(q.removeAll(p));
526	<	assertEquals(SIZE-i, q.size());
526	>	assertEquals(SIZE - i, q.size());
527		for (int j = 0; j < i; ++j) {
528	<	Integer I = (Integer)(p.remove());
529	<	assertFalse(q.contains(I));
528	>	Integer x = (Integer)(p.remove());
529	>	assertFalse(q.contains(x));
530		}
531		}
532		}
533
534		/**
535	<	*  toArray contains all elements
535	>	* toArray contains all elements
536		*/
537		public void testToArray() throws InterruptedException {
538		PriorityBlockingQueue q = populatedQueue(SIZE);
539		Object[] o = q.toArray();
540		Arrays.sort(o);
541		for (int i = 0; i < o.length; i++)
542	<	assertEquals(o[i], q.take());
542	>	assertSame(o[i], q.take());
543		}
544
545		/**
546		* toArray(a) contains all elements
547		*/
548		public void testToArray2() throws InterruptedException {
549	<	PriorityBlockingQueue q = populatedQueue(SIZE);
549	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
550		Integer[] ints = new Integer[SIZE];
551	<	ints = (Integer[])q.toArray(ints);
551	>	Integer[] array = q.toArray(ints);
552	>	assertSame(ints, array);
553		Arrays.sort(ints);
554		for (int i = 0; i < ints.length; i++)
555	<	assertEquals(ints[i], q.take());
626	<	}
627	<
628	<	/**
629	<	* toArray(null) throws NPE
630	<	*/
631	<	public void testToArray_BadArg() {
632	<	try {
633	<	PriorityBlockingQueue q = populatedQueue(SIZE);
634	<	Object o[] = q.toArray(null);
635	<	shouldThrow();
636	<	} catch (NullPointerException success) {}
555	>	assertSame(ints[i], q.take());
556		}
557
558		/**
559	<	* toArray with incompatible array type throws CCE
559	>	* toArray(incompatible array type) throws ArrayStoreException
560		*/
561		public void testToArray1_BadArg() {
562	+	PriorityBlockingQueue q = populatedQueue(SIZE);
563		try {
564	<	PriorityBlockingQueue q = populatedQueue(SIZE);
645	<	Object o[] = q.toArray(new String[10] );
564	>	q.toArray(new String[10]);
565		shouldThrow();
566		} catch (ArrayStoreException success) {}
567		}
#	Line 652 | Line 571 | public class PriorityBlockingQueueTest e
571		*/
572		public void testIterator() {
573		PriorityBlockingQueue q = populatedQueue(SIZE);
655	–	int i = 0;
574		Iterator it = q.iterator();
575	<	while (it.hasNext()) {
575	>	int i;
576	>	for (i = 0; it.hasNext(); i++)
577		assertTrue(q.contains(it.next()));
659	–	++i;
660	–	}
578		assertEquals(i, SIZE);
579	+	assertIteratorExhausted(it);
580	+	}
581	+
582	+	/**
583	+	* iterator of empty collection has no elements
584	+	*/
585	+	public void testEmptyIterator() {
586	+	assertIteratorExhausted(new PriorityBlockingQueue().iterator());
587		}
588
589		/**
590		* iterator.remove removes current element
591		*/
592	<	public void testIteratorRemove () {
592	>	public void testIteratorRemove() {
593		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
594		q.add(new Integer(2));
595		q.add(new Integer(1));
#	Line 680 | Line 605 | public class PriorityBlockingQueueTest e
605		assertFalse(it.hasNext());
606		}
607
683	–
608		/**
609		* toString contains toStrings of elements
610		*/
#	Line 688 | Line 612 | public class PriorityBlockingQueueTest e
612		PriorityBlockingQueue q = populatedQueue(SIZE);
613		String s = q.toString();
614		for (int i = 0; i < SIZE; ++i) {
615	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
615	>	assertTrue(s.contains(String.valueOf(i)));
616		}
617		}
618
619		/**
620	<	* offer transfers elements across Executor tasks
620	>	* timed poll transfers elements across Executor tasks
621		*/
622		public void testPollInExecutor() {
623		final PriorityBlockingQueue q = new PriorityBlockingQueue(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());
630	<	}});
631	<
632	<	executor.execute(new CheckedRunnable() {
633	<	public void realRun() throws InterruptedException {
634	<	Thread.sleep(SMALL_DELAY_MS);
635	<	q.put(new Integer(1));
636	<	}});
637	<
638	<	joinPool(executor);
624	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
625	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
626	>	try (PoolCleaner cleaner = cleaner(executor)) {
627	>	executor.execute(new CheckedRunnable() {
628	>	public void realRun() throws InterruptedException {
629	>	assertNull(q.poll());
630	>	threadsStarted.await();
631	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
632	>	checkEmpty(q);
633	>	}});
634	>
635	>	executor.execute(new CheckedRunnable() {
636	>	public void realRun() throws InterruptedException {
637	>	threadsStarted.await();
638	>	q.put(one);
639	>	}});
640	>	}
641		}
642
643		/**
644		* A deserialized serialized queue has same elements
645		*/
646		public void testSerialization() throws Exception {
647	<	PriorityBlockingQueue q = populatedQueue(SIZE);
648	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
723	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
724	<	out.writeObject(q);
725	<	out.close();
726	<
727	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
728	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
729	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
730	<	assertEquals(q.size(), r.size());
731	<	while (!q.isEmpty())
732	<	assertEquals(q.remove(), r.remove());
733	<	}
734	<
735	<	/**
736	<	* drainTo(null) throws NPE
737	<	*/
738	<	public void testDrainToNull() {
739	<	PriorityBlockingQueue q = populatedQueue(SIZE);
740	<	try {
741	<	q.drainTo(null);
742	<	shouldThrow();
743	<	} catch (NullPointerException success) {}
744	<	}
647	>	Queue x = populatedQueue(SIZE);
648	>	Queue y = serialClone(x);
649
650	<	/**
651	<	* drainTo(this) throws IAE
652	<	*/
653	<	public void testDrainToSelf() {
654	<	PriorityBlockingQueue q = populatedQueue(SIZE);
655	<	try {
656	<	q.drainTo(q);
753	<	shouldThrow();
754	<	} catch (IllegalArgumentException success) {}
650	>	assertNotSame(x, y);
651	>	assertEquals(x.size(), y.size());
652	>	while (!x.isEmpty()) {
653	>	assertFalse(y.isEmpty());
654	>	assertEquals(x.remove(), y.remove());
655	>	}
656	>	assertTrue(y.isEmpty());
657		}
658
659		/**
#	Line 761 | Line 663 | public class PriorityBlockingQueueTest e
663		PriorityBlockingQueue q = populatedQueue(SIZE);
664		ArrayList l = new ArrayList();
665		q.drainTo(l);
666	<	assertEquals(q.size(), 0);
667	<	assertEquals(l.size(), SIZE);
666	>	assertEquals(0, q.size());
667	>	assertEquals(SIZE, l.size());
668		for (int i = 0; i < SIZE; ++i)
669		assertEquals(l.get(i), new Integer(i));
670		q.add(zero);
#	Line 772 | Line 674 | public class PriorityBlockingQueueTest e
674		assertTrue(q.contains(one));
675		l.clear();
676		q.drainTo(l);
677	<	assertEquals(q.size(), 0);
678	<	assertEquals(l.size(), 2);
677	>	assertEquals(0, q.size());
678	>	assertEquals(2, l.size());
679		for (int i = 0; i < 2; ++i)
680		assertEquals(l.get(i), new Integer(i));
681		}
#	Line 785 | Line 687 | public class PriorityBlockingQueueTest e
687		final PriorityBlockingQueue q = populatedQueue(SIZE);
688		Thread t = new Thread(new CheckedRunnable() {
689		public void realRun() {
690	<	q.put(new Integer(SIZE+1));
690	>	q.put(new Integer(SIZE + 1));
691		}});
692
693		t.start();
#	Line 799 | Line 701 | public class PriorityBlockingQueueTest e
701		}
702
703		/**
704	<	* drainTo(null, n) throws NPE
803	<	*/
804	<	public void testDrainToNullN() {
805	<	PriorityBlockingQueue q = populatedQueue(SIZE);
806	<	try {
807	<	q.drainTo(null, 0);
808	<	shouldThrow();
809	<	} catch (NullPointerException success) {}
810	<	}
811	<
812	<	/**
813	<	* drainTo(this, n) throws IAE
814	<	*/
815	<	public void testDrainToSelfN() {
816	<	PriorityBlockingQueue q = populatedQueue(SIZE);
817	<	try {
818	<	q.drainTo(q, 0);
819	<	shouldThrow();
820	<	} catch (IllegalArgumentException success) {}
821	<	}
822	<
823	<	/**
824	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
704	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
705		*/
706		public void testDrainToN() {
707	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
707	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
708		for (int i = 0; i < SIZE + 2; ++i) {
709		for (int j = 0; j < SIZE; j++)
710		assertTrue(q.offer(new Integer(j)));
711		ArrayList l = new ArrayList();
712		q.drainTo(l, i);
713	<	int k = (i < SIZE)? i : SIZE;
714	<	assertEquals(l.size(), k);
715	<	assertEquals(q.size(), SIZE-k);
713	>	int k = (i < SIZE) ? i : SIZE;
714	>	assertEquals(k, l.size());
715	>	assertEquals(SIZE - k, q.size());
716		for (int j = 0; j < k; ++j)
717		assertEquals(l.get(j), new Integer(j));
718	<	while (q.poll() != null) ;
718	>	do {} while (q.poll() != null);
719	>	}
720	>	}
721	>
722	>	/**
723	>	* remove(null), contains(null) always return false
724	>	*/
725	>	public void testNeverContainsNull() {
726	>	Collection<?>[] qs = {
727	>	new PriorityBlockingQueue<Object>(),
728	>	populatedQueue(2),
729	>	};
730	>
731	>	for (Collection<?> q : qs) {
732	>	assertFalse(q.contains(null));
733	>	assertFalse(q.remove(null));
734		}
735		}
736

Diff Legend

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