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.89 by jsr166, Sun May 14 04:02:06 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 313 | Line 362 | public class ArrayBlockingQueueTest exte
362		pleaseTake.countDown();
363		q.put(86);
364
365	+	Thread.currentThread().interrupt();
366	+	try {
367	+	q.put(99);
368	+	shouldThrow();
369	+	} catch (InterruptedException success) {}
370	+	assertFalse(Thread.interrupted());
371	+
372		pleaseInterrupt.countDown();
373		try {
374		q.put(99);
#	Line 326 | Line 382 | public class ArrayBlockingQueueTest exte
382		assertEquals(0, q.take());
383
384		await(pleaseInterrupt);
385	<	assertThreadStaysAlive(t);
385	>	assertThreadBlocks(t, Thread.State.WAITING);
386		t.interrupt();
387		awaitTermination(t);
388		assertEquals(0, q.remainingCapacity());
#	Line 350 | Line 406 | public class ArrayBlockingQueueTest exte
406		q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
407		shouldThrow();
408		} catch (InterruptedException success) {}
409	+	assertFalse(Thread.interrupted());
410		}});
411
412		await(pleaseInterrupt);
413	<	assertThreadStaysAlive(t);
413	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
414		t.interrupt();
415		awaitTermination(t);
416		}
#	Line 376 | Line 433 | public class ArrayBlockingQueueTest exte
433		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
434		Thread t = newStartedThread(new CheckedRunnable() {
435		public void realRun() throws InterruptedException {
436	<	for (int i = 0; i < SIZE; ++i) {
380	<	assertEquals(i, q.take());
381	<	}
436	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
437
438		Thread.currentThread().interrupt();
439		try {
#	Line 396 | Line 451 | public class ArrayBlockingQueueTest exte
451		}});
452
453		await(pleaseInterrupt);
454	<	assertThreadStaysAlive(t);
454	>	assertThreadBlocks(t, Thread.State.WAITING);
455		t.interrupt();
456		awaitTermination(t);
457		}
#	Line 446 | Line 501 | public class ArrayBlockingQueueTest exte
501		*/
502		public void testInterruptedTimedPoll() throws InterruptedException {
503		final BlockingQueue<Integer> q = populatedQueue(SIZE);
504	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
504	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
505		Thread t = newStartedThread(new CheckedRunnable() {
506		public void realRun() throws InterruptedException {
507	<	for (int i = 0; i < SIZE; ++i) {
508	<	long t0 = System.nanoTime();
507	>	long startTime = System.nanoTime();
508	>	for (int i = 0; i < SIZE; i++)
509		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
510	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
511	<	}
457	<	long t0 = System.nanoTime();
458	<	aboutToWait.countDown();
510	>
511	>	Thread.currentThread().interrupt();
512		try {
513	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
513	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
514		shouldThrow();
515	<	} catch (InterruptedException success) {
516	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
517	<	}
515	>	} catch (InterruptedException success) {}
516	>	assertFalse(Thread.interrupted());
517	>
518	>	pleaseInterrupt.countDown();
519	>	try {
520	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
521	>	shouldThrow();
522	>	} catch (InterruptedException success) {}
523	>	assertFalse(Thread.interrupted());
524	>
525	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
526		}});
527
528	<	aboutToWait.await();
529	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
528	>	await(pleaseInterrupt);
529	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
530		t.interrupt();
531	<	awaitTermination(t, MEDIUM_DELAY_MS);
531	>	awaitTermination(t);
532		checkEmpty(q);
533		}
534
#	Line 518 | Line 579 | public class ArrayBlockingQueueTest exte
579		* contains(x) reports true when elements added but not yet removed
580		*/
581		public void testContains() {
582	<	ArrayBlockingQueue q = populatedQueue(SIZE);
583	<	for (int i = 0; i < SIZE; ++i) {
582	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
583	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
584	>	assertFalse(q.contains(null));
585	>	for (int i = 0; i < size; ++i) {
586		assertTrue(q.contains(new Integer(i)));
587		assertEquals(i, q.poll());
588		assertFalse(q.contains(new Integer(i)));
#	Line 530 | Line 593 | public class ArrayBlockingQueueTest exte
593		* clear removes all elements
594		*/
595		public void testClear() {
596	<	ArrayBlockingQueue q = populatedQueue(SIZE);
596	>	int size = ThreadLocalRandom.current().nextInt(1, 5);
597	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
598	>	int capacity = size + q.remainingCapacity();
599		q.clear();
600		assertTrue(q.isEmpty());
601		assertEquals(0, q.size());
602	<	assertEquals(SIZE, q.remainingCapacity());
602	>	assertEquals(capacity, q.remainingCapacity());
603		q.add(one);
604		assertFalse(q.isEmpty());
605		assertTrue(q.contains(one));
#	Line 570 | Line 635 | public class ArrayBlockingQueueTest exte
635		assertTrue(changed);
636
637		assertTrue(q.containsAll(p));
638	<	assertEquals(SIZE-i, q.size());
638	>	assertEquals(SIZE - i, q.size());
639		p.remove();
640		}
641		}
#	Line 583 | Line 648 | public class ArrayBlockingQueueTest exte
648		ArrayBlockingQueue q = populatedQueue(SIZE);
649		ArrayBlockingQueue p = populatedQueue(i);
650		assertTrue(q.removeAll(p));
651	<	assertEquals(SIZE-i, q.size());
651	>	assertEquals(SIZE - i, q.size());
652		for (int j = 0; j < i; ++j) {
653	<	Integer I = (Integer)(p.remove());
654	<	assertFalse(q.contains(I));
653	>	Integer x = (Integer)(p.remove());
654	>	assertFalse(q.contains(x));
655		}
656		}
657		}
658
659	<	void checkToArray(ArrayBlockingQueue q) {
659	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
660		int size = q.size();
661	<	Object[] o = q.toArray();
662	<	assertEquals(size, o.length);
661	>	Object[] a1 = q.toArray();
662	>	assertEquals(size, a1.length);
663	>	Integer[] a2 = q.toArray(new Integer[0]);
664	>	assertEquals(size, a2.length);
665	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
666	>	assertEquals(size, a3.length);
667	>	Integer[] a4 = new Integer[size];
668	>	assertSame(a4, q.toArray(a4));
669	>	Integer[] a5 = new Integer[size + 1];
670	>	Arrays.fill(a5, 42);
671	>	assertSame(a5, q.toArray(a5));
672	>	Integer[] a6 = new Integer[size + 2];
673	>	Arrays.fill(a6, 42);
674	>	assertSame(a6, q.toArray(a6));
675	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
676	>	for (Object[] a : as) {
677	>	if (a.length > size) assertNull(a[size]);
678	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
679	>	}
680		Iterator it = q.iterator();
681	+	Integer s = q.peek();
682		for (int i = 0; i < size; i++) {
683		Integer x = (Integer) it.next();
684	<	assertEquals((Integer)o[0] + i, (int) x);
685	<	assertSame(o[i], x);
684	>	assertEquals(s + i, (int) x);
685	>	for (Object[] a : as)
686	>	assertSame(a1[i], x);
687		}
688		}
689
690		/**
691	<	* toArray() contains all elements in FIFO order
691	>	* toArray() and toArray(a) contain all elements in FIFO order
692		*/
693		public void testToArray() {
694	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
695	<	for (int i = 0; i < SIZE; i++) {
694	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
695	>	final int size = rnd.nextInt(6);
696	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
697	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
698	>	for (int i = 0; i < size; i++) {
699		checkToArray(q);
700		q.add(i);
701		}
702		// Provoke wraparound
703	<	for (int i = 0; i < SIZE; i++) {
703	>	int added = size * 2;
704	>	for (int i = 0; i < added; i++) {
705		checkToArray(q);
706	<	assertEquals(i, q.poll());
707	<	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());
706	>	assertEquals((Integer) i, q.poll());
707	>	q.add(size + i);
708		}
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();
709		for (int i = 0; i < size; i++) {
710	<	Integer x = (Integer) it.next();
711	<	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());
710	>	checkToArray(q);
711	>	assertEquals((Integer) (added + i), q.poll());
712		}
713		}
714
715		/**
716		* toArray(incompatible array type) throws ArrayStoreException
717		*/
718	<	public void testToArray1_BadArg() {
718	>	public void testToArray_incompatibleArrayType() {
719		ArrayBlockingQueue q = populatedQueue(SIZE);
720		try {
721		q.toArray(new String[10]);
722		shouldThrow();
723		} catch (ArrayStoreException success) {}
724	+	try {
725	+	q.toArray(new String[0]);
726	+	shouldThrow();
727	+	} catch (ArrayStoreException success) {}
728		}
729
730		/**
#	Line 696 | Line 733 | public class ArrayBlockingQueueTest exte
733		public void testIterator() throws InterruptedException {
734		ArrayBlockingQueue q = populatedQueue(SIZE);
735		Iterator it = q.iterator();
736	<	while (it.hasNext()) {
736	>	int i;
737	>	for (i = 0; it.hasNext(); i++)
738	>	assertTrue(q.contains(it.next()));
739	>	assertEquals(i, SIZE);
740	>	assertIteratorExhausted(it);
741	>
742	>	it = q.iterator();
743	>	for (i = 0; it.hasNext(); i++)
744		assertEquals(it.next(), q.take());
745	<	}
745	>	assertEquals(i, SIZE);
746	>	assertIteratorExhausted(it);
747	>	}
748	>
749	>	/**
750	>	* iterator of empty collection has no elements
751	>	*/
752	>	public void testEmptyIterator() {
753	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
754		}
755
756		/**
#	Line 771 | Line 823 | public class ArrayBlockingQueueTest exte
823		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
824		q.add(one);
825		q.add(two);
774	–	ExecutorService executor = Executors.newFixedThreadPool(2);
826		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
827	<	executor.execute(new CheckedRunnable() {
828	<	public void realRun() throws InterruptedException {
829	<	assertFalse(q.offer(three));
830	<	threadsStarted.await();
831	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
832	<	assertEquals(0, q.remainingCapacity());
833	<	}});
834	<
835	<	executor.execute(new CheckedRunnable() {
836	<	public void realRun() throws InterruptedException {
837	<	threadsStarted.await();
838	<	assertEquals(0, q.remainingCapacity());
839	<	assertSame(one, q.take());
840	<	}});
841	<
842	<	joinPool(executor);
827	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
828	>	try (PoolCleaner cleaner = cleaner(executor)) {
829	>	executor.execute(new CheckedRunnable() {
830	>	public void realRun() throws InterruptedException {
831	>	assertFalse(q.offer(three));
832	>	threadsStarted.await();
833	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
834	>	assertEquals(0, q.remainingCapacity());
835	>	}});
836	>
837	>	executor.execute(new CheckedRunnable() {
838	>	public void realRun() throws InterruptedException {
839	>	threadsStarted.await();
840	>	assertEquals(0, q.remainingCapacity());
841	>	assertSame(one, q.take());
842	>	}});
843	>	}
844		}
845
846		/**
#	Line 797 | Line 849 | public class ArrayBlockingQueueTest exte
849		public void testPollInExecutor() {
850		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
851		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
852	<	ExecutorService executor = Executors.newFixedThreadPool(2);
853	<	executor.execute(new CheckedRunnable() {
854	<	public void realRun() throws InterruptedException {
855	<	assertNull(q.poll());
856	<	threadsStarted.await();
857	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
858	<	checkEmpty(q);
859	<	}});
860	<
861	<	executor.execute(new CheckedRunnable() {
862	<	public void realRun() throws InterruptedException {
863	<	threadsStarted.await();
864	<	q.put(one);
865	<	}});
866	<
867	<	joinPool(executor);
852	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
853	>	try (PoolCleaner cleaner = cleaner(executor)) {
854	>	executor.execute(new CheckedRunnable() {
855	>	public void realRun() throws InterruptedException {
856	>	assertNull(q.poll());
857	>	threadsStarted.await();
858	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
859	>	checkEmpty(q);
860	>	}});
861	>
862	>	executor.execute(new CheckedRunnable() {
863	>	public void realRun() throws InterruptedException {
864	>	threadsStarted.await();
865	>	q.put(one);
866	>	}});
867	>	}
868		}
869
870		/**
#	Line 864 | Line 916 | public class ArrayBlockingQueueTest exte
916		final ArrayBlockingQueue q = populatedQueue(SIZE);
917		Thread t = new Thread(new CheckedRunnable() {
918		public void realRun() throws InterruptedException {
919	<	q.put(new Integer(SIZE+1));
919	>	q.put(new Integer(SIZE + 1));
920		}});
921
922		t.start();
#	Line 881 | Line 933 | public class ArrayBlockingQueueTest exte
933		* drainTo(c, n) empties first min(n, size) elements of queue into c
934		*/
935		public void testDrainToN() {
936	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
936	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
937		for (int i = 0; i < SIZE + 2; ++i) {
938		for (int j = 0; j < SIZE; j++)
939		assertTrue(q.offer(new Integer(j)));
#	Line 889 | Line 941 | public class ArrayBlockingQueueTest exte
941		q.drainTo(l, i);
942		int k = (i < SIZE) ? i : SIZE;
943		assertEquals(k, l.size());
944	<	assertEquals(SIZE-k, q.size());
944	>	assertEquals(SIZE - k, q.size());
945		for (int j = 0; j < k; ++j)
946		assertEquals(l.get(j), new Integer(j));
947	<	while (q.poll() != null) ;
947	>	do {} while (q.poll() != null);
948		}
949		}
950
#	Line 901 | Line 953 | public class ArrayBlockingQueueTest exte
953		*/
954		public void testNeverContainsNull() {
955		Collection<?>[] qs = {
956	<	new ArrayBlockingQueue<Object>(10),
957	<	populatedQueue(2),
956	>	populatedQueue(0, 1, 10, false),
957	>	populatedQueue(2, 2, 10, true),
958		};
959
960		for (Collection<?> q : qs) {

Diff Legend

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