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.18 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.79 by jsr166, Sun Nov 6 03:52:59 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.Collections;
15	>	import java.util.Iterator;
16	>	import java.util.NoSuchElementException;
17	>	import java.util.Queue;
18	>	import java.util.concurrent.ArrayBlockingQueue;
19	>	import java.util.concurrent.BlockingQueue;
20	>	import java.util.concurrent.CountDownLatch;
21	>	import java.util.concurrent.Executors;
22	>	import java.util.concurrent.ExecutorService;
23	>	import java.util.concurrent.ThreadLocalRandom;
24	>
25	>	import junit.framework.Test;
26
27		public class ArrayBlockingQueueTest extends JSR166TestCase {
28	+
29		public static void main(String[] args) {
30	<	junit.textui.TestRunner.run (suite());
30	>	main(suite(), args);
31		}
32	+
33		public static Test suite() {
34	<	return new TestSuite(ArrayBlockingQueueTest.class);
34	>	class Implementation implements CollectionImplementation {
35	>	public Class<?> klazz() { return ArrayBlockingQueue.class; }
36	>	public Collection emptyCollection() {
37	>	boolean fair = ThreadLocalRandom.current().nextBoolean();
38	>	return populatedQueue(0, SIZE, 2 * SIZE, fair);
39	>	}
40	>	public Object makeElement(int i) { return i; }
41	>	public boolean isConcurrent() { return true; }
42	>	public boolean permitsNulls() { return false; }
43	>	}
44	>
45	>	return newTestSuite(
46	>	ArrayBlockingQueueTest.class,
47	>	new Fair().testSuite(),
48	>	new NonFair().testSuite(),
49	>	CollectionTest.testSuite(new Implementation()));
50	>	}
51	>
52	>	public static class Fair extends BlockingQueueTest {
53	>	protected BlockingQueue emptyCollection() {
54	>	return populatedQueue(0, SIZE, 2 * SIZE, true);
55	>	}
56	>	}
57	>
58	>	public static class NonFair extends BlockingQueueTest {
59	>	protected BlockingQueue emptyCollection() {
60	>	return populatedQueue(0, SIZE, 2 * SIZE, false);
61	>	}
62		}
63
64		/**
65	<	* Create a queue of given size containing consecutive
66	<	* Integers 0 ... n.
65	>	* Returns a new queue of given size containing consecutive
66	>	* Integers 0 ... n - 1.
67		*/
68	<	private ArrayBlockingQueue populatedQueue(int n) {
69	<	ArrayBlockingQueue q = new ArrayBlockingQueue(n);
68	>	static ArrayBlockingQueue<Integer> populatedQueue(int n) {
69	>	return populatedQueue(n, n, n, false);
70	>	}
71	>
72	>	/**
73	>	* Returns a new queue of given size containing consecutive
74	>	* Integers 0 ... n - 1, with given capacity range and fairness.
75	>	*/
76	>	static ArrayBlockingQueue<Integer> populatedQueue(
77	>	int size, int minCapacity, int maxCapacity, boolean fair) {
78	>	ThreadLocalRandom rnd = ThreadLocalRandom.current();
79	>	int capacity = rnd.nextInt(minCapacity, maxCapacity + 1);
80	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
81		assertTrue(q.isEmpty());
82	<	for (int i = 0; i < n; i++)
83	<	assertTrue(q.offer(new Integer(i)));
84	<	assertFalse(q.isEmpty());
85	<	assertEquals(0, q.remainingCapacity());
86	<	assertEquals(n, q.size());
82	>	// shuffle circular array elements so they wrap
83	>	{
84	>	int n = rnd.nextInt(capacity);
85	>	for (int i = 0; i < n; i++) q.add(42);
86	>	for (int i = 0; i < n; i++) q.remove();
87	>	}
88	>	for (int i = 0; i < size; i++)
89	>	assertTrue(q.offer((Integer) i));
90	>	assertEquals(size == 0, q.isEmpty());
91	>	assertEquals(capacity - size, q.remainingCapacity());
92	>	assertEquals(size, q.size());
93	>	if (size > 0)
94	>	assertEquals((Integer) 0, q.peek());
95		return q;
96		}
97
#	Line 46 | Line 105 | public class ArrayBlockingQueueTest exte
105		/**
106		* Constructor throws IAE if capacity argument nonpositive
107		*/
108	<	public void testConstructor2() {
109	<	try {
110	<	ArrayBlockingQueue q = new ArrayBlockingQueue(0);
111	<	shouldThrow();
112	<	} catch (IllegalArgumentException success) {}
108	>	public void testConstructor_nonPositiveCapacity() {
109	>	for (int i : new int[] { 0, -1, Integer.MIN_VALUE }) {
110	>	try {
111	>	new ArrayBlockingQueue(i);
112	>	shouldThrow();
113	>	} catch (IllegalArgumentException success) {}
114	>	for (boolean fair : new boolean[] { true, false }) {
115	>	try {
116	>	new ArrayBlockingQueue(i, fair);
117	>	shouldThrow();
118	>	} catch (IllegalArgumentException success) {}
119	>	}
120	>	}
121		}
122
123		/**
124		* Initializing from null Collection throws NPE
125		*/
126	<	public void testConstructor3() {
126	>	public void testConstructor_nullCollection() {
127		try {
128	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
128	>	new ArrayBlockingQueue(1, true, null);
129		shouldThrow();
130		} catch (NullPointerException success) {}
131		}
#	Line 67 | Line 134 | public class ArrayBlockingQueueTest exte
134		* Initializing from Collection of null elements throws NPE
135		*/
136		public void testConstructor4() {
137	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
138		try {
139	<	Integer[] ints = new Integer[SIZE];
72	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
139	>	new ArrayBlockingQueue(SIZE, false, elements);
140		shouldThrow();
141		} catch (NullPointerException success) {}
142		}
#	Line 78 | Line 145 | public class ArrayBlockingQueueTest exte
145		* Initializing from Collection with some null elements throws NPE
146		*/
147		public void testConstructor5() {
148	+	Integer[] ints = new Integer[SIZE];
149	+	for (int i = 0; i < SIZE - 1; ++i)
150	+	ints[i] = i;
151	+	Collection<Integer> elements = Arrays.asList(ints);
152		try {
153	<	Integer[] ints = new Integer[SIZE];
83	<	for (int i = 0; i < SIZE-1; ++i)
84	<	ints[i] = new Integer(i);
85	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
153	>	new ArrayBlockingQueue(SIZE, false, elements);
154		shouldThrow();
155		} catch (NullPointerException success) {}
156		}
#	Line 90 | Line 158 | public class ArrayBlockingQueueTest exte
158		/**
159		* Initializing from too large collection throws IAE
160		*/
161	<	public void testConstructor6() {
161	>	public void testConstructor_collectionTooLarge() {
162	>	// just barely fits - succeeds
163	>	new ArrayBlockingQueue(SIZE, false,
164	>	Collections.nCopies(SIZE, ""));
165		try {
166	<	Integer[] ints = new Integer[SIZE];
167	<	for (int i = 0; i < SIZE; ++i)
97	<	ints[i] = new Integer(i);
98	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
166	>	new ArrayBlockingQueue(SIZE - 1, false,
167	>	Collections.nCopies(SIZE, ""));
168		shouldThrow();
169		} catch (IllegalArgumentException success) {}
170		}
#	Line 104 | Line 173 | public class ArrayBlockingQueueTest exte
173		* Queue contains all elements of collection used to initialize
174		*/
175		public void testConstructor7() {
176	<	try {
177	<	Integer[] ints = new Integer[SIZE];
178	<	for (int i = 0; i < SIZE; ++i)
179	<	ints[i] = new Integer(i);
180	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
181	<	for (int i = 0; i < SIZE; ++i)
182	<	assertEquals(ints[i], q.poll());
114	<	}
115	<	finally {}
176	>	Integer[] ints = new Integer[SIZE];
177	>	for (int i = 0; i < SIZE; ++i)
178	>	ints[i] = i;
179	>	Collection<Integer> elements = Arrays.asList(ints);
180	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, elements);
181	>	for (int i = 0; i < SIZE; ++i)
182	>	assertEquals(ints[i], q.poll());
183		}
184
185		/**
186		* Queue transitions from empty to full when elements added
187		*/
188		public void testEmptyFull() {
189	<	ArrayBlockingQueue q = new ArrayBlockingQueue(2);
189	>	BlockingQueue q = populatedQueue(0, 2, 2, false);
190		assertTrue(q.isEmpty());
191		assertEquals(2, q.remainingCapacity());
192		q.add(one);
193		assertFalse(q.isEmpty());
194	<	q.add(two);
194	>	assertTrue(q.offer(two));
195		assertFalse(q.isEmpty());
196		assertEquals(0, q.remainingCapacity());
197		assertFalse(q.offer(three));
#	Line 134 | Line 201 | public class ArrayBlockingQueueTest exte
201		* remainingCapacity decreases on add, increases on remove
202		*/
203		public void testRemainingCapacity() {
204	<	ArrayBlockingQueue q = populatedQueue(SIZE);
205	<	for (int i = 0; i < SIZE; ++i) {
206	<	assertEquals(i, q.remainingCapacity());
207	<	assertEquals(SIZE-i, q.size());
208	<	q.remove();
209	<	}
210	<	for (int i = 0; i < SIZE; ++i) {
211	<	assertEquals(SIZE-i, q.remainingCapacity());
212	<	assertEquals(i, q.size());
213	<	q.add(new Integer(i));
204	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
205	>	BlockingQueue q = populatedQueue(size, size, 2 * size, false);
206	>	int spare = q.remainingCapacity();
207	>	int capacity = spare + size;
208	>	for (int i = 0; i < size; i++) {
209	>	assertEquals(spare + i, q.remainingCapacity());
210	>	assertEquals(capacity, q.size() + q.remainingCapacity());
211	>	assertEquals(i, q.remove());
212	>	}
213	>	for (int i = 0; i < size; i++) {
214	>	assertEquals(capacity - i, q.remainingCapacity());
215	>	assertEquals(capacity, q.size() + q.remainingCapacity());
216	>	assertTrue(q.add(i));
217		}
218		}
219
220		/**
151	–	*  offer(null) throws NPE
152	–	*/
153	–	public void testOfferNull() {
154	–	try {
155	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
156	–	q.offer(null);
157	–	shouldThrow();
158	–	} catch (NullPointerException success) {}
159	–	}
160	–
161	–	/**
162	–	*  add(null) throws NPE
163	–	*/
164	–	public void testAddNull() {
165	–	try {
166	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
167	–	q.add(null);
168	–	shouldThrow();
169	–	} catch (NullPointerException success) {}
170	–	}
171	–
172	–	/**
221		* Offer succeeds if not full; fails if full
222		*/
223		public void testOffer() {
#	Line 182 | Line 230 | public class ArrayBlockingQueueTest exte
230		* add succeeds if not full; throws ISE if full
231		*/
232		public void testAdd() {
233	+	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
234	+	for (int i = 0; i < SIZE; i++) assertTrue(q.add((Integer) i));
235	+	assertEquals(0, q.remainingCapacity());
236		try {
237	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
187	<	for (int i = 0; i < SIZE; ++i) {
188	<	assertTrue(q.add(new Integer(i)));
189	<	}
190	<	assertEquals(0, q.remainingCapacity());
191	<	q.add(new Integer(SIZE));
237	>	q.add((Integer) SIZE);
238		shouldThrow();
239		} catch (IllegalStateException success) {}
240		}
241
242		/**
197	–	*  addAll(null) throws NPE
198	–	*/
199	–	public void testAddAll1() {
200	–	try {
201	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
202	–	q.addAll(null);
203	–	shouldThrow();
204	–	} catch (NullPointerException success) {}
205	–	}
206	–
207	–	/**
243		* addAll(this) throws IAE
244		*/
245		public void testAddAllSelf() {
246	+	ArrayBlockingQueue q = populatedQueue(SIZE);
247		try {
212	–	ArrayBlockingQueue q = populatedQueue(SIZE);
248		q.addAll(q);
249		shouldThrow();
250		} catch (IllegalArgumentException success) {}
251		}
252
218	–
219	–	/**
220	–	*  addAll of a collection with null elements throws NPE
221	–	*/
222	–	public void testAddAll2() {
223	–	try {
224	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
225	–	Integer[] ints = new Integer[SIZE];
226	–	q.addAll(Arrays.asList(ints));
227	–	shouldThrow();
228	–	} catch (NullPointerException success) {}
229	–	}
253		/**
254		* addAll of a collection with any null elements throws NPE after
255		* possibly adding some elements
256		*/
257		public void testAddAll3() {
258	+	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
259	+	Integer[] ints = new Integer[SIZE];
260	+	for (int i = 0; i < SIZE - 1; ++i)
261	+	ints[i] = new Integer(i);
262		try {
236	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
237	–	Integer[] ints = new Integer[SIZE];
238	–	for (int i = 0; i < SIZE-1; ++i)
239	–	ints[i] = new Integer(i);
263		q.addAll(Arrays.asList(ints));
264		shouldThrow();
265		} catch (NullPointerException success) {}
266		}
267	+
268		/**
269		* addAll throws ISE if not enough room
270		*/
271	<	public void testAddAll4() {
271	>	public void testAddAll_insufficientSpace() {
272	>	int size = ThreadLocalRandom.current().nextInt(SIZE);
273	>	ArrayBlockingQueue q = populatedQueue(0, size, size, false);
274	>	// Just fits:
275	>	q.addAll(populatedQueue(size, size, 2 * size, false));
276	>	assertEquals(0, q.remainingCapacity());
277	>	assertEquals(size, q.size());
278	>	assertEquals(0, q.peek());
279		try {
280	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
281	<	Integer[] ints = new Integer[SIZE];
251	<	for (int i = 0; i < SIZE; ++i)
252	<	ints[i] = new Integer(i);
253	<	q.addAll(Arrays.asList(ints));
280	>	q = populatedQueue(0, size, size, false);
281	>	q.addAll(Collections.nCopies(size + 1, 42));
282		shouldThrow();
283		} catch (IllegalStateException success) {}
284		}
285	+
286		/**
287		* Queue contains all elements, in traversal order, of successful addAll
288		*/
#	Line 270 | Line 299 | public class ArrayBlockingQueueTest exte
299		}
300
301		/**
273	–	*  put(null) throws NPE
274	–	*/
275	–	public void testPutNull() throws InterruptedException {
276	–	try {
277	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
278	–	q.put(null);
279	–	shouldThrow();
280	–	} catch (NullPointerException success) {}
281	–	}
282	–
283	–	/**
302		* all elements successfully put are contained
303		*/
304		public void testPut() throws InterruptedException {
305		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
306		for (int i = 0; i < SIZE; ++i) {
307	<	Integer I = new Integer(i);
308	<	q.put(I);
309	<	assertTrue(q.contains(I));
307	>	Integer x = new Integer(i);
308	>	q.put(x);
309	>	assertTrue(q.contains(x));
310		}
311		assertEquals(0, q.remainingCapacity());
312		}
#	Line 298 | Line 316 | public class ArrayBlockingQueueTest exte
316		*/
317		public void testBlockingPut() throws InterruptedException {
318		final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
319	<	Thread t = new Thread(new CheckedRunnable() {
320	<	public void realRun() {
321	<	int added = 0;
319	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
320	>	Thread t = newStartedThread(new CheckedRunnable() {
321	>	public void realRun() throws InterruptedException {
322	>	for (int i = 0; i < SIZE; ++i)
323	>	q.put(i);
324	>	assertEquals(SIZE, q.size());
325	>	assertEquals(0, q.remainingCapacity());
326	>
327	>	Thread.currentThread().interrupt();
328		try {
329	<	for (int i = 0; i < SIZE; ++i) {
330	<	q.put(new Integer(i));
331	<	++added;
332	<	}
309	<	q.put(new Integer(SIZE));
310	<	threadShouldThrow();
311	<	} catch (InterruptedException ie) {
312	<	threadAssertEquals(added, SIZE);
313	<	}}});
329	>	q.put(99);
330	>	shouldThrow();
331	>	} catch (InterruptedException success) {}
332	>	assertFalse(Thread.interrupted());
333
334	<	t.start();
335	<	Thread.sleep(MEDIUM_DELAY_MS);
334	>	pleaseInterrupt.countDown();
335	>	try {
336	>	q.put(99);
337	>	shouldThrow();
338	>	} catch (InterruptedException success) {}
339	>	assertFalse(Thread.interrupted());
340	>	}});
341	>
342	>	await(pleaseInterrupt);
343	>	assertThreadStaysAlive(t);
344		t.interrupt();
345	<	t.join();
345	>	awaitTermination(t);
346	>	assertEquals(SIZE, q.size());
347	>	assertEquals(0, q.remainingCapacity());
348		}
349
350		/**
351	<	* put blocks waiting for take when full
351	>	* put blocks interruptibly waiting for take when full
352		*/
353		public void testPutWithTake() throws InterruptedException {
354	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
355	<	Thread t = new Thread(new CheckedRunnable() {
356	<	public void realRun() {
357	<	int added = 0;
354	>	final int capacity = 2;
355	>	final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
356	>	final CountDownLatch pleaseTake = new CountDownLatch(1);
357	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
358	>	Thread t = newStartedThread(new CheckedRunnable() {
359	>	public void realRun() throws InterruptedException {
360	>	for (int i = 0; i < capacity; i++)
361	>	q.put(i);
362	>	pleaseTake.countDown();
363	>	q.put(86);
364	>
365	>	pleaseInterrupt.countDown();
366		try {
367	<	q.put(new Object());
368	<	++added;
369	<	q.put(new Object());
370	<	++added;
334	<	q.put(new Object());
335	<	++added;
336	<	q.put(new Object());
337	<	++added;
338	<	threadShouldThrow();
339	<	} catch (InterruptedException e) {
340	<	threadAssertTrue(added >= 2);
341	<	}
367	>	q.put(99);
368	>	shouldThrow();
369	>	} catch (InterruptedException success) {}
370	>	assertFalse(Thread.interrupted());
371		}});
372
373	<	t.start();
374	<	Thread.sleep(SHORT_DELAY_MS);
375	<	q.take();
373	>	await(pleaseTake);
374	>	assertEquals(0, q.remainingCapacity());
375	>	assertEquals(0, q.take());
376	>
377	>	await(pleaseInterrupt);
378	>	assertThreadStaysAlive(t);
379		t.interrupt();
380	<	t.join();
380	>	awaitTermination(t);
381	>	assertEquals(0, q.remainingCapacity());
382		}
383
384		/**
#	Line 353 | Line 386 | public class ArrayBlockingQueueTest exte
386		*/
387		public void testTimedOffer() throws InterruptedException {
388		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
389	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
389	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
390	>	Thread t = newStartedThread(new CheckedRunnable() {
391		public void realRun() throws InterruptedException {
392		q.put(new Object());
393		q.put(new Object());
394	<	threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
395	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
396	<	}};
394	>	long startTime = System.nanoTime();
395	>	assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
396	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
397	>	pleaseInterrupt.countDown();
398	>	try {
399	>	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
400	>	shouldThrow();
401	>	} catch (InterruptedException success) {}
402	>	}});
403
404	<	t.start();
405	<	Thread.sleep(SHORT_DELAY_MS);
404	>	await(pleaseInterrupt);
405	>	assertThreadStaysAlive(t);
406		t.interrupt();
407	<	t.join();
407	>	awaitTermination(t);
408		}
409
410		/**
#	Line 373 | Line 413 | public class ArrayBlockingQueueTest exte
413		public void testTake() throws InterruptedException {
414		ArrayBlockingQueue q = populatedQueue(SIZE);
415		for (int i = 0; i < SIZE; ++i) {
416	<	assertEquals(i, ((Integer)q.take()).intValue());
416	>	assertEquals(i, q.take());
417		}
418		}
419
420		/**
381	–	* take blocks interruptibly when empty
382	–	*/
383	–	public void testTakeFromEmpty() throws InterruptedException {
384	–	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
385	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
386	–	public void realRun() throws InterruptedException {
387	–	q.take();
388	–	}};
389	–
390	–	t.start();
391	–	Thread.sleep(SHORT_DELAY_MS);
392	–	t.interrupt();
393	–	t.join();
394	–	}
395	–
396	–	/**
421		* Take removes existing elements until empty, then blocks interruptibly
422		*/
423		public void testBlockingTake() throws InterruptedException {
424	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
424	>	final ArrayBlockingQueue q = populatedQueue(SIZE);
425	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
426	>	Thread t = newStartedThread(new CheckedRunnable() {
427		public void realRun() throws InterruptedException {
402	–	ArrayBlockingQueue q = populatedQueue(SIZE);
428		for (int i = 0; i < SIZE; ++i) {
429	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
429	>	assertEquals(i, q.take());
430		}
406	–	q.take();
407	–	}};
431
432	<	t.start();
433	<	Thread.sleep(SHORT_DELAY_MS);
434	<	t.interrupt();
435	<	t.join();
436	<	}
432	>	Thread.currentThread().interrupt();
433	>	try {
434	>	q.take();
435	>	shouldThrow();
436	>	} catch (InterruptedException success) {}
437	>	assertFalse(Thread.interrupted());
438	>
439	>	pleaseInterrupt.countDown();
440	>	try {
441	>	q.take();
442	>	shouldThrow();
443	>	} catch (InterruptedException success) {}
444	>	assertFalse(Thread.interrupted());
445	>	}});
446
447	+	await(pleaseInterrupt);
448	+	assertThreadStaysAlive(t);
449	+	t.interrupt();
450	+	awaitTermination(t);
451	+	}
452
453		/**
454		* poll succeeds unless empty
#	Line 419 | Line 456 | public class ArrayBlockingQueueTest exte
456		public void testPoll() {
457		ArrayBlockingQueue q = populatedQueue(SIZE);
458		for (int i = 0; i < SIZE; ++i) {
459	<	assertEquals(i, ((Integer)q.poll()).intValue());
459	>	assertEquals(i, q.poll());
460		}
461		assertNull(q.poll());
462		}
463
464		/**
465	<	* timed pool with zero timeout succeeds when non-empty, else times out
465	>	* timed poll with zero timeout succeeds when non-empty, else times out
466		*/
467		public void testTimedPoll0() throws InterruptedException {
468		ArrayBlockingQueue q = populatedQueue(SIZE);
469		for (int i = 0; i < SIZE; ++i) {
470	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
470	>	assertEquals(i, q.poll(0, MILLISECONDS));
471		}
472		assertNull(q.poll(0, MILLISECONDS));
473	+	checkEmpty(q);
474		}
475
476		/**
477	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
477	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
478		*/
479		public void testTimedPoll() throws InterruptedException {
480		ArrayBlockingQueue q = populatedQueue(SIZE);
481		for (int i = 0; i < SIZE; ++i) {
482	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
483	<	}
484	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
482	>	long startTime = System.nanoTime();
483	>	assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
484	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
485	>	}
486	>	long startTime = System.nanoTime();
487	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
488	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
489	>	checkEmpty(q);
490		}
491
492		/**
#	Line 451 | Line 494 | public class ArrayBlockingQueueTest exte
494		* returning timeout status
495		*/
496		public void testInterruptedTimedPoll() throws InterruptedException {
497	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
497	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
498	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
499	>	Thread t = newStartedThread(new CheckedRunnable() {
500		public void realRun() throws InterruptedException {
501	<	ArrayBlockingQueue q = populatedQueue(SIZE);
501	>	long startTime = System.nanoTime();
502		for (int i = 0; i < SIZE; ++i) {
503	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
503	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
504		}
505	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
506	<	}};
507	<
508	<	t.start();
509	<	Thread.sleep(SMALL_DELAY_MS);
510	<	t.interrupt();
511	<	t.join();
512	<	}
468	<
469	<	/**
470	<	*  timed poll before a delayed offer fails; after offer succeeds;
471	<	*  on interruption throws
472	<	*/
473	<	public void testTimedPollWithOffer() throws InterruptedException {
474	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
475	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
476	<	public void realRun() throws InterruptedException {
477	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
478	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
479	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
480	<	}};
505	>	aboutToWait.countDown();
506	>	try {
507	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
508	>	shouldThrow();
509	>	} catch (InterruptedException success) {
510	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
511	>	}
512	>	}});
513
514	<	t.start();
515	<	Thread.sleep(SMALL_DELAY_MS);
484	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
514	>	await(aboutToWait);
515	>	waitForThreadToEnterWaitState(t);
516		t.interrupt();
517	<	t.join();
517	>	awaitTermination(t);
518	>	checkEmpty(q);
519		}
520
489	–
521		/**
522		* peek returns next element, or null if empty
523		*/
524		public void testPeek() {
525		ArrayBlockingQueue q = populatedQueue(SIZE);
526		for (int i = 0; i < SIZE; ++i) {
527	<	assertEquals(i, ((Integer)q.peek()).intValue());
528	<	q.poll();
527	>	assertEquals(i, q.peek());
528	>	assertEquals(i, q.poll());
529		assertTrue(q.peek() == null ||
530	<	i != ((Integer)q.peek()).intValue());
530	>	!q.peek().equals(i));
531		}
532		assertNull(q.peek());
533		}
#	Line 507 | Line 538 | public class ArrayBlockingQueueTest exte
538		public void testElement() {
539		ArrayBlockingQueue q = populatedQueue(SIZE);
540		for (int i = 0; i < SIZE; ++i) {
541	<	assertEquals(i, ((Integer)q.element()).intValue());
542	<	q.poll();
541	>	assertEquals(i, q.element());
542	>	assertEquals(i, q.poll());
543		}
544		try {
545		q.element();
#	Line 522 | Line 553 | public class ArrayBlockingQueueTest exte
553		public void testRemove() {
554		ArrayBlockingQueue q = populatedQueue(SIZE);
555		for (int i = 0; i < SIZE; ++i) {
556	<	assertEquals(i, ((Integer)q.remove()).intValue());
556	>	assertEquals(i, q.remove());
557		}
558		try {
559		q.remove();
#	Line 531 | Line 562 | public class ArrayBlockingQueueTest exte
562		}
563
564		/**
534	–	* remove(x) removes x and returns true if present
535	–	*/
536	–	public void testRemoveElement() {
537	–	ArrayBlockingQueue q = populatedQueue(SIZE);
538	–	for (int i = 1; i < SIZE; i+=2) {
539	–	assertTrue(q.remove(new Integer(i)));
540	–	}
541	–	for (int i = 0; i < SIZE; i+=2) {
542	–	assertTrue(q.remove(new Integer(i)));
543	–	assertFalse(q.remove(new Integer(i+1)));
544	–	}
545	–	assertTrue(q.isEmpty());
546	–	}
547	–
548	–	/**
565		* contains(x) reports true when elements added but not yet removed
566		*/
567		public void testContains() {
568	<	ArrayBlockingQueue q = populatedQueue(SIZE);
569	<	for (int i = 0; i < SIZE; ++i) {
568	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
569	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
570	>	assertFalse(q.contains(null));
571	>	for (int i = 0; i < size; ++i) {
572		assertTrue(q.contains(new Integer(i)));
573	<	q.poll();
573	>	assertEquals(i, q.poll());
574		assertFalse(q.contains(new Integer(i)));
575		}
576		}
#	Line 601 | Line 619 | public class ArrayBlockingQueueTest exte
619		assertTrue(changed);
620
621		assertTrue(q.containsAll(p));
622	<	assertEquals(SIZE-i, q.size());
622	>	assertEquals(SIZE - i, q.size());
623		p.remove();
624		}
625		}
#	Line 614 | Line 632 | public class ArrayBlockingQueueTest exte
632		ArrayBlockingQueue q = populatedQueue(SIZE);
633		ArrayBlockingQueue p = populatedQueue(i);
634		assertTrue(q.removeAll(p));
635	<	assertEquals(SIZE-i, q.size());
635	>	assertEquals(SIZE - i, q.size());
636		for (int j = 0; j < i; ++j) {
637	<	Integer I = (Integer)(p.remove());
638	<	assertFalse(q.contains(I));
637	>	Integer x = (Integer)(p.remove());
638	>	assertFalse(q.contains(x));
639		}
640		}
641		}
642
643	<	/**
644	<	*  toArray contains all elements
645	<	*/
646	<	public void testToArray() throws InterruptedException {
647	<	ArrayBlockingQueue q = populatedQueue(SIZE);
648	<	Object[] o = q.toArray();
649	<	for (int i = 0; i < o.length; i++)
650	<	assertEquals(o[i], q.take());
643	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
644	>	int size = q.size();
645	>	Object[] a1 = q.toArray();
646	>	assertEquals(size, a1.length);
647	>	Integer[] a2 = q.toArray(new Integer[0]);
648	>	assertEquals(size, a2.length);
649	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
650	>	assertEquals(size, a3.length);
651	>	Integer[] a4 = new Integer[size];
652	>	assertSame(a4, q.toArray(a4));
653	>	Integer[] a5 = new Integer[size + 1];
654	>	Arrays.fill(a5, 42);
655	>	assertSame(a5, q.toArray(a5));
656	>	Integer[] a6 = new Integer[size + 2];
657	>	Arrays.fill(a6, 42);
658	>	assertSame(a6, q.toArray(a6));
659	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
660	>	for (Object[] a : as) {
661	>	if (a.length > size) assertNull(a[size]);
662	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
663	>	}
664	>	Iterator it = q.iterator();
665	>	Integer s = q.peek();
666	>	for (int i = 0; i < size; i++) {
667	>	Integer x = (Integer) it.next();
668	>	assertEquals(s + i, (int) x);
669	>	for (Object[] a : as)
670	>	assertSame(a1[i], x);
671	>	}
672		}
673
674		/**
675	<	* toArray(a) contains all elements
675	>	* toArray() and toArray(a) contain all elements in FIFO order
676		*/
677	<	public void testToArray2() throws InterruptedException {
678	<	ArrayBlockingQueue q = populatedQueue(SIZE);
679	<	Integer[] ints = new Integer[SIZE];
680	<	ints = (Integer[])q.toArray(ints);
681	<	for (int i = 0; i < ints.length; i++)
682	<	assertEquals(ints[i], q.take());
677	>	public void testToArray() {
678	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
679	>	final int size = rnd.nextInt(6);
680	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
681	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
682	>	for (int i = 0; i < size; i++) {
683	>	checkToArray(q);
684	>	q.add(i);
685	>	}
686	>	// Provoke wraparound
687	>	int added = size * 2;
688	>	for (int i = 0; i < added; i++) {
689	>	checkToArray(q);
690	>	assertEquals((Integer) i, q.poll());
691	>	q.add(size + i);
692	>	}
693	>	for (int i = 0; i < size; i++) {
694	>	checkToArray(q);
695	>	assertEquals((Integer) (added + i), q.poll());
696	>	}
697		}
698
699		/**
700	<	* toArray(null) throws NPE
700	>	* toArray(incompatible array type) throws ArrayStoreException
701		*/
702	<	public void testToArray_BadArg() {
702	>	public void testToArray_incompatibleArrayType() {
703	>	ArrayBlockingQueue q = populatedQueue(SIZE);
704		try {
705	<	ArrayBlockingQueue q = populatedQueue(SIZE);
652	<	Object o[] = q.toArray(null);
705	>	q.toArray(new String[10]);
706		shouldThrow();
707	<	} catch (NullPointerException success) {}
655	<	}
656	<
657	<	/**
658	<	* toArray with incompatible array type throws CCE
659	<	*/
660	<	public void testToArray1_BadArg() {
707	>	} catch (ArrayStoreException success) {}
708		try {
709	<	ArrayBlockingQueue q = populatedQueue(SIZE);
663	<	Object o[] = q.toArray(new String[10] );
709	>	q.toArray(new String[0]);
710		shouldThrow();
711		} catch (ArrayStoreException success) {}
712		}
713
668	–
714		/**
715		* iterator iterates through all elements
716		*/
717		public void testIterator() throws InterruptedException {
718		ArrayBlockingQueue q = populatedQueue(SIZE);
719		Iterator it = q.iterator();
720	<	while (it.hasNext()) {
720	>	int i;
721	>	for (i = 0; it.hasNext(); i++)
722	>	assertTrue(q.contains(it.next()));
723	>	assertEquals(i, SIZE);
724	>	assertIteratorExhausted(it);
725	>
726	>	it = q.iterator();
727	>	for (i = 0; it.hasNext(); i++)
728		assertEquals(it.next(), q.take());
729	<	}
729	>	assertEquals(i, SIZE);
730	>	assertIteratorExhausted(it);
731	>	}
732	>
733	>	/**
734	>	* iterator of empty collection has no elements
735	>	*/
736	>	public void testEmptyIterator() {
737	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
738		}
739
740		/**
741		* iterator.remove removes current element
742		*/
743	<	public void testIteratorRemove () {
743	>	public void testIteratorRemove() {
744		final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
745		q.add(two);
746		q.add(one);
#	Line 691 | Line 751 | public class ArrayBlockingQueueTest exte
751		it.remove();
752
753		it = q.iterator();
754	<	assertEquals(it.next(), one);
755	<	assertEquals(it.next(), three);
754	>	assertSame(it.next(), one);
755	>	assertSame(it.next(), three);
756		assertFalse(it.hasNext());
757		}
758
#	Line 709 | Line 769 | public class ArrayBlockingQueueTest exte
769
770		int k = 0;
771		for (Iterator it = q.iterator(); it.hasNext();) {
772	<	int i = ((Integer)(it.next())).intValue();
713	<	assertEquals(++k, i);
772	>	assertEquals(++k, it.next());
773		}
774		assertEquals(3, k);
775		}
#	Line 718 | Line 777 | public class ArrayBlockingQueueTest exte
777		/**
778		* Modifications do not cause iterators to fail
779		*/
780	<	public void testWeaklyConsistentIteration () {
780	>	public void testWeaklyConsistentIteration() {
781		final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
782		q.add(one);
783		q.add(two);
#	Line 730 | Line 789 | public class ArrayBlockingQueueTest exte
789		assertEquals(0, q.size());
790		}
791
733	–
792		/**
793		* toString contains toStrings of elements
794		*/
#	Line 738 | Line 796 | public class ArrayBlockingQueueTest exte
796		ArrayBlockingQueue q = populatedQueue(SIZE);
797		String s = q.toString();
798		for (int i = 0; i < SIZE; ++i) {
799	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
799	>	assertTrue(s.contains(String.valueOf(i)));
800		}
801		}
802
745	–
803		/**
804		* offer transfers elements across Executor tasks
805		*/
#	Line 750 | Line 807 | public class ArrayBlockingQueueTest exte
807		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
808		q.add(one);
809		q.add(two);
810	<	ExecutorService executor = Executors.newFixedThreadPool(2);
811	<	executor.execute(new CheckedRunnable() {
812	<	public void realRun() throws InterruptedException {
813	<	threadAssertFalse(q.offer(three));
814	<	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
815	<	threadAssertEquals(0, q.remainingCapacity());
816	<	}});
817	<
818	<	executor.execute(new CheckedRunnable() {
819	<	public void realRun() throws InterruptedException {
820	<	Thread.sleep(SMALL_DELAY_MS);
821	<	threadAssertEquals(one, q.take());
822	<	}});
823	<
824	<	joinPool(executor);
825	<
810	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
811	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
812	>	try (PoolCleaner cleaner = cleaner(executor)) {
813	>	executor.execute(new CheckedRunnable() {
814	>	public void realRun() throws InterruptedException {
815	>	assertFalse(q.offer(three));
816	>	threadsStarted.await();
817	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
818	>	assertEquals(0, q.remainingCapacity());
819	>	}});
820	>
821	>	executor.execute(new CheckedRunnable() {
822	>	public void realRun() throws InterruptedException {
823	>	threadsStarted.await();
824	>	assertEquals(0, q.remainingCapacity());
825	>	assertSame(one, q.take());
826	>	}});
827	>	}
828		}
829
830		/**
831	<	* poll retrieves elements across Executor threads
831	>	* timed poll retrieves elements across Executor threads
832		*/
833		public void testPollInExecutor() {
834		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
835	<	ExecutorService executor = Executors.newFixedThreadPool(2);
836	<	executor.execute(new CheckedRunnable() {
837	<	public void realRun() throws InterruptedException {
838	<	threadAssertNull(q.poll());
839	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
840	<	threadAssertTrue(q.isEmpty());
841	<	}});
842	<
843	<	executor.execute(new CheckedRunnable() {
844	<	public void realRun() throws InterruptedException {
845	<	Thread.sleep(SMALL_DELAY_MS);
846	<	q.put(one);
847	<	}});
848	<
849	<	joinPool(executor);
835	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
836	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
837	>	try (PoolCleaner cleaner = cleaner(executor)) {
838	>	executor.execute(new CheckedRunnable() {
839	>	public void realRun() throws InterruptedException {
840	>	assertNull(q.poll());
841	>	threadsStarted.await();
842	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
843	>	checkEmpty(q);
844	>	}});
845	>
846	>	executor.execute(new CheckedRunnable() {
847	>	public void realRun() throws InterruptedException {
848	>	threadsStarted.await();
849	>	q.put(one);
850	>	}});
851	>	}
852		}
853
854		/**
855		* A deserialized serialized queue has same elements in same order
856		*/
857		public void testSerialization() throws Exception {
858	<	ArrayBlockingQueue q = populatedQueue(SIZE);
859	<
799	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
800	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
801	<	out.writeObject(q);
802	<	out.close();
803	<
804	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
805	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
806	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
807	<	assertEquals(q.size(), r.size());
808	<	while (!q.isEmpty())
809	<	assertEquals(q.remove(), r.remove());
810	<	}
811	<
812	<	/**
813	<	* drainTo(null) throws NPE
814	<	*/
815	<	public void testDrainToNull() {
816	<	ArrayBlockingQueue q = populatedQueue(SIZE);
817	<	try {
818	<	q.drainTo(null);
819	<	shouldThrow();
820	<	} catch (NullPointerException success) {}
821	<	}
858	>	Queue x = populatedQueue(SIZE);
859	>	Queue y = serialClone(x);
860
861	<	/**
862	<	* drainTo(this) throws IAE
863	<	*/
864	<	public void testDrainToSelf() {
865	<	ArrayBlockingQueue q = populatedQueue(SIZE);
866	<	try {
867	<	q.drainTo(q);
868	<	shouldThrow();
869	<	} catch (IllegalArgumentException success) {}
861	>	assertNotSame(x, y);
862	>	assertEquals(x.size(), y.size());
863	>	assertEquals(x.toString(), y.toString());
864	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
865	>	while (!x.isEmpty()) {
866	>	assertFalse(y.isEmpty());
867	>	assertEquals(x.remove(), y.remove());
868	>	}
869	>	assertTrue(y.isEmpty());
870		}
871
872		/**
#	Line 838 | Line 876 | public class ArrayBlockingQueueTest exte
876		ArrayBlockingQueue q = populatedQueue(SIZE);
877		ArrayList l = new ArrayList();
878		q.drainTo(l);
879	<	assertEquals(q.size(), 0);
880	<	assertEquals(l.size(), SIZE);
879	>	assertEquals(0, q.size());
880	>	assertEquals(SIZE, l.size());
881		for (int i = 0; i < SIZE; ++i)
882		assertEquals(l.get(i), new Integer(i));
883		q.add(zero);
#	Line 849 | Line 887 | public class ArrayBlockingQueueTest exte
887		assertTrue(q.contains(one));
888		l.clear();
889		q.drainTo(l);
890	<	assertEquals(q.size(), 0);
891	<	assertEquals(l.size(), 2);
890	>	assertEquals(0, q.size());
891	>	assertEquals(2, l.size());
892		for (int i = 0; i < 2; ++i)
893		assertEquals(l.get(i), new Integer(i));
894		}
#	Line 862 | Line 900 | public class ArrayBlockingQueueTest exte
900		final ArrayBlockingQueue q = populatedQueue(SIZE);
901		Thread t = new Thread(new CheckedRunnable() {
902		public void realRun() throws InterruptedException {
903	<	q.put(new Integer(SIZE+1));
903	>	q.put(new Integer(SIZE + 1));
904		}});
905
906		t.start();
#	Line 876 | Line 914 | public class ArrayBlockingQueueTest exte
914		}
915
916		/**
917	<	* drainTo(null, n) throws NPE
880	<	*/
881	<	public void testDrainToNullN() {
882	<	ArrayBlockingQueue q = populatedQueue(SIZE);
883	<	try {
884	<	q.drainTo(null, 0);
885	<	shouldThrow();
886	<	} catch (NullPointerException success) {}
887	<	}
888	<
889	<	/**
890	<	* drainTo(this, n) throws IAE
891	<	*/
892	<	public void testDrainToSelfN() {
893	<	ArrayBlockingQueue q = populatedQueue(SIZE);
894	<	try {
895	<	q.drainTo(q, 0);
896	<	shouldThrow();
897	<	} catch (IllegalArgumentException success) {}
898	<	}
899	<
900	<	/**
901	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
917	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
918		*/
919		public void testDrainToN() {
920	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
920	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
921		for (int i = 0; i < SIZE + 2; ++i) {
922		for (int j = 0; j < SIZE; j++)
923		assertTrue(q.offer(new Integer(j)));
924		ArrayList l = new ArrayList();
925		q.drainTo(l, i);
926	<	int k = (i < SIZE)? i : SIZE;
927	<	assertEquals(l.size(), k);
928	<	assertEquals(q.size(), SIZE-k);
926	>	int k = (i < SIZE) ? i : SIZE;
927	>	assertEquals(k, l.size());
928	>	assertEquals(SIZE - k, q.size());
929		for (int j = 0; j < k; ++j)
930		assertEquals(l.get(j), new Integer(j));
931	<	while (q.poll() != null) ;
931	>	do {} while (q.poll() != null);
932		}
933		}
934
935	+	/**
936	+	* remove(null), contains(null) always return false
937	+	*/
938	+	public void testNeverContainsNull() {
939	+	Collection<?>[] qs = {
940	+	new ArrayBlockingQueue<Object>(10),
941	+	populatedQueue(2),
942	+	};
943	+
944	+	for (Collection<?> q : qs) {
945	+	assertFalse(q.contains(null));
946	+	assertFalse(q.remove(null));
947	+	}
948	+	}
949		}

Diff Legend

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