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.24 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.47 by jsr166, Fri Jul 15 18:49:31 2011 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.*;
10	>	import java.util.Arrays;
11	>	import java.util.ArrayList;
12	>	import java.util.Collection;
13	>	import java.util.Iterator;
14	>	import java.util.NoSuchElementException;
15	>	import java.util.Queue;
16	>	import java.util.concurrent.BlockingQueue;
17	>	import java.util.concurrent.CountDownLatch;
18	>	import java.util.concurrent.LinkedBlockingQueue;
19	>	import java.util.concurrent.Executors;
20	>	import java.util.concurrent.ExecutorService;
21		import static java.util.concurrent.TimeUnit.MILLISECONDS;
13	–	import java.io.*;
22
23		public class LinkedBlockingQueueTest extends JSR166TestCase {
24
25	+	public static class Unbounded extends BlockingQueueTest {
26	+	protected BlockingQueue emptyCollection() {
27	+	return new LinkedBlockingQueue();
28	+	}
29	+	}
30	+
31	+	public static class Bounded extends BlockingQueueTest {
32	+	protected BlockingQueue emptyCollection() {
33	+	return new LinkedBlockingQueue(SIZE);
34	+	}
35	+	}
36	+
37		public static void main(String[] args) {
38	<	junit.textui.TestRunner.run (suite());
38	>	junit.textui.TestRunner.run(suite());
39		}
40
41		public static Test suite() {
42	<	return new TestSuite(LinkedBlockingQueueTest.class);
42	>	return newTestSuite(LinkedBlockingQueueTest.class,
43	>	new Unbounded().testSuite(),
44	>	new Bounded().testSuite());
45		}
46
25	–
47		/**
48		* Create a queue of given size containing consecutive
49		* Integers 0 ... n.
50		*/
51	<	private LinkedBlockingQueue populatedQueue(int n) {
52	<	LinkedBlockingQueue q = new LinkedBlockingQueue(n);
51	>	private LinkedBlockingQueue<Integer> populatedQueue(int n) {
52	>	LinkedBlockingQueue<Integer> q =
53	>	new LinkedBlockingQueue<Integer>(n);
54		assertTrue(q.isEmpty());
55		for (int i = 0; i < n; i++)
56		assertTrue(q.offer(new Integer(i)));
#	Line 48 | Line 70 | public class LinkedBlockingQueueTest ext
70		}
71
72		/**
73	<	* Constructor throws IAE if capacity argument nonpositive
73	>	* Constructor throws IllegalArgumentException if capacity argument nonpositive
74		*/
75		public void testConstructor2() {
76		try {
77	<	LinkedBlockingQueue q = new LinkedBlockingQueue(0);
77	>	new LinkedBlockingQueue(0);
78		shouldThrow();
79		} catch (IllegalArgumentException success) {}
80		}
81
82		/**
83	<	* Initializing from null Collection throws NPE
83	>	* Initializing from null Collection throws NullPointerException
84		*/
85		public void testConstructor3() {
86		try {
87	<	LinkedBlockingQueue q = new LinkedBlockingQueue(null);
87	>	new LinkedBlockingQueue(null);
88		shouldThrow();
89		} catch (NullPointerException success) {}
90		}
91
92		/**
93	<	* Initializing from Collection of null elements throws NPE
93	>	* Initializing from Collection of null elements throws NullPointerException
94		*/
95		public void testConstructor4() {
96	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
97		try {
98	<	Integer[] ints = new Integer[SIZE];
76	<	LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
98	>	new LinkedBlockingQueue(elements);
99		shouldThrow();
100		} catch (NullPointerException success) {}
101		}
102
103		/**
104	<	* Initializing from Collection with some null elements throws NPE
104	>	* Initializing from Collection with some null elements throws
105	>	* NullPointerException
106		*/
107		public void testConstructor5() {
108	+	Integer[] ints = new Integer[SIZE];
109	+	for (int i = 0; i < SIZE-1; ++i)
110	+	ints[i] = new Integer(i);
111	+	Collection<Integer> elements = Arrays.asList(ints);
112		try {
113	<	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));
113	>	new LinkedBlockingQueue(elements);
114		shouldThrow();
115		} catch (NullPointerException success) {}
116		}
#	Line 136 | Line 160 | public class LinkedBlockingQueueTest ext
160		}
161
162		/**
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	–	/**
163		* Offer succeeds if not full; fails if full
164		*/
165		public void testOffer() {
#	Line 167 | Line 169 | public class LinkedBlockingQueueTest ext
169		}
170
171		/**
172	<	* add succeeds if not full; throws ISE if full
172	>	* add succeeds if not full; throws IllegalStateException if full
173		*/
174		public void testAdd() {
175	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
176	+	for (int i = 0; i < SIZE; ++i)
177	+	assertTrue(q.add(new Integer(i)));
178	+	assertEquals(0, q.remainingCapacity());
179		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());
180		q.add(new Integer(SIZE));
181		shouldThrow();
182		} catch (IllegalStateException success) {}
183		}
184
185		/**
186	<	* 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
186	>	* addAll(this) throws IllegalArgumentException
187		*/
188		public void testAddAllSelf() {
189	+	LinkedBlockingQueue q = populatedQueue(SIZE);
190		try {
200	–	LinkedBlockingQueue q = populatedQueue(SIZE);
191		q.addAll(q);
192		shouldThrow();
193		} catch (IllegalArgumentException success) {}
194		}
195
196		/**
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	–	/**
197		* addAll of a collection with any null elements throws NPE after
198		* possibly adding some elements
199		*/
200		public void testAddAll3() {
201	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
202	+	Integer[] ints = new Integer[SIZE];
203	+	for (int i = 0; i < SIZE-1; ++i)
204	+	ints[i] = new Integer(i);
205	+	Collection<Integer> elements = Arrays.asList(ints);
206		try {
207	<	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));
207	>	q.addAll(elements);
208		shouldThrow();
209		} catch (NullPointerException success) {}
210		}
211	+
212		/**
213	<	* addAll throws ISE if not enough room
213	>	* addAll throws IllegalStateException if not enough room
214		*/
215		public void testAddAll4() {
216	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE - 1);
217	+	Integer[] ints = new Integer[SIZE];
218	+	for (int i = 0; i < SIZE; ++i)
219	+	ints[i] = new Integer(i);
220	+	Collection<Integer> elements = Arrays.asList(ints);
221		try {
222	<	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));
222	>	q.addAll(elements);
223		shouldThrow();
224		} catch (IllegalStateException success) {}
225		}
226	+
227		/**
228		* Queue contains all elements, in traversal order, of successful addAll
229		*/
#	Line 257 | Line 240 | public class LinkedBlockingQueueTest ext
240		}
241
242		/**
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	–	/**
243		* all elements successfully put are contained
244		*/
245		public void testPut() throws InterruptedException {
#	Line 285 | Line 257 | public class LinkedBlockingQueueTest ext
257		*/
258		public void testBlockingPut() throws InterruptedException {
259		final LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
260	<	Thread t = new Thread(new CheckedRunnable() {
260	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
261	>	Thread t = newStartedThread(new CheckedRunnable() {
262		public void realRun() throws InterruptedException {
263		for (int i = 0; i < SIZE; ++i)
264		q.put(i);
265		assertEquals(SIZE, q.size());
266		assertEquals(0, q.remainingCapacity());
267	+
268	+	Thread.currentThread().interrupt();
269		try {
270		q.put(99);
271		shouldThrow();
272		} catch (InterruptedException success) {}
273	+	assertFalse(Thread.interrupted());
274	+
275	+	pleaseInterrupt.countDown();
276	+	try {
277	+	q.put(99);
278	+	shouldThrow();
279	+	} catch (InterruptedException success) {}
280	+	assertFalse(Thread.interrupted());
281		}});
282
283	<	t.start();
284	<	Thread.sleep(SHORT_DELAY_MS);
283	>	await(pleaseInterrupt);
284	>	assertThreadStaysAlive(t);
285		t.interrupt();
286	<	t.join();
286	>	awaitTermination(t);
287		assertEquals(SIZE, q.size());
288		assertEquals(0, q.remainingCapacity());
289		}
290
291		/**
292	<	* put blocks waiting for take when full
292	>	* put blocks interruptibly waiting for take when full
293		*/
294		public void testPutWithTake() throws InterruptedException {
295		final int capacity = 2;
296		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
297	<	Thread t = new Thread(new CheckedRunnable() {
297	>	final CountDownLatch pleaseTake = new CountDownLatch(1);
298	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
299	>	Thread t = newStartedThread(new CheckedRunnable() {
300		public void realRun() throws InterruptedException {
301	<	for (int i = 0; i < capacity + 1; i++)
301	>	for (int i = 0; i < capacity; i++)
302		q.put(i);
303	+	pleaseTake.countDown();
304	+	q.put(86);
305	+
306	+	pleaseInterrupt.countDown();
307		try {
308		q.put(99);
309		shouldThrow();
310		} catch (InterruptedException success) {}
311	+	assertFalse(Thread.interrupted());
312		}});
313
314	<	t.start();
325	<	Thread.sleep(SHORT_DELAY_MS);
314	>	await(pleaseTake);
315		assertEquals(q.remainingCapacity(), 0);
316		assertEquals(0, q.take());
317	<	Thread.sleep(SHORT_DELAY_MS);
317	>
318	>	await(pleaseInterrupt);
319	>	assertThreadStaysAlive(t);
320		t.interrupt();
321	<	t.join();
321	>	awaitTermination(t);
322		assertEquals(q.remainingCapacity(), 0);
323		}
324
325		/**
326		* timed offer times out if full and elements not taken
327		*/
328	<	public void testTimedOffer() throws InterruptedException {
328	>	public void testTimedOffer() {
329		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
330	<	Thread t = new Thread(new CheckedRunnable() {
330	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
331	>	Thread t = newStartedThread(new CheckedRunnable() {
332		public void realRun() throws InterruptedException {
333		q.put(new Object());
334		q.put(new Object());
335	<	assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
335	>	long startTime = System.nanoTime();
336	>	assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
337	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
338	>	pleaseInterrupt.countDown();
339		try {
340	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
340	>	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
341		shouldThrow();
342		} catch (InterruptedException success) {}
343		}});
344
345	<	t.start();
346	<	Thread.sleep(SMALL_DELAY_MS);
345	>	await(pleaseInterrupt);
346	>	assertThreadStaysAlive(t);
347		t.interrupt();
348	<	t.join();
348	>	awaitTermination(t);
349		}
350
351		/**
#	Line 364 | Line 359 | public class LinkedBlockingQueueTest ext
359		}
360
361		/**
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	–	/**
362		* Take removes existing elements until empty, then blocks interruptibly
363		*/
364		public void testBlockingTake() throws InterruptedException {
365	<	final LinkedBlockingQueue q = populatedQueue(SIZE);
366	<	Thread t = new Thread(new CheckedRunnable() {
365	>	final BlockingQueue q = populatedQueue(SIZE);
366	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
367	>	Thread t = newStartedThread(new CheckedRunnable() {
368		public void realRun() throws InterruptedException {
369		for (int i = 0; i < SIZE; ++i) {
370		assertEquals(i, q.take());
371		}
372	+
373	+	Thread.currentThread().interrupt();
374		try {
375		q.take();
376		shouldThrow();
377		} catch (InterruptedException success) {}
378	+	assertFalse(Thread.interrupted());
379	+
380	+	pleaseInterrupt.countDown();
381	+	try {
382	+	q.take();
383	+	shouldThrow();
384	+	} catch (InterruptedException success) {}
385	+	assertFalse(Thread.interrupted());
386		}});
387
388	<	t.start();
389	<	Thread.sleep(SHORT_DELAY_MS);
388	>	await(pleaseInterrupt);
389	>	assertThreadStaysAlive(t);
390		t.interrupt();
391	<	t.join();
391	>	awaitTermination(t);
392		}
393
394		/**
#	Line 413 | Line 403 | public class LinkedBlockingQueueTest ext
403		}
404
405		/**
406	<	* timed pool with zero timeout succeeds when non-empty, else times out
406	>	* timed poll with zero timeout succeeds when non-empty, else times out
407		*/
408		public void testTimedPoll0() throws InterruptedException {
409		LinkedBlockingQueue q = populatedQueue(SIZE);
#	Line 424 | Line 414 | public class LinkedBlockingQueueTest ext
414		}
415
416		/**
417	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
417	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
418		*/
419		public void testTimedPoll() throws InterruptedException {
420	<	LinkedBlockingQueue q = populatedQueue(SIZE);
420	>	LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
421		for (int i = 0; i < SIZE; ++i) {
422	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
423	<	}
424	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
422	>	long startTime = System.nanoTime();
423	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
424	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
425	>	}
426	>	long startTime = System.nanoTime();
427	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
428	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
429	>	checkEmpty(q);
430		}
431
432		/**
#	Line 439 | Line 434 | public class LinkedBlockingQueueTest ext
434		* returning timeout status
435		*/
436		public void testInterruptedTimedPoll() throws InterruptedException {
437	<	Thread t = new Thread(new CheckedRunnable() {
437	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
438	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
439	>	Thread t = newStartedThread(new CheckedRunnable() {
440		public void realRun() throws InterruptedException {
444	–	LinkedBlockingQueue q = populatedQueue(SIZE);
441		for (int i = 0; i < SIZE; ++i) {
442	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
442	>	long t0 = System.nanoTime();
443	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
444	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
445		}
446	+	long t0 = System.nanoTime();
447	+	aboutToWait.countDown();
448		try {
449	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
449	>	q.poll(MEDIUM_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);
472	<	shouldThrow();
473	<	} catch (InterruptedException success) {}
451	>	} catch (InterruptedException success) {
452	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
453	>	}
454		}});
455
456	<	t.start();
457	<	Thread.sleep(SMALL_DELAY_MS);
478	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
456	>	aboutToWait.await();
457	>	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
458		t.interrupt();
459	<	t.join();
459	>	awaitTermination(t, MEDIUM_DELAY_MS);
460	>	checkEmpty(q);
461		}
462
463		/**
#	Line 524 | Line 504 | public class LinkedBlockingQueueTest ext
504		}
505
506		/**
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	–	/**
507		* An add following remove(x) succeeds
508		*/
509		public void testRemoveElementAndAdd() throws InterruptedException {
#	Line 629 | Line 594 | public class LinkedBlockingQueueTest ext
594		}
595
596		/**
597	<	* toArray contains all elements
597	>	* toArray contains all elements in FIFO order
598		*/
599	<	public void testToArray() throws InterruptedException {
599	>	public void testToArray() {
600		LinkedBlockingQueue q = populatedQueue(SIZE);
601		Object[] o = q.toArray();
602		for (int i = 0; i < o.length; i++)
603	<	assertEquals(o[i], q.take());
603	>	assertSame(o[i], q.poll());
604		}
605
606		/**
607	<	* toArray(a) contains all elements
607	>	* toArray(a) contains all elements in FIFO order
608		*/
609		public void testToArray2() throws InterruptedException {
610	<	LinkedBlockingQueue q = populatedQueue(SIZE);
610	>	LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
611		Integer[] ints = new Integer[SIZE];
612	<	ints = (Integer[])q.toArray(ints);
612	>	Integer[] array = q.toArray(ints);
613	>	assertSame(ints, array);
614		for (int i = 0; i < ints.length; i++)
615	<	assertEquals(ints[i], q.take());
615	>	assertSame(ints[i], q.poll());
616		}
617
618		/**
619	<	* 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) {}
661	<	}
662	<
663	<	/**
664	<	* toArray with incompatible array type throws CCE
619	>	* toArray(incompatible array type) throws ArrayStoreException
620		*/
621		public void testToArray1_BadArg() {
622		LinkedBlockingQueue q = populatedQueue(SIZE);
623		try {
624	<	Object o[] = q.toArray(new String[10]);
624	>	q.toArray(new String[10]);
625		shouldThrow();
626		} catch (ArrayStoreException success) {}
627		}
628
674	–
629		/**
630		* iterator iterates through all elements
631		*/
#	Line 686 | Line 640 | public class LinkedBlockingQueueTest ext
640		/**
641		* iterator.remove removes current element
642		*/
643	<	public void testIteratorRemove () {
643	>	public void testIteratorRemove() {
644		final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
645		q.add(two);
646		q.add(one);
#	Line 697 | Line 651 | public class LinkedBlockingQueueTest ext
651		it.remove();
652
653		it = q.iterator();
654	<	assertEquals(it.next(), one);
655	<	assertEquals(it.next(), three);
654	>	assertSame(it.next(), one);
655	>	assertSame(it.next(), three);
656		assertFalse(it.hasNext());
657		}
658
705	–
659		/**
660		* iterator ordering is FIFO
661		*/
#	Line 722 | Line 675 | public class LinkedBlockingQueueTest ext
675		/**
676		* Modifications do not cause iterators to fail
677		*/
678	<	public void testWeaklyConsistentIteration () {
678	>	public void testWeaklyConsistentIteration() {
679		final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
680		q.add(one);
681		q.add(two);
#	Line 734 | Line 687 | public class LinkedBlockingQueueTest ext
687		assertEquals(0, q.size());
688		}
689
737	–
690		/**
691		* toString contains toStrings of elements
692		*/
#	Line 742 | Line 694 | public class LinkedBlockingQueueTest ext
694		LinkedBlockingQueue q = populatedQueue(SIZE);
695		String s = q.toString();
696		for (int i = 0; i < SIZE; ++i) {
697	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
697	>	assertTrue(s.contains(String.valueOf(i)));
698		}
699		}
700
749	–
701		/**
702		* offer transfers elements across Executor tasks
703		*/
#	Line 755 | Line 706 | public class LinkedBlockingQueueTest ext
706		q.add(one);
707		q.add(two);
708		ExecutorService executor = Executors.newFixedThreadPool(2);
709	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
710		executor.execute(new CheckedRunnable() {
711		public void realRun() throws InterruptedException {
712		assertFalse(q.offer(three));
713	<	assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
713	>	threadsStarted.await();
714	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
715		assertEquals(0, q.remainingCapacity());
716		}});
717
718		executor.execute(new CheckedRunnable() {
719		public void realRun() throws InterruptedException {
720	<	Thread.sleep(SMALL_DELAY_MS);
720	>	threadsStarted.await();
721		assertSame(one, q.take());
722		}});
723
#	Line 772 | Line 725 | public class LinkedBlockingQueueTest ext
725		}
726
727		/**
728	<	* poll retrieves elements across Executor threads
728	>	* timed poll retrieves elements across Executor threads
729		*/
730		public void testPollInExecutor() {
731		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
732	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
733		ExecutorService executor = Executors.newFixedThreadPool(2);
734		executor.execute(new CheckedRunnable() {
735		public void realRun() throws InterruptedException {
736		assertNull(q.poll());
737	<	assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
738	<	assertTrue(q.isEmpty());
737	>	threadsStarted.await();
738	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
739	>	checkEmpty(q);
740		}});
741
742		executor.execute(new CheckedRunnable() {
743		public void realRun() throws InterruptedException {
744	<	Thread.sleep(SMALL_DELAY_MS);
744	>	threadsStarted.await();
745		q.put(one);
746		}});
747
#	Line 797 | Line 752 | public class LinkedBlockingQueueTest ext
752		* A deserialized serialized queue has same elements in same order
753		*/
754		public void testSerialization() throws Exception {
755	<	LinkedBlockingQueue q = populatedQueue(SIZE);
756	<
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	<	}
755	>	Queue x = populatedQueue(SIZE);
756	>	Queue y = serialClone(x);
757
758	<	/**
759	<	* drainTo(null) throws NPE
760	<	*/
761	<	public void testDrainToNull() {
762	<	LinkedBlockingQueue q = populatedQueue(SIZE);
763	<	try {
764	<	q.drainTo(null);
765	<	shouldThrow();
766	<	} catch (NullPointerException success) {}
824	<	}
825	<
826	<	/**
827	<	* drainTo(this) throws IAE
828	<	*/
829	<	public void testDrainToSelf() {
830	<	LinkedBlockingQueue q = populatedQueue(SIZE);
831	<	try {
832	<	q.drainTo(q);
833	<	shouldThrow();
834	<	} catch (IllegalArgumentException success) {}
758	>	assertTrue(x != y);
759	>	assertEquals(x.size(), y.size());
760	>	assertEquals(x.toString(), y.toString());
761	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
762	>	while (!x.isEmpty()) {
763	>	assertFalse(y.isEmpty());
764	>	assertEquals(x.remove(), y.remove());
765	>	}
766	>	assertTrue(y.isEmpty());
767		}
768
769		/**
#	Line 879 | Line 811 | public class LinkedBlockingQueueTest ext
811		}
812
813		/**
814	<	* 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
814	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
815		*/
816		public void testDrainToN() {
817		LinkedBlockingQueue q = new LinkedBlockingQueue();
#	Line 910 | Line 820 | public class LinkedBlockingQueueTest ext
820		assertTrue(q.offer(new Integer(j)));
821		ArrayList l = new ArrayList();
822		q.drainTo(l, i);
823	<	int k = (i < SIZE)? i : SIZE;
823	>	int k = (i < SIZE) ? i : SIZE;
824		assertEquals(l.size(), k);
825		assertEquals(q.size(), SIZE-k);
826		for (int j = 0; j < k; ++j)

Diff Legend

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