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.57 by jsr166, Sun Nov 23 22:27:06 2014 UTC vs.
Revision 1.87 by jsr166, Sun May 14 00:56:43 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 350 | Line 399 | public class ArrayBlockingQueueTest exte
399		q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
400		shouldThrow();
401		} catch (InterruptedException success) {}
402	+	assertFalse(Thread.interrupted());
403		}});
404
405		await(pleaseInterrupt);
406	<	assertThreadStaysAlive(t);
406	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
407		t.interrupt();
408		awaitTermination(t);
409		}
#	Line 376 | Line 426 | public class ArrayBlockingQueueTest exte
426		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
427		Thread t = newStartedThread(new CheckedRunnable() {
428		public void realRun() throws InterruptedException {
429	<	for (int i = 0; i < SIZE; ++i) {
380	<	assertEquals(i, q.take());
381	<	}
429	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
430
431		Thread.currentThread().interrupt();
432		try {
#	Line 396 | Line 444 | public class ArrayBlockingQueueTest exte
444		}});
445
446		await(pleaseInterrupt);
447	<	assertThreadStaysAlive(t);
447	>	assertThreadBlocks(t, Thread.State.WAITING);
448		t.interrupt();
449		awaitTermination(t);
450		}
#	Line 446 | Line 494 | public class ArrayBlockingQueueTest exte
494		*/
495		public void testInterruptedTimedPoll() throws InterruptedException {
496		final BlockingQueue<Integer> q = populatedQueue(SIZE);
497	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
497	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
498		Thread t = newStartedThread(new CheckedRunnable() {
499		public void realRun() throws InterruptedException {
500	+	long startTime = System.nanoTime();
501		for (int i = 0; i < SIZE; ++i) {
453	–	long t0 = System.nanoTime();
502		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
455	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
503		}
504	<	long t0 = System.nanoTime();
505	<	aboutToWait.countDown();
504	>
505	>	pleaseInterrupt.countDown();
506		try {
507	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
507	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
508		shouldThrow();
509	<	} catch (InterruptedException success) {
510	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
511	<	}
509	>	} catch (InterruptedException success) {}
510	>	assertFalse(Thread.interrupted());
511	>
512	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
513		}});
514
515	<	aboutToWait.await();
516	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
515	>	await(pleaseInterrupt);
516	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
517		t.interrupt();
518	<	awaitTermination(t, MEDIUM_DELAY_MS);
518	>	awaitTermination(t);
519		checkEmpty(q);
520		}
521
#	Line 518 | Line 566 | public class ArrayBlockingQueueTest exte
566		* contains(x) reports true when elements added but not yet removed
567		*/
568		public void testContains() {
569	<	ArrayBlockingQueue q = populatedQueue(SIZE);
570	<	for (int i = 0; i < SIZE; ++i) {
569	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
570	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
571	>	assertFalse(q.contains(null));
572	>	for (int i = 0; i < size; ++i) {
573		assertTrue(q.contains(new Integer(i)));
574		assertEquals(i, q.poll());
575		assertFalse(q.contains(new Integer(i)));
#	Line 530 | Line 580 | public class ArrayBlockingQueueTest exte
580		* clear removes all elements
581		*/
582		public void testClear() {
583	<	ArrayBlockingQueue q = populatedQueue(SIZE);
583	>	int size = ThreadLocalRandom.current().nextInt(1, 5);
584	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
585	>	int capacity = size + q.remainingCapacity();
586		q.clear();
587		assertTrue(q.isEmpty());
588		assertEquals(0, q.size());
589	<	assertEquals(SIZE, q.remainingCapacity());
589	>	assertEquals(capacity, q.remainingCapacity());
590		q.add(one);
591		assertFalse(q.isEmpty());
592		assertTrue(q.contains(one));
#	Line 570 | Line 622 | public class ArrayBlockingQueueTest exte
622		assertTrue(changed);
623
624		assertTrue(q.containsAll(p));
625	<	assertEquals(SIZE-i, q.size());
625	>	assertEquals(SIZE - i, q.size());
626		p.remove();
627		}
628		}
#	Line 583 | Line 635 | public class ArrayBlockingQueueTest exte
635		ArrayBlockingQueue q = populatedQueue(SIZE);
636		ArrayBlockingQueue p = populatedQueue(i);
637		assertTrue(q.removeAll(p));
638	<	assertEquals(SIZE-i, q.size());
638	>	assertEquals(SIZE - i, q.size());
639		for (int j = 0; j < i; ++j) {
640	<	Integer I = (Integer)(p.remove());
641	<	assertFalse(q.contains(I));
640	>	Integer x = (Integer)(p.remove());
641	>	assertFalse(q.contains(x));
642		}
643		}
644		}
645
646	<	void checkToArray(ArrayBlockingQueue q) {
646	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
647		int size = q.size();
648	<	Object[] o = q.toArray();
649	<	assertEquals(size, o.length);
648	>	Object[] a1 = q.toArray();
649	>	assertEquals(size, a1.length);
650	>	Integer[] a2 = q.toArray(new Integer[0]);
651	>	assertEquals(size, a2.length);
652	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
653	>	assertEquals(size, a3.length);
654	>	Integer[] a4 = new Integer[size];
655	>	assertSame(a4, q.toArray(a4));
656	>	Integer[] a5 = new Integer[size + 1];
657	>	Arrays.fill(a5, 42);
658	>	assertSame(a5, q.toArray(a5));
659	>	Integer[] a6 = new Integer[size + 2];
660	>	Arrays.fill(a6, 42);
661	>	assertSame(a6, q.toArray(a6));
662	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
663	>	for (Object[] a : as) {
664	>	if (a.length > size) assertNull(a[size]);
665	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
666	>	}
667		Iterator it = q.iterator();
668	+	Integer s = q.peek();
669		for (int i = 0; i < size; i++) {
670		Integer x = (Integer) it.next();
671	<	assertEquals((Integer)o[0] + i, (int) x);
672	<	assertSame(o[i], x);
671	>	assertEquals(s + i, (int) x);
672	>	for (Object[] a : as)
673	>	assertSame(a1[i], x);
674		}
675		}
676
677		/**
678	<	* toArray() contains all elements in FIFO order
678	>	* toArray() and toArray(a) contain all elements in FIFO order
679		*/
680		public void testToArray() {
681	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
682	<	for (int i = 0; i < SIZE; i++) {
681	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
682	>	final int size = rnd.nextInt(6);
683	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
684	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
685	>	for (int i = 0; i < size; i++) {
686		checkToArray(q);
687		q.add(i);
688		}
689		// Provoke wraparound
690	<	for (int i = 0; i < SIZE; i++) {
691	<	checkToArray(q);
618	<	assertEquals(i, q.poll());
619	<	checkToArray(q);
620	<	q.add(SIZE+i);
621	<	}
622	<	for (int i = 0; i < SIZE; i++) {
690	>	int added = size * 2;
691	>	for (int i = 0; i < added; i++) {
692		checkToArray(q);
693	<	assertEquals(SIZE+i, q.poll());
693	>	assertEquals((Integer) i, q.poll());
694	>	q.add(size + i);
695		}
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();
696		for (int i = 0; i < size; i++) {
697	<	Integer x = (Integer) it.next();
698	<	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());
697	>	checkToArray(q);
698	>	assertEquals((Integer) (added + i), q.poll());
699		}
700		}
701
702		/**
703		* toArray(incompatible array type) throws ArrayStoreException
704		*/
705	<	public void testToArray1_BadArg() {
705	>	public void testToArray_incompatibleArrayType() {
706		ArrayBlockingQueue q = populatedQueue(SIZE);
707		try {
708		q.toArray(new String[10]);
709		shouldThrow();
710		} catch (ArrayStoreException success) {}
711	+	try {
712	+	q.toArray(new String[0]);
713	+	shouldThrow();
714	+	} catch (ArrayStoreException success) {}
715		}
716
717		/**
#	Line 696 | Line 720 | public class ArrayBlockingQueueTest exte
720		public void testIterator() throws InterruptedException {
721		ArrayBlockingQueue q = populatedQueue(SIZE);
722		Iterator it = q.iterator();
723	<	while (it.hasNext()) {
723	>	int i;
724	>	for (i = 0; it.hasNext(); i++)
725	>	assertTrue(q.contains(it.next()));
726	>	assertEquals(i, SIZE);
727	>	assertIteratorExhausted(it);
728	>
729	>	it = q.iterator();
730	>	for (i = 0; it.hasNext(); i++)
731		assertEquals(it.next(), q.take());
732	<	}
732	>	assertEquals(i, SIZE);
733	>	assertIteratorExhausted(it);
734	>	}
735	>
736	>	/**
737	>	* iterator of empty collection has no elements
738	>	*/
739	>	public void testEmptyIterator() {
740	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
741		}
742
743		/**
#	Line 771 | Line 810 | public class ArrayBlockingQueueTest exte
810		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
811		q.add(one);
812		q.add(two);
774	–	ExecutorService executor = Executors.newFixedThreadPool(2);
813		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
814	<	executor.execute(new CheckedRunnable() {
815	<	public void realRun() throws InterruptedException {
816	<	assertFalse(q.offer(three));
817	<	threadsStarted.await();
818	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
819	<	assertEquals(0, q.remainingCapacity());
820	<	}});
821	<
822	<	executor.execute(new CheckedRunnable() {
823	<	public void realRun() throws InterruptedException {
824	<	threadsStarted.await();
825	<	assertEquals(0, q.remainingCapacity());
826	<	assertSame(one, q.take());
827	<	}});
828	<
829	<	joinPool(executor);
814	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
815	>	try (PoolCleaner cleaner = cleaner(executor)) {
816	>	executor.execute(new CheckedRunnable() {
817	>	public void realRun() throws InterruptedException {
818	>	assertFalse(q.offer(three));
819	>	threadsStarted.await();
820	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
821	>	assertEquals(0, q.remainingCapacity());
822	>	}});
823	>
824	>	executor.execute(new CheckedRunnable() {
825	>	public void realRun() throws InterruptedException {
826	>	threadsStarted.await();
827	>	assertEquals(0, q.remainingCapacity());
828	>	assertSame(one, q.take());
829	>	}});
830	>	}
831		}
832
833		/**
#	Line 797 | Line 836 | public class ArrayBlockingQueueTest exte
836		public void testPollInExecutor() {
837		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
838		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
839	<	ExecutorService executor = Executors.newFixedThreadPool(2);
840	<	executor.execute(new CheckedRunnable() {
841	<	public void realRun() throws InterruptedException {
842	<	assertNull(q.poll());
843	<	threadsStarted.await();
844	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
845	<	checkEmpty(q);
846	<	}});
847	<
848	<	executor.execute(new CheckedRunnable() {
849	<	public void realRun() throws InterruptedException {
850	<	threadsStarted.await();
851	<	q.put(one);
852	<	}});
853	<
854	<	joinPool(executor);
839	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
840	>	try (PoolCleaner cleaner = cleaner(executor)) {
841	>	executor.execute(new CheckedRunnable() {
842	>	public void realRun() throws InterruptedException {
843	>	assertNull(q.poll());
844	>	threadsStarted.await();
845	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
846	>	checkEmpty(q);
847	>	}});
848	>
849	>	executor.execute(new CheckedRunnable() {
850	>	public void realRun() throws InterruptedException {
851	>	threadsStarted.await();
852	>	q.put(one);
853	>	}});
854	>	}
855		}
856
857		/**
#	Line 864 | Line 903 | public class ArrayBlockingQueueTest exte
903		final ArrayBlockingQueue q = populatedQueue(SIZE);
904		Thread t = new Thread(new CheckedRunnable() {
905		public void realRun() throws InterruptedException {
906	<	q.put(new Integer(SIZE+1));
906	>	q.put(new Integer(SIZE + 1));
907		}});
908
909		t.start();
#	Line 881 | Line 920 | public class ArrayBlockingQueueTest exte
920		* drainTo(c, n) empties first min(n, size) elements of queue into c
921		*/
922		public void testDrainToN() {
923	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
923	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
924		for (int i = 0; i < SIZE + 2; ++i) {
925		for (int j = 0; j < SIZE; j++)
926		assertTrue(q.offer(new Integer(j)));
#	Line 889 | Line 928 | public class ArrayBlockingQueueTest exte
928		q.drainTo(l, i);
929		int k = (i < SIZE) ? i : SIZE;
930		assertEquals(k, l.size());
931	<	assertEquals(SIZE-k, q.size());
931	>	assertEquals(SIZE - k, q.size());
932		for (int j = 0; j < k; ++j)
933		assertEquals(l.get(j), new Integer(j));
934	<	while (q.poll() != null) ;
934	>	do {} while (q.poll() != null);
935		}
936		}
937
#	Line 901 | Line 940 | public class ArrayBlockingQueueTest exte
940		*/
941		public void testNeverContainsNull() {
942		Collection<?>[] qs = {
943	<	new ArrayBlockingQueue<Object>(10),
944	<	populatedQueue(2),
943	>	populatedQueue(0, 1, 10, false),
944	>	populatedQueue(2, 2, 10, true),
945		};
946
947		for (Collection<?> q : qs) {

Diff Legend

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