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.18 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.61 by jsr166, Sat Jan 17 22:55:06 2015 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
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.Iterator;
15	>	import java.util.NoSuchElementException;
16	>	import java.util.Queue;
17	>	import java.util.concurrent.ArrayBlockingQueue;
18	>	import java.util.concurrent.BlockingQueue;
19	>	import java.util.concurrent.CountDownLatch;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>
23	>	import junit.framework.Test;
24
25		public class ArrayBlockingQueueTest extends JSR166TestCase {
26	+
27	+	public static class Fair extends BlockingQueueTest {
28	+	protected BlockingQueue emptyCollection() {
29	+	return new ArrayBlockingQueue(SIZE, true);
30	+	}
31	+	}
32	+
33	+	public static class NonFair extends BlockingQueueTest {
34	+	protected BlockingQueue emptyCollection() {
35	+	return new ArrayBlockingQueue(SIZE, false);
36	+	}
37	+	}
38	+
39		public static void main(String[] args) {
40	<	junit.textui.TestRunner.run (suite());
40	>	junit.textui.TestRunner.run(suite());
41		}
42	+
43		public static Test suite() {
44	<	return new TestSuite(ArrayBlockingQueueTest.class);
44	>	return newTestSuite(ArrayBlockingQueueTest.class,
45	>	new Fair().testSuite(),
46	>	new NonFair().testSuite());
47		}
48
49		/**
50	<	* Create a queue of given size containing consecutive
50	>	* Returns a new queue of given size containing consecutive
51		* Integers 0 ... n.
52		*/
53	<	private ArrayBlockingQueue populatedQueue(int n) {
54	<	ArrayBlockingQueue q = new ArrayBlockingQueue(n);
53	>	private ArrayBlockingQueue<Integer> populatedQueue(int n) {
54	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n);
55		assertTrue(q.isEmpty());
56		for (int i = 0; i < n; i++)
57		assertTrue(q.offer(new Integer(i)));
#	Line 48 | Line 73 | public class ArrayBlockingQueueTest exte
73		*/
74		public void testConstructor2() {
75		try {
76	<	ArrayBlockingQueue q = new ArrayBlockingQueue(0);
76	>	new ArrayBlockingQueue(0);
77		shouldThrow();
78		} catch (IllegalArgumentException success) {}
79		}
#	Line 58 | Line 83 | public class ArrayBlockingQueueTest exte
83		*/
84		public void testConstructor3() {
85		try {
86	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
86	>	new ArrayBlockingQueue(1, true, null);
87		shouldThrow();
88		} catch (NullPointerException success) {}
89		}
#	Line 67 | Line 92 | public class ArrayBlockingQueueTest exte
92		* Initializing from Collection of null elements throws NPE
93		*/
94		public void testConstructor4() {
95	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
96		try {
97	<	Integer[] ints = new Integer[SIZE];
72	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
97	>	new ArrayBlockingQueue(SIZE, false, elements);
98		shouldThrow();
99		} catch (NullPointerException success) {}
100		}
#	Line 78 | Line 103 | public class ArrayBlockingQueueTest exte
103		* Initializing from Collection with some null elements throws NPE
104		*/
105		public void testConstructor5() {
106	+	Integer[] ints = new Integer[SIZE];
107	+	for (int i = 0; i < SIZE-1; ++i)
108	+	ints[i] = i;
109	+	Collection<Integer> elements = Arrays.asList(ints);
110		try {
111	<	Integer[] ints = new Integer[SIZE];
83	<	for (int i = 0; i < SIZE-1; ++i)
84	<	ints[i] = new Integer(i);
85	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
111	>	new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
112		shouldThrow();
113		} catch (NullPointerException success) {}
114		}
#	Line 91 | Line 117 | public class ArrayBlockingQueueTest exte
117		* Initializing from too large collection throws IAE
118		*/
119		public void testConstructor6() {
120	+	Integer[] ints = new Integer[SIZE];
121	+	for (int i = 0; i < SIZE; ++i)
122	+	ints[i] = i;
123	+	Collection<Integer> elements = Arrays.asList(ints);
124		try {
125	<	Integer[] ints = new Integer[SIZE];
96	<	for (int i = 0; i < SIZE; ++i)
97	<	ints[i] = new Integer(i);
98	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
125	>	new ArrayBlockingQueue(SIZE - 1, false, elements);
126		shouldThrow();
127		} catch (IllegalArgumentException success) {}
128		}
#	Line 104 | Line 131 | public class ArrayBlockingQueueTest exte
131		* Queue contains all elements of collection used to initialize
132		*/
133		public void testConstructor7() {
134	<	try {
135	<	Integer[] ints = new Integer[SIZE];
136	<	for (int i = 0; i < SIZE; ++i)
137	<	ints[i] = new Integer(i);
138	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
139	<	for (int i = 0; i < SIZE; ++i)
140	<	assertEquals(ints[i], q.poll());
114	<	}
115	<	finally {}
134	>	Integer[] ints = new Integer[SIZE];
135	>	for (int i = 0; i < SIZE; ++i)
136	>	ints[i] = i;
137	>	Collection<Integer> elements = Arrays.asList(ints);
138	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, elements);
139	>	for (int i = 0; i < SIZE; ++i)
140	>	assertEquals(ints[i], q.poll());
141		}
142
143		/**
#	Line 148 | Line 173 | public class ArrayBlockingQueueTest exte
173		}
174
175		/**
151	–	*  offer(null) throws NPE
152	–	*/
153	–	public void testOfferNull() {
154	–	try {
155	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
156	–	q.offer(null);
157	–	shouldThrow();
158	–	} catch (NullPointerException success) {}
159	–	}
160	–
161	–	/**
162	–	*  add(null) throws NPE
163	–	*/
164	–	public void testAddNull() {
165	–	try {
166	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
167	–	q.add(null);
168	–	shouldThrow();
169	–	} catch (NullPointerException success) {}
170	–	}
171	–
172	–	/**
176		* Offer succeeds if not full; fails if full
177		*/
178		public void testOffer() {
#	Line 194 | Line 197 | public class ArrayBlockingQueueTest exte
197		}
198
199		/**
197	–	*  addAll(null) throws NPE
198	–	*/
199	–	public void testAddAll1() {
200	–	try {
201	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
202	–	q.addAll(null);
203	–	shouldThrow();
204	–	} catch (NullPointerException success) {}
205	–	}
206	–
207	–	/**
200		* addAll(this) throws IAE
201		*/
202		public void testAddAllSelf() {
#	Line 215 | Line 207 | public class ArrayBlockingQueueTest exte
207		} catch (IllegalArgumentException success) {}
208		}
209
218	–
219	–	/**
220	–	*  addAll of a collection with null elements throws NPE
221	–	*/
222	–	public void testAddAll2() {
223	–	try {
224	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
225	–	Integer[] ints = new Integer[SIZE];
226	–	q.addAll(Arrays.asList(ints));
227	–	shouldThrow();
228	–	} catch (NullPointerException success) {}
229	–	}
210		/**
211		* addAll of a collection with any null elements throws NPE after
212		* possibly adding some elements
#	Line 241 | Line 221 | public class ArrayBlockingQueueTest exte
221		shouldThrow();
222		} catch (NullPointerException success) {}
223		}
224	+
225		/**
226		* addAll throws ISE if not enough room
227		*/
#	Line 254 | Line 235 | public class ArrayBlockingQueueTest exte
235		shouldThrow();
236		} catch (IllegalStateException success) {}
237		}
238	+
239		/**
240		* Queue contains all elements, in traversal order, of successful addAll
241		*/
#	Line 270 | Line 252 | public class ArrayBlockingQueueTest exte
252		}
253
254		/**
273	–	*  put(null) throws NPE
274	–	*/
275	–	public void testPutNull() throws InterruptedException {
276	–	try {
277	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
278	–	q.put(null);
279	–	shouldThrow();
280	–	} catch (NullPointerException success) {}
281	–	}
282	–
283	–	/**
255		* all elements successfully put are contained
256		*/
257		public void testPut() throws InterruptedException {
258		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
259		for (int i = 0; i < SIZE; ++i) {
260	<	Integer I = new Integer(i);
261	<	q.put(I);
262	<	assertTrue(q.contains(I));
260	>	Integer x = new Integer(i);
261	>	q.put(x);
262	>	assertTrue(q.contains(x));
263		}
264		assertEquals(0, q.remainingCapacity());
265		}
#	Line 298 | Line 269 | public class ArrayBlockingQueueTest exte
269		*/
270		public void testBlockingPut() throws InterruptedException {
271		final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
272	<	Thread t = new Thread(new CheckedRunnable() {
273	<	public void realRun() {
274	<	int added = 0;
272	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
273	>	Thread t = newStartedThread(new CheckedRunnable() {
274	>	public void realRun() throws InterruptedException {
275	>	for (int i = 0; i < SIZE; ++i)
276	>	q.put(i);
277	>	assertEquals(SIZE, q.size());
278	>	assertEquals(0, q.remainingCapacity());
279	>
280	>	Thread.currentThread().interrupt();
281		try {
282	<	for (int i = 0; i < SIZE; ++i) {
283	<	q.put(new Integer(i));
284	<	++added;
285	<	}
309	<	q.put(new Integer(SIZE));
310	<	threadShouldThrow();
311	<	} catch (InterruptedException ie) {
312	<	threadAssertEquals(added, SIZE);
313	<	}}});
282	>	q.put(99);
283	>	shouldThrow();
284	>	} catch (InterruptedException success) {}
285	>	assertFalse(Thread.interrupted());
286
287	<	t.start();
288	<	Thread.sleep(MEDIUM_DELAY_MS);
287	>	pleaseInterrupt.countDown();
288	>	try {
289	>	q.put(99);
290	>	shouldThrow();
291	>	} catch (InterruptedException success) {}
292	>	assertFalse(Thread.interrupted());
293	>	}});
294	>
295	>	await(pleaseInterrupt);
296	>	assertThreadStaysAlive(t);
297		t.interrupt();
298	<	t.join();
298	>	awaitTermination(t);
299	>	assertEquals(SIZE, q.size());
300	>	assertEquals(0, q.remainingCapacity());
301		}
302
303		/**
304	<	* put blocks waiting for take when full
304	>	* put blocks interruptibly waiting for take when full
305		*/
306		public void testPutWithTake() throws InterruptedException {
307	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
308	<	Thread t = new Thread(new CheckedRunnable() {
309	<	public void realRun() {
310	<	int added = 0;
307	>	final int capacity = 2;
308	>	final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
309	>	final CountDownLatch pleaseTake = new CountDownLatch(1);
310	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
311	>	Thread t = newStartedThread(new CheckedRunnable() {
312	>	public void realRun() throws InterruptedException {
313	>	for (int i = 0; i < capacity; i++)
314	>	q.put(i);
315	>	pleaseTake.countDown();
316	>	q.put(86);
317	>
318	>	pleaseInterrupt.countDown();
319		try {
320	<	q.put(new Object());
321	<	++added;
322	<	q.put(new Object());
323	<	++added;
334	<	q.put(new Object());
335	<	++added;
336	<	q.put(new Object());
337	<	++added;
338	<	threadShouldThrow();
339	<	} catch (InterruptedException e) {
340	<	threadAssertTrue(added >= 2);
341	<	}
320	>	q.put(99);
321	>	shouldThrow();
322	>	} catch (InterruptedException success) {}
323	>	assertFalse(Thread.interrupted());
324		}});
325
326	<	t.start();
327	<	Thread.sleep(SHORT_DELAY_MS);
328	<	q.take();
326	>	await(pleaseTake);
327	>	assertEquals(0, q.remainingCapacity());
328	>	assertEquals(0, q.take());
329	>
330	>	await(pleaseInterrupt);
331	>	assertThreadStaysAlive(t);
332		t.interrupt();
333	<	t.join();
333	>	awaitTermination(t);
334	>	assertEquals(0, q.remainingCapacity());
335		}
336
337		/**
#	Line 353 | Line 339 | public class ArrayBlockingQueueTest exte
339		*/
340		public void testTimedOffer() throws InterruptedException {
341		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
342	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
342	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
343	>	Thread t = newStartedThread(new CheckedRunnable() {
344		public void realRun() throws InterruptedException {
345		q.put(new Object());
346		q.put(new Object());
347	<	threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
348	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
349	<	}};
347	>	long startTime = System.nanoTime();
348	>	assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
349	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
350	>	pleaseInterrupt.countDown();
351	>	try {
352	>	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
353	>	shouldThrow();
354	>	} catch (InterruptedException success) {}
355	>	}});
356
357	<	t.start();
358	<	Thread.sleep(SHORT_DELAY_MS);
357	>	await(pleaseInterrupt);
358	>	assertThreadStaysAlive(t);
359		t.interrupt();
360	<	t.join();
360	>	awaitTermination(t);
361		}
362
363		/**
#	Line 373 | Line 366 | public class ArrayBlockingQueueTest exte
366		public void testTake() throws InterruptedException {
367		ArrayBlockingQueue q = populatedQueue(SIZE);
368		for (int i = 0; i < SIZE; ++i) {
369	<	assertEquals(i, ((Integer)q.take()).intValue());
369	>	assertEquals(i, q.take());
370		}
371		}
372
373		/**
381	–	* take blocks interruptibly when empty
382	–	*/
383	–	public void testTakeFromEmpty() throws InterruptedException {
384	–	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
385	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
386	–	public void realRun() throws InterruptedException {
387	–	q.take();
388	–	}};
389	–
390	–	t.start();
391	–	Thread.sleep(SHORT_DELAY_MS);
392	–	t.interrupt();
393	–	t.join();
394	–	}
395	–
396	–	/**
374		* Take removes existing elements until empty, then blocks interruptibly
375		*/
376		public void testBlockingTake() throws InterruptedException {
377	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
377	>	final ArrayBlockingQueue q = populatedQueue(SIZE);
378	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
379	>	Thread t = newStartedThread(new CheckedRunnable() {
380		public void realRun() throws InterruptedException {
402	–	ArrayBlockingQueue q = populatedQueue(SIZE);
381		for (int i = 0; i < SIZE; ++i) {
382	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
382	>	assertEquals(i, q.take());
383		}
406	–	q.take();
407	–	}};
384
385	<	t.start();
386	<	Thread.sleep(SHORT_DELAY_MS);
387	<	t.interrupt();
388	<	t.join();
389	<	}
385	>	Thread.currentThread().interrupt();
386	>	try {
387	>	q.take();
388	>	shouldThrow();
389	>	} catch (InterruptedException success) {}
390	>	assertFalse(Thread.interrupted());
391
392	+	pleaseInterrupt.countDown();
393	+	try {
394	+	q.take();
395	+	shouldThrow();
396	+	} catch (InterruptedException success) {}
397	+	assertFalse(Thread.interrupted());
398	+	}});
399	+
400	+	await(pleaseInterrupt);
401	+	assertThreadStaysAlive(t);
402	+	t.interrupt();
403	+	awaitTermination(t);
404	+	}
405
406		/**
407		* poll succeeds unless empty
#	Line 419 | Line 409 | public class ArrayBlockingQueueTest exte
409		public void testPoll() {
410		ArrayBlockingQueue q = populatedQueue(SIZE);
411		for (int i = 0; i < SIZE; ++i) {
412	<	assertEquals(i, ((Integer)q.poll()).intValue());
412	>	assertEquals(i, q.poll());
413		}
414		assertNull(q.poll());
415		}
416
417		/**
418	<	* timed pool with zero timeout succeeds when non-empty, else times out
418	>	* timed poll with zero timeout succeeds when non-empty, else times out
419		*/
420		public void testTimedPoll0() throws InterruptedException {
421		ArrayBlockingQueue q = populatedQueue(SIZE);
422		for (int i = 0; i < SIZE; ++i) {
423	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
423	>	assertEquals(i, q.poll(0, MILLISECONDS));
424		}
425		assertNull(q.poll(0, MILLISECONDS));
426	+	checkEmpty(q);
427		}
428
429		/**
430	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
430	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
431		*/
432		public void testTimedPoll() throws InterruptedException {
433		ArrayBlockingQueue q = populatedQueue(SIZE);
434		for (int i = 0; i < SIZE; ++i) {
435	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
436	<	}
437	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
435	>	long startTime = System.nanoTime();
436	>	assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
437	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
438	>	}
439	>	long startTime = System.nanoTime();
440	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
441	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
442	>	checkEmpty(q);
443		}
444
445		/**
#	Line 451 | Line 447 | public class ArrayBlockingQueueTest exte
447		* returning timeout status
448		*/
449		public void testInterruptedTimedPoll() throws InterruptedException {
450	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
450	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
451	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
452	>	Thread t = newStartedThread(new CheckedRunnable() {
453		public void realRun() throws InterruptedException {
456	–	ArrayBlockingQueue q = populatedQueue(SIZE);
454		for (int i = 0; i < SIZE; ++i) {
455	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
455	>	long t0 = System.nanoTime();
456	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
457	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
458		}
459	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
460	<	}};
461	<
462	<	t.start();
463	<	Thread.sleep(SMALL_DELAY_MS);
464	<	t.interrupt();
465	<	t.join();
466	<	}
467	<
469	<	/**
470	<	*  timed poll before a delayed offer fails; after offer succeeds;
471	<	*  on interruption throws
472	<	*/
473	<	public void testTimedPollWithOffer() throws InterruptedException {
474	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
475	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
476	<	public void realRun() throws InterruptedException {
477	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
478	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
479	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
480	<	}};
459	>	long t0 = System.nanoTime();
460	>	aboutToWait.countDown();
461	>	try {
462	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
463	>	shouldThrow();
464	>	} catch (InterruptedException success) {
465	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
466	>	}
467	>	}});
468
469	<	t.start();
470	<	Thread.sleep(SMALL_DELAY_MS);
484	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
469	>	aboutToWait.await();
470	>	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
471		t.interrupt();
472	<	t.join();
472	>	awaitTermination(t, MEDIUM_DELAY_MS);
473	>	checkEmpty(q);
474		}
475
489	–
476		/**
477		* peek returns next element, or null if empty
478		*/
479		public void testPeek() {
480		ArrayBlockingQueue q = populatedQueue(SIZE);
481		for (int i = 0; i < SIZE; ++i) {
482	<	assertEquals(i, ((Integer)q.peek()).intValue());
483	<	q.poll();
482	>	assertEquals(i, q.peek());
483	>	assertEquals(i, q.poll());
484		assertTrue(q.peek() == null ||
485	<	i != ((Integer)q.peek()).intValue());
485	>	!q.peek().equals(i));
486		}
487		assertNull(q.peek());
488		}
#	Line 507 | Line 493 | public class ArrayBlockingQueueTest exte
493		public void testElement() {
494		ArrayBlockingQueue q = populatedQueue(SIZE);
495		for (int i = 0; i < SIZE; ++i) {
496	<	assertEquals(i, ((Integer)q.element()).intValue());
497	<	q.poll();
496	>	assertEquals(i, q.element());
497	>	assertEquals(i, q.poll());
498		}
499		try {
500		q.element();
#	Line 522 | Line 508 | public class ArrayBlockingQueueTest exte
508		public void testRemove() {
509		ArrayBlockingQueue q = populatedQueue(SIZE);
510		for (int i = 0; i < SIZE; ++i) {
511	<	assertEquals(i, ((Integer)q.remove()).intValue());
511	>	assertEquals(i, q.remove());
512		}
513		try {
514		q.remove();
#	Line 531 | Line 517 | public class ArrayBlockingQueueTest exte
517		}
518
519		/**
534	–	* remove(x) removes x and returns true if present
535	–	*/
536	–	public void testRemoveElement() {
537	–	ArrayBlockingQueue q = populatedQueue(SIZE);
538	–	for (int i = 1; i < SIZE; i+=2) {
539	–	assertTrue(q.remove(new Integer(i)));
540	–	}
541	–	for (int i = 0; i < SIZE; i+=2) {
542	–	assertTrue(q.remove(new Integer(i)));
543	–	assertFalse(q.remove(new Integer(i+1)));
544	–	}
545	–	assertTrue(q.isEmpty());
546	–	}
547	–
548	–	/**
520		* contains(x) reports true when elements added but not yet removed
521		*/
522		public void testContains() {
523		ArrayBlockingQueue q = populatedQueue(SIZE);
524		for (int i = 0; i < SIZE; ++i) {
525		assertTrue(q.contains(new Integer(i)));
526	<	q.poll();
526	>	assertEquals(i, q.poll());
527		assertFalse(q.contains(new Integer(i)));
528		}
529		}
#	Line 616 | Line 587 | public class ArrayBlockingQueueTest exte
587		assertTrue(q.removeAll(p));
588		assertEquals(SIZE-i, q.size());
589		for (int j = 0; j < i; ++j) {
590	<	Integer I = (Integer)(p.remove());
591	<	assertFalse(q.contains(I));
590	>	Integer x = (Integer)(p.remove());
591	>	assertFalse(q.contains(x));
592		}
593		}
594		}
595
596	<	/**
597	<	*  toArray contains all elements
627	<	*/
628	<	public void testToArray() throws InterruptedException {
629	<	ArrayBlockingQueue q = populatedQueue(SIZE);
596	>	void checkToArray(ArrayBlockingQueue q) {
597	>	int size = q.size();
598		Object[] o = q.toArray();
599	<	for (int i = 0; i < o.length; i++)
600	<	assertEquals(o[i], q.take());
599	>	assertEquals(size, o.length);
600	>	Iterator it = q.iterator();
601	>	for (int i = 0; i < size; i++) {
602	>	Integer x = (Integer) it.next();
603	>	assertEquals((Integer)o[0] + i, (int) x);
604	>	assertSame(o[i], x);
605	>	}
606		}
607
608		/**
609	<	* toArray(a) contains all elements
609	>	* toArray() contains all elements in FIFO order
610		*/
611	<	public void testToArray2() throws InterruptedException {
612	<	ArrayBlockingQueue q = populatedQueue(SIZE);
613	<	Integer[] ints = new Integer[SIZE];
614	<	ints = (Integer[])q.toArray(ints);
615	<	for (int i = 0; i < ints.length; i++)
616	<	assertEquals(ints[i], q.take());
611	>	public void testToArray() {
612	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
613	>	for (int i = 0; i < SIZE; i++) {
614	>	checkToArray(q);
615	>	q.add(i);
616	>	}
617	>	// Provoke wraparound
618	>	for (int i = 0; i < SIZE; i++) {
619	>	checkToArray(q);
620	>	assertEquals(i, q.poll());
621	>	checkToArray(q);
622	>	q.add(SIZE+i);
623	>	}
624	>	for (int i = 0; i < SIZE; i++) {
625	>	checkToArray(q);
626	>	assertEquals(SIZE+i, q.poll());
627	>	}
628	>	}
629	>
630	>	void checkToArray2(ArrayBlockingQueue q) {
631	>	int size = q.size();
632	>	Integer[] a1 = size == 0 ? null : new Integer[size-1];
633	>	Integer[] a2 = new Integer[size];
634	>	Integer[] a3 = new Integer[size+2];
635	>	if (size > 0) Arrays.fill(a1, 42);
636	>	Arrays.fill(a2, 42);
637	>	Arrays.fill(a3, 42);
638	>	Integer[] b1 = size == 0 ? null : (Integer[]) q.toArray(a1);
639	>	Integer[] b2 = (Integer[]) q.toArray(a2);
640	>	Integer[] b3 = (Integer[]) q.toArray(a3);
641	>	assertSame(a2, b2);
642	>	assertSame(a3, b3);
643	>	Iterator it = q.iterator();
644	>	for (int i = 0; i < size; i++) {
645	>	Integer x = (Integer) it.next();
646	>	assertSame(b1[i], x);
647	>	assertEquals(b1[0] + i, (int) x);
648	>	assertSame(b2[i], x);
649	>	assertSame(b3[i], x);
650	>	}
651	>	assertNull(a3[size]);
652	>	assertEquals(42, (int) a3[size+1]);
653	>	if (size > 0) {
654	>	assertNotSame(a1, b1);
655	>	assertEquals(size, b1.length);
656	>	for (int i = 0; i < a1.length; i++) {
657	>	assertEquals(42, (int) a1[i]);
658	>	}
659	>	}
660		}
661
662		/**
663	<	* toArray(null) throws NPE
663	>	* toArray(a) contains all elements in FIFO order
664		*/
665	<	public void testToArray_BadArg() {
666	<	try {
667	<	ArrayBlockingQueue q = populatedQueue(SIZE);
668	<	Object o[] = q.toArray(null);
669	<	shouldThrow();
670	<	} catch (NullPointerException success) {}
665	>	public void testToArray2() {
666	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
667	>	for (int i = 0; i < SIZE; i++) {
668	>	checkToArray2(q);
669	>	q.add(i);
670	>	}
671	>	// Provoke wraparound
672	>	for (int i = 0; i < SIZE; i++) {
673	>	checkToArray2(q);
674	>	assertEquals(i, q.poll());
675	>	checkToArray2(q);
676	>	q.add(SIZE+i);
677	>	}
678	>	for (int i = 0; i < SIZE; i++) {
679	>	checkToArray2(q);
680	>	assertEquals(SIZE+i, q.poll());
681	>	}
682		}
683
684		/**
685	<	* toArray with incompatible array type throws CCE
685	>	* toArray(incompatible array type) throws ArrayStoreException
686		*/
687		public void testToArray1_BadArg() {
688	+	ArrayBlockingQueue q = populatedQueue(SIZE);
689		try {
690	<	ArrayBlockingQueue q = populatedQueue(SIZE);
663	<	Object o[] = q.toArray(new String[10] );
690	>	q.toArray(new String[10]);
691		shouldThrow();
692		} catch (ArrayStoreException success) {}
693		}
694
668	–
695		/**
696		* iterator iterates through all elements
697		*/
698		public void testIterator() throws InterruptedException {
699		ArrayBlockingQueue q = populatedQueue(SIZE);
700		Iterator it = q.iterator();
701	<	while (it.hasNext()) {
701	>	int i;
702	>	for (i = 0; it.hasNext(); i++)
703	>	assertTrue(q.contains(it.next()));
704	>	assertEquals(i, SIZE);
705	>	assertIteratorExhausted(it);
706	>
707	>	it = q.iterator();
708	>	for (i = 0; it.hasNext(); i++)
709		assertEquals(it.next(), q.take());
710	<	}
710	>	assertEquals(i, SIZE);
711	>	assertIteratorExhausted(it);
712	>	}
713	>
714	>	/**
715	>	* iterator of empty collection has no elements
716	>	*/
717	>	public void testEmptyIterator() {
718	>	assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
719		}
720
721		/**
722		* iterator.remove removes current element
723		*/
724	<	public void testIteratorRemove () {
724	>	public void testIteratorRemove() {
725		final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
726		q.add(two);
727		q.add(one);
#	Line 691 | Line 732 | public class ArrayBlockingQueueTest exte
732		it.remove();
733
734		it = q.iterator();
735	<	assertEquals(it.next(), one);
736	<	assertEquals(it.next(), three);
735	>	assertSame(it.next(), one);
736	>	assertSame(it.next(), three);
737		assertFalse(it.hasNext());
738		}
739
#	Line 709 | Line 750 | public class ArrayBlockingQueueTest exte
750
751		int k = 0;
752		for (Iterator it = q.iterator(); it.hasNext();) {
753	<	int i = ((Integer)(it.next())).intValue();
713	<	assertEquals(++k, i);
753	>	assertEquals(++k, it.next());
754		}
755		assertEquals(3, k);
756		}
#	Line 718 | Line 758 | public class ArrayBlockingQueueTest exte
758		/**
759		* Modifications do not cause iterators to fail
760		*/
761	<	public void testWeaklyConsistentIteration () {
761	>	public void testWeaklyConsistentIteration() {
762		final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
763		q.add(one);
764		q.add(two);
#	Line 730 | Line 770 | public class ArrayBlockingQueueTest exte
770		assertEquals(0, q.size());
771		}
772
733	–
773		/**
774		* toString contains toStrings of elements
775		*/
#	Line 738 | Line 777 | public class ArrayBlockingQueueTest exte
777		ArrayBlockingQueue q = populatedQueue(SIZE);
778		String s = q.toString();
779		for (int i = 0; i < SIZE; ++i) {
780	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
780	>	assertTrue(s.contains(String.valueOf(i)));
781		}
782		}
783
745	–
784		/**
785		* offer transfers elements across Executor tasks
786		*/
#	Line 751 | Line 789 | public class ArrayBlockingQueueTest exte
789		q.add(one);
790		q.add(two);
791		ExecutorService executor = Executors.newFixedThreadPool(2);
792	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
793		executor.execute(new CheckedRunnable() {
794		public void realRun() throws InterruptedException {
795	<	threadAssertFalse(q.offer(three));
796	<	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
797	<	threadAssertEquals(0, q.remainingCapacity());
795	>	assertFalse(q.offer(three));
796	>	threadsStarted.await();
797	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
798	>	assertEquals(0, q.remainingCapacity());
799		}});
800
801		executor.execute(new CheckedRunnable() {
802		public void realRun() throws InterruptedException {
803	<	Thread.sleep(SMALL_DELAY_MS);
804	<	threadAssertEquals(one, q.take());
803	>	threadsStarted.await();
804	>	assertEquals(0, q.remainingCapacity());
805	>	assertSame(one, q.take());
806		}});
807
808		joinPool(executor);
768	–
809		}
810
811		/**
812	<	* poll retrieves elements across Executor threads
812	>	* timed poll retrieves elements across Executor threads
813		*/
814		public void testPollInExecutor() {
815		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
816	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
817		ExecutorService executor = Executors.newFixedThreadPool(2);
818		executor.execute(new CheckedRunnable() {
819		public void realRun() throws InterruptedException {
820	<	threadAssertNull(q.poll());
821	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
822	<	threadAssertTrue(q.isEmpty());
820	>	assertNull(q.poll());
821	>	threadsStarted.await();
822	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
823	>	checkEmpty(q);
824		}});
825
826		executor.execute(new CheckedRunnable() {
827		public void realRun() throws InterruptedException {
828	<	Thread.sleep(SMALL_DELAY_MS);
828	>	threadsStarted.await();
829		q.put(one);
830		}});
831
#	Line 794 | Line 836 | public class ArrayBlockingQueueTest exte
836		* A deserialized serialized queue has same elements in same order
837		*/
838		public void testSerialization() throws Exception {
839	<	ArrayBlockingQueue q = populatedQueue(SIZE);
840	<
799	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
800	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
801	<	out.writeObject(q);
802	<	out.close();
839	>	Queue x = populatedQueue(SIZE);
840	>	Queue y = serialClone(x);
841
842	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
843	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
844	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
845	<	assertEquals(q.size(), r.size());
846	<	while (!q.isEmpty())
847	<	assertEquals(q.remove(), r.remove());
848	<	}
849	<
850	<	/**
813	<	* drainTo(null) throws NPE
814	<	*/
815	<	public void testDrainToNull() {
816	<	ArrayBlockingQueue q = populatedQueue(SIZE);
817	<	try {
818	<	q.drainTo(null);
819	<	shouldThrow();
820	<	} catch (NullPointerException success) {}
821	<	}
822	<
823	<	/**
824	<	* drainTo(this) throws IAE
825	<	*/
826	<	public void testDrainToSelf() {
827	<	ArrayBlockingQueue q = populatedQueue(SIZE);
828	<	try {
829	<	q.drainTo(q);
830	<	shouldThrow();
831	<	} catch (IllegalArgumentException success) {}
842	>	assertNotSame(x, y);
843	>	assertEquals(x.size(), y.size());
844	>	assertEquals(x.toString(), y.toString());
845	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
846	>	while (!x.isEmpty()) {
847	>	assertFalse(y.isEmpty());
848	>	assertEquals(x.remove(), y.remove());
849	>	}
850	>	assertTrue(y.isEmpty());
851		}
852
853		/**
#	Line 838 | Line 857 | public class ArrayBlockingQueueTest exte
857		ArrayBlockingQueue q = populatedQueue(SIZE);
858		ArrayList l = new ArrayList();
859		q.drainTo(l);
860	<	assertEquals(q.size(), 0);
861	<	assertEquals(l.size(), SIZE);
860	>	assertEquals(0, q.size());
861	>	assertEquals(SIZE, l.size());
862		for (int i = 0; i < SIZE; ++i)
863		assertEquals(l.get(i), new Integer(i));
864		q.add(zero);
#	Line 849 | Line 868 | public class ArrayBlockingQueueTest exte
868		assertTrue(q.contains(one));
869		l.clear();
870		q.drainTo(l);
871	<	assertEquals(q.size(), 0);
872	<	assertEquals(l.size(), 2);
871	>	assertEquals(0, q.size());
872	>	assertEquals(2, l.size());
873		for (int i = 0; i < 2; ++i)
874		assertEquals(l.get(i), new Integer(i));
875		}
#	Line 876 | Line 895 | public class ArrayBlockingQueueTest exte
895		}
896
897		/**
898	<	* drainTo(null, n) throws NPE
880	<	*/
881	<	public void testDrainToNullN() {
882	<	ArrayBlockingQueue q = populatedQueue(SIZE);
883	<	try {
884	<	q.drainTo(null, 0);
885	<	shouldThrow();
886	<	} catch (NullPointerException success) {}
887	<	}
888	<
889	<	/**
890	<	* drainTo(this, n) throws IAE
891	<	*/
892	<	public void testDrainToSelfN() {
893	<	ArrayBlockingQueue q = populatedQueue(SIZE);
894	<	try {
895	<	q.drainTo(q, 0);
896	<	shouldThrow();
897	<	} catch (IllegalArgumentException success) {}
898	<	}
899	<
900	<	/**
901	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
898	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
899		*/
900		public void testDrainToN() {
901		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
#	Line 907 | Line 904 | public class ArrayBlockingQueueTest exte
904		assertTrue(q.offer(new Integer(j)));
905		ArrayList l = new ArrayList();
906		q.drainTo(l, i);
907	<	int k = (i < SIZE)? i : SIZE;
908	<	assertEquals(l.size(), k);
909	<	assertEquals(q.size(), SIZE-k);
907	>	int k = (i < SIZE) ? i : SIZE;
908	>	assertEquals(k, l.size());
909	>	assertEquals(SIZE-k, q.size());
910		for (int j = 0; j < k; ++j)
911		assertEquals(l.get(j), new Integer(j));
912	<	while (q.poll() != null) ;
912	>	do {} while (q.poll() != null);
913		}
914		}
915
916	+	/**
917	+	* remove(null), contains(null) always return false
918	+	*/
919	+	public void testNeverContainsNull() {
920	+	Collection<?>[] qs = {
921	+	new ArrayBlockingQueue<Object>(10),
922	+	populatedQueue(2),
923	+	};
924	+
925	+	for (Collection<?> q : qs) {
926	+	assertFalse(q.contains(null));
927	+	assertFalse(q.remove(null));
928	+	}
929	+	}
930		}

Diff Legend

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