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.6 by dl, Thu Sep 25 11:02:41 2003 UTC vs.
Revision 1.69 by jsr166, Sun Oct 16 20:44:18 2016 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
59	<	* Integers 0 ... n.
58	>	* Returns a new queue of given size containing consecutive
59	>	* Integers 0 ... n - 1.
60		*/
61	<	private PriorityBlockingQueue populatedQueue(int n) {
62	<	PriorityBlockingQueue q = new PriorityBlockingQueue(n);
61	>	private PriorityBlockingQueue<Integer> populatedQueue(int n) {
62	>	PriorityBlockingQueue<Integer> q =
63	>	new PriorityBlockingQueue<Integer>(n);
64		assertTrue(q.isEmpty());
65	<	for(int i = n-1; i >= 0; i-=2)
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	>	assertEquals((Integer) 0, q.peek());
73		return q;
74		}
75	<
75	>
76		/**
77		* A new queue has unbounded capacity
78		*/
79		public void testConstructor1() {
80	<	assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
80	>	assertEquals(Integer.MAX_VALUE,
81	>	new PriorityBlockingQueue(SIZE).remainingCapacity());
82		}
83
84		/**
85	<	* Constructor throws IAE if  capacity argument nonpositive
85	>	* Constructor throws IAE if capacity argument nonpositive
86		*/
87		public void testConstructor2() {
88		try {
89	<	PriorityBlockingQueue q = new PriorityBlockingQueue(0);
89	>	new PriorityBlockingQueue(0);
90		shouldThrow();
91	<	}
66	<	catch (IllegalArgumentException success) {}
91	>	} catch (IllegalArgumentException success) {}
92		}
93
94		/**
#	Line 71 | Line 96 | public class PriorityBlockingQueueTest e
96		*/
97		public void testConstructor3() {
98		try {
99	<	PriorityBlockingQueue q = new PriorityBlockingQueue(null);
99	>	new PriorityBlockingQueue(null);
100		shouldThrow();
101	<	}
77	<	catch (NullPointerException success) {}
101	>	} catch (NullPointerException success) {}
102		}
103
104		/**
105		* Initializing from Collection of null elements throws NPE
106		*/
107		public void testConstructor4() {
108	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
109		try {
110	<	Integer[] ints = new Integer[SIZE];
86	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
110	>	new PriorityBlockingQueue(elements);
111		shouldThrow();
112	<	}
89	<	catch (NullPointerException success) {}
112	>	} catch (NullPointerException success) {}
113		}
114
115		/**
116		* Initializing from Collection with some null elements throws NPE
117		*/
118		public void testConstructor5() {
119	+	Integer[] ints = new Integer[SIZE];
120	+	for (int i = 0; i < SIZE - 1; ++i)
121	+	ints[i] = i;
122	+	Collection<Integer> elements = Arrays.asList(ints);
123		try {
124	<	Integer[] ints = new Integer[SIZE];
98	<	for (int i = 0; i < SIZE-1; ++i)
99	<	ints[i] = new Integer(i);
100	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
124	>	new PriorityBlockingQueue(elements);
125		shouldThrow();
126	<	}
103	<	catch (NullPointerException success) {}
126	>	} catch (NullPointerException success) {}
127		}
128
129		/**
130		* Queue contains all elements of collection used to initialize
131		*/
132		public void testConstructor6() {
133	<	try {
134	<	Integer[] ints = new Integer[SIZE];
135	<	for (int i = 0; i < SIZE; ++i)
136	<	ints[i] = new Integer(i);
137	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
138	<	for (int i = 0; i < SIZE; ++i)
116	<	assertEquals(ints[i], q.poll());
117	<	}
118	<	finally {}
133	>	Integer[] ints = new Integer[SIZE];
134	>	for (int i = 0; i < SIZE; ++i)
135	>	ints[i] = i;
136	>	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
137	>	for (int i = 0; i < SIZE; ++i)
138	>	assertEquals(ints[i], q.poll());
139		}
140
141		/**
142		* The comparator used in constructor is used
143		*/
144		public void testConstructor7() {
145	<	try {
146	<	MyReverseComparator cmp = new MyReverseComparator();
147	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
148	<	assertEquals(cmp, q.comparator());
149	<	Integer[] ints = new Integer[SIZE];
150	<	for (int i = 0; i < SIZE; ++i)
151	<	ints[i] = new Integer(i);
152	<	q.addAll(Arrays.asList(ints));
153	<	for (int i = SIZE-1; i >= 0; --i)
134	<	assertEquals(ints[i], q.poll());
135	<	}
136	<	finally {}
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)
153	>	assertEquals(ints[i], q.poll());
154		}
155
156		/**
#	Line 142 | Line 159 | public class PriorityBlockingQueueTest e
159		public void testEmpty() {
160		PriorityBlockingQueue q = new PriorityBlockingQueue(2);
161		assertTrue(q.isEmpty());
162	<	assertEquals(NOCAP, q.remainingCapacity());
162	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
163		q.add(one);
164		assertFalse(q.isEmpty());
165		q.add(two);
#	Line 152 | Line 169 | public class PriorityBlockingQueueTest e
169		}
170
171		/**
172	<	* remainingCapacity does not change when elementa added or removed,
156	<	* but size does
172	>	* remainingCapacity() always returns Integer.MAX_VALUE
173		*/
174		public void testRemainingCapacity() {
175	<	PriorityBlockingQueue q = populatedQueue(SIZE);
175	>	BlockingQueue q = populatedQueue(SIZE);
176		for (int i = 0; i < SIZE; ++i) {
177	<	assertEquals(NOCAP, q.remainingCapacity());
178	<	assertEquals(SIZE-i, q.size());
179	<	q.remove();
177	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
178	>	assertEquals(SIZE - i, q.size());
179	>	assertEquals(i, q.remove());
180		}
181		for (int i = 0; i < SIZE; ++i) {
182	<	assertEquals(NOCAP, q.remainingCapacity());
182	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
183		assertEquals(i, q.size());
184	<	q.add(new Integer(i));
184	>	assertTrue(q.add(i));
185		}
186		}
187
188		/**
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	–	/**
189		* Offer of comparable element succeeds
190		*/
191		public void testOffer() {
#	Line 193 | Line 198 | public class PriorityBlockingQueueTest e
198		* Offer of non-Comparable throws CCE
199		*/
200		public void testOfferNonComparable() {
201	+	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
202		try {
197	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
198	–	q.offer(new Object());
199	–	q.offer(new Object());
203		q.offer(new Object());
204		shouldThrow();
205	+	} catch (ClassCastException success) {
206	+	assertTrue(q.isEmpty());
207	+	assertEquals(0, q.size());
208	+	assertNull(q.poll());
209		}
203	–	catch(ClassCastException success) {}
210		}
211
212		/**
#	Line 215 | Line 221 | public class PriorityBlockingQueueTest e
221		}
222
223		/**
224	<	* addAll(null) throws NPE
224	>	* addAll(this) throws IAE
225		*/
226	<	public void testAddAll1() {
227	<	try {
222	<	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
223	<	q.addAll(null);
224	<	shouldThrow();
225	<	}
226	<	catch (NullPointerException success) {}
227	<	}
228	<	/**
229	<	* addAll of a collection with null elements throws NPE
230	<	*/
231	<	public void testAddAll2() {
226	>	public void testAddAllSelf() {
227	>	PriorityBlockingQueue q = populatedQueue(SIZE);
228		try {
229	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
234	<	Integer[] ints = new Integer[SIZE];
235	<	q.addAll(Arrays.asList(ints));
229	>	q.addAll(q);
230		shouldThrow();
231	<	}
238	<	catch (NullPointerException success) {}
231	>	} catch (IllegalArgumentException success) {}
232		}
233	+
234		/**
235		* addAll of a collection with any null elements throws NPE after
236		* possibly adding some elements
237		*/
238		public void testAddAll3() {
239	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
240	+	Integer[] ints = new Integer[SIZE];
241	+	for (int i = 0; i < SIZE - 1; ++i)
242	+	ints[i] = new Integer(i);
243		try {
246	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
247	–	Integer[] ints = new Integer[SIZE];
248	–	for (int i = 0; i < SIZE-1; ++i)
249	–	ints[i] = new Integer(i);
244		q.addAll(Arrays.asList(ints));
245		shouldThrow();
246	<	}
253	<	catch (NullPointerException success) {}
246	>	} catch (NullPointerException success) {}
247		}
248
249		/**
250		* Queue contains all elements of successful addAll
251		*/
252		public void testAddAll5() {
253	<	try {
254	<	Integer[] empty = new Integer[0];
255	<	Integer[] ints = new Integer[SIZE];
256	<	for (int i = SIZE-1; i >= 0; --i)
257	<	ints[i] = new Integer(i);
258	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
259	<	assertFalse(q.addAll(Arrays.asList(empty)));
260	<	assertTrue(q.addAll(Arrays.asList(ints)));
261	<	for (int i = 0; i < SIZE; ++i)
269	<	assertEquals(ints[i], q.poll());
270	<	}
271	<	finally {}
253	>	Integer[] empty = new Integer[0];
254	>	Integer[] ints = new Integer[SIZE];
255	>	for (int i = SIZE - 1; i >= 0; --i)
256	>	ints[i] = new Integer(i);
257	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
258	>	assertFalse(q.addAll(Arrays.asList(empty)));
259	>	assertTrue(q.addAll(Arrays.asList(ints)));
260	>	for (int i = 0; i < SIZE; ++i)
261	>	assertEquals(ints[i], q.poll());
262		}
263
264		/**
275	–	* put(null) throws NPE
276	–	*/
277	–	public void testPutNull() {
278	–	try {
279	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
280	–	q.put(null);
281	–	shouldThrow();
282	–	}
283	–	catch (NullPointerException success){
284	–	}
285	–	}
286	–
287	–	/**
265		* all elements successfully put are contained
266		*/
267	<	public void testPut() {
268	<	try {
269	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
270	<	for (int i = 0; i < SIZE; ++i) {
271	<	Integer I = new Integer(i);
272	<	q.put(I);
296	<	assertTrue(q.contains(I));
297	<	}
298	<	assertEquals(SIZE, q.size());
299	<	}
300	<	finally {
267	>	public void testPut() {
268	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
269	>	for (int i = 0; i < SIZE; ++i) {
270	>	Integer x = new Integer(i);
271	>	q.put(x);
272	>	assertTrue(q.contains(x));
273		}
274	+	assertEquals(SIZE, q.size());
275		}
276
277		/**
278		* put doesn't block waiting for take
279		*/
280	<	public void testPutWithTake() {
280	>	public void testPutWithTake() throws InterruptedException {
281		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
282	<	Thread t = new Thread(new Runnable() {
283	<	public void run() {
284	<	int added = 0;
285	<	try {
286	<	q.put(new Integer(0));
287	<	++added;
288	<	q.put(new Integer(0));
289	<	++added;
290	<	q.put(new Integer(0));
291	<	++added;
319	<	q.put(new Integer(0));
320	<	++added;
321	<	threadAssertTrue(added == 4);
322	<	} finally {
323	<	}
324	<	}
325	<	});
326	<	try {
327	<	t.start();
328	<	Thread.sleep(SHORT_DELAY_MS);
329	<	q.take();
330	<	t.interrupt();
331	<	t.join();
332	<	} catch (Exception e){
333	<	unexpectedException();
334	<	}
282	>	final int size = 4;
283	>	Thread t = newStartedThread(new CheckedRunnable() {
284	>	public void realRun() {
285	>	for (int i = 0; i < size; i++)
286	>	q.put(new Integer(0));
287	>	}});
288	>
289	>	awaitTermination(t);
290	>	assertEquals(size, q.size());
291	>	q.take();
292		}
293
294		/**
295		* timed offer does not time out
296		*/
297	<	public void testTimedOffer() {
297	>	public void testTimedOffer() throws InterruptedException {
298		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
299	<	Thread t = new Thread(new Runnable() {
300	<	public void run() {
301	<	try {
302	<	q.put(new Integer(0));
303	<	q.put(new Integer(0));
304	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
305	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
349	<	} finally { }
350	<	}
351	<	});
352	<
353	<	try {
354	<	t.start();
355	<	Thread.sleep(SMALL_DELAY_MS);
356	<	t.interrupt();
357	<	t.join();
358	<	} catch (Exception e){
359	<	unexpectedException();
360	<	}
361	<	}
299	>	Thread t = newStartedThread(new CheckedRunnable() {
300	>	public void realRun() {
301	>	q.put(new Integer(0));
302	>	q.put(new Integer(0));
303	>	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
304	>	assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
305	>	}});
306
307	<	/**
364	<	* take retrieves elements in priority order
365	<	*/
366	<	public void testTake() {
367	<	try {
368	<	PriorityBlockingQueue q = populatedQueue(SIZE);
369	<	for (int i = 0; i < SIZE; ++i) {
370	<	assertEquals(i, ((Integer)q.take()).intValue());
371	<	}
372	<	} catch (InterruptedException e){
373	<	unexpectedException();
374	<	}
307	>	awaitTermination(t);
308		}
309
310		/**
311	<	* take blocks interruptibly when empty
311	>	* take retrieves elements in priority order
312		*/
313	<	public void testTakeFromEmpty() {
314	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
315	<	Thread t = new Thread(new Runnable() {
316	<	public void run() {
384	<	try {
385	<	q.take();
386	<	threadShouldThrow();
387	<	} catch (InterruptedException success){ }
388	<	}
389	<	});
390	<	try {
391	<	t.start();
392	<	Thread.sleep(SHORT_DELAY_MS);
393	<	t.interrupt();
394	<	t.join();
395	<	} catch (Exception e){
396	<	unexpectedException();
313	>	public void testTake() throws InterruptedException {
314	>	PriorityBlockingQueue q = populatedQueue(SIZE);
315	>	for (int i = 0; i < SIZE; ++i) {
316	>	assertEquals(i, q.take());
317		}
318		}
319
320		/**
321		* Take removes existing elements until empty, then blocks interruptibly
322		*/
323	<	public void testBlockingTake() {
324	<	Thread t = new Thread(new Runnable() {
325	<	public void run() {
326	<	try {
327	<	PriorityBlockingQueue q = populatedQueue(SIZE);
328	<	for (int i = 0; i < SIZE; ++i) {
329	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
330	<	}
411	<	q.take();
412	<	threadShouldThrow();
413	<	} catch (InterruptedException success){
414	<	}
415	<	}});
416	<	t.start();
417	<	try {
418	<	Thread.sleep(SHORT_DELAY_MS);
419	<	t.interrupt();
420	<	t.join();
421	<	}
422	<	catch (InterruptedException ie) {
423	<	unexpectedException();
424	<	}
425	<	}
323	>	public void testBlockingTake() throws InterruptedException {
324	>	final PriorityBlockingQueue q = populatedQueue(SIZE);
325	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
326	>	Thread t = newStartedThread(new CheckedRunnable() {
327	>	public void realRun() throws InterruptedException {
328	>	for (int i = 0; i < SIZE; ++i) {
329	>	assertEquals(i, q.take());
330	>	}
331
332	+	Thread.currentThread().interrupt();
333	+	try {
334	+	q.take();
335	+	shouldThrow();
336	+	} catch (InterruptedException success) {}
337	+	assertFalse(Thread.interrupted());
338	+
339	+	pleaseInterrupt.countDown();
340	+	try {
341	+	q.take();
342	+	shouldThrow();
343	+	} catch (InterruptedException success) {}
344	+	assertFalse(Thread.interrupted());
345	+	}});
346	+
347	+	await(pleaseInterrupt);
348	+	assertThreadStaysAlive(t);
349	+	t.interrupt();
350	+	awaitTermination(t);
351	+	}
352
353		/**
354		* poll succeeds unless empty
#	Line 431 | Line 356 | public class PriorityBlockingQueueTest e
356		public void testPoll() {
357		PriorityBlockingQueue q = populatedQueue(SIZE);
358		for (int i = 0; i < SIZE; ++i) {
359	<	assertEquals(i, ((Integer)q.poll()).intValue());
359	>	assertEquals(i, q.poll());
360		}
361	<	assertNull(q.poll());
361	>	assertNull(q.poll());
362		}
363
364		/**
365	<	* timed pool with zero timeout succeeds when non-empty, else times out
365	>	* timed poll with zero timeout succeeds when non-empty, else times out
366		*/
367	<	public void testTimedPoll0() {
368	<	try {
369	<	PriorityBlockingQueue q = populatedQueue(SIZE);
370	<	for (int i = 0; i < SIZE; ++i) {
371	<	assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
372	<	}
448	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
449	<	} catch (InterruptedException e){
450	<	unexpectedException();
451	<	}
367	>	public void testTimedPoll0() throws InterruptedException {
368	>	PriorityBlockingQueue q = populatedQueue(SIZE);
369	>	for (int i = 0; i < SIZE; ++i) {
370	>	assertEquals(i, q.poll(0, MILLISECONDS));
371	>	}
372	>	assertNull(q.poll(0, MILLISECONDS));
373		}
374
375		/**
376	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
376	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
377		*/
378	<	public void testTimedPoll() {
379	<	try {
380	<	PriorityBlockingQueue q = populatedQueue(SIZE);
381	<	for (int i = 0; i < SIZE; ++i) {
382	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
383	<	}
384	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
385	<	} catch (InterruptedException e){
386	<	unexpectedException();
387	<	}
378	>	public void testTimedPoll() throws InterruptedException {
379	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
380	>	for (int i = 0; i < SIZE; ++i) {
381	>	long startTime = System.nanoTime();
382	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
383	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
384	>	}
385	>	long startTime = System.nanoTime();
386	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
387	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
388	>	checkEmpty(q);
389		}
390
391		/**
392		* Interrupted timed poll throws InterruptedException instead of
393		* returning timeout status
394		*/
395	<	public void testInterruptedTimedPoll() {
396	<	Thread t = new Thread(new Runnable() {
397	<	public void run() {
398	<	try {
399	<	PriorityBlockingQueue q = populatedQueue(SIZE);
400	<	for (int i = 0; i < SIZE; ++i) {
401	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
402	<	}
481	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
482	<	} catch (InterruptedException success){
483	<	}
484	<	}});
485	<	t.start();
486	<	try {
487	<	Thread.sleep(SHORT_DELAY_MS);
488	<	t.interrupt();
489	<	t.join();
490	<	}
491	<	catch (InterruptedException ie) {
492	<	unexpectedException();
493	<	}
494	<	}
495	<
496	<	/**
497	<	*  timed poll before a delayed offer fails; after offer succeeds;
498	<	*  on interruption throws
499	<	*/
500	<	public void testTimedPollWithOffer() {
501	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
502	<	Thread t = new Thread(new Runnable() {
503	<	public void run() {
504	<	try {
505	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
506	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
507	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
508	<	threadShouldThrow();
509	<	} catch (InterruptedException success) { }
395	>	public void testInterruptedTimedPoll() throws InterruptedException {
396	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
397	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
398	>	Thread t = newStartedThread(new CheckedRunnable() {
399	>	public void realRun() throws InterruptedException {
400	>	long startTime = System.nanoTime();
401	>	for (int i = 0; i < SIZE; ++i) {
402	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
403		}
404	<	});
405	<	try {
406	<	t.start();
407	<	Thread.sleep(SMALL_DELAY_MS);
408	<	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
409	<	t.interrupt();
410	<	t.join();
411	<	} catch (Exception e){
519	<	unexpectedException();
520	<	}
521	<	}
404	>	aboutToWait.countDown();
405	>	try {
406	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
407	>	shouldThrow();
408	>	} catch (InterruptedException success) {
409	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
410	>	}
411	>	}});
412
413	+	aboutToWait.await();
414	+	waitForThreadToEnterWaitState(t);
415	+	t.interrupt();
416	+	awaitTermination(t);
417	+	}
418
419		/**
420		* peek returns next element, or null if empty
#	Line 527 | Line 422 | public class PriorityBlockingQueueTest e
422		public void testPeek() {
423		PriorityBlockingQueue q = populatedQueue(SIZE);
424		for (int i = 0; i < SIZE; ++i) {
425	<	assertEquals(i, ((Integer)q.peek()).intValue());
426	<	q.poll();
425	>	assertEquals(i, q.peek());
426	>	assertEquals(i, q.poll());
427		assertTrue(q.peek() == null ||
428	<	i != ((Integer)q.peek()).intValue());
428	>	!q.peek().equals(i));
429		}
430	<	assertNull(q.peek());
430	>	assertNull(q.peek());
431		}
432
433		/**
#	Line 541 | Line 436 | public class PriorityBlockingQueueTest e
436		public void testElement() {
437		PriorityBlockingQueue q = populatedQueue(SIZE);
438		for (int i = 0; i < SIZE; ++i) {
439	<	assertEquals(i, ((Integer)q.element()).intValue());
440	<	q.poll();
439	>	assertEquals(i, q.element());
440	>	assertEquals(i, q.poll());
441		}
442		try {
443		q.element();
444		shouldThrow();
445	<	}
551	<	catch (NoSuchElementException success) {}
445	>	} catch (NoSuchElementException success) {}
446		}
447
448		/**
#	Line 557 | Line 451 | public class PriorityBlockingQueueTest e
451		public void testRemove() {
452		PriorityBlockingQueue q = populatedQueue(SIZE);
453		for (int i = 0; i < SIZE; ++i) {
454	<	assertEquals(i, ((Integer)q.remove()).intValue());
454	>	assertEquals(i, q.remove());
455		}
456		try {
457		q.remove();
458		shouldThrow();
459	<	} catch (NoSuchElementException success){
566	<	}
459	>	} catch (NoSuchElementException success) {}
460		}
461
462		/**
570	–	* remove(x) removes x and returns true if present
571	–	*/
572	–	public void testRemoveElement() {
573	–	PriorityBlockingQueue q = populatedQueue(SIZE);
574	–	for (int i = 1; i < SIZE; i+=2) {
575	–	assertTrue(q.remove(new Integer(i)));
576	–	}
577	–	for (int i = 0; i < SIZE; i+=2) {
578	–	assertTrue(q.remove(new Integer(i)));
579	–	assertFalse(q.remove(new Integer(i+1)));
580	–	}
581	–	assertTrue(q.isEmpty());
582	–	}
583	–
584	–	/**
463		* contains(x) reports true when elements added but not yet removed
464		*/
465		public void testContains() {
#	Line 601 | Line 479 | public class PriorityBlockingQueueTest e
479		q.clear();
480		assertTrue(q.isEmpty());
481		assertEquals(0, q.size());
482	<	assertEquals(NOCAP, q.remainingCapacity());
605	<	q.add(new Integer(1));
482	>	q.add(one);
483		assertFalse(q.isEmpty());
484	+	assertTrue(q.contains(one));
485		q.clear();
486		assertTrue(q.isEmpty());
487		}
#	Line 636 | Line 514 | public class PriorityBlockingQueueTest e
514		assertTrue(changed);
515
516		assertTrue(q.containsAll(p));
517	<	assertEquals(SIZE-i, q.size());
517	>	assertEquals(SIZE - i, q.size());
518		p.remove();
519		}
520		}
#	Line 649 | Line 527 | public class PriorityBlockingQueueTest e
527		PriorityBlockingQueue q = populatedQueue(SIZE);
528		PriorityBlockingQueue p = populatedQueue(i);
529		assertTrue(q.removeAll(p));
530	<	assertEquals(SIZE-i, q.size());
530	>	assertEquals(SIZE - i, q.size());
531		for (int j = 0; j < i; ++j) {
532	<	Integer I = (Integer)(p.remove());
533	<	assertFalse(q.contains(I));
532	>	Integer x = (Integer)(p.remove());
533	>	assertFalse(q.contains(x));
534		}
535		}
536		}
537
538		/**
539	<	*  toArray contains all elements
539	>	* toArray contains all elements
540		*/
541	<	public void testToArray() {
541	>	public void testToArray() throws InterruptedException {
542		PriorityBlockingQueue q = populatedQueue(SIZE);
543	<	Object[] o = q.toArray();
543	>	Object[] o = q.toArray();
544		Arrays.sort(o);
545	<	try {
546	<	for(int i = 0; i < o.length; i++)
669	<	assertEquals(o[i], q.take());
670	<	} catch (InterruptedException e){
671	<	unexpectedException();
672	<	}
545	>	for (int i = 0; i < o.length; i++)
546	>	assertSame(o[i], q.take());
547		}
548
549		/**
550		* toArray(a) contains all elements
551		*/
552	<	public void testToArray2() {
553	<	PriorityBlockingQueue q = populatedQueue(SIZE);
554	<	Integer[] ints = new Integer[SIZE];
555	<	ints = (Integer[])q.toArray(ints);
552	>	public void testToArray2() throws InterruptedException {
553	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
554	>	Integer[] ints = new Integer[SIZE];
555	>	Integer[] array = q.toArray(ints);
556	>	assertSame(ints, array);
557		Arrays.sort(ints);
558	<	try {
559	<	for(int i = 0; i < ints.length; i++)
685	<	assertEquals(ints[i], q.take());
686	<	} catch (InterruptedException e){
687	<	unexpectedException();
688	<	}
558	>	for (int i = 0; i < ints.length; i++)
559	>	assertSame(ints[i], q.take());
560		}
561	<
561	>
562	>	/**
563	>	* toArray(incompatible array type) throws ArrayStoreException
564	>	*/
565	>	public void testToArray1_BadArg() {
566	>	PriorityBlockingQueue q = populatedQueue(SIZE);
567	>	try {
568	>	q.toArray(new String[10]);
569	>	shouldThrow();
570	>	} catch (ArrayStoreException success) {}
571	>	}
572	>
573		/**
574		* iterator iterates through all elements
575		*/
576		public void testIterator() {
577		PriorityBlockingQueue q = populatedQueue(SIZE);
578	<	int i = 0;
579	<	Iterator it = q.iterator();
580	<	while(it.hasNext()) {
578	>	Iterator it = q.iterator();
579	>	int i;
580	>	for (i = 0; it.hasNext(); i++)
581		assertTrue(q.contains(it.next()));
700	–	++i;
701	–	}
582		assertEquals(i, SIZE);
583	+	assertIteratorExhausted(it);
584	+	}
585	+
586	+	/**
587	+	* iterator of empty collection has no elements
588	+	*/
589	+	public void testEmptyIterator() {
590	+	assertIteratorExhausted(new PriorityBlockingQueue().iterator());
591		}
592
593		/**
594		* iterator.remove removes current element
595		*/
596	<	public void testIteratorRemove () {
596	>	public void testIteratorRemove() {
597		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
598		q.add(new Integer(2));
599		q.add(new Integer(1));
#	Line 721 | Line 609 | public class PriorityBlockingQueueTest e
609		assertFalse(it.hasNext());
610		}
611
724	–
612		/**
613		* toString contains toStrings of elements
614		*/
#	Line 729 | Line 616 | public class PriorityBlockingQueueTest e
616		PriorityBlockingQueue q = populatedQueue(SIZE);
617		String s = q.toString();
618		for (int i = 0; i < SIZE; ++i) {
619	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
619	>	assertTrue(s.contains(String.valueOf(i)));
620		}
621	<	}
621	>	}
622
623		/**
624	<	* offer transfers elements across Executor tasks
624	>	* timed poll transfers elements across Executor tasks
625		*/
626		public void testPollInExecutor() {
627		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
628	<	ExecutorService executor = Executors.newFixedThreadPool(2);
629	<	executor.execute(new Runnable() {
630	<	public void run() {
631	<	threadAssertNull(q.poll());
632	<	try {
633	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
634	<	threadAssertTrue(q.isEmpty());
635	<	}
636	<	catch (InterruptedException e) {
637	<	threadUnexpectedException();
751	<	}
752	<	}
753	<	});
628	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
629	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
630	>	try (PoolCleaner cleaner = cleaner(executor)) {
631	>	executor.execute(new CheckedRunnable() {
632	>	public void realRun() throws InterruptedException {
633	>	assertNull(q.poll());
634	>	threadsStarted.await();
635	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
636	>	checkEmpty(q);
637	>	}});
638
639	<	executor.execute(new Runnable() {
640	<	public void run() {
641	<	try {
642	<	Thread.sleep(SMALL_DELAY_MS);
643	<	q.put(new Integer(1));
644	<	}
761	<	catch (InterruptedException e) {
762	<	threadUnexpectedException();
763	<	}
764	<	}
765	<	});
766	<
767	<	joinPool(executor);
639	>	executor.execute(new CheckedRunnable() {
640	>	public void realRun() throws InterruptedException {
641	>	threadsStarted.await();
642	>	q.put(one);
643	>	}});
644	>	}
645		}
646
647		/**
648	<	* A deserialized serialized queue has same elements
648	>	* A deserialized serialized queue has same elements
649		*/
650	<	public void testSerialization() {
650	>	public void testSerialization() throws Exception {
651	>	Queue x = populatedQueue(SIZE);
652	>	Queue y = serialClone(x);
653	>
654	>	assertNotSame(x, y);
655	>	assertEquals(x.size(), y.size());
656	>	while (!x.isEmpty()) {
657	>	assertFalse(y.isEmpty());
658	>	assertEquals(x.remove(), y.remove());
659	>	}
660	>	assertTrue(y.isEmpty());
661	>	}
662	>
663	>	/**
664	>	* drainTo(c) empties queue into another collection c
665	>	*/
666	>	public void testDrainTo() {
667		PriorityBlockingQueue q = populatedQueue(SIZE);
668	<	try {
669	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
670	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
671	<	out.writeObject(q);
672	<	out.close();
673	<
674	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
675	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
676	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
677	<	assertEquals(q.size(), r.size());
678	<	while (!q.isEmpty())
679	<	assertEquals(q.remove(), r.remove());
680	<	} catch(Exception e){
681	<	unexpectedException();
668	>	ArrayList l = new ArrayList();
669	>	q.drainTo(l);
670	>	assertEquals(0, q.size());
671	>	assertEquals(SIZE, l.size());
672	>	for (int i = 0; i < SIZE; ++i)
673	>	assertEquals(l.get(i), new Integer(i));
674	>	q.add(zero);
675	>	q.add(one);
676	>	assertFalse(q.isEmpty());
677	>	assertTrue(q.contains(zero));
678	>	assertTrue(q.contains(one));
679	>	l.clear();
680	>	q.drainTo(l);
681	>	assertEquals(0, q.size());
682	>	assertEquals(2, l.size());
683	>	for (int i = 0; i < 2; ++i)
684	>	assertEquals(l.get(i), new Integer(i));
685	>	}
686	>
687	>	/**
688	>	* drainTo empties queue
689	>	*/
690	>	public void testDrainToWithActivePut() throws InterruptedException {
691	>	final PriorityBlockingQueue q = populatedQueue(SIZE);
692	>	Thread t = new Thread(new CheckedRunnable() {
693	>	public void realRun() {
694	>	q.put(new Integer(SIZE + 1));
695	>	}});
696	>
697	>	t.start();
698	>	ArrayList l = new ArrayList();
699	>	q.drainTo(l);
700	>	assertTrue(l.size() >= SIZE);
701	>	for (int i = 0; i < SIZE; ++i)
702	>	assertEquals(l.get(i), new Integer(i));
703	>	t.join();
704	>	assertTrue(q.size() + l.size() >= SIZE);
705	>	}
706	>
707	>	/**
708	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
709	>	*/
710	>	public void testDrainToN() {
711	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
712	>	for (int i = 0; i < SIZE + 2; ++i) {
713	>	for (int j = 0; j < SIZE; j++)
714	>	assertTrue(q.offer(new Integer(j)));
715	>	ArrayList l = new ArrayList();
716	>	q.drainTo(l, i);
717	>	int k = (i < SIZE) ? i : SIZE;
718	>	assertEquals(k, l.size());
719	>	assertEquals(SIZE - k, q.size());
720	>	for (int j = 0; j < k; ++j)
721	>	assertEquals(l.get(j), new Integer(j));
722	>	do {} while (q.poll() != null);
723	>	}
724	>	}
725	>
726	>	/**
727	>	* remove(null), contains(null) always return false
728	>	*/
729	>	public void testNeverContainsNull() {
730	>	Collection<?>[] qs = {
731	>	new PriorityBlockingQueue<Object>(),
732	>	populatedQueue(2),
733	>	};
734	>
735	>	for (Collection<?> q : qs) {
736	>	assertFalse(q.contains(null));
737	>	assertFalse(q.remove(null));
738		}
739		}
740

Diff Legend

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