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.43 by jsr166, Tue Mar 15 19:47:06 2011 UTC vs.
Revision 1.86 by jsr166, Sun May 14 00:48:20 2017 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–
10	–	import junit.framework.*;
11	–	import java.util.*;
12	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.io.*;
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 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,
36	<	new Fair().testSuite(),
37	<	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 62 | Line 105 | public class ArrayBlockingQueueTest exte
105		/**
106		* Constructor throws IAE if capacity argument nonpositive
107		*/
108	<	public void testConstructor2() {
109	<	try {
110	<	ArrayBlockingQueue q = 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	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
128	>	new ArrayBlockingQueue(1, true, null);
129		shouldThrow();
130		} catch (NullPointerException success) {}
131		}
#	Line 83 | Line 134 | public class ArrayBlockingQueueTest exte
134		* Initializing from Collection of null elements throws NPE
135		*/
136		public void testConstructor4() {
137	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
138		try {
139	<	Integer[] ints = new Integer[SIZE];
88	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
139	>	new ArrayBlockingQueue(SIZE, false, elements);
140		shouldThrow();
141		} catch (NullPointerException success) {}
142		}
#	Line 94 | Line 145 | public class ArrayBlockingQueueTest exte
145		* Initializing from Collection with some null elements throws NPE
146		*/
147		public void testConstructor5() {
148	+	Integer[] ints = new Integer[SIZE];
149	+	for (int i = 0; i < SIZE - 1; ++i)
150	+	ints[i] = i;
151	+	Collection<Integer> elements = Arrays.asList(ints);
152		try {
153	<	Integer[] ints = new Integer[SIZE];
99	<	for (int i = 0; i < SIZE-1; ++i)
100	<	ints[i] = new Integer(i);
101	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
153	>	new ArrayBlockingQueue(SIZE, false, elements);
154		shouldThrow();
155		} catch (NullPointerException success) {}
156		}
#	Line 106 | Line 158 | public class ArrayBlockingQueueTest exte
158		/**
159		* Initializing from too large collection throws IAE
160		*/
161	<	public void testConstructor6() {
161	>	public void testConstructor_collectionTooLarge() {
162	>	// just barely fits - succeeds
163	>	new ArrayBlockingQueue(SIZE, false,
164	>	Collections.nCopies(SIZE, ""));
165		try {
166	<	Integer[] ints = new Integer[SIZE];
167	<	for (int i = 0; i < SIZE; ++i)
113	<	ints[i] = new Integer(i);
114	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
166	>	new ArrayBlockingQueue(SIZE - 1, false,
167	>	Collections.nCopies(SIZE, ""));
168		shouldThrow();
169		} catch (IllegalArgumentException success) {}
170		}
#	Line 122 | Line 175 | public class ArrayBlockingQueueTest exte
175		public void testConstructor7() {
176		Integer[] ints = new Integer[SIZE];
177		for (int i = 0; i < SIZE; ++i)
178	<	ints[i] = new Integer(i);
179	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
178	>	ints[i] = i;
179	>	Collection<Integer> elements = Arrays.asList(ints);
180	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, elements);
181		for (int i = 0; i < SIZE; ++i)
182		assertEquals(ints[i], q.poll());
183		}
#	Line 132 | 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 147 | 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
220		/**
164	–	* offer(null) throws NPE
165	–	*/
166	–	public void testOfferNull() {
167	–	try {
168	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
169	–	q.offer(null);
170	–	shouldThrow();
171	–	} catch (NullPointerException success) {}
172	–	}
173	–
174	–	/**
175	–	* add(null) throws NPE
176	–	*/
177	–	public void testAddNull() {
178	–	try {
179	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
180	–	q.add(null);
181	–	shouldThrow();
182	–	} catch (NullPointerException success) {}
183	–	}
184	–
185	–	/**
221		* Offer succeeds if not full; fails if full
222		*/
223		public void testOffer() {
#	Line 195 | 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);
200	<	for (int i = 0; i < SIZE; ++i) {
201	<	assertTrue(q.add(new Integer(i)));
202	<	}
203	<	assertEquals(0, q.remainingCapacity());
204	<	q.add(new Integer(SIZE));
237	>	q.add((Integer) SIZE);
238		shouldThrow();
239		} catch (IllegalStateException success) {}
240		}
241
242		/**
210	–	* addAll(null) throws NPE
211	–	*/
212	–	public void testAddAll1() {
213	–	try {
214	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
215	–	q.addAll(null);
216	–	shouldThrow();
217	–	} catch (NullPointerException success) {}
218	–	}
219	–
220	–	/**
243		* addAll(this) throws IAE
244		*/
245		public void testAddAllSelf() {
246	+	ArrayBlockingQueue q = populatedQueue(SIZE);
247		try {
225	–	ArrayBlockingQueue q = populatedQueue(SIZE);
248		q.addAll(q);
249		shouldThrow();
250		} catch (IllegalArgumentException success) {}
251		}
252
231	–
232	–	/**
233	–	* addAll of a collection with null elements throws NPE
234	–	*/
235	–	public void testAddAll2() {
236	–	try {
237	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
238	–	Integer[] ints = new Integer[SIZE];
239	–	q.addAll(Arrays.asList(ints));
240	–	shouldThrow();
241	–	} catch (NullPointerException success) {}
242	–	}
243	–
253		/**
254		* addAll of a collection with any null elements throws NPE after
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 {
250	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
251	–	Integer[] ints = new Integer[SIZE];
252	–	for (int i = 0; i < SIZE-1; ++i)
253	–	ints[i] = new Integer(i);
263		q.addAll(Arrays.asList(ints));
264		shouldThrow();
265		} catch (NullPointerException success) {}
#	Line 259 | 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];
266	<	for (int i = 0; i < SIZE; ++i)
267	<	ints[i] = new Integer(i);
268	<	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 286 | Line 299 | public class ArrayBlockingQueueTest exte
299		}
300
301		/**
289	–	* put(null) throws NPE
290	–	*/
291	–	public void testPutNull() throws InterruptedException {
292	–	try {
293	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
294	–	q.put(null);
295	–	shouldThrow();
296	–	} catch (NullPointerException success) {}
297	–	}
298	–
299	–	/**
302		* all elements successfully put are contained
303		*/
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 314 | Line 316 | public class ArrayBlockingQueueTest exte
316		*/
317		public void testBlockingPut() throws InterruptedException {
318		final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
319	<	Thread t = new Thread(new CheckedRunnable() {
319	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
320	>	Thread t = newStartedThread(new CheckedRunnable() {
321		public void realRun() throws InterruptedException {
322		for (int i = 0; i < SIZE; ++i)
323		q.put(i);
324		assertEquals(SIZE, q.size());
325		assertEquals(0, q.remainingCapacity());
326	+
327	+	Thread.currentThread().interrupt();
328		try {
329		q.put(99);
330		shouldThrow();
331		} catch (InterruptedException success) {}
332	+	assertFalse(Thread.interrupted());
333	+
334	+	pleaseInterrupt.countDown();
335	+	try {
336	+	q.put(99);
337	+	shouldThrow();
338	+	} catch (InterruptedException success) {}
339	+	assertFalse(Thread.interrupted());
340		}});
341
342	<	t.start();
343	<	Thread.sleep(SHORT_DELAY_MS);
342	>	await(pleaseInterrupt);
343	>	assertThreadBlocks(t, Thread.State.WAITING);
344		t.interrupt();
345	<	t.join();
345	>	awaitTermination(t);
346		assertEquals(SIZE, q.size());
347		assertEquals(0, q.remainingCapacity());
348		}
349
350		/**
351	<	* put blocks waiting for take when full
351	>	* put blocks interruptibly waiting for take when full
352		*/
353		public void testPutWithTake() throws InterruptedException {
354		final int capacity = 2;
355		final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
356	<	Thread t = new Thread(new CheckedRunnable() {
356	>	final CountDownLatch pleaseTake = new CountDownLatch(1);
357	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
358	>	Thread t = newStartedThread(new CheckedRunnable() {
359		public void realRun() throws InterruptedException {
360	<	for (int i = 0; i < capacity + 1; i++)
360	>	for (int i = 0; i < capacity; i++)
361		q.put(i);
362	+	pleaseTake.countDown();
363	+	q.put(86);
364	+
365	+	pleaseInterrupt.countDown();
366		try {
367		q.put(99);
368		shouldThrow();
369		} catch (InterruptedException success) {}
370	+	assertFalse(Thread.interrupted());
371		}});
372
373	<	t.start();
374	<	Thread.sleep(SHORT_DELAY_MS);
355	<	assertEquals(q.remainingCapacity(), 0);
373	>	await(pleaseTake);
374	>	assertEquals(0, q.remainingCapacity());
375		assertEquals(0, q.take());
376	<	Thread.sleep(SHORT_DELAY_MS);
376	>
377	>	await(pleaseInterrupt);
378	>	assertThreadBlocks(t, Thread.State.WAITING);
379		t.interrupt();
380	<	t.join();
381	<	assertEquals(q.remainingCapacity(), 0);
380	>	awaitTermination(t);
381	>	assertEquals(0, q.remainingCapacity());
382		}
383
384		/**
#	Line 365 | Line 386 | public class ArrayBlockingQueueTest exte
386		*/
387		public void testTimedOffer() throws InterruptedException {
388		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
389	<	Thread t = new Thread(new CheckedRunnable() {
389	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
390	>	Thread t = newStartedThread(new CheckedRunnable() {
391		public void realRun() throws InterruptedException {
392		q.put(new Object());
393		q.put(new Object());
394	<	assertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
394	>	long startTime = System.nanoTime();
395	>	assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
396	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
397	>	pleaseInterrupt.countDown();
398		try {
399	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
399	>	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
400		shouldThrow();
401		} catch (InterruptedException success) {}
402		}});
403
404	<	t.start();
405	<	Thread.sleep(SHORT_DELAY_MS);
404	>	await(pleaseInterrupt);
405	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
406		t.interrupt();
407	<	t.join();
407	>	awaitTermination(t);
408		}
409
410		/**
#	Line 397 | Line 422 | public class ArrayBlockingQueueTest exte
422		*/
423		public void testBlockingTake() throws InterruptedException {
424		final ArrayBlockingQueue q = populatedQueue(SIZE);
425	<	Thread t = new Thread(new CheckedRunnable() {
425	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
426	>	Thread t = newStartedThread(new CheckedRunnable() {
427		public void realRun() throws InterruptedException {
428	<	for (int i = 0; i < SIZE; ++i) {
429	<	assertEquals(i, q.take());
430	<	}
428	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
429	>
430	>	Thread.currentThread().interrupt();
431	>	try {
432	>	q.take();
433	>	shouldThrow();
434	>	} catch (InterruptedException success) {}
435	>	assertFalse(Thread.interrupted());
436	>
437	>	pleaseInterrupt.countDown();
438		try {
439		q.take();
440		shouldThrow();
441		} catch (InterruptedException success) {}
442	+	assertFalse(Thread.interrupted());
443		}});
444
445	<	t.start();
446	<	Thread.sleep(SHORT_DELAY_MS);
445	>	await(pleaseInterrupt);
446	>	assertThreadBlocks(t, Thread.State.WAITING);
447		t.interrupt();
448	<	t.join();
448	>	awaitTermination(t);
449		}
450
417	–
451		/**
452		* poll succeeds unless empty
453		*/
#	Line 435 | Line 468 | public class ArrayBlockingQueueTest exte
468		assertEquals(i, q.poll(0, MILLISECONDS));
469		}
470		assertNull(q.poll(0, MILLISECONDS));
471	+	checkEmpty(q);
472		}
473
474		/**
#	Line 443 | Line 477 | public class ArrayBlockingQueueTest exte
477		public void testTimedPoll() throws InterruptedException {
478		ArrayBlockingQueue q = populatedQueue(SIZE);
479		for (int i = 0; i < SIZE; ++i) {
480	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
481	<	}
482	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
480	>	long startTime = System.nanoTime();
481	>	assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
482	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
483	>	}
484	>	long startTime = System.nanoTime();
485	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
486	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
487	>	checkEmpty(q);
488		}
489
490		/**
#	Line 454 | Line 493 | public class ArrayBlockingQueueTest exte
493		*/
494		public void testInterruptedTimedPoll() throws InterruptedException {
495		final BlockingQueue<Integer> q = populatedQueue(SIZE);
496	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
496	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
497		Thread t = newStartedThread(new CheckedRunnable() {
498		public void realRun() throws InterruptedException {
499	+	long startTime = System.nanoTime();
500		for (int i = 0; i < SIZE; ++i) {
461	–	long t0 = System.nanoTime();
501		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
463	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
502		}
503	<	long t0 = System.nanoTime();
504	<	aboutToWait.countDown();
503	>
504	>	pleaseInterrupt.countDown();
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	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
512		}});
513
514	<	aboutToWait.await();
515	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
514	>	await(pleaseInterrupt);
515	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
516		t.interrupt();
517	<	awaitTermination(t, MEDIUM_DELAY_MS);
517	>	awaitTermination(t);
518		checkEmpty(q);
519		}
520
#	Line 523 | Line 562 | public class ArrayBlockingQueueTest exte
562		}
563
564		/**
526	–	* remove(x) removes x and returns true if present
527	–	*/
528	–	public void testRemoveElement() {
529	–	ArrayBlockingQueue q = populatedQueue(SIZE);
530	–	for (int i = 1; i < SIZE; i+=2) {
531	–	assertTrue(q.remove(new Integer(i)));
532	–	}
533	–	for (int i = 0; i < SIZE; i+=2) {
534	–	assertTrue(q.remove(new Integer(i)));
535	–	assertFalse(q.remove(new Integer(i+1)));
536	–	}
537	–	assertTrue(q.isEmpty());
538	–	}
539	–
540	–	/**
565		* contains(x) reports true when elements added but not yet removed
566		*/
567		public void testContains() {
568	<	ArrayBlockingQueue q = populatedQueue(SIZE);
569	<	for (int i = 0; i < SIZE; ++i) {
568	>	int size = ThreadLocalRandom.current().nextInt(1, SIZE);
569	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
570	>	assertFalse(q.contains(null));
571	>	for (int i = 0; i < size; ++i) {
572		assertTrue(q.contains(new Integer(i)));
573		assertEquals(i, q.poll());
574		assertFalse(q.contains(new Integer(i)));
#	Line 553 | Line 579 | public class ArrayBlockingQueueTest exte
579		* clear removes all elements
580		*/
581		public void testClear() {
582	<	ArrayBlockingQueue q = populatedQueue(SIZE);
582	>	int size = ThreadLocalRandom.current().nextInt(1, 5);
583	>	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
584	>	int capacity = size + q.remainingCapacity();
585		q.clear();
586		assertTrue(q.isEmpty());
587		assertEquals(0, q.size());
588	<	assertEquals(SIZE, q.remainingCapacity());
588	>	assertEquals(capacity, q.remainingCapacity());
589		q.add(one);
590		assertFalse(q.isEmpty());
591		assertTrue(q.contains(one));
#	Line 593 | Line 621 | public class ArrayBlockingQueueTest exte
621		assertTrue(changed);
622
623		assertTrue(q.containsAll(p));
624	<	assertEquals(SIZE-i, q.size());
624	>	assertEquals(SIZE - i, q.size());
625		p.remove();
626		}
627		}
#	Line 606 | Line 634 | public class ArrayBlockingQueueTest exte
634		ArrayBlockingQueue q = populatedQueue(SIZE);
635		ArrayBlockingQueue p = populatedQueue(i);
636		assertTrue(q.removeAll(p));
637	<	assertEquals(SIZE-i, q.size());
637	>	assertEquals(SIZE - i, q.size());
638		for (int j = 0; j < i; ++j) {
639	<	Integer I = (Integer)(p.remove());
640	<	assertFalse(q.contains(I));
639	>	Integer x = (Integer)(p.remove());
640	>	assertFalse(q.contains(x));
641		}
642		}
643		}
644
645	<	/**
646	<	* toArray contains all elements in FIFO order
647	<	*/
648	<	public void testToArray() {
649	<	ArrayBlockingQueue q = populatedQueue(SIZE);
650	<	Object[] o = q.toArray();
651	<	for (int i = 0; i < o.length; i++)
652	<	assertSame(o[i], q.poll());
653	<	}
654	<
655	<	/**
656	<	* toArray(a) contains all elements in FIFO order
657	<	*/
658	<	public void testToArray2() {
659	<	ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
660	<	Integer[] ints = new Integer[SIZE];
661	<	Integer[] array = q.toArray(ints);
662	<	assertSame(ints, array);
663	<	for (int i = 0; i < ints.length; i++)
664	<	assertSame(ints[i], q.poll());
645	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
646	>	int size = q.size();
647	>	Object[] a1 = q.toArray();
648	>	assertEquals(size, a1.length);
649	>	Integer[] a2 = q.toArray(new Integer[0]);
650	>	assertEquals(size, a2.length);
651	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
652	>	assertEquals(size, a3.length);
653	>	Integer[] a4 = new Integer[size];
654	>	assertSame(a4, q.toArray(a4));
655	>	Integer[] a5 = new Integer[size + 1];
656	>	Arrays.fill(a5, 42);
657	>	assertSame(a5, q.toArray(a5));
658	>	Integer[] a6 = new Integer[size + 2];
659	>	Arrays.fill(a6, 42);
660	>	assertSame(a6, q.toArray(a6));
661	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
662	>	for (Object[] a : as) {
663	>	if (a.length > size) assertNull(a[size]);
664	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
665	>	}
666	>	Iterator it = q.iterator();
667	>	Integer s = q.peek();
668	>	for (int i = 0; i < size; i++) {
669	>	Integer x = (Integer) it.next();
670	>	assertEquals(s + i, (int) x);
671	>	for (Object[] a : as)
672	>	assertSame(a1[i], x);
673	>	}
674		}
675
676		/**
677	<	* toArray(null) throws NullPointerException
677	>	* toArray() and toArray(a) contain all elements in FIFO order
678		*/
679	<	public void testToArray_NullArg() {
680	<	ArrayBlockingQueue q = populatedQueue(SIZE);
681	<	try {
682	<	q.toArray(null);
683	<	shouldThrow();
684	<	} catch (NullPointerException success) {}
679	>	public void testToArray() {
680	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
681	>	final int size = rnd.nextInt(6);
682	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
683	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
684	>	for (int i = 0; i < size; i++) {
685	>	checkToArray(q);
686	>	q.add(i);
687	>	}
688	>	// Provoke wraparound
689	>	int added = size * 2;
690	>	for (int i = 0; i < added; i++) {
691	>	checkToArray(q);
692	>	assertEquals((Integer) i, q.poll());
693	>	q.add(size + i);
694	>	}
695	>	for (int i = 0; i < size; i++) {
696	>	checkToArray(q);
697	>	assertEquals((Integer) (added + i), q.poll());
698	>	}
699		}
700
701		/**
702		* toArray(incompatible array type) throws ArrayStoreException
703		*/
704	<	public void testToArray1_BadArg() {
704	>	public void testToArray_incompatibleArrayType() {
705		ArrayBlockingQueue q = populatedQueue(SIZE);
706		try {
707		q.toArray(new String[10]);
708		shouldThrow();
709		} catch (ArrayStoreException success) {}
710	+	try {
711	+	q.toArray(new String[0]);
712	+	shouldThrow();
713	+	} catch (ArrayStoreException success) {}
714		}
715
661	–
716		/**
717		* iterator iterates through all elements
718		*/
719		public void testIterator() throws InterruptedException {
720		ArrayBlockingQueue q = populatedQueue(SIZE);
721		Iterator it = q.iterator();
722	<	while (it.hasNext()) {
722	>	int i;
723	>	for (i = 0; it.hasNext(); i++)
724	>	assertTrue(q.contains(it.next()));
725	>	assertEquals(i, SIZE);
726	>	assertIteratorExhausted(it);
727	>
728	>	it = q.iterator();
729	>	for (i = 0; it.hasNext(); i++)
730		assertEquals(it.next(), q.take());
731	<	}
731	>	assertEquals(i, SIZE);
732	>	assertIteratorExhausted(it);
733	>	}
734	>
735	>	/**
736	>	* iterator of empty collection has no elements
737	>	*/
738	>	public void testEmptyIterator() {
739	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
740		}
741
742		/**
#	Line 722 | Line 791 | public class ArrayBlockingQueueTest exte
791		assertEquals(0, q.size());
792		}
793
725	–
794		/**
795		* toString contains toStrings of elements
796		*/
#	Line 730 | Line 798 | public class ArrayBlockingQueueTest exte
798		ArrayBlockingQueue q = populatedQueue(SIZE);
799		String s = q.toString();
800		for (int i = 0; i < SIZE; ++i) {
801	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
801	>	assertTrue(s.contains(String.valueOf(i)));
802		}
803		}
804
737	–
805		/**
806		* offer transfers elements across Executor tasks
807		*/
#	Line 742 | Line 809 | public class ArrayBlockingQueueTest exte
809		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
810		q.add(one);
811		q.add(two);
812	<	ExecutorService executor = Executors.newFixedThreadPool(2);
813	<	executor.execute(new CheckedRunnable() {
814	<	public void realRun() throws InterruptedException {
815	<	assertFalse(q.offer(three));
816	<	assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
817	<	assertEquals(0, q.remainingCapacity());
818	<	}});
819	<
820	<	executor.execute(new CheckedRunnable() {
821	<	public void realRun() throws InterruptedException {
822	<	Thread.sleep(SMALL_DELAY_MS);
823	<	assertSame(one, q.take());
824	<	}});
825	<
826	<	joinPool(executor);
812	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
813	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
814	>	try (PoolCleaner cleaner = cleaner(executor)) {
815	>	executor.execute(new CheckedRunnable() {
816	>	public void realRun() throws InterruptedException {
817	>	assertFalse(q.offer(three));
818	>	threadsStarted.await();
819	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
820	>	assertEquals(0, q.remainingCapacity());
821	>	}});
822	>
823	>	executor.execute(new CheckedRunnable() {
824	>	public void realRun() throws InterruptedException {
825	>	threadsStarted.await();
826	>	assertEquals(0, q.remainingCapacity());
827	>	assertSame(one, q.take());
828	>	}});
829	>	}
830		}
831
832		/**
833	<	* poll retrieves elements across Executor threads
833	>	* timed poll retrieves elements across Executor threads
834		*/
835		public void testPollInExecutor() {
836		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
837	<	ExecutorService executor = Executors.newFixedThreadPool(2);
838	<	executor.execute(new CheckedRunnable() {
839	<	public void realRun() throws InterruptedException {
840	<	assertNull(q.poll());
841	<	assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
842	<	assertTrue(q.isEmpty());
843	<	}});
844	<
845	<	executor.execute(new CheckedRunnable() {
846	<	public void realRun() throws InterruptedException {
847	<	Thread.sleep(SMALL_DELAY_MS);
848	<	q.put(one);
849	<	}});
850	<
851	<	joinPool(executor);
837	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
838	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
839	>	try (PoolCleaner cleaner = cleaner(executor)) {
840	>	executor.execute(new CheckedRunnable() {
841	>	public void realRun() throws InterruptedException {
842	>	assertNull(q.poll());
843	>	threadsStarted.await();
844	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
845	>	checkEmpty(q);
846	>	}});
847	>
848	>	executor.execute(new CheckedRunnable() {
849	>	public void realRun() throws InterruptedException {
850	>	threadsStarted.await();
851	>	q.put(one);
852	>	}});
853	>	}
854		}
855
856		/**
857		* A deserialized serialized queue has same elements in same order
858		*/
859		public void testSerialization() throws Exception {
860	<	ArrayBlockingQueue q = populatedQueue(SIZE);
860	>	Queue x = populatedQueue(SIZE);
861	>	Queue y = serialClone(x);
862
863	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
864	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
865	<	out.writeObject(q);
866	<	out.close();
867	<
868	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
869	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
870	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
871	<	assertEquals(q.size(), r.size());
799	<	while (!q.isEmpty())
800	<	assertEquals(q.remove(), r.remove());
801	<	}
802	<
803	<	/**
804	<	* drainTo(null) throws NPE
805	<	*/
806	<	public void testDrainToNull() {
807	<	ArrayBlockingQueue q = populatedQueue(SIZE);
808	<	try {
809	<	q.drainTo(null);
810	<	shouldThrow();
811	<	} catch (NullPointerException success) {}
812	<	}
813	<
814	<	/**
815	<	* drainTo(this) throws IAE
816	<	*/
817	<	public void testDrainToSelf() {
818	<	ArrayBlockingQueue q = populatedQueue(SIZE);
819	<	try {
820	<	q.drainTo(q);
821	<	shouldThrow();
822	<	} catch (IllegalArgumentException success) {}
863	>	assertNotSame(x, y);
864	>	assertEquals(x.size(), y.size());
865	>	assertEquals(x.toString(), y.toString());
866	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
867	>	while (!x.isEmpty()) {
868	>	assertFalse(y.isEmpty());
869	>	assertEquals(x.remove(), y.remove());
870	>	}
871	>	assertTrue(y.isEmpty());
872		}
873
874		/**
#	Line 829 | Line 878 | public class ArrayBlockingQueueTest exte
878		ArrayBlockingQueue q = populatedQueue(SIZE);
879		ArrayList l = new ArrayList();
880		q.drainTo(l);
881	<	assertEquals(q.size(), 0);
882	<	assertEquals(l.size(), SIZE);
881	>	assertEquals(0, q.size());
882	>	assertEquals(SIZE, l.size());
883		for (int i = 0; i < SIZE; ++i)
884		assertEquals(l.get(i), new Integer(i));
885		q.add(zero);
#	Line 840 | Line 889 | public class ArrayBlockingQueueTest exte
889		assertTrue(q.contains(one));
890		l.clear();
891		q.drainTo(l);
892	<	assertEquals(q.size(), 0);
893	<	assertEquals(l.size(), 2);
892	>	assertEquals(0, q.size());
893	>	assertEquals(2, l.size());
894		for (int i = 0; i < 2; ++i)
895		assertEquals(l.get(i), new Integer(i));
896		}
#	Line 853 | Line 902 | public class ArrayBlockingQueueTest exte
902		final ArrayBlockingQueue q = populatedQueue(SIZE);
903		Thread t = new Thread(new CheckedRunnable() {
904		public void realRun() throws InterruptedException {
905	<	q.put(new Integer(SIZE+1));
905	>	q.put(new Integer(SIZE + 1));
906		}});
907
908		t.start();
#	Line 867 | Line 916 | public class ArrayBlockingQueueTest exte
916		}
917
918		/**
870	–	* drainTo(null, n) throws NPE
871	–	*/
872	–	public void testDrainToNullN() {
873	–	ArrayBlockingQueue q = populatedQueue(SIZE);
874	–	try {
875	–	q.drainTo(null, 0);
876	–	shouldThrow();
877	–	} catch (NullPointerException success) {}
878	–	}
879	–
880	–	/**
881	–	* drainTo(this, n) throws IAE
882	–	*/
883	–	public void testDrainToSelfN() {
884	–	ArrayBlockingQueue q = populatedQueue(SIZE);
885	–	try {
886	–	q.drainTo(q, 0);
887	–	shouldThrow();
888	–	} catch (IllegalArgumentException success) {}
889	–	}
890	–
891	–	/**
919		* drainTo(c, n) empties first min(n, size) elements of queue into c
920		*/
921		public void testDrainToN() {
922	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
922	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
923		for (int i = 0; i < SIZE + 2; ++i) {
924		for (int j = 0; j < SIZE; j++)
925		assertTrue(q.offer(new Integer(j)));
926		ArrayList l = new ArrayList();
927		q.drainTo(l, i);
928		int k = (i < SIZE) ? i : SIZE;
929	<	assertEquals(l.size(), k);
930	<	assertEquals(q.size(), SIZE-k);
929	>	assertEquals(k, l.size());
930	>	assertEquals(SIZE - k, q.size());
931		for (int j = 0; j < k; ++j)
932		assertEquals(l.get(j), new Integer(j));
933	<	while (q.poll() != null) ;
933	>	do {} while (q.poll() != null);
934		}
935		}
936
937	+	/**
938	+	* remove(null), contains(null) always return false
939	+	*/
940	+	public void testNeverContainsNull() {
941	+	Collection<?>[] qs = {
942	+	populatedQueue(0, 1, 10, false),
943	+	populatedQueue(2, 2, 10, true),
944	+	};
945	+
946	+	for (Collection<?> q : qs) {
947	+	assertFalse(q.contains(null));
948	+	assertFalse(q.remove(null));
949	+	}
950	+	}
951		}

Diff Legend

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