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.78 by jsr166, Sun Nov 6 03:49:39 2016 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(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 449 | Line 498 | public class ArrayBlockingQueueTest exte
498		final CountDownLatch aboutToWait = new CountDownLatch(1);
499		Thread t = newStartedThread(new CheckedRunnable() {
500		public void realRun() throws InterruptedException {
501	+	long startTime = System.nanoTime();
502		for (int i = 0; i < SIZE; ++i) {
453	–	long t0 = System.nanoTime();
503		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
455	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
504		}
457	–	long t0 = System.nanoTime();
505		aboutToWait.countDown();
506		try {
507	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
507	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
508		shouldThrow();
509		} catch (InterruptedException success) {
510	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
510	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
511		}
512		}});
513
514	<	aboutToWait.await();
515	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
514	>	await(aboutToWait);
515	>	waitForThreadToEnterWaitState(t);
516		t.interrupt();
517	<	awaitTermination(t, MEDIUM_DELAY_MS);
517	>	awaitTermination(t);
518		checkEmpty(q);
519		}
520
#	Line 570 | Line 617 | public class ArrayBlockingQueueTest exte
617		assertTrue(changed);
618
619		assertTrue(q.containsAll(p));
620	<	assertEquals(SIZE-i, q.size());
620	>	assertEquals(SIZE - i, q.size());
621		p.remove();
622		}
623		}
#	Line 583 | Line 630 | public class ArrayBlockingQueueTest exte
630		ArrayBlockingQueue q = populatedQueue(SIZE);
631		ArrayBlockingQueue p = populatedQueue(i);
632		assertTrue(q.removeAll(p));
633	<	assertEquals(SIZE-i, q.size());
633	>	assertEquals(SIZE - i, q.size());
634		for (int j = 0; j < i; ++j) {
635	<	Integer I = (Integer)(p.remove());
636	<	assertFalse(q.contains(I));
635	>	Integer x = (Integer)(p.remove());
636	>	assertFalse(q.contains(x));
637		}
638		}
639		}
640
641	<	void checkToArray(ArrayBlockingQueue q) {
641	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
642		int size = q.size();
643	<	Object[] o = q.toArray();
644	<	assertEquals(size, o.length);
643	>	Object[] a1 = q.toArray();
644	>	assertEquals(size, a1.length);
645	>	Integer[] a2 = q.toArray(new Integer[0]);
646	>	assertEquals(size, a2.length);
647	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
648	>	assertEquals(size, a3.length);
649	>	Integer[] a4 = new Integer[size];
650	>	assertSame(a4, q.toArray(a4));
651	>	Integer[] a5 = new Integer[size + 1];
652	>	Arrays.fill(a5, 42);
653	>	assertSame(a5, q.toArray(a5));
654	>	Integer[] a6 = new Integer[size + 2];
655	>	Arrays.fill(a6, 42);
656	>	assertSame(a6, q.toArray(a6));
657	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
658	>	for (Object[] a : as) {
659	>	if (a.length > size) assertNull(a[size]);
660	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
661	>	}
662		Iterator it = q.iterator();
663	+	Integer s = q.peek();
664		for (int i = 0; i < size; i++) {
665		Integer x = (Integer) it.next();
666	<	assertEquals((Integer)o[0] + i, (int) x);
667	<	assertSame(o[i], x);
666	>	assertEquals(s + i, (int) x);
667	>	for (Object[] a : as)
668	>	assertSame(a1[i], x);
669		}
670		}
671
672		/**
673	<	* toArray() contains all elements in FIFO order
673	>	* toArray() and toArray(a) contain all elements in FIFO order
674		*/
675		public void testToArray() {
676	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
677	<	for (int i = 0; i < SIZE; i++) {
676	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
677	>	final int size = rnd.nextInt(6);
678	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
679	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
680	>	for (int i = 0; i < size; i++) {
681		checkToArray(q);
682		q.add(i);
683		}
684		// Provoke wraparound
685	<	for (int i = 0; i < SIZE; i++) {
686	<	checkToArray(q);
618	<	assertEquals(i, q.poll());
685	>	int added = size * 2;
686	>	for (int i = 0; i < added; i++) {
687		checkToArray(q);
688	<	q.add(SIZE+i);
688	>	assertEquals((Integer) i, q.poll());
689	>	q.add(size + i);
690		}
622	–	for (int i = 0; i < SIZE; i++) {
623	–	checkToArray(q);
624	–	assertEquals(SIZE+i, q.poll());
625	–	}
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();
691		for (int i = 0; i < size; i++) {
692	<	Integer x = (Integer) it.next();
693	<	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());
692	>	checkToArray(q);
693	>	assertEquals((Integer) (added + i), q.poll());
694		}
695		}
696
697		/**
698		* toArray(incompatible array type) throws ArrayStoreException
699		*/
700	<	public void testToArray1_BadArg() {
700	>	public void testToArray_incompatibleArrayType() {
701		ArrayBlockingQueue q = populatedQueue(SIZE);
702		try {
703		q.toArray(new String[10]);
704		shouldThrow();
705		} catch (ArrayStoreException success) {}
706	+	try {
707	+	q.toArray(new String[0]);
708	+	shouldThrow();
709	+	} catch (ArrayStoreException success) {}
710		}
711
712		/**
#	Line 696 | Line 715 | public class ArrayBlockingQueueTest exte
715		public void testIterator() throws InterruptedException {
716		ArrayBlockingQueue q = populatedQueue(SIZE);
717		Iterator it = q.iterator();
718	<	while (it.hasNext()) {
718	>	int i;
719	>	for (i = 0; it.hasNext(); i++)
720	>	assertTrue(q.contains(it.next()));
721	>	assertEquals(i, SIZE);
722	>	assertIteratorExhausted(it);
723	>
724	>	it = q.iterator();
725	>	for (i = 0; it.hasNext(); i++)
726		assertEquals(it.next(), q.take());
727	<	}
727	>	assertEquals(i, SIZE);
728	>	assertIteratorExhausted(it);
729	>	}
730	>
731	>	/**
732	>	* iterator of empty collection has no elements
733	>	*/
734	>	public void testEmptyIterator() {
735	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
736		}
737
738		/**
#	Line 771 | Line 805 | public class ArrayBlockingQueueTest exte
805		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
806		q.add(one);
807		q.add(two);
774	–	ExecutorService executor = Executors.newFixedThreadPool(2);
808		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
809	<	executor.execute(new CheckedRunnable() {
810	<	public void realRun() throws InterruptedException {
811	<	assertFalse(q.offer(three));
812	<	threadsStarted.await();
813	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
814	<	assertEquals(0, q.remainingCapacity());
815	<	}});
816	<
817	<	executor.execute(new CheckedRunnable() {
818	<	public void realRun() throws InterruptedException {
819	<	threadsStarted.await();
820	<	assertEquals(0, q.remainingCapacity());
821	<	assertSame(one, q.take());
822	<	}});
823	<
824	<	joinPool(executor);
809	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
810	>	try (PoolCleaner cleaner = cleaner(executor)) {
811	>	executor.execute(new CheckedRunnable() {
812	>	public void realRun() throws InterruptedException {
813	>	assertFalse(q.offer(three));
814	>	threadsStarted.await();
815	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
816	>	assertEquals(0, q.remainingCapacity());
817	>	}});
818	>
819	>	executor.execute(new CheckedRunnable() {
820	>	public void realRun() throws InterruptedException {
821	>	threadsStarted.await();
822	>	assertEquals(0, q.remainingCapacity());
823	>	assertSame(one, q.take());
824	>	}});
825	>	}
826		}
827
828		/**
#	Line 797 | Line 831 | public class ArrayBlockingQueueTest exte
831		public void testPollInExecutor() {
832		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
833		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
834	<	ExecutorService executor = Executors.newFixedThreadPool(2);
835	<	executor.execute(new CheckedRunnable() {
836	<	public void realRun() throws InterruptedException {
837	<	assertNull(q.poll());
838	<	threadsStarted.await();
839	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
840	<	checkEmpty(q);
841	<	}});
842	<
843	<	executor.execute(new CheckedRunnable() {
844	<	public void realRun() throws InterruptedException {
845	<	threadsStarted.await();
846	<	q.put(one);
847	<	}});
848	<
849	<	joinPool(executor);
834	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
835	>	try (PoolCleaner cleaner = cleaner(executor)) {
836	>	executor.execute(new CheckedRunnable() {
837	>	public void realRun() throws InterruptedException {
838	>	assertNull(q.poll());
839	>	threadsStarted.await();
840	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
841	>	checkEmpty(q);
842	>	}});
843	>
844	>	executor.execute(new CheckedRunnable() {
845	>	public void realRun() throws InterruptedException {
846	>	threadsStarted.await();
847	>	q.put(one);
848	>	}});
849	>	}
850		}
851
852		/**
#	Line 864 | Line 898 | public class ArrayBlockingQueueTest exte
898		final ArrayBlockingQueue q = populatedQueue(SIZE);
899		Thread t = new Thread(new CheckedRunnable() {
900		public void realRun() throws InterruptedException {
901	<	q.put(new Integer(SIZE+1));
901	>	q.put(new Integer(SIZE + 1));
902		}});
903
904		t.start();
#	Line 881 | Line 915 | public class ArrayBlockingQueueTest exte
915		* drainTo(c, n) empties first min(n, size) elements of queue into c
916		*/
917		public void testDrainToN() {
918	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
918	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
919		for (int i = 0; i < SIZE + 2; ++i) {
920		for (int j = 0; j < SIZE; j++)
921		assertTrue(q.offer(new Integer(j)));
#	Line 889 | Line 923 | public class ArrayBlockingQueueTest exte
923		q.drainTo(l, i);
924		int k = (i < SIZE) ? i : SIZE;
925		assertEquals(k, l.size());
926	<	assertEquals(SIZE-k, q.size());
926	>	assertEquals(SIZE - k, q.size());
927		for (int j = 0; j < k; ++j)
928		assertEquals(l.get(j), new Integer(j));
929	<	while (q.poll() != null) ;
929	>	do {} while (q.poll() != null);
930		}
931		}
932

Diff Legend

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