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.50 by jsr166, Fri Jul 15 18:49:31 2011 UTC vs.
Revision 1.88 by jsr166, Sun May 14 01:30:34 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	<	* 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 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 322 | Line 371 | public class ArrayBlockingQueueTest exte
371		}});
372
373		await(pleaseTake);
374	<	assertEquals(q.remainingCapacity(), 0);
374	>	assertEquals(0, q.remainingCapacity());
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(q.remainingCapacity(), 0);
381	>	assertEquals(0, q.remainingCapacity());
382		}
383
384		/**
#	Line 350 | Line 399 | public class ArrayBlockingQueueTest exte
399		q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
400		shouldThrow();
401		} catch (InterruptedException success) {}
402	+	assertFalse(Thread.interrupted());
403		}});
404
405		await(pleaseInterrupt);
406	<	assertThreadStaysAlive(t);
406	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
407		t.interrupt();
408		awaitTermination(t);
409		}
#	Line 376 | Line 426 | public class ArrayBlockingQueueTest exte
426		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
427		Thread t = newStartedThread(new CheckedRunnable() {
428		public void realRun() throws InterruptedException {
429	<	for (int i = 0; i < SIZE; ++i) {
380	<	assertEquals(i, q.take());
381	<	}
429	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
430
431		Thread.currentThread().interrupt();
432		try {
#	Line 396 | Line 444 | public class ArrayBlockingQueueTest exte
444		}});
445
446		await(pleaseInterrupt);
447	<	assertThreadStaysAlive(t);
447	>	assertThreadBlocks(t, Thread.State.WAITING);
448		t.interrupt();
449		awaitTermination(t);
450		}
#	Line 446 | Line 494 | public class ArrayBlockingQueueTest exte
494		*/
495		public void testInterruptedTimedPoll() throws InterruptedException {
496		final BlockingQueue<Integer> q = populatedQueue(SIZE);
497	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
497	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
498		Thread t = newStartedThread(new CheckedRunnable() {
499		public void realRun() throws InterruptedException {
500	<	for (int i = 0; i < SIZE; ++i) {
501	<	long t0 = System.nanoTime();
500	>	long startTime = System.nanoTime();
501	>	for (int i = 0; i < SIZE; i++)
502		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
503	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
504	<	}
457	<	long t0 = System.nanoTime();
458	<	aboutToWait.countDown();
503	>
504	>	Thread.currentThread().interrupt();
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	>	pleaseInterrupt.countDown();
512	>	try {
513	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
514	>	shouldThrow();
515	>	} catch (InterruptedException success) {}
516	>	assertFalse(Thread.interrupted());
517	>
518	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
519		}});
520
521	<	aboutToWait.await();
522	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
521	>	await(pleaseInterrupt);
522	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
523		t.interrupt();
524	<	awaitTermination(t, MEDIUM_DELAY_MS);
524	>	awaitTermination(t);
525		checkEmpty(q);
526		}
527
#	Line 518 | Line 572 | public class ArrayBlockingQueueTest exte
572		* contains(x) reports true when elements added but not yet removed
573		*/
574		public void testContains() {
575	<	ArrayBlockingQueue q = populatedQueue(SIZE);
576	<	for (int i = 0; i < SIZE; ++i) {
575	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
576	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
577	>	assertFalse(q.contains(null));
578	>	for (int i = 0; i < size; ++i) {
579		assertTrue(q.contains(new Integer(i)));
580		assertEquals(i, q.poll());
581		assertFalse(q.contains(new Integer(i)));
#	Line 530 | Line 586 | public class ArrayBlockingQueueTest exte
586		* clear removes all elements
587		*/
588		public void testClear() {
589	<	ArrayBlockingQueue q = populatedQueue(SIZE);
589	>	int size = ThreadLocalRandom.current().nextInt(1, 5);
590	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
591	>	int capacity = size + q.remainingCapacity();
592		q.clear();
593		assertTrue(q.isEmpty());
594		assertEquals(0, q.size());
595	<	assertEquals(SIZE, q.remainingCapacity());
595	>	assertEquals(capacity, q.remainingCapacity());
596		q.add(one);
597		assertFalse(q.isEmpty());
598		assertTrue(q.contains(one));
#	Line 570 | Line 628 | public class ArrayBlockingQueueTest exte
628		assertTrue(changed);
629
630		assertTrue(q.containsAll(p));
631	<	assertEquals(SIZE-i, q.size());
631	>	assertEquals(SIZE - i, q.size());
632		p.remove();
633		}
634		}
#	Line 583 | Line 641 | public class ArrayBlockingQueueTest exte
641		ArrayBlockingQueue q = populatedQueue(SIZE);
642		ArrayBlockingQueue p = populatedQueue(i);
643		assertTrue(q.removeAll(p));
644	<	assertEquals(SIZE-i, q.size());
644	>	assertEquals(SIZE - i, q.size());
645		for (int j = 0; j < i; ++j) {
646	<	Integer I = (Integer)(p.remove());
647	<	assertFalse(q.contains(I));
646	>	Integer x = (Integer)(p.remove());
647	>	assertFalse(q.contains(x));
648		}
649		}
650		}
651
652	<	/**
653	<	* toArray contains all elements in FIFO order
654	<	*/
655	<	public void testToArray() {
656	<	ArrayBlockingQueue q = populatedQueue(SIZE);
657	<	Object[] o = q.toArray();
658	<	for (int i = 0; i < o.length; i++)
659	<	assertSame(o[i], q.poll());
652	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
653	>	int size = q.size();
654	>	Object[] a1 = q.toArray();
655	>	assertEquals(size, a1.length);
656	>	Integer[] a2 = q.toArray(new Integer[0]);
657	>	assertEquals(size, a2.length);
658	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
659	>	assertEquals(size, a3.length);
660	>	Integer[] a4 = new Integer[size];
661	>	assertSame(a4, q.toArray(a4));
662	>	Integer[] a5 = new Integer[size + 1];
663	>	Arrays.fill(a5, 42);
664	>	assertSame(a5, q.toArray(a5));
665	>	Integer[] a6 = new Integer[size + 2];
666	>	Arrays.fill(a6, 42);
667	>	assertSame(a6, q.toArray(a6));
668	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
669	>	for (Object[] a : as) {
670	>	if (a.length > size) assertNull(a[size]);
671	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
672	>	}
673	>	Iterator it = q.iterator();
674	>	Integer s = q.peek();
675	>	for (int i = 0; i < size; i++) {
676	>	Integer x = (Integer) it.next();
677	>	assertEquals(s + i, (int) x);
678	>	for (Object[] a : as)
679	>	assertSame(a1[i], x);
680	>	}
681		}
682
683		/**
684	<	* toArray(a) contains all elements in FIFO order
684	>	* toArray() and toArray(a) contain all elements in FIFO order
685		*/
686	<	public void testToArray2() {
687	<	ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
688	<	Integer[] ints = new Integer[SIZE];
689	<	Integer[] array = q.toArray(ints);
690	<	assertSame(ints, array);
691	<	for (int i = 0; i < ints.length; i++)
692	<	assertSame(ints[i], q.poll());
686	>	public void testToArray() {
687	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
688	>	final int size = rnd.nextInt(6);
689	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
690	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
691	>	for (int i = 0; i < size; i++) {
692	>	checkToArray(q);
693	>	q.add(i);
694	>	}
695	>	// Provoke wraparound
696	>	int added = size * 2;
697	>	for (int i = 0; i < added; i++) {
698	>	checkToArray(q);
699	>	assertEquals((Integer) i, q.poll());
700	>	q.add(size + i);
701	>	}
702	>	for (int i = 0; i < size; i++) {
703	>	checkToArray(q);
704	>	assertEquals((Integer) (added + i), q.poll());
705	>	}
706		}
707
708		/**
709		* toArray(incompatible array type) throws ArrayStoreException
710		*/
711	<	public void testToArray1_BadArg() {
711	>	public void testToArray_incompatibleArrayType() {
712		ArrayBlockingQueue q = populatedQueue(SIZE);
713		try {
714		q.toArray(new String[10]);
715		shouldThrow();
716		} catch (ArrayStoreException success) {}
717	+	try {
718	+	q.toArray(new String[0]);
719	+	shouldThrow();
720	+	} catch (ArrayStoreException success) {}
721		}
722
723		/**
#	Line 630 | Line 726 | public class ArrayBlockingQueueTest exte
726		public void testIterator() throws InterruptedException {
727		ArrayBlockingQueue q = populatedQueue(SIZE);
728		Iterator it = q.iterator();
729	<	while (it.hasNext()) {
729	>	int i;
730	>	for (i = 0; it.hasNext(); i++)
731	>	assertTrue(q.contains(it.next()));
732	>	assertEquals(i, SIZE);
733	>	assertIteratorExhausted(it);
734	>
735	>	it = q.iterator();
736	>	for (i = 0; it.hasNext(); i++)
737		assertEquals(it.next(), q.take());
738	<	}
738	>	assertEquals(i, SIZE);
739	>	assertIteratorExhausted(it);
740	>	}
741	>
742	>	/**
743	>	* iterator of empty collection has no elements
744	>	*/
745	>	public void testEmptyIterator() {
746	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
747		}
748
749		/**
#	Line 705 | Line 816 | public class ArrayBlockingQueueTest exte
816		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
817		q.add(one);
818		q.add(two);
708	–	ExecutorService executor = Executors.newFixedThreadPool(2);
819		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
820	<	executor.execute(new CheckedRunnable() {
821	<	public void realRun() throws InterruptedException {
822	<	assertFalse(q.offer(three));
823	<	threadsStarted.await();
824	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
825	<	assertEquals(0, q.remainingCapacity());
826	<	}});
827	<
828	<	executor.execute(new CheckedRunnable() {
829	<	public void realRun() throws InterruptedException {
830	<	threadsStarted.await();
831	<	assertEquals(0, q.remainingCapacity());
832	<	assertSame(one, q.take());
833	<	}});
834	<
835	<	joinPool(executor);
820	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
821	>	try (PoolCleaner cleaner = cleaner(executor)) {
822	>	executor.execute(new CheckedRunnable() {
823	>	public void realRun() throws InterruptedException {
824	>	assertFalse(q.offer(three));
825	>	threadsStarted.await();
826	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
827	>	assertEquals(0, q.remainingCapacity());
828	>	}});
829	>
830	>	executor.execute(new CheckedRunnable() {
831	>	public void realRun() throws InterruptedException {
832	>	threadsStarted.await();
833	>	assertEquals(0, q.remainingCapacity());
834	>	assertSame(one, q.take());
835	>	}});
836	>	}
837		}
838
839		/**
#	Line 731 | Line 842 | public class ArrayBlockingQueueTest exte
842		public void testPollInExecutor() {
843		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
844		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
845	<	ExecutorService executor = Executors.newFixedThreadPool(2);
846	<	executor.execute(new CheckedRunnable() {
847	<	public void realRun() throws InterruptedException {
848	<	assertNull(q.poll());
849	<	threadsStarted.await();
850	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
851	<	checkEmpty(q);
852	<	}});
853	<
854	<	executor.execute(new CheckedRunnable() {
855	<	public void realRun() throws InterruptedException {
856	<	threadsStarted.await();
857	<	q.put(one);
858	<	}});
859	<
860	<	joinPool(executor);
845	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
846	>	try (PoolCleaner cleaner = cleaner(executor)) {
847	>	executor.execute(new CheckedRunnable() {
848	>	public void realRun() throws InterruptedException {
849	>	assertNull(q.poll());
850	>	threadsStarted.await();
851	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
852	>	checkEmpty(q);
853	>	}});
854	>
855	>	executor.execute(new CheckedRunnable() {
856	>	public void realRun() throws InterruptedException {
857	>	threadsStarted.await();
858	>	q.put(one);
859	>	}});
860	>	}
861		}
862
863		/**
#	Line 756 | Line 867 | public class ArrayBlockingQueueTest exte
867		Queue x = populatedQueue(SIZE);
868		Queue y = serialClone(x);
869
870	<	assertTrue(x != y);
870	>	assertNotSame(x, y);
871		assertEquals(x.size(), y.size());
872		assertEquals(x.toString(), y.toString());
873		assertTrue(Arrays.equals(x.toArray(), y.toArray()));
#	Line 774 | Line 885 | public class ArrayBlockingQueueTest exte
885		ArrayBlockingQueue q = populatedQueue(SIZE);
886		ArrayList l = new ArrayList();
887		q.drainTo(l);
888	<	assertEquals(q.size(), 0);
889	<	assertEquals(l.size(), SIZE);
888	>	assertEquals(0, q.size());
889	>	assertEquals(SIZE, l.size());
890		for (int i = 0; i < SIZE; ++i)
891		assertEquals(l.get(i), new Integer(i));
892		q.add(zero);
#	Line 785 | Line 896 | public class ArrayBlockingQueueTest exte
896		assertTrue(q.contains(one));
897		l.clear();
898		q.drainTo(l);
899	<	assertEquals(q.size(), 0);
900	<	assertEquals(l.size(), 2);
899	>	assertEquals(0, q.size());
900	>	assertEquals(2, l.size());
901		for (int i = 0; i < 2; ++i)
902		assertEquals(l.get(i), new Integer(i));
903		}
#	Line 798 | Line 909 | public class ArrayBlockingQueueTest exte
909		final ArrayBlockingQueue q = populatedQueue(SIZE);
910		Thread t = new Thread(new CheckedRunnable() {
911		public void realRun() throws InterruptedException {
912	<	q.put(new Integer(SIZE+1));
912	>	q.put(new Integer(SIZE + 1));
913		}});
914
915		t.start();
#	Line 815 | Line 926 | public class ArrayBlockingQueueTest exte
926		* drainTo(c, n) empties first min(n, size) elements of queue into c
927		*/
928		public void testDrainToN() {
929	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
929	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
930		for (int i = 0; i < SIZE + 2; ++i) {
931		for (int j = 0; j < SIZE; j++)
932		assertTrue(q.offer(new Integer(j)));
933		ArrayList l = new ArrayList();
934		q.drainTo(l, i);
935		int k = (i < SIZE) ? i : SIZE;
936	<	assertEquals(l.size(), k);
937	<	assertEquals(q.size(), SIZE-k);
936	>	assertEquals(k, l.size());
937	>	assertEquals(SIZE - k, q.size());
938		for (int j = 0; j < k; ++j)
939		assertEquals(l.get(j), new Integer(j));
940	<	while (q.poll() != null) ;
940	>	do {} while (q.poll() != null);
941		}
942		}
943
944	+	/**
945	+	* remove(null), contains(null) always return false
946	+	*/
947	+	public void testNeverContainsNull() {
948	+	Collection<?>[] qs = {
949	+	populatedQueue(0, 1, 10, false),
950	+	populatedQueue(2, 2, 10, true),
951	+	};
952	+
953	+	for (Collection<?> q : qs) {
954	+	assertFalse(q.contains(null));
955	+	assertFalse(q.remove(null));
956	+	}
957	+	}
958		}

Diff Legend

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