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.7 by dl, Sun Oct 5 23:00:40 2003 UTC vs.
Revision 1.64 by jsr166, Sun May 24 01:42:14 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by members of JCP JSR-166 Expert Group and released to the
3	<	* public domain. Use, modify, and redistribute this code in any way
4	<	* without acknowledgement. Other contributors include Andrew Wright,
5	<	* Jeffrey Hayes, Pat Fischer, Mike Judd.
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/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.*;
12	<	import java.io.*;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
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
21	–	private static final int NOCAP = Integer.MAX_VALUE;
22	–
50		/** Sample Comparator */
51	<	static class MyReverseComparator implements Comparator {
51	>	static class MyReverseComparator implements Comparator {
52		public int compare(Object x, Object y) {
53	<	int i = ((Integer)x).intValue();
27	<	int j = ((Integer)y).intValue();
28	<	if (i < j) return 1;
29	<	if (i > j) return -1;
30	<	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)
66	<	assertTrue(q.offer(new Integer(i)));
67	<	for(int i = (n & 1); i < n; i+=2)
68	<	assertTrue(q.offer(new Integer(i)));
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)
68	>	assertTrue(q.offer(new Integer(i)));
69		assertFalse(q.isEmpty());
70	<	assertEquals(NOCAP, q.remainingCapacity());
71	<	assertEquals(n, q.size());
70	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
71	>	assertEquals(n, q.size());
72		return q;
73		}
74	<
74	>
75		/**
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	<	}
66	<	catch (IllegalArgumentException success) {}
90	>	} catch (IllegalArgumentException success) {}
91		}
92
93		/**
#	Line 71 | 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	<	}
77	<	catch (NullPointerException success) {}
100	>	} catch (NullPointerException success) {}
101		}
102
103		/**
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	<	}
89	<	catch (NullPointerException success) {}
111	>	} catch (NullPointerException success) {}
112		}
113
114		/**
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];
98	<	for (int i = 0; i < SIZE-1; ++i)
99	<	ints[i] = new Integer(i);
100	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
123	>	new PriorityBlockingQueue(elements);
124		shouldThrow();
125	<	}
103	<	catch (NullPointerException success) {}
125	>	} catch (NullPointerException success) {}
126		}
127
128		/**
129		* Queue contains all elements of collection used to initialize
130		*/
131		public void testConstructor6() {
132	<	try {
133	<	Integer[] ints = new Integer[SIZE];
134	<	for (int i = 0; i < SIZE; ++i)
135	<	ints[i] = new Integer(i);
136	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
137	<	for (int i = 0; i < SIZE; ++i)
116	<	assertEquals(ints[i], q.poll());
117	<	}
118	<	finally {}
132	>	Integer[] ints = new Integer[SIZE];
133	>	for (int i = 0; i < SIZE; ++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());
138		}
139
140		/**
141		* The comparator used in constructor is used
142		*/
143		public void testConstructor7() {
144	<	try {
145	<	MyReverseComparator cmp = new MyReverseComparator();
146	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
147	<	assertEquals(cmp, q.comparator());
148	<	Integer[] ints = new Integer[SIZE];
149	<	for (int i = 0; i < SIZE; ++i)
150	<	ints[i] = new Integer(i);
151	<	q.addAll(Arrays.asList(ints));
152	<	for (int i = SIZE-1; i >= 0; --i)
134	<	assertEquals(ints[i], q.poll());
135	<	}
136	<	finally {}
144	>	MyReverseComparator cmp = new MyReverseComparator();
145	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
146	>	assertEquals(cmp, q.comparator());
147	>	Integer[] ints = new Integer[SIZE];
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)
152	>	assertEquals(ints[i], q.poll());
153		}
154
155		/**
#	Line 142 | 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 152 | Line 168 | public class PriorityBlockingQueueTest e
168		}
169
170		/**
171	<	* remainingCapacity does not change when elementa added or removed,
156	<	* 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		/**
173	–	* offer(null) throws NPE
174	–	*/
175	–	public void testOfferNull() {
176	–	try {
177	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
178	–	q.offer(null);
179	–	shouldThrow();
180	–	} catch (NullPointerException success) { }
181	–	}
182	–
183	–	/**
184	–	* add(null) throws NPE
185	–	*/
186	–	public void testAddNull() {
187	–	try {
188	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
189	–	q.add(null);
190	–	shouldThrow();
191	–	} catch (NullPointerException success) { }
192	–	}
193	–
194	–	/**
188		* Offer of comparable element succeeds
189		*/
190		public void testOffer() {
#	Line 204 | 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 {
208	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
209	–	q.offer(new Object());
202		q.offer(new Object());
203		q.offer(new Object());
204		shouldThrow();
205	<	}
214	<	catch(ClassCastException success) {}
205	>	} catch (ClassCastException success) {}
206		}
207
208		/**
#	Line 226 | Line 217 | public class PriorityBlockingQueueTest e
217		}
218
219		/**
229	–	* addAll(null) throws NPE
230	–	*/
231	–	public void testAddAll1() {
232	–	try {
233	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
234	–	q.addAll(null);
235	–	shouldThrow();
236	–	}
237	–	catch (NullPointerException success) {}
238	–	}
239	–
240	–	/**
220		* addAll(this) throws IAE
221		*/
222		public void testAddAllSelf() {
223	+	PriorityBlockingQueue q = populatedQueue(SIZE);
224		try {
245	–	PriorityBlockingQueue q = populatedQueue(SIZE);
225		q.addAll(q);
226		shouldThrow();
227	<	}
249	<	catch (IllegalArgumentException success) {}
227	>	} catch (IllegalArgumentException success) {}
228		}
229
230		/**
253	–	* addAll of a collection with null elements throws NPE
254	–	*/
255	–	public void testAddAll2() {
256	–	try {
257	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
258	–	Integer[] ints = new Integer[SIZE];
259	–	q.addAll(Arrays.asList(ints));
260	–	shouldThrow();
261	–	}
262	–	catch (NullPointerException success) {}
263	–	}
264	–	/**
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 {
270	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
271	–	Integer[] ints = new Integer[SIZE];
272	–	for (int i = 0; i < SIZE-1; ++i)
273	–	ints[i] = new Integer(i);
240		q.addAll(Arrays.asList(ints));
241		shouldThrow();
242	<	}
277	<	catch (NullPointerException success) {}
242	>	} catch (NullPointerException success) {}
243		}
244
245		/**
246		* Queue contains all elements of successful addAll
247		*/
248		public void testAddAll5() {
249	<	try {
250	<	Integer[] empty = new Integer[0];
251	<	Integer[] ints = new Integer[SIZE];
252	<	for (int i = SIZE-1; i >= 0; --i)
253	<	ints[i] = new Integer(i);
254	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
255	<	assertFalse(q.addAll(Arrays.asList(empty)));
256	<	assertTrue(q.addAll(Arrays.asList(ints)));
257	<	for (int i = 0; i < SIZE; ++i)
293	<	assertEquals(ints[i], q.poll());
294	<	}
295	<	finally {}
249	>	Integer[] empty = new Integer[0];
250	>	Integer[] ints = new Integer[SIZE];
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)));
255	>	assertTrue(q.addAll(Arrays.asList(ints)));
256	>	for (int i = 0; i < SIZE; ++i)
257	>	assertEquals(ints[i], q.poll());
258		}
259
260		/**
299	–	* put(null) throws NPE
300	–	*/
301	–	public void testPutNull() {
302	–	try {
303	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
304	–	q.put(null);
305	–	shouldThrow();
306	–	}
307	–	catch (NullPointerException success){
308	–	}
309	–	}
310	–
311	–	/**
261		* all elements successfully put are contained
262		*/
263	<	public void testPut() {
264	<	try {
265	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
266	<	for (int i = 0; i < SIZE; ++i) {
267	<	Integer I = new Integer(i);
268	<	q.put(I);
320	<	assertTrue(q.contains(I));
321	<	}
322	<	assertEquals(SIZE, q.size());
323	<	}
324	<	finally {
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		/**
274		* put doesn't block waiting for take
275		*/
276	<	public void testPutWithTake() {
276	>	public void testPutWithTake() throws InterruptedException {
277		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
278	<	Thread t = new Thread(new Runnable() {
279	<	public void run() {
280	<	int added = 0;
281	<	try {
282	<	q.put(new Integer(0));
283	<	++added;
284	<	q.put(new Integer(0));
285	<	++added;
286	<	q.put(new Integer(0));
287	<	++added;
343	<	q.put(new Integer(0));
344	<	++added;
345	<	threadAssertTrue(added == 4);
346	<	} finally {
347	<	}
348	<	}
349	<	});
350	<	try {
351	<	t.start();
352	<	Thread.sleep(SHORT_DELAY_MS);
353	<	q.take();
354	<	t.interrupt();
355	<	t.join();
356	<	} catch (Exception e){
357	<	unexpectedException();
358	<	}
278	>	final int size = 4;
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	>	awaitTermination(t);
286	>	assertEquals(size, q.size());
287	>	q.take();
288		}
289
290		/**
291		* timed offer does not time out
292		*/
293	<	public void testTimedOffer() {
293	>	public void testTimedOffer() throws InterruptedException {
294		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
295	<	Thread t = new Thread(new Runnable() {
296	<	public void run() {
297	<	try {
298	<	q.put(new Integer(0));
299	<	q.put(new Integer(0));
300	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
301	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
373	<	} finally { }
374	<	}
375	<	});
376	<
377	<	try {
378	<	t.start();
379	<	Thread.sleep(SMALL_DELAY_MS);
380	<	t.interrupt();
381	<	t.join();
382	<	} catch (Exception e){
383	<	unexpectedException();
384	<	}
385	<	}
295	>	Thread t = newStartedThread(new CheckedRunnable() {
296	>	public void realRun() {
297	>	q.put(new Integer(0));
298	>	q.put(new Integer(0));
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	<	/**
388	<	* take retrieves elements in priority order
389	<	*/
390	<	public void testTake() {
391	<	try {
392	<	PriorityBlockingQueue q = populatedQueue(SIZE);
393	<	for (int i = 0; i < SIZE; ++i) {
394	<	assertEquals(i, ((Integer)q.take()).intValue());
395	<	}
396	<	} catch (InterruptedException e){
397	<	unexpectedException();
398	<	}
303	>	awaitTermination(t);
304		}
305
306		/**
307	<	* take blocks interruptibly when empty
307	>	* take retrieves elements in priority order
308		*/
309	<	public void testTakeFromEmpty() {
310	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
311	<	Thread t = new Thread(new Runnable() {
312	<	public void run() {
408	<	try {
409	<	q.take();
410	<	threadShouldThrow();
411	<	} catch (InterruptedException success){ }
412	<	}
413	<	});
414	<	try {
415	<	t.start();
416	<	Thread.sleep(SHORT_DELAY_MS);
417	<	t.interrupt();
418	<	t.join();
419	<	} catch (Exception e){
420	<	unexpectedException();
309	>	public void testTake() throws InterruptedException {
310	>	PriorityBlockingQueue q = populatedQueue(SIZE);
311	>	for (int i = 0; i < SIZE; ++i) {
312	>	assertEquals(i, q.take());
313		}
314		}
315
316		/**
317		* Take removes existing elements until empty, then blocks interruptibly
318		*/
319	<	public void testBlockingTake() {
320	<	Thread t = new Thread(new Runnable() {
321	<	public void run() {
322	<	try {
323	<	PriorityBlockingQueue q = populatedQueue(SIZE);
324	<	for (int i = 0; i < SIZE; ++i) {
325	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
326	<	}
327	<	q.take();
328	<	threadShouldThrow();
329	<	} catch (InterruptedException success){
330	<	}
331	<	}});
332	<	t.start();
333	<	try {
442	<	Thread.sleep(SHORT_DELAY_MS);
443	<	t.interrupt();
444	<	t.join();
445	<	}
446	<	catch (InterruptedException ie) {
447	<	unexpectedException();
448	<	}
449	<	}
319	>	public void testBlockingTake() throws InterruptedException {
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 {
324	>	for (int i = 0; i < SIZE; ++i) {
325	>	assertEquals(i, q.take());
326	>	}
327	>
328	>	Thread.currentThread().interrupt();
329	>	try {
330	>	q.take();
331	>	shouldThrow();
332	>	} catch (InterruptedException success) {}
333	>	assertFalse(Thread.interrupted());
334
335	+	pleaseInterrupt.countDown();
336	+	try {
337	+	q.take();
338	+	shouldThrow();
339	+	} catch (InterruptedException success) {}
340	+	assertFalse(Thread.interrupted());
341	+	}});
342	+
343	+	await(pleaseInterrupt);
344	+	assertThreadStaysAlive(t);
345	+	t.interrupt();
346	+	awaitTermination(t);
347	+	}
348
349		/**
350		* poll succeeds unless empty
#	Line 455 | Line 352 | public class PriorityBlockingQueueTest e
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());
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() {
364	<	try {
365	<	PriorityBlockingQueue q = populatedQueue(SIZE);
366	<	for (int i = 0; i < SIZE; ++i) {
367	<	assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
368	<	}
472	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
473	<	} catch (InterruptedException e){
474	<	unexpectedException();
475	<	}
363	>	public void testTimedPoll0() throws InterruptedException {
364	>	PriorityBlockingQueue q = populatedQueue(SIZE);
365	>	for (int i = 0; i < SIZE; ++i) {
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() {
375	<	try {
376	<	PriorityBlockingQueue q = populatedQueue(SIZE);
377	<	for (int i = 0; i < SIZE; ++i) {
378	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
379	<	}
380	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
381	<	} catch (InterruptedException e){
382	<	unexpectedException();
383	<	}
374	>	public void testTimedPoll() throws InterruptedException {
375	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
376	>	for (int i = 0; i < SIZE; ++i) {
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		/**
388		* Interrupted timed poll throws InterruptedException instead of
389		* returning timeout status
390		*/
391	<	public void testInterruptedTimedPoll() {
392	<	Thread t = new Thread(new Runnable() {
393	<	public void run() {
394	<	try {
395	<	PriorityBlockingQueue q = populatedQueue(SIZE);
396	<	for (int i = 0; i < SIZE; ++i) {
397	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
398	<	}
399	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
506	<	} catch (InterruptedException success){
507	<	}
508	<	}});
509	<	t.start();
510	<	try {
511	<	Thread.sleep(SHORT_DELAY_MS);
512	<	t.interrupt();
513	<	t.join();
514	<	}
515	<	catch (InterruptedException ie) {
516	<	unexpectedException();
517	<	}
518	<	}
519	<
520	<	/**
521	<	*  timed poll before a delayed offer fails; after offer succeeds;
522	<	*  on interruption throws
523	<	*/
524	<	public void testTimedPollWithOffer() {
525	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
526	<	Thread t = new Thread(new Runnable() {
527	<	public void run() {
528	<	try {
529	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
530	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
531	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
532	<	threadShouldThrow();
533	<	} catch (InterruptedException success) { }
391	>	public void testInterruptedTimedPoll() throws InterruptedException {
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	>	for (int i = 0; i < SIZE; ++i) {
397	>	long t0 = System.nanoTime();
398	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
399	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
400		}
401	<	});
402	<	try {
403	<	t.start();
404	<	Thread.sleep(SMALL_DELAY_MS);
405	<	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
406	<	t.interrupt();
407	<	t.join();
408	<	} catch (Exception e){
409	<	unexpectedException();
544	<	}
545	<	}
401	>	long t0 = System.nanoTime();
402	>	aboutToWait.countDown();
403	>	try {
404	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
405	>	shouldThrow();
406	>	} catch (InterruptedException success) {
407	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
408	>	}
409	>	}});
410
411	+	aboutToWait.await();
412	+	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
413	+	t.interrupt();
414	+	awaitTermination(t, MEDIUM_DELAY_MS);
415	+	}
416
417		/**
418		* peek returns next element, or null if empty
#	Line 551 | Line 420 | public class PriorityBlockingQueueTest e
420		public void testPeek() {
421		PriorityBlockingQueue q = populatedQueue(SIZE);
422		for (int i = 0; i < SIZE; ++i) {
423	<	assertEquals(i, ((Integer)q.peek()).intValue());
424	<	q.poll();
423	>	assertEquals(i, q.peek());
424	>	assertEquals(i, q.poll());
425		assertTrue(q.peek() == null ||
426	<	i != ((Integer)q.peek()).intValue());
426	>	!q.peek().equals(i));
427		}
428	<	assertNull(q.peek());
428	>	assertNull(q.peek());
429		}
430
431		/**
#	Line 565 | Line 434 | public class PriorityBlockingQueueTest e
434		public void testElement() {
435		PriorityBlockingQueue q = populatedQueue(SIZE);
436		for (int i = 0; i < SIZE; ++i) {
437	<	assertEquals(i, ((Integer)q.element()).intValue());
438	<	q.poll();
437	>	assertEquals(i, q.element());
438	>	assertEquals(i, q.poll());
439		}
440		try {
441		q.element();
442		shouldThrow();
443	<	}
575	<	catch (NoSuchElementException success) {}
443	>	} catch (NoSuchElementException success) {}
444		}
445
446		/**
#	Line 581 | Line 449 | public class PriorityBlockingQueueTest e
449		public void testRemove() {
450		PriorityBlockingQueue q = populatedQueue(SIZE);
451		for (int i = 0; i < SIZE; ++i) {
452	<	assertEquals(i, ((Integer)q.remove()).intValue());
452	>	assertEquals(i, q.remove());
453		}
454		try {
455		q.remove();
456		shouldThrow();
457	<	} catch (NoSuchElementException success){
590	<	}
457	>	} catch (NoSuchElementException success) {}
458		}
459
460		/**
594	–	* remove(x) removes x and returns true if present
595	–	*/
596	–	public void testRemoveElement() {
597	–	PriorityBlockingQueue q = populatedQueue(SIZE);
598	–	for (int i = 1; i < SIZE; i+=2) {
599	–	assertTrue(q.remove(new Integer(i)));
600	–	}
601	–	for (int i = 0; i < SIZE; i+=2) {
602	–	assertTrue(q.remove(new Integer(i)));
603	–	assertFalse(q.remove(new Integer(i+1)));
604	–	}
605	–	assertTrue(q.isEmpty());
606	–	}
607	–
608	–	/**
461		* contains(x) reports true when elements added but not yet removed
462		*/
463		public void testContains() {
#	Line 625 | Line 477 | public class PriorityBlockingQueueTest e
477		q.clear();
478		assertTrue(q.isEmpty());
479		assertEquals(0, q.size());
480	<	assertEquals(NOCAP, q.remainingCapacity());
629	<	q.add(new Integer(1));
480	>	q.add(one);
481		assertFalse(q.isEmpty());
482	+	assertTrue(q.contains(one));
483		q.clear();
484		assertTrue(q.isEmpty());
485		}
#	Line 660 | Line 512 | public class PriorityBlockingQueueTest e
512		assertTrue(changed);
513
514		assertTrue(q.containsAll(p));
515	<	assertEquals(SIZE-i, q.size());
515	>	assertEquals(SIZE - i, q.size());
516		p.remove();
517		}
518		}
#	Line 673 | Line 525 | public class PriorityBlockingQueueTest e
525		PriorityBlockingQueue q = populatedQueue(SIZE);
526		PriorityBlockingQueue p = populatedQueue(i);
527		assertTrue(q.removeAll(p));
528	<	assertEquals(SIZE-i, q.size());
528	>	assertEquals(SIZE - i, q.size());
529		for (int j = 0; j < i; ++j) {
530	<	Integer I = (Integer)(p.remove());
531	<	assertFalse(q.contains(I));
530	>	Integer x = (Integer)(p.remove());
531	>	assertFalse(q.contains(x));
532		}
533		}
534		}
535
536		/**
537	<	*  toArray contains all elements
537	>	* toArray contains all elements
538		*/
539	<	public void testToArray() {
539	>	public void testToArray() throws InterruptedException {
540		PriorityBlockingQueue q = populatedQueue(SIZE);
541	<	Object[] o = q.toArray();
541	>	Object[] o = q.toArray();
542		Arrays.sort(o);
543	<	try {
544	<	for(int i = 0; i < o.length; i++)
693	<	assertEquals(o[i], q.take());
694	<	} catch (InterruptedException e){
695	<	unexpectedException();
696	<	}
543	>	for (int i = 0; i < o.length; i++)
544	>	assertSame(o[i], q.take());
545		}
546
547		/**
548		* toArray(a) contains all elements
549		*/
550	<	public void testToArray2() {
551	<	PriorityBlockingQueue q = populatedQueue(SIZE);
552	<	Integer[] ints = new Integer[SIZE];
553	<	ints = (Integer[])q.toArray(ints);
550	>	public void testToArray2() throws InterruptedException {
551	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
552	>	Integer[] ints = new Integer[SIZE];
553	>	Integer[] array = q.toArray(ints);
554	>	assertSame(ints, array);
555		Arrays.sort(ints);
556	<	try {
557	<	for(int i = 0; i < ints.length; i++)
709	<	assertEquals(ints[i], q.take());
710	<	} catch (InterruptedException e){
711	<	unexpectedException();
712	<	}
556	>	for (int i = 0; i < ints.length; i++)
557	>	assertSame(ints[i], q.take());
558		}
559
560		/**
561	<	* toArray(null) throws NPE
717	<	*/
718	<	public void testToArray_BadArg() {
719	<	try {
720	<	PriorityBlockingQueue q = populatedQueue(SIZE);
721	<	Object o[] = q.toArray(null);
722	<	shouldThrow();
723	<	} catch(NullPointerException success){}
724	<	}
725	<
726	<	/**
727	<	* toArray with incompatable array type throws CCE
561	>	* toArray(incompatible array type) throws ArrayStoreException
562		*/
563		public void testToArray1_BadArg() {
564	<	try {
565	<	PriorityBlockingQueue q = populatedQueue(SIZE);
566	<	Object o[] = q.toArray(new String[10] );
567	<	shouldThrow();
568	<	} catch(ArrayStoreException  success){}
564	>	PriorityBlockingQueue q = populatedQueue(SIZE);
565	>	try {
566	>	q.toArray(new String[10]);
567	>	shouldThrow();
568	>	} catch (ArrayStoreException success) {}
569		}
570	<
570	>
571		/**
572		* iterator iterates through all elements
573		*/
574		public void testIterator() {
575		PriorityBlockingQueue q = populatedQueue(SIZE);
576	<	int i = 0;
577	<	Iterator it = q.iterator();
578	<	while(it.hasNext()) {
576	>	Iterator it = q.iterator();
577	>	int i;
578	>	for (i = 0; it.hasNext(); i++)
579		assertTrue(q.contains(it.next()));
746	–	++i;
747	–	}
580		assertEquals(i, SIZE);
581	+	assertIteratorExhausted(it);
582	+	}
583	+
584	+	/**
585	+	* iterator of empty collection has no elements
586	+	*/
587	+	public void testEmptyIterator() {
588	+	assertIteratorExhausted(new PriorityBlockingQueue().iterator());
589		}
590
591		/**
592		* iterator.remove removes current element
593		*/
594	<	public void testIteratorRemove () {
594	>	public void testIteratorRemove() {
595		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
596		q.add(new Integer(2));
597		q.add(new Integer(1));
#	Line 767 | Line 607 | public class PriorityBlockingQueueTest e
607		assertFalse(it.hasNext());
608		}
609
770	–
610		/**
611		* toString contains toStrings of elements
612		*/
#	Line 775 | Line 614 | public class PriorityBlockingQueueTest e
614		PriorityBlockingQueue q = populatedQueue(SIZE);
615		String s = q.toString();
616		for (int i = 0; i < SIZE; ++i) {
617	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
617	>	assertTrue(s.contains(String.valueOf(i)));
618		}
619	<	}
619	>	}
620
621		/**
622	<	* offer transfers elements across Executor tasks
622	>	* timed poll transfers elements across Executor tasks
623		*/
624		public void testPollInExecutor() {
625		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
626	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
627		ExecutorService executor = Executors.newFixedThreadPool(2);
628	<	executor.execute(new Runnable() {
629	<	public void run() {
630	<	threadAssertNull(q.poll());
631	<	try {
632	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
633	<	threadAssertTrue(q.isEmpty());
634	<	}
635	<	catch (InterruptedException e) {
636	<	threadUnexpectedException();
637	<	}
638	<	}
639	<	});
628	>	executor.execute(new CheckedRunnable() {
629	>	public void realRun() throws InterruptedException {
630	>	assertNull(q.poll());
631	>	threadsStarted.await();
632	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
633	>	checkEmpty(q);
634	>	}});
635	>
636	>	executor.execute(new CheckedRunnable() {
637	>	public void realRun() throws InterruptedException {
638	>	threadsStarted.await();
639	>	q.put(one);
640	>	}});
641
801	–	executor.execute(new Runnable() {
802	–	public void run() {
803	–	try {
804	–	Thread.sleep(SMALL_DELAY_MS);
805	–	q.put(new Integer(1));
806	–	}
807	–	catch (InterruptedException e) {
808	–	threadUnexpectedException();
809	–	}
810	–	}
811	–	});
812	–
642		joinPool(executor);
643		}
644
645		/**
646	<	* A deserialized serialized queue has same elements
646	>	* A deserialized serialized queue has same elements
647		*/
648	<	public void testSerialization() {
649	<	PriorityBlockingQueue q = populatedQueue(SIZE);
650	<	try {
651	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
652	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
653	<	out.writeObject(q);
654	<	out.close();
655	<
656	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
828	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
829	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
830	<	assertEquals(q.size(), r.size());
831	<	while (!q.isEmpty())
832	<	assertEquals(q.remove(), r.remove());
833	<	} catch(Exception e){
834	<	unexpectedException();
835	<	}
836	<	}
837	<
838	<	/**
839	<	* drainTo(null) throws NPE
840	<	*/
841	<	public void testDrainToNull() {
842	<	PriorityBlockingQueue q = populatedQueue(SIZE);
843	<	try {
844	<	q.drainTo(null);
845	<	shouldThrow();
846	<	} catch(NullPointerException success) {
847	<	}
848	<	}
849	<
850	<	/**
851	<	* drainTo(this) throws IAE
852	<	*/
853	<	public void testDrainToSelf() {
854	<	PriorityBlockingQueue q = populatedQueue(SIZE);
855	<	try {
856	<	q.drainTo(q);
857	<	shouldThrow();
858	<	} catch(IllegalArgumentException success) {
648	>	public void testSerialization() throws Exception {
649	>	Queue x = populatedQueue(SIZE);
650	>	Queue y = serialClone(x);
651	>
652	>	assertNotSame(x, y);
653	>	assertEquals(x.size(), y.size());
654	>	while (!x.isEmpty()) {
655	>	assertFalse(y.isEmpty());
656	>	assertEquals(x.remove(), y.remove());
657		}
658	+	assertTrue(y.isEmpty());
659		}
660
661		/**
662		* drainTo(c) empties queue into another collection c
663	<	*/
663	>	*/
664		public void testDrainTo() {
665		PriorityBlockingQueue q = populatedQueue(SIZE);
666		ArrayList l = new ArrayList();
667		q.drainTo(l);
668	<	assertEquals(q.size(), 0);
669	<	assertEquals(l.size(), SIZE);
670	<	for (int i = 0; i < SIZE; ++i)
668	>	assertEquals(0, q.size());
669	>	assertEquals(SIZE, l.size());
670	>	for (int i = 0; i < SIZE; ++i)
671	>	assertEquals(l.get(i), new Integer(i));
672	>	q.add(zero);
673	>	q.add(one);
674	>	assertFalse(q.isEmpty());
675	>	assertTrue(q.contains(zero));
676	>	assertTrue(q.contains(one));
677	>	l.clear();
678	>	q.drainTo(l);
679	>	assertEquals(0, q.size());
680	>	assertEquals(2, l.size());
681	>	for (int i = 0; i < 2; ++i)
682		assertEquals(l.get(i), new Integer(i));
683		}
684
685		/**
686		* drainTo empties queue
687	<	*/
688	<	public void testDrainToWithActivePut() {
687	>	*/
688	>	public void testDrainToWithActivePut() throws InterruptedException {
689		final PriorityBlockingQueue q = populatedQueue(SIZE);
690	<	Thread t = new Thread(new Runnable() {
691	<	public void run() {
692	<	q.put(new Integer(SIZE+1));
693	<	}
884	<	});
885	<	try {
886	<	t.start();
887	<	ArrayList l = new ArrayList();
888	<	q.drainTo(l);
889	<	assertTrue(l.size() >= SIZE);
890	<	for (int i = 0; i < SIZE; ++i)
891	<	assertEquals(l.get(i), new Integer(i));
892	<	t.join();
893	<	assertTrue(q.size() + l.size() == SIZE+1);
894	<	} catch(Exception e){
895	<	unexpectedException();
896	<	}
897	<	}
690	>	Thread t = new Thread(new CheckedRunnable() {
691	>	public void realRun() {
692	>	q.put(new Integer(SIZE + 1));
693	>	}});
694
695	<	/**
696	<	* drainTo(null, n) throws NPE
697	<	*/
698	<	public void testDrainToNullN() {
699	<	PriorityBlockingQueue q = populatedQueue(SIZE);
700	<	try {
701	<	q.drainTo(null, 0);
702	<	shouldThrow();
907	<	} catch(NullPointerException success) {
908	<	}
909	<	}
910	<
911	<	/**
912	<	* drainTo(this, n) throws IAE
913	<	*/
914	<	public void testDrainToSelfN() {
915	<	PriorityBlockingQueue q = populatedQueue(SIZE);
916	<	try {
917	<	q.drainTo(q, 0);
918	<	shouldThrow();
919	<	} catch(IllegalArgumentException success) {
920	<	}
695	>	t.start();
696	>	ArrayList l = new ArrayList();
697	>	q.drainTo(l);
698	>	assertTrue(l.size() >= SIZE);
699	>	for (int i = 0; i < SIZE; ++i)
700	>	assertEquals(l.get(i), new Integer(i));
701	>	t.join();
702	>	assertTrue(q.size() + l.size() >= SIZE);
703		}
704
705		/**
706	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
707	<	*/
706	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
707	>	*/
708		public void testDrainToN() {
709	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
710		for (int i = 0; i < SIZE + 2; ++i) {
711	<	PriorityBlockingQueue q = populatedQueue(SIZE);
711	>	for (int j = 0; j < SIZE; j++)
712	>	assertTrue(q.offer(new Integer(j)));
713		ArrayList l = new ArrayList();
714		q.drainTo(l, i);
715	<	int k = (i < SIZE)? i : SIZE;
716	<	assertEquals(q.size(), SIZE-k);
717	<	assertEquals(l.size(), k);
718	<	for (int j = 0; j < k; ++j)
719	<	assertTrue(l.contains(new Integer(j)));
715	>	int k = (i < SIZE) ? i : SIZE;
716	>	assertEquals(k, l.size());
717	>	assertEquals(SIZE - k, q.size());
718	>	for (int j = 0; j < k; ++j)
719	>	assertEquals(l.get(j), new Integer(j));
720	>	do {} while (q.poll() != null);
721		}
722		}
723
724	+	/**
725	+	* remove(null), contains(null) always return false
726	+	*/
727	+	public void testNeverContainsNull() {
728	+	Collection<?>[] qs = {
729	+	new PriorityBlockingQueue<Object>(),
730	+	populatedQueue(2),
731	+	};
732	+
733	+	for (Collection<?> q : qs) {
734	+	assertFalse(q.contains(null));
735	+	assertFalse(q.remove(null));
736	+	}
737	+	}
738
739		}

Diff Legend

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