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.56 by jsr166, Thu May 30 03:28:55 2013 UTC vs.
Revision 1.84 by jsr166, Sat May 13 22:17:12 2017 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		* Returns a new queue of given size containing consecutive
74	<	* Integers 0 ... n.
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++) assertTrue(q.add((Integer) i));
235	+	assertEquals(0, q.remainingCapacity());
236		try {
237	<	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());
192	<	q.add(new Integer(SIZE));
237	>	q.add((Integer) SIZE);
238		shouldThrow();
239		} catch (IllegalStateException success) {}
240		}
#	Line 198 | Line 243 | public class ArrayBlockingQueueTest exte
243		* addAll(this) throws IAE
244		*/
245		public void testAddAllSelf() {
246	+	ArrayBlockingQueue q = populatedQueue(SIZE);
247		try {
202	–	ArrayBlockingQueue q = populatedQueue(SIZE);
248		q.addAll(q);
249		shouldThrow();
250		} catch (IllegalArgumentException success) {}
#	Line 210 | Line 255 | public class ArrayBlockingQueueTest exte
255		* possibly adding some elements
256		*/
257		public void testAddAll3() {
258	+	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
259	+	Integer[] ints = new Integer[SIZE];
260	+	for (int i = 0; i < SIZE - 1; ++i)
261	+	ints[i] = new Integer(i);
262		try {
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);
263		q.addAll(Arrays.asList(ints));
264		shouldThrow();
265		} catch (NullPointerException success) {}
#	Line 223 | Line 268 | public class ArrayBlockingQueueTest exte
268		/**
269		* addAll throws ISE if not enough room
270		*/
271	<	public void testAddAll4() {
271	>	public void testAddAll_insufficientSpace() {
272	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
273	>	ArrayBlockingQueue q = populatedQueue(0, size, size, false);
274	>	// Just fits:
275	>	q.addAll(populatedQueue(size, size, 2 * size, false));
276	>	assertEquals(0, q.remainingCapacity());
277	>	assertEquals(size, q.size());
278	>	assertEquals(0, q.peek());
279		try {
280	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
281	<	Integer[] ints = new Integer[SIZE];
230	<	for (int i = 0; i < SIZE; ++i)
231	<	ints[i] = new Integer(i);
232	<	q.addAll(Arrays.asList(ints));
280	>	q = populatedQueue(0, size, size, false);
281	>	q.addAll(Collections.nCopies(size + 1, 42));
282		shouldThrow();
283		} catch (IllegalStateException success) {}
284		}
#	Line 255 | Line 304 | public class ArrayBlockingQueueTest exte
304		public void testPut() throws InterruptedException {
305		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
306		for (int i = 0; i < SIZE; ++i) {
307	<	Integer I = new Integer(i);
308	<	q.put(I);
309	<	assertTrue(q.contains(I));
307	>	Integer x = new Integer(i);
308	>	q.put(x);
309	>	assertTrue(q.contains(x));
310		}
311		assertEquals(0, q.remainingCapacity());
312		}
#	Line 291 | Line 340 | public class ArrayBlockingQueueTest exte
340		}});
341
342		await(pleaseInterrupt);
343	<	assertThreadStaysAlive(t);
343	>	assertThreadBlocks(t, Thread.State.WAITING);
344		t.interrupt();
345		awaitTermination(t);
346		assertEquals(SIZE, q.size());
#	Line 326 | Line 375 | public class ArrayBlockingQueueTest exte
375		assertEquals(0, q.take());
376
377		await(pleaseInterrupt);
378	<	assertThreadStaysAlive(t);
378	>	assertThreadBlocks(t, Thread.State.WAITING);
379		t.interrupt();
380		awaitTermination(t);
381		assertEquals(0, q.remainingCapacity());
#	Line 353 | Line 402 | public class ArrayBlockingQueueTest exte
402		}});
403
404		await(pleaseInterrupt);
405	<	assertThreadStaysAlive(t);
405	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
406		t.interrupt();
407		awaitTermination(t);
408		}
#	Line 376 | Line 425 | public class ArrayBlockingQueueTest exte
425		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
426		Thread t = newStartedThread(new CheckedRunnable() {
427		public void realRun() throws InterruptedException {
428	<	for (int i = 0; i < SIZE; ++i) {
380	<	assertEquals(i, q.take());
381	<	}
428	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
429
430		Thread.currentThread().interrupt();
431		try {
#	Line 396 | Line 443 | public class ArrayBlockingQueueTest exte
443		}});
444
445		await(pleaseInterrupt);
446	<	assertThreadStaysAlive(t);
446	>	assertThreadBlocks(t, Thread.State.WAITING);
447		t.interrupt();
448		awaitTermination(t);
449		}
#	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 518 | Line 563 | public class ArrayBlockingQueueTest exte
563		* contains(x) reports true when elements added but not yet removed
564		*/
565		public void testContains() {
566	<	ArrayBlockingQueue q = populatedQueue(SIZE);
567	<	for (int i = 0; i < SIZE; ++i) {
566	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
567	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
568	>	assertFalse(q.contains(null));
569	>	for (int i = 0; i < size; ++i) {
570		assertTrue(q.contains(new Integer(i)));
571		assertEquals(i, q.poll());
572		assertFalse(q.contains(new Integer(i)));
#	Line 530 | Line 577 | public class ArrayBlockingQueueTest exte
577		* clear removes all elements
578		*/
579		public void testClear() {
580	<	ArrayBlockingQueue q = populatedQueue(SIZE);
580	>	int size = ThreadLocalRandom.current().nextInt(1, 5);
581	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
582	>	int capacity = size + q.remainingCapacity();
583		q.clear();
584		assertTrue(q.isEmpty());
585		assertEquals(0, q.size());
586	<	assertEquals(SIZE, q.remainingCapacity());
586	>	assertEquals(capacity, q.remainingCapacity());
587		q.add(one);
588		assertFalse(q.isEmpty());
589		assertTrue(q.contains(one));
#	Line 570 | Line 619 | public class ArrayBlockingQueueTest exte
619		assertTrue(changed);
620
621		assertTrue(q.containsAll(p));
622	<	assertEquals(SIZE-i, q.size());
622	>	assertEquals(SIZE - i, q.size());
623		p.remove();
624		}
625		}
#	Line 583 | Line 632 | public class ArrayBlockingQueueTest exte
632		ArrayBlockingQueue q = populatedQueue(SIZE);
633		ArrayBlockingQueue p = populatedQueue(i);
634		assertTrue(q.removeAll(p));
635	<	assertEquals(SIZE-i, q.size());
635	>	assertEquals(SIZE - i, q.size());
636		for (int j = 0; j < i; ++j) {
637	<	Integer I = (Integer)(p.remove());
638	<	assertFalse(q.contains(I));
637	>	Integer x = (Integer)(p.remove());
638	>	assertFalse(q.contains(x));
639		}
640		}
641		}
642
643	<	void checkToArray(ArrayBlockingQueue q) {
643	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
644		int size = q.size();
645	<	Object[] o = q.toArray();
646	<	assertEquals(size, o.length);
645	>	Object[] a1 = q.toArray();
646	>	assertEquals(size, a1.length);
647	>	Integer[] a2 = q.toArray(new Integer[0]);
648	>	assertEquals(size, a2.length);
649	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
650	>	assertEquals(size, a3.length);
651	>	Integer[] a4 = new Integer[size];
652	>	assertSame(a4, q.toArray(a4));
653	>	Integer[] a5 = new Integer[size + 1];
654	>	Arrays.fill(a5, 42);
655	>	assertSame(a5, q.toArray(a5));
656	>	Integer[] a6 = new Integer[size + 2];
657	>	Arrays.fill(a6, 42);
658	>	assertSame(a6, q.toArray(a6));
659	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
660	>	for (Object[] a : as) {
661	>	if (a.length > size) assertNull(a[size]);
662	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
663	>	}
664		Iterator it = q.iterator();
665	+	Integer s = q.peek();
666		for (int i = 0; i < size; i++) {
667		Integer x = (Integer) it.next();
668	<	assertEquals((Integer)o[0] + i, (int) x);
669	<	assertSame(o[i], x);
668	>	assertEquals(s + i, (int) x);
669	>	for (Object[] a : as)
670	>	assertSame(a1[i], x);
671		}
672		}
673
674		/**
675	<	* toArray() contains all elements in FIFO order
675	>	* toArray() and toArray(a) contain all elements in FIFO order
676		*/
677		public void testToArray() {
678	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
679	<	for (int i = 0; i < SIZE; i++) {
678	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
679	>	final int size = rnd.nextInt(6);
680	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
681	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
682	>	for (int i = 0; i < size; i++) {
683		checkToArray(q);
684		q.add(i);
685		}
686		// Provoke wraparound
687	<	for (int i = 0; i < SIZE; i++) {
688	<	checkToArray(q);
618	<	assertEquals(i, q.poll());
687	>	int added = size * 2;
688	>	for (int i = 0; i < added; i++) {
689		checkToArray(q);
690	<	q.add(SIZE+i);
690	>	assertEquals((Integer) i, q.poll());
691	>	q.add(size + i);
692		}
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();
693		for (int i = 0; i < size; i++) {
694	<	Integer x = (Integer) it.next();
695	<	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(a) contains all elements in FIFO order
662	<	*/
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());
694	>	checkToArray(q);
695	>	assertEquals((Integer) (added + i), q.poll());
696		}
697		}
698
699		/**
700		* toArray(incompatible array type) throws ArrayStoreException
701		*/
702	<	public void testToArray1_BadArg() {
702	>	public void testToArray_incompatibleArrayType() {
703		ArrayBlockingQueue q = populatedQueue(SIZE);
704		try {
705		q.toArray(new String[10]);
706		shouldThrow();
707		} catch (ArrayStoreException success) {}
708	+	try {
709	+	q.toArray(new String[0]);
710	+	shouldThrow();
711	+	} catch (ArrayStoreException success) {}
712		}
713
714		/**
#	Line 696 | Line 717 | public class ArrayBlockingQueueTest exte
717		public void testIterator() throws InterruptedException {
718		ArrayBlockingQueue q = populatedQueue(SIZE);
719		Iterator it = q.iterator();
720	<	while (it.hasNext()) {
720	>	int i;
721	>	for (i = 0; it.hasNext(); i++)
722	>	assertTrue(q.contains(it.next()));
723	>	assertEquals(i, SIZE);
724	>	assertIteratorExhausted(it);
725	>
726	>	it = q.iterator();
727	>	for (i = 0; it.hasNext(); i++)
728		assertEquals(it.next(), q.take());
729	<	}
729	>	assertEquals(i, SIZE);
730	>	assertIteratorExhausted(it);
731	>	}
732	>
733	>	/**
734	>	* iterator of empty collection has no elements
735	>	*/
736	>	public void testEmptyIterator() {
737	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
738		}
739
740		/**
#	Line 771 | Line 807 | public class ArrayBlockingQueueTest exte
807		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
808		q.add(one);
809		q.add(two);
774	–	ExecutorService executor = Executors.newFixedThreadPool(2);
810		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
811	<	executor.execute(new CheckedRunnable() {
812	<	public void realRun() throws InterruptedException {
813	<	assertFalse(q.offer(three));
814	<	threadsStarted.await();
815	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
816	<	assertEquals(0, q.remainingCapacity());
817	<	}});
818	<
819	<	executor.execute(new CheckedRunnable() {
820	<	public void realRun() throws InterruptedException {
821	<	threadsStarted.await();
822	<	assertEquals(0, q.remainingCapacity());
823	<	assertSame(one, q.take());
824	<	}});
825	<
826	<	joinPool(executor);
811	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
812	>	try (PoolCleaner cleaner = cleaner(executor)) {
813	>	executor.execute(new CheckedRunnable() {
814	>	public void realRun() throws InterruptedException {
815	>	assertFalse(q.offer(three));
816	>	threadsStarted.await();
817	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
818	>	assertEquals(0, q.remainingCapacity());
819	>	}});
820	>
821	>	executor.execute(new CheckedRunnable() {
822	>	public void realRun() throws InterruptedException {
823	>	threadsStarted.await();
824	>	assertEquals(0, q.remainingCapacity());
825	>	assertSame(one, q.take());
826	>	}});
827	>	}
828		}
829
830		/**
#	Line 797 | Line 833 | public class ArrayBlockingQueueTest exte
833		public void testPollInExecutor() {
834		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
835		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
836	<	ExecutorService executor = Executors.newFixedThreadPool(2);
837	<	executor.execute(new CheckedRunnable() {
838	<	public void realRun() throws InterruptedException {
839	<	assertNull(q.poll());
840	<	threadsStarted.await();
841	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
842	<	checkEmpty(q);
843	<	}});
844	<
845	<	executor.execute(new CheckedRunnable() {
846	<	public void realRun() throws InterruptedException {
847	<	threadsStarted.await();
848	<	q.put(one);
849	<	}});
850	<
851	<	joinPool(executor);
836	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
837	>	try (PoolCleaner cleaner = cleaner(executor)) {
838	>	executor.execute(new CheckedRunnable() {
839	>	public void realRun() throws InterruptedException {
840	>	assertNull(q.poll());
841	>	threadsStarted.await();
842	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
843	>	checkEmpty(q);
844	>	}});
845	>
846	>	executor.execute(new CheckedRunnable() {
847	>	public void realRun() throws InterruptedException {
848	>	threadsStarted.await();
849	>	q.put(one);
850	>	}});
851	>	}
852		}
853
854		/**
#	Line 864 | Line 900 | public class ArrayBlockingQueueTest exte
900		final ArrayBlockingQueue q = populatedQueue(SIZE);
901		Thread t = new Thread(new CheckedRunnable() {
902		public void realRun() throws InterruptedException {
903	<	q.put(new Integer(SIZE+1));
903	>	q.put(new Integer(SIZE + 1));
904		}});
905
906		t.start();
#	Line 881 | Line 917 | public class ArrayBlockingQueueTest exte
917		* drainTo(c, n) empties first min(n, size) elements of queue into c
918		*/
919		public void testDrainToN() {
920	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
920	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
921		for (int i = 0; i < SIZE + 2; ++i) {
922		for (int j = 0; j < SIZE; j++)
923		assertTrue(q.offer(new Integer(j)));
#	Line 889 | Line 925 | public class ArrayBlockingQueueTest exte
925		q.drainTo(l, i);
926		int k = (i < SIZE) ? i : SIZE;
927		assertEquals(k, l.size());
928	<	assertEquals(SIZE-k, q.size());
928	>	assertEquals(SIZE - k, q.size());
929		for (int j = 0; j < k; ++j)
930		assertEquals(l.get(j), new Integer(j));
931	<	while (q.poll() != null) ;
931	>	do {} while (q.poll() != null);
932		}
933		}
934
935	+	/**
936	+	* remove(null), contains(null) always return false
937	+	*/
938	+	public void testNeverContainsNull() {
939	+	Collection<?>[] qs = {
940	+	populatedQueue(0, 1, 10, false),
941	+	populatedQueue(2, 2, 10, true),
942	+	};
943	+
944	+	for (Collection<?> q : qs) {
945	+	assertFalse(q.contains(null));
946	+	assertFalse(q.remove(null));
947	+	}
948	+	}
949		}

Diff Legend

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