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.51 by jsr166, Sat Nov 26 05:19:17 2011 UTC vs.
Revision 1.77 by jsr166, Sun Nov 6 03:11:15 2016 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
10	<	import java.util.Arrays;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	>
11		import java.util.ArrayList;
12	+	import java.util.Arrays;
13		import java.util.Collection;
14	+	import java.util.Collections;
15		import java.util.Iterator;
16		import java.util.NoSuchElementException;
17		import java.util.Queue;
#	Line 18 | Line 20 | import java.util.concurrent.BlockingQueu
20		import java.util.concurrent.CountDownLatch;
21		import java.util.concurrent.Executors;
22		import java.util.concurrent.ExecutorService;
23	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
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	+	main(suite(), args);
31	+	}
32	+
33	+	public static Test suite() {
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 new ArrayBlockingQueue(SIZE, true);
54	>	return populatedQueue(0, SIZE, 2 * SIZE, true);
55		}
56		}
57
58		public static class NonFair extends BlockingQueueTest {
59		protected BlockingQueue emptyCollection() {
60	<	return new ArrayBlockingQueue(SIZE, false);
60	>	return populatedQueue(0, SIZE, 2 * SIZE, false);
61		}
62		}
63
64	<	public static void main(String[] args) {
65	<	junit.textui.TestRunner.run(suite());
66	<	}
67	<
68	<	public static Test suite() {
69	<	return newTestSuite(ArrayBlockingQueueTest.class,
43	<	new Fair().testSuite(),
44	<	new NonFair().testSuite());
64	>	/**
65	>	* Returns a new queue of given size containing consecutive
66	>	* Integers 0 ... n - 1.
67	>	*/
68	>	static ArrayBlockingQueue<Integer> populatedQueue(int n) {
69	>	return populatedQueue(n, n, n, false);
70		}
71
72		/**
73	<	* Create a queue of given size containing consecutive
74	<	* Integers 0 ... n.
73	>	* Returns a new queue of given size containing consecutive
74	>	* Integers 0 ... n - 1, with given capacity range and fairness.
75		*/
76	<	private ArrayBlockingQueue<Integer> populatedQueue(int n) {
77	<	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n);
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 69 | Line 105 | public class ArrayBlockingQueueTest exte
105		/**
106		* Constructor throws IAE if capacity argument nonpositive
107		*/
108	<	public void testConstructor2() {
109	<	try {
110	<	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		new ArrayBlockingQueue(1, true, null);
129		shouldThrow();
#	Line 102 | Line 146 | public class ArrayBlockingQueueTest exte
146		*/
147		public void testConstructor5() {
148		Integer[] ints = new Integer[SIZE];
149	<	for (int i = 0; i < SIZE-1; ++i)
149	>	for (int i = 0; i < SIZE - 1; ++i)
150		ints[i] = i;
151		Collection<Integer> elements = Arrays.asList(ints);
152		try {
153	<	new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
153	>	new ArrayBlockingQueue(SIZE, false, elements);
154		shouldThrow();
155		} catch (NullPointerException success) {}
156		}
#	Line 114 | Line 158 | public class ArrayBlockingQueueTest exte
158		/**
159		* Initializing from too large collection throws IAE
160		*/
161	<	public void testConstructor6() {
162	<	Integer[] ints = new Integer[SIZE];
163	<	for (int i = 0; i < SIZE; ++i)
164	<	ints[i] = i;
121	<	Collection<Integer> elements = Arrays.asList(ints);
161	>	public void testConstructor_collectionTooLarge() {
162	>	// just barely fits - succeeds
163	>	new ArrayBlockingQueue(SIZE, false,
164	>	Collections.nCopies(SIZE, ""));
165		try {
166	<	new ArrayBlockingQueue(SIZE - 1, false, elements);
166	>	new ArrayBlockingQueue(SIZE - 1, false,
167	>	Collections.nCopies(SIZE, ""));
168		shouldThrow();
169		} catch (IllegalArgumentException success) {}
170		}
#	Line 142 | Line 186 | public class ArrayBlockingQueueTest exte
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 157 | 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();
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(SIZE-i, q.remainingCapacity());
215	<	assertEquals(i, q.size());
216	<	q.add(new Integer(i));
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
#	Line 183 | 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) {
235	+	assertTrue(q.add(new Integer(i)));
236	+	}
237	+	assertEquals(0, q.remainingCapacity());
238		try {
187	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
188	–	for (int i = 0; i < SIZE; ++i) {
189	–	assertTrue(q.add(new Integer(i)));
190	–	}
191	–	assertEquals(0, q.remainingCapacity());
239		q.add(new Integer(SIZE));
240		shouldThrow();
241		} catch (IllegalStateException success) {}
#	Line 198 | Line 245 | public class ArrayBlockingQueueTest exte
245		* addAll(this) throws IAE
246		*/
247		public void testAddAllSelf() {
248	+	ArrayBlockingQueue q = populatedQueue(SIZE);
249		try {
202	–	ArrayBlockingQueue q = populatedQueue(SIZE);
250		q.addAll(q);
251		shouldThrow();
252		} catch (IllegalArgumentException success) {}
#	Line 210 | Line 257 | public class ArrayBlockingQueueTest exte
257		* possibly adding some elements
258		*/
259		public void testAddAll3() {
260	+	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
261	+	Integer[] ints = new Integer[SIZE];
262	+	for (int i = 0; i < SIZE - 1; ++i)
263	+	ints[i] = new Integer(i);
264		try {
214	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
215	–	Integer[] ints = new Integer[SIZE];
216	–	for (int i = 0; i < SIZE-1; ++i)
217	–	ints[i] = new Integer(i);
265		q.addAll(Arrays.asList(ints));
266		shouldThrow();
267		} catch (NullPointerException success) {}
#	Line 224 | Line 271 | public class ArrayBlockingQueueTest exte
271		* addAll throws ISE if not enough room
272		*/
273		public void testAddAll4() {
274	+	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
275	+	Integer[] ints = new Integer[SIZE];
276	+	for (int i = 0; i < SIZE; ++i)
277	+	ints[i] = new Integer(i);
278		try {
228	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
229	–	Integer[] ints = new Integer[SIZE];
230	–	for (int i = 0; i < SIZE; ++i)
231	–	ints[i] = new Integer(i);
279		q.addAll(Arrays.asList(ints));
280		shouldThrow();
281		} catch (IllegalStateException success) {}
#	Line 255 | Line 302 | public class ArrayBlockingQueueTest exte
302		public void testPut() throws InterruptedException {
303		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
304		for (int i = 0; i < SIZE; ++i) {
305	<	Integer I = new Integer(i);
306	<	q.put(I);
307	<	assertTrue(q.contains(I));
305	>	Integer x = new Integer(i);
306	>	q.put(x);
307	>	assertTrue(q.contains(x));
308		}
309		assertEquals(0, q.remainingCapacity());
310		}
#	Line 449 | Line 496 | public class ArrayBlockingQueueTest exte
496		final CountDownLatch aboutToWait = new CountDownLatch(1);
497		Thread t = newStartedThread(new CheckedRunnable() {
498		public void realRun() throws InterruptedException {
499	+	long startTime = System.nanoTime();
500		for (int i = 0; i < SIZE; ++i) {
453	–	long t0 = System.nanoTime();
501		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
455	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
502		}
457	–	long t0 = System.nanoTime();
503		aboutToWait.countDown();
504		try {
505	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
505	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
506		shouldThrow();
507		} catch (InterruptedException success) {
508	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
508	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
509		}
510		}});
511
512	<	aboutToWait.await();
513	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
512	>	await(aboutToWait);
513	>	waitForThreadToEnterWaitState(t);
514		t.interrupt();
515	<	awaitTermination(t, MEDIUM_DELAY_MS);
515	>	awaitTermination(t);
516		checkEmpty(q);
517		}
518
#	Line 570 | Line 615 | public class ArrayBlockingQueueTest exte
615		assertTrue(changed);
616
617		assertTrue(q.containsAll(p));
618	<	assertEquals(SIZE-i, q.size());
618	>	assertEquals(SIZE - i, q.size());
619		p.remove();
620		}
621		}
#	Line 583 | Line 628 | public class ArrayBlockingQueueTest exte
628		ArrayBlockingQueue q = populatedQueue(SIZE);
629		ArrayBlockingQueue p = populatedQueue(i);
630		assertTrue(q.removeAll(p));
631	<	assertEquals(SIZE-i, q.size());
631	>	assertEquals(SIZE - i, q.size());
632		for (int j = 0; j < i; ++j) {
633	<	Integer I = (Integer)(p.remove());
634	<	assertFalse(q.contains(I));
633	>	Integer x = (Integer)(p.remove());
634	>	assertFalse(q.contains(x));
635		}
636		}
637		}
638
639	<	/**
640	<	* toArray contains all elements in FIFO order
641	<	*/
642	<	public void testToArray() {
643	<	ArrayBlockingQueue q = populatedQueue(SIZE);
644	<	Object[] o = q.toArray();
645	<	for (int i = 0; i < o.length; i++)
646	<	assertSame(o[i], q.poll());
639	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
640	>	int size = q.size();
641	>	Object[] a1 = q.toArray();
642	>	assertEquals(size, a1.length);
643	>	Integer[] a2 = q.toArray(new Integer[0]);
644	>	assertEquals(size, a2.length);
645	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
646	>	assertEquals(size, a3.length);
647	>	Integer[] a4 = new Integer[size];
648	>	assertSame(a4, q.toArray(a4));
649	>	Integer[] a5 = new Integer[size + 1];
650	>	Arrays.fill(a5, 42);
651	>	assertSame(a5, q.toArray(a5));
652	>	Integer[] a6 = new Integer[size + 2];
653	>	Arrays.fill(a6, 42);
654	>	assertSame(a6, q.toArray(a6));
655	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
656	>	for (Object[] a : as) {
657	>	if (a.length > size) assertNull(a[size]);
658	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
659	>	}
660	>	Iterator it = q.iterator();
661	>	Integer s = q.peek();
662	>	for (int i = 0; i < size; i++) {
663	>	Integer x = (Integer) it.next();
664	>	assertEquals(s + i, (int) x);
665	>	for (Object[] a : as)
666	>	assertSame(a1[i], x);
667	>	}
668		}
669
670		/**
671	<	* toArray(a) contains all elements in FIFO order
671	>	* toArray() and toArray(a) contain all elements in FIFO order
672		*/
673	<	public void testToArray2() {
674	<	ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
675	<	Integer[] ints = new Integer[SIZE];
676	<	Integer[] array = q.toArray(ints);
677	<	assertSame(ints, array);
678	<	for (int i = 0; i < ints.length; i++)
679	<	assertSame(ints[i], q.poll());
673	>	public void testToArray() {
674	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
675	>	final int size = rnd.nextInt(6);
676	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
677	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
678	>	for (int i = 0; i < size; i++) {
679	>	checkToArray(q);
680	>	q.add(i);
681	>	}
682	>	// Provoke wraparound
683	>	int added = size * 2;
684	>	for (int i = 0; i < added; i++) {
685	>	checkToArray(q);
686	>	assertEquals((Integer) i, q.poll());
687	>	q.add(size + i);
688	>	}
689	>	for (int i = 0; i < size; i++) {
690	>	checkToArray(q);
691	>	assertEquals((Integer) (added + i), q.poll());
692	>	}
693		}
694
695		/**
696		* toArray(incompatible array type) throws ArrayStoreException
697		*/
698	<	public void testToArray1_BadArg() {
698	>	public void testToArray_incompatibleArrayType() {
699		ArrayBlockingQueue q = populatedQueue(SIZE);
700		try {
701		q.toArray(new String[10]);
702		shouldThrow();
703		} catch (ArrayStoreException success) {}
704	+	try {
705	+	q.toArray(new String[0]);
706	+	shouldThrow();
707	+	} catch (ArrayStoreException success) {}
708		}
709
710		/**
#	Line 630 | Line 713 | public class ArrayBlockingQueueTest exte
713		public void testIterator() throws InterruptedException {
714		ArrayBlockingQueue q = populatedQueue(SIZE);
715		Iterator it = q.iterator();
716	<	while (it.hasNext()) {
716	>	int i;
717	>	for (i = 0; it.hasNext(); i++)
718	>	assertTrue(q.contains(it.next()));
719	>	assertEquals(i, SIZE);
720	>	assertIteratorExhausted(it);
721	>
722	>	it = q.iterator();
723	>	for (i = 0; it.hasNext(); i++)
724		assertEquals(it.next(), q.take());
725	<	}
725	>	assertEquals(i, SIZE);
726	>	assertIteratorExhausted(it);
727	>	}
728	>
729	>	/**
730	>	* iterator of empty collection has no elements
731	>	*/
732	>	public void testEmptyIterator() {
733	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
734		}
735
736		/**
#	Line 705 | Line 803 | public class ArrayBlockingQueueTest exte
803		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
804		q.add(one);
805		q.add(two);
708	–	ExecutorService executor = Executors.newFixedThreadPool(2);
806		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
807	<	executor.execute(new CheckedRunnable() {
808	<	public void realRun() throws InterruptedException {
809	<	assertFalse(q.offer(three));
810	<	threadsStarted.await();
811	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
812	<	assertEquals(0, q.remainingCapacity());
813	<	}});
814	<
815	<	executor.execute(new CheckedRunnable() {
816	<	public void realRun() throws InterruptedException {
817	<	threadsStarted.await();
818	<	assertEquals(0, q.remainingCapacity());
819	<	assertSame(one, q.take());
820	<	}});
821	<
822	<	joinPool(executor);
807	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
808	>	try (PoolCleaner cleaner = cleaner(executor)) {
809	>	executor.execute(new CheckedRunnable() {
810	>	public void realRun() throws InterruptedException {
811	>	assertFalse(q.offer(three));
812	>	threadsStarted.await();
813	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
814	>	assertEquals(0, q.remainingCapacity());
815	>	}});
816	>
817	>	executor.execute(new CheckedRunnable() {
818	>	public void realRun() throws InterruptedException {
819	>	threadsStarted.await();
820	>	assertEquals(0, q.remainingCapacity());
821	>	assertSame(one, q.take());
822	>	}});
823	>	}
824		}
825
826		/**
#	Line 731 | Line 829 | public class ArrayBlockingQueueTest exte
829		public void testPollInExecutor() {
830		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
831		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
832	<	ExecutorService executor = Executors.newFixedThreadPool(2);
833	<	executor.execute(new CheckedRunnable() {
834	<	public void realRun() throws InterruptedException {
835	<	assertNull(q.poll());
836	<	threadsStarted.await();
837	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
838	<	checkEmpty(q);
839	<	}});
840	<
841	<	executor.execute(new CheckedRunnable() {
842	<	public void realRun() throws InterruptedException {
843	<	threadsStarted.await();
844	<	q.put(one);
845	<	}});
846	<
847	<	joinPool(executor);
832	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
833	>	try (PoolCleaner cleaner = cleaner(executor)) {
834	>	executor.execute(new CheckedRunnable() {
835	>	public void realRun() throws InterruptedException {
836	>	assertNull(q.poll());
837	>	threadsStarted.await();
838	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
839	>	checkEmpty(q);
840	>	}});
841	>
842	>	executor.execute(new CheckedRunnable() {
843	>	public void realRun() throws InterruptedException {
844	>	threadsStarted.await();
845	>	q.put(one);
846	>	}});
847	>	}
848		}
849
850		/**
#	Line 756 | Line 854 | public class ArrayBlockingQueueTest exte
854		Queue x = populatedQueue(SIZE);
855		Queue y = serialClone(x);
856
857	<	assertTrue(x != y);
857	>	assertNotSame(x, y);
858		assertEquals(x.size(), y.size());
859		assertEquals(x.toString(), y.toString());
860		assertTrue(Arrays.equals(x.toArray(), y.toArray()));
#	Line 798 | Line 896 | public class ArrayBlockingQueueTest exte
896		final ArrayBlockingQueue q = populatedQueue(SIZE);
897		Thread t = new Thread(new CheckedRunnable() {
898		public void realRun() throws InterruptedException {
899	<	q.put(new Integer(SIZE+1));
899	>	q.put(new Integer(SIZE + 1));
900		}});
901
902		t.start();
#	Line 815 | Line 913 | public class ArrayBlockingQueueTest exte
913		* drainTo(c, n) empties first min(n, size) elements of queue into c
914		*/
915		public void testDrainToN() {
916	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
916	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
917		for (int i = 0; i < SIZE + 2; ++i) {
918		for (int j = 0; j < SIZE; j++)
919		assertTrue(q.offer(new Integer(j)));
920		ArrayList l = new ArrayList();
921		q.drainTo(l, i);
922		int k = (i < SIZE) ? i : SIZE;
923	<	assertEquals(l.size(), k);
924	<	assertEquals(q.size(), SIZE-k);
923	>	assertEquals(k, l.size());
924	>	assertEquals(SIZE - k, q.size());
925		for (int j = 0; j < k; ++j)
926		assertEquals(l.get(j), new Integer(j));
927	<	while (q.poll() != null) ;
927	>	do {} while (q.poll() != null);
928		}
929		}
930
931	+	/**
932	+	* remove(null), contains(null) always return false
933	+	*/
934	+	public void testNeverContainsNull() {
935	+	Collection<?>[] qs = {
936	+	new ArrayBlockingQueue<Object>(10),
937	+	populatedQueue(2),
938	+	};
939	+
940	+	for (Collection<?> q : qs) {
941	+	assertFalse(q.contains(null));
942	+	assertFalse(q.remove(null));
943	+	}
944	+	}
945		}

Diff Legend

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