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.47 by jsr166, Fri May 27 20:07:24 2011 UTC vs.
Revision 1.68 by jsr166, Sun Oct 4 18:49:02 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
10	–	import java.util.*;
11	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.io.*;
10	>
11	>	import java.util.ArrayList;
12	>	import java.util.Arrays;
13	>	import java.util.Collection;
14	>	import java.util.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(20, true);
29	>	return new ArrayBlockingQueue(SIZE, true);
30		}
31		}
32
33		public static class NonFair extends BlockingQueueTest {
34		protected BlockingQueue emptyCollection() {
35	<	return new ArrayBlockingQueue(20, false);
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() {
#	Line 37 | Line 47 | public class ArrayBlockingQueueTest exte
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<Integer> populatedQueue(int n) {
#	Line 63 | Line 73 | public class ArrayBlockingQueueTest exte
73		*/
74		public void testConstructor2() {
75		try {
76	<	ArrayBlockingQueue q = new ArrayBlockingQueue(0);
76	>	new ArrayBlockingQueue(0);
77		shouldThrow();
78		} catch (IllegalArgumentException success) {}
79		}
#	Line 73 | 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		} catch (NullPointerException success) {}
89		}
#	Line 82 | Line 92 | public class ArrayBlockingQueueTest exte
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];
87	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
97	>	new ArrayBlockingQueue(SIZE, false, elements);
98		shouldThrow();
99		} catch (NullPointerException success) {}
100		}
#	Line 93 | Line 103 | public class ArrayBlockingQueueTest exte
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];
98	<	for (int i = 0; i < SIZE-1; ++i)
99	<	ints[i] = new Integer(i);
100	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
111	>	new ArrayBlockingQueue(SIZE, false, elements);
112		shouldThrow();
113		} catch (NullPointerException success) {}
114		}
#	Line 106 | Line 117 | public class ArrayBlockingQueueTest exte
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];
111	<	for (int i = 0; i < SIZE; ++i)
112	<	ints[i] = new Integer(i);
113	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
125	>	new ArrayBlockingQueue(SIZE - 1, false, elements);
126		shouldThrow();
127		} catch (IllegalArgumentException success) {}
128		}
#	Line 121 | Line 133 | public class ArrayBlockingQueueTest exte
133		public void testConstructor7() {
134		Integer[] ints = new Integer[SIZE];
135		for (int i = 0; i < SIZE; ++i)
136	<	ints[i] = new Integer(i);
137	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
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		}
#	Line 146 | 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		/**
163	–	* offer(null) throws NPE
164	–	*/
165	–	public void testOfferNull() {
166	–	try {
167	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
168	–	q.offer(null);
169	–	shouldThrow();
170	–	} catch (NullPointerException success) {}
171	–	}
172	–
173	–	/**
174	–	* add(null) throws NPE
175	–	*/
176	–	public void testAddNull() {
177	–	try {
178	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
179	–	q.add(null);
180	–	shouldThrow();
181	–	} catch (NullPointerException success) {}
182	–	}
183	–
184	–	/**
176		* Offer succeeds if not full; fails if full
177		*/
178		public void testOffer() {
#	Line 194 | Line 185 | public class ArrayBlockingQueueTest exte
185		* add succeeds if not full; throws ISE if full
186		*/
187		public void testAdd() {
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 {
198	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
199	–	for (int i = 0; i < SIZE; ++i) {
200	–	assertTrue(q.add(new Integer(i)));
201	–	}
202	–	assertEquals(0, q.remainingCapacity());
194		q.add(new Integer(SIZE));
195		shouldThrow();
196		} catch (IllegalStateException success) {}
197		}
198
199		/**
209	–	* addAll(null) throws NPE
210	–	*/
211	–	public void testAddAll1() {
212	–	try {
213	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
214	–	q.addAll(null);
215	–	shouldThrow();
216	–	} catch (NullPointerException success) {}
217	–	}
218	–
219	–	/**
200		* addAll(this) throws IAE
201		*/
202		public void testAddAllSelf() {
203	+	ArrayBlockingQueue q = populatedQueue(SIZE);
204		try {
224	–	ArrayBlockingQueue q = populatedQueue(SIZE);
205		q.addAll(q);
206		shouldThrow();
207		} catch (IllegalArgumentException success) {}
208		}
209
210		/**
231	–	* addAll of a collection with null elements throws NPE
232	–	*/
233	–	public void testAddAll2() {
234	–	try {
235	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
236	–	Integer[] ints = new Integer[SIZE];
237	–	q.addAll(Arrays.asList(ints));
238	–	shouldThrow();
239	–	} catch (NullPointerException success) {}
240	–	}
241	–
242	–	/**
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 {
248	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
249	–	Integer[] ints = new Integer[SIZE];
250	–	for (int i = 0; i < SIZE-1; ++i)
251	–	ints[i] = new Integer(i);
220		q.addAll(Arrays.asList(ints));
221		shouldThrow();
222		} catch (NullPointerException success) {}
#	Line 258 | Line 226 | public class ArrayBlockingQueueTest exte
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 {
262	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
263	–	Integer[] ints = new Integer[SIZE];
264	–	for (int i = 0; i < SIZE; ++i)
265	–	ints[i] = new Integer(i);
234		q.addAll(Arrays.asList(ints));
235		shouldThrow();
236		} catch (IllegalStateException success) {}
#	Line 284 | Line 252 | public class ArrayBlockingQueueTest exte
252		}
253
254		/**
287	–	* put(null) throws NPE
288	–	*/
289	–	public void testPutNull() throws InterruptedException {
290	–	try {
291	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
292	–	q.put(null);
293	–	shouldThrow();
294	–	} catch (NullPointerException success) {}
295	–	}
296	–
297	–	/**
255		* all elements successfully put are contained
256		*/
257		public void testPut() throws InterruptedException {
258		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
259		for (int i = 0; i < SIZE; ++i) {
260	<	Integer I = new Integer(i);
261	<	q.put(I);
262	<	assertTrue(q.contains(I));
260	>	Integer x = new Integer(i);
261	>	q.put(x);
262	>	assertTrue(q.contains(x));
263		}
264		assertEquals(0, q.remainingCapacity());
265		}
#	Line 367 | Line 324 | public class ArrayBlockingQueueTest exte
324		}});
325
326		await(pleaseTake);
327	<	assertEquals(q.remainingCapacity(), 0);
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(q.remainingCapacity(), 0);
334	>	assertEquals(0, q.remainingCapacity());
335		}
336
337		/**
#	Line 560 | Line 517 | public class ArrayBlockingQueueTest exte
517		}
518
519		/**
563	–	* remove(x) removes x and returns true if present
564	–	*/
565	–	public void testRemoveElement() {
566	–	ArrayBlockingQueue q = populatedQueue(SIZE);
567	–	for (int i = 1; i < SIZE; i+=2) {
568	–	assertTrue(q.remove(new Integer(i)));
569	–	}
570	–	for (int i = 0; i < SIZE; i+=2) {
571	–	assertTrue(q.remove(new Integer(i)));
572	–	assertFalse(q.remove(new Integer(i+1)));
573	–	}
574	–	assertTrue(q.isEmpty());
575	–	}
576	–
577	–	/**
520		* contains(x) reports true when elements added but not yet removed
521		*/
522		public void testContains() {
#	Line 630 | Line 572 | public class ArrayBlockingQueueTest exte
572		assertTrue(changed);
573
574		assertTrue(q.containsAll(p));
575	<	assertEquals(SIZE-i, q.size());
575	>	assertEquals(SIZE - i, q.size());
576		p.remove();
577		}
578		}
#	Line 643 | Line 585 | public class ArrayBlockingQueueTest exte
585		ArrayBlockingQueue q = populatedQueue(SIZE);
586		ArrayBlockingQueue p = populatedQueue(i);
587		assertTrue(q.removeAll(p));
588	<	assertEquals(SIZE-i, q.size());
588	>	assertEquals(SIZE - i, q.size());
589		for (int j = 0; j < i; ++j) {
590	<	Integer I = (Integer)(p.remove());
591	<	assertFalse(q.contains(I));
590	>	Integer x = (Integer)(p.remove());
591	>	assertFalse(q.contains(x));
592		}
593		}
594		}
595
596	<	/**
597	<	* toArray contains all elements in FIFO order
656	<	*/
657	<	public void testToArray() {
658	<	ArrayBlockingQueue q = populatedQueue(SIZE);
596	>	void checkToArray(ArrayBlockingQueue q) {
597	>	int size = q.size();
598		Object[] o = q.toArray();
599	<	for (int i = 0; i < o.length; i++)
600	<	assertSame(o[i], q.poll());
599	>	assertEquals(size, o.length);
600	>	Iterator it = q.iterator();
601	>	for (int i = 0; i < size; i++) {
602	>	Integer x = (Integer) it.next();
603	>	assertEquals((Integer)o[0] + i, (int) x);
604	>	assertSame(o[i], x);
605	>	}
606		}
607
608		/**
609	<	* toArray(a) contains all elements in FIFO order
609	>	* toArray() contains all elements in FIFO order
610		*/
611	<	public void testToArray2() {
612	<	ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
613	<	Integer[] ints = new Integer[SIZE];
614	<	Integer[] array = q.toArray(ints);
615	<	assertSame(ints, array);
616	<	for (int i = 0; i < ints.length; i++)
617	<	assertSame(ints[i], q.poll());
611	>	public void testToArray() {
612	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
613	>	for (int i = 0; i < SIZE; i++) {
614	>	checkToArray(q);
615	>	q.add(i);
616	>	}
617	>	// Provoke wraparound
618	>	for (int i = 0; i < SIZE; i++) {
619	>	checkToArray(q);
620	>	assertEquals(i, q.poll());
621	>	checkToArray(q);
622	>	q.add(SIZE + i);
623	>	}
624	>	for (int i = 0; i < SIZE; i++) {
625	>	checkToArray(q);
626	>	assertEquals(SIZE + i, q.poll());
627	>	}
628	>	}
629	>
630	>	void checkToArray2(ArrayBlockingQueue q) {
631	>	int size = q.size();
632	>	Integer[] a1 = (size == 0) ? null : new Integer[size - 1];
633	>	Integer[] a2 = new Integer[size];
634	>	Integer[] a3 = new Integer[size + 2];
635	>	if (size > 0) Arrays.fill(a1, 42);
636	>	Arrays.fill(a2, 42);
637	>	Arrays.fill(a3, 42);
638	>	Integer[] b1 = (size == 0) ? null : (Integer[]) q.toArray(a1);
639	>	Integer[] b2 = (Integer[]) q.toArray(a2);
640	>	Integer[] b3 = (Integer[]) q.toArray(a3);
641	>	assertSame(a2, b2);
642	>	assertSame(a3, b3);
643	>	Iterator it = q.iterator();
644	>	for (int i = 0; i < size; i++) {
645	>	Integer x = (Integer) it.next();
646	>	assertSame(b1[i], x);
647	>	assertEquals(b1[0] + i, (int) x);
648	>	assertSame(b2[i], x);
649	>	assertSame(b3[i], x);
650	>	}
651	>	assertNull(a3[size]);
652	>	assertEquals(42, (int) a3[size + 1]);
653	>	if (size > 0) {
654	>	assertNotSame(a1, b1);
655	>	assertEquals(size, b1.length);
656	>	for (int i = 0; i < a1.length; i++) {
657	>	assertEquals(42, (int) a1[i]);
658	>	}
659	>	}
660		}
661
662		/**
663	<	* toArray(null) throws NullPointerException
663	>	* toArray(a) contains all elements in FIFO order
664		*/
665	<	public void testToArray_NullArg() {
666	<	ArrayBlockingQueue q = populatedQueue(SIZE);
667	<	try {
668	<	q.toArray(null);
669	<	shouldThrow();
670	<	} catch (NullPointerException success) {}
665	>	public void testToArray2() {
666	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
667	>	for (int i = 0; i < SIZE; i++) {
668	>	checkToArray2(q);
669	>	q.add(i);
670	>	}
671	>	// Provoke wraparound
672	>	for (int i = 0; i < SIZE; i++) {
673	>	checkToArray2(q);
674	>	assertEquals(i, q.poll());
675	>	checkToArray2(q);
676	>	q.add(SIZE + i);
677	>	}
678	>	for (int i = 0; i < SIZE; i++) {
679	>	checkToArray2(q);
680	>	assertEquals(SIZE + i, q.poll());
681	>	}
682		}
683
684		/**
#	Line 701 | Line 698 | public class ArrayBlockingQueueTest exte
698		public void testIterator() throws InterruptedException {
699		ArrayBlockingQueue q = populatedQueue(SIZE);
700		Iterator it = q.iterator();
701	<	while (it.hasNext()) {
701	>	int i;
702	>	for (i = 0; it.hasNext(); i++)
703	>	assertTrue(q.contains(it.next()));
704	>	assertEquals(i, SIZE);
705	>	assertIteratorExhausted(it);
706	>
707	>	it = q.iterator();
708	>	for (i = 0; it.hasNext(); i++)
709		assertEquals(it.next(), q.take());
710	<	}
710	>	assertEquals(i, SIZE);
711	>	assertIteratorExhausted(it);
712	>	}
713	>
714	>	/**
715	>	* iterator of empty collection has no elements
716	>	*/
717	>	public void testEmptyIterator() {
718	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
719		}
720
721		/**
#	Line 776 | Line 788 | public class ArrayBlockingQueueTest exte
788		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
789		q.add(one);
790		q.add(two);
779	–	ExecutorService executor = Executors.newFixedThreadPool(2);
791		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
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	<	joinPool(executor);
792	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
793	>	try (PoolCleaner cleaner = cleaner(executor)) {
794	>	executor.execute(new CheckedRunnable() {
795	>	public void realRun() throws InterruptedException {
796	>	assertFalse(q.offer(three));
797	>	threadsStarted.await();
798	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
799	>	assertEquals(0, q.remainingCapacity());
800	>	}});
801	>
802	>	executor.execute(new CheckedRunnable() {
803	>	public void realRun() throws InterruptedException {
804	>	threadsStarted.await();
805	>	assertEquals(0, q.remainingCapacity());
806	>	assertSame(one, q.take());
807	>	}});
808	>	}
809		}
810
811		/**
#	Line 802 | Line 814 | public class ArrayBlockingQueueTest exte
814		public void testPollInExecutor() {
815		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
816		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
817	<	ExecutorService executor = Executors.newFixedThreadPool(2);
818	<	executor.execute(new CheckedRunnable() {
819	<	public void realRun() throws InterruptedException {
820	<	assertNull(q.poll());
821	<	threadsStarted.await();
822	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
823	<	checkEmpty(q);
824	<	}});
825	<
826	<	executor.execute(new CheckedRunnable() {
827	<	public void realRun() throws InterruptedException {
828	<	threadsStarted.await();
829	<	q.put(one);
830	<	}});
831	<
832	<	joinPool(executor);
817	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
818	>	try (PoolCleaner cleaner = cleaner(executor)) {
819	>	executor.execute(new CheckedRunnable() {
820	>	public void realRun() throws InterruptedException {
821	>	assertNull(q.poll());
822	>	threadsStarted.await();
823	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
824	>	checkEmpty(q);
825	>	}});
826	>
827	>	executor.execute(new CheckedRunnable() {
828	>	public void realRun() throws InterruptedException {
829	>	threadsStarted.await();
830	>	q.put(one);
831	>	}});
832	>	}
833		}
834
835		/**
836		* A deserialized serialized queue has same elements in same order
837		*/
838		public void testSerialization() throws Exception {
839	<	ArrayBlockingQueue q = populatedQueue(SIZE);
840	<
829	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
830	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
831	<	out.writeObject(q);
832	<	out.close();
839	>	Queue x = populatedQueue(SIZE);
840	>	Queue y = serialClone(x);
841
842	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
843	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
844	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
845	<	assertEquals(q.size(), r.size());
846	<	while (!q.isEmpty())
847	<	assertEquals(q.remove(), r.remove());
848	<	}
849	<
850	<	/**
843	<	* drainTo(null) throws NPE
844	<	*/
845	<	public void testDrainToNull() {
846	<	ArrayBlockingQueue q = populatedQueue(SIZE);
847	<	try {
848	<	q.drainTo(null);
849	<	shouldThrow();
850	<	} catch (NullPointerException success) {}
851	<	}
852	<
853	<	/**
854	<	* drainTo(this) throws IAE
855	<	*/
856	<	public void testDrainToSelf() {
857	<	ArrayBlockingQueue q = populatedQueue(SIZE);
858	<	try {
859	<	q.drainTo(q);
860	<	shouldThrow();
861	<	} catch (IllegalArgumentException success) {}
842	>	assertNotSame(x, y);
843	>	assertEquals(x.size(), y.size());
844	>	assertEquals(x.toString(), y.toString());
845	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
846	>	while (!x.isEmpty()) {
847	>	assertFalse(y.isEmpty());
848	>	assertEquals(x.remove(), y.remove());
849	>	}
850	>	assertTrue(y.isEmpty());
851		}
852
853		/**
#	Line 868 | Line 857 | public class ArrayBlockingQueueTest exte
857		ArrayBlockingQueue q = populatedQueue(SIZE);
858		ArrayList l = new ArrayList();
859		q.drainTo(l);
860	<	assertEquals(q.size(), 0);
861	<	assertEquals(l.size(), SIZE);
860	>	assertEquals(0, q.size());
861	>	assertEquals(SIZE, l.size());
862		for (int i = 0; i < SIZE; ++i)
863		assertEquals(l.get(i), new Integer(i));
864		q.add(zero);
#	Line 879 | Line 868 | public class ArrayBlockingQueueTest exte
868		assertTrue(q.contains(one));
869		l.clear();
870		q.drainTo(l);
871	<	assertEquals(q.size(), 0);
872	<	assertEquals(l.size(), 2);
871	>	assertEquals(0, q.size());
872	>	assertEquals(2, l.size());
873		for (int i = 0; i < 2; ++i)
874		assertEquals(l.get(i), new Integer(i));
875		}
#	Line 892 | Line 881 | public class ArrayBlockingQueueTest exte
881		final ArrayBlockingQueue q = populatedQueue(SIZE);
882		Thread t = new Thread(new CheckedRunnable() {
883		public void realRun() throws InterruptedException {
884	<	q.put(new Integer(SIZE+1));
884	>	q.put(new Integer(SIZE + 1));
885		}});
886
887		t.start();
#	Line 906 | Line 895 | public class ArrayBlockingQueueTest exte
895		}
896
897		/**
909	–	* drainTo(null, n) throws NPE
910	–	*/
911	–	public void testDrainToNullN() {
912	–	ArrayBlockingQueue q = populatedQueue(SIZE);
913	–	try {
914	–	q.drainTo(null, 0);
915	–	shouldThrow();
916	–	} catch (NullPointerException success) {}
917	–	}
918	–
919	–	/**
920	–	* drainTo(this, n) throws IAE
921	–	*/
922	–	public void testDrainToSelfN() {
923	–	ArrayBlockingQueue q = populatedQueue(SIZE);
924	–	try {
925	–	q.drainTo(q, 0);
926	–	shouldThrow();
927	–	} catch (IllegalArgumentException success) {}
928	–	}
929	–
930	–	/**
898		* drainTo(c, n) empties first min(n, size) elements of queue into c
899		*/
900		public void testDrainToN() {
901	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
901	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
902		for (int i = 0; i < SIZE + 2; ++i) {
903		for (int j = 0; j < SIZE; j++)
904		assertTrue(q.offer(new Integer(j)));
905		ArrayList l = new ArrayList();
906		q.drainTo(l, i);
907		int k = (i < SIZE) ? i : SIZE;
908	<	assertEquals(l.size(), k);
909	<	assertEquals(q.size(), SIZE-k);
908	>	assertEquals(k, l.size());
909	>	assertEquals(SIZE - k, q.size());
910		for (int j = 0; j < k; ++j)
911		assertEquals(l.get(j), new Integer(j));
912	<	while (q.poll() != null) ;
912	>	do {} while (q.poll() != null);
913		}
914		}
915
916	+	/**
917	+	* remove(null), contains(null) always return false
918	+	*/
919	+	public void testNeverContainsNull() {
920	+	Collection<?>[] qs = {
921	+	new ArrayBlockingQueue<Object>(10),
922	+	populatedQueue(2),
923	+	};
924	+
925	+	for (Collection<?> q : qs) {
926	+	assertFalse(q.contains(null));
927	+	assertFalse(q.remove(null));
928	+	}
929	+	}
930		}

Diff Legend

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