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.18 by jsr166, Sat Nov 21 09:28:16 2009 UTC vs.
Revision 1.67 by jsr166, Wed Jun 1 16:08:04 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	+
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		/**
84	<	* Constructor throws IAE if  capacity argument nonpositive
84	>	* Constructor throws IAE if capacity argument nonpositive
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());
202		q.offer(new Object());
203		shouldThrow();
204	<	} catch (ClassCastException success) {}
204	>	} catch (ClassCastException success) {
205	>	assertTrue(q.isEmpty());
206	>	assertEquals(0, q.size());
207	>	assertNull(q.poll());
208	>	}
209		}
210
211		/**
#	Line 217 | Line 220 | public class PriorityBlockingQueueTest e
220		}
221
222		/**
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	–	/**
223		* addAll(this) throws IAE
224		*/
225		public void testAddAllSelf() {
226	+	PriorityBlockingQueue q = populatedQueue(SIZE);
227		try {
235	–	PriorityBlockingQueue q = populatedQueue(SIZE);
228		q.addAll(q);
229		shouldThrow();
230		} catch (IllegalArgumentException success) {}
231		}
232
233		/**
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	–	/**
234		* addAll of a collection with any null elements throws NPE after
235		* possibly adding some elements
236		*/
237		public void testAddAll3() {
238	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
239	+	Integer[] ints = new Integer[SIZE];
240	+	for (int i = 0; i < SIZE - 1; ++i)
241	+	ints[i] = new Integer(i);
242		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);
243		q.addAll(Arrays.asList(ints));
244		shouldThrow();
245		} catch (NullPointerException success) {}
#	Line 270 | Line 251 | public class PriorityBlockingQueueTest e
251		public void testAddAll5() {
252		Integer[] empty = new Integer[0];
253		Integer[] ints = new Integer[SIZE];
254	<	for (int i = SIZE-1; i >= 0; --i)
254	>	for (int i = SIZE - 1; i >= 0; --i)
255		ints[i] = new Integer(i);
256		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
257		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 280 | Line 261 | public class PriorityBlockingQueueTest e
261		}
262
263		/**
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	–	/**
264		* all elements successfully put are contained
265		*/
266	<	public void testPut() {
267	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
268	<	for (int i = 0; i < SIZE; ++i) {
269	<	Integer I = new Integer(i);
270	<	q.put(I);
271	<	assertTrue(q.contains(I));
272	<	}
273	<	assertEquals(SIZE, q.size());
266	>	public void testPut() {
267	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
268	>	for (int i = 0; i < SIZE; ++i) {
269	>	Integer x = new Integer(i);
270	>	q.put(x);
271	>	assertTrue(q.contains(x));
272	>	}
273	>	assertEquals(SIZE, q.size());
274		}
275
276		/**
#	Line 309 | Line 279 | public class PriorityBlockingQueueTest e
279		public void testPutWithTake() throws InterruptedException {
280		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
281		final int size = 4;
282	<	Thread t = new Thread(new CheckedRunnable() {
282	>	Thread t = newStartedThread(new CheckedRunnable() {
283		public void realRun() {
284		for (int i = 0; i < size; i++)
285		q.put(new Integer(0));
286		}});
287
288	<	t.start();
289	<	Thread.sleep(SHORT_DELAY_MS);
320	<	assertEquals(q.size(), size);
288	>	awaitTermination(t);
289	>	assertEquals(size, q.size());
290		q.take();
322	–	t.interrupt();
323	–	t.join();
291		}
292
293		/**
#	Line 328 | Line 295 | public class PriorityBlockingQueueTest e
295		*/
296		public void testTimedOffer() throws InterruptedException {
297		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
298	<	Thread t = new Thread(new CheckedRunnable() {
298	>	Thread t = newStartedThread(new CheckedRunnable() {
299		public void realRun() {
300		q.put(new Integer(0));
301		q.put(new Integer(0));
302	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
303	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
302	>	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
303	>	assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
304		}});
305
306	<	t.start();
340	<	Thread.sleep(SMALL_DELAY_MS);
341	<	t.interrupt();
342	<	t.join();
306	>	awaitTermination(t);
307		}
308
309		/**
#	Line 348 | Line 312 | public class PriorityBlockingQueueTest e
312		public void testTake() throws InterruptedException {
313		PriorityBlockingQueue q = populatedQueue(SIZE);
314		for (int i = 0; i < SIZE; ++i) {
315	<	assertEquals(i, ((Integer)q.take()).intValue());
315	>	assertEquals(i, q.take());
316		}
317		}
318
319		/**
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	–	/**
320		* Take removes existing elements until empty, then blocks interruptibly
321		*/
322		public void testBlockingTake() throws InterruptedException {
323	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
323	>	final PriorityBlockingQueue q = populatedQueue(SIZE);
324	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
325	>	Thread t = newStartedThread(new CheckedRunnable() {
326		public void realRun() throws InterruptedException {
377	–	PriorityBlockingQueue q = populatedQueue(SIZE);
327		for (int i = 0; i < SIZE; ++i) {
328	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
328	>	assertEquals(i, q.take());
329		}
330	<	q.take();
330	>
331	>	Thread.currentThread().interrupt();
332	>	try {
333	>	q.take();
334	>	shouldThrow();
335	>	} catch (InterruptedException success) {}
336	>	assertFalse(Thread.interrupted());
337	>
338	>	pleaseInterrupt.countDown();
339	>	try {
340	>	q.take();
341	>	shouldThrow();
342	>	} catch (InterruptedException success) {}
343	>	assertFalse(Thread.interrupted());
344		}});
345
346	<	t.start();
347	<	Thread.sleep(SHORT_DELAY_MS);
346	>	await(pleaseInterrupt);
347	>	assertThreadStaysAlive(t);
348		t.interrupt();
349	<	t.join();
349	>	awaitTermination(t);
350		}
351
390	–
352		/**
353		* poll succeeds unless empty
354		*/
355		public void testPoll() {
356		PriorityBlockingQueue q = populatedQueue(SIZE);
357		for (int i = 0; i < SIZE; ++i) {
358	<	assertEquals(i, ((Integer)q.poll()).intValue());
358	>	assertEquals(i, q.poll());
359		}
360		assertNull(q.poll());
361		}
362
363		/**
364	<	* timed pool with zero timeout succeeds when non-empty, else times out
364	>	* timed poll with zero timeout succeeds when non-empty, else times out
365		*/
366		public void testTimedPoll0() throws InterruptedException {
367		PriorityBlockingQueue q = populatedQueue(SIZE);
368		for (int i = 0; i < SIZE; ++i) {
369	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
369	>	assertEquals(i, q.poll(0, MILLISECONDS));
370		}
371		assertNull(q.poll(0, MILLISECONDS));
372		}
373
374		/**
375	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
375	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
376		*/
377		public void testTimedPoll() throws InterruptedException {
378	<	PriorityBlockingQueue q = populatedQueue(SIZE);
378	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
379		for (int i = 0; i < SIZE; ++i) {
380	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
381	<	}
382	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
380	>	long startTime = System.nanoTime();
381	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
382	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
383	>	}
384	>	long startTime = System.nanoTime();
385	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
386	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
387	>	checkEmpty(q);
388		}
389
390		/**
#	Line 426 | Line 392 | public class PriorityBlockingQueueTest e
392		* returning timeout status
393		*/
394		public void testInterruptedTimedPoll() throws InterruptedException {
395	<	Thread t = new Thread(new CheckedRunnable() {
395	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
396	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
397	>	Thread t = newStartedThread(new CheckedRunnable() {
398		public void realRun() throws InterruptedException {
399	<	PriorityBlockingQueue q = populatedQueue(SIZE);
399	>	long startTime = System.nanoTime();
400		for (int i = 0; i < SIZE; ++i) {
401	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
401	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
402		}
403	+	aboutToWait.countDown();
404		try {
405		q.poll(LONG_DELAY_MS, MILLISECONDS);
406		shouldThrow();
407	<	} catch (InterruptedException success) {}
408	<	}});
409	<
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));
457	<	try {
458	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
459	<	threadShouldThrow();
460	<	} catch (InterruptedException success) {}
407	>	} catch (InterruptedException success) {
408	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
409	>	}
410		}});
411
412	<	t.start();
413	<	Thread.sleep(SMALL_DELAY_MS);
465	<	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
412	>	aboutToWait.await();
413	>	waitForThreadToEnterWaitState(t, LONG_DELAY_MS);
414		t.interrupt();
415	<	t.join();
415	>	awaitTermination(t);
416		}
417
470	–
418		/**
419		* peek returns next element, or null if empty
420		*/
421		public void testPeek() {
422		PriorityBlockingQueue q = populatedQueue(SIZE);
423		for (int i = 0; i < SIZE; ++i) {
424	<	assertEquals(i, ((Integer)q.peek()).intValue());
425	<	q.poll();
424	>	assertEquals(i, q.peek());
425	>	assertEquals(i, q.poll());
426		assertTrue(q.peek() == null ||
427	<	i != ((Integer)q.peek()).intValue());
427	>	!q.peek().equals(i));
428		}
429		assertNull(q.peek());
430		}
#	Line 488 | Line 435 | public class PriorityBlockingQueueTest e
435		public void testElement() {
436		PriorityBlockingQueue q = populatedQueue(SIZE);
437		for (int i = 0; i < SIZE; ++i) {
438	<	assertEquals(i, ((Integer)q.element()).intValue());
439	<	q.poll();
438	>	assertEquals(i, q.element());
439	>	assertEquals(i, q.poll());
440		}
441		try {
442		q.element();
#	Line 503 | Line 450 | public class PriorityBlockingQueueTest e
450		public void testRemove() {
451		PriorityBlockingQueue q = populatedQueue(SIZE);
452		for (int i = 0; i < SIZE; ++i) {
453	<	assertEquals(i, ((Integer)q.remove()).intValue());
453	>	assertEquals(i, q.remove());
454		}
455		try {
456		q.remove();
#	Line 512 | Line 459 | public class PriorityBlockingQueueTest e
459		}
460
461		/**
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	–	/**
462		* contains(x) reports true when elements added but not yet removed
463		*/
464		public void testContains() {
#	Line 581 | Line 513 | public class PriorityBlockingQueueTest e
513		assertTrue(changed);
514
515		assertTrue(q.containsAll(p));
516	<	assertEquals(SIZE-i, q.size());
516	>	assertEquals(SIZE - i, q.size());
517		p.remove();
518		}
519		}
#	Line 594 | Line 526 | public class PriorityBlockingQueueTest e
526		PriorityBlockingQueue q = populatedQueue(SIZE);
527		PriorityBlockingQueue p = populatedQueue(i);
528		assertTrue(q.removeAll(p));
529	<	assertEquals(SIZE-i, q.size());
529	>	assertEquals(SIZE - i, q.size());
530		for (int j = 0; j < i; ++j) {
531	<	Integer I = (Integer)(p.remove());
532	<	assertFalse(q.contains(I));
531	>	Integer x = (Integer)(p.remove());
532	>	assertFalse(q.contains(x));
533		}
534		}
535		}
536
537		/**
538	<	*  toArray contains all elements
538	>	* toArray contains all elements
539		*/
540		public void testToArray() throws InterruptedException {
541		PriorityBlockingQueue q = populatedQueue(SIZE);
542		Object[] o = q.toArray();
543		Arrays.sort(o);
544		for (int i = 0; i < o.length; i++)
545	<	assertEquals(o[i], q.take());
545	>	assertSame(o[i], q.take());
546		}
547
548		/**
549		* toArray(a) contains all elements
550		*/
551		public void testToArray2() throws InterruptedException {
552	<	PriorityBlockingQueue q = populatedQueue(SIZE);
552	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
553		Integer[] ints = new Integer[SIZE];
554	<	ints = (Integer[])q.toArray(ints);
554	>	Integer[] array = q.toArray(ints);
555	>	assertSame(ints, array);
556		Arrays.sort(ints);
557		for (int i = 0; i < ints.length; i++)
558	<	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) {}
558	>	assertSame(ints[i], q.take());
559		}
560
561		/**
562	<	* toArray with incompatible array type throws CCE
562	>	* toArray(incompatible array type) throws ArrayStoreException
563		*/
564		public void testToArray1_BadArg() {
565	+	PriorityBlockingQueue q = populatedQueue(SIZE);
566		try {
567	<	PriorityBlockingQueue q = populatedQueue(SIZE);
645	<	Object o[] = q.toArray(new String[10] );
567	>	q.toArray(new String[10]);
568		shouldThrow();
569	<	} catch (ArrayStoreException  success) {}
569	>	} catch (ArrayStoreException success) {}
570		}
571
572		/**
#	Line 652 | Line 574 | public class PriorityBlockingQueueTest e
574		*/
575		public void testIterator() {
576		PriorityBlockingQueue q = populatedQueue(SIZE);
655	–	int i = 0;
577		Iterator it = q.iterator();
578	<	while (it.hasNext()) {
578	>	int i;
579	>	for (i = 0; it.hasNext(); i++)
580		assertTrue(q.contains(it.next()));
659	–	++i;
660	–	}
581		assertEquals(i, SIZE);
582	+	assertIteratorExhausted(it);
583	+	}
584	+
585	+	/**
586	+	* iterator of empty collection has no elements
587	+	*/
588	+	public void testEmptyIterator() {
589	+	assertIteratorExhausted(new PriorityBlockingQueue().iterator());
590		}
591
592		/**
593		* iterator.remove removes current element
594		*/
595	<	public void testIteratorRemove () {
595	>	public void testIteratorRemove() {
596		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
597		q.add(new Integer(2));
598		q.add(new Integer(1));
#	Line 680 | Line 608 | public class PriorityBlockingQueueTest e
608		assertFalse(it.hasNext());
609		}
610
683	–
611		/**
612		* toString contains toStrings of elements
613		*/
#	Line 688 | Line 615 | public class PriorityBlockingQueueTest e
615		PriorityBlockingQueue q = populatedQueue(SIZE);
616		String s = q.toString();
617		for (int i = 0; i < SIZE; ++i) {
618	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
618	>	assertTrue(s.contains(String.valueOf(i)));
619		}
620		}
621
622		/**
623	<	* offer transfers elements across Executor tasks
623	>	* timed poll transfers elements across Executor tasks
624		*/
625		public void testPollInExecutor() {
626		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
627	<	ExecutorService executor = Executors.newFixedThreadPool(2);
628	<	executor.execute(new CheckedRunnable() {
629	<	public void realRun() throws InterruptedException {
630	<	threadAssertNull(q.poll());
631	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
632	<	threadAssertTrue(q.isEmpty());
633	<	}});
634	<
635	<	executor.execute(new CheckedRunnable() {
636	<	public void realRun() throws InterruptedException {
637	<	Thread.sleep(SMALL_DELAY_MS);
638	<	q.put(new Integer(1));
639	<	}});
640	<
641	<	joinPool(executor);
627	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
628	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
629	>	try (PoolCleaner cleaner = cleaner(executor)) {
630	>	executor.execute(new CheckedRunnable() {
631	>	public void realRun() throws InterruptedException {
632	>	assertNull(q.poll());
633	>	threadsStarted.await();
634	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
635	>	checkEmpty(q);
636	>	}});
637	>
638	>	executor.execute(new CheckedRunnable() {
639	>	public void realRun() throws InterruptedException {
640	>	threadsStarted.await();
641	>	q.put(one);
642	>	}});
643	>	}
644		}
645
646		/**
647		* A deserialized serialized queue has same elements
648		*/
649		public void testSerialization() throws Exception {
650	<	PriorityBlockingQueue q = populatedQueue(SIZE);
651	<	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	<	}
650	>	Queue x = populatedQueue(SIZE);
651	>	Queue y = serialClone(x);
652
653	<	/**
654	<	* drainTo(this) throws IAE
655	<	*/
656	<	public void testDrainToSelf() {
657	<	PriorityBlockingQueue q = populatedQueue(SIZE);
658	<	try {
659	<	q.drainTo(q);
753	<	shouldThrow();
754	<	} catch (IllegalArgumentException success) {}
653	>	assertNotSame(x, y);
654	>	assertEquals(x.size(), y.size());
655	>	while (!x.isEmpty()) {
656	>	assertFalse(y.isEmpty());
657	>	assertEquals(x.remove(), y.remove());
658	>	}
659	>	assertTrue(y.isEmpty());
660		}
661
662		/**
#	Line 761 | Line 666 | public class PriorityBlockingQueueTest e
666		PriorityBlockingQueue q = populatedQueue(SIZE);
667		ArrayList l = new ArrayList();
668		q.drainTo(l);
669	<	assertEquals(q.size(), 0);
670	<	assertEquals(l.size(), SIZE);
669	>	assertEquals(0, q.size());
670	>	assertEquals(SIZE, l.size());
671		for (int i = 0; i < SIZE; ++i)
672		assertEquals(l.get(i), new Integer(i));
673		q.add(zero);
#	Line 772 | Line 677 | public class PriorityBlockingQueueTest e
677		assertTrue(q.contains(one));
678		l.clear();
679		q.drainTo(l);
680	<	assertEquals(q.size(), 0);
681	<	assertEquals(l.size(), 2);
680	>	assertEquals(0, q.size());
681	>	assertEquals(2, l.size());
682		for (int i = 0; i < 2; ++i)
683		assertEquals(l.get(i), new Integer(i));
684		}
#	Line 785 | Line 690 | public class PriorityBlockingQueueTest e
690		final PriorityBlockingQueue q = populatedQueue(SIZE);
691		Thread t = new Thread(new CheckedRunnable() {
692		public void realRun() {
693	<	q.put(new Integer(SIZE+1));
693	>	q.put(new Integer(SIZE + 1));
694		}});
695
696		t.start();
#	Line 799 | Line 704 | public class PriorityBlockingQueueTest e
704		}
705
706		/**
707	<	* 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
707	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
708		*/
709		public void testDrainToN() {
710	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
710	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
711		for (int i = 0; i < SIZE + 2; ++i) {
712		for (int j = 0; j < SIZE; j++)
713		assertTrue(q.offer(new Integer(j)));
714		ArrayList l = new ArrayList();
715		q.drainTo(l, i);
716	<	int k = (i < SIZE)? i : SIZE;
717	<	assertEquals(l.size(), k);
718	<	assertEquals(q.size(), SIZE-k);
716	>	int k = (i < SIZE) ? i : SIZE;
717	>	assertEquals(k, l.size());
718	>	assertEquals(SIZE - k, q.size());
719		for (int j = 0; j < k; ++j)
720		assertEquals(l.get(j), new Integer(j));
721	<	while (q.poll() != null) ;
721	>	do {} while (q.poll() != null);
722	>	}
723	>	}
724	>
725	>	/**
726	>	* remove(null), contains(null) always return false
727	>	*/
728	>	public void testNeverContainsNull() {
729	>	Collection<?>[] qs = {
730	>	new PriorityBlockingQueue<Object>(),
731	>	populatedQueue(2),
732	>	};
733	>
734	>	for (Collection<?> q : qs) {
735	>	assertFalse(q.contains(null));
736	>	assertFalse(q.remove(null));
737		}
738		}
739

Diff Legend

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