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.17 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.80 by jsr166, Sun May 6 22:29:24 2018 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	>	import java.util.concurrent.ThreadLocalRandom;
24	>
25	>	import junit.framework.Test;
26
27		public class PriorityBlockingQueueTest extends JSR166TestCase {
28	+
29	+	public static class Generic extends BlockingQueueTest {
30	+	protected BlockingQueue emptyCollection() {
31	+	return new PriorityBlockingQueue();
32	+	}
33	+	}
34	+
35	+	public static class InitialCapacity extends BlockingQueueTest {
36	+	protected BlockingQueue emptyCollection() {
37	+	ThreadLocalRandom rnd = ThreadLocalRandom.current();
38	+	int initialCapacity = rnd.nextInt(1, SIZE);
39	+	return new PriorityBlockingQueue(initialCapacity);
40	+	}
41	+	}
42	+
43		public static void main(String[] args) {
44	<	junit.textui.TestRunner.run (suite());
44	>	main(suite(), args);
45		}
46	+
47		public static Test suite() {
48	<	return new TestSuite(PriorityBlockingQueueTest.class);
48	>	class Implementation implements CollectionImplementation {
49	>	public Class<?> klazz() { return PriorityBlockingQueue.class; }
50	>	public Collection emptyCollection() {
51	>	return new PriorityBlockingQueue();
52	>	}
53	>	public Object makeElement(int i) { return i; }
54	>	public boolean isConcurrent() { return true; }
55	>	public boolean permitsNulls() { return false; }
56	>	}
57	>	class ComparatorImplementation implements CollectionImplementation {
58	>	public Class<?> klazz() { return PriorityBlockingQueue.class; }
59	>	public Collection emptyCollection() {
60	>	ThreadLocalRandom rnd = ThreadLocalRandom.current();
61	>	int initialCapacity = rnd.nextInt(1, 10);
62	>	return new PriorityBlockingQueue(
63	>	initialCapacity, new MyReverseComparator());
64	>	}
65	>	public Object makeElement(int i) { return i; }
66	>	public boolean isConcurrent() { return true; }
67	>	public boolean permitsNulls() { return false; }
68	>	}
69	>	return newTestSuite(
70	>	PriorityBlockingQueueTest.class,
71	>	new Generic().testSuite(),
72	>	new InitialCapacity().testSuite(),
73	>	CollectionTest.testSuite(new Implementation()),
74	>	CollectionTest.testSuite(new ComparatorImplementation()));
75		}
76
23	–	private static final int NOCAP = Integer.MAX_VALUE;
24	–
77		/** Sample Comparator */
78	<	static class MyReverseComparator implements Comparator {
78	>	static class MyReverseComparator implements Comparator, java.io.Serializable {
79		public int compare(Object x, Object y) {
80	<	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;
80	>	return ((Comparable)y).compareTo(x);
81		}
82		}
83
84		/**
85	<	* Create a queue of given size containing consecutive
86	<	* Integers 0 ... n.
85	>	* Returns a new queue of given size containing consecutive
86	>	* Integers 0 ... n - 1.
87		*/
88	<	private PriorityBlockingQueue populatedQueue(int n) {
89	<	PriorityBlockingQueue q = new PriorityBlockingQueue(n);
88	>	private static PriorityBlockingQueue<Integer> populatedQueue(int n) {
89	>	PriorityBlockingQueue<Integer> q =
90	>	new PriorityBlockingQueue<Integer>(n);
91		assertTrue(q.isEmpty());
92	<	for (int i = n-1; i >= 0; i-=2)
92	>	for (int i = n - 1; i >= 0; i -= 2)
93		assertTrue(q.offer(new Integer(i)));
94	<	for (int i = (n & 1); i < n; i+=2)
94	>	for (int i = (n & 1); i < n; i += 2)
95		assertTrue(q.offer(new Integer(i)));
96		assertFalse(q.isEmpty());
97	<	assertEquals(NOCAP, q.remainingCapacity());
97	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
98		assertEquals(n, q.size());
99	+	assertEquals((Integer) 0, q.peek());
100		return q;
101		}
102
#	Line 54 | Line 104 | public class PriorityBlockingQueueTest e
104		* A new queue has unbounded capacity
105		*/
106		public void testConstructor1() {
107	<	assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
107	>	assertEquals(Integer.MAX_VALUE,
108	>	new PriorityBlockingQueue(SIZE).remainingCapacity());
109		}
110
111		/**
112	<	* Constructor throws IAE if  capacity argument nonpositive
112	>	* Constructor throws IllegalArgumentException if capacity argument nonpositive
113		*/
114		public void testConstructor2() {
115		try {
116	<	PriorityBlockingQueue q = new PriorityBlockingQueue(0);
116	>	new PriorityBlockingQueue(0);
117		shouldThrow();
118		} catch (IllegalArgumentException success) {}
119		}
#	Line 72 | Line 123 | public class PriorityBlockingQueueTest e
123		*/
124		public void testConstructor3() {
125		try {
126	<	PriorityBlockingQueue q = new PriorityBlockingQueue(null);
126	>	new PriorityBlockingQueue(null);
127		shouldThrow();
128		} catch (NullPointerException success) {}
129		}
#	Line 81 | Line 132 | public class PriorityBlockingQueueTest e
132		* Initializing from Collection of null elements throws NPE
133		*/
134		public void testConstructor4() {
135	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
136		try {
137	<	Integer[] ints = new Integer[SIZE];
86	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
137	>	new PriorityBlockingQueue(elements);
138		shouldThrow();
139		} catch (NullPointerException success) {}
140		}
#	Line 92 | Line 143 | public class PriorityBlockingQueueTest e
143		* Initializing from Collection with some null elements throws NPE
144		*/
145		public void testConstructor5() {
146	+	Integer[] ints = new Integer[SIZE];
147	+	for (int i = 0; i < SIZE - 1; ++i)
148	+	ints[i] = i;
149	+	Collection<Integer> elements = Arrays.asList(ints);
150		try {
151	<	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));
151	>	new PriorityBlockingQueue(elements);
152		shouldThrow();
153		} catch (NullPointerException success) {}
154		}
#	Line 107 | Line 159 | public class PriorityBlockingQueueTest e
159		public void testConstructor6() {
160		Integer[] ints = new Integer[SIZE];
161		for (int i = 0; i < SIZE; ++i)
162	<	ints[i] = new Integer(i);
162	>	ints[i] = i;
163		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
164		for (int i = 0; i < SIZE; ++i)
165		assertEquals(ints[i], q.poll());
#	Line 124 | Line 176 | public class PriorityBlockingQueueTest e
176		for (int i = 0; i < SIZE; ++i)
177		ints[i] = new Integer(i);
178		q.addAll(Arrays.asList(ints));
179	<	for (int i = SIZE-1; i >= 0; --i)
179	>	for (int i = SIZE - 1; i >= 0; --i)
180		assertEquals(ints[i], q.poll());
181		}
182
#	Line 134 | Line 186 | public class PriorityBlockingQueueTest e
186		public void testEmpty() {
187		PriorityBlockingQueue q = new PriorityBlockingQueue(2);
188		assertTrue(q.isEmpty());
189	<	assertEquals(NOCAP, q.remainingCapacity());
189	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
190		q.add(one);
191		assertFalse(q.isEmpty());
192		q.add(two);
#	Line 144 | Line 196 | public class PriorityBlockingQueueTest e
196		}
197
198		/**
199	<	* remainingCapacity does not change when elements added or removed,
148	<	* but size does
199	>	* remainingCapacity() always returns Integer.MAX_VALUE
200		*/
201		public void testRemainingCapacity() {
202	<	PriorityBlockingQueue q = populatedQueue(SIZE);
202	>	BlockingQueue q = populatedQueue(SIZE);
203		for (int i = 0; i < SIZE; ++i) {
204	<	assertEquals(NOCAP, q.remainingCapacity());
205	<	assertEquals(SIZE-i, q.size());
206	<	q.remove();
204	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
205	>	assertEquals(SIZE - i, q.size());
206	>	assertEquals(i, q.remove());
207		}
208		for (int i = 0; i < SIZE; ++i) {
209	<	assertEquals(NOCAP, q.remainingCapacity());
209	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
210		assertEquals(i, q.size());
211	<	q.add(new Integer(i));
211	>	assertTrue(q.add(i));
212		}
213		}
214
215		/**
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	–	/**
216		* Offer of comparable element succeeds
217		*/
218		public void testOffer() {
#	Line 196 | Line 225 | public class PriorityBlockingQueueTest e
225		* Offer of non-Comparable throws CCE
226		*/
227		public void testOfferNonComparable() {
228	+	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
229		try {
200	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
201	–	q.offer(new Object());
202	–	q.offer(new Object());
230		q.offer(new Object());
231		shouldThrow();
232	<	} catch (ClassCastException success) {}
232	>	} catch (ClassCastException success) {
233	>	assertTrue(q.isEmpty());
234	>	assertEquals(0, q.size());
235	>	assertNull(q.poll());
236	>	}
237		}
238
239		/**
#	Line 217 | Line 248 | public class PriorityBlockingQueueTest e
248		}
249
250		/**
251	<	* 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	<	/**
231	<	* addAll(this) throws IAE
251	>	* addAll(this) throws IllegalArgumentException
252		*/
253		public void testAddAllSelf() {
254	+	PriorityBlockingQueue q = populatedQueue(SIZE);
255		try {
235	–	PriorityBlockingQueue q = populatedQueue(SIZE);
256		q.addAll(q);
257		shouldThrow();
258		} catch (IllegalArgumentException success) {}
259		}
260
261		/**
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	–	/**
262		* addAll of a collection with any null elements throws NPE after
263		* possibly adding some elements
264		*/
265		public void testAddAll3() {
266	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
267	+	Integer[] ints = new Integer[SIZE];
268	+	for (int i = 0; i < SIZE - 1; ++i)
269	+	ints[i] = new Integer(i);
270		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);
271		q.addAll(Arrays.asList(ints));
272		shouldThrow();
273		} catch (NullPointerException success) {}
#	Line 270 | Line 279 | public class PriorityBlockingQueueTest e
279		public void testAddAll5() {
280		Integer[] empty = new Integer[0];
281		Integer[] ints = new Integer[SIZE];
282	<	for (int i = SIZE-1; i >= 0; --i)
282	>	for (int i = SIZE - 1; i >= 0; --i)
283		ints[i] = new Integer(i);
284		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
285		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 280 | Line 289 | public class PriorityBlockingQueueTest e
289		}
290
291		/**
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	–	/**
292		* all elements successfully put are contained
293		*/
294	<	public void testPut() {
295	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
296	<	for (int i = 0; i < SIZE; ++i) {
297	<	Integer I = new Integer(i);
298	<	q.put(I);
299	<	assertTrue(q.contains(I));
300	<	}
301	<	assertEquals(SIZE, q.size());
294	>	public void testPut() {
295	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
296	>	for (int i = 0; i < SIZE; ++i) {
297	>	Integer x = new Integer(i);
298	>	q.put(x);
299	>	assertTrue(q.contains(x));
300	>	}
301	>	assertEquals(SIZE, q.size());
302		}
303
304		/**
#	Line 309 | Line 307 | public class PriorityBlockingQueueTest e
307		public void testPutWithTake() throws InterruptedException {
308		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
309		final int size = 4;
310	<	Thread t = new Thread(new CheckedRunnable() {
310	>	Thread t = newStartedThread(new CheckedRunnable() {
311		public void realRun() {
312		for (int i = 0; i < size; i++)
313		q.put(new Integer(0));
314		}});
315
316	<	t.start();
317	<	Thread.sleep(SHORT_DELAY_MS);
320	<	assertEquals(q.size(), size);
316	>	awaitTermination(t);
317	>	assertEquals(size, q.size());
318		q.take();
322	–	t.interrupt();
323	–	t.join();
319		}
320
321		/**
322		* timed offer does not time out
323		*/
324	<	public void testTimedOffer() throws InterruptedException {
324	>	public void testTimedOffer() {
325		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
326	<	Thread t = new Thread(new Runnable() {
327	<	public void run() {
328	<	try {
329	<	q.put(new Integer(0));
330	<	q.put(new Integer(0));
331	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
332	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
338	<	} finally { }
339	<	}
340	<	});
326	>	Thread t = newStartedThread(new CheckedRunnable() {
327	>	public void realRun() {
328	>	q.put(new Integer(0));
329	>	q.put(new Integer(0));
330	>	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
331	>	assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
332	>	}});
333
334	<	t.start();
343	<	Thread.sleep(SMALL_DELAY_MS);
344	<	t.interrupt();
345	<	t.join();
334	>	awaitTermination(t);
335		}
336
337		/**
#	Line 351 | Line 340 | public class PriorityBlockingQueueTest e
340		public void testTake() throws InterruptedException {
341		PriorityBlockingQueue q = populatedQueue(SIZE);
342		for (int i = 0; i < SIZE; ++i) {
343	<	assertEquals(i, ((Integer)q.take()).intValue());
343	>	assertEquals(i, q.take());
344		}
345		}
346
347		/**
359	–	* take blocks interruptibly when empty
360	–	*/
361	–	public void testTakeFromEmpty() throws InterruptedException {
362	–	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
363	–	Thread t = new Thread(new CheckedInterruptedRunnable() {
364	–	public void realRun() throws InterruptedException {
365	–	q.take();
366	–	}});
367	–
368	–	t.start();
369	–	Thread.sleep(SHORT_DELAY_MS);
370	–	t.interrupt();
371	–	t.join();
372	–	}
373	–
374	–	/**
348		* Take removes existing elements until empty, then blocks interruptibly
349		*/
350		public void testBlockingTake() throws InterruptedException {
351	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
351	>	final PriorityBlockingQueue q = populatedQueue(SIZE);
352	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
353	>	Thread t = newStartedThread(new CheckedRunnable() {
354		public void realRun() throws InterruptedException {
355	<	PriorityBlockingQueue q = populatedQueue(SIZE);
356	<	for (int i = 0; i < SIZE; ++i) {
357	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
358	<	}
359	<	q.take();
355	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
356	>
357	>	Thread.currentThread().interrupt();
358	>	try {
359	>	q.take();
360	>	shouldThrow();
361	>	} catch (InterruptedException success) {}
362	>	assertFalse(Thread.interrupted());
363	>
364	>	pleaseInterrupt.countDown();
365	>	try {
366	>	q.take();
367	>	shouldThrow();
368	>	} catch (InterruptedException success) {}
369	>	assertFalse(Thread.interrupted());
370		}});
371
372	<	t.start();
373	<	Thread.sleep(SHORT_DELAY_MS);
372	>	await(pleaseInterrupt);
373	>	assertThreadBlocks(t, Thread.State.WAITING);
374		t.interrupt();
375	<	t.join();
375	>	awaitTermination(t);
376		}
377
393	–
378		/**
379		* poll succeeds unless empty
380		*/
381		public void testPoll() {
382		PriorityBlockingQueue q = populatedQueue(SIZE);
383		for (int i = 0; i < SIZE; ++i) {
384	<	assertEquals(i, ((Integer)q.poll()).intValue());
384	>	assertEquals(i, q.poll());
385		}
386		assertNull(q.poll());
387		}
388
389		/**
390	<	* timed pool with zero timeout succeeds when non-empty, else times out
390	>	* timed poll with zero timeout succeeds when non-empty, else times out
391		*/
392		public void testTimedPoll0() throws InterruptedException {
393		PriorityBlockingQueue q = populatedQueue(SIZE);
394		for (int i = 0; i < SIZE; ++i) {
395	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
395	>	assertEquals(i, q.poll(0, MILLISECONDS));
396		}
397		assertNull(q.poll(0, MILLISECONDS));
398		}
399
400		/**
401	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
401	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
402		*/
403		public void testTimedPoll() throws InterruptedException {
404	<	PriorityBlockingQueue q = populatedQueue(SIZE);
404	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
405		for (int i = 0; i < SIZE; ++i) {
406	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
407	<	}
408	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
406	>	long startTime = System.nanoTime();
407	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
408	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
409	>	}
410	>	long startTime = System.nanoTime();
411	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
412	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
413	>	checkEmpty(q);
414		}
415
416		/**
#	Line 429 | Line 418 | public class PriorityBlockingQueueTest e
418		* returning timeout status
419		*/
420		public void testInterruptedTimedPoll() throws InterruptedException {
421	<	Thread t = new Thread(new CheckedRunnable() {
421	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
422	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
423	>	Thread t = newStartedThread(new CheckedRunnable() {
424		public void realRun() throws InterruptedException {
425	<	PriorityBlockingQueue q = populatedQueue(SIZE);
426	<	for (int i = 0; i < SIZE; ++i) {
427	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
428	<	}
425	>	long startTime = System.nanoTime();
426	>	for (int i = 0; i < SIZE; i++)
427	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
428	>
429	>	Thread.currentThread().interrupt();
430		try {
431	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
432	<	threadShouldThrow();
431	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
432	>	shouldThrow();
433		} catch (InterruptedException success) {}
434	<	}});
443	<
444	<	t.start();
445	<	Thread.sleep(SHORT_DELAY_MS);
446	<	t.interrupt();
447	<	t.join();
448	<	}
434	>	assertFalse(Thread.interrupted());
435
436	<	/**
451	<	*  timed poll before a delayed offer fails; after offer succeeds;
452	<	*  on interruption throws
453	<	*/
454	<	public void testTimedPollWithOffer() throws InterruptedException {
455	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
456	<	Thread t = new Thread(new CheckedRunnable() {
457	<	public void realRun() throws InterruptedException {
458	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
459	<	threadAssertEquals(0, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
436	>	pleaseInterrupt.countDown();
437		try {
438		q.poll(LONG_DELAY_MS, MILLISECONDS);
439	<	threadShouldThrow();
439	>	shouldThrow();
440		} catch (InterruptedException success) {}
441	+	assertFalse(Thread.interrupted());
442	+
443	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
444		}});
445
446	<	t.start();
447	<	Thread.sleep(SMALL_DELAY_MS);
468	<	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
446	>	await(pleaseInterrupt);
447	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
448		t.interrupt();
449	<	t.join();
449	>	awaitTermination(t);
450		}
451
473	–
452		/**
453		* peek returns next element, or null if empty
454		*/
455		public void testPeek() {
456		PriorityBlockingQueue q = populatedQueue(SIZE);
457		for (int i = 0; i < SIZE; ++i) {
458	<	assertEquals(i, ((Integer)q.peek()).intValue());
459	<	q.poll();
458	>	assertEquals(i, q.peek());
459	>	assertEquals(i, q.poll());
460		assertTrue(q.peek() == null ||
461	<	i != ((Integer)q.peek()).intValue());
461	>	!q.peek().equals(i));
462		}
463		assertNull(q.peek());
464		}
#	Line 491 | Line 469 | public class PriorityBlockingQueueTest e
469		public void testElement() {
470		PriorityBlockingQueue q = populatedQueue(SIZE);
471		for (int i = 0; i < SIZE; ++i) {
472	<	assertEquals(i, ((Integer)q.element()).intValue());
473	<	q.poll();
472	>	assertEquals(i, q.element());
473	>	assertEquals(i, q.poll());
474		}
475		try {
476		q.element();
#	Line 506 | Line 484 | public class PriorityBlockingQueueTest e
484		public void testRemove() {
485		PriorityBlockingQueue q = populatedQueue(SIZE);
486		for (int i = 0; i < SIZE; ++i) {
487	<	assertEquals(i, ((Integer)q.remove()).intValue());
487	>	assertEquals(i, q.remove());
488		}
489		try {
490		q.remove();
#	Line 515 | Line 493 | public class PriorityBlockingQueueTest e
493		}
494
495		/**
518	–	* remove(x) removes x and returns true if present
519	–	*/
520	–	public void testRemoveElement() {
521	–	PriorityBlockingQueue q = populatedQueue(SIZE);
522	–	for (int i = 1; i < SIZE; i+=2) {
523	–	assertTrue(q.remove(new Integer(i)));
524	–	}
525	–	for (int i = 0; i < SIZE; i+=2) {
526	–	assertTrue(q.remove(new Integer(i)));
527	–	assertFalse(q.remove(new Integer(i+1)));
528	–	}
529	–	assertTrue(q.isEmpty());
530	–	}
531	–
532	–	/**
496		* contains(x) reports true when elements added but not yet removed
497		*/
498		public void testContains() {
#	Line 584 | Line 547 | public class PriorityBlockingQueueTest e
547		assertTrue(changed);
548
549		assertTrue(q.containsAll(p));
550	<	assertEquals(SIZE-i, q.size());
550	>	assertEquals(SIZE - i, q.size());
551		p.remove();
552		}
553		}
#	Line 597 | Line 560 | public class PriorityBlockingQueueTest e
560		PriorityBlockingQueue q = populatedQueue(SIZE);
561		PriorityBlockingQueue p = populatedQueue(i);
562		assertTrue(q.removeAll(p));
563	<	assertEquals(SIZE-i, q.size());
563	>	assertEquals(SIZE - i, q.size());
564		for (int j = 0; j < i; ++j) {
565	<	Integer I = (Integer)(p.remove());
566	<	assertFalse(q.contains(I));
565	>	Integer x = (Integer)(p.remove());
566	>	assertFalse(q.contains(x));
567		}
568		}
569		}
570
571		/**
572	<	*  toArray contains all elements
572	>	* toArray contains all elements
573		*/
574		public void testToArray() throws InterruptedException {
575		PriorityBlockingQueue q = populatedQueue(SIZE);
576		Object[] o = q.toArray();
577		Arrays.sort(o);
578		for (int i = 0; i < o.length; i++)
579	<	assertEquals(o[i], q.take());
579	>	assertSame(o[i], q.take());
580		}
581
582		/**
583		* toArray(a) contains all elements
584		*/
585		public void testToArray2() throws InterruptedException {
586	<	PriorityBlockingQueue q = populatedQueue(SIZE);
586	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
587		Integer[] ints = new Integer[SIZE];
588	<	ints = (Integer[])q.toArray(ints);
588	>	Integer[] array = q.toArray(ints);
589	>	assertSame(ints, array);
590		Arrays.sort(ints);
591		for (int i = 0; i < ints.length; i++)
592	<	assertEquals(ints[i], q.take());
592	>	assertSame(ints[i], q.take());
593		}
594
595		/**
596	<	* toArray(null) throws NPE
633	<	*/
634	<	public void testToArray_BadArg() {
635	<	try {
636	<	PriorityBlockingQueue q = populatedQueue(SIZE);
637	<	Object o[] = q.toArray(null);
638	<	shouldThrow();
639	<	} catch (NullPointerException success) {}
640	<	}
641	<
642	<	/**
643	<	* toArray with incompatible array type throws CCE
596	>	* toArray(incompatible array type) throws ArrayStoreException
597		*/
598		public void testToArray1_BadArg() {
599	+	PriorityBlockingQueue q = populatedQueue(SIZE);
600		try {
601	<	PriorityBlockingQueue q = populatedQueue(SIZE);
648	<	Object o[] = q.toArray(new String[10] );
601	>	q.toArray(new String[10]);
602		shouldThrow();
603	<	} catch (ArrayStoreException  success) {}
603	>	} catch (ArrayStoreException success) {}
604		}
605
606		/**
#	Line 655 | Line 608 | public class PriorityBlockingQueueTest e
608		*/
609		public void testIterator() {
610		PriorityBlockingQueue q = populatedQueue(SIZE);
658	–	int i = 0;
611		Iterator it = q.iterator();
612	<	while (it.hasNext()) {
612	>	int i;
613	>	for (i = 0; it.hasNext(); i++)
614		assertTrue(q.contains(it.next()));
662	–	++i;
663	–	}
615		assertEquals(i, SIZE);
616	+	assertIteratorExhausted(it);
617	+	}
618	+
619	+	/**
620	+	* iterator of empty collection has no elements
621	+	*/
622	+	public void testEmptyIterator() {
623	+	assertIteratorExhausted(new PriorityBlockingQueue().iterator());
624		}
625
626		/**
627		* iterator.remove removes current element
628		*/
629	<	public void testIteratorRemove () {
629	>	public void testIteratorRemove() {
630		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
631		q.add(new Integer(2));
632		q.add(new Integer(1));
#	Line 683 | Line 642 | public class PriorityBlockingQueueTest e
642		assertFalse(it.hasNext());
643		}
644
686	–
645		/**
646		* toString contains toStrings of elements
647		*/
#	Line 691 | Line 649 | public class PriorityBlockingQueueTest e
649		PriorityBlockingQueue q = populatedQueue(SIZE);
650		String s = q.toString();
651		for (int i = 0; i < SIZE; ++i) {
652	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
652	>	assertTrue(s.contains(String.valueOf(i)));
653		}
654		}
655
656		/**
657	<	* offer transfers elements across Executor tasks
657	>	* timed poll transfers elements across Executor tasks
658		*/
659		public void testPollInExecutor() {
660		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
661	<	ExecutorService executor = Executors.newFixedThreadPool(2);
662	<	executor.execute(new CheckedRunnable() {
663	<	public void realRun() throws InterruptedException {
664	<	threadAssertNull(q.poll());
665	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
666	<	threadAssertTrue(q.isEmpty());
667	<	}});
668	<
669	<	executor.execute(new CheckedRunnable() {
670	<	public void realRun() throws InterruptedException {
671	<	Thread.sleep(SMALL_DELAY_MS);
672	<	q.put(new Integer(1));
673	<	}});
674	<
675	<	joinPool(executor);
661	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
662	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
663	>	try (PoolCleaner cleaner = cleaner(executor)) {
664	>	executor.execute(new CheckedRunnable() {
665	>	public void realRun() throws InterruptedException {
666	>	assertNull(q.poll());
667	>	threadsStarted.await();
668	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
669	>	checkEmpty(q);
670	>	}});
671	>
672	>	executor.execute(new CheckedRunnable() {
673	>	public void realRun() throws InterruptedException {
674	>	threadsStarted.await();
675	>	q.put(one);
676	>	}});
677	>	}
678		}
679
680		/**
681	<	* A deserialized serialized queue has same elements
681	>	* A deserialized/reserialized queue has same elements
682		*/
683		public void testSerialization() throws Exception {
684	<	PriorityBlockingQueue q = populatedQueue(SIZE);
685	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
726	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
727	<	out.writeObject(q);
728	<	out.close();
729	<
730	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
731	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
732	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
733	<	assertEquals(q.size(), r.size());
734	<	while (!q.isEmpty())
735	<	assertEquals(q.remove(), r.remove());
736	<	}
737	<
738	<	/**
739	<	* drainTo(null) throws NPE
740	<	*/
741	<	public void testDrainToNull() {
742	<	PriorityBlockingQueue q = populatedQueue(SIZE);
743	<	try {
744	<	q.drainTo(null);
745	<	shouldThrow();
746	<	} catch (NullPointerException success) {}
747	<	}
684	>	Queue x = populatedQueue(SIZE);
685	>	Queue y = serialClone(x);
686
687	<	/**
688	<	* drainTo(this) throws IAE
689	<	*/
690	<	public void testDrainToSelf() {
691	<	PriorityBlockingQueue q = populatedQueue(SIZE);
692	<	try {
693	<	q.drainTo(q);
756	<	shouldThrow();
757	<	} catch (IllegalArgumentException success) {}
687	>	assertNotSame(x, y);
688	>	assertEquals(x.size(), y.size());
689	>	while (!x.isEmpty()) {
690	>	assertFalse(y.isEmpty());
691	>	assertEquals(x.remove(), y.remove());
692	>	}
693	>	assertTrue(y.isEmpty());
694		}
695
696		/**
#	Line 764 | Line 700 | public class PriorityBlockingQueueTest e
700		PriorityBlockingQueue q = populatedQueue(SIZE);
701		ArrayList l = new ArrayList();
702		q.drainTo(l);
703	<	assertEquals(q.size(), 0);
704	<	assertEquals(l.size(), SIZE);
703	>	assertEquals(0, q.size());
704	>	assertEquals(SIZE, l.size());
705		for (int i = 0; i < SIZE; ++i)
706		assertEquals(l.get(i), new Integer(i));
707		q.add(zero);
#	Line 775 | Line 711 | public class PriorityBlockingQueueTest e
711		assertTrue(q.contains(one));
712		l.clear();
713		q.drainTo(l);
714	<	assertEquals(q.size(), 0);
715	<	assertEquals(l.size(), 2);
714	>	assertEquals(0, q.size());
715	>	assertEquals(2, l.size());
716		for (int i = 0; i < 2; ++i)
717		assertEquals(l.get(i), new Integer(i));
718		}
#	Line 788 | Line 724 | public class PriorityBlockingQueueTest e
724		final PriorityBlockingQueue q = populatedQueue(SIZE);
725		Thread t = new Thread(new CheckedRunnable() {
726		public void realRun() {
727	<	q.put(new Integer(SIZE+1));
727	>	q.put(new Integer(SIZE + 1));
728		}});
729
730		t.start();
#	Line 802 | Line 738 | public class PriorityBlockingQueueTest e
738		}
739
740		/**
741	<	* drainTo(null, n) throws NPE
806	<	*/
807	<	public void testDrainToNullN() {
808	<	PriorityBlockingQueue q = populatedQueue(SIZE);
809	<	try {
810	<	q.drainTo(null, 0);
811	<	shouldThrow();
812	<	} catch (NullPointerException success) {}
813	<	}
814	<
815	<	/**
816	<	* drainTo(this, n) throws IAE
817	<	*/
818	<	public void testDrainToSelfN() {
819	<	PriorityBlockingQueue q = populatedQueue(SIZE);
820	<	try {
821	<	q.drainTo(q, 0);
822	<	shouldThrow();
823	<	} catch (IllegalArgumentException success) {}
824	<	}
825	<
826	<	/**
827	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
741	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
742		*/
743		public void testDrainToN() {
744	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
744	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
745		for (int i = 0; i < SIZE + 2; ++i) {
746		for (int j = 0; j < SIZE; j++)
747		assertTrue(q.offer(new Integer(j)));
748		ArrayList l = new ArrayList();
749		q.drainTo(l, i);
750	<	int k = (i < SIZE)? i : SIZE;
751	<	assertEquals(l.size(), k);
752	<	assertEquals(q.size(), SIZE-k);
750	>	int k = (i < SIZE) ? i : SIZE;
751	>	assertEquals(k, l.size());
752	>	assertEquals(SIZE - k, q.size());
753		for (int j = 0; j < k; ++j)
754		assertEquals(l.get(j), new Integer(j));
755	<	while (q.poll() != null) ;
755	>	do {} while (q.poll() != null);
756	>	}
757	>	}
758	>
759	>	/**
760	>	* remove(null), contains(null) always return false
761	>	*/
762	>	public void testNeverContainsNull() {
763	>	Collection<?>[] qs = {
764	>	new PriorityBlockingQueue<Object>(),
765	>	populatedQueue(2),
766	>	};
767	>
768	>	for (Collection<?> q : qs) {
769	>	assertFalse(q.contains(null));
770	>	assertFalse(q.remove(null));
771		}
772		}
773

Diff Legend

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