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.71 by jsr166, Sat Aug 6 17:02:49 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
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 494 | Line 451 | public class ArrayBlockingQueueTest exte
451		final CountDownLatch aboutToWait = new CountDownLatch(1);
452		Thread t = newStartedThread(new CheckedRunnable() {
453		public void realRun() throws InterruptedException {
454	+	long startTime = System.nanoTime();
455		for (int i = 0; i < SIZE; ++i) {
498	–	long t0 = System.nanoTime();
456		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
500	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
457		}
502	–	long t0 = System.nanoTime();
458		aboutToWait.countDown();
459		try {
460	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
460	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
461		shouldThrow();
462		} catch (InterruptedException success) {
463	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
463	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
464		}
465		}});
466
467	<	aboutToWait.await();
468	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
467	>	await(aboutToWait);
468	>	waitForThreadToEnterWaitState(t);
469		t.interrupt();
470	<	awaitTermination(t, MEDIUM_DELAY_MS);
470	>	awaitTermination(t);
471		checkEmpty(q);
472		}
473
#	Line 560 | Line 515 | public class ArrayBlockingQueueTest exte
515		}
516
517		/**
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	–	/**
518		* contains(x) reports true when elements added but not yet removed
519		*/
520		public void testContains() {
#	Line 630 | Line 570 | public class ArrayBlockingQueueTest exte
570		assertTrue(changed);
571
572		assertTrue(q.containsAll(p));
573	<	assertEquals(SIZE-i, q.size());
573	>	assertEquals(SIZE - i, q.size());
574		p.remove();
575		}
576		}
#	Line 643 | Line 583 | public class ArrayBlockingQueueTest exte
583		ArrayBlockingQueue q = populatedQueue(SIZE);
584		ArrayBlockingQueue p = populatedQueue(i);
585		assertTrue(q.removeAll(p));
586	<	assertEquals(SIZE-i, q.size());
586	>	assertEquals(SIZE - i, q.size());
587		for (int j = 0; j < i; ++j) {
588	<	Integer I = (Integer)(p.remove());
589	<	assertFalse(q.contains(I));
588	>	Integer x = (Integer)(p.remove());
589	>	assertFalse(q.contains(x));
590		}
591		}
592		}
593
594	<	/**
595	<	* toArray contains all elements in FIFO order
656	<	*/
657	<	public void testToArray() {
658	<	ArrayBlockingQueue q = populatedQueue(SIZE);
594	>	void checkToArray(ArrayBlockingQueue q) {
595	>	int size = q.size();
596		Object[] o = q.toArray();
597	<	for (int i = 0; i < o.length; i++)
598	<	assertSame(o[i], q.poll());
597	>	assertEquals(size, o.length);
598	>	Iterator it = q.iterator();
599	>	for (int i = 0; i < size; i++) {
600	>	Integer x = (Integer) it.next();
601	>	assertEquals((Integer)o[0] + i, (int) x);
602	>	assertSame(o[i], x);
603	>	}
604		}
605
606		/**
607	<	* toArray(a) contains all elements in FIFO order
607	>	* toArray() contains all elements in FIFO order
608		*/
609	<	public void testToArray2() {
610	<	ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
611	<	Integer[] ints = new Integer[SIZE];
612	<	Integer[] array = q.toArray(ints);
613	<	assertSame(ints, array);
614	<	for (int i = 0; i < ints.length; i++)
615	<	assertSame(ints[i], q.poll());
609	>	public void testToArray() {
610	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
611	>	for (int i = 0; i < SIZE; i++) {
612	>	checkToArray(q);
613	>	q.add(i);
614	>	}
615	>	// Provoke wraparound
616	>	for (int i = 0; i < SIZE; i++) {
617	>	checkToArray(q);
618	>	assertEquals(i, q.poll());
619	>	checkToArray(q);
620	>	q.add(SIZE + i);
621	>	}
622	>	for (int i = 0; i < SIZE; i++) {
623	>	checkToArray(q);
624	>	assertEquals(SIZE + i, q.poll());
625	>	}
626	>	}
627	>
628	>	void checkToArray2(ArrayBlockingQueue q) {
629	>	int size = q.size();
630	>	Integer[] a1 = (size == 0) ? null : new Integer[size - 1];
631	>	Integer[] a2 = new Integer[size];
632	>	Integer[] a3 = new Integer[size + 2];
633	>	if (size > 0) Arrays.fill(a1, 42);
634	>	Arrays.fill(a2, 42);
635	>	Arrays.fill(a3, 42);
636	>	Integer[] b1 = (size == 0) ? null : (Integer[]) q.toArray(a1);
637	>	Integer[] b2 = (Integer[]) q.toArray(a2);
638	>	Integer[] b3 = (Integer[]) q.toArray(a3);
639	>	assertSame(a2, b2);
640	>	assertSame(a3, b3);
641	>	Iterator it = q.iterator();
642	>	for (int i = 0; i < size; i++) {
643	>	Integer x = (Integer) it.next();
644	>	assertSame(b1[i], x);
645	>	assertEquals(b1[0] + i, (int) x);
646	>	assertSame(b2[i], x);
647	>	assertSame(b3[i], x);
648	>	}
649	>	assertNull(a3[size]);
650	>	assertEquals(42, (int) a3[size + 1]);
651	>	if (size > 0) {
652	>	assertNotSame(a1, b1);
653	>	assertEquals(size, b1.length);
654	>	for (int i = 0; i < a1.length; i++) {
655	>	assertEquals(42, (int) a1[i]);
656	>	}
657	>	}
658		}
659
660		/**
661	<	* toArray(null) throws NullPointerException
661	>	* toArray(a) contains all elements in FIFO order
662		*/
663	<	public void testToArray_NullArg() {
664	<	ArrayBlockingQueue q = populatedQueue(SIZE);
665	<	try {
666	<	q.toArray(null);
667	<	shouldThrow();
668	<	} catch (NullPointerException success) {}
663	>	public void testToArray2() {
664	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
665	>	for (int i = 0; i < SIZE; i++) {
666	>	checkToArray2(q);
667	>	q.add(i);
668	>	}
669	>	// Provoke wraparound
670	>	for (int i = 0; i < SIZE; i++) {
671	>	checkToArray2(q);
672	>	assertEquals(i, q.poll());
673	>	checkToArray2(q);
674	>	q.add(SIZE + i);
675	>	}
676	>	for (int i = 0; i < SIZE; i++) {
677	>	checkToArray2(q);
678	>	assertEquals(SIZE + i, q.poll());
679	>	}
680		}
681
682		/**
#	Line 701 | Line 696 | public class ArrayBlockingQueueTest exte
696		public void testIterator() throws InterruptedException {
697		ArrayBlockingQueue q = populatedQueue(SIZE);
698		Iterator it = q.iterator();
699	<	while (it.hasNext()) {
699	>	int i;
700	>	for (i = 0; it.hasNext(); i++)
701	>	assertTrue(q.contains(it.next()));
702	>	assertEquals(i, SIZE);
703	>	assertIteratorExhausted(it);
704	>
705	>	it = q.iterator();
706	>	for (i = 0; it.hasNext(); i++)
707		assertEquals(it.next(), q.take());
708	<	}
708	>	assertEquals(i, SIZE);
709	>	assertIteratorExhausted(it);
710	>	}
711	>
712	>	/**
713	>	* iterator of empty collection has no elements
714	>	*/
715	>	public void testEmptyIterator() {
716	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
717		}
718
719		/**
#	Line 776 | Line 786 | public class ArrayBlockingQueueTest exte
786		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
787		q.add(one);
788		q.add(two);
779	–	ExecutorService executor = Executors.newFixedThreadPool(2);
789		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
790	<	executor.execute(new CheckedRunnable() {
791	<	public void realRun() throws InterruptedException {
792	<	assertFalse(q.offer(three));
793	<	threadsStarted.await();
794	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
795	<	assertEquals(0, q.remainingCapacity());
796	<	}});
797	<
798	<	executor.execute(new CheckedRunnable() {
799	<	public void realRun() throws InterruptedException {
800	<	threadsStarted.await();
801	<	assertEquals(0, q.remainingCapacity());
802	<	assertSame(one, q.take());
803	<	}});
804	<
805	<	joinPool(executor);
790	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
791	>	try (PoolCleaner cleaner = cleaner(executor)) {
792	>	executor.execute(new CheckedRunnable() {
793	>	public void realRun() throws InterruptedException {
794	>	assertFalse(q.offer(three));
795	>	threadsStarted.await();
796	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
797	>	assertEquals(0, q.remainingCapacity());
798	>	}});
799	>
800	>	executor.execute(new CheckedRunnable() {
801	>	public void realRun() throws InterruptedException {
802	>	threadsStarted.await();
803	>	assertEquals(0, q.remainingCapacity());
804	>	assertSame(one, q.take());
805	>	}});
806	>	}
807		}
808
809		/**
#	Line 802 | Line 812 | public class ArrayBlockingQueueTest exte
812		public void testPollInExecutor() {
813		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
814		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
815	<	ExecutorService executor = Executors.newFixedThreadPool(2);
816	<	executor.execute(new CheckedRunnable() {
817	<	public void realRun() throws InterruptedException {
818	<	assertNull(q.poll());
819	<	threadsStarted.await();
820	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
821	<	checkEmpty(q);
822	<	}});
823	<
824	<	executor.execute(new CheckedRunnable() {
825	<	public void realRun() throws InterruptedException {
826	<	threadsStarted.await();
827	<	q.put(one);
828	<	}});
829	<
830	<	joinPool(executor);
815	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
816	>	try (PoolCleaner cleaner = cleaner(executor)) {
817	>	executor.execute(new CheckedRunnable() {
818	>	public void realRun() throws InterruptedException {
819	>	assertNull(q.poll());
820	>	threadsStarted.await();
821	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
822	>	checkEmpty(q);
823	>	}});
824	>
825	>	executor.execute(new CheckedRunnable() {
826	>	public void realRun() throws InterruptedException {
827	>	threadsStarted.await();
828	>	q.put(one);
829	>	}});
830	>	}
831		}
832
833		/**
834		* A deserialized serialized queue has same elements in same order
835		*/
836		public void testSerialization() throws Exception {
837	<	ArrayBlockingQueue q = populatedQueue(SIZE);
837	>	Queue x = populatedQueue(SIZE);
838	>	Queue y = serialClone(x);
839
840	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
841	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
842	<	out.writeObject(q);
843	<	out.close();
844	<
845	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
846	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
847	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
848	<	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) {}
840	>	assertNotSame(x, y);
841	>	assertEquals(x.size(), y.size());
842	>	assertEquals(x.toString(), y.toString());
843	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
844	>	while (!x.isEmpty()) {
845	>	assertFalse(y.isEmpty());
846	>	assertEquals(x.remove(), y.remove());
847	>	}
848	>	assertTrue(y.isEmpty());
849		}
850
851		/**
#	Line 868 | Line 855 | public class ArrayBlockingQueueTest exte
855		ArrayBlockingQueue q = populatedQueue(SIZE);
856		ArrayList l = new ArrayList();
857		q.drainTo(l);
858	<	assertEquals(q.size(), 0);
859	<	assertEquals(l.size(), SIZE);
858	>	assertEquals(0, q.size());
859	>	assertEquals(SIZE, l.size());
860		for (int i = 0; i < SIZE; ++i)
861		assertEquals(l.get(i), new Integer(i));
862		q.add(zero);
#	Line 879 | Line 866 | public class ArrayBlockingQueueTest exte
866		assertTrue(q.contains(one));
867		l.clear();
868		q.drainTo(l);
869	<	assertEquals(q.size(), 0);
870	<	assertEquals(l.size(), 2);
869	>	assertEquals(0, q.size());
870	>	assertEquals(2, l.size());
871		for (int i = 0; i < 2; ++i)
872		assertEquals(l.get(i), new Integer(i));
873		}
#	Line 892 | Line 879 | public class ArrayBlockingQueueTest exte
879		final ArrayBlockingQueue q = populatedQueue(SIZE);
880		Thread t = new Thread(new CheckedRunnable() {
881		public void realRun() throws InterruptedException {
882	<	q.put(new Integer(SIZE+1));
882	>	q.put(new Integer(SIZE + 1));
883		}});
884
885		t.start();
#	Line 906 | Line 893 | public class ArrayBlockingQueueTest exte
893		}
894
895		/**
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	–	/**
896		* drainTo(c, n) empties first min(n, size) elements of queue into c
897		*/
898		public void testDrainToN() {
899	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
899	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
900		for (int i = 0; i < SIZE + 2; ++i) {
901		for (int j = 0; j < SIZE; j++)
902		assertTrue(q.offer(new Integer(j)));
903		ArrayList l = new ArrayList();
904		q.drainTo(l, i);
905		int k = (i < SIZE) ? i : SIZE;
906	<	assertEquals(l.size(), k);
907	<	assertEquals(q.size(), SIZE-k);
906	>	assertEquals(k, l.size());
907	>	assertEquals(SIZE - k, q.size());
908		for (int j = 0; j < k; ++j)
909		assertEquals(l.get(j), new Integer(j));
910	<	while (q.poll() != null) ;
910	>	do {} while (q.poll() != null);
911		}
912		}
913
914	+	/**
915	+	* remove(null), contains(null) always return false
916	+	*/
917	+	public void testNeverContainsNull() {
918	+	Collection<?>[] qs = {
919	+	new ArrayBlockingQueue<Object>(10),
920	+	populatedQueue(2),
921	+	};
922	+
923	+	for (Collection<?> q : qs) {
924	+	assertFalse(q.contains(null));
925	+	assertFalse(q.remove(null));
926	+	}
927	+	}
928		}

Diff Legend

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