ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ArrayBlockingQueueTest.java

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.16 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.72 by jsr166, Sun Oct 16 20:44:18 2016 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–
10	–	import junit.framework.*;
11	–	import java.util.*;
12	–	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.Iterator;
15	>	import java.util.NoSuchElementException;
16	>	import java.util.Queue;
17	>	import java.util.concurrent.ArrayBlockingQueue;
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	>
23	>	import junit.framework.Test;
24
25		public class ArrayBlockingQueueTest extends JSR166TestCase {
26	+
27	+	public static class Fair extends BlockingQueueTest {
28	+	protected BlockingQueue emptyCollection() {
29	+	return new ArrayBlockingQueue(SIZE, true);
30	+	}
31	+	}
32	+
33	+	public static class NonFair extends BlockingQueueTest {
34	+	protected BlockingQueue emptyCollection() {
35	+	return new ArrayBlockingQueue(SIZE, false);
36	+	}
37	+	}
38	+
39		public static void main(String[] args) {
40	<	junit.textui.TestRunner.run (suite());
40	>	main(suite(), args);
41		}
42	+
43		public static Test suite() {
44	<	return new TestSuite(ArrayBlockingQueueTest.class);
44	>	return newTestSuite(ArrayBlockingQueueTest.class,
45	>	new Fair().testSuite(),
46	>	new NonFair().testSuite());
47		}
48
49		/**
50	<	* Create a queue of given size containing consecutive
51	<	* Integers 0 ... n.
50	>	* Returns a new queue of given size containing consecutive
51	>	* Integers 0 ... n - 1.
52		*/
53	<	private ArrayBlockingQueue populatedQueue(int n) {
54	<	ArrayBlockingQueue q = new ArrayBlockingQueue(n);
53	>	private ArrayBlockingQueue<Integer> populatedQueue(int n) {
54	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n);
55		assertTrue(q.isEmpty());
56		for (int i = 0; i < n; i++)
57		assertTrue(q.offer(new Integer(i)));
58		assertFalse(q.isEmpty());
59		assertEquals(0, q.remainingCapacity());
60		assertEquals(n, q.size());
61	+	assertEquals((Integer) 0, q.peek());
62		return q;
63		}
64
#	Line 44 | Line 70 | public class ArrayBlockingQueueTest exte
70		}
71
72		/**
73	<	* Constructor throws IAE if  capacity argument nonpositive
73	>	* Constructor throws IAE if capacity argument nonpositive
74		*/
75		public void testConstructor2() {
76		try {
77	<	ArrayBlockingQueue q = new ArrayBlockingQueue(0);
77	>	new ArrayBlockingQueue(0);
78		shouldThrow();
79	<	}
54	<	catch (IllegalArgumentException success) {}
79	>	} catch (IllegalArgumentException success) {}
80		}
81
82		/**
#	Line 59 | Line 84 | public class ArrayBlockingQueueTest exte
84		*/
85		public void testConstructor3() {
86		try {
87	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
87	>	new ArrayBlockingQueue(1, true, null);
88		shouldThrow();
89	<	}
65	<	catch (NullPointerException success) {}
89	>	} catch (NullPointerException success) {}
90		}
91
92		/**
93		* Initializing from Collection of null elements throws NPE
94		*/
95		public void testConstructor4() {
96	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
97		try {
98	<	Integer[] ints = new Integer[SIZE];
74	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
98	>	new ArrayBlockingQueue(SIZE, false, elements);
99		shouldThrow();
100	<	}
77	<	catch (NullPointerException success) {}
100	>	} catch (NullPointerException success) {}
101		}
102
103		/**
104		* Initializing from Collection with some null elements throws NPE
105		*/
106		public void testConstructor5() {
107	+	Integer[] ints = new Integer[SIZE];
108	+	for (int i = 0; i < SIZE - 1; ++i)
109	+	ints[i] = i;
110	+	Collection<Integer> elements = Arrays.asList(ints);
111		try {
112	<	Integer[] ints = new Integer[SIZE];
86	<	for (int i = 0; i < SIZE-1; ++i)
87	<	ints[i] = new Integer(i);
88	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
112	>	new ArrayBlockingQueue(SIZE, false, elements);
113		shouldThrow();
114	<	}
91	<	catch (NullPointerException success) {}
114	>	} catch (NullPointerException success) {}
115		}
116
117		/**
118		* Initializing from too large collection throws IAE
119		*/
120		public void testConstructor6() {
121	+	Integer[] ints = new Integer[SIZE];
122	+	for (int i = 0; i < SIZE; ++i)
123	+	ints[i] = i;
124	+	Collection<Integer> elements = Arrays.asList(ints);
125		try {
126	<	Integer[] ints = new Integer[SIZE];
100	<	for (int i = 0; i < SIZE; ++i)
101	<	ints[i] = new Integer(i);
102	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
126	>	new ArrayBlockingQueue(SIZE - 1, false, elements);
127		shouldThrow();
128	<	}
105	<	catch (IllegalArgumentException success) {}
128	>	} catch (IllegalArgumentException success) {}
129		}
130
131		/**
132		* Queue contains all elements of collection used to initialize
133		*/
134		public void testConstructor7() {
135	<	try {
136	<	Integer[] ints = new Integer[SIZE];
137	<	for (int i = 0; i < SIZE; ++i)
138	<	ints[i] = new Integer(i);
139	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
140	<	for (int i = 0; i < SIZE; ++i)
141	<	assertEquals(ints[i], q.poll());
119	<	}
120	<	finally {}
135	>	Integer[] ints = new Integer[SIZE];
136	>	for (int i = 0; i < SIZE; ++i)
137	>	ints[i] = i;
138	>	Collection<Integer> elements = Arrays.asList(ints);
139	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, elements);
140	>	for (int i = 0; i < SIZE; ++i)
141	>	assertEquals(ints[i], q.poll());
142		}
143
144		/**
#	Line 139 | Line 160 | public class ArrayBlockingQueueTest exte
160		* remainingCapacity decreases on add, increases on remove
161		*/
162		public void testRemainingCapacity() {
163	<	ArrayBlockingQueue q = populatedQueue(SIZE);
163	>	BlockingQueue q = populatedQueue(SIZE);
164		for (int i = 0; i < SIZE; ++i) {
165		assertEquals(i, q.remainingCapacity());
166	<	assertEquals(SIZE-i, q.size());
167	<	q.remove();
166	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
167	>	assertEquals(i, q.remove());
168		}
169		for (int i = 0; i < SIZE; ++i) {
170	<	assertEquals(SIZE-i, q.remainingCapacity());
171	<	assertEquals(i, q.size());
172	<	q.add(new Integer(i));
170	>	assertEquals(SIZE - i, q.remainingCapacity());
171	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
172	>	assertTrue(q.add(i));
173		}
174		}
175
176		/**
156	–	*  offer(null) throws NPE
157	–	*/
158	–	public void testOfferNull() {
159	–	try {
160	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
161	–	q.offer(null);
162	–	shouldThrow();
163	–	} catch (NullPointerException success) { }
164	–	}
165	–
166	–	/**
167	–	*  add(null) throws NPE
168	–	*/
169	–	public void testAddNull() {
170	–	try {
171	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
172	–	q.add(null);
173	–	shouldThrow();
174	–	} catch (NullPointerException success) { }
175	–	}
176	–
177	–	/**
177		* Offer succeeds if not full; fails if full
178		*/
179		public void testOffer() {
#	Line 187 | Line 186 | public class ArrayBlockingQueueTest exte
186		* add succeeds if not full; throws ISE if full
187		*/
188		public void testAdd() {
189	<	try {
190	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
191	<	for (int i = 0; i < SIZE; ++i) {
193	<	assertTrue(q.add(new Integer(i)));
194	<	}
195	<	assertEquals(0, q.remainingCapacity());
196	<	q.add(new Integer(SIZE));
197	<	} catch (IllegalStateException success) {
189	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
190	>	for (int i = 0; i < SIZE; ++i) {
191	>	assertTrue(q.add(new Integer(i)));
192		}
193	<	}
200	<
201	<	/**
202	<	*  addAll(null) throws NPE
203	<	*/
204	<	public void testAddAll1() {
193	>	assertEquals(0, q.remainingCapacity());
194		try {
195	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
207	<	q.addAll(null);
195	>	q.add(new Integer(SIZE));
196		shouldThrow();
197	<	}
210	<	catch (NullPointerException success) {}
197	>	} catch (IllegalStateException success) {}
198		}
199
200		/**
201		* addAll(this) throws IAE
202		*/
203		public void testAddAllSelf() {
204	+	ArrayBlockingQueue q = populatedQueue(SIZE);
205		try {
218	–	ArrayBlockingQueue q = populatedQueue(SIZE);
206		q.addAll(q);
207		shouldThrow();
208	<	}
222	<	catch (IllegalArgumentException success) {}
208	>	} catch (IllegalArgumentException success) {}
209		}
210
225	–
226	–	/**
227	–	*  addAll of a collection with null elements throws NPE
228	–	*/
229	–	public void testAddAll2() {
230	–	try {
231	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
232	–	Integer[] ints = new Integer[SIZE];
233	–	q.addAll(Arrays.asList(ints));
234	–	shouldThrow();
235	–	}
236	–	catch (NullPointerException success) {}
237	–	}
211		/**
212		* addAll of a collection with any null elements throws NPE after
213		* possibly adding some elements
214		*/
215		public void testAddAll3() {
216	+	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
217	+	Integer[] ints = new Integer[SIZE];
218	+	for (int i = 0; i < SIZE - 1; ++i)
219	+	ints[i] = new Integer(i);
220		try {
244	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
245	–	Integer[] ints = new Integer[SIZE];
246	–	for (int i = 0; i < SIZE-1; ++i)
247	–	ints[i] = new Integer(i);
221		q.addAll(Arrays.asList(ints));
222		shouldThrow();
223	<	}
251	<	catch (NullPointerException success) {}
223	>	} catch (NullPointerException success) {}
224		}
225	+
226		/**
227		* addAll throws ISE if not enough room
228		*/
229		public void testAddAll4() {
230	+	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
231	+	Integer[] ints = new Integer[SIZE];
232	+	for (int i = 0; i < SIZE; ++i)
233	+	ints[i] = new Integer(i);
234		try {
258	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
259	–	Integer[] ints = new Integer[SIZE];
260	–	for (int i = 0; i < SIZE; ++i)
261	–	ints[i] = new Integer(i);
235		q.addAll(Arrays.asList(ints));
236		shouldThrow();
237	<	}
265	<	catch (IllegalStateException success) {}
237	>	} catch (IllegalStateException success) {}
238		}
239	+
240		/**
241		* Queue contains all elements, in traversal order, of successful addAll
242		*/
243		public void testAddAll5() {
244	<	try {
245	<	Integer[] empty = new Integer[0];
246	<	Integer[] ints = new Integer[SIZE];
247	<	for (int i = 0; i < SIZE; ++i)
248	<	ints[i] = new Integer(i);
249	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
250	<	assertFalse(q.addAll(Arrays.asList(empty)));
251	<	assertTrue(q.addAll(Arrays.asList(ints)));
252	<	for (int i = 0; i < SIZE; ++i)
280	<	assertEquals(ints[i], q.poll());
281	<	}
282	<	finally {}
244	>	Integer[] empty = new Integer[0];
245	>	Integer[] ints = new Integer[SIZE];
246	>	for (int i = 0; i < SIZE; ++i)
247	>	ints[i] = new Integer(i);
248	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
249	>	assertFalse(q.addAll(Arrays.asList(empty)));
250	>	assertTrue(q.addAll(Arrays.asList(ints)));
251	>	for (int i = 0; i < SIZE; ++i)
252	>	assertEquals(ints[i], q.poll());
253		}
254
255		/**
286	–	*  put(null) throws NPE
287	–	*/
288	–	public void testPutNull() {
289	–	try {
290	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
291	–	q.put(null);
292	–	shouldThrow();
293	–	}
294	–	catch (NullPointerException success) {
295	–	}
296	–	catch (InterruptedException ie) {
297	–	unexpectedException();
298	–	}
299	–	}
300	–
301	–	/**
256		* all elements successfully put are contained
257		*/
258	<	public void testPut() {
259	<	try {
260	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
261	<	for (int i = 0; i < SIZE; ++i) {
262	<	Integer I = new Integer(i);
263	<	q.put(I);
310	<	assertTrue(q.contains(I));
311	<	}
312	<	assertEquals(0, q.remainingCapacity());
313	<	}
314	<	catch (InterruptedException ie) {
315	<	unexpectedException();
258	>	public void testPut() throws InterruptedException {
259	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
260	>	for (int i = 0; i < SIZE; ++i) {
261	>	Integer x = new Integer(i);
262	>	q.put(x);
263	>	assertTrue(q.contains(x));
264		}
265	+	assertEquals(0, q.remainingCapacity());
266		}
267
268		/**
269		* put blocks interruptibly if full
270		*/
271	<	public void testBlockingPut() {
271	>	public void testBlockingPut() throws InterruptedException {
272		final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
273	<	Thread t = new Thread(new Runnable() {
274	<	public void run() {
275	<	int added = 0;
276	<	try {
277	<	for (int i = 0; i < SIZE; ++i) {
278	<	q.put(new Integer(i));
279	<	++added;
280	<	}
281	<	q.put(new Integer(SIZE));
282	<	threadShouldThrow();
283	<	} catch (InterruptedException ie) {
284	<	threadAssertEquals(added, SIZE);
285	<	}
286	<	}});
287	<	try {
288	<	t.start();
289	<	Thread.sleep(MEDIUM_DELAY_MS);
290	<	t.interrupt();
291	<	t.join();
292	<	}
293	<	catch (InterruptedException ie) {
294	<	unexpectedException();
295	<	}
273	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
274	>	Thread t = newStartedThread(new CheckedRunnable() {
275	>	public void realRun() throws InterruptedException {
276	>	for (int i = 0; i < SIZE; ++i)
277	>	q.put(i);
278	>	assertEquals(SIZE, q.size());
279	>	assertEquals(0, q.remainingCapacity());
280	>
281	>	Thread.currentThread().interrupt();
282	>	try {
283	>	q.put(99);
284	>	shouldThrow();
285	>	} catch (InterruptedException success) {}
286	>	assertFalse(Thread.interrupted());
287	>
288	>	pleaseInterrupt.countDown();
289	>	try {
290	>	q.put(99);
291	>	shouldThrow();
292	>	} catch (InterruptedException success) {}
293	>	assertFalse(Thread.interrupted());
294	>	}});
295	>
296	>	await(pleaseInterrupt);
297	>	assertThreadStaysAlive(t);
298	>	t.interrupt();
299	>	awaitTermination(t);
300	>	assertEquals(SIZE, q.size());
301	>	assertEquals(0, q.remainingCapacity());
302		}
303
304		/**
305	<	* put blocks waiting for take when full
305	>	* put blocks interruptibly waiting for take when full
306		*/
307	<	public void testPutWithTake() {
308	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
309	<	Thread t = new Thread(new Runnable() {
310	<	public void run() {
311	<	int added = 0;
312	<	try {
313	<	q.put(new Object());
314	<	++added;
315	<	q.put(new Object());
316	<	++added;
317	<	q.put(new Object());
318	<	++added;
319	<	q.put(new Object());
320	<	++added;
321	<	threadShouldThrow();
322	<	} catch (InterruptedException e) {
323	<	threadAssertTrue(added >= 2);
324	<	}
325	<	}
326	<	});
327	<	try {
328	<	t.start();
329	<	Thread.sleep(SHORT_DELAY_MS);
330	<	q.take();
331	<	t.interrupt();
332	<	t.join();
333	<	} catch (Exception e) {
334	<	unexpectedException();
335	<	}
307	>	public void testPutWithTake() throws InterruptedException {
308	>	final int capacity = 2;
309	>	final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
310	>	final CountDownLatch pleaseTake = new CountDownLatch(1);
311	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
312	>	Thread t = newStartedThread(new CheckedRunnable() {
313	>	public void realRun() throws InterruptedException {
314	>	for (int i = 0; i < capacity; i++)
315	>	q.put(i);
316	>	pleaseTake.countDown();
317	>	q.put(86);
318	>
319	>	pleaseInterrupt.countDown();
320	>	try {
321	>	q.put(99);
322	>	shouldThrow();
323	>	} catch (InterruptedException success) {}
324	>	assertFalse(Thread.interrupted());
325	>	}});
326	>
327	>	await(pleaseTake);
328	>	assertEquals(0, q.remainingCapacity());
329	>	assertEquals(0, q.take());
330	>
331	>	await(pleaseInterrupt);
332	>	assertThreadStaysAlive(t);
333	>	t.interrupt();
334	>	awaitTermination(t);
335	>	assertEquals(0, q.remainingCapacity());
336		}
337
338		/**
339		* timed offer times out if full and elements not taken
340		*/
341	<	public void testTimedOffer() {
341	>	public void testTimedOffer() throws InterruptedException {
342		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
343	<	Thread t = new Thread(new Runnable() {
344	<	public void run() {
345	<	try {
346	<	q.put(new Object());
347	<	q.put(new Object());
348	<	threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
349	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
350	<	threadShouldThrow();
351	<	} catch (InterruptedException success) {}
352	<	}
353	<	});
354	<
355	<	try {
356	<	t.start();
357	<	Thread.sleep(SHORT_DELAY_MS);
358	<	t.interrupt();
359	<	t.join();
360	<	} catch (Exception e) {
361	<	unexpectedException();
407	<	}
343	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
344	>	Thread t = newStartedThread(new CheckedRunnable() {
345	>	public void realRun() throws InterruptedException {
346	>	q.put(new Object());
347	>	q.put(new Object());
348	>	long startTime = System.nanoTime();
349	>	assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
350	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
351	>	pleaseInterrupt.countDown();
352	>	try {
353	>	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
354	>	shouldThrow();
355	>	} catch (InterruptedException success) {}
356	>	}});
357	>
358	>	await(pleaseInterrupt);
359	>	assertThreadStaysAlive(t);
360	>	t.interrupt();
361	>	awaitTermination(t);
362		}
363
364		/**
365		* take retrieves elements in FIFO order
366		*/
367	<	public void testTake() {
368	<	try {
369	<	ArrayBlockingQueue q = populatedQueue(SIZE);
370	<	for (int i = 0; i < SIZE; ++i) {
417	<	assertEquals(i, ((Integer)q.take()).intValue());
418	<	}
419	<	} catch (InterruptedException e) {
420	<	unexpectedException();
367	>	public void testTake() throws InterruptedException {
368	>	ArrayBlockingQueue q = populatedQueue(SIZE);
369	>	for (int i = 0; i < SIZE; ++i) {
370	>	assertEquals(i, q.take());
371		}
372		}
373
374		/**
375	<	* take blocks interruptibly when empty
375	>	* Take removes existing elements until empty, then blocks interruptibly
376		*/
377	<	public void testTakeFromEmpty() {
378	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
379	<	Thread t = new Thread(new Runnable() {
380	<	public void run() {
381	<	try {
382	<	q.take();
383	<	threadShouldThrow();
434	<	} catch (InterruptedException success) { }
377	>	public void testBlockingTake() throws InterruptedException {
378	>	final ArrayBlockingQueue q = populatedQueue(SIZE);
379	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
380	>	Thread t = newStartedThread(new CheckedRunnable() {
381	>	public void realRun() throws InterruptedException {
382	>	for (int i = 0; i < SIZE; ++i) {
383	>	assertEquals(i, q.take());
384		}
436	–	});
437	–	try {
438	–	t.start();
439	–	Thread.sleep(SHORT_DELAY_MS);
440	–	t.interrupt();
441	–	t.join();
442	–	} catch (Exception e) {
443	–	unexpectedException();
444	–	}
445	–	}
385
386	<	/**
387	<	* Take removes existing elements until empty, then blocks interruptibly
388	<	*/
389	<	public void testBlockingTake() {
390	<	Thread t = new Thread(new Runnable() {
391	<	public void run() {
453	<	try {
454	<	ArrayBlockingQueue q = populatedQueue(SIZE);
455	<	for (int i = 0; i < SIZE; ++i) {
456	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
457	<	}
458	<	q.take();
459	<	threadShouldThrow();
460	<	} catch (InterruptedException success) {
461	<	}
462	<	}});
463	<	try {
464	<	t.start();
465	<	Thread.sleep(SHORT_DELAY_MS);
466	<	t.interrupt();
467	<	t.join();
468	<	}
469	<	catch (InterruptedException ie) {
470	<	unexpectedException();
471	<	}
472	<	}
386	>	Thread.currentThread().interrupt();
387	>	try {
388	>	q.take();
389	>	shouldThrow();
390	>	} catch (InterruptedException success) {}
391	>	assertFalse(Thread.interrupted());
392
393	+	pleaseInterrupt.countDown();
394	+	try {
395	+	q.take();
396	+	shouldThrow();
397	+	} catch (InterruptedException success) {}
398	+	assertFalse(Thread.interrupted());
399	+	}});
400	+
401	+	await(pleaseInterrupt);
402	+	assertThreadStaysAlive(t);
403	+	t.interrupt();
404	+	awaitTermination(t);
405	+	}
406
407		/**
408		* poll succeeds unless empty
#	Line 478 | Line 410 | public class ArrayBlockingQueueTest exte
410		public void testPoll() {
411		ArrayBlockingQueue q = populatedQueue(SIZE);
412		for (int i = 0; i < SIZE; ++i) {
413	<	assertEquals(i, ((Integer)q.poll()).intValue());
413	>	assertEquals(i, q.poll());
414		}
415		assertNull(q.poll());
416		}
417
418		/**
419	<	* timed pool with zero timeout succeeds when non-empty, else times out
419	>	* timed poll with zero timeout succeeds when non-empty, else times out
420		*/
421	<	public void testTimedPoll0() {
422	<	try {
423	<	ArrayBlockingQueue q = populatedQueue(SIZE);
424	<	for (int i = 0; i < SIZE; ++i) {
493	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
494	<	}
495	<	assertNull(q.poll(0, MILLISECONDS));
496	<	} catch (InterruptedException e) {
497	<	unexpectedException();
421	>	public void testTimedPoll0() throws InterruptedException {
422	>	ArrayBlockingQueue q = populatedQueue(SIZE);
423	>	for (int i = 0; i < SIZE; ++i) {
424	>	assertEquals(i, q.poll(0, MILLISECONDS));
425		}
426	+	assertNull(q.poll(0, MILLISECONDS));
427	+	checkEmpty(q);
428		}
429
430		/**
431	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
431	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
432		*/
433	<	public void testTimedPoll() {
434	<	try {
435	<	ArrayBlockingQueue q = populatedQueue(SIZE);
436	<	for (int i = 0; i < SIZE; ++i) {
437	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
438	<	}
439	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
440	<	} catch (InterruptedException e) {
441	<	unexpectedException();
442	<	}
433	>	public void testTimedPoll() throws InterruptedException {
434	>	ArrayBlockingQueue q = populatedQueue(SIZE);
435	>	for (int i = 0; i < SIZE; ++i) {
436	>	long startTime = System.nanoTime();
437	>	assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
438	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
439	>	}
440	>	long startTime = System.nanoTime();
441	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
442	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
443	>	checkEmpty(q);
444		}
445
446		/**
447		* Interrupted timed poll throws InterruptedException instead of
448		* returning timeout status
449		*/
450	<	public void testInterruptedTimedPoll() {
451	<	Thread t = new Thread(new Runnable() {
452	<	public void run() {
453	<	try {
454	<	ArrayBlockingQueue q = populatedQueue(SIZE);
455	<	for (int i = 0; i < SIZE; ++i) {
456	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
457	<	}
528	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
529	<	} catch (InterruptedException success) {
530	<	}
531	<	}});
532	<	try {
533	<	t.start();
534	<	Thread.sleep(SHORT_DELAY_MS);
535	<	t.interrupt();
536	<	t.join();
537	<	}
538	<	catch (InterruptedException ie) {
539	<	unexpectedException();
540	<	}
541	<	}
542	<
543	<	/**
544	<	*  timed poll before a delayed offer fails; after offer succeeds;
545	<	*  on interruption throws
546	<	*/
547	<	public void testTimedPollWithOffer() {
548	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
549	<	Thread t = new Thread(new Runnable() {
550	<	public void run() {
551	<	try {
552	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
553	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
554	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
555	<	threadShouldThrow();
556	<	} catch (InterruptedException success) { }
450	>	public void testInterruptedTimedPoll() throws InterruptedException {
451	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
452	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
453	>	Thread t = newStartedThread(new CheckedRunnable() {
454	>	public void realRun() throws InterruptedException {
455	>	long startTime = System.nanoTime();
456	>	for (int i = 0; i < SIZE; ++i) {
457	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
458		}
459	<	});
460	<	try {
461	<	t.start();
462	<	Thread.sleep(SMALL_DELAY_MS);
463	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
464	<	t.interrupt();
465	<	t.join();
466	<	} catch (Exception e) {
467	<	unexpectedException();
468	<	}
459	>	aboutToWait.countDown();
460	>	try {
461	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
462	>	shouldThrow();
463	>	} catch (InterruptedException success) {
464	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
465	>	}
466	>	}});
467	>
468	>	await(aboutToWait);
469	>	waitForThreadToEnterWaitState(t);
470	>	t.interrupt();
471	>	awaitTermination(t);
472	>	checkEmpty(q);
473		}
474
570	–
475		/**
476		* peek returns next element, or null if empty
477		*/
478		public void testPeek() {
479		ArrayBlockingQueue q = populatedQueue(SIZE);
480		for (int i = 0; i < SIZE; ++i) {
481	<	assertEquals(i, ((Integer)q.peek()).intValue());
482	<	q.poll();
481	>	assertEquals(i, q.peek());
482	>	assertEquals(i, q.poll());
483		assertTrue(q.peek() == null ||
484	<	i != ((Integer)q.peek()).intValue());
484	>	!q.peek().equals(i));
485		}
486		assertNull(q.peek());
487		}
#	Line 588 | Line 492 | public class ArrayBlockingQueueTest exte
492		public void testElement() {
493		ArrayBlockingQueue q = populatedQueue(SIZE);
494		for (int i = 0; i < SIZE; ++i) {
495	<	assertEquals(i, ((Integer)q.element()).intValue());
496	<	q.poll();
495	>	assertEquals(i, q.element());
496	>	assertEquals(i, q.poll());
497		}
498		try {
499		q.element();
500		shouldThrow();
501	<	}
598	<	catch (NoSuchElementException success) {}
501	>	} catch (NoSuchElementException success) {}
502		}
503
504		/**
#	Line 604 | Line 507 | public class ArrayBlockingQueueTest exte
507		public void testRemove() {
508		ArrayBlockingQueue q = populatedQueue(SIZE);
509		for (int i = 0; i < SIZE; ++i) {
510	<	assertEquals(i, ((Integer)q.remove()).intValue());
510	>	assertEquals(i, q.remove());
511		}
512		try {
513		q.remove();
514		shouldThrow();
515	<	} catch (NoSuchElementException success) {
613	<	}
614	<	}
615	<
616	<	/**
617	<	* remove(x) removes x and returns true if present
618	<	*/
619	<	public void testRemoveElement() {
620	<	ArrayBlockingQueue q = populatedQueue(SIZE);
621	<	for (int i = 1; i < SIZE; i+=2) {
622	<	assertTrue(q.remove(new Integer(i)));
623	<	}
624	<	for (int i = 0; i < SIZE; i+=2) {
625	<	assertTrue(q.remove(new Integer(i)));
626	<	assertFalse(q.remove(new Integer(i+1)));
627	<	}
628	<	assertTrue(q.isEmpty());
515	>	} catch (NoSuchElementException success) {}
516		}
517
518		/**
#	Line 635 | Line 522 | public class ArrayBlockingQueueTest exte
522		ArrayBlockingQueue q = populatedQueue(SIZE);
523		for (int i = 0; i < SIZE; ++i) {
524		assertTrue(q.contains(new Integer(i)));
525	<	q.poll();
525	>	assertEquals(i, q.poll());
526		assertFalse(q.contains(new Integer(i)));
527		}
528		}
#	Line 684 | Line 571 | public class ArrayBlockingQueueTest exte
571		assertTrue(changed);
572
573		assertTrue(q.containsAll(p));
574	<	assertEquals(SIZE-i, q.size());
574	>	assertEquals(SIZE - i, q.size());
575		p.remove();
576		}
577		}
#	Line 697 | Line 584 | public class ArrayBlockingQueueTest exte
584		ArrayBlockingQueue q = populatedQueue(SIZE);
585		ArrayBlockingQueue p = populatedQueue(i);
586		assertTrue(q.removeAll(p));
587	<	assertEquals(SIZE-i, q.size());
587	>	assertEquals(SIZE - i, q.size());
588		for (int j = 0; j < i; ++j) {
589	<	Integer I = (Integer)(p.remove());
590	<	assertFalse(q.contains(I));
589	>	Integer x = (Integer)(p.remove());
590	>	assertFalse(q.contains(x));
591		}
592		}
593		}
594
595	<	/**
596	<	*  toArray contains all elements
710	<	*/
711	<	public void testToArray() {
712	<	ArrayBlockingQueue q = populatedQueue(SIZE);
595	>	void checkToArray(ArrayBlockingQueue q) {
596	>	int size = q.size();
597		Object[] o = q.toArray();
598	<	try {
599	<	for (int i = 0; i < o.length; i++)
600	<	assertEquals(o[i], q.take());
601	<	} catch (InterruptedException e) {
602	<	unexpectedException();
598	>	assertEquals(size, o.length);
599	>	Iterator it = q.iterator();
600	>	for (int i = 0; i < size; i++) {
601	>	Integer x = (Integer) it.next();
602	>	assertEquals((Integer)o[0] + i, (int) x);
603	>	assertSame(o[i], x);
604		}
605		}
606
607		/**
608	<	* toArray(a) contains all elements
608	>	* toArray() contains all elements in FIFO order
609		*/
610	<	public void testToArray2() {
611	<	ArrayBlockingQueue q = populatedQueue(SIZE);
612	<	Integer[] ints = new Integer[SIZE];
613	<	ints = (Integer[])q.toArray(ints);
614	<	try {
615	<	for (int i = 0; i < ints.length; i++)
616	<	assertEquals(ints[i], q.take());
617	<	} catch (InterruptedException e) {
618	<	unexpectedException();
610	>	public void testToArray() {
611	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
612	>	for (int i = 0; i < SIZE; i++) {
613	>	checkToArray(q);
614	>	q.add(i);
615	>	}
616	>	// Provoke wraparound
617	>	for (int i = 0; i < SIZE; i++) {
618	>	checkToArray(q);
619	>	assertEquals(i, q.poll());
620	>	checkToArray(q);
621	>	q.add(SIZE + i);
622	>	}
623	>	for (int i = 0; i < SIZE; i++) {
624	>	checkToArray(q);
625	>	assertEquals(SIZE + i, q.poll());
626	>	}
627	>	}
628	>
629	>	void checkToArray2(ArrayBlockingQueue q) {
630	>	int size = q.size();
631	>	Integer[] a1 = (size == 0) ? null : new Integer[size - 1];
632	>	Integer[] a2 = new Integer[size];
633	>	Integer[] a3 = new Integer[size + 2];
634	>	if (size > 0) Arrays.fill(a1, 42);
635	>	Arrays.fill(a2, 42);
636	>	Arrays.fill(a3, 42);
637	>	Integer[] b1 = (size == 0) ? null : (Integer[]) q.toArray(a1);
638	>	Integer[] b2 = (Integer[]) q.toArray(a2);
639	>	Integer[] b3 = (Integer[]) q.toArray(a3);
640	>	assertSame(a2, b2);
641	>	assertSame(a3, b3);
642	>	Iterator it = q.iterator();
643	>	for (int i = 0; i < size; i++) {
644	>	Integer x = (Integer) it.next();
645	>	assertSame(b1[i], x);
646	>	assertEquals(b1[0] + i, (int) x);
647	>	assertSame(b2[i], x);
648	>	assertSame(b3[i], x);
649	>	}
650	>	assertNull(a3[size]);
651	>	assertEquals(42, (int) a3[size + 1]);
652	>	if (size > 0) {
653	>	assertNotSame(a1, b1);
654	>	assertEquals(size, b1.length);
655	>	for (int i = 0; i < a1.length; i++) {
656	>	assertEquals(42, (int) a1[i]);
657	>	}
658		}
659		}
660
661		/**
662	<	* toArray(null) throws NPE
662	>	* toArray(a) contains all elements in FIFO order
663		*/
664	<	public void testToArray_BadArg() {
665	<	try {
666	<	ArrayBlockingQueue q = populatedQueue(SIZE);
667	<	Object o[] = q.toArray(null);
668	<	shouldThrow();
669	<	} catch (NullPointerException success) {}
664	>	public void testToArray2() {
665	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
666	>	for (int i = 0; i < SIZE; i++) {
667	>	checkToArray2(q);
668	>	q.add(i);
669	>	}
670	>	// Provoke wraparound
671	>	for (int i = 0; i < SIZE; i++) {
672	>	checkToArray2(q);
673	>	assertEquals(i, q.poll());
674	>	checkToArray2(q);
675	>	q.add(SIZE + i);
676	>	}
677	>	for (int i = 0; i < SIZE; i++) {
678	>	checkToArray2(q);
679	>	assertEquals(SIZE + i, q.poll());
680	>	}
681		}
682
683		/**
684	<	* toArray with incompatible array type throws CCE
684	>	* toArray(incompatible array type) throws ArrayStoreException
685		*/
686		public void testToArray1_BadArg() {
687	+	ArrayBlockingQueue q = populatedQueue(SIZE);
688		try {
689	<	ArrayBlockingQueue q = populatedQueue(SIZE);
754	<	Object o[] = q.toArray(new String[10] );
689	>	q.toArray(new String[10]);
690		shouldThrow();
691	<	} catch (ArrayStoreException  success) {}
691	>	} catch (ArrayStoreException success) {}
692		}
693
759	–
694		/**
695		* iterator iterates through all elements
696		*/
697	<	public void testIterator() {
697	>	public void testIterator() throws InterruptedException {
698		ArrayBlockingQueue q = populatedQueue(SIZE);
699		Iterator it = q.iterator();
700	<	try {
701	<	while (it.hasNext()) {
702	<	assertEquals(it.next(), q.take());
703	<	}
704	<	} catch (InterruptedException e) {
705	<	unexpectedException();
706	<	}
700	>	int i;
701	>	for (i = 0; it.hasNext(); i++)
702	>	assertTrue(q.contains(it.next()));
703	>	assertEquals(i, SIZE);
704	>	assertIteratorExhausted(it);
705	>
706	>	it = q.iterator();
707	>	for (i = 0; it.hasNext(); i++)
708	>	assertEquals(it.next(), q.take());
709	>	assertEquals(i, SIZE);
710	>	assertIteratorExhausted(it);
711	>	}
712	>
713	>	/**
714	>	* iterator of empty collection has no elements
715	>	*/
716	>	public void testEmptyIterator() {
717	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
718		}
719
720		/**
721		* iterator.remove removes current element
722		*/
723	<	public void testIteratorRemove () {
723	>	public void testIteratorRemove() {
724		final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
725		q.add(two);
726		q.add(one);
#	Line 786 | Line 731 | public class ArrayBlockingQueueTest exte
731		it.remove();
732
733		it = q.iterator();
734	<	assertEquals(it.next(), one);
735	<	assertEquals(it.next(), three);
734	>	assertSame(it.next(), one);
735	>	assertSame(it.next(), three);
736		assertFalse(it.hasNext());
737		}
738
#	Line 804 | Line 749 | public class ArrayBlockingQueueTest exte
749
750		int k = 0;
751		for (Iterator it = q.iterator(); it.hasNext();) {
752	<	int i = ((Integer)(it.next())).intValue();
808	<	assertEquals(++k, i);
752	>	assertEquals(++k, it.next());
753		}
754		assertEquals(3, k);
755		}
#	Line 813 | Line 757 | public class ArrayBlockingQueueTest exte
757		/**
758		* Modifications do not cause iterators to fail
759		*/
760	<	public void testWeaklyConsistentIteration () {
760	>	public void testWeaklyConsistentIteration() {
761		final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
762		q.add(one);
763		q.add(two);
764		q.add(three);
765	<	try {
766	<	for (Iterator it = q.iterator(); it.hasNext();) {
767	<	q.remove();
824	<	it.next();
825	<	}
826	<	}
827	<	catch (ConcurrentModificationException e) {
828	<	unexpectedException();
765	>	for (Iterator it = q.iterator(); it.hasNext();) {
766	>	q.remove();
767	>	it.next();
768		}
769		assertEquals(0, q.size());
770		}
771
833	–
772		/**
773		* toString contains toStrings of elements
774		*/
#	Line 838 | Line 776 | public class ArrayBlockingQueueTest exte
776		ArrayBlockingQueue q = populatedQueue(SIZE);
777		String s = q.toString();
778		for (int i = 0; i < SIZE; ++i) {
779	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
779	>	assertTrue(s.contains(String.valueOf(i)));
780		}
781		}
782
845	–
783		/**
784		* offer transfers elements across Executor tasks
785		*/
#	Line 850 | Line 787 | public class ArrayBlockingQueueTest exte
787		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
788		q.add(one);
789		q.add(two);
790	<	ExecutorService executor = Executors.newFixedThreadPool(2);
791	<	executor.execute(new Runnable() {
792	<	public void run() {
793	<	threadAssertFalse(q.offer(three));
794	<	try {
795	<	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
796	<	threadAssertEquals(0, q.remainingCapacity());
797	<	}
798	<	catch (InterruptedException e) {
799	<	threadUnexpectedException();
863	<	}
864	<	}
865	<	});
866	<
867	<	executor.execute(new Runnable() {
868	<	public void run() {
869	<	try {
870	<	Thread.sleep(SMALL_DELAY_MS);
871	<	threadAssertEquals(one, q.take());
872	<	}
873	<	catch (InterruptedException e) {
874	<	threadUnexpectedException();
875	<	}
876	<	}
877	<	});
878	<
879	<	joinPool(executor);
790	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
791	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
792	>	try (PoolCleaner cleaner = cleaner(executor)) {
793	>	executor.execute(new CheckedRunnable() {
794	>	public void realRun() throws InterruptedException {
795	>	assertFalse(q.offer(three));
796	>	threadsStarted.await();
797	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
798	>	assertEquals(0, q.remainingCapacity());
799	>	}});
800
801	+	executor.execute(new CheckedRunnable() {
802	+	public void realRun() throws InterruptedException {
803	+	threadsStarted.await();
804	+	assertEquals(0, q.remainingCapacity());
805	+	assertSame(one, q.take());
806	+	}});
807	+	}
808		}
809
810		/**
811	<	* poll retrieves elements across Executor threads
811	>	* timed poll retrieves elements across Executor threads
812		*/
813		public void testPollInExecutor() {
814		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
815	<	ExecutorService executor = Executors.newFixedThreadPool(2);
816	<	executor.execute(new Runnable() {
817	<	public void run() {
818	<	threadAssertNull(q.poll());
819	<	try {
820	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
821	<	threadAssertTrue(q.isEmpty());
822	<	}
823	<	catch (InterruptedException e) {
824	<	threadUnexpectedException();
898	<	}
899	<	}
900	<	});
815	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
816	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
817	>	try (PoolCleaner cleaner = cleaner(executor)) {
818	>	executor.execute(new CheckedRunnable() {
819	>	public void realRun() throws InterruptedException {
820	>	assertNull(q.poll());
821	>	threadsStarted.await();
822	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
823	>	checkEmpty(q);
824	>	}});
825
826	<	executor.execute(new Runnable() {
827	<	public void run() {
828	<	try {
905	<	Thread.sleep(SMALL_DELAY_MS);
826	>	executor.execute(new CheckedRunnable() {
827	>	public void realRun() throws InterruptedException {
828	>	threadsStarted.await();
829		q.put(one);
830	<	}
908	<	catch (InterruptedException e) {
909	<	threadUnexpectedException();
910	<	}
911	<	}
912	<	});
913	<
914	<	joinPool(executor);
915	<	}
916	<
917	<	/**
918	<	* A deserialized serialized queue has same elements in same order
919	<	*/
920	<	public void testSerialization() {
921	<	ArrayBlockingQueue q = populatedQueue(SIZE);
922	<
923	<	try {
924	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
925	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
926	<	out.writeObject(q);
927	<	out.close();
928	<
929	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
930	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
931	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
932	<	assertEquals(q.size(), r.size());
933	<	while (!q.isEmpty())
934	<	assertEquals(q.remove(), r.remove());
935	<	} catch (Exception e) {
936	<	unexpectedException();
937	<	}
938	<	}
939	<
940	<	/**
941	<	* drainTo(null) throws NPE
942	<	*/
943	<	public void testDrainToNull() {
944	<	ArrayBlockingQueue q = populatedQueue(SIZE);
945	<	try {
946	<	q.drainTo(null);
947	<	shouldThrow();
948	<	} catch (NullPointerException success) {
830	>	}});
831		}
832		}
833
834		/**
835	<	* drainTo(this) throws IAE
835	>	* A deserialized serialized queue has same elements in same order
836		*/
837	<	public void testDrainToSelf() {
838	<	ArrayBlockingQueue q = populatedQueue(SIZE);
839	<	try {
840	<	q.drainTo(q);
841	<	shouldThrow();
842	<	} catch (IllegalArgumentException success) {
837	>	public void testSerialization() throws Exception {
838	>	Queue x = populatedQueue(SIZE);
839	>	Queue y = serialClone(x);
840	>
841	>	assertNotSame(x, y);
842	>	assertEquals(x.size(), y.size());
843	>	assertEquals(x.toString(), y.toString());
844	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
845	>	while (!x.isEmpty()) {
846	>	assertFalse(y.isEmpty());
847	>	assertEquals(x.remove(), y.remove());
848		}
849	+	assertTrue(y.isEmpty());
850		}
851
852		/**
#	Line 968 | Line 856 | public class ArrayBlockingQueueTest exte
856		ArrayBlockingQueue q = populatedQueue(SIZE);
857		ArrayList l = new ArrayList();
858		q.drainTo(l);
859	<	assertEquals(q.size(), 0);
860	<	assertEquals(l.size(), SIZE);
859	>	assertEquals(0, q.size());
860	>	assertEquals(SIZE, l.size());
861		for (int i = 0; i < SIZE; ++i)
862		assertEquals(l.get(i), new Integer(i));
863		q.add(zero);
#	Line 979 | Line 867 | public class ArrayBlockingQueueTest exte
867		assertTrue(q.contains(one));
868		l.clear();
869		q.drainTo(l);
870	<	assertEquals(q.size(), 0);
871	<	assertEquals(l.size(), 2);
870	>	assertEquals(0, q.size());
871	>	assertEquals(2, l.size());
872		for (int i = 0; i < 2; ++i)
873		assertEquals(l.get(i), new Integer(i));
874		}
#	Line 988 | Line 876 | public class ArrayBlockingQueueTest exte
876		/**
877		* drainTo empties full queue, unblocking a waiting put.
878		*/
879	<	public void testDrainToWithActivePut() {
879	>	public void testDrainToWithActivePut() throws InterruptedException {
880		final ArrayBlockingQueue q = populatedQueue(SIZE);
881	<	Thread t = new Thread(new Runnable() {
882	<	public void run() {
883	<	try {
884	<	q.put(new Integer(SIZE+1));
997	<	} catch (InterruptedException ie) {
998	<	threadUnexpectedException();
999	<	}
1000	<	}
1001	<	});
1002	<	try {
1003	<	t.start();
1004	<	ArrayList l = new ArrayList();
1005	<	q.drainTo(l);
1006	<	assertTrue(l.size() >= SIZE);
1007	<	for (int i = 0; i < SIZE; ++i)
1008	<	assertEquals(l.get(i), new Integer(i));
1009	<	t.join();
1010	<	assertTrue(q.size() + l.size() >= SIZE);
1011	<	} catch (Exception e) {
1012	<	unexpectedException();
1013	<	}
1014	<	}
881	>	Thread t = new Thread(new CheckedRunnable() {
882	>	public void realRun() throws InterruptedException {
883	>	q.put(new Integer(SIZE + 1));
884	>	}});
885
886	<	/**
887	<	* drainTo(null, n) throws NPE
888	<	*/
889	<	public void testDrainToNullN() {
890	<	ArrayBlockingQueue q = populatedQueue(SIZE);
891	<	try {
892	<	q.drainTo(null, 0);
893	<	shouldThrow();
1024	<	} catch (NullPointerException success) {
1025	<	}
1026	<	}
1027	<
1028	<	/**
1029	<	* drainTo(this, n) throws IAE
1030	<	*/
1031	<	public void testDrainToSelfN() {
1032	<	ArrayBlockingQueue q = populatedQueue(SIZE);
1033	<	try {
1034	<	q.drainTo(q, 0);
1035	<	shouldThrow();
1036	<	} catch (IllegalArgumentException success) {
1037	<	}
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);
894		}
895
896		/**
897	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
897	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
898		*/
899		public void testDrainToN() {
900	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
900	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
901		for (int i = 0; i < SIZE + 2; ++i) {
902		for (int j = 0; j < SIZE; j++)
903		assertTrue(q.offer(new Integer(j)));
904		ArrayList l = new ArrayList();
905		q.drainTo(l, i);
906	<	int k = (i < SIZE)? i : SIZE;
907	<	assertEquals(l.size(), k);
908	<	assertEquals(q.size(), SIZE-k);
906	>	int k = (i < SIZE) ? i : SIZE;
907	>	assertEquals(k, l.size());
908	>	assertEquals(SIZE - k, q.size());
909		for (int j = 0; j < k; ++j)
910		assertEquals(l.get(j), new Integer(j));
911	<	while (q.poll() != null) ;
911	>	do {} while (q.poll() != null);
912		}
913		}
914
915	+	/**
916	+	* remove(null), contains(null) always return false
917	+	*/
918	+	public void testNeverContainsNull() {
919	+	Collection<?>[] qs = {
920	+	new ArrayBlockingQueue<Object>(10),
921	+	populatedQueue(2),
922	+	};
923
924	+	for (Collection<?> q : qs) {
925	+	assertFalse(q.contains(null));
926	+	assertFalse(q.remove(null));
927	+	}
928	+	}
929		}

Diff Legend

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