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.43 by jsr166, Sat May 21 06:24:33 2011 UTC vs.
Revision 1.65 by jsr166, Mon Oct 17 01:31:30 2016 UTC

#	Line 6 | Line 6
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
#	Line 22 | Line 32 | public class LinkedBlockingQueueTest ext
32
33		public static class Bounded extends BlockingQueueTest {
34		protected BlockingQueue emptyCollection() {
35	<	return new LinkedBlockingQueue(20);
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	+	class Implementation implements CollectionImplementation {
45	+	public Class<?> klazz() { return LinkedBlockingQueue.class; }
46	+	public Collection emptyCollection() { return new LinkedBlockingQueue(); }
47	+	public Object makeElement(int i) { return i; }
48	+	public boolean isConcurrent() { return true; }
49	+	public boolean permitsNulls() { return false; }
50	+	}
51		return newTestSuite(LinkedBlockingQueueTest.class,
52		new Unbounded().testSuite(),
53	<	new Bounded().testSuite());
53	>	new Bounded().testSuite(),
54	>	CollectionTest.testSuite(new Implementation()));
55		}
56
39	–
57		/**
58	<	* Create a queue of given size containing consecutive
59	<	* Integers 0 ... n.
58	>	* Returns a new queue of given size containing consecutive
59	>	* Integers 0 ... n - 1.
60		*/
61		private LinkedBlockingQueue<Integer> populatedQueue(int n) {
62		LinkedBlockingQueue<Integer> q =
#	Line 50 | Line 67 | public class LinkedBlockingQueueTest ext
67		assertFalse(q.isEmpty());
68		assertEquals(0, q.remainingCapacity());
69		assertEquals(n, q.size());
70	+	assertEquals((Integer) 0, q.peek());
71		return q;
72		}
73
#	Line 63 | Line 81 | public class LinkedBlockingQueueTest ext
81		}
82
83		/**
84	<	* Constructor throws IAE if capacity argument nonpositive
84	>	* Constructor throws IllegalArgumentException if capacity argument nonpositive
85		*/
86		public void testConstructor2() {
87		try {
88	<	LinkedBlockingQueue q = new LinkedBlockingQueue(0);
88	>	new LinkedBlockingQueue(0);
89		shouldThrow();
90		} catch (IllegalArgumentException success) {}
91		}
92
93		/**
94	<	* Initializing from null Collection throws NPE
94	>	* Initializing from null Collection throws NullPointerException
95		*/
96		public void testConstructor3() {
97		try {
98	<	LinkedBlockingQueue q = new LinkedBlockingQueue(null);
98	>	new LinkedBlockingQueue(null);
99		shouldThrow();
100		} catch (NullPointerException success) {}
101		}
102
103		/**
104	<	* Initializing from Collection of null elements throws NPE
104	>	* Initializing from Collection of null elements throws NullPointerException
105		*/
106		public void testConstructor4() {
107	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
108		try {
109	<	Integer[] ints = new Integer[SIZE];
91	<	LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
109	>	new LinkedBlockingQueue(elements);
110		shouldThrow();
111		} catch (NullPointerException success) {}
112		}
113
114		/**
115	<	* Initializing from Collection with some null elements throws NPE
115	>	* Initializing from Collection with some null elements throws
116	>	* NullPointerException
117		*/
118		public void testConstructor5() {
119	+	Integer[] ints = new Integer[SIZE];
120	+	for (int i = 0; i < SIZE - 1; ++i)
121	+	ints[i] = new Integer(i);
122	+	Collection<Integer> elements = Arrays.asList(ints);
123		try {
124	<	Integer[] ints = new Integer[SIZE];
102	<	for (int i = 0; i < SIZE-1; ++i)
103	<	ints[i] = new Integer(i);
104	<	LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
124	>	new LinkedBlockingQueue(elements);
125		shouldThrow();
126		} catch (NullPointerException success) {}
127		}
#	Line 137 | Line 157 | public class LinkedBlockingQueueTest ext
157		* remainingCapacity decreases on add, increases on remove
158		*/
159		public void testRemainingCapacity() {
160	<	LinkedBlockingQueue q = populatedQueue(SIZE);
160	>	BlockingQueue q = populatedQueue(SIZE);
161		for (int i = 0; i < SIZE; ++i) {
162		assertEquals(i, q.remainingCapacity());
163	<	assertEquals(SIZE-i, q.size());
164	<	q.remove();
163	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
164	>	assertEquals(i, q.remove());
165		}
166		for (int i = 0; i < SIZE; ++i) {
167	<	assertEquals(SIZE-i, q.remainingCapacity());
168	<	assertEquals(i, q.size());
169	<	q.add(new Integer(i));
167	>	assertEquals(SIZE - i, q.remainingCapacity());
168	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
169	>	assertTrue(q.add(i));
170		}
171		}
172
173		/**
154	–	* offer(null) throws NPE
155	–	*/
156	–	public void testOfferNull() {
157	–	try {
158	–	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
159	–	q.offer(null);
160	–	shouldThrow();
161	–	} catch (NullPointerException success) {}
162	–	}
163	–
164	–	/**
165	–	* add(null) throws NPE
166	–	*/
167	–	public void testAddNull() {
168	–	try {
169	–	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
170	–	q.add(null);
171	–	shouldThrow();
172	–	} catch (NullPointerException success) {}
173	–	}
174	–
175	–	/**
174		* Offer succeeds if not full; fails if full
175		*/
176		public void testOffer() {
#	Line 182 | Line 180 | public class LinkedBlockingQueueTest ext
180		}
181
182		/**
183	<	* add succeeds if not full; throws ISE if full
183	>	* add succeeds if not full; throws IllegalStateException if full
184		*/
185		public void testAdd() {
186	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
187	+	for (int i = 0; i < SIZE; ++i)
188	+	assertTrue(q.add(new Integer(i)));
189	+	assertEquals(0, q.remainingCapacity());
190		try {
189	–	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
190	–	for (int i = 0; i < SIZE; ++i) {
191	–	assertTrue(q.add(new Integer(i)));
192	–	}
193	–	assertEquals(0, q.remainingCapacity());
191		q.add(new Integer(SIZE));
192		shouldThrow();
193		} catch (IllegalStateException success) {}
194		}
195
196		/**
197	<	* addAll(null) throws NPE
201	<	*/
202	<	public void testAddAll1() {
203	<	try {
204	<	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
205	<	q.addAll(null);
206	<	shouldThrow();
207	<	} catch (NullPointerException success) {}
208	<	}
209	<
210	<	/**
211	<	* addAll(this) throws IAE
197	>	* addAll(this) throws IllegalArgumentException
198		*/
199		public void testAddAllSelf() {
200	+	LinkedBlockingQueue q = populatedQueue(SIZE);
201		try {
215	–	LinkedBlockingQueue q = populatedQueue(SIZE);
202		q.addAll(q);
203		shouldThrow();
204		} catch (IllegalArgumentException success) {}
205		}
206
207		/**
222	–	* addAll of a collection with null elements throws NPE
223	–	*/
224	–	public void testAddAll2() {
225	–	try {
226	–	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
227	–	Integer[] ints = new Integer[SIZE];
228	–	q.addAll(Arrays.asList(ints));
229	–	shouldThrow();
230	–	} catch (NullPointerException success) {}
231	–	}
232	–
233	–	/**
208		* addAll of a collection with any null elements throws NPE after
209		* possibly adding some elements
210		*/
211		public void testAddAll3() {
212	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
213	+	Integer[] ints = new Integer[SIZE];
214	+	for (int i = 0; i < SIZE - 1; ++i)
215	+	ints[i] = new Integer(i);
216	+	Collection<Integer> elements = Arrays.asList(ints);
217		try {
218	<	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
240	<	Integer[] ints = new Integer[SIZE];
241	<	for (int i = 0; i < SIZE-1; ++i)
242	<	ints[i] = new Integer(i);
243	<	q.addAll(Arrays.asList(ints));
218	>	q.addAll(elements);
219		shouldThrow();
220		} catch (NullPointerException success) {}
221		}
222
223		/**
224	<	* addAll throws ISE if not enough room
224	>	* addAll throws IllegalStateException if not enough room
225		*/
226		public void testAddAll4() {
227	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE - 1);
228	+	Integer[] ints = new Integer[SIZE];
229	+	for (int i = 0; i < SIZE; ++i)
230	+	ints[i] = new Integer(i);
231	+	Collection<Integer> elements = Arrays.asList(ints);
232		try {
233	<	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
254	<	Integer[] ints = new Integer[SIZE];
255	<	for (int i = 0; i < SIZE; ++i)
256	<	ints[i] = new Integer(i);
257	<	q.addAll(Arrays.asList(ints));
233	>	q.addAll(elements);
234		shouldThrow();
235		} catch (IllegalStateException success) {}
236		}
#	Line 275 | Line 251 | public class LinkedBlockingQueueTest ext
251		}
252
253		/**
278	–	* put(null) throws NPE
279	–	*/
280	–	public void testPutNull() throws InterruptedException {
281	–	try {
282	–	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
283	–	q.put(null);
284	–	shouldThrow();
285	–	} catch (NullPointerException success) {}
286	–	}
287	–
288	–	/**
254		* all elements successfully put are contained
255		*/
256		public void testPut() throws InterruptedException {
257		LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
258		for (int i = 0; i < SIZE; ++i) {
259	<	Integer I = new Integer(i);
260	<	q.put(I);
261	<	assertTrue(q.contains(I));
259	>	Integer x = new Integer(i);
260	>	q.put(x);
261	>	assertTrue(q.contains(x));
262		}
263		assertEquals(0, q.remainingCapacity());
264		}
#	Line 303 | Line 268 | public class LinkedBlockingQueueTest ext
268		*/
269		public void testBlockingPut() throws InterruptedException {
270		final LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
271	<	Thread t = new Thread(new CheckedRunnable() {
271	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
272	>	Thread t = newStartedThread(new CheckedRunnable() {
273		public void realRun() throws InterruptedException {
274		for (int i = 0; i < SIZE; ++i)
275		q.put(i);
276		assertEquals(SIZE, q.size());
277		assertEquals(0, q.remainingCapacity());
278	+
279	+	Thread.currentThread().interrupt();
280	+	try {
281	+	q.put(99);
282	+	shouldThrow();
283	+	} catch (InterruptedException success) {}
284	+	assertFalse(Thread.interrupted());
285	+
286	+	pleaseInterrupt.countDown();
287		try {
288		q.put(99);
289		shouldThrow();
290		} catch (InterruptedException success) {}
291	+	assertFalse(Thread.interrupted());
292		}});
293
294	<	t.start();
295	<	delay(SHORT_DELAY_MS);
294	>	await(pleaseInterrupt);
295	>	assertThreadStaysAlive(t);
296		t.interrupt();
297	<	t.join();
297	>	awaitTermination(t);
298		assertEquals(SIZE, q.size());
299		assertEquals(0, q.remainingCapacity());
300		}
301
302		/**
303	<	* put blocks waiting for take when full
303	>	* put blocks interruptibly waiting for take when full
304		*/
305		public void testPutWithTake() throws InterruptedException {
306		final int capacity = 2;
307		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
308	<	Thread t = new Thread(new CheckedRunnable() {
308	>	final CountDownLatch pleaseTake = new CountDownLatch(1);
309	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
310	>	Thread t = newStartedThread(new CheckedRunnable() {
311		public void realRun() throws InterruptedException {
312	<	for (int i = 0; i < capacity + 1; i++)
312	>	for (int i = 0; i < capacity; i++)
313		q.put(i);
314	+	pleaseTake.countDown();
315	+	q.put(86);
316	+
317	+	pleaseInterrupt.countDown();
318		try {
319		q.put(99);
320		shouldThrow();
321		} catch (InterruptedException success) {}
322	+	assertFalse(Thread.interrupted());
323		}});
324
325	<	t.start();
326	<	delay(SHORT_DELAY_MS);
344	<	assertEquals(q.remainingCapacity(), 0);
325	>	await(pleaseTake);
326	>	assertEquals(0, q.remainingCapacity());
327		assertEquals(0, q.take());
328	<	delay(SHORT_DELAY_MS);
328	>
329	>	await(pleaseInterrupt);
330	>	assertThreadStaysAlive(t);
331		t.interrupt();
332	<	t.join();
333	<	assertEquals(q.remainingCapacity(), 0);
332	>	awaitTermination(t);
333	>	assertEquals(0, q.remainingCapacity());
334		}
335
336		/**
#	Line 370 | Line 354 | public class LinkedBlockingQueueTest ext
354		}});
355
356		await(pleaseInterrupt);
357	+	assertThreadStaysAlive(t);
358		t.interrupt();
359		awaitTermination(t);
360		}
#	Line 388 | Line 373 | public class LinkedBlockingQueueTest ext
373		* Take removes existing elements until empty, then blocks interruptibly
374		*/
375		public void testBlockingTake() throws InterruptedException {
376	<	final LinkedBlockingQueue q = populatedQueue(SIZE);
377	<	Thread t = new Thread(new CheckedRunnable() {
376	>	final BlockingQueue q = populatedQueue(SIZE);
377	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
378	>	Thread t = newStartedThread(new CheckedRunnable() {
379		public void realRun() throws InterruptedException {
380		for (int i = 0; i < SIZE; ++i) {
381		assertEquals(i, q.take());
382		}
383	+
384	+	Thread.currentThread().interrupt();
385		try {
386		q.take();
387		shouldThrow();
388		} catch (InterruptedException success) {}
389	+	assertFalse(Thread.interrupted());
390	+
391	+	pleaseInterrupt.countDown();
392	+	try {
393	+	q.take();
394	+	shouldThrow();
395	+	} catch (InterruptedException success) {}
396	+	assertFalse(Thread.interrupted());
397		}});
398
399	<	t.start();
400	<	delay(SHORT_DELAY_MS);
399	>	await(pleaseInterrupt);
400	>	assertThreadStaysAlive(t);
401		t.interrupt();
402	<	t.join();
402	>	awaitTermination(t);
403		}
404
405		/**
#	Line 432 | Line 428 | public class LinkedBlockingQueueTest ext
428		* timed poll with nonzero timeout succeeds when non-empty, else times out
429		*/
430		public void testTimedPoll() throws InterruptedException {
431	<	LinkedBlockingQueue q = populatedQueue(SIZE);
431	>	LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
432		for (int i = 0; i < SIZE; ++i) {
433	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
434	<	}
435	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
433	>	long startTime = System.nanoTime();
434	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
435	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
436	>	}
437	>	long startTime = System.nanoTime();
438	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
439	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
440	>	checkEmpty(q);
441		}
442
443		/**
#	Line 448 | Line 449 | public class LinkedBlockingQueueTest ext
449		final CountDownLatch aboutToWait = new CountDownLatch(1);
450		Thread t = newStartedThread(new CheckedRunnable() {
451		public void realRun() throws InterruptedException {
452	+	long startTime = System.nanoTime();
453		for (int i = 0; i < SIZE; ++i) {
452	–	long t0 = System.nanoTime();
454		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
454	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
455		}
456	–	long t0 = System.nanoTime();
456		aboutToWait.countDown();
457		try {
458	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
458	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
459		shouldThrow();
460		} catch (InterruptedException success) {
461	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
461	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
462		}
463		}});
464
465	<	aboutToWait.await();
466	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
465	>	await(aboutToWait);
466	>	waitForThreadToEnterWaitState(t);
467		t.interrupt();
468	<	awaitTermination(t, MEDIUM_DELAY_MS);
468	>	awaitTermination(t);
469		checkEmpty(q);
470		}
471
#	Line 514 | Line 513 | public class LinkedBlockingQueueTest ext
513		}
514
515		/**
517	–	* remove(x) removes x and returns true if present
518	–	*/
519	–	public void testRemoveElement() {
520	–	LinkedBlockingQueue q = populatedQueue(SIZE);
521	–	for (int i = 1; i < SIZE; i+=2) {
522	–	assertTrue(q.contains(i));
523	–	assertTrue(q.remove(i));
524	–	assertFalse(q.contains(i));
525	–	assertTrue(q.contains(i-1));
526	–	}
527	–	for (int i = 0; i < SIZE; i+=2) {
528	–	assertTrue(q.contains(i));
529	–	assertTrue(q.remove(i));
530	–	assertFalse(q.contains(i));
531	–	assertFalse(q.remove(i+1));
532	–	assertFalse(q.contains(i+1));
533	–	}
534	–	assertTrue(q.isEmpty());
535	–	}
536	–
537	–	/**
516		* An add following remove(x) succeeds
517		*/
518		public void testRemoveElementAndAdd() throws InterruptedException {
#	Line 544 | Line 522 | public class LinkedBlockingQueueTest ext
522		assertTrue(q.remove(new Integer(1)));
523		assertTrue(q.remove(new Integer(2)));
524		assertTrue(q.add(new Integer(3)));
525	<	assertTrue(q.take() != null);
525	>	assertNotNull(q.take());
526		}
527
528		/**
#	Line 603 | Line 581 | public class LinkedBlockingQueueTest ext
581		assertTrue(changed);
582
583		assertTrue(q.containsAll(p));
584	<	assertEquals(SIZE-i, q.size());
584	>	assertEquals(SIZE - i, q.size());
585		p.remove();
586		}
587		}
#	Line 616 | Line 594 | public class LinkedBlockingQueueTest ext
594		LinkedBlockingQueue q = populatedQueue(SIZE);
595		LinkedBlockingQueue p = populatedQueue(i);
596		assertTrue(q.removeAll(p));
597	<	assertEquals(SIZE-i, q.size());
597	>	assertEquals(SIZE - i, q.size());
598		for (int j = 0; j < i; ++j) {
599	<	Integer I = (Integer)(p.remove());
600	<	assertFalse(q.contains(I));
599	>	Integer x = (Integer)(p.remove());
600	>	assertFalse(q.contains(x));
601		}
602		}
603		}
#	Line 647 | Line 625 | public class LinkedBlockingQueueTest ext
625		}
626
627		/**
650	–	* toArray(null) throws NullPointerException
651	–	*/
652	–	public void testToArray_NullArg() {
653	–	LinkedBlockingQueue q = populatedQueue(SIZE);
654	–	try {
655	–	q.toArray(null);
656	–	shouldThrow();
657	–	} catch (NullPointerException success) {}
658	–	}
659	–
660	–	/**
628		* toArray(incompatible array type) throws ArrayStoreException
629		*/
630		public void testToArray1_BadArg() {
#	Line 668 | Line 635 | public class LinkedBlockingQueueTest ext
635		} catch (ArrayStoreException success) {}
636		}
637
671	–
638		/**
639		* iterator iterates through all elements
640		*/
641		public void testIterator() throws InterruptedException {
642		LinkedBlockingQueue q = populatedQueue(SIZE);
643		Iterator it = q.iterator();
644	<	while (it.hasNext()) {
644	>	int i;
645	>	for (i = 0; it.hasNext(); i++)
646	>	assertTrue(q.contains(it.next()));
647	>	assertEquals(i, SIZE);
648	>	assertIteratorExhausted(it);
649	>
650	>	it = q.iterator();
651	>	for (i = 0; it.hasNext(); i++)
652		assertEquals(it.next(), q.take());
653	<	}
653	>	assertEquals(i, SIZE);
654	>	assertIteratorExhausted(it);
655	>	}
656	>
657	>	/**
658	>	* iterator of empty collection has no elements
659	>	*/
660	>	public void testEmptyIterator() {
661	>	assertIteratorExhausted(new LinkedBlockingQueue().iterator());
662		}
663
664		/**
#	Line 699 | Line 680 | public class LinkedBlockingQueueTest ext
680		assertFalse(it.hasNext());
681		}
682
702	–
683		/**
684		* iterator ordering is FIFO
685		*/
#	Line 731 | Line 711 | public class LinkedBlockingQueueTest ext
711		assertEquals(0, q.size());
712		}
713
734	–
714		/**
715		* toString contains toStrings of elements
716		*/
#	Line 739 | Line 718 | public class LinkedBlockingQueueTest ext
718		LinkedBlockingQueue q = populatedQueue(SIZE);
719		String s = q.toString();
720		for (int i = 0; i < SIZE; ++i) {
721	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
721	>	assertTrue(s.contains(String.valueOf(i)));
722		}
723		}
724
746	–
725		/**
726		* offer transfers elements across Executor tasks
727		*/
#	Line 751 | Line 729 | public class LinkedBlockingQueueTest ext
729		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
730		q.add(one);
731		q.add(two);
732	<	ExecutorService executor = Executors.newFixedThreadPool(2);
733	<	executor.execute(new CheckedRunnable() {
734	<	public void realRun() throws InterruptedException {
735	<	assertFalse(q.offer(three));
736	<	assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
737	<	assertEquals(0, q.remainingCapacity());
738	<	}});
739	<
740	<	executor.execute(new CheckedRunnable() {
741	<	public void realRun() throws InterruptedException {
742	<	delay(SMALL_DELAY_MS);
743	<	assertSame(one, q.take());
744	<	}});
745	<
746	<	joinPool(executor);
732	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
733	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
734	>	try (PoolCleaner cleaner = cleaner(executor)) {
735	>	executor.execute(new CheckedRunnable() {
736	>	public void realRun() throws InterruptedException {
737	>	assertFalse(q.offer(three));
738	>	threadsStarted.await();
739	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
740	>	assertEquals(0, q.remainingCapacity());
741	>	}});
742	>
743	>	executor.execute(new CheckedRunnable() {
744	>	public void realRun() throws InterruptedException {
745	>	threadsStarted.await();
746	>	assertSame(one, q.take());
747	>	}});
748	>	}
749		}
750
751		/**
752	<	* poll retrieves elements across Executor threads
752	>	* timed poll retrieves elements across Executor threads
753		*/
754		public void testPollInExecutor() {
755		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
756	<	ExecutorService executor = Executors.newFixedThreadPool(2);
757	<	executor.execute(new CheckedRunnable() {
758	<	public void realRun() throws InterruptedException {
759	<	assertNull(q.poll());
760	<	assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
761	<	assertTrue(q.isEmpty());
762	<	}});
763	<
764	<	executor.execute(new CheckedRunnable() {
765	<	public void realRun() throws InterruptedException {
766	<	delay(SMALL_DELAY_MS);
767	<	q.put(one);
768	<	}});
769	<
770	<	joinPool(executor);
756	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
757	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
758	>	try (PoolCleaner cleaner = cleaner(executor)) {
759	>	executor.execute(new CheckedRunnable() {
760	>	public void realRun() throws InterruptedException {
761	>	assertNull(q.poll());
762	>	threadsStarted.await();
763	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
764	>	checkEmpty(q);
765	>	}});
766	>
767	>	executor.execute(new CheckedRunnable() {
768	>	public void realRun() throws InterruptedException {
769	>	threadsStarted.await();
770	>	q.put(one);
771	>	}});
772	>	}
773		}
774
775		/**
776		* A deserialized serialized queue has same elements in same order
777		*/
778		public void testSerialization() throws Exception {
779	<	LinkedBlockingQueue q = populatedQueue(SIZE);
780	<
799	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
800	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
801	<	out.writeObject(q);
802	<	out.close();
803	<
804	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
805	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
806	<	LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
807	<	assertEquals(q.size(), r.size());
808	<	while (!q.isEmpty())
809	<	assertEquals(q.remove(), r.remove());
810	<	}
779	>	Queue x = populatedQueue(SIZE);
780	>	Queue y = serialClone(x);
781
782	<	/**
783	<	* drainTo(null) throws NPE
784	<	*/
785	<	public void testDrainToNull() {
786	<	LinkedBlockingQueue q = populatedQueue(SIZE);
787	<	try {
788	<	q.drainTo(null);
789	<	shouldThrow();
790	<	} catch (NullPointerException success) {}
821	<	}
822	<
823	<	/**
824	<	* drainTo(this) throws IAE
825	<	*/
826	<	public void testDrainToSelf() {
827	<	LinkedBlockingQueue q = populatedQueue(SIZE);
828	<	try {
829	<	q.drainTo(q);
830	<	shouldThrow();
831	<	} catch (IllegalArgumentException success) {}
782	>	assertNotSame(x, y);
783	>	assertEquals(x.size(), y.size());
784	>	assertEquals(x.toString(), y.toString());
785	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
786	>	while (!x.isEmpty()) {
787	>	assertFalse(y.isEmpty());
788	>	assertEquals(x.remove(), y.remove());
789	>	}
790	>	assertTrue(y.isEmpty());
791		}
792
793		/**
#	Line 838 | Line 797 | public class LinkedBlockingQueueTest ext
797		LinkedBlockingQueue q = populatedQueue(SIZE);
798		ArrayList l = new ArrayList();
799		q.drainTo(l);
800	<	assertEquals(q.size(), 0);
801	<	assertEquals(l.size(), SIZE);
800	>	assertEquals(0, q.size());
801	>	assertEquals(SIZE, l.size());
802		for (int i = 0; i < SIZE; ++i)
803		assertEquals(l.get(i), new Integer(i));
804		q.add(zero);
#	Line 849 | Line 808 | public class LinkedBlockingQueueTest ext
808		assertTrue(q.contains(one));
809		l.clear();
810		q.drainTo(l);
811	<	assertEquals(q.size(), 0);
812	<	assertEquals(l.size(), 2);
811	>	assertEquals(0, q.size());
812	>	assertEquals(2, l.size());
813		for (int i = 0; i < 2; ++i)
814		assertEquals(l.get(i), new Integer(i));
815		}
#	Line 862 | Line 821 | public class LinkedBlockingQueueTest ext
821		final LinkedBlockingQueue q = populatedQueue(SIZE);
822		Thread t = new Thread(new CheckedRunnable() {
823		public void realRun() throws InterruptedException {
824	<	q.put(new Integer(SIZE+1));
824	>	q.put(new Integer(SIZE + 1));
825		}});
826
827		t.start();
#	Line 876 | Line 835 | public class LinkedBlockingQueueTest ext
835		}
836
837		/**
879	–	* drainTo(null, n) throws NPE
880	–	*/
881	–	public void testDrainToNullN() {
882	–	LinkedBlockingQueue 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	–	LinkedBlockingQueue q = populatedQueue(SIZE);
894	–	try {
895	–	q.drainTo(q, 0);
896	–	shouldThrow();
897	–	} catch (IllegalArgumentException success) {}
898	–	}
899	–
900	–	/**
838		* drainTo(c, n) empties first min(n, size) elements of queue into c
839		*/
840		public void testDrainToN() {
#	Line 908 | Line 845 | public class LinkedBlockingQueueTest ext
845		ArrayList l = new ArrayList();
846		q.drainTo(l, i);
847		int k = (i < SIZE) ? i : SIZE;
848	<	assertEquals(l.size(), k);
849	<	assertEquals(q.size(), SIZE-k);
848	>	assertEquals(k, l.size());
849	>	assertEquals(SIZE - k, q.size());
850		for (int j = 0; j < k; ++j)
851		assertEquals(l.get(j), new Integer(j));
852	<	while (q.poll() != null) ;
852	>	do {} while (q.poll() != null);
853	>	}
854	>	}
855	>
856	>	/**
857	>	* remove(null), contains(null) always return false
858	>	*/
859	>	public void testNeverContainsNull() {
860	>	Collection<?>[] qs = {
861	>	new LinkedBlockingQueue<Object>(),
862	>	populatedQueue(2),
863	>	};
864	>
865	>	for (Collection<?> q : qs) {
866	>	assertFalse(q.contains(null));
867	>	assertFalse(q.remove(null));
868		}
869		}
870

Diff Legend

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