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.60 by jsr166, Wed Dec 31 20:17:39 2014 UTC vs.
Revision 1.86 by jsr166, Sun May 14 00:48:20 2017 UTC

#	Line 11 | Line 11 | import static java.util.concurrent.TimeU
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 19 | 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 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,
45	<	new Fair().testSuite(),
46	<	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 71 | 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 104 | 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 116 | 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;
123	<	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 144 | 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 159 | 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 185 | 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);
190	<	for (int i = 0; i < SIZE; ++i) {
191	<	assertTrue(q.add(new Integer(i)));
192	<	}
193	<	assertEquals(0, q.remainingCapacity());
194	<	q.add(new Integer(SIZE));
237	>	q.add((Integer) SIZE);
238		shouldThrow();
239		} catch (IllegalStateException success) {}
240		}
#	Line 200 | Line 243 | public class ArrayBlockingQueueTest exte
243		* addAll(this) throws IAE
244		*/
245		public void testAddAllSelf() {
246	+	ArrayBlockingQueue q = populatedQueue(SIZE);
247		try {
204	–	ArrayBlockingQueue q = populatedQueue(SIZE);
248		q.addAll(q);
249		shouldThrow();
250		} catch (IllegalArgumentException success) {}
#	Line 212 | 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 {
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);
263		q.addAll(Arrays.asList(ints));
264		shouldThrow();
265		} catch (NullPointerException success) {}
#	Line 225 | 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];
232	<	for (int i = 0; i < SIZE; ++i)
233	<	ints[i] = new Integer(i);
234	<	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 293 | 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 328 | 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 355 | 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 378 | 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) {
382	<	assertEquals(i, q.take());
383	<	}
428	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
429
430		Thread.currentThread().interrupt();
431		try {
#	Line 398 | 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 448 | Line 493 | public class ArrayBlockingQueueTest exte
493		*/
494		public void testInterruptedTimedPoll() throws InterruptedException {
495		final BlockingQueue<Integer> q = populatedQueue(SIZE);
496	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
496	>	final CountDownLatch pleaseInterrupt = 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) {
455	–	long t0 = System.nanoTime();
501		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
457	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
502		}
503	<	long t0 = System.nanoTime();
504	<	aboutToWait.countDown();
503	>
504	>	pleaseInterrupt.countDown();
505		try {
506	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
506	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
507		shouldThrow();
508	<	} catch (InterruptedException success) {
509	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
510	<	}
508	>	} catch (InterruptedException success) {}
509	>	assertFalse(Thread.interrupted());
510	>
511	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
512		}});
513
514	<	aboutToWait.await();
515	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
514	>	await(pleaseInterrupt);
515	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
516		t.interrupt();
517	<	awaitTermination(t, MEDIUM_DELAY_MS);
517	>	awaitTermination(t);
518		checkEmpty(q);
519		}
520
#	Line 520 | Line 565 | public class ArrayBlockingQueueTest exte
565		* contains(x) reports true when elements added but not yet removed
566		*/
567		public void testContains() {
568	<	ArrayBlockingQueue q = populatedQueue(SIZE);
569	<	for (int i = 0; i < SIZE; ++i) {
568	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
569	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
570	>	assertFalse(q.contains(null));
571	>	for (int i = 0; i < size; ++i) {
572		assertTrue(q.contains(new Integer(i)));
573		assertEquals(i, q.poll());
574		assertFalse(q.contains(new Integer(i)));
#	Line 532 | Line 579 | public class ArrayBlockingQueueTest exte
579		* clear removes all elements
580		*/
581		public void testClear() {
582	<	ArrayBlockingQueue q = populatedQueue(SIZE);
582	>	int size = ThreadLocalRandom.current().nextInt(1, 5);
583	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
584	>	int capacity = size + q.remainingCapacity();
585		q.clear();
586		assertTrue(q.isEmpty());
587		assertEquals(0, q.size());
588	<	assertEquals(SIZE, q.remainingCapacity());
588	>	assertEquals(capacity, q.remainingCapacity());
589		q.add(one);
590		assertFalse(q.isEmpty());
591		assertTrue(q.contains(one));
#	Line 572 | Line 621 | public class ArrayBlockingQueueTest exte
621		assertTrue(changed);
622
623		assertTrue(q.containsAll(p));
624	<	assertEquals(SIZE-i, q.size());
624	>	assertEquals(SIZE - i, q.size());
625		p.remove();
626		}
627		}
#	Line 585 | Line 634 | public class ArrayBlockingQueueTest exte
634		ArrayBlockingQueue q = populatedQueue(SIZE);
635		ArrayBlockingQueue p = populatedQueue(i);
636		assertTrue(q.removeAll(p));
637	<	assertEquals(SIZE-i, q.size());
637	>	assertEquals(SIZE - i, q.size());
638		for (int j = 0; j < i; ++j) {
639		Integer x = (Integer)(p.remove());
640		assertFalse(q.contains(x));
#	Line 593 | Line 642 | public class ArrayBlockingQueueTest exte
642		}
643		}
644
645	<	void checkToArray(ArrayBlockingQueue q) {
645	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
646		int size = q.size();
647	<	Object[] o = q.toArray();
648	<	assertEquals(size, o.length);
647	>	Object[] a1 = q.toArray();
648	>	assertEquals(size, a1.length);
649	>	Integer[] a2 = q.toArray(new Integer[0]);
650	>	assertEquals(size, a2.length);
651	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
652	>	assertEquals(size, a3.length);
653	>	Integer[] a4 = new Integer[size];
654	>	assertSame(a4, q.toArray(a4));
655	>	Integer[] a5 = new Integer[size + 1];
656	>	Arrays.fill(a5, 42);
657	>	assertSame(a5, q.toArray(a5));
658	>	Integer[] a6 = new Integer[size + 2];
659	>	Arrays.fill(a6, 42);
660	>	assertSame(a6, q.toArray(a6));
661	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
662	>	for (Object[] a : as) {
663	>	if (a.length > size) assertNull(a[size]);
664	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
665	>	}
666		Iterator it = q.iterator();
667	+	Integer s = q.peek();
668		for (int i = 0; i < size; i++) {
669		Integer x = (Integer) it.next();
670	<	assertEquals((Integer)o[0] + i, (int) x);
671	<	assertSame(o[i], x);
670	>	assertEquals(s + i, (int) x);
671	>	for (Object[] a : as)
672	>	assertSame(a1[i], x);
673		}
674		}
675
676		/**
677	<	* toArray() contains all elements in FIFO order
677	>	* toArray() and toArray(a) contain all elements in FIFO order
678		*/
679		public void testToArray() {
680	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
681	<	for (int i = 0; i < SIZE; i++) {
680	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
681	>	final int size = rnd.nextInt(6);
682	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
683	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
684	>	for (int i = 0; i < size; i++) {
685		checkToArray(q);
686		q.add(i);
687		}
688		// Provoke wraparound
689	<	for (int i = 0; i < SIZE; i++) {
690	<	checkToArray(q);
620	<	assertEquals(i, q.poll());
689	>	int added = size * 2;
690	>	for (int i = 0; i < added; i++) {
691		checkToArray(q);
692	<	q.add(SIZE+i);
692	>	assertEquals((Integer) i, q.poll());
693	>	q.add(size + i);
694		}
624	–	for (int i = 0; i < SIZE; i++) {
625	–	checkToArray(q);
626	–	assertEquals(SIZE+i, q.poll());
627	–	}
628	–	}
629	–
630	–	void checkToArray2(ArrayBlockingQueue q) {
631	–	int size = q.size();
632	–	Integer[] a1 = size == 0 ? null : new Integer[size-1];
633	–	Integer[] a2 = new Integer[size];
634	–	Integer[] a3 = new Integer[size+2];
635	–	if (size > 0) Arrays.fill(a1, 42);
636	–	Arrays.fill(a2, 42);
637	–	Arrays.fill(a3, 42);
638	–	Integer[] b1 = size == 0 ? null : (Integer[]) q.toArray(a1);
639	–	Integer[] b2 = (Integer[]) q.toArray(a2);
640	–	Integer[] b3 = (Integer[]) q.toArray(a3);
641	–	assertSame(a2, b2);
642	–	assertSame(a3, b3);
643	–	Iterator it = q.iterator();
695		for (int i = 0; i < size; i++) {
696	<	Integer x = (Integer) it.next();
697	<	assertSame(b1[i], x);
647	<	assertEquals(b1[0] + i, (int) x);
648	<	assertSame(b2[i], x);
649	<	assertSame(b3[i], x);
650	<	}
651	<	assertNull(a3[size]);
652	<	assertEquals(42, (int) a3[size+1]);
653	<	if (size > 0) {
654	<	assertNotSame(a1, b1);
655	<	assertEquals(size, b1.length);
656	<	for (int i = 0; i < a1.length; i++) {
657	<	assertEquals(42, (int) a1[i]);
658	<	}
659	<	}
660	<	}
661	<
662	<	/**
663	<	* toArray(a) contains all elements in FIFO order
664	<	*/
665	<	public void testToArray2() {
666	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
667	<	for (int i = 0; i < SIZE; i++) {
668	<	checkToArray2(q);
669	<	q.add(i);
670	<	}
671	<	// Provoke wraparound
672	<	for (int i = 0; i < SIZE; i++) {
673	<	checkToArray2(q);
674	<	assertEquals(i, q.poll());
675	<	checkToArray2(q);
676	<	q.add(SIZE+i);
677	<	}
678	<	for (int i = 0; i < SIZE; i++) {
679	<	checkToArray2(q);
680	<	assertEquals(SIZE+i, q.poll());
696	>	checkToArray(q);
697	>	assertEquals((Integer) (added + i), q.poll());
698		}
699		}
700
701		/**
702		* toArray(incompatible array type) throws ArrayStoreException
703		*/
704	<	public void testToArray1_BadArg() {
704	>	public void testToArray_incompatibleArrayType() {
705		ArrayBlockingQueue q = populatedQueue(SIZE);
706		try {
707		q.toArray(new String[10]);
708		shouldThrow();
709		} catch (ArrayStoreException success) {}
710	+	try {
711	+	q.toArray(new String[0]);
712	+	shouldThrow();
713	+	} catch (ArrayStoreException success) {}
714		}
715
716		/**
#	Line 698 | Line 719 | public class ArrayBlockingQueueTest exte
719		public void testIterator() throws InterruptedException {
720		ArrayBlockingQueue q = populatedQueue(SIZE);
721		Iterator it = q.iterator();
722	<	while (it.hasNext()) {
722	>	int i;
723	>	for (i = 0; it.hasNext(); i++)
724	>	assertTrue(q.contains(it.next()));
725	>	assertEquals(i, SIZE);
726	>	assertIteratorExhausted(it);
727	>
728	>	it = q.iterator();
729	>	for (i = 0; it.hasNext(); i++)
730		assertEquals(it.next(), q.take());
731	<	}
731	>	assertEquals(i, SIZE);
732	>	assertIteratorExhausted(it);
733	>	}
734	>
735	>	/**
736	>	* iterator of empty collection has no elements
737	>	*/
738	>	public void testEmptyIterator() {
739	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
740		}
741
742		/**
#	Line 773 | Line 809 | public class ArrayBlockingQueueTest exte
809		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
810		q.add(one);
811		q.add(two);
776	–	ExecutorService executor = Executors.newFixedThreadPool(2);
812		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
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	<	joinPool(executor);
813	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
814	>	try (PoolCleaner cleaner = cleaner(executor)) {
815	>	executor.execute(new CheckedRunnable() {
816	>	public void realRun() throws InterruptedException {
817	>	assertFalse(q.offer(three));
818	>	threadsStarted.await();
819	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
820	>	assertEquals(0, q.remainingCapacity());
821	>	}});
822	>
823	>	executor.execute(new CheckedRunnable() {
824	>	public void realRun() throws InterruptedException {
825	>	threadsStarted.await();
826	>	assertEquals(0, q.remainingCapacity());
827	>	assertSame(one, q.take());
828	>	}});
829	>	}
830		}
831
832		/**
#	Line 799 | Line 835 | public class ArrayBlockingQueueTest exte
835		public void testPollInExecutor() {
836		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
837		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
838	<	ExecutorService executor = Executors.newFixedThreadPool(2);
839	<	executor.execute(new CheckedRunnable() {
840	<	public void realRun() throws InterruptedException {
841	<	assertNull(q.poll());
842	<	threadsStarted.await();
843	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
844	<	checkEmpty(q);
845	<	}});
846	<
847	<	executor.execute(new CheckedRunnable() {
848	<	public void realRun() throws InterruptedException {
849	<	threadsStarted.await();
850	<	q.put(one);
851	<	}});
852	<
853	<	joinPool(executor);
838	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
839	>	try (PoolCleaner cleaner = cleaner(executor)) {
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		}
855
856		/**
#	Line 866 | Line 902 | public class ArrayBlockingQueueTest exte
902		final ArrayBlockingQueue q = populatedQueue(SIZE);
903		Thread t = new Thread(new CheckedRunnable() {
904		public void realRun() throws InterruptedException {
905	<	q.put(new Integer(SIZE+1));
905	>	q.put(new Integer(SIZE + 1));
906		}});
907
908		t.start();
#	Line 883 | Line 919 | public class ArrayBlockingQueueTest exte
919		* drainTo(c, n) empties first min(n, size) elements of queue into c
920		*/
921		public void testDrainToN() {
922	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
922	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
923		for (int i = 0; i < SIZE + 2; ++i) {
924		for (int j = 0; j < SIZE; j++)
925		assertTrue(q.offer(new Integer(j)));
#	Line 891 | Line 927 | public class ArrayBlockingQueueTest exte
927		q.drainTo(l, i);
928		int k = (i < SIZE) ? i : SIZE;
929		assertEquals(k, l.size());
930	<	assertEquals(SIZE-k, q.size());
930	>	assertEquals(SIZE - k, q.size());
931		for (int j = 0; j < k; ++j)
932		assertEquals(l.get(j), new Integer(j));
933		do {} while (q.poll() != null);
#	Line 903 | Line 939 | public class ArrayBlockingQueueTest exte
939		*/
940		public void testNeverContainsNull() {
941		Collection<?>[] qs = {
942	<	new ArrayBlockingQueue<Object>(10),
943	<	populatedQueue(2),
942	>	populatedQueue(0, 1, 10, false),
943	>	populatedQueue(2, 2, 10, true),
944		};
945
946		for (Collection<?> q : qs) {

Diff Legend

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