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.97 by jsr166, Mon Dec 16 21:16:08 2019 UTC vs.
Revision 1.98 by dl, Tue Jan 26 13:33:05 2021 UTC

#	Line 37 | Line 37 | public class ArrayBlockingQueueTest exte
37		boolean fair = randomBoolean();
38		return populatedQueue(0, SIZE, 2 * SIZE, fair);
39		}
40	<	public Object makeElement(int i) { return i; }
40	>	public Object makeElement(int i) { return JSR166TestCase.itemFor(i); }
41		public boolean isConcurrent() { return true; }
42		public boolean permitsNulls() { return false; }
43		}
#	Line 50 | Line 50 | public class ArrayBlockingQueueTest exte
50		}
51
52		public static class Fair extends BlockingQueueTest {
53	<	protected BlockingQueue emptyCollection() {
53	>	protected BlockingQueue<Item> emptyCollection() {
54		return populatedQueue(0, SIZE, 2 * SIZE, true);
55		}
56		}
57
58		public static class NonFair extends BlockingQueueTest {
59	<	protected BlockingQueue emptyCollection() {
59	>	protected BlockingQueue<Item> emptyCollection() {
60		return populatedQueue(0, SIZE, 2 * SIZE, false);
61		}
62		}
63
64		/**
65		* Returns a new queue of given size containing consecutive
66	<	* Integers 0 ... n - 1.
66	>	* Items 0 ... n - 1.
67		*/
68	<	static ArrayBlockingQueue<Integer> populatedQueue(int n) {
68	>	static ArrayBlockingQueue<Item> 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 - 1, with given capacity range and fairness.
74	>	* Items 0 ... n - 1, with given capacity range and fairness.
75		*/
76	<	static ArrayBlockingQueue<Integer> populatedQueue(
76	>	static ArrayBlockingQueue<Item> 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);
80	>	ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(capacity);
81		assertTrue(q.isEmpty());
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);
85	>	for (int i = 0; i < n; i++) q.add(fortytwo);
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());
89	>	mustOffer(q, i);
90	>	mustEqual(size == 0, q.isEmpty());
91	>	mustEqual(capacity - size, q.remainingCapacity());
92	>	mustEqual(size, q.size());
93		if (size > 0)
94	<	assertEquals((Integer) 0, q.peek());
94	>	mustEqual(0, q.peek());
95		return q;
96		}
97
#	Line 99 | Line 99 | public class ArrayBlockingQueueTest exte
99		* A new queue has the indicated capacity
100		*/
101		public void testConstructor1() {
102	<	assertEquals(SIZE, new ArrayBlockingQueue(SIZE).remainingCapacity());
102	>	mustEqual(SIZE, new ArrayBlockingQueue<Item>(SIZE).remainingCapacity());
103		}
104
105		/**
#	Line 108 | Line 108 | public class ArrayBlockingQueueTest exte
108		public void testConstructor_nonPositiveCapacity() {
109		for (int i : new int[] { 0, -1, Integer.MIN_VALUE }) {
110		try {
111	<	new ArrayBlockingQueue(i);
111	>	new ArrayBlockingQueue<Item>(i);
112		shouldThrow();
113		} catch (IllegalArgumentException success) {}
114		for (boolean fair : new boolean[] { true, false }) {
115		try {
116	<	new ArrayBlockingQueue(i, fair);
116	>	new ArrayBlockingQueue<Item>(i, fair);
117		shouldThrow();
118		} catch (IllegalArgumentException success) {}
119		}
#	Line 125 | Line 125 | public class ArrayBlockingQueueTest exte
125		*/
126		public void testConstructor_nullCollection() {
127		try {
128	<	new ArrayBlockingQueue(1, true, null);
128	>	new ArrayBlockingQueue<Item>(1, true, null);
129		shouldThrow();
130		} catch (NullPointerException success) {}
131		}
#	Line 134 | 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]);
137	>	Collection<Item> elements = Arrays.asList(new Item[SIZE]);
138		try {
139	<	new ArrayBlockingQueue(SIZE, false, elements);
139	>	new ArrayBlockingQueue<Item>(SIZE, false, elements);
140		shouldThrow();
141		} catch (NullPointerException success) {}
142		}
#	Line 145 | 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);
148	>	Item[] items = new Item[2]; items[0] = zero;
149	>	Collection<Item> elements = Arrays.asList(items);
150		try {
151	<	new ArrayBlockingQueue(SIZE, false, elements);
151	>	new ArrayBlockingQueue<Item>(SIZE, false, elements);
152		shouldThrow();
153		} catch (NullPointerException success) {}
154		}
#	Line 160 | Line 158 | public class ArrayBlockingQueueTest exte
158		*/
159		public void testConstructor_collectionTooLarge() {
160		// just barely fits - succeeds
161	<	new ArrayBlockingQueue(SIZE, false,
162	<	Collections.nCopies(SIZE, ""));
161	>	new ArrayBlockingQueue<Object>(SIZE, false,
162	>	Collections.nCopies(SIZE, ""));
163		try {
164	<	new ArrayBlockingQueue(SIZE - 1, false,
164	>	new ArrayBlockingQueue<Object>(SIZE - 1, false,
165		Collections.nCopies(SIZE, ""));
166		shouldThrow();
167		} catch (IllegalArgumentException success) {}
#	Line 173 | Line 171 | public class ArrayBlockingQueueTest exte
171		* Queue contains all elements of collection used to initialize
172		*/
173		public void testConstructor7() {
174	<	Integer[] ints = new Integer[SIZE];
174	>	Item[] items = defaultItems;
175	>	Collection<Item> elements = Arrays.asList(items);
176	>	ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(SIZE, true, elements);
177		for (int i = 0; i < SIZE; ++i)
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());
178	>	mustEqual(items[i], q.poll());
179		}
180
181		/**
182		* Queue transitions from empty to full when elements added
183		*/
184		public void testEmptyFull() {
185	<	BlockingQueue q = populatedQueue(0, 2, 2, false);
185	>	BlockingQueue<Item> q = populatedQueue(0, 2, 2, false);
186		assertTrue(q.isEmpty());
187	<	assertEquals(2, q.remainingCapacity());
187	>	mustEqual(2, q.remainingCapacity());
188		q.add(one);
189		assertFalse(q.isEmpty());
190		assertTrue(q.offer(two));
191		assertFalse(q.isEmpty());
192	<	assertEquals(0, q.remainingCapacity());
192	>	mustEqual(0, q.remainingCapacity());
193		assertFalse(q.offer(three));
194		}
195
#	Line 202 | Line 198 | public class ArrayBlockingQueueTest exte
198		*/
199		public void testRemainingCapacity() {
200		int size = ThreadLocalRandom.current().nextInt(1, SIZE);
201	<	BlockingQueue q = populatedQueue(size, size, 2 * size, false);
201	>	BlockingQueue<Item> q = populatedQueue(size, size, 2 * size, false);
202		int spare = q.remainingCapacity();
203		int capacity = spare + size;
204		for (int i = 0; i < size; i++) {
205	<	assertEquals(spare + i, q.remainingCapacity());
206	<	assertEquals(capacity, q.size() + q.remainingCapacity());
207	<	assertEquals(i, q.remove());
205	>	mustEqual(spare + i, q.remainingCapacity());
206	>	mustEqual(capacity, q.size() + q.remainingCapacity());
207	>	mustEqual(i, q.remove());
208		}
209		for (int i = 0; i < size; i++) {
210	<	assertEquals(capacity - i, q.remainingCapacity());
211	<	assertEquals(capacity, q.size() + q.remainingCapacity());
212	<	assertTrue(q.add(i));
210	>	mustEqual(capacity - i, q.remainingCapacity());
211	>	mustEqual(capacity, q.size() + q.remainingCapacity());
212	>	mustAdd(q, i);
213		}
214		}
215
#	Line 221 | Line 217 | public class ArrayBlockingQueueTest exte
217		* Offer succeeds if not full; fails if full
218		*/
219		public void testOffer() {
220	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
220	>	ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(1);
221		assertTrue(q.offer(zero));
222		assertFalse(q.offer(one));
223		}
#	Line 230 | Line 226 | public class ArrayBlockingQueueTest exte
226		* add succeeds if not full; throws IllegalStateException if full
227		*/
228		public void testAdd() {
229	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
230	<	for (int i = 0; i < SIZE; i++) assertTrue(q.add((Integer) i));
231	<	assertEquals(0, q.remainingCapacity());
229	>	ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(SIZE);
230	>	for (int i = 0; i < SIZE; i++) assertTrue(q.add(itemFor(i)));
231	>	mustEqual(0, q.remainingCapacity());
232		try {
233	<	q.add((Integer) SIZE);
233	>	q.add(itemFor(SIZE));
234		shouldThrow();
235		} catch (IllegalStateException success) {}
236		}
#	Line 243 | Line 239 | public class ArrayBlockingQueueTest exte
239		* addAll(this) throws IllegalArgumentException
240		*/
241		public void testAddAllSelf() {
242	<	ArrayBlockingQueue q = populatedQueue(SIZE);
242	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
243		try {
244		q.addAll(q);
245		shouldThrow();
#	Line 255 | Line 251 | public class ArrayBlockingQueueTest exte
251		* possibly adding some elements
252		*/
253		public void testAddAll3() {
254	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
255	<	Integer[] ints = new Integer[SIZE];
260	<	for (int i = 0; i < SIZE - 1; ++i)
261	<	ints[i] = new Integer(i);
254	>	ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(SIZE);
255	>	Item[] items = new Item[2]; items[0] = zero;
256		try {
257	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(items));
258		shouldThrow();
259		} catch (NullPointerException success) {}
260		}
#	Line 270 | Line 264 | public class ArrayBlockingQueueTest exte
264		*/
265		public void testAddAll_insufficientSpace() {
266		int size = ThreadLocalRandom.current().nextInt(1, SIZE);
267	<	ArrayBlockingQueue q = populatedQueue(0, size, size, false);
267	>	ArrayBlockingQueue<Item> q = populatedQueue(0, size, size, false);
268		// Just fits:
269		q.addAll(populatedQueue(size, size, 2 * size, false));
270	<	assertEquals(0, q.remainingCapacity());
271	<	assertEquals(size, q.size());
272	<	assertEquals(0, q.peek());
270	>	mustEqual(0, q.remainingCapacity());
271	>	mustEqual(size, q.size());
272	>	mustEqual(0, q.peek());
273		try {
274		q = populatedQueue(0, size, size, false);
275	<	q.addAll(Collections.nCopies(size + 1, 42));
275	>	q.addAll(Collections.nCopies(size + 1, fortytwo));
276		shouldThrow();
277		} catch (IllegalStateException success) {}
278		}
#	Line 287 | Line 281 | public class ArrayBlockingQueueTest exte
281		* Queue contains all elements, in traversal order, of successful addAll
282		*/
283		public void testAddAll5() {
284	<	Integer[] empty = new Integer[0];
285	<	Integer[] ints = new Integer[SIZE];
286	<	for (int i = 0; i < SIZE; ++i)
293	<	ints[i] = new Integer(i);
294	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
284	>	Item[] empty = new Item[0];
285	>	Item[] items = defaultItems;
286	>	ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(SIZE);
287		assertFalse(q.addAll(Arrays.asList(empty)));
288	<	assertTrue(q.addAll(Arrays.asList(ints)));
288	>	assertTrue(q.addAll(Arrays.asList(items)));
289		for (int i = 0; i < SIZE; ++i)
290	<	assertEquals(ints[i], q.poll());
290	>	mustEqual(items[i], q.poll());
291		}
292
293		/**
294		* all elements successfully put are contained
295		*/
296		public void testPut() throws InterruptedException {
297	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
297	>	ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(SIZE);
298		for (int i = 0; i < SIZE; ++i) {
299	<	Integer x = new Integer(i);
299	>	Item x = itemFor(i);
300		q.put(x);
301	<	assertTrue(q.contains(x));
301	>	mustContain(q, x);
302		}
303	<	assertEquals(0, q.remainingCapacity());
303	>	mustEqual(0, q.remainingCapacity());
304		}
305
306		/**
307		* put blocks interruptibly if full
308		*/
309		public void testBlockingPut() throws InterruptedException {
310	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
310	>	final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(SIZE);
311		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
312		Thread t = newStartedThread(new CheckedRunnable() {
313		public void realRun() throws InterruptedException {
314		for (int i = 0; i < SIZE; ++i)
315	<	q.put(i);
316	<	assertEquals(SIZE, q.size());
317	<	assertEquals(0, q.remainingCapacity());
315	>	q.put(itemFor(i));
316	>	mustEqual(SIZE, q.size());
317	>	mustEqual(0, q.remainingCapacity());
318
319		Thread.currentThread().interrupt();
320		try {
321	<	q.put(99);
321	>	q.put(ninetynine);
322		shouldThrow();
323		} catch (InterruptedException success) {}
324		assertFalse(Thread.interrupted());
325
326		pleaseInterrupt.countDown();
327		try {
328	<	q.put(99);
328	>	q.put(ninetynine);
329		shouldThrow();
330		} catch (InterruptedException success) {}
331		assertFalse(Thread.interrupted());
#	Line 343 | Line 335 | public class ArrayBlockingQueueTest exte
335		if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
336		t.interrupt();
337		awaitTermination(t);
338	<	assertEquals(SIZE, q.size());
339	<	assertEquals(0, q.remainingCapacity());
338	>	mustEqual(SIZE, q.size());
339	>	mustEqual(0, q.remainingCapacity());
340		}
341
342		/**
#	Line 352 | Line 344 | public class ArrayBlockingQueueTest exte
344		*/
345		public void testPutWithTake() throws InterruptedException {
346		final int capacity = 2;
347	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
347	>	final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(capacity);
348		final CountDownLatch pleaseTake = new CountDownLatch(1);
349		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
350		Thread t = newStartedThread(new CheckedRunnable() {
351		public void realRun() throws InterruptedException {
352		for (int i = 0; i < capacity; i++)
353	<	q.put(i);
353	>	q.put(itemFor(i));
354		pleaseTake.countDown();
355	<	q.put(86);
355	>	q.put(eightysix);
356
357		Thread.currentThread().interrupt();
358		try {
359	<	q.put(99);
359	>	q.put(ninetynine);
360		shouldThrow();
361		} catch (InterruptedException success) {}
362		assertFalse(Thread.interrupted());
363
364		pleaseInterrupt.countDown();
365		try {
366	<	q.put(99);
366	>	q.put(ninetynine);
367		shouldThrow();
368		} catch (InterruptedException success) {}
369		assertFalse(Thread.interrupted());
370		}});
371
372		await(pleaseTake);
373	<	assertEquals(0, q.remainingCapacity());
374	<	assertEquals(0, q.take());
373	>	mustEqual(0, q.remainingCapacity());
374	>	mustEqual(0, q.take());
375
376		await(pleaseInterrupt);
377		if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
378		t.interrupt();
379		awaitTermination(t);
380	<	assertEquals(0, q.remainingCapacity());
380	>	mustEqual(0, q.remainingCapacity());
381		}
382
383		/**
384		* timed offer times out if full and elements not taken
385		*/
386		public void testTimedOffer() {
387	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
387	>	final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(2);
388		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
389		Thread t = newStartedThread(new CheckedRunnable() {
390		public void realRun() throws InterruptedException {
391	<	q.put(new Object());
392	<	q.put(new Object());
391	>	q.put(one);
392	>	q.put(two);
393		long startTime = System.nanoTime();
394	<	assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
394	>	assertFalse(q.offer(zero, timeoutMillis(), MILLISECONDS));
395		assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
396
397		Thread.currentThread().interrupt();
398		try {
399	<	q.offer(new Object(), randomTimeout(), randomTimeUnit());
399	>	q.offer(three, randomTimeout(), randomTimeUnit());
400		shouldThrow();
401		} catch (InterruptedException success) {}
402		assertFalse(Thread.interrupted());
403
404		pleaseInterrupt.countDown();
405		try {
406	<	q.offer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
406	>	q.offer(four, LONGER_DELAY_MS, MILLISECONDS);
407		shouldThrow();
408		} catch (InterruptedException success) {}
409		assertFalse(Thread.interrupted());
#	Line 427 | Line 419 | public class ArrayBlockingQueueTest exte
419		* take retrieves elements in FIFO order
420		*/
421		public void testTake() throws InterruptedException {
422	<	ArrayBlockingQueue q = populatedQueue(SIZE);
422	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
423		for (int i = 0; i < SIZE; ++i) {
424	<	assertEquals(i, q.take());
424	>	mustEqual(i, q.take());
425		}
426		}
427
#	Line 437 | Line 429 | public class ArrayBlockingQueueTest exte
429		* Take removes existing elements until empty, then blocks interruptibly
430		*/
431		public void testBlockingTake() throws InterruptedException {
432	<	final ArrayBlockingQueue q = populatedQueue(SIZE);
432	>	final ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
433		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
434		Thread t = newStartedThread(new CheckedRunnable() {
435		public void realRun() throws InterruptedException {
436	<	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
436	>	for (int i = 0; i < SIZE; i++) mustEqual(i, q.take());
437
438		Thread.currentThread().interrupt();
439		try {
#	Line 468 | Line 460 | public class ArrayBlockingQueueTest exte
460		* poll succeeds unless empty
461		*/
462		public void testPoll() {
463	<	ArrayBlockingQueue q = populatedQueue(SIZE);
463	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
464		for (int i = 0; i < SIZE; ++i) {
465	<	assertEquals(i, q.poll());
465	>	mustEqual(i, q.poll());
466		}
467		assertNull(q.poll());
468		}
#	Line 479 | Line 471 | public class ArrayBlockingQueueTest exte
471		* timed poll with zero timeout succeeds when non-empty, else times out
472		*/
473		public void testTimedPoll0() throws InterruptedException {
474	<	ArrayBlockingQueue q = populatedQueue(SIZE);
474	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
475		for (int i = 0; i < SIZE; ++i) {
476	<	assertEquals(i, q.poll(0, MILLISECONDS));
476	>	mustEqual(i, q.poll(0, MILLISECONDS));
477		}
478		assertNull(q.poll(0, MILLISECONDS));
479		checkEmpty(q);
#	Line 491 | Line 483 | public class ArrayBlockingQueueTest exte
483		* timed poll with nonzero timeout succeeds when non-empty, else times out
484		*/
485		public void testTimedPoll() throws InterruptedException {
486	<	ArrayBlockingQueue q = populatedQueue(SIZE);
486	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
487		for (int i = 0; i < SIZE; ++i) {
488		long startTime = System.nanoTime();
489	<	assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
489	>	mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
490		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
491		}
492		long startTime = System.nanoTime();
#	Line 508 | Line 500 | public class ArrayBlockingQueueTest exte
500		* returning timeout status
501		*/
502		public void testInterruptedTimedPoll() throws InterruptedException {
503	<	final BlockingQueue<Integer> q = populatedQueue(SIZE);
503	>	final BlockingQueue<Item> q = populatedQueue(SIZE);
504		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
505		Thread t = newStartedThread(new CheckedRunnable() {
506		public void realRun() throws InterruptedException {
507		for (int i = 0; i < SIZE; i++)
508	<	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
508	>	mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
509
510		Thread.currentThread().interrupt();
511		try {
#	Line 541 | Line 533 | public class ArrayBlockingQueueTest exte
533		* peek returns next element, or null if empty
534		*/
535		public void testPeek() {
536	<	ArrayBlockingQueue q = populatedQueue(SIZE);
536	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
537		for (int i = 0; i < SIZE; ++i) {
538	<	assertEquals(i, q.peek());
539	<	assertEquals(i, q.poll());
538	>	mustEqual(i, q.peek());
539	>	mustEqual(i, q.poll());
540		assertTrue(q.peek() == null ||
541		!q.peek().equals(i));
542		}
#	Line 555 | Line 547 | public class ArrayBlockingQueueTest exte
547		* element returns next element, or throws NSEE if empty
548		*/
549		public void testElement() {
550	<	ArrayBlockingQueue q = populatedQueue(SIZE);
550	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
551		for (int i = 0; i < SIZE; ++i) {
552	<	assertEquals(i, q.element());
553	<	assertEquals(i, q.poll());
552	>	mustEqual(i, q.element());
553	>	mustEqual(i, q.poll());
554		}
555		try {
556		q.element();
#	Line 570 | Line 562 | public class ArrayBlockingQueueTest exte
562		* remove removes next element, or throws NSEE if empty
563		*/
564		public void testRemove() {
565	<	ArrayBlockingQueue q = populatedQueue(SIZE);
565	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
566		for (int i = 0; i < SIZE; ++i) {
567	<	assertEquals(i, q.remove());
567	>	mustEqual(i, q.remove());
568		}
569		try {
570		q.remove();
#	Line 585 | Line 577 | public class ArrayBlockingQueueTest exte
577		*/
578		public void testContains() {
579		int size = ThreadLocalRandom.current().nextInt(1, SIZE);
580	<	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
580	>	ArrayBlockingQueue<Item> q = populatedQueue(size, size, 2 * size, false);
581		assertFalse(q.contains(null));
582		for (int i = 0; i < size; ++i) {
583	<	assertTrue(q.contains(new Integer(i)));
584	<	assertEquals(i, q.poll());
585	<	assertFalse(q.contains(new Integer(i)));
583	>	mustContain(q, i);
584	>	mustEqual(i, q.poll());
585	>	mustNotContain(q, i);
586		}
587		}
588
#	Line 599 | Line 591 | public class ArrayBlockingQueueTest exte
591		*/
592		public void testClear() {
593		int size = ThreadLocalRandom.current().nextInt(1, 5);
594	<	ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
594	>	ArrayBlockingQueue<Item> q = populatedQueue(size, size, 2 * size, false);
595		int capacity = size + q.remainingCapacity();
596		q.clear();
597		assertTrue(q.isEmpty());
598	<	assertEquals(0, q.size());
599	<	assertEquals(capacity, q.remainingCapacity());
598	>	mustEqual(0, q.size());
599	>	mustEqual(capacity, q.remainingCapacity());
600		q.add(one);
601		assertFalse(q.isEmpty());
602	<	assertTrue(q.contains(one));
602	>	mustContain(q, one);
603		q.clear();
604		assertTrue(q.isEmpty());
605		}
#	Line 616 | Line 608 | public class ArrayBlockingQueueTest exte
608		* containsAll(c) is true when c contains a subset of elements
609		*/
610		public void testContainsAll() {
611	<	ArrayBlockingQueue q = populatedQueue(SIZE);
612	<	ArrayBlockingQueue p = new ArrayBlockingQueue(SIZE);
611	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
612	>	ArrayBlockingQueue<Item> p = new ArrayBlockingQueue<Item>(SIZE);
613		for (int i = 0; i < SIZE; ++i) {
614		assertTrue(q.containsAll(p));
615		assertFalse(p.containsAll(q));
616	<	p.add(new Integer(i));
616	>	mustAdd(p, i);
617		}
618		assertTrue(p.containsAll(q));
619		}
#	Line 630 | Line 622 | public class ArrayBlockingQueueTest exte
622		* retainAll(c) retains only those elements of c and reports true if changed
623		*/
624		public void testRetainAll() {
625	<	ArrayBlockingQueue q = populatedQueue(SIZE);
626	<	ArrayBlockingQueue p = populatedQueue(SIZE);
625	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
626	>	ArrayBlockingQueue<Item> p = populatedQueue(SIZE);
627		for (int i = 0; i < SIZE; ++i) {
628		boolean changed = q.retainAll(p);
629		if (i == 0)
#	Line 640 | Line 632 | public class ArrayBlockingQueueTest exte
632		assertTrue(changed);
633
634		assertTrue(q.containsAll(p));
635	<	assertEquals(SIZE - i, q.size());
635	>	mustEqual(SIZE - i, q.size());
636		p.remove();
637		}
638		}
#	Line 650 | Line 642 | public class ArrayBlockingQueueTest exte
642		*/
643		public void testRemoveAll() {
644		for (int i = 1; i < SIZE; ++i) {
645	<	ArrayBlockingQueue q = populatedQueue(SIZE);
646	<	ArrayBlockingQueue p = populatedQueue(i);
645	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
646	>	ArrayBlockingQueue<Item> p = populatedQueue(i);
647		assertTrue(q.removeAll(p));
648	<	assertEquals(SIZE - i, q.size());
648	>	mustEqual(SIZE - i, q.size());
649		for (int j = 0; j < i; ++j) {
650	<	Integer x = (Integer)(p.remove());
651	<	assertFalse(q.contains(x));
650	>	Item x = p.remove();
651	>	mustNotContain(q, x);
652		}
653		}
654		}
655
656	<	void checkToArray(ArrayBlockingQueue<Integer> q) {
656	>	void checkToArray(ArrayBlockingQueue<Item> q) {
657		int size = q.size();
658		Object[] a1 = q.toArray();
659	<	assertEquals(size, a1.length);
660	<	Integer[] a2 = q.toArray(new Integer[0]);
661	<	assertEquals(size, a2.length);
662	<	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
663	<	assertEquals(size, a3.length);
664	<	Integer[] a4 = new Integer[size];
659	>	mustEqual(size, a1.length);
660	>	Item[] a2 = q.toArray(new Item[0]);
661	>	mustEqual(size, a2.length);
662	>	Item[] a3 = q.toArray(new Item[Math.max(0, size - 1)]);
663	>	mustEqual(size, a3.length);
664	>	Item[] a4 = new Item[size];
665		assertSame(a4, q.toArray(a4));
666	<	Integer[] a5 = new Integer[size + 1];
667	<	Arrays.fill(a5, 42);
666	>	Item[] a5 = new Item[size + 1];
667	>	Arrays.fill(a5, fortytwo);
668		assertSame(a5, q.toArray(a5));
669	<	Integer[] a6 = new Integer[size + 2];
670	<	Arrays.fill(a6, 42);
669	>	Item[] a6 = new Item[size + 2];
670	>	Arrays.fill(a6, fortytwo);
671		assertSame(a6, q.toArray(a6));
672		Object[][] as = { a1, a2, a3, a4, a5, a6 };
673		for (Object[] a : as) {
674		if (a.length > size) assertNull(a[size]);
675	<	if (a.length > size + 1) assertEquals(42, a[size + 1]);
675	>	if (a.length > size + 1) mustEqual(fortytwo, a[size + 1]);
676		}
677	<	Iterator it = q.iterator();
678	<	Integer s = q.peek();
677	>	Iterator<? extends Item> it = q.iterator();
678	>	Item s = q.peek();
679		for (int i = 0; i < size; i++) {
680	<	Integer x = (Integer) it.next();
681	<	assertEquals(s + i, (int) x);
680	>	Item x = (Item) it.next();
681	>	mustEqual(s.value + i, x);
682		for (Object[] a : as)
683	<	assertSame(a[i], x);
683	>	mustEqual(a[i], x);
684		}
685		}
686
#	Line 699 | Line 691 | public class ArrayBlockingQueueTest exte
691		final ThreadLocalRandom rnd = ThreadLocalRandom.current();
692		final int size = rnd.nextInt(6);
693		final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
694	<	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
694	>	ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<>(capacity);
695		for (int i = 0; i < size; i++) {
696		checkToArray(q);
697	<	q.add(i);
697	>	mustAdd(q, i);
698		}
699		// Provoke wraparound
700		int added = size * 2;
701		for (int i = 0; i < added; i++) {
702		checkToArray(q);
703	<	assertEquals((Integer) i, q.poll());
704	<	q.add(size + i);
703	>	mustEqual(i, q.poll());
704	>	q.add(new Item(size + i));
705		}
706		for (int i = 0; i < size; i++) {
707		checkToArray(q);
708	<	assertEquals((Integer) (added + i), q.poll());
708	>	mustEqual((added + i), q.poll());
709		}
710		}
711
#	Line 721 | Line 713 | public class ArrayBlockingQueueTest exte
713		* toArray(incompatible array type) throws ArrayStoreException
714		*/
715		public void testToArray_incompatibleArrayType() {
716	<	ArrayBlockingQueue q = populatedQueue(SIZE);
716	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
717		try {
718		q.toArray(new String[10]);
719		shouldThrow();
#	Line 736 | Line 728 | public class ArrayBlockingQueueTest exte
728		* iterator iterates through all elements
729		*/
730		public void testIterator() throws InterruptedException {
731	<	ArrayBlockingQueue q = populatedQueue(SIZE);
732	<	Iterator it = q.iterator();
731	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
732	>	Iterator<? extends Item> it = q.iterator();
733		int i;
734		for (i = 0; it.hasNext(); i++)
735	<	assertTrue(q.contains(it.next()));
736	<	assertEquals(i, SIZE);
735	>	mustContain(q, it.next());
736	>	mustEqual(i, SIZE);
737		assertIteratorExhausted(it);
738
739		it = q.iterator();
740		for (i = 0; it.hasNext(); i++)
741	<	assertEquals(it.next(), q.take());
742	<	assertEquals(i, SIZE);
741	>	mustEqual(it.next(), q.take());
742	>	mustEqual(i, SIZE);
743		assertIteratorExhausted(it);
744		}
745
#	Line 755 | Line 747 | public class ArrayBlockingQueueTest exte
747		* iterator of empty collection has no elements
748		*/
749		public void testEmptyIterator() {
750	<	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
750	>	assertIteratorExhausted(new ArrayBlockingQueue<Item>(SIZE).iterator());
751		}
752
753		/**
754		* iterator.remove removes current element
755		*/
756		public void testIteratorRemove() {
757	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
757	>	final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(3);
758		q.add(two);
759		q.add(one);
760		q.add(three);
761
762	<	Iterator it = q.iterator();
762	>	Iterator<? extends Item> it = q.iterator();
763		it.next();
764		it.remove();
765
#	Line 781 | Line 773 | public class ArrayBlockingQueueTest exte
773		* iterator ordering is FIFO
774		*/
775		public void testIteratorOrdering() {
776	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
776	>	final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(3);
777		q.add(one);
778		q.add(two);
779		q.add(three);
#	Line 789 | Line 781 | public class ArrayBlockingQueueTest exte
781		assertEquals("queue should be full", 0, q.remainingCapacity());
782
783		int k = 0;
784	<	for (Iterator it = q.iterator(); it.hasNext();) {
785	<	assertEquals(++k, it.next());
784	>	for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
785	>	mustEqual(++k, it.next());
786		}
787	<	assertEquals(3, k);
787	>	mustEqual(3, k);
788		}
789
790		/**
791		* Modifications do not cause iterators to fail
792		*/
793		public void testWeaklyConsistentIteration() {
794	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
794	>	final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(3);
795		q.add(one);
796		q.add(two);
797		q.add(three);
798	<	for (Iterator it = q.iterator(); it.hasNext();) {
798	>	for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
799		q.remove();
800		it.next();
801		}
802	<	assertEquals(0, q.size());
802	>	mustEqual(0, q.size());
803		}
804
805		/**
806		* toString contains toStrings of elements
807		*/
808		public void testToString() {
809	<	ArrayBlockingQueue q = populatedQueue(SIZE);
809	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
810		String s = q.toString();
811		for (int i = 0; i < SIZE; ++i) {
812		assertTrue(s.contains(String.valueOf(i)));
#	Line 825 | Line 817 | public class ArrayBlockingQueueTest exte
817		* offer transfers elements across Executor tasks
818		*/
819		public void testOfferInExecutor() {
820	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
820	>	final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(2);
821		q.add(one);
822		q.add(two);
823		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
#	Line 836 | Line 828 | public class ArrayBlockingQueueTest exte
828		assertFalse(q.offer(three));
829		threadsStarted.await();
830		assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
831	<	assertEquals(0, q.remainingCapacity());
831	>	mustEqual(0, q.remainingCapacity());
832		}});
833
834		executor.execute(new CheckedRunnable() {
835		public void realRun() throws InterruptedException {
836		threadsStarted.await();
837	<	assertEquals(0, q.remainingCapacity());
837	>	mustEqual(0, q.remainingCapacity());
838		assertSame(one, q.take());
839		}});
840		}
#	Line 852 | Line 844 | public class ArrayBlockingQueueTest exte
844		* timed poll retrieves elements across Executor threads
845		*/
846		public void testPollInExecutor() {
847	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
847	>	final ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(2);
848		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
849		final ExecutorService executor = Executors.newFixedThreadPool(2);
850		try (PoolCleaner cleaner = cleaner(executor)) {
#	Line 876 | Line 868 | public class ArrayBlockingQueueTest exte
868		* A deserialized/reserialized queue has same elements in same order
869		*/
870		public void testSerialization() throws Exception {
871	<	Queue x = populatedQueue(SIZE);
872	<	Queue y = serialClone(x);
871	>	Queue<Item> x = populatedQueue(SIZE);
872	>	Queue<Item> y = serialClone(x);
873
874		assertNotSame(x, y);
875	<	assertEquals(x.size(), y.size());
876	<	assertEquals(x.toString(), y.toString());
875	>	mustEqual(x.size(), y.size());
876	>	mustEqual(x.toString(), y.toString());
877		assertTrue(Arrays.equals(x.toArray(), y.toArray()));
878		while (!x.isEmpty()) {
879		assertFalse(y.isEmpty());
880	<	assertEquals(x.remove(), y.remove());
880	>	mustEqual(x.remove(), y.remove());
881		}
882		assertTrue(y.isEmpty());
883		}
#	Line 894 | Line 886 | public class ArrayBlockingQueueTest exte
886		* drainTo(c) empties queue into another collection c
887		*/
888		public void testDrainTo() {
889	<	ArrayBlockingQueue q = populatedQueue(SIZE);
890	<	ArrayList l = new ArrayList();
889	>	ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
890	>	ArrayList<Item> l = new ArrayList<Item>();
891		q.drainTo(l);
892	<	assertEquals(0, q.size());
893	<	assertEquals(SIZE, l.size());
892	>	mustEqual(0, q.size());
893	>	mustEqual(SIZE, l.size());
894		for (int i = 0; i < SIZE; ++i)
895	<	assertEquals(l.get(i), new Integer(i));
895	>	mustEqual(l.get(i), i);
896		q.add(zero);
897		q.add(one);
898		assertFalse(q.isEmpty());
899	<	assertTrue(q.contains(zero));
900	<	assertTrue(q.contains(one));
899	>	mustContain(q, zero);
900	>	mustContain(q, one);
901		l.clear();
902		q.drainTo(l);
903	<	assertEquals(0, q.size());
904	<	assertEquals(2, l.size());
903	>	mustEqual(0, q.size());
904	>	mustEqual(2, l.size());
905		for (int i = 0; i < 2; ++i)
906	<	assertEquals(l.get(i), new Integer(i));
906	>	mustEqual(l.get(i), i);
907		}
908
909		/**
910		* drainTo empties full queue, unblocking a waiting put.
911		*/
912		public void testDrainToWithActivePut() throws InterruptedException {
913	<	final ArrayBlockingQueue q = populatedQueue(SIZE);
913	>	final ArrayBlockingQueue<Item> q = populatedQueue(SIZE);
914		Thread t = new Thread(new CheckedRunnable() {
915		public void realRun() throws InterruptedException {
916	<	q.put(new Integer(SIZE + 1));
916	>	q.put(new Item(SIZE + 1));
917		}});
918
919		t.start();
920	<	ArrayList l = new ArrayList();
920	>	ArrayList<Item> l = new ArrayList<Item>();
921		q.drainTo(l);
922		assertTrue(l.size() >= SIZE);
923		for (int i = 0; i < SIZE; ++i)
924	<	assertEquals(l.get(i), new Integer(i));
924	>	mustEqual(l.get(i), i);
925		t.join();
926		assertTrue(q.size() + l.size() >= SIZE);
927		}
#	Line 938 | Line 930 | public class ArrayBlockingQueueTest exte
930		* drainTo(c, n) empties first min(n, size) elements of queue into c
931		*/
932		public void testDrainToN() {
933	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
933	>	ArrayBlockingQueue<Item> q = new ArrayBlockingQueue<Item>(SIZE * 2);
934		for (int i = 0; i < SIZE + 2; ++i) {
935		for (int j = 0; j < SIZE; j++)
936	<	assertTrue(q.offer(new Integer(j)));
937	<	ArrayList l = new ArrayList();
936	>	mustOffer(q, j);
937	>	ArrayList<Item> l = new ArrayList<Item>();
938		q.drainTo(l, i);
939		int k = (i < SIZE) ? i : SIZE;
940	<	assertEquals(k, l.size());
941	<	assertEquals(SIZE - k, q.size());
940	>	mustEqual(k, l.size());
941	>	mustEqual(SIZE - k, q.size());
942		for (int j = 0; j < k; ++j)
943	<	assertEquals(l.get(j), new Integer(j));
943	>	mustEqual(l.get(j), j);
944		do {} while (q.poll() != null);
945		}
946		}

Diff Legend

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