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.76 by jsr166, Sun May 14 01:30:34 2017 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	>	class Implementation implements CollectionImplementation {
46	>	public Class<?> klazz() { return PriorityBlockingQueue.class; }
47	>	public Collection emptyCollection() { return new PriorityBlockingQueue(); }
48	>	public Object makeElement(int i) { return i; }
49	>	public boolean isConcurrent() { return true; }
50	>	public boolean permitsNulls() { return false; }
51	>	}
52	>	return newTestSuite(PriorityBlockingQueueTest.class,
53	>	new Generic().testSuite(),
54	>	new InitialCapacity().testSuite(),
55	>	CollectionTest.testSuite(new Implementation()));
56		}
57
23	–	private static final int NOCAP = Integer.MAX_VALUE;
24	–
58		/** Sample Comparator */
59		static class MyReverseComparator implements Comparator {
60		public int compare(Object x, Object y) {
61	<	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;
61	>	return ((Comparable)y).compareTo(x);
62		}
63		}
64
65		/**
66	<	* Create a queue of given size containing consecutive
67	<	* Integers 0 ... n.
66	>	* Returns a new queue of given size containing consecutive
67	>	* Integers 0 ... n - 1.
68		*/
69	<	private PriorityBlockingQueue populatedQueue(int n) {
70	<	PriorityBlockingQueue q = new PriorityBlockingQueue(n);
69	>	private static PriorityBlockingQueue<Integer> populatedQueue(int n) {
70	>	PriorityBlockingQueue<Integer> q =
71	>	new PriorityBlockingQueue<Integer>(n);
72		assertTrue(q.isEmpty());
73	<	for (int i = n-1; i >= 0; i-=2)
73	>	for (int i = n - 1; i >= 0; i -= 2)
74		assertTrue(q.offer(new Integer(i)));
75	<	for (int i = (n & 1); i < n; i+=2)
75	>	for (int i = (n & 1); i < n; i += 2)
76		assertTrue(q.offer(new Integer(i)));
77		assertFalse(q.isEmpty());
78	<	assertEquals(NOCAP, q.remainingCapacity());
78	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
79		assertEquals(n, q.size());
80	+	assertEquals((Integer) 0, q.peek());
81		return q;
82		}
83
#	Line 54 | Line 85 | public class PriorityBlockingQueueTest e
85		* A new queue has unbounded capacity
86		*/
87		public void testConstructor1() {
88	<	assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
88	>	assertEquals(Integer.MAX_VALUE,
89	>	new PriorityBlockingQueue(SIZE).remainingCapacity());
90		}
91
92		/**
#	Line 62 | Line 94 | public class PriorityBlockingQueueTest e
94		*/
95		public void testConstructor2() {
96		try {
97	<	PriorityBlockingQueue q = new PriorityBlockingQueue(0);
97	>	new PriorityBlockingQueue(0);
98		shouldThrow();
99		} catch (IllegalArgumentException success) {}
100		}
#	Line 72 | Line 104 | public class PriorityBlockingQueueTest e
104		*/
105		public void testConstructor3() {
106		try {
107	<	PriorityBlockingQueue q = new PriorityBlockingQueue(null);
107	>	new PriorityBlockingQueue(null);
108		shouldThrow();
109		} catch (NullPointerException success) {}
110		}
#	Line 81 | Line 113 | public class PriorityBlockingQueueTest e
113		* Initializing from Collection of null elements throws NPE
114		*/
115		public void testConstructor4() {
116	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
117		try {
118	<	Integer[] ints = new Integer[SIZE];
86	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
118	>	new PriorityBlockingQueue(elements);
119		shouldThrow();
120		} catch (NullPointerException success) {}
121		}
#	Line 92 | Line 124 | public class PriorityBlockingQueueTest e
124		* Initializing from Collection with some null elements throws NPE
125		*/
126		public void testConstructor5() {
127	+	Integer[] ints = new Integer[SIZE];
128	+	for (int i = 0; i < SIZE - 1; ++i)
129	+	ints[i] = i;
130	+	Collection<Integer> elements = Arrays.asList(ints);
131		try {
132	<	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));
132	>	new PriorityBlockingQueue(elements);
133		shouldThrow();
134		} catch (NullPointerException success) {}
135		}
#	Line 107 | Line 140 | public class PriorityBlockingQueueTest e
140		public void testConstructor6() {
141		Integer[] ints = new Integer[SIZE];
142		for (int i = 0; i < SIZE; ++i)
143	<	ints[i] = new Integer(i);
143	>	ints[i] = i;
144		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
145		for (int i = 0; i < SIZE; ++i)
146		assertEquals(ints[i], q.poll());
#	Line 124 | Line 157 | public class PriorityBlockingQueueTest e
157		for (int i = 0; i < SIZE; ++i)
158		ints[i] = new Integer(i);
159		q.addAll(Arrays.asList(ints));
160	<	for (int i = SIZE-1; i >= 0; --i)
160	>	for (int i = SIZE - 1; i >= 0; --i)
161		assertEquals(ints[i], q.poll());
162		}
163
#	Line 134 | Line 167 | public class PriorityBlockingQueueTest e
167		public void testEmpty() {
168		PriorityBlockingQueue q = new PriorityBlockingQueue(2);
169		assertTrue(q.isEmpty());
170	<	assertEquals(NOCAP, q.remainingCapacity());
170	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
171		q.add(one);
172		assertFalse(q.isEmpty());
173		q.add(two);
#	Line 144 | Line 177 | public class PriorityBlockingQueueTest e
177		}
178
179		/**
180	<	* remainingCapacity does not change when elements added or removed,
148	<	* but size does
180	>	* remainingCapacity() always returns Integer.MAX_VALUE
181		*/
182		public void testRemainingCapacity() {
183	<	PriorityBlockingQueue q = populatedQueue(SIZE);
183	>	BlockingQueue q = populatedQueue(SIZE);
184		for (int i = 0; i < SIZE; ++i) {
185	<	assertEquals(NOCAP, q.remainingCapacity());
186	<	assertEquals(SIZE-i, q.size());
187	<	q.remove();
185	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
186	>	assertEquals(SIZE - i, q.size());
187	>	assertEquals(i, q.remove());
188		}
189		for (int i = 0; i < SIZE; ++i) {
190	<	assertEquals(NOCAP, q.remainingCapacity());
190	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
191		assertEquals(i, q.size());
192	<	q.add(new Integer(i));
192	>	assertTrue(q.add(i));
193		}
194		}
195
196		/**
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	–	/**
197		* Offer of comparable element succeeds
198		*/
199		public void testOffer() {
#	Line 196 | Line 206 | public class PriorityBlockingQueueTest e
206		* Offer of non-Comparable throws CCE
207		*/
208		public void testOfferNonComparable() {
209	+	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
210		try {
200	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
201	–	q.offer(new Object());
202	–	q.offer(new Object());
211		q.offer(new Object());
212		shouldThrow();
213	<	} catch (ClassCastException success) {}
213	>	} catch (ClassCastException success) {
214	>	assertTrue(q.isEmpty());
215	>	assertEquals(0, q.size());
216	>	assertNull(q.poll());
217	>	}
218		}
219
220		/**
#	Line 217 | Line 229 | public class PriorityBlockingQueueTest e
229		}
230
231		/**
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	–	/**
232		* addAll(this) throws IAE
233		*/
234		public void testAddAllSelf() {
235	+	PriorityBlockingQueue q = populatedQueue(SIZE);
236		try {
235	–	PriorityBlockingQueue q = populatedQueue(SIZE);
237		q.addAll(q);
238		shouldThrow();
239		} catch (IllegalArgumentException success) {}
240		}
241
242		/**
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	–	/**
243		* addAll of a collection with any null elements throws NPE after
244		* possibly adding some elements
245		*/
246		public void testAddAll3() {
247	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
248	+	Integer[] ints = new Integer[SIZE];
249	+	for (int i = 0; i < SIZE - 1; ++i)
250	+	ints[i] = new Integer(i);
251		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);
252		q.addAll(Arrays.asList(ints));
253		shouldThrow();
254		} catch (NullPointerException success) {}
#	Line 270 | Line 260 | public class PriorityBlockingQueueTest e
260		public void testAddAll5() {
261		Integer[] empty = new Integer[0];
262		Integer[] ints = new Integer[SIZE];
263	<	for (int i = SIZE-1; i >= 0; --i)
263	>	for (int i = SIZE - 1; i >= 0; --i)
264		ints[i] = new Integer(i);
265		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
266		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 280 | Line 270 | public class PriorityBlockingQueueTest e
270		}
271
272		/**
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	–	/**
273		* all elements successfully put are contained
274		*/
275	<	public void testPut() {
276	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
277	<	for (int i = 0; i < SIZE; ++i) {
278	<	Integer I = new Integer(i);
279	<	q.put(I);
280	<	assertTrue(q.contains(I));
281	<	}
282	<	assertEquals(SIZE, q.size());
275	>	public void testPut() {
276	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
277	>	for (int i = 0; i < SIZE; ++i) {
278	>	Integer x = new Integer(i);
279	>	q.put(x);
280	>	assertTrue(q.contains(x));
281	>	}
282	>	assertEquals(SIZE, q.size());
283		}
284
285		/**
#	Line 309 | Line 288 | public class PriorityBlockingQueueTest e
288		public void testPutWithTake() throws InterruptedException {
289		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
290		final int size = 4;
291	<	Thread t = new Thread(new CheckedRunnable() {
291	>	Thread t = newStartedThread(new CheckedRunnable() {
292		public void realRun() {
293		for (int i = 0; i < size; i++)
294		q.put(new Integer(0));
295		}});
296
297	<	t.start();
298	<	Thread.sleep(SHORT_DELAY_MS);
320	<	assertEquals(q.size(), size);
297	>	awaitTermination(t);
298	>	assertEquals(size, q.size());
299		q.take();
322	–	t.interrupt();
323	–	t.join();
300		}
301
302		/**
#	Line 328 | Line 304 | public class PriorityBlockingQueueTest e
304		*/
305		public void testTimedOffer() throws InterruptedException {
306		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
307	<	Thread t = new Thread(new CheckedRunnable() {
307	>	Thread t = newStartedThread(new CheckedRunnable() {
308		public void realRun() {
309		q.put(new Integer(0));
310		q.put(new Integer(0));
311	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
312	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
311	>	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
312	>	assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
313		}});
314
315	<	t.start();
340	<	Thread.sleep(SMALL_DELAY_MS);
341	<	t.interrupt();
342	<	t.join();
315	>	awaitTermination(t);
316		}
317
318		/**
#	Line 348 | Line 321 | public class PriorityBlockingQueueTest e
321		public void testTake() throws InterruptedException {
322		PriorityBlockingQueue q = populatedQueue(SIZE);
323		for (int i = 0; i < SIZE; ++i) {
324	<	assertEquals(i, ((Integer)q.take()).intValue());
324	>	assertEquals(i, q.take());
325		}
326		}
327
328		/**
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	–	/**
329		* Take removes existing elements until empty, then blocks interruptibly
330		*/
331		public void testBlockingTake() throws InterruptedException {
332	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
332	>	final PriorityBlockingQueue q = populatedQueue(SIZE);
333	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
334	>	Thread t = newStartedThread(new CheckedRunnable() {
335		public void realRun() throws InterruptedException {
336	<	PriorityBlockingQueue q = populatedQueue(SIZE);
337	<	for (int i = 0; i < SIZE; ++i) {
338	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
339	<	}
340	<	q.take();
336	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
337	>
338	>	Thread.currentThread().interrupt();
339	>	try {
340	>	q.take();
341	>	shouldThrow();
342	>	} catch (InterruptedException success) {}
343	>	assertFalse(Thread.interrupted());
344	>
345	>	pleaseInterrupt.countDown();
346	>	try {
347	>	q.take();
348	>	shouldThrow();
349	>	} catch (InterruptedException success) {}
350	>	assertFalse(Thread.interrupted());
351		}});
352
353	<	t.start();
354	<	Thread.sleep(SHORT_DELAY_MS);
353	>	await(pleaseInterrupt);
354	>	assertThreadBlocks(t, Thread.State.WAITING);
355		t.interrupt();
356	<	t.join();
356	>	awaitTermination(t);
357		}
358
390	–
359		/**
360		* poll succeeds unless empty
361		*/
362		public void testPoll() {
363		PriorityBlockingQueue q = populatedQueue(SIZE);
364		for (int i = 0; i < SIZE; ++i) {
365	<	assertEquals(i, ((Integer)q.poll()).intValue());
365	>	assertEquals(i, q.poll());
366		}
367		assertNull(q.poll());
368		}
369
370		/**
371	<	* timed pool with zero timeout succeeds when non-empty, else times out
371	>	* timed poll with zero timeout succeeds when non-empty, else times out
372		*/
373		public void testTimedPoll0() throws InterruptedException {
374		PriorityBlockingQueue q = populatedQueue(SIZE);
375		for (int i = 0; i < SIZE; ++i) {
376	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
376	>	assertEquals(i, q.poll(0, MILLISECONDS));
377		}
378		assertNull(q.poll(0, MILLISECONDS));
379		}
380
381		/**
382	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
382	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
383		*/
384		public void testTimedPoll() throws InterruptedException {
385	<	PriorityBlockingQueue q = populatedQueue(SIZE);
385	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
386		for (int i = 0; i < SIZE; ++i) {
387	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
388	<	}
389	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
387	>	long startTime = System.nanoTime();
388	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
389	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
390	>	}
391	>	long startTime = System.nanoTime();
392	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
393	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
394	>	checkEmpty(q);
395		}
396
397		/**
#	Line 426 | Line 399 | public class PriorityBlockingQueueTest e
399		* returning timeout status
400		*/
401		public void testInterruptedTimedPoll() throws InterruptedException {
402	<	Thread t = new Thread(new CheckedRunnable() {
402	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
403	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
404	>	Thread t = newStartedThread(new CheckedRunnable() {
405		public void realRun() throws InterruptedException {
406	<	PriorityBlockingQueue q = populatedQueue(SIZE);
407	<	for (int i = 0; i < SIZE; ++i) {
408	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
409	<	}
406	>	long startTime = System.nanoTime();
407	>	for (int i = 0; i < SIZE; i++)
408	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
409	>
410	>	Thread.currentThread().interrupt();
411		try {
412	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
412	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
413		shouldThrow();
414		} catch (InterruptedException success) {}
415	<	}});
440	<
441	<	t.start();
442	<	Thread.sleep(SHORT_DELAY_MS);
443	<	t.interrupt();
444	<	t.join();
445	<	}
415	>	assertFalse(Thread.interrupted());
416
417	<	/**
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));
417	>	pleaseInterrupt.countDown();
418		try {
419		q.poll(LONG_DELAY_MS, MILLISECONDS);
420	<	threadShouldThrow();
420	>	shouldThrow();
421		} catch (InterruptedException success) {}
422	+	assertFalse(Thread.interrupted());
423	+
424	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
425		}});
426
427	<	t.start();
428	<	Thread.sleep(SMALL_DELAY_MS);
465	<	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
427	>	await(pleaseInterrupt);
428	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
429		t.interrupt();
430	<	t.join();
430	>	awaitTermination(t);
431		}
432
470	–
433		/**
434		* peek returns next element, or null if empty
435		*/
436		public void testPeek() {
437		PriorityBlockingQueue q = populatedQueue(SIZE);
438		for (int i = 0; i < SIZE; ++i) {
439	<	assertEquals(i, ((Integer)q.peek()).intValue());
440	<	q.poll();
439	>	assertEquals(i, q.peek());
440	>	assertEquals(i, q.poll());
441		assertTrue(q.peek() == null ||
442	<	i != ((Integer)q.peek()).intValue());
442	>	!q.peek().equals(i));
443		}
444		assertNull(q.peek());
445		}
#	Line 488 | Line 450 | public class PriorityBlockingQueueTest e
450		public void testElement() {
451		PriorityBlockingQueue q = populatedQueue(SIZE);
452		for (int i = 0; i < SIZE; ++i) {
453	<	assertEquals(i, ((Integer)q.element()).intValue());
454	<	q.poll();
453	>	assertEquals(i, q.element());
454	>	assertEquals(i, q.poll());
455		}
456		try {
457		q.element();
#	Line 503 | Line 465 | public class PriorityBlockingQueueTest e
465		public void testRemove() {
466		PriorityBlockingQueue q = populatedQueue(SIZE);
467		for (int i = 0; i < SIZE; ++i) {
468	<	assertEquals(i, ((Integer)q.remove()).intValue());
468	>	assertEquals(i, q.remove());
469		}
470		try {
471		q.remove();
#	Line 512 | Line 474 | public class PriorityBlockingQueueTest e
474		}
475
476		/**
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	–	/**
477		* contains(x) reports true when elements added but not yet removed
478		*/
479		public void testContains() {
#	Line 581 | Line 528 | public class PriorityBlockingQueueTest e
528		assertTrue(changed);
529
530		assertTrue(q.containsAll(p));
531	<	assertEquals(SIZE-i, q.size());
531	>	assertEquals(SIZE - i, q.size());
532		p.remove();
533		}
534		}
#	Line 594 | Line 541 | public class PriorityBlockingQueueTest e
541		PriorityBlockingQueue q = populatedQueue(SIZE);
542		PriorityBlockingQueue p = populatedQueue(i);
543		assertTrue(q.removeAll(p));
544	<	assertEquals(SIZE-i, q.size());
544	>	assertEquals(SIZE - i, q.size());
545		for (int j = 0; j < i; ++j) {
546	<	Integer I = (Integer)(p.remove());
547	<	assertFalse(q.contains(I));
546	>	Integer x = (Integer)(p.remove());
547	>	assertFalse(q.contains(x));
548		}
549		}
550		}
551
552		/**
553	<	*  toArray contains all elements
553	>	* toArray contains all elements
554		*/
555		public void testToArray() throws InterruptedException {
556		PriorityBlockingQueue q = populatedQueue(SIZE);
557		Object[] o = q.toArray();
558		Arrays.sort(o);
559		for (int i = 0; i < o.length; i++)
560	<	assertEquals(o[i], q.take());
560	>	assertSame(o[i], q.take());
561		}
562
563		/**
564		* toArray(a) contains all elements
565		*/
566		public void testToArray2() throws InterruptedException {
567	<	PriorityBlockingQueue q = populatedQueue(SIZE);
567	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
568		Integer[] ints = new Integer[SIZE];
569	<	ints = (Integer[])q.toArray(ints);
569	>	Integer[] array = q.toArray(ints);
570	>	assertSame(ints, array);
571		Arrays.sort(ints);
572		for (int i = 0; i < ints.length; i++)
573	<	assertEquals(ints[i], q.take());
573	>	assertSame(ints[i], q.take());
574		}
575
576		/**
577	<	* 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) {}
637	<	}
638	<
639	<	/**
640	<	* toArray with incompatible array type throws CCE
577	>	* toArray(incompatible array type) throws ArrayStoreException
578		*/
579		public void testToArray1_BadArg() {
580	+	PriorityBlockingQueue q = populatedQueue(SIZE);
581		try {
582	<	PriorityBlockingQueue q = populatedQueue(SIZE);
645	<	Object o[] = q.toArray(new String[10] );
582	>	q.toArray(new String[10]);
583		shouldThrow();
584		} catch (ArrayStoreException success) {}
585		}
#	Line 652 | Line 589 | public class PriorityBlockingQueueTest e
589		*/
590		public void testIterator() {
591		PriorityBlockingQueue q = populatedQueue(SIZE);
655	–	int i = 0;
592		Iterator it = q.iterator();
593	<	while (it.hasNext()) {
593	>	int i;
594	>	for (i = 0; it.hasNext(); i++)
595		assertTrue(q.contains(it.next()));
659	–	++i;
660	–	}
596		assertEquals(i, SIZE);
597	+	assertIteratorExhausted(it);
598	+	}
599	+
600	+	/**
601	+	* iterator of empty collection has no elements
602	+	*/
603	+	public void testEmptyIterator() {
604	+	assertIteratorExhausted(new PriorityBlockingQueue().iterator());
605		}
606
607		/**
608		* iterator.remove removes current element
609		*/
610	<	public void testIteratorRemove () {
610	>	public void testIteratorRemove() {
611		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
612		q.add(new Integer(2));
613		q.add(new Integer(1));
#	Line 680 | Line 623 | public class PriorityBlockingQueueTest e
623		assertFalse(it.hasNext());
624		}
625
683	–
626		/**
627		* toString contains toStrings of elements
628		*/
#	Line 688 | Line 630 | public class PriorityBlockingQueueTest e
630		PriorityBlockingQueue q = populatedQueue(SIZE);
631		String s = q.toString();
632		for (int i = 0; i < SIZE; ++i) {
633	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
633	>	assertTrue(s.contains(String.valueOf(i)));
634		}
635		}
636
637		/**
638	<	* offer transfers elements across Executor tasks
638	>	* timed poll transfers elements across Executor tasks
639		*/
640		public void testPollInExecutor() {
641		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
642	<	ExecutorService executor = Executors.newFixedThreadPool(2);
643	<	executor.execute(new CheckedRunnable() {
644	<	public void realRun() throws InterruptedException {
645	<	threadAssertNull(q.poll());
646	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
647	<	threadAssertTrue(q.isEmpty());
648	<	}});
649	<
650	<	executor.execute(new CheckedRunnable() {
651	<	public void realRun() throws InterruptedException {
652	<	Thread.sleep(SMALL_DELAY_MS);
653	<	q.put(new Integer(1));
654	<	}});
655	<
656	<	joinPool(executor);
642	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
643	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
644	>	try (PoolCleaner cleaner = cleaner(executor)) {
645	>	executor.execute(new CheckedRunnable() {
646	>	public void realRun() throws InterruptedException {
647	>	assertNull(q.poll());
648	>	threadsStarted.await();
649	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
650	>	checkEmpty(q);
651	>	}});
652	>
653	>	executor.execute(new CheckedRunnable() {
654	>	public void realRun() throws InterruptedException {
655	>	threadsStarted.await();
656	>	q.put(one);
657	>	}});
658	>	}
659		}
660
661		/**
662		* A deserialized serialized queue has same elements
663		*/
664		public void testSerialization() throws Exception {
665	<	PriorityBlockingQueue q = populatedQueue(SIZE);
666	<	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	<	}
665	>	Queue x = populatedQueue(SIZE);
666	>	Queue y = serialClone(x);
667
668	<	/**
669	<	* drainTo(this) throws IAE
670	<	*/
671	<	public void testDrainToSelf() {
672	<	PriorityBlockingQueue q = populatedQueue(SIZE);
673	<	try {
674	<	q.drainTo(q);
753	<	shouldThrow();
754	<	} catch (IllegalArgumentException success) {}
668	>	assertNotSame(x, y);
669	>	assertEquals(x.size(), y.size());
670	>	while (!x.isEmpty()) {
671	>	assertFalse(y.isEmpty());
672	>	assertEquals(x.remove(), y.remove());
673	>	}
674	>	assertTrue(y.isEmpty());
675		}
676
677		/**
#	Line 761 | Line 681 | public class PriorityBlockingQueueTest e
681		PriorityBlockingQueue q = populatedQueue(SIZE);
682		ArrayList l = new ArrayList();
683		q.drainTo(l);
684	<	assertEquals(q.size(), 0);
685	<	assertEquals(l.size(), SIZE);
684	>	assertEquals(0, q.size());
685	>	assertEquals(SIZE, l.size());
686		for (int i = 0; i < SIZE; ++i)
687		assertEquals(l.get(i), new Integer(i));
688		q.add(zero);
#	Line 772 | Line 692 | public class PriorityBlockingQueueTest e
692		assertTrue(q.contains(one));
693		l.clear();
694		q.drainTo(l);
695	<	assertEquals(q.size(), 0);
696	<	assertEquals(l.size(), 2);
695	>	assertEquals(0, q.size());
696	>	assertEquals(2, l.size());
697		for (int i = 0; i < 2; ++i)
698		assertEquals(l.get(i), new Integer(i));
699		}
#	Line 785 | Line 705 | public class PriorityBlockingQueueTest e
705		final PriorityBlockingQueue q = populatedQueue(SIZE);
706		Thread t = new Thread(new CheckedRunnable() {
707		public void realRun() {
708	<	q.put(new Integer(SIZE+1));
708	>	q.put(new Integer(SIZE + 1));
709		}});
710
711		t.start();
#	Line 799 | Line 719 | public class PriorityBlockingQueueTest e
719		}
720
721		/**
722	<	* 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
722	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
723		*/
724		public void testDrainToN() {
725	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
725	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
726		for (int i = 0; i < SIZE + 2; ++i) {
727		for (int j = 0; j < SIZE; j++)
728		assertTrue(q.offer(new Integer(j)));
729		ArrayList l = new ArrayList();
730		q.drainTo(l, i);
731	<	int k = (i < SIZE)? i : SIZE;
732	<	assertEquals(l.size(), k);
733	<	assertEquals(q.size(), SIZE-k);
731	>	int k = (i < SIZE) ? i : SIZE;
732	>	assertEquals(k, l.size());
733	>	assertEquals(SIZE - k, q.size());
734		for (int j = 0; j < k; ++j)
735		assertEquals(l.get(j), new Integer(j));
736	<	while (q.poll() != null) ;
736	>	do {} while (q.poll() != null);
737	>	}
738	>	}
739	>
740	>	/**
741	>	* remove(null), contains(null) always return false
742	>	*/
743	>	public void testNeverContainsNull() {
744	>	Collection<?>[] qs = {
745	>	new PriorityBlockingQueue<Object>(),
746	>	populatedQueue(2),
747	>	};
748	>
749	>	for (Collection<?> q : qs) {
750	>	assertFalse(q.contains(null));
751	>	assertFalse(q.remove(null));
752		}
753		}
754

Diff Legend

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