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

Diff Legend

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