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.72 by jsr166, Sun Oct 16 20:44:18 2016 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
51	<	* Integers 0 ... n.
50	>	* Returns a new queue of given size containing consecutive
51	>	* Integers 0 ... n - 1.
52		*/
53		private ArrayBlockingQueue<Integer> populatedQueue(int n) {
54		ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n);
#	Line 48 | Line 58 | public class ArrayBlockingQueueTest exte
58		assertFalse(q.isEmpty());
59		assertEquals(0, q.remainingCapacity());
60		assertEquals(n, q.size());
61	+	assertEquals((Integer) 0, q.peek());
62		return q;
63		}
64
#	Line 63 | Line 74 | public class ArrayBlockingQueueTest exte
74		*/
75		public void testConstructor2() {
76		try {
77	<	ArrayBlockingQueue q = new ArrayBlockingQueue(0);
77	>	new ArrayBlockingQueue(0);
78		shouldThrow();
79		} catch (IllegalArgumentException success) {}
80		}
#	Line 73 | Line 84 | public class ArrayBlockingQueueTest exte
84		*/
85		public void testConstructor3() {
86		try {
87	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
87	>	new ArrayBlockingQueue(1, true, null);
88		shouldThrow();
89		} catch (NullPointerException success) {}
90		}
#	Line 82 | Line 93 | public class ArrayBlockingQueueTest exte
93		* Initializing from Collection of null elements throws NPE
94		*/
95		public void testConstructor4() {
96	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
97		try {
98	<	Integer[] ints = new Integer[SIZE];
87	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
98	>	new ArrayBlockingQueue(SIZE, false, elements);
99		shouldThrow();
100		} catch (NullPointerException success) {}
101		}
#	Line 93 | Line 104 | public class ArrayBlockingQueueTest exte
104		* Initializing from Collection with some null elements throws NPE
105		*/
106		public void testConstructor5() {
107	+	Integer[] ints = new Integer[SIZE];
108	+	for (int i = 0; i < SIZE - 1; ++i)
109	+	ints[i] = i;
110	+	Collection<Integer> elements = Arrays.asList(ints);
111		try {
112	<	Integer[] ints = new Integer[SIZE];
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));
112	>	new ArrayBlockingQueue(SIZE, false, elements);
113		shouldThrow();
114		} catch (NullPointerException success) {}
115		}
#	Line 106 | Line 118 | public class ArrayBlockingQueueTest exte
118		* Initializing from too large collection throws IAE
119		*/
120		public void testConstructor6() {
121	+	Integer[] ints = new Integer[SIZE];
122	+	for (int i = 0; i < SIZE; ++i)
123	+	ints[i] = i;
124	+	Collection<Integer> elements = Arrays.asList(ints);
125		try {
126	<	Integer[] ints = new Integer[SIZE];
111	<	for (int i = 0; i < SIZE; ++i)
112	<	ints[i] = new Integer(i);
113	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
126	>	new ArrayBlockingQueue(SIZE - 1, false, elements);
127		shouldThrow();
128		} catch (IllegalArgumentException success) {}
129		}
#	Line 121 | Line 134 | public class ArrayBlockingQueueTest exte
134		public void testConstructor7() {
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));
137	>	ints[i] = i;
138	>	Collection<Integer> elements = Arrays.asList(ints);
139	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, elements);
140		for (int i = 0; i < SIZE; ++i)
141		assertEquals(ints[i], q.poll());
142		}
#	Line 146 | Line 160 | public class ArrayBlockingQueueTest exte
160		* remainingCapacity decreases on add, increases on remove
161		*/
162		public void testRemainingCapacity() {
163	<	ArrayBlockingQueue q = populatedQueue(SIZE);
163	>	BlockingQueue q = populatedQueue(SIZE);
164		for (int i = 0; i < SIZE; ++i) {
165		assertEquals(i, q.remainingCapacity());
166	<	assertEquals(SIZE-i, q.size());
167	<	q.remove();
166	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
167	>	assertEquals(i, q.remove());
168		}
169		for (int i = 0; i < SIZE; ++i) {
170	<	assertEquals(SIZE-i, q.remainingCapacity());
171	<	assertEquals(i, q.size());
172	<	q.add(new Integer(i));
170	>	assertEquals(SIZE - i, q.remainingCapacity());
171	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
172	>	assertTrue(q.add(i));
173		}
174		}
175
176		/**
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	–	/**
177		* Offer succeeds if not full; fails if full
178		*/
179		public void testOffer() {
#	Line 194 | Line 186 | public class ArrayBlockingQueueTest exte
186		* add succeeds if not full; throws ISE if full
187		*/
188		public void testAdd() {
189	+	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
190	+	for (int i = 0; i < SIZE; ++i) {
191	+	assertTrue(q.add(new Integer(i)));
192	+	}
193	+	assertEquals(0, q.remainingCapacity());
194		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());
195		q.add(new Integer(SIZE));
196		shouldThrow();
197		} catch (IllegalStateException success) {}
198		}
199
200		/**
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	–	/**
201		* addAll(this) throws IAE
202		*/
203		public void testAddAllSelf() {
204	+	ArrayBlockingQueue q = populatedQueue(SIZE);
205		try {
224	–	ArrayBlockingQueue q = populatedQueue(SIZE);
206		q.addAll(q);
207		shouldThrow();
208		} catch (IllegalArgumentException success) {}
209		}
210
211		/**
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	–	/**
212		* addAll of a collection with any null elements throws NPE after
213		* possibly adding some elements
214		*/
215		public void testAddAll3() {
216	+	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
217	+	Integer[] ints = new Integer[SIZE];
218	+	for (int i = 0; i < SIZE - 1; ++i)
219	+	ints[i] = new Integer(i);
220		try {
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);
221		q.addAll(Arrays.asList(ints));
222		shouldThrow();
223		} catch (NullPointerException success) {}
#	Line 258 | Line 227 | public class ArrayBlockingQueueTest exte
227		* addAll throws ISE if not enough room
228		*/
229		public void testAddAll4() {
230	+	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
231	+	Integer[] ints = new Integer[SIZE];
232	+	for (int i = 0; i < SIZE; ++i)
233	+	ints[i] = new Integer(i);
234		try {
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);
235		q.addAll(Arrays.asList(ints));
236		shouldThrow();
237		} catch (IllegalStateException success) {}
#	Line 284 | Line 253 | public class ArrayBlockingQueueTest exte
253		}
254
255		/**
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	–	/**
256		* all elements successfully put are contained
257		*/
258		public void testPut() throws InterruptedException {
259		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
260		for (int i = 0; i < SIZE; ++i) {
261	<	Integer I = new Integer(i);
262	<	q.put(I);
263	<	assertTrue(q.contains(I));
261	>	Integer x = new Integer(i);
262	>	q.put(x);
263	>	assertTrue(q.contains(x));
264		}
265		assertEquals(0, q.remainingCapacity());
266		}
#	Line 367 | Line 325 | public class ArrayBlockingQueueTest exte
325		}});
326
327		await(pleaseTake);
328	<	assertEquals(q.remainingCapacity(), 0);
328	>	assertEquals(0, q.remainingCapacity());
329		assertEquals(0, q.take());
330
331		await(pleaseInterrupt);
332		assertThreadStaysAlive(t);
333		t.interrupt();
334		awaitTermination(t);
335	<	assertEquals(q.remainingCapacity(), 0);
335	>	assertEquals(0, q.remainingCapacity());
336		}
337
338		/**
#	Line 494 | Line 452 | public class ArrayBlockingQueueTest exte
452		final CountDownLatch aboutToWait = new CountDownLatch(1);
453		Thread t = newStartedThread(new CheckedRunnable() {
454		public void realRun() throws InterruptedException {
455	+	long startTime = System.nanoTime();
456		for (int i = 0; i < SIZE; ++i) {
498	–	long t0 = System.nanoTime();
457		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
500	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
458		}
502	–	long t0 = System.nanoTime();
459		aboutToWait.countDown();
460		try {
461	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
461	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
462		shouldThrow();
463		} catch (InterruptedException success) {
464	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
464	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
465		}
466		}});
467
468	<	aboutToWait.await();
469	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
468	>	await(aboutToWait);
469	>	waitForThreadToEnterWaitState(t);
470		t.interrupt();
471	<	awaitTermination(t, MEDIUM_DELAY_MS);
471	>	awaitTermination(t);
472		checkEmpty(q);
473		}
474
#	Line 560 | Line 516 | public class ArrayBlockingQueueTest exte
516		}
517
518		/**
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	–	/**
519		* contains(x) reports true when elements added but not yet removed
520		*/
521		public void testContains() {
#	Line 630 | Line 571 | public class ArrayBlockingQueueTest exte
571		assertTrue(changed);
572
573		assertTrue(q.containsAll(p));
574	<	assertEquals(SIZE-i, q.size());
574	>	assertEquals(SIZE - i, q.size());
575		p.remove();
576		}
577		}
#	Line 643 | Line 584 | public class ArrayBlockingQueueTest exte
584		ArrayBlockingQueue q = populatedQueue(SIZE);
585		ArrayBlockingQueue p = populatedQueue(i);
586		assertTrue(q.removeAll(p));
587	<	assertEquals(SIZE-i, q.size());
587	>	assertEquals(SIZE - i, q.size());
588		for (int j = 0; j < i; ++j) {
589	<	Integer I = (Integer)(p.remove());
590	<	assertFalse(q.contains(I));
589	>	Integer x = (Integer)(p.remove());
590	>	assertFalse(q.contains(x));
591		}
592		}
593		}
594
595	<	/**
596	<	* toArray contains all elements in FIFO order
656	<	*/
657	<	public void testToArray() {
658	<	ArrayBlockingQueue q = populatedQueue(SIZE);
595	>	void checkToArray(ArrayBlockingQueue q) {
596	>	int size = q.size();
597		Object[] o = q.toArray();
598	<	for (int i = 0; i < o.length; i++)
599	<	assertSame(o[i], q.poll());
598	>	assertEquals(size, o.length);
599	>	Iterator it = q.iterator();
600	>	for (int i = 0; i < size; i++) {
601	>	Integer x = (Integer) it.next();
602	>	assertEquals((Integer)o[0] + i, (int) x);
603	>	assertSame(o[i], x);
604	>	}
605		}
606
607		/**
608	<	* toArray(a) contains all elements in FIFO order
608	>	* toArray() contains all elements in FIFO order
609		*/
610	<	public void testToArray2() {
611	<	ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
612	<	Integer[] ints = new Integer[SIZE];
613	<	Integer[] array = q.toArray(ints);
614	<	assertSame(ints, array);
615	<	for (int i = 0; i < ints.length; i++)
616	<	assertSame(ints[i], q.poll());
610	>	public void testToArray() {
611	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
612	>	for (int i = 0; i < SIZE; i++) {
613	>	checkToArray(q);
614	>	q.add(i);
615	>	}
616	>	// Provoke wraparound
617	>	for (int i = 0; i < SIZE; i++) {
618	>	checkToArray(q);
619	>	assertEquals(i, q.poll());
620	>	checkToArray(q);
621	>	q.add(SIZE + i);
622	>	}
623	>	for (int i = 0; i < SIZE; i++) {
624	>	checkToArray(q);
625	>	assertEquals(SIZE + i, q.poll());
626	>	}
627	>	}
628	>
629	>	void checkToArray2(ArrayBlockingQueue q) {
630	>	int size = q.size();
631	>	Integer[] a1 = (size == 0) ? null : new Integer[size - 1];
632	>	Integer[] a2 = new Integer[size];
633	>	Integer[] a3 = new Integer[size + 2];
634	>	if (size > 0) Arrays.fill(a1, 42);
635	>	Arrays.fill(a2, 42);
636	>	Arrays.fill(a3, 42);
637	>	Integer[] b1 = (size == 0) ? null : (Integer[]) q.toArray(a1);
638	>	Integer[] b2 = (Integer[]) q.toArray(a2);
639	>	Integer[] b3 = (Integer[]) q.toArray(a3);
640	>	assertSame(a2, b2);
641	>	assertSame(a3, b3);
642	>	Iterator it = q.iterator();
643	>	for (int i = 0; i < size; i++) {
644	>	Integer x = (Integer) it.next();
645	>	assertSame(b1[i], x);
646	>	assertEquals(b1[0] + i, (int) x);
647	>	assertSame(b2[i], x);
648	>	assertSame(b3[i], x);
649	>	}
650	>	assertNull(a3[size]);
651	>	assertEquals(42, (int) a3[size + 1]);
652	>	if (size > 0) {
653	>	assertNotSame(a1, b1);
654	>	assertEquals(size, b1.length);
655	>	for (int i = 0; i < a1.length; i++) {
656	>	assertEquals(42, (int) a1[i]);
657	>	}
658	>	}
659		}
660
661		/**
662	<	* toArray(null) throws NullPointerException
662	>	* toArray(a) contains all elements in FIFO order
663		*/
664	<	public void testToArray_NullArg() {
665	<	ArrayBlockingQueue q = populatedQueue(SIZE);
666	<	try {
667	<	q.toArray(null);
668	<	shouldThrow();
669	<	} catch (NullPointerException success) {}
664	>	public void testToArray2() {
665	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
666	>	for (int i = 0; i < SIZE; i++) {
667	>	checkToArray2(q);
668	>	q.add(i);
669	>	}
670	>	// Provoke wraparound
671	>	for (int i = 0; i < SIZE; i++) {
672	>	checkToArray2(q);
673	>	assertEquals(i, q.poll());
674	>	checkToArray2(q);
675	>	q.add(SIZE + i);
676	>	}
677	>	for (int i = 0; i < SIZE; i++) {
678	>	checkToArray2(q);
679	>	assertEquals(SIZE + i, q.poll());
680	>	}
681		}
682
683		/**
#	Line 701 | Line 697 | public class ArrayBlockingQueueTest exte
697		public void testIterator() throws InterruptedException {
698		ArrayBlockingQueue q = populatedQueue(SIZE);
699		Iterator it = q.iterator();
700	<	while (it.hasNext()) {
700	>	int i;
701	>	for (i = 0; it.hasNext(); i++)
702	>	assertTrue(q.contains(it.next()));
703	>	assertEquals(i, SIZE);
704	>	assertIteratorExhausted(it);
705	>
706	>	it = q.iterator();
707	>	for (i = 0; it.hasNext(); i++)
708		assertEquals(it.next(), q.take());
709	<	}
709	>	assertEquals(i, SIZE);
710	>	assertIteratorExhausted(it);
711	>	}
712	>
713	>	/**
714	>	* iterator of empty collection has no elements
715	>	*/
716	>	public void testEmptyIterator() {
717	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
718		}
719
720		/**
#	Line 776 | Line 787 | public class ArrayBlockingQueueTest exte
787		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
788		q.add(one);
789		q.add(two);
779	–	ExecutorService executor = Executors.newFixedThreadPool(2);
790		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
791	<	executor.execute(new CheckedRunnable() {
792	<	public void realRun() throws InterruptedException {
793	<	assertFalse(q.offer(three));
794	<	threadsStarted.await();
795	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
796	<	assertEquals(0, q.remainingCapacity());
797	<	}});
798	<
799	<	executor.execute(new CheckedRunnable() {
800	<	public void realRun() throws InterruptedException {
801	<	threadsStarted.await();
802	<	assertEquals(0, q.remainingCapacity());
803	<	assertSame(one, q.take());
804	<	}});
805	<
806	<	joinPool(executor);
791	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
792	>	try (PoolCleaner cleaner = cleaner(executor)) {
793	>	executor.execute(new CheckedRunnable() {
794	>	public void realRun() throws InterruptedException {
795	>	assertFalse(q.offer(three));
796	>	threadsStarted.await();
797	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
798	>	assertEquals(0, q.remainingCapacity());
799	>	}});
800	>
801	>	executor.execute(new CheckedRunnable() {
802	>	public void realRun() throws InterruptedException {
803	>	threadsStarted.await();
804	>	assertEquals(0, q.remainingCapacity());
805	>	assertSame(one, q.take());
806	>	}});
807	>	}
808		}
809
810		/**
#	Line 802 | Line 813 | public class ArrayBlockingQueueTest exte
813		public void testPollInExecutor() {
814		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
815		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
816	<	ExecutorService executor = Executors.newFixedThreadPool(2);
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 CheckedRunnable() {
826	<	public void realRun() throws InterruptedException {
827	<	threadsStarted.await();
828	<	q.put(one);
829	<	}});
830	<
831	<	joinPool(executor);
816	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
817	>	try (PoolCleaner cleaner = cleaner(executor)) {
818	>	executor.execute(new CheckedRunnable() {
819	>	public void realRun() throws InterruptedException {
820	>	assertNull(q.poll());
821	>	threadsStarted.await();
822	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
823	>	checkEmpty(q);
824	>	}});
825	>
826	>	executor.execute(new CheckedRunnable() {
827	>	public void realRun() throws InterruptedException {
828	>	threadsStarted.await();
829	>	q.put(one);
830	>	}});
831	>	}
832		}
833
834		/**
835		* A deserialized serialized queue has same elements in same order
836		*/
837		public void testSerialization() throws Exception {
838	<	ArrayBlockingQueue q = populatedQueue(SIZE);
838	>	Queue x = populatedQueue(SIZE);
839	>	Queue y = serialClone(x);
840
841	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
842	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
843	<	out.writeObject(q);
844	<	out.close();
845	<
846	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
847	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
848	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
849	<	assertEquals(q.size(), r.size());
838	<	while (!q.isEmpty())
839	<	assertEquals(q.remove(), r.remove());
840	<	}
841	<
842	<	/**
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) {}
841	>	assertNotSame(x, y);
842	>	assertEquals(x.size(), y.size());
843	>	assertEquals(x.toString(), y.toString());
844	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
845	>	while (!x.isEmpty()) {
846	>	assertFalse(y.isEmpty());
847	>	assertEquals(x.remove(), y.remove());
848	>	}
849	>	assertTrue(y.isEmpty());
850		}
851
852		/**
#	Line 868 | Line 856 | public class ArrayBlockingQueueTest exte
856		ArrayBlockingQueue q = populatedQueue(SIZE);
857		ArrayList l = new ArrayList();
858		q.drainTo(l);
859	<	assertEquals(q.size(), 0);
860	<	assertEquals(l.size(), SIZE);
859	>	assertEquals(0, q.size());
860	>	assertEquals(SIZE, l.size());
861		for (int i = 0; i < SIZE; ++i)
862		assertEquals(l.get(i), new Integer(i));
863		q.add(zero);
#	Line 879 | Line 867 | public class ArrayBlockingQueueTest exte
867		assertTrue(q.contains(one));
868		l.clear();
869		q.drainTo(l);
870	<	assertEquals(q.size(), 0);
871	<	assertEquals(l.size(), 2);
870	>	assertEquals(0, q.size());
871	>	assertEquals(2, l.size());
872		for (int i = 0; i < 2; ++i)
873		assertEquals(l.get(i), new Integer(i));
874		}
#	Line 892 | Line 880 | public class ArrayBlockingQueueTest exte
880		final ArrayBlockingQueue q = populatedQueue(SIZE);
881		Thread t = new Thread(new CheckedRunnable() {
882		public void realRun() throws InterruptedException {
883	<	q.put(new Integer(SIZE+1));
883	>	q.put(new Integer(SIZE + 1));
884		}});
885
886		t.start();
#	Line 906 | Line 894 | public class ArrayBlockingQueueTest exte
894		}
895
896		/**
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	–	/**
897		* drainTo(c, n) empties first min(n, size) elements of queue into c
898		*/
899		public void testDrainToN() {
900	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
900	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
901		for (int i = 0; i < SIZE + 2; ++i) {
902		for (int j = 0; j < SIZE; j++)
903		assertTrue(q.offer(new Integer(j)));
904		ArrayList l = new ArrayList();
905		q.drainTo(l, i);
906		int k = (i < SIZE) ? i : SIZE;
907	<	assertEquals(l.size(), k);
908	<	assertEquals(q.size(), SIZE-k);
907	>	assertEquals(k, l.size());
908	>	assertEquals(SIZE - k, q.size());
909		for (int j = 0; j < k; ++j)
910		assertEquals(l.get(j), new Integer(j));
911	<	while (q.poll() != null) ;
911	>	do {} while (q.poll() != null);
912		}
913		}
914
915	+	/**
916	+	* remove(null), contains(null) always return false
917	+	*/
918	+	public void testNeverContainsNull() {
919	+	Collection<?>[] qs = {
920	+	new ArrayBlockingQueue<Object>(10),
921	+	populatedQueue(2),
922	+	};
923	+
924	+	for (Collection<?> q : qs) {
925	+	assertFalse(q.contains(null));
926	+	assertFalse(q.remove(null));
927	+	}
928	+	}
929		}

Diff Legend

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