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.48 by jsr166, Mon May 30 22:43:20 2011 UTC vs.
Revision 1.93 by jsr166, Sun Aug 11 22:29:26 2019 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;
18		import java.util.concurrent.ArrayBlockingQueue;
19		import java.util.concurrent.BlockingQueue;
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;
24	<	import java.io.*;
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(20, 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(20, 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	<	* Create a queue of given size containing consecutive
74	<	* Integers 0 ... n.
73	>	* Returns a new queue of given size containing consecutive
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 67 | Line 103 | public class ArrayBlockingQueueTest exte
103		}
104
105		/**
106	<	* Constructor throws IAE if capacity argument nonpositive
106	>	* Constructor throws IllegalArgumentException 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		}
157
158		/**
159	<	* Initializing from too large collection throws IAE
159	>	* Initializing from too large collection throws IllegalArgumentException
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 180 | Line 227 | public class ArrayBlockingQueueTest exte
227		}
228
229		/**
230	<	* add succeeds if not full; throws ISE if full
230	>	* add succeeds if not full; throws IllegalStateException 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		}
241
242		/**
243	<	* addAll(this) throws IAE
243	>	* addAll(this) throws IllegalArgumentException
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) {}
266		}
267
268		/**
269	<	* addAll throws ISE if not enough room
269	>	* addAll throws IllegalStateException 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	>	if (randomBoolean()) 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 322 | Line 378 | public class ArrayBlockingQueueTest exte
378		}});
379
380		await(pleaseTake);
381	<	assertEquals(q.remainingCapacity(), 0);
381	>	assertEquals(0, q.remainingCapacity());
382		assertEquals(0, q.take());
383
384		await(pleaseInterrupt);
385	<	assertThreadStaysAlive(t);
385	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
386		t.interrupt();
387		awaitTermination(t);
388	<	assertEquals(q.remainingCapacity(), 0);
388	>	assertEquals(0, q.remainingCapacity());
389		}
390
391		/**
392		* timed offer times out if full and elements not taken
393		*/
394	<	public void testTimedOffer() throws InterruptedException {
394	>	public void testTimedOffer() {
395		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
396		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
397		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 345 | Line 401 | public class ArrayBlockingQueueTest exte
401		long startTime = System.nanoTime();
402		assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
403		assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
404	+
405	+	Thread.currentThread().interrupt();
406	+	try {
407	+	q.offer(new Object(), randomTimeout(), randomTimeUnit());
408	+	shouldThrow();
409	+	} catch (InterruptedException success) {}
410	+	assertFalse(Thread.interrupted());
411	+
412		pleaseInterrupt.countDown();
413		try {
414	<	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
414	>	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
415		shouldThrow();
416		} catch (InterruptedException success) {}
417	+	assertFalse(Thread.interrupted());
418	+
419	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
420		}});
421
422		await(pleaseInterrupt);
423	<	assertThreadStaysAlive(t);
423	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
424		t.interrupt();
425		awaitTermination(t);
426		}
#	Line 376 | Line 443 | public class ArrayBlockingQueueTest exte
443		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
444		Thread t = newStartedThread(new CheckedRunnable() {
445		public void realRun() throws InterruptedException {
446	<	for (int i = 0; i < SIZE; ++i) {
380	<	assertEquals(i, q.take());
381	<	}
446	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
447
448		Thread.currentThread().interrupt();
449		try {
#	Line 396 | Line 461 | public class ArrayBlockingQueueTest exte
461		}});
462
463		await(pleaseInterrupt);
464	<	assertThreadStaysAlive(t);
464	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
465		t.interrupt();
466		awaitTermination(t);
467		}
#	Line 446 | Line 511 | public class ArrayBlockingQueueTest exte
511		*/
512		public void testInterruptedTimedPoll() throws InterruptedException {
513		final BlockingQueue<Integer> q = populatedQueue(SIZE);
514	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
514	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
515		Thread t = newStartedThread(new CheckedRunnable() {
516		public void realRun() throws InterruptedException {
517	<	for (int i = 0; i < SIZE; ++i) {
518	<	long t0 = System.nanoTime();
517	>	long startTime = System.nanoTime();
518	>	for (int i = 0; i < SIZE; i++)
519		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
520	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
521	<	}
522	<	long t0 = System.nanoTime();
523	<	aboutToWait.countDown();
524	<	try {
525	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
526	<	shouldThrow();
527	<	} catch (InterruptedException success) {
528	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
529	<	}
520	>
521	>	Thread.currentThread().interrupt();
522	>	try {
523	>	q.poll(randomTimeout(), randomTimeUnit());
524	>	shouldThrow();
525	>	} catch (InterruptedException success) {}
526	>	assertFalse(Thread.interrupted());
527	>
528	>	pleaseInterrupt.countDown();
529	>	try {
530	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
531	>	shouldThrow();
532	>	} catch (InterruptedException success) {}
533	>	assertFalse(Thread.interrupted());
534	>
535	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
536		}});
537
538	<	aboutToWait.await();
539	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
538	>	await(pleaseInterrupt);
539	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
540		t.interrupt();
541	<	awaitTermination(t, MEDIUM_DELAY_MS);
541	>	awaitTermination(t);
542		checkEmpty(q);
543		}
544
#	Line 515 | Line 586 | public class ArrayBlockingQueueTest exte
586		}
587
588		/**
518	–	* remove(x) removes x and returns true if present
519	–	*/
520	–	public void testRemoveElement() {
521	–	ArrayBlockingQueue q = populatedQueue(SIZE);
522	–	for (int i = 1; i < SIZE; i+=2) {
523	–	assertTrue(q.remove(new Integer(i)));
524	–	}
525	–	for (int i = 0; i < SIZE; i+=2) {
526	–	assertTrue(q.remove(new Integer(i)));
527	–	assertFalse(q.remove(new Integer(i+1)));
528	–	}
529	–	assertTrue(q.isEmpty());
530	–	}
531	–
532	–	/**
589		* contains(x) reports true when elements added but not yet removed
590		*/
591		public void testContains() {
592	<	ArrayBlockingQueue q = populatedQueue(SIZE);
593	<	for (int i = 0; i < SIZE; ++i) {
592	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
593	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
594	>	assertFalse(q.contains(null));
595	>	for (int i = 0; i < size; ++i) {
596		assertTrue(q.contains(new Integer(i)));
597		assertEquals(i, q.poll());
598		assertFalse(q.contains(new Integer(i)));
#	Line 545 | Line 603 | public class ArrayBlockingQueueTest exte
603		* clear removes all elements
604		*/
605		public void testClear() {
606	<	ArrayBlockingQueue q = populatedQueue(SIZE);
606	>	int size = ThreadLocalRandom.current().nextInt(1, 5);
607	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
608	>	int capacity = size + q.remainingCapacity();
609		q.clear();
610		assertTrue(q.isEmpty());
611		assertEquals(0, q.size());
612	<	assertEquals(SIZE, q.remainingCapacity());
612	>	assertEquals(capacity, q.remainingCapacity());
613		q.add(one);
614		assertFalse(q.isEmpty());
615		assertTrue(q.contains(one));
#	Line 585 | Line 645 | public class ArrayBlockingQueueTest exte
645		assertTrue(changed);
646
647		assertTrue(q.containsAll(p));
648	<	assertEquals(SIZE-i, q.size());
648	>	assertEquals(SIZE - i, q.size());
649		p.remove();
650		}
651		}
#	Line 598 | Line 658 | public class ArrayBlockingQueueTest exte
658		ArrayBlockingQueue q = populatedQueue(SIZE);
659		ArrayBlockingQueue p = populatedQueue(i);
660		assertTrue(q.removeAll(p));
661	<	assertEquals(SIZE-i, q.size());
661	>	assertEquals(SIZE - i, q.size());
662		for (int j = 0; j < i; ++j) {
663	<	Integer I = (Integer)(p.remove());
664	<	assertFalse(q.contains(I));
663	>	Integer x = (Integer)(p.remove());
664	>	assertFalse(q.contains(x));
665		}
666		}
667		}
668
669	<	/**
670	<	* toArray contains all elements in FIFO order
671	<	*/
672	<	public void testToArray() {
673	<	ArrayBlockingQueue q = populatedQueue(SIZE);
674	<	Object[] o = q.toArray();
675	<	for (int i = 0; i < o.length; i++)
676	<	assertSame(o[i], q.poll());
669	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
670	>	int size = q.size();
671	>	Object[] a1 = q.toArray();
672	>	assertEquals(size, a1.length);
673	>	Integer[] a2 = q.toArray(new Integer[0]);
674	>	assertEquals(size, a2.length);
675	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
676	>	assertEquals(size, a3.length);
677	>	Integer[] a4 = new Integer[size];
678	>	assertSame(a4, q.toArray(a4));
679	>	Integer[] a5 = new Integer[size + 1];
680	>	Arrays.fill(a5, 42);
681	>	assertSame(a5, q.toArray(a5));
682	>	Integer[] a6 = new Integer[size + 2];
683	>	Arrays.fill(a6, 42);
684	>	assertSame(a6, q.toArray(a6));
685	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
686	>	for (Object[] a : as) {
687	>	if (a.length > size) assertNull(a[size]);
688	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
689	>	}
690	>	Iterator it = q.iterator();
691	>	Integer s = q.peek();
692	>	for (int i = 0; i < size; i++) {
693	>	Integer x = (Integer) it.next();
694	>	assertEquals(s + i, (int) x);
695	>	for (Object[] a : as)
696	>	assertSame(a1[i], x);
697	>	}
698		}
699
700		/**
701	<	* toArray(a) contains all elements in FIFO order
701	>	* toArray() and toArray(a) contain all elements in FIFO order
702		*/
703	<	public void testToArray2() {
704	<	ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
705	<	Integer[] ints = new Integer[SIZE];
706	<	Integer[] array = q.toArray(ints);
707	<	assertSame(ints, array);
708	<	for (int i = 0; i < ints.length; i++)
709	<	assertSame(ints[i], q.poll());
703	>	public void testToArray() {
704	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
705	>	final int size = rnd.nextInt(6);
706	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
707	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
708	>	for (int i = 0; i < size; i++) {
709	>	checkToArray(q);
710	>	q.add(i);
711	>	}
712	>	// Provoke wraparound
713	>	int added = size * 2;
714	>	for (int i = 0; i < added; i++) {
715	>	checkToArray(q);
716	>	assertEquals((Integer) i, q.poll());
717	>	q.add(size + i);
718	>	}
719	>	for (int i = 0; i < size; i++) {
720	>	checkToArray(q);
721	>	assertEquals((Integer) (added + i), q.poll());
722	>	}
723		}
724
725		/**
726		* toArray(incompatible array type) throws ArrayStoreException
727		*/
728	<	public void testToArray1_BadArg() {
728	>	public void testToArray_incompatibleArrayType() {
729		ArrayBlockingQueue q = populatedQueue(SIZE);
730		try {
731		q.toArray(new String[10]);
732		shouldThrow();
733		} catch (ArrayStoreException success) {}
734	+	try {
735	+	q.toArray(new String[0]);
736	+	shouldThrow();
737	+	} catch (ArrayStoreException success) {}
738		}
739
740		/**
#	Line 645 | Line 743 | public class ArrayBlockingQueueTest exte
743		public void testIterator() throws InterruptedException {
744		ArrayBlockingQueue q = populatedQueue(SIZE);
745		Iterator it = q.iterator();
746	<	while (it.hasNext()) {
746	>	int i;
747	>	for (i = 0; it.hasNext(); i++)
748	>	assertTrue(q.contains(it.next()));
749	>	assertEquals(i, SIZE);
750	>	assertIteratorExhausted(it);
751	>
752	>	it = q.iterator();
753	>	for (i = 0; it.hasNext(); i++)
754		assertEquals(it.next(), q.take());
755	<	}
755	>	assertEquals(i, SIZE);
756	>	assertIteratorExhausted(it);
757	>	}
758	>
759	>	/**
760	>	* iterator of empty collection has no elements
761	>	*/
762	>	public void testEmptyIterator() {
763	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
764		}
765
766		/**
#	Line 720 | Line 833 | public class ArrayBlockingQueueTest exte
833		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
834		q.add(one);
835		q.add(two);
723	–	ExecutorService executor = Executors.newFixedThreadPool(2);
836		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
837	<	executor.execute(new CheckedRunnable() {
838	<	public void realRun() throws InterruptedException {
839	<	assertFalse(q.offer(three));
840	<	threadsStarted.await();
841	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
842	<	assertEquals(0, q.remainingCapacity());
843	<	}});
844	<
845	<	executor.execute(new CheckedRunnable() {
846	<	public void realRun() throws InterruptedException {
847	<	threadsStarted.await();
848	<	assertEquals(0, q.remainingCapacity());
849	<	assertSame(one, q.take());
850	<	}});
851	<
852	<	joinPool(executor);
837	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
838	>	try (PoolCleaner cleaner = cleaner(executor)) {
839	>	executor.execute(new CheckedRunnable() {
840	>	public void realRun() throws InterruptedException {
841	>	assertFalse(q.offer(three));
842	>	threadsStarted.await();
843	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
844	>	assertEquals(0, q.remainingCapacity());
845	>	}});
846	>
847	>	executor.execute(new CheckedRunnable() {
848	>	public void realRun() throws InterruptedException {
849	>	threadsStarted.await();
850	>	assertEquals(0, q.remainingCapacity());
851	>	assertSame(one, q.take());
852	>	}});
853	>	}
854		}
855
856		/**
#	Line 746 | Line 859 | public class ArrayBlockingQueueTest exte
859		public void testPollInExecutor() {
860		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
861		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
862	<	ExecutorService executor = Executors.newFixedThreadPool(2);
863	<	executor.execute(new CheckedRunnable() {
864	<	public void realRun() throws InterruptedException {
865	<	assertNull(q.poll());
866	<	threadsStarted.await();
867	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
868	<	checkEmpty(q);
869	<	}});
870	<
871	<	executor.execute(new CheckedRunnable() {
872	<	public void realRun() throws InterruptedException {
873	<	threadsStarted.await();
874	<	q.put(one);
875	<	}});
876	<
877	<	joinPool(executor);
862	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
863	>	try (PoolCleaner cleaner = cleaner(executor)) {
864	>	executor.execute(new CheckedRunnable() {
865	>	public void realRun() throws InterruptedException {
866	>	assertNull(q.poll());
867	>	threadsStarted.await();
868	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
869	>	checkEmpty(q);
870	>	}});
871	>
872	>	executor.execute(new CheckedRunnable() {
873	>	public void realRun() throws InterruptedException {
874	>	threadsStarted.await();
875	>	q.put(one);
876	>	}});
877	>	}
878		}
879
880		/**
881	<	* A deserialized serialized queue has same elements in same order
881	>	* A deserialized/reserialized queue has same elements in same order
882		*/
883		public void testSerialization() throws Exception {
884	<	ArrayBlockingQueue q = populatedQueue(SIZE);
884	>	Queue x = populatedQueue(SIZE);
885	>	Queue y = serialClone(x);
886
887	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
888	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
889	<	out.writeObject(q);
890	<	out.close();
891	<
892	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
893	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
894	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
895	<	assertEquals(q.size(), r.size());
782	<	while (!q.isEmpty())
783	<	assertEquals(q.remove(), r.remove());
887	>	assertNotSame(x, y);
888	>	assertEquals(x.size(), y.size());
889	>	assertEquals(x.toString(), y.toString());
890	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
891	>	while (!x.isEmpty()) {
892	>	assertFalse(y.isEmpty());
893	>	assertEquals(x.remove(), y.remove());
894	>	}
895	>	assertTrue(y.isEmpty());
896		}
897
898		/**
#	Line 790 | Line 902 | public class ArrayBlockingQueueTest exte
902		ArrayBlockingQueue q = populatedQueue(SIZE);
903		ArrayList l = new ArrayList();
904		q.drainTo(l);
905	<	assertEquals(q.size(), 0);
906	<	assertEquals(l.size(), SIZE);
905	>	assertEquals(0, q.size());
906	>	assertEquals(SIZE, l.size());
907		for (int i = 0; i < SIZE; ++i)
908		assertEquals(l.get(i), new Integer(i));
909		q.add(zero);
#	Line 801 | Line 913 | public class ArrayBlockingQueueTest exte
913		assertTrue(q.contains(one));
914		l.clear();
915		q.drainTo(l);
916	<	assertEquals(q.size(), 0);
917	<	assertEquals(l.size(), 2);
916	>	assertEquals(0, q.size());
917	>	assertEquals(2, l.size());
918		for (int i = 0; i < 2; ++i)
919		assertEquals(l.get(i), new Integer(i));
920		}
#	Line 814 | Line 926 | public class ArrayBlockingQueueTest exte
926		final ArrayBlockingQueue q = populatedQueue(SIZE);
927		Thread t = new Thread(new CheckedRunnable() {
928		public void realRun() throws InterruptedException {
929	<	q.put(new Integer(SIZE+1));
929	>	q.put(new Integer(SIZE + 1));
930		}});
931
932		t.start();
#	Line 831 | Line 943 | public class ArrayBlockingQueueTest exte
943		* drainTo(c, n) empties first min(n, size) elements of queue into c
944		*/
945		public void testDrainToN() {
946	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
946	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
947		for (int i = 0; i < SIZE + 2; ++i) {
948		for (int j = 0; j < SIZE; j++)
949		assertTrue(q.offer(new Integer(j)));
950		ArrayList l = new ArrayList();
951		q.drainTo(l, i);
952		int k = (i < SIZE) ? i : SIZE;
953	<	assertEquals(l.size(), k);
954	<	assertEquals(q.size(), SIZE-k);
953	>	assertEquals(k, l.size());
954	>	assertEquals(SIZE - k, q.size());
955		for (int j = 0; j < k; ++j)
956		assertEquals(l.get(j), new Integer(j));
957	<	while (q.poll() != null) ;
957	>	do {} while (q.poll() != null);
958		}
959		}
960
961	+	/**
962	+	* remove(null), contains(null) always return false
963	+	*/
964	+	public void testNeverContainsNull() {
965	+	Collection<?>[] qs = {
966	+	populatedQueue(0, 1, 10, false),
967	+	populatedQueue(2, 2, 10, true),
968	+	};
969	+
970	+	for (Collection<?> q : qs) {
971	+	assertFalse(q.contains(null));
972	+	assertFalse(q.remove(null));
973	+	}
974	+	}
975		}

Diff Legend

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