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.53 by jsr166, Tue Feb 21 01:54:03 2012 UTC vs.
Revision 1.90 by jsr166, Sun May 14 04:14:09 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	<	* Creates 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 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 335 | Line 391 | public class ArrayBlockingQueueTest exte
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(), 2 * LONG_DELAY_MS, MILLISECONDS);
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);
415		shouldThrow();
416		} catch (InterruptedException success) {}
417	+	assertFalse(Thread.interrupted());
418		}});
419
420		await(pleaseInterrupt);
421	<	assertThreadStaysAlive(t);
421	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
422		t.interrupt();
423		awaitTermination(t);
424		}
#	Line 376 | Line 441 | public class ArrayBlockingQueueTest exte
441		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
442		Thread t = newStartedThread(new CheckedRunnable() {
443		public void realRun() throws InterruptedException {
444	<	for (int i = 0; i < SIZE; ++i) {
380	<	assertEquals(i, q.take());
381	<	}
444	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
445
446		Thread.currentThread().interrupt();
447		try {
#	Line 396 | Line 459 | public class ArrayBlockingQueueTest exte
459		}});
460
461		await(pleaseInterrupt);
462	<	assertThreadStaysAlive(t);
462	>	assertThreadBlocks(t, Thread.State.WAITING);
463		t.interrupt();
464		awaitTermination(t);
465		}
#	Line 446 | Line 509 | public class ArrayBlockingQueueTest exte
509		*/
510		public void testInterruptedTimedPoll() throws InterruptedException {
511		final BlockingQueue<Integer> q = populatedQueue(SIZE);
512	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
512	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
513		Thread t = newStartedThread(new CheckedRunnable() {
514		public void realRun() throws InterruptedException {
515	<	for (int i = 0; i < SIZE; ++i) {
516	<	long t0 = System.nanoTime();
515	>	long startTime = System.nanoTime();
516	>	for (int i = 0; i < SIZE; i++)
517		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
518	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
519	<	}
520	<	long t0 = System.nanoTime();
521	<	aboutToWait.countDown();
522	<	try {
523	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
524	<	shouldThrow();
525	<	} catch (InterruptedException success) {
526	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
527	<	}
518	>
519	>	Thread.currentThread().interrupt();
520	>	try {
521	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
522	>	shouldThrow();
523	>	} catch (InterruptedException success) {}
524	>	assertFalse(Thread.interrupted());
525	>
526	>	pleaseInterrupt.countDown();
527	>	try {
528	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
529	>	shouldThrow();
530	>	} catch (InterruptedException success) {}
531	>	assertFalse(Thread.interrupted());
532	>
533	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
534		}});
535
536	<	aboutToWait.await();
537	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
536	>	await(pleaseInterrupt);
537	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
538		t.interrupt();
539	<	awaitTermination(t, MEDIUM_DELAY_MS);
539	>	awaitTermination(t);
540		checkEmpty(q);
541		}
542
#	Line 518 | Line 587 | public class ArrayBlockingQueueTest exte
587		* contains(x) reports true when elements added but not yet removed
588		*/
589		public void testContains() {
590	<	ArrayBlockingQueue q = populatedQueue(SIZE);
591	<	for (int i = 0; i < SIZE; ++i) {
590	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
591	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
592	>	assertFalse(q.contains(null));
593	>	for (int i = 0; i < size; ++i) {
594		assertTrue(q.contains(new Integer(i)));
595		assertEquals(i, q.poll());
596		assertFalse(q.contains(new Integer(i)));
#	Line 530 | Line 601 | public class ArrayBlockingQueueTest exte
601		* clear removes all elements
602		*/
603		public void testClear() {
604	<	ArrayBlockingQueue q = populatedQueue(SIZE);
604	>	int size = ThreadLocalRandom.current().nextInt(1, 5);
605	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
606	>	int capacity = size + q.remainingCapacity();
607		q.clear();
608		assertTrue(q.isEmpty());
609		assertEquals(0, q.size());
610	<	assertEquals(SIZE, q.remainingCapacity());
610	>	assertEquals(capacity, q.remainingCapacity());
611		q.add(one);
612		assertFalse(q.isEmpty());
613		assertTrue(q.contains(one));
#	Line 570 | Line 643 | public class ArrayBlockingQueueTest exte
643		assertTrue(changed);
644
645		assertTrue(q.containsAll(p));
646	<	assertEquals(SIZE-i, q.size());
646	>	assertEquals(SIZE - i, q.size());
647		p.remove();
648		}
649		}
#	Line 583 | Line 656 | public class ArrayBlockingQueueTest exte
656		ArrayBlockingQueue q = populatedQueue(SIZE);
657		ArrayBlockingQueue p = populatedQueue(i);
658		assertTrue(q.removeAll(p));
659	<	assertEquals(SIZE-i, q.size());
659	>	assertEquals(SIZE - i, q.size());
660		for (int j = 0; j < i; ++j) {
661	<	Integer I = (Integer)(p.remove());
662	<	assertFalse(q.contains(I));
661	>	Integer x = (Integer)(p.remove());
662	>	assertFalse(q.contains(x));
663		}
664		}
665		}
666
667	<	/**
668	<	* toArray contains all elements in FIFO order
669	<	*/
670	<	public void testToArray() {
671	<	ArrayBlockingQueue q = populatedQueue(SIZE);
672	<	Object[] o = q.toArray();
673	<	for (int i = 0; i < o.length; i++)
674	<	assertSame(o[i], q.poll());
667	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
668	>	int size = q.size();
669	>	Object[] a1 = q.toArray();
670	>	assertEquals(size, a1.length);
671	>	Integer[] a2 = q.toArray(new Integer[0]);
672	>	assertEquals(size, a2.length);
673	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
674	>	assertEquals(size, a3.length);
675	>	Integer[] a4 = new Integer[size];
676	>	assertSame(a4, q.toArray(a4));
677	>	Integer[] a5 = new Integer[size + 1];
678	>	Arrays.fill(a5, 42);
679	>	assertSame(a5, q.toArray(a5));
680	>	Integer[] a6 = new Integer[size + 2];
681	>	Arrays.fill(a6, 42);
682	>	assertSame(a6, q.toArray(a6));
683	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
684	>	for (Object[] a : as) {
685	>	if (a.length > size) assertNull(a[size]);
686	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
687	>	}
688	>	Iterator it = q.iterator();
689	>	Integer s = q.peek();
690	>	for (int i = 0; i < size; i++) {
691	>	Integer x = (Integer) it.next();
692	>	assertEquals(s + i, (int) x);
693	>	for (Object[] a : as)
694	>	assertSame(a1[i], x);
695	>	}
696		}
697
698		/**
699	<	* toArray(a) contains all elements in FIFO order
699	>	* toArray() and toArray(a) contain all elements in FIFO order
700		*/
701	<	public void testToArray2() {
702	<	ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
703	<	Integer[] ints = new Integer[SIZE];
704	<	Integer[] array = q.toArray(ints);
705	<	assertSame(ints, array);
706	<	for (int i = 0; i < ints.length; i++)
707	<	assertSame(ints[i], q.poll());
701	>	public void testToArray() {
702	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
703	>	final int size = rnd.nextInt(6);
704	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
705	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
706	>	for (int i = 0; i < size; i++) {
707	>	checkToArray(q);
708	>	q.add(i);
709	>	}
710	>	// Provoke wraparound
711	>	int added = size * 2;
712	>	for (int i = 0; i < added; i++) {
713	>	checkToArray(q);
714	>	assertEquals((Integer) i, q.poll());
715	>	q.add(size + i);
716	>	}
717	>	for (int i = 0; i < size; i++) {
718	>	checkToArray(q);
719	>	assertEquals((Integer) (added + i), q.poll());
720	>	}
721		}
722
723		/**
724		* toArray(incompatible array type) throws ArrayStoreException
725		*/
726	<	public void testToArray1_BadArg() {
726	>	public void testToArray_incompatibleArrayType() {
727		ArrayBlockingQueue q = populatedQueue(SIZE);
728		try {
729		q.toArray(new String[10]);
730		shouldThrow();
731		} catch (ArrayStoreException success) {}
732	+	try {
733	+	q.toArray(new String[0]);
734	+	shouldThrow();
735	+	} catch (ArrayStoreException success) {}
736		}
737
738		/**
#	Line 630 | Line 741 | public class ArrayBlockingQueueTest exte
741		public void testIterator() throws InterruptedException {
742		ArrayBlockingQueue q = populatedQueue(SIZE);
743		Iterator it = q.iterator();
744	<	while (it.hasNext()) {
744	>	int i;
745	>	for (i = 0; it.hasNext(); i++)
746	>	assertTrue(q.contains(it.next()));
747	>	assertEquals(i, SIZE);
748	>	assertIteratorExhausted(it);
749	>
750	>	it = q.iterator();
751	>	for (i = 0; it.hasNext(); i++)
752		assertEquals(it.next(), q.take());
753	<	}
753	>	assertEquals(i, SIZE);
754	>	assertIteratorExhausted(it);
755	>	}
756	>
757	>	/**
758	>	* iterator of empty collection has no elements
759	>	*/
760	>	public void testEmptyIterator() {
761	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
762		}
763
764		/**
#	Line 705 | Line 831 | public class ArrayBlockingQueueTest exte
831		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
832		q.add(one);
833		q.add(two);
708	–	ExecutorService executor = Executors.newFixedThreadPool(2);
834		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
835	<	executor.execute(new CheckedRunnable() {
836	<	public void realRun() throws InterruptedException {
837	<	assertFalse(q.offer(three));
838	<	threadsStarted.await();
839	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
840	<	assertEquals(0, q.remainingCapacity());
841	<	}});
842	<
843	<	executor.execute(new CheckedRunnable() {
844	<	public void realRun() throws InterruptedException {
845	<	threadsStarted.await();
846	<	assertEquals(0, q.remainingCapacity());
847	<	assertSame(one, q.take());
848	<	}});
849	<
850	<	joinPool(executor);
835	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
836	>	try (PoolCleaner cleaner = cleaner(executor)) {
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		}
853
854		/**
#	Line 731 | Line 857 | public class ArrayBlockingQueueTest exte
857		public void testPollInExecutor() {
858		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
859		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
860	<	ExecutorService executor = Executors.newFixedThreadPool(2);
861	<	executor.execute(new CheckedRunnable() {
862	<	public void realRun() throws InterruptedException {
863	<	assertNull(q.poll());
864	<	threadsStarted.await();
865	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
866	<	checkEmpty(q);
867	<	}});
868	<
869	<	executor.execute(new CheckedRunnable() {
870	<	public void realRun() throws InterruptedException {
871	<	threadsStarted.await();
872	<	q.put(one);
873	<	}});
874	<
875	<	joinPool(executor);
860	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
861	>	try (PoolCleaner cleaner = cleaner(executor)) {
862	>	executor.execute(new CheckedRunnable() {
863	>	public void realRun() throws InterruptedException {
864	>	assertNull(q.poll());
865	>	threadsStarted.await();
866	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
867	>	checkEmpty(q);
868	>	}});
869	>
870	>	executor.execute(new CheckedRunnable() {
871	>	public void realRun() throws InterruptedException {
872	>	threadsStarted.await();
873	>	q.put(one);
874	>	}});
875	>	}
876		}
877
878		/**
#	Line 756 | Line 882 | public class ArrayBlockingQueueTest exte
882		Queue x = populatedQueue(SIZE);
883		Queue y = serialClone(x);
884
885	<	assertTrue(x != y);
885	>	assertNotSame(x, y);
886		assertEquals(x.size(), y.size());
887		assertEquals(x.toString(), y.toString());
888		assertTrue(Arrays.equals(x.toArray(), y.toArray()));
#	Line 798 | Line 924 | public class ArrayBlockingQueueTest exte
924		final ArrayBlockingQueue q = populatedQueue(SIZE);
925		Thread t = new Thread(new CheckedRunnable() {
926		public void realRun() throws InterruptedException {
927	<	q.put(new Integer(SIZE+1));
927	>	q.put(new Integer(SIZE + 1));
928		}});
929
930		t.start();
#	Line 815 | Line 941 | public class ArrayBlockingQueueTest exte
941		* drainTo(c, n) empties first min(n, size) elements of queue into c
942		*/
943		public void testDrainToN() {
944	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
944	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
945		for (int i = 0; i < SIZE + 2; ++i) {
946		for (int j = 0; j < SIZE; j++)
947		assertTrue(q.offer(new Integer(j)));
#	Line 823 | Line 949 | public class ArrayBlockingQueueTest exte
949		q.drainTo(l, i);
950		int k = (i < SIZE) ? i : SIZE;
951		assertEquals(k, l.size());
952	<	assertEquals(SIZE-k, q.size());
952	>	assertEquals(SIZE - k, q.size());
953		for (int j = 0; j < k; ++j)
954		assertEquals(l.get(j), new Integer(j));
955	<	while (q.poll() != null) ;
955	>	do {} while (q.poll() != null);
956		}
957		}
958
959	+	/**
960	+	* remove(null), contains(null) always return false
961	+	*/
962	+	public void testNeverContainsNull() {
963	+	Collection<?>[] qs = {
964	+	populatedQueue(0, 1, 10, false),
965	+	populatedQueue(2, 2, 10, true),
966	+	};
967	+
968	+	for (Collection<?> q : qs) {
969	+	assertFalse(q.contains(null));
970	+	assertFalse(q.remove(null));
971	+	}
972	+	}
973		}

Diff Legend

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