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.18 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.59 by jsr166, Sat Apr 25 04:55:31 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	>	main(suite(), args);
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 122 | Line 148 | public class LinkedBlockingQueueTest ext
148		* remainingCapacity decreases on add, increases on remove
149		*/
150		public void testRemainingCapacity() {
151	<	LinkedBlockingQueue q = populatedQueue(SIZE);
151	>	BlockingQueue q = populatedQueue(SIZE);
152		for (int i = 0; i < SIZE; ++i) {
153		assertEquals(i, q.remainingCapacity());
154	<	assertEquals(SIZE-i, q.size());
155	<	q.remove();
154	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
155	>	assertEquals(i, q.remove());
156		}
157		for (int i = 0; i < SIZE; ++i) {
158		assertEquals(SIZE-i, q.remainingCapacity());
159	<	assertEquals(i, q.size());
160	<	q.add(new Integer(i));
159	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
160	>	assertTrue(q.add(i));
161		}
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 284 | Line 258 | public class LinkedBlockingQueueTest ext
258		* put blocks interruptibly if full
259		*/
260		public void testBlockingPut() throws InterruptedException {
261	<	Thread t = new Thread(new CheckedRunnable() {
262	<	public void realRun() {
263	<	int added = 0;
261	>	final LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
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	<	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
273	<	for (int i = 0; i < SIZE; ++i) {
274	<	q.put(new Integer(i));
275	<	++added;
276	<	}
277	<	q.put(new Integer(SIZE));
278	<	threadShouldThrow();
279	<	} catch (InterruptedException success) {
280	<	threadAssertEquals(added, SIZE);
281	<	}
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() {
300	<	public void realRun() {
301	<	int added = 0;
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; i++)
304	>	q.put(i);
305	>	pleaseTake.countDown();
306	>	q.put(86);
307	>
308	>	pleaseInterrupt.countDown();
309		try {
310	<	q.put(new Object());
311	<	++added;
312	<	q.put(new Object());
313	<	++added;
322	<	q.put(new Object());
323	<	++added;
324	<	q.put(new Object());
325	<	++added;
326	<	threadShouldThrow();
327	<	} catch (InterruptedException success) {
328	<	threadAssertTrue(added >= 2);
329	<	}
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);
318	<	q.take();
316	>	await(pleaseTake);
317	>	assertEquals(0, q.remainingCapacity());
318	>	assertEquals(0, q.take());
319	>
320	>	await(pleaseInterrupt);
321	>	assertThreadStaysAlive(t);
322		t.interrupt();
323	<	t.join();
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 ThreadShouldThrow(InterruptedException.class) {
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	<	threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
338	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
339	<	}};
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(), 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 361 | Line 356 | public class LinkedBlockingQueueTest ext
356		public void testTake() throws InterruptedException {
357		LinkedBlockingQueue q = populatedQueue(SIZE);
358		for (int i = 0; i < SIZE; ++i) {
359	<	assertEquals(i, ((Integer)q.take()).intValue());
359	>	assertEquals(i, q.take());
360		}
361		}
362
363		/**
369	–	* take blocks interruptibly when empty
370	–	*/
371	–	public void testTakeFromEmpty() throws InterruptedException {
372	–	final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
373	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
374	–	public void realRun() throws InterruptedException {
375	–	q.take();
376	–	}};
377	–
378	–	t.start();
379	–	Thread.sleep(SHORT_DELAY_MS);
380	–	t.interrupt();
381	–	t.join();
382	–	}
383	–
384	–	/**
364		* Take removes existing elements until empty, then blocks interruptibly
365		*/
366		public void testBlockingTake() throws InterruptedException {
367	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
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 {
390	–	LinkedBlockingQueue q = populatedQueue(SIZE);
371		for (int i = 0; i < SIZE; ++i) {
372	<	assertEquals(i, ((Integer)q.take()).intValue());
372	>	assertEquals(i, q.take());
373		}
394	–	q.take();
395	–	}};
374
375	<	t.start();
376	<	Thread.sleep(SHORT_DELAY_MS);
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	>	await(pleaseInterrupt);
391	>	assertThreadStaysAlive(t);
392		t.interrupt();
393	<	t.join();
393	>	awaitTermination(t);
394		}
395
403	–
396		/**
397		* poll succeeds unless empty
398		*/
399		public void testPoll() {
400		LinkedBlockingQueue q = populatedQueue(SIZE);
401		for (int i = 0; i < SIZE; ++i) {
402	<	assertEquals(i, ((Integer)q.poll()).intValue());
402	>	assertEquals(i, q.poll());
403		}
404		assertNull(q.poll());
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);
412		for (int i = 0; i < SIZE; ++i) {
413	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
413	>	assertEquals(i, q.poll(0, MILLISECONDS));
414		}
415		assertNull(q.poll(0, MILLISECONDS));
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, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
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 ThreadShouldThrow(InterruptedException.class) {
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	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
444	>	long t0 = System.nanoTime();
445	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
446	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
447		}
448	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
449	<	}};
450	<
451	<	t.start();
452	<	Thread.sleep(SHORT_DELAY_MS);
453	<	t.interrupt();
454	<	t.join();
455	<	}
456	<
457	<	/**
458	<	*  timed poll before a delayed offer fails; after offer succeeds;
459	<	*  on interruption throws
460	<	*/
461	<	public void testTimedPollWithOffer() throws InterruptedException {
462	<	final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
463	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
464	<	public void realRun() throws InterruptedException {
465	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
466	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
467	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
468	<	}};
448	>	long t0 = System.nanoTime();
449	>	aboutToWait.countDown();
450	>	try {
451	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
452	>	shouldThrow();
453	>	} catch (InterruptedException success) {
454	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
455	>	}
456	>	}});
457
458	<	t.start();
459	<	Thread.sleep(SMALL_DELAY_MS);
472	<	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 480 | Line 468 | public class LinkedBlockingQueueTest ext
468		public void testPeek() {
469		LinkedBlockingQueue q = populatedQueue(SIZE);
470		for (int i = 0; i < SIZE; ++i) {
471	<	assertEquals(i, ((Integer)q.peek()).intValue());
472	<	q.poll();
471	>	assertEquals(i, q.peek());
472	>	assertEquals(i, q.poll());
473		assertTrue(q.peek() == null ||
474	<	i != ((Integer)q.peek()).intValue());
474	>	!q.peek().equals(i));
475		}
476		assertNull(q.peek());
477		}
#	Line 494 | Line 482 | public class LinkedBlockingQueueTest ext
482		public void testElement() {
483		LinkedBlockingQueue q = populatedQueue(SIZE);
484		for (int i = 0; i < SIZE; ++i) {
485	<	assertEquals(i, ((Integer)q.element()).intValue());
486	<	q.poll();
485	>	assertEquals(i, q.element());
486	>	assertEquals(i, q.poll());
487		}
488		try {
489		q.element();
#	Line 509 | Line 497 | public class LinkedBlockingQueueTest ext
497		public void testRemove() {
498		LinkedBlockingQueue q = populatedQueue(SIZE);
499		for (int i = 0; i < SIZE; ++i) {
500	<	assertEquals(i, ((Integer)q.remove()).intValue());
500	>	assertEquals(i, q.remove());
501		}
502		try {
503		q.remove();
#	Line 518 | Line 506 | public class LinkedBlockingQueueTest ext
506		}
507
508		/**
521	–	* remove(x) removes x and returns true if present
522	–	*/
523	–	public void testRemoveElement() {
524	–	LinkedBlockingQueue q = populatedQueue(SIZE);
525	–	for (int i = 1; i < SIZE; i+=2) {
526	–	assertTrue(q.remove(new Integer(i)));
527	–	}
528	–	for (int i = 0; i < SIZE; i+=2) {
529	–	assertTrue(q.remove(new Integer(i)));
530	–	assertFalse(q.remove(new Integer(i+1)));
531	–	}
532	–	assertTrue(q.isEmpty());
533	–	}
534	–
535	–	/**
509		* An add following remove(x) succeeds
510		*/
511		public void testRemoveElementAndAdd() throws InterruptedException {
#	Line 542 | 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 616 | 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());
644	<	}
645	<
646	<	/**
647	<	* toArray(null) throws NPE
648	<	*/
649	<	public void testToArray_BadArg() {
650	<	try {
651	<	LinkedBlockingQueue q = populatedQueue(SIZE);
652	<	Object o[] = q.toArray(null);
653	<	shouldThrow();
654	<	} 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	<	LinkedBlockingQueue q = populatedQueue(SIZE);
663	<	Object o[] = q.toArray(new String[10] );
626	>	q.toArray(new String[10]);
627		shouldThrow();
628		} catch (ArrayStoreException success) {}
629		}
630
668	–
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 691 | Line 668 | public class LinkedBlockingQueueTest ext
668		it.remove();
669
670		it = q.iterator();
671	<	assertEquals(it.next(), one);
672	<	assertEquals(it.next(), three);
671	>	assertSame(it.next(), one);
672	>	assertSame(it.next(), three);
673		assertFalse(it.hasNext());
674		}
675
699	–
676		/**
677		* iterator ordering is FIFO
678		*/
#	Line 708 | Line 684 | public class LinkedBlockingQueueTest ext
684		assertEquals(0, q.remainingCapacity());
685		int k = 0;
686		for (Iterator it = q.iterator(); it.hasNext();) {
687	<	int i = ((Integer)(it.next())).intValue();
712	<	assertEquals(++k, i);
687	>	assertEquals(++k, it.next());
688		}
689		assertEquals(3, k);
690		}
#	Line 717 | 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 729 | Line 704 | public class LinkedBlockingQueueTest ext
704		assertEquals(0, q.size());
705		}
706
732	–
707		/**
708		* toString contains toStrings of elements
709		*/
#	Line 737 | 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
744	–
718		/**
719		* offer transfers elements across Executor tasks
720		*/
#	Line 750 | 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	<	threadAssertFalse(q.offer(three));
730	<	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
731	<	threadAssertEquals(0, q.remainingCapacity());
729	>	assertFalse(q.offer(three));
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);
738	<	threadAssertEquals(one, q.take());
737	>	threadsStarted.await();
738	>	assertSame(one, q.take());
739		}});
740
741		joinPool(executor);
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	<	threadAssertNull(q.poll());
754	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
755	<	threadAssertTrue(q.isEmpty());
753	>	assertNull(q.poll());
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 792 | 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);
772	>	Queue x = populatedQueue(SIZE);
773	>	Queue y = serialClone(x);
774
775	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
776	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
777	<	out.writeObject(q);
778	<	out.close();
779	<
780	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
781	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
782	<	LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
783	<	assertEquals(q.size(), r.size());
806	<	while (!q.isEmpty())
807	<	assertEquals(q.remove(), r.remove());
808	<	}
809	<
810	<	/**
811	<	* drainTo(null) throws NPE
812	<	*/
813	<	public void testDrainToNull() {
814	<	LinkedBlockingQueue q = populatedQueue(SIZE);
815	<	try {
816	<	q.drainTo(null);
817	<	shouldThrow();
818	<	} catch (NullPointerException success) {}
819	<	}
820	<
821	<	/**
822	<	* drainTo(this) throws IAE
823	<	*/
824	<	public void testDrainToSelf() {
825	<	LinkedBlockingQueue q = populatedQueue(SIZE);
826	<	try {
827	<	q.drainTo(q);
828	<	shouldThrow();
829	<	} 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 836 | 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 847 | 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 874 | Line 828 | public class LinkedBlockingQueueTest ext
828		}
829
830		/**
831	<	* drainTo(null, n) throws NPE
878	<	*/
879	<	public void testDrainToNullN() {
880	<	LinkedBlockingQueue q = populatedQueue(SIZE);
881	<	try {
882	<	q.drainTo(null, 0);
883	<	shouldThrow();
884	<	} catch (NullPointerException success) {}
885	<	}
886	<
887	<	/**
888	<	* drainTo(this, n) throws IAE
889	<	*/
890	<	public void testDrainToSelfN() {
891	<	LinkedBlockingQueue q = populatedQueue(SIZE);
892	<	try {
893	<	q.drainTo(q, 0);
894	<	shouldThrow();
895	<	} catch (IllegalArgumentException success) {}
896	<	}
897	<
898	<	/**
899	<	* 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 905 | 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