ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/LinkedBlockingQueueTest.java

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.25 by jsr166, Tue Dec 1 09:56:28 2009 UTC vs.
Revision 1.57 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	–	import junit.framework.*;
10	–	import java.util.*;
11	–	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.BlockingQueue;
18	>	import java.util.concurrent.CountDownLatch;
19	>	import java.util.concurrent.Executors;
20	>	import java.util.concurrent.ExecutorService;
21	>	import java.util.concurrent.LinkedBlockingQueue;
22	>
23	>	import junit.framework.Test;
24
25		public class LinkedBlockingQueueTest extends JSR166TestCase {
26
27	+	public static class Unbounded extends BlockingQueueTest {
28	+	protected BlockingQueue emptyCollection() {
29	+	return new LinkedBlockingQueue();
30	+	}
31	+	}
32	+
33	+	public static class Bounded extends BlockingQueueTest {
34	+	protected BlockingQueue emptyCollection() {
35	+	return new LinkedBlockingQueue(SIZE);
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(LinkedBlockingQueueTest.class);
44	>	return newTestSuite(LinkedBlockingQueueTest.class,
45	>	new Unbounded().testSuite(),
46	>	new Bounded().testSuite());
47		}
48
25	–
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 LinkedBlockingQueue populatedQueue(int n) {
54	<	LinkedBlockingQueue q = new LinkedBlockingQueue(n);
53	>	private LinkedBlockingQueue<Integer> populatedQueue(int n) {
54	>	LinkedBlockingQueue<Integer> q =
55	>	new LinkedBlockingQueue<Integer>(n);
56		assertTrue(q.isEmpty());
57		for (int i = 0; i < n; i++)
58		assertTrue(q.offer(new Integer(i)));
#	Line 48 | Line 72 | public class LinkedBlockingQueueTest ext
72		}
73
74		/**
75	<	* Constructor throws IAE if capacity argument nonpositive
75	>	* Constructor throws IllegalArgumentException if capacity argument nonpositive
76		*/
77		public void testConstructor2() {
78		try {
79	<	LinkedBlockingQueue q = new LinkedBlockingQueue(0);
79	>	new LinkedBlockingQueue(0);
80		shouldThrow();
81		} catch (IllegalArgumentException success) {}
82		}
83
84		/**
85	<	* Initializing from null Collection throws NPE
85	>	* Initializing from null Collection throws NullPointerException
86		*/
87		public void testConstructor3() {
88		try {
89	<	LinkedBlockingQueue q = new LinkedBlockingQueue(null);
89	>	new LinkedBlockingQueue(null);
90		shouldThrow();
91		} catch (NullPointerException success) {}
92		}
93
94		/**
95	<	* Initializing from Collection of null elements throws NPE
95	>	* Initializing from Collection of null elements throws NullPointerException
96		*/
97		public void testConstructor4() {
98	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
99		try {
100	<	Integer[] ints = new Integer[SIZE];
76	<	LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
100	>	new LinkedBlockingQueue(elements);
101		shouldThrow();
102		} catch (NullPointerException success) {}
103		}
104
105		/**
106	<	* Initializing from Collection with some null elements throws NPE
106	>	* Initializing from Collection with some null elements throws
107	>	* NullPointerException
108		*/
109		public void testConstructor5() {
110	+	Integer[] ints = new Integer[SIZE];
111	+	for (int i = 0; i < SIZE-1; ++i)
112	+	ints[i] = new Integer(i);
113	+	Collection<Integer> elements = Arrays.asList(ints);
114		try {
115	<	Integer[] ints = new Integer[SIZE];
87	<	for (int i = 0; i < SIZE-1; ++i)
88	<	ints[i] = new Integer(i);
89	<	LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
115	>	new LinkedBlockingQueue(elements);
116		shouldThrow();
117		} catch (NullPointerException success) {}
118		}
#	Line 136 | Line 162 | public class LinkedBlockingQueueTest ext
162		}
163
164		/**
139	–	* offer(null) throws NPE
140	–	*/
141	–	public void testOfferNull() {
142	–	try {
143	–	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
144	–	q.offer(null);
145	–	shouldThrow();
146	–	} catch (NullPointerException success) {}
147	–	}
148	–
149	–	/**
150	–	* add(null) throws NPE
151	–	*/
152	–	public void testAddNull() {
153	–	try {
154	–	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
155	–	q.add(null);
156	–	shouldThrow();
157	–	} catch (NullPointerException success) {}
158	–	}
159	–
160	–	/**
165		* Offer succeeds if not full; fails if full
166		*/
167		public void testOffer() {
#	Line 167 | Line 171 | public class LinkedBlockingQueueTest ext
171		}
172
173		/**
174	<	* add succeeds if not full; throws ISE if full
174	>	* add succeeds if not full; throws IllegalStateException if full
175		*/
176		public void testAdd() {
177	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
178	+	for (int i = 0; i < SIZE; ++i)
179	+	assertTrue(q.add(new Integer(i)));
180	+	assertEquals(0, q.remainingCapacity());
181		try {
174	–	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
175	–	for (int i = 0; i < SIZE; ++i) {
176	–	assertTrue(q.add(new Integer(i)));
177	–	}
178	–	assertEquals(0, q.remainingCapacity());
182		q.add(new Integer(SIZE));
183		shouldThrow();
184		} catch (IllegalStateException success) {}
185		}
186
187		/**
188	<	* addAll(null) throws NPE
186	<	*/
187	<	public void testAddAll1() {
188	<	try {
189	<	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
190	<	q.addAll(null);
191	<	shouldThrow();
192	<	} catch (NullPointerException success) {}
193	<	}
194	<
195	<	/**
196	<	* addAll(this) throws IAE
188	>	* addAll(this) throws IllegalArgumentException
189		*/
190		public void testAddAllSelf() {
191	+	LinkedBlockingQueue q = populatedQueue(SIZE);
192		try {
200	–	LinkedBlockingQueue q = populatedQueue(SIZE);
193		q.addAll(q);
194		shouldThrow();
195		} catch (IllegalArgumentException success) {}
196		}
197
198		/**
207	–	* addAll of a collection with null elements throws NPE
208	–	*/
209	–	public void testAddAll2() {
210	–	try {
211	–	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
212	–	Integer[] ints = new Integer[SIZE];
213	–	q.addAll(Arrays.asList(ints));
214	–	shouldThrow();
215	–	} catch (NullPointerException success) {}
216	–	}
217	–	/**
199		* addAll of a collection with any null elements throws NPE after
200		* possibly adding some elements
201		*/
202		public void testAddAll3() {
203	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
204	+	Integer[] ints = new Integer[SIZE];
205	+	for (int i = 0; i < SIZE-1; ++i)
206	+	ints[i] = new Integer(i);
207	+	Collection<Integer> elements = Arrays.asList(ints);
208		try {
209	<	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
224	<	Integer[] ints = new Integer[SIZE];
225	<	for (int i = 0; i < SIZE-1; ++i)
226	<	ints[i] = new Integer(i);
227	<	q.addAll(Arrays.asList(ints));
209	>	q.addAll(elements);
210		shouldThrow();
211		} catch (NullPointerException success) {}
212		}
213	+
214		/**
215	<	* addAll throws ISE if not enough room
215	>	* addAll throws IllegalStateException if not enough room
216		*/
217		public void testAddAll4() {
218	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE - 1);
219	+	Integer[] ints = new Integer[SIZE];
220	+	for (int i = 0; i < SIZE; ++i)
221	+	ints[i] = new Integer(i);
222	+	Collection<Integer> elements = Arrays.asList(ints);
223		try {
224	<	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
237	<	Integer[] ints = new Integer[SIZE];
238	<	for (int i = 0; i < SIZE; ++i)
239	<	ints[i] = new Integer(i);
240	<	q.addAll(Arrays.asList(ints));
224	>	q.addAll(elements);
225		shouldThrow();
226		} catch (IllegalStateException success) {}
227		}
228	+
229		/**
230		* Queue contains all elements, in traversal order, of successful addAll
231		*/
#	Line 257 | Line 242 | public class LinkedBlockingQueueTest ext
242		}
243
244		/**
260	–	* put(null) throws NPE
261	–	*/
262	–	public void testPutNull() throws InterruptedException {
263	–	try {
264	–	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
265	–	q.put(null);
266	–	shouldThrow();
267	–	} catch (NullPointerException success) {}
268	–	}
269	–
270	–	/**
245		* all elements successfully put are contained
246		*/
247		public void testPut() throws InterruptedException {
248		LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
249		for (int i = 0; i < SIZE; ++i) {
250	<	Integer I = new Integer(i);
251	<	q.put(I);
252	<	assertTrue(q.contains(I));
250	>	Integer x = new Integer(i);
251	>	q.put(x);
252	>	assertTrue(q.contains(x));
253		}
254		assertEquals(0, q.remainingCapacity());
255		}
#	Line 285 | Line 259 | public class LinkedBlockingQueueTest ext
259		*/
260		public void testBlockingPut() throws InterruptedException {
261		final LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
262	<	Thread t = new Thread(new CheckedRunnable() {
262	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
263	>	Thread t = newStartedThread(new CheckedRunnable() {
264		public void realRun() throws InterruptedException {
265		for (int i = 0; i < SIZE; ++i)
266		q.put(i);
267		assertEquals(SIZE, q.size());
268		assertEquals(0, q.remainingCapacity());
269	+
270	+	Thread.currentThread().interrupt();
271		try {
272		q.put(99);
273		shouldThrow();
274		} catch (InterruptedException success) {}
275	+	assertFalse(Thread.interrupted());
276	+
277	+	pleaseInterrupt.countDown();
278	+	try {
279	+	q.put(99);
280	+	shouldThrow();
281	+	} catch (InterruptedException success) {}
282	+	assertFalse(Thread.interrupted());
283		}});
284
285	<	t.start();
286	<	Thread.sleep(SHORT_DELAY_MS);
285	>	await(pleaseInterrupt);
286	>	assertThreadStaysAlive(t);
287		t.interrupt();
288	<	t.join();
288	>	awaitTermination(t);
289		assertEquals(SIZE, q.size());
290		assertEquals(0, q.remainingCapacity());
291		}
292
293		/**
294	<	* put blocks waiting for take when full
294	>	* put blocks interruptibly waiting for take when full
295		*/
296		public void testPutWithTake() throws InterruptedException {
297		final int capacity = 2;
298		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
299	<	Thread t = new Thread(new CheckedRunnable() {
299	>	final CountDownLatch pleaseTake = new CountDownLatch(1);
300	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
301	>	Thread t = newStartedThread(new CheckedRunnable() {
302		public void realRun() throws InterruptedException {
303	<	for (int i = 0; i < capacity + 1; i++)
303	>	for (int i = 0; i < capacity; i++)
304		q.put(i);
305	+	pleaseTake.countDown();
306	+	q.put(86);
307	+
308	+	pleaseInterrupt.countDown();
309		try {
310		q.put(99);
311		shouldThrow();
312		} catch (InterruptedException success) {}
313	+	assertFalse(Thread.interrupted());
314		}});
315
316	<	t.start();
317	<	Thread.sleep(SHORT_DELAY_MS);
326	<	assertEquals(q.remainingCapacity(), 0);
316	>	await(pleaseTake);
317	>	assertEquals(0, q.remainingCapacity());
318		assertEquals(0, q.take());
319	<	Thread.sleep(SHORT_DELAY_MS);
319	>
320	>	await(pleaseInterrupt);
321	>	assertThreadStaysAlive(t);
322		t.interrupt();
323	<	t.join();
324	<	assertEquals(q.remainingCapacity(), 0);
323	>	awaitTermination(t);
324	>	assertEquals(0, q.remainingCapacity());
325		}
326
327		/**
328		* timed offer times out if full and elements not taken
329		*/
330	<	public void testTimedOffer() throws InterruptedException {
330	>	public void testTimedOffer() {
331		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
332	<	Thread t = new Thread(new CheckedRunnable() {
332	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
333	>	Thread t = newStartedThread(new CheckedRunnable() {
334		public void realRun() throws InterruptedException {
335		q.put(new Object());
336		q.put(new Object());
337	<	assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
337	>	long startTime = System.nanoTime();
338	>	assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
339	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
340	>	pleaseInterrupt.countDown();
341		try {
342	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
342	>	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
343		shouldThrow();
344		} catch (InterruptedException success) {}
345		}});
346
347	<	t.start();
348	<	Thread.sleep(SMALL_DELAY_MS);
347	>	await(pleaseInterrupt);
348	>	assertThreadStaysAlive(t);
349		t.interrupt();
350	<	t.join();
350	>	awaitTermination(t);
351		}
352
353		/**
#	Line 364 | Line 361 | public class LinkedBlockingQueueTest ext
361		}
362
363		/**
367	–	* take blocks interruptibly when empty
368	–	*/
369	–	public void testTakeFromEmpty() throws InterruptedException {
370	–	final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
371	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
372	–	public void realRun() throws InterruptedException {
373	–	q.take();
374	–	}};
375	–
376	–	t.start();
377	–	Thread.sleep(SHORT_DELAY_MS);
378	–	t.interrupt();
379	–	t.join();
380	–	}
381	–
382	–	/**
364		* Take removes existing elements until empty, then blocks interruptibly
365		*/
366		public void testBlockingTake() throws InterruptedException {
367	<	final LinkedBlockingQueue q = populatedQueue(SIZE);
368	<	Thread t = new Thread(new CheckedRunnable() {
367	>	final BlockingQueue q = populatedQueue(SIZE);
368	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
369	>	Thread t = newStartedThread(new CheckedRunnable() {
370		public void realRun() throws InterruptedException {
371		for (int i = 0; i < SIZE; ++i) {
372		assertEquals(i, q.take());
373		}
374	+
375	+	Thread.currentThread().interrupt();
376	+	try {
377	+	q.take();
378	+	shouldThrow();
379	+	} catch (InterruptedException success) {}
380	+	assertFalse(Thread.interrupted());
381	+
382	+	pleaseInterrupt.countDown();
383		try {
384		q.take();
385		shouldThrow();
386		} catch (InterruptedException success) {}
387	+	assertFalse(Thread.interrupted());
388		}});
389
390	<	t.start();
391	<	Thread.sleep(SHORT_DELAY_MS);
390	>	await(pleaseInterrupt);
391	>	assertThreadStaysAlive(t);
392		t.interrupt();
393	<	t.join();
393	>	awaitTermination(t);
394		}
395
396		/**
#	Line 413 | Line 405 | public class LinkedBlockingQueueTest ext
405		}
406
407		/**
408	<	* timed pool with zero timeout succeeds when non-empty, else times out
408	>	* timed poll with zero timeout succeeds when non-empty, else times out
409		*/
410		public void testTimedPoll0() throws InterruptedException {
411		LinkedBlockingQueue q = populatedQueue(SIZE);
#	Line 424 | Line 416 | public class LinkedBlockingQueueTest ext
416		}
417
418		/**
419	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
419	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
420		*/
421		public void testTimedPoll() throws InterruptedException {
422	<	LinkedBlockingQueue q = populatedQueue(SIZE);
422	>	LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
423		for (int i = 0; i < SIZE; ++i) {
424	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
425	<	}
426	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
424	>	long startTime = System.nanoTime();
425	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
426	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
427	>	}
428	>	long startTime = System.nanoTime();
429	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
430	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
431	>	checkEmpty(q);
432		}
433
434		/**
#	Line 439 | Line 436 | public class LinkedBlockingQueueTest ext
436		* returning timeout status
437		*/
438		public void testInterruptedTimedPoll() throws InterruptedException {
439	<	Thread t = new Thread(new CheckedRunnable() {
439	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
440	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
441	>	Thread t = newStartedThread(new CheckedRunnable() {
442		public void realRun() throws InterruptedException {
444	–	LinkedBlockingQueue q = populatedQueue(SIZE);
443		for (int i = 0; i < SIZE; ++i) {
444	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
444	>	long t0 = System.nanoTime();
445	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
446	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
447		}
448	+	long t0 = System.nanoTime();
449	+	aboutToWait.countDown();
450		try {
451	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
450	<	shouldThrow();
451	<	} catch (InterruptedException success) {}
452	<	}});
453	<
454	<	t.start();
455	<	Thread.sleep(SHORT_DELAY_MS);
456	<	t.interrupt();
457	<	t.join();
458	<	}
459	<
460	<	/**
461	<	*  timed poll before a delayed offer fails; after offer succeeds;
462	<	*  on interruption throws
463	<	*/
464	<	public void testTimedPollWithOffer() throws InterruptedException {
465	<	final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
466	<	Thread t = new Thread(new CheckedRunnable() {
467	<	public void realRun() throws InterruptedException {
468	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
469	<	assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
470	<	try {
471	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
451	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
452		shouldThrow();
453	<	} catch (InterruptedException success) {}
453	>	} catch (InterruptedException success) {
454	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
455	>	}
456		}});
457
458	<	t.start();
459	<	Thread.sleep(SMALL_DELAY_MS);
478	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
458	>	aboutToWait.await();
459	>	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
460		t.interrupt();
461	<	t.join();
461	>	awaitTermination(t, MEDIUM_DELAY_MS);
462	>	checkEmpty(q);
463		}
464
465		/**
#	Line 524 | Line 506 | public class LinkedBlockingQueueTest ext
506		}
507
508		/**
527	–	* remove(x) removes x and returns true if present
528	–	*/
529	–	public void testRemoveElement() {
530	–	LinkedBlockingQueue q = populatedQueue(SIZE);
531	–	for (int i = 1; i < SIZE; i+=2) {
532	–	assertTrue(q.remove(new Integer(i)));
533	–	}
534	–	for (int i = 0; i < SIZE; i+=2) {
535	–	assertTrue(q.remove(new Integer(i)));
536	–	assertFalse(q.remove(new Integer(i+1)));
537	–	}
538	–	assertTrue(q.isEmpty());
539	–	}
540	–
541	–	/**
509		* An add following remove(x) succeeds
510		*/
511		public void testRemoveElementAndAdd() throws InterruptedException {
#	Line 548 | Line 515 | public class LinkedBlockingQueueTest ext
515		assertTrue(q.remove(new Integer(1)));
516		assertTrue(q.remove(new Integer(2)));
517		assertTrue(q.add(new Integer(3)));
518	<	assertTrue(q.take() != null);
518	>	assertNotNull(q.take());
519		}
520
521		/**
#	Line 622 | Line 589 | public class LinkedBlockingQueueTest ext
589		assertTrue(q.removeAll(p));
590		assertEquals(SIZE-i, q.size());
591		for (int j = 0; j < i; ++j) {
592	<	Integer I = (Integer)(p.remove());
593	<	assertFalse(q.contains(I));
592	>	Integer x = (Integer)(p.remove());
593	>	assertFalse(q.contains(x));
594		}
595		}
596		}
597
598		/**
599	<	* toArray contains all elements
599	>	* toArray contains all elements in FIFO order
600		*/
601	<	public void testToArray() throws InterruptedException {
601	>	public void testToArray() {
602		LinkedBlockingQueue q = populatedQueue(SIZE);
603		Object[] o = q.toArray();
604		for (int i = 0; i < o.length; i++)
605	<	assertEquals(o[i], q.take());
605	>	assertSame(o[i], q.poll());
606		}
607
608		/**
609	<	* toArray(a) contains all elements
609	>	* toArray(a) contains all elements in FIFO order
610		*/
611		public void testToArray2() throws InterruptedException {
612	<	LinkedBlockingQueue q = populatedQueue(SIZE);
612	>	LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
613		Integer[] ints = new Integer[SIZE];
614	<	ints = (Integer[])q.toArray(ints);
614	>	Integer[] array = q.toArray(ints);
615	>	assertSame(ints, array);
616		for (int i = 0; i < ints.length; i++)
617	<	assertEquals(ints[i], q.take());
650	<	}
651	<
652	<	/**
653	<	* toArray(null) throws NPE
654	<	*/
655	<	public void testToArray_BadArg() {
656	<	LinkedBlockingQueue q = populatedQueue(SIZE);
657	<	try {
658	<	Object o[] = q.toArray(null);
659	<	shouldThrow();
660	<	} catch (NullPointerException success) {}
617	>	assertSame(ints[i], q.poll());
618		}
619
620		/**
621	<	* toArray with incompatible array type throws CCE
621	>	* toArray(incompatible array type) throws ArrayStoreException
622		*/
623		public void testToArray1_BadArg() {
624		LinkedBlockingQueue q = populatedQueue(SIZE);
625		try {
626	<	Object o[] = q.toArray(new String[10]);
626	>	q.toArray(new String[10]);
627		shouldThrow();
628		} catch (ArrayStoreException success) {}
629		}
630
674	–
631		/**
632		* iterator iterates through all elements
633		*/
634		public void testIterator() throws InterruptedException {
635		LinkedBlockingQueue q = populatedQueue(SIZE);
636		Iterator it = q.iterator();
637	<	while (it.hasNext()) {
637	>	int i;
638	>	for (i = 0; it.hasNext(); i++)
639	>	assertTrue(q.contains(it.next()));
640	>	assertEquals(i, SIZE);
641	>	assertIteratorExhausted(it);
642	>
643	>	it = q.iterator();
644	>	for (i = 0; it.hasNext(); i++)
645		assertEquals(it.next(), q.take());
646	<	}
646	>	assertEquals(i, SIZE);
647	>	assertIteratorExhausted(it);
648	>	}
649	>
650	>	/**
651	>	* iterator of empty collection has no elements
652	>	*/
653	>	public void testEmptyIterator() {
654	>	assertIteratorExhausted(new LinkedBlockingQueue().iterator());
655		}
656
657		/**
658		* iterator.remove removes current element
659		*/
660	<	public void testIteratorRemove () {
660	>	public void testIteratorRemove() {
661		final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
662		q.add(two);
663		q.add(one);
#	Line 702 | Line 673 | public class LinkedBlockingQueueTest ext
673		assertFalse(it.hasNext());
674		}
675
705	–
676		/**
677		* iterator ordering is FIFO
678		*/
#	Line 722 | Line 692 | public class LinkedBlockingQueueTest ext
692		/**
693		* Modifications do not cause iterators to fail
694		*/
695	<	public void testWeaklyConsistentIteration () {
695	>	public void testWeaklyConsistentIteration() {
696		final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
697		q.add(one);
698		q.add(two);
#	Line 734 | Line 704 | public class LinkedBlockingQueueTest ext
704		assertEquals(0, q.size());
705		}
706
737	–
707		/**
708		* toString contains toStrings of elements
709		*/
#	Line 742 | Line 711 | public class LinkedBlockingQueueTest ext
711		LinkedBlockingQueue q = populatedQueue(SIZE);
712		String s = q.toString();
713		for (int i = 0; i < SIZE; ++i) {
714	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
714	>	assertTrue(s.contains(String.valueOf(i)));
715		}
716		}
717
749	–
718		/**
719		* offer transfers elements across Executor tasks
720		*/
#	Line 755 | Line 723 | public class LinkedBlockingQueueTest ext
723		q.add(one);
724		q.add(two);
725		ExecutorService executor = Executors.newFixedThreadPool(2);
726	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
727		executor.execute(new CheckedRunnable() {
728		public void realRun() throws InterruptedException {
729		assertFalse(q.offer(three));
730	<	assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
730	>	threadsStarted.await();
731	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
732		assertEquals(0, q.remainingCapacity());
733		}});
734
735		executor.execute(new CheckedRunnable() {
736		public void realRun() throws InterruptedException {
737	<	Thread.sleep(SMALL_DELAY_MS);
737	>	threadsStarted.await();
738		assertSame(one, q.take());
739		}});
740
#	Line 772 | Line 742 | public class LinkedBlockingQueueTest ext
742		}
743
744		/**
745	<	* poll retrieves elements across Executor threads
745	>	* timed poll retrieves elements across Executor threads
746		*/
747		public void testPollInExecutor() {
748		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
749	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
750		ExecutorService executor = Executors.newFixedThreadPool(2);
751		executor.execute(new CheckedRunnable() {
752		public void realRun() throws InterruptedException {
753		assertNull(q.poll());
754	<	assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
755	<	assertTrue(q.isEmpty());
754	>	threadsStarted.await();
755	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
756	>	checkEmpty(q);
757		}});
758
759		executor.execute(new CheckedRunnable() {
760		public void realRun() throws InterruptedException {
761	<	Thread.sleep(SMALL_DELAY_MS);
761	>	threadsStarted.await();
762		q.put(one);
763		}});
764
#	Line 797 | Line 769 | public class LinkedBlockingQueueTest ext
769		* A deserialized serialized queue has same elements in same order
770		*/
771		public void testSerialization() throws Exception {
772	<	LinkedBlockingQueue q = populatedQueue(SIZE);
773	<
802	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
803	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
804	<	out.writeObject(q);
805	<	out.close();
806	<
807	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
808	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
809	<	LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
810	<	assertEquals(q.size(), r.size());
811	<	while (!q.isEmpty())
812	<	assertEquals(q.remove(), r.remove());
813	<	}
814	<
815	<	/**
816	<	* drainTo(null) throws NPE
817	<	*/
818	<	public void testDrainToNull() {
819	<	LinkedBlockingQueue q = populatedQueue(SIZE);
820	<	try {
821	<	q.drainTo(null);
822	<	shouldThrow();
823	<	} catch (NullPointerException success) {}
824	<	}
772	>	Queue x = populatedQueue(SIZE);
773	>	Queue y = serialClone(x);
774
775	<	/**
776	<	* drainTo(this) throws IAE
777	<	*/
778	<	public void testDrainToSelf() {
779	<	LinkedBlockingQueue q = populatedQueue(SIZE);
780	<	try {
781	<	q.drainTo(q);
782	<	shouldThrow();
783	<	} catch (IllegalArgumentException success) {}
775	>	assertNotSame(x, y);
776	>	assertEquals(x.size(), y.size());
777	>	assertEquals(x.toString(), y.toString());
778	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
779	>	while (!x.isEmpty()) {
780	>	assertFalse(y.isEmpty());
781	>	assertEquals(x.remove(), y.remove());
782	>	}
783	>	assertTrue(y.isEmpty());
784		}
785
786		/**
#	Line 841 | Line 790 | public class LinkedBlockingQueueTest ext
790		LinkedBlockingQueue q = populatedQueue(SIZE);
791		ArrayList l = new ArrayList();
792		q.drainTo(l);
793	<	assertEquals(q.size(), 0);
794	<	assertEquals(l.size(), SIZE);
793	>	assertEquals(0, q.size());
794	>	assertEquals(SIZE, l.size());
795		for (int i = 0; i < SIZE; ++i)
796		assertEquals(l.get(i), new Integer(i));
797		q.add(zero);
#	Line 852 | Line 801 | public class LinkedBlockingQueueTest ext
801		assertTrue(q.contains(one));
802		l.clear();
803		q.drainTo(l);
804	<	assertEquals(q.size(), 0);
805	<	assertEquals(l.size(), 2);
804	>	assertEquals(0, q.size());
805	>	assertEquals(2, l.size());
806		for (int i = 0; i < 2; ++i)
807		assertEquals(l.get(i), new Integer(i));
808		}
#	Line 879 | Line 828 | public class LinkedBlockingQueueTest ext
828		}
829
830		/**
831	<	* drainTo(null, n) throws NPE
883	<	*/
884	<	public void testDrainToNullN() {
885	<	LinkedBlockingQueue q = populatedQueue(SIZE);
886	<	try {
887	<	q.drainTo(null, 0);
888	<	shouldThrow();
889	<	} catch (NullPointerException success) {}
890	<	}
891	<
892	<	/**
893	<	* drainTo(this, n) throws IAE
894	<	*/
895	<	public void testDrainToSelfN() {
896	<	LinkedBlockingQueue q = populatedQueue(SIZE);
897	<	try {
898	<	q.drainTo(q, 0);
899	<	shouldThrow();
900	<	} catch (IllegalArgumentException success) {}
901	<	}
902	<
903	<	/**
904	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
831	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
832		*/
833		public void testDrainToN() {
834		LinkedBlockingQueue q = new LinkedBlockingQueue();
#	Line 910 | Line 837 | public class LinkedBlockingQueueTest ext
837		assertTrue(q.offer(new Integer(j)));
838		ArrayList l = new ArrayList();
839		q.drainTo(l, i);
840	<	int k = (i < SIZE)? i : SIZE;
841	<	assertEquals(l.size(), k);
842	<	assertEquals(q.size(), SIZE-k);
840	>	int k = (i < SIZE) ? i : SIZE;
841	>	assertEquals(k, l.size());
842	>	assertEquals(SIZE-k, q.size());
843		for (int j = 0; j < k; ++j)
844		assertEquals(l.get(j), new Integer(j));
845	<	while (q.poll() != null) ;
845	>	do {} while (q.poll() != null);
846	>	}
847	>	}
848	>
849	>	/**
850	>	* remove(null), contains(null) always return false
851	>	*/
852	>	public void testNeverContainsNull() {
853	>	Collection<?>[] qs = {
854	>	new LinkedBlockingQueue<Object>(),
855	>	populatedQueue(2),
856	>	};
857	>
858	>	for (Collection<?> q : qs) {
859	>	assertFalse(q.contains(null));
860	>	assertFalse(q.remove(null));
861		}
862		}
863

Diff Legend

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