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.44 by jsr166, Fri May 27 20:07:24 2011 UTC vs.
Revision 1.77 by jsr166, Sun Jan 7 22:59:18 2018 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
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 =
45	<	new LinkedBlockingQueue<Integer>(n);
61	>	private static LinkedBlockingQueue<Integer> populatedQueue(int n) {
62	>	LinkedBlockingQueue<Integer> q = new LinkedBlockingQueue<>(n);
63		assertTrue(q.isEmpty());
64		for (int i = 0; i < n; i++)
65		assertTrue(q.offer(new Integer(i)));
66		assertFalse(q.isEmpty());
67		assertEquals(0, q.remainingCapacity());
68		assertEquals(n, q.size());
69	+	assertEquals((Integer) 0, q.peek());
70		return q;
71		}
72
#	Line 62 | Line 80 | public class LinkedBlockingQueueTest ext
80		}
81
82		/**
83	<	* Constructor throws IAE if capacity argument nonpositive
83	>	* Constructor throws IllegalArgumentException if capacity argument nonpositive
84		*/
85		public void testConstructor2() {
86		try {
87	<	LinkedBlockingQueue q = new LinkedBlockingQueue(0);
87	>	new LinkedBlockingQueue(0);
88		shouldThrow();
89		} catch (IllegalArgumentException success) {}
90		}
91
92		/**
93	<	* Initializing from null Collection throws NPE
93	>	* Initializing from null Collection throws NullPointerException
94		*/
95		public void testConstructor3() {
96		try {
97	<	LinkedBlockingQueue q = new LinkedBlockingQueue(null);
97	>	new LinkedBlockingQueue(null);
98		shouldThrow();
99		} catch (NullPointerException success) {}
100		}
101
102		/**
103	<	* Initializing from Collection of null elements throws NPE
103	>	* Initializing from Collection of null elements throws NullPointerException
104		*/
105		public void testConstructor4() {
106	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
107		try {
108	<	Integer[] ints = new Integer[SIZE];
90	<	LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
108	>	new LinkedBlockingQueue(elements);
109		shouldThrow();
110		} catch (NullPointerException success) {}
111		}
112
113		/**
114	<	* Initializing from Collection with some null elements throws NPE
114	>	* Initializing from Collection with some null elements throws
115	>	* NullPointerException
116		*/
117		public void testConstructor5() {
118	+	Integer[] ints = new Integer[SIZE];
119	+	for (int i = 0; i < SIZE - 1; ++i)
120	+	ints[i] = new Integer(i);
121	+	Collection<Integer> elements = Arrays.asList(ints);
122		try {
123	<	Integer[] ints = new Integer[SIZE];
101	<	for (int i = 0; i < SIZE-1; ++i)
102	<	ints[i] = new Integer(i);
103	<	LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
123	>	new LinkedBlockingQueue(elements);
124		shouldThrow();
125		} catch (NullPointerException success) {}
126		}
#	Line 136 | Line 156 | public class LinkedBlockingQueueTest ext
156		* remainingCapacity decreases on add, increases on remove
157		*/
158		public void testRemainingCapacity() {
159	<	LinkedBlockingQueue q = populatedQueue(SIZE);
159	>	BlockingQueue q = populatedQueue(SIZE);
160		for (int i = 0; i < SIZE; ++i) {
161		assertEquals(i, q.remainingCapacity());
162	<	assertEquals(SIZE-i, q.size());
163	<	q.remove();
162	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
163	>	assertEquals(i, q.remove());
164		}
165		for (int i = 0; i < SIZE; ++i) {
166	<	assertEquals(SIZE-i, q.remainingCapacity());
167	<	assertEquals(i, q.size());
168	<	q.add(new Integer(i));
166	>	assertEquals(SIZE - i, q.remainingCapacity());
167	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
168	>	assertTrue(q.add(i));
169		}
170		}
171
172		/**
153	–	* offer(null) throws NPE
154	–	*/
155	–	public void testOfferNull() {
156	–	try {
157	–	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
158	–	q.offer(null);
159	–	shouldThrow();
160	–	} catch (NullPointerException success) {}
161	–	}
162	–
163	–	/**
164	–	* add(null) throws NPE
165	–	*/
166	–	public void testAddNull() {
167	–	try {
168	–	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
169	–	q.add(null);
170	–	shouldThrow();
171	–	} catch (NullPointerException success) {}
172	–	}
173	–
174	–	/**
173		* Offer succeeds if not full; fails if full
174		*/
175		public void testOffer() {
#	Line 181 | Line 179 | public class LinkedBlockingQueueTest ext
179		}
180
181		/**
182	<	* add succeeds if not full; throws ISE if full
182	>	* add succeeds if not full; throws IllegalStateException if full
183		*/
184		public void testAdd() {
185	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
186	+	for (int i = 0; i < SIZE; ++i)
187	+	assertTrue(q.add(new Integer(i)));
188	+	assertEquals(0, q.remainingCapacity());
189		try {
188	–	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
189	–	for (int i = 0; i < SIZE; ++i) {
190	–	assertTrue(q.add(new Integer(i)));
191	–	}
192	–	assertEquals(0, q.remainingCapacity());
190		q.add(new Integer(SIZE));
191		shouldThrow();
192		} catch (IllegalStateException success) {}
193		}
194
195		/**
196	<	* addAll(null) throws NPE
200	<	*/
201	<	public void testAddAll1() {
202	<	try {
203	<	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
204	<	q.addAll(null);
205	<	shouldThrow();
206	<	} catch (NullPointerException success) {}
207	<	}
208	<
209	<	/**
210	<	* addAll(this) throws IAE
196	>	* addAll(this) throws IllegalArgumentException
197		*/
198		public void testAddAllSelf() {
199	+	LinkedBlockingQueue q = populatedQueue(SIZE);
200		try {
214	–	LinkedBlockingQueue q = populatedQueue(SIZE);
201		q.addAll(q);
202		shouldThrow();
203		} catch (IllegalArgumentException success) {}
204		}
205
206		/**
221	–	* addAll of a collection with null elements throws NPE
222	–	*/
223	–	public void testAddAll2() {
224	–	try {
225	–	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
226	–	Integer[] ints = new Integer[SIZE];
227	–	q.addAll(Arrays.asList(ints));
228	–	shouldThrow();
229	–	} catch (NullPointerException success) {}
230	–	}
231	–
232	–	/**
207		* addAll of a collection with any null elements throws NPE after
208		* possibly adding some elements
209		*/
210		public void testAddAll3() {
211	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
212	+	Integer[] ints = new Integer[SIZE];
213	+	for (int i = 0; i < SIZE - 1; ++i)
214	+	ints[i] = new Integer(i);
215	+	Collection<Integer> elements = Arrays.asList(ints);
216		try {
217	<	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
239	<	Integer[] ints = new Integer[SIZE];
240	<	for (int i = 0; i < SIZE-1; ++i)
241	<	ints[i] = new Integer(i);
242	<	q.addAll(Arrays.asList(ints));
217	>	q.addAll(elements);
218		shouldThrow();
219		} catch (NullPointerException success) {}
220		}
221
222		/**
223	<	* addAll throws ISE if not enough room
223	>	* addAll throws IllegalStateException if not enough room
224		*/
225		public void testAddAll4() {
226	+	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE - 1);
227	+	Integer[] ints = new Integer[SIZE];
228	+	for (int i = 0; i < SIZE; ++i)
229	+	ints[i] = new Integer(i);
230	+	Collection<Integer> elements = Arrays.asList(ints);
231		try {
232	<	LinkedBlockingQueue q = new LinkedBlockingQueue(1);
253	<	Integer[] ints = new Integer[SIZE];
254	<	for (int i = 0; i < SIZE; ++i)
255	<	ints[i] = new Integer(i);
256	<	q.addAll(Arrays.asList(ints));
232	>	q.addAll(elements);
233		shouldThrow();
234		} catch (IllegalStateException success) {}
235		}
#	Line 274 | Line 250 | public class LinkedBlockingQueueTest ext
250		}
251
252		/**
277	–	* put(null) throws NPE
278	–	*/
279	–	public void testPutNull() throws InterruptedException {
280	–	try {
281	–	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
282	–	q.put(null);
283	–	shouldThrow();
284	–	} catch (NullPointerException success) {}
285	–	}
286	–
287	–	/**
253		* all elements successfully put are contained
254		*/
255		public void testPut() throws InterruptedException {
256		LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
257		for (int i = 0; i < SIZE; ++i) {
258	<	Integer I = new Integer(i);
259	<	q.put(I);
260	<	assertTrue(q.contains(I));
258	>	Integer x = new Integer(i);
259	>	q.put(x);
260	>	assertTrue(q.contains(x));
261		}
262		assertEquals(0, q.remainingCapacity());
263		}
#	Line 326 | Line 291 | public class LinkedBlockingQueueTest ext
291		}});
292
293		await(pleaseInterrupt);
294	<	assertThreadStaysAlive(t);
294	>	assertThreadBlocks(t, Thread.State.WAITING);
295		t.interrupt();
296		awaitTermination(t);
297		assertEquals(SIZE, q.size());
#	Line 348 | Line 313 | public class LinkedBlockingQueueTest ext
313		pleaseTake.countDown();
314		q.put(86);
315
316	+	Thread.currentThread().interrupt();
317	+	try {
318	+	q.put(99);
319	+	shouldThrow();
320	+	} catch (InterruptedException success) {}
321	+	assertFalse(Thread.interrupted());
322	+
323		pleaseInterrupt.countDown();
324		try {
325		q.put(99);
#	Line 357 | Line 329 | public class LinkedBlockingQueueTest ext
329		}});
330
331		await(pleaseTake);
332	<	assertEquals(q.remainingCapacity(), 0);
332	>	assertEquals(0, q.remainingCapacity());
333		assertEquals(0, q.take());
334
335		await(pleaseInterrupt);
336	<	assertThreadStaysAlive(t);
336	>	assertThreadBlocks(t, Thread.State.WAITING);
337		t.interrupt();
338		awaitTermination(t);
339	<	assertEquals(q.remainingCapacity(), 0);
339	>	assertEquals(0, q.remainingCapacity());
340		}
341
342		/**
#	Line 377 | Line 349 | public class LinkedBlockingQueueTest ext
349		public void realRun() throws InterruptedException {
350		q.put(new Object());
351		q.put(new Object());
352	+
353		long startTime = System.nanoTime();
354		assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
355		assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
356	+
357	+	Thread.currentThread().interrupt();
358	+	try {
359	+	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
360	+	shouldThrow();
361	+	} catch (InterruptedException success) {}
362	+	assertFalse(Thread.interrupted());
363	+
364		pleaseInterrupt.countDown();
365		try {
366		q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
367		shouldThrow();
368		} catch (InterruptedException success) {}
369	+	assertFalse(Thread.interrupted());
370		}});
371
372		await(pleaseInterrupt);
373	<	assertThreadStaysAlive(t);
373	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
374		t.interrupt();
375		awaitTermination(t);
376		}
#	Line 411 | Line 393 | public class LinkedBlockingQueueTest ext
393		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
394		Thread t = newStartedThread(new CheckedRunnable() {
395		public void realRun() throws InterruptedException {
396	<	for (int i = 0; i < SIZE; ++i) {
415	<	assertEquals(i, q.take());
416	<	}
396	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
397
398		Thread.currentThread().interrupt();
399		try {
#	Line 431 | Line 411 | public class LinkedBlockingQueueTest ext
411		}});
412
413		await(pleaseInterrupt);
414	<	assertThreadStaysAlive(t);
414	>	assertThreadBlocks(t, Thread.State.WAITING);
415		t.interrupt();
416		awaitTermination(t);
417		}
#	Line 480 | Line 460 | public class LinkedBlockingQueueTest ext
460		*/
461		public void testInterruptedTimedPoll() throws InterruptedException {
462		final BlockingQueue<Integer> q = populatedQueue(SIZE);
463	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
463	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
464		Thread t = newStartedThread(new CheckedRunnable() {
465		public void realRun() throws InterruptedException {
466	<	for (int i = 0; i < SIZE; ++i) {
467	<	long t0 = System.nanoTime();
466	>	long startTime = System.nanoTime();
467	>	for (int i = 0; i < SIZE; i++)
468		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
469	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
470	<	}
471	<	long t0 = System.nanoTime();
472	<	aboutToWait.countDown();
469	>
470	>	Thread.currentThread().interrupt();
471	>	try {
472	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
473	>	shouldThrow();
474	>	} catch (InterruptedException success) {}
475	>	assertFalse(Thread.interrupted());
476	>
477	>	pleaseInterrupt.countDown();
478		try {
479	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
479	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
480		shouldThrow();
481	<	} catch (InterruptedException success) {
482	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
483	<	}
481	>	} catch (InterruptedException success) {}
482	>	assertFalse(Thread.interrupted());
483	>
484	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
485		}});
486
487	<	aboutToWait.await();
488	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
487	>	await(pleaseInterrupt);
488	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
489		t.interrupt();
490	<	awaitTermination(t, MEDIUM_DELAY_MS);
490	>	awaitTermination(t);
491		checkEmpty(q);
492		}
493
#	Line 549 | Line 535 | public class LinkedBlockingQueueTest ext
535		}
536
537		/**
552	–	* remove(x) removes x and returns true if present
553	–	*/
554	–	public void testRemoveElement() {
555	–	LinkedBlockingQueue q = populatedQueue(SIZE);
556	–	for (int i = 1; i < SIZE; i+=2) {
557	–	assertTrue(q.contains(i));
558	–	assertTrue(q.remove(i));
559	–	assertFalse(q.contains(i));
560	–	assertTrue(q.contains(i-1));
561	–	}
562	–	for (int i = 0; i < SIZE; i+=2) {
563	–	assertTrue(q.contains(i));
564	–	assertTrue(q.remove(i));
565	–	assertFalse(q.contains(i));
566	–	assertFalse(q.remove(i+1));
567	–	assertFalse(q.contains(i+1));
568	–	}
569	–	assertTrue(q.isEmpty());
570	–	}
571	–
572	–	/**
538		* An add following remove(x) succeeds
539		*/
540		public void testRemoveElementAndAdd() throws InterruptedException {
#	Line 579 | Line 544 | public class LinkedBlockingQueueTest ext
544		assertTrue(q.remove(new Integer(1)));
545		assertTrue(q.remove(new Integer(2)));
546		assertTrue(q.add(new Integer(3)));
547	<	assertTrue(q.take() != null);
547	>	assertNotNull(q.take());
548		}
549
550		/**
#	Line 638 | Line 603 | public class LinkedBlockingQueueTest ext
603		assertTrue(changed);
604
605		assertTrue(q.containsAll(p));
606	<	assertEquals(SIZE-i, q.size());
606	>	assertEquals(SIZE - i, q.size());
607		p.remove();
608		}
609		}
#	Line 651 | Line 616 | public class LinkedBlockingQueueTest ext
616		LinkedBlockingQueue q = populatedQueue(SIZE);
617		LinkedBlockingQueue p = populatedQueue(i);
618		assertTrue(q.removeAll(p));
619	<	assertEquals(SIZE-i, q.size());
619	>	assertEquals(SIZE - i, q.size());
620		for (int j = 0; j < i; ++j) {
621	<	Integer I = (Integer)(p.remove());
622	<	assertFalse(q.contains(I));
621	>	Integer x = (Integer)(p.remove());
622	>	assertFalse(q.contains(x));
623		}
624		}
625		}
#	Line 682 | Line 647 | public class LinkedBlockingQueueTest ext
647		}
648
649		/**
685	–	* toArray(null) throws NullPointerException
686	–	*/
687	–	public void testToArray_NullArg() {
688	–	LinkedBlockingQueue q = populatedQueue(SIZE);
689	–	try {
690	–	q.toArray(null);
691	–	shouldThrow();
692	–	} catch (NullPointerException success) {}
693	–	}
694	–
695	–	/**
650		* toArray(incompatible array type) throws ArrayStoreException
651		*/
652		public void testToArray1_BadArg() {
#	Line 709 | Line 663 | public class LinkedBlockingQueueTest ext
663		public void testIterator() throws InterruptedException {
664		LinkedBlockingQueue q = populatedQueue(SIZE);
665		Iterator it = q.iterator();
666	<	while (it.hasNext()) {
666	>	int i;
667	>	for (i = 0; it.hasNext(); i++)
668	>	assertTrue(q.contains(it.next()));
669	>	assertEquals(i, SIZE);
670	>	assertIteratorExhausted(it);
671	>
672	>	it = q.iterator();
673	>	for (i = 0; it.hasNext(); i++)
674		assertEquals(it.next(), q.take());
675	<	}
675	>	assertEquals(i, SIZE);
676	>	assertIteratorExhausted(it);
677	>	}
678	>
679	>	/**
680	>	* iterator of empty collection has no elements
681	>	*/
682	>	public void testEmptyIterator() {
683	>	assertIteratorExhausted(new LinkedBlockingQueue().iterator());
684		}
685
686		/**
#	Line 782 | Line 751 | public class LinkedBlockingQueueTest ext
751		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
752		q.add(one);
753		q.add(two);
785	–	ExecutorService executor = Executors.newFixedThreadPool(2);
754		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
755	<	executor.execute(new CheckedRunnable() {
756	<	public void realRun() throws InterruptedException {
757	<	assertFalse(q.offer(three));
758	<	threadsStarted.await();
759	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
760	<	assertEquals(0, q.remainingCapacity());
761	<	}});
762	<
763	<	executor.execute(new CheckedRunnable() {
764	<	public void realRun() throws InterruptedException {
765	<	threadsStarted.await();
766	<	assertSame(one, q.take());
767	<	}});
768	<
769	<	joinPool(executor);
755	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
756	>	try (PoolCleaner cleaner = cleaner(executor)) {
757	>	executor.execute(new CheckedRunnable() {
758	>	public void realRun() throws InterruptedException {
759	>	assertFalse(q.offer(three));
760	>	threadsStarted.await();
761	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
762	>	assertEquals(0, q.remainingCapacity());
763	>	}});
764	>
765	>	executor.execute(new CheckedRunnable() {
766	>	public void realRun() throws InterruptedException {
767	>	threadsStarted.await();
768	>	assertSame(one, q.take());
769	>	}});
770	>	}
771		}
772
773		/**
#	Line 807 | Line 776 | public class LinkedBlockingQueueTest ext
776		public void testPollInExecutor() {
777		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
778		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
779	<	ExecutorService executor = Executors.newFixedThreadPool(2);
780	<	executor.execute(new CheckedRunnable() {
781	<	public void realRun() throws InterruptedException {
782	<	assertNull(q.poll());
783	<	threadsStarted.await();
784	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
785	<	checkEmpty(q);
786	<	}});
787	<
788	<	executor.execute(new CheckedRunnable() {
789	<	public void realRun() throws InterruptedException {
790	<	threadsStarted.await();
791	<	q.put(one);
792	<	}});
793	<
794	<	joinPool(executor);
779	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
780	>	try (PoolCleaner cleaner = cleaner(executor)) {
781	>	executor.execute(new CheckedRunnable() {
782	>	public void realRun() throws InterruptedException {
783	>	assertNull(q.poll());
784	>	threadsStarted.await();
785	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
786	>	checkEmpty(q);
787	>	}});
788	>
789	>	executor.execute(new CheckedRunnable() {
790	>	public void realRun() throws InterruptedException {
791	>	threadsStarted.await();
792	>	q.put(one);
793	>	}});
794	>	}
795		}
796
797		/**
798	<	* A deserialized serialized queue has same elements in same order
798	>	* A deserialized/reserialized queue has same elements in same order
799		*/
800		public void testSerialization() throws Exception {
801	<	LinkedBlockingQueue q = populatedQueue(SIZE);
801	>	Queue x = populatedQueue(SIZE);
802	>	Queue y = serialClone(x);
803
804	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
805	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
806	<	out.writeObject(q);
807	<	out.close();
808	<
809	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
810	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
811	<	LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
812	<	assertEquals(q.size(), r.size());
843	<	while (!q.isEmpty())
844	<	assertEquals(q.remove(), r.remove());
845	<	}
846	<
847	<	/**
848	<	* drainTo(null) throws NPE
849	<	*/
850	<	public void testDrainToNull() {
851	<	LinkedBlockingQueue q = populatedQueue(SIZE);
852	<	try {
853	<	q.drainTo(null);
854	<	shouldThrow();
855	<	} catch (NullPointerException success) {}
856	<	}
857	<
858	<	/**
859	<	* drainTo(this) throws IAE
860	<	*/
861	<	public void testDrainToSelf() {
862	<	LinkedBlockingQueue q = populatedQueue(SIZE);
863	<	try {
864	<	q.drainTo(q);
865	<	shouldThrow();
866	<	} catch (IllegalArgumentException success) {}
804	>	assertNotSame(x, y);
805	>	assertEquals(x.size(), y.size());
806	>	assertEquals(x.toString(), y.toString());
807	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
808	>	while (!x.isEmpty()) {
809	>	assertFalse(y.isEmpty());
810	>	assertEquals(x.remove(), y.remove());
811	>	}
812	>	assertTrue(y.isEmpty());
813		}
814
815		/**
#	Line 873 | Line 819 | public class LinkedBlockingQueueTest ext
819		LinkedBlockingQueue q = populatedQueue(SIZE);
820		ArrayList l = new ArrayList();
821		q.drainTo(l);
822	<	assertEquals(q.size(), 0);
823	<	assertEquals(l.size(), SIZE);
822	>	assertEquals(0, q.size());
823	>	assertEquals(SIZE, l.size());
824		for (int i = 0; i < SIZE; ++i)
825		assertEquals(l.get(i), new Integer(i));
826		q.add(zero);
#	Line 884 | Line 830 | public class LinkedBlockingQueueTest ext
830		assertTrue(q.contains(one));
831		l.clear();
832		q.drainTo(l);
833	<	assertEquals(q.size(), 0);
834	<	assertEquals(l.size(), 2);
833	>	assertEquals(0, q.size());
834	>	assertEquals(2, l.size());
835		for (int i = 0; i < 2; ++i)
836		assertEquals(l.get(i), new Integer(i));
837		}
#	Line 897 | Line 843 | public class LinkedBlockingQueueTest ext
843		final LinkedBlockingQueue q = populatedQueue(SIZE);
844		Thread t = new Thread(new CheckedRunnable() {
845		public void realRun() throws InterruptedException {
846	<	q.put(new Integer(SIZE+1));
846	>	q.put(new Integer(SIZE + 1));
847		}});
848
849		t.start();
#	Line 911 | Line 857 | public class LinkedBlockingQueueTest ext
857		}
858
859		/**
914	–	* drainTo(null, n) throws NPE
915	–	*/
916	–	public void testDrainToNullN() {
917	–	LinkedBlockingQueue q = populatedQueue(SIZE);
918	–	try {
919	–	q.drainTo(null, 0);
920	–	shouldThrow();
921	–	} catch (NullPointerException success) {}
922	–	}
923	–
924	–	/**
925	–	* drainTo(this, n) throws IAE
926	–	*/
927	–	public void testDrainToSelfN() {
928	–	LinkedBlockingQueue q = populatedQueue(SIZE);
929	–	try {
930	–	q.drainTo(q, 0);
931	–	shouldThrow();
932	–	} catch (IllegalArgumentException success) {}
933	–	}
934	–
935	–	/**
860		* drainTo(c, n) empties first min(n, size) elements of queue into c
861		*/
862		public void testDrainToN() {
#	Line 943 | Line 867 | public class LinkedBlockingQueueTest ext
867		ArrayList l = new ArrayList();
868		q.drainTo(l, i);
869		int k = (i < SIZE) ? i : SIZE;
870	<	assertEquals(l.size(), k);
871	<	assertEquals(q.size(), SIZE-k);
870	>	assertEquals(k, l.size());
871	>	assertEquals(SIZE - k, q.size());
872		for (int j = 0; j < k; ++j)
873		assertEquals(l.get(j), new Integer(j));
874	<	while (q.poll() != null) ;
874	>	do {} while (q.poll() != null);
875	>	}
876	>	}
877	>
878	>	/**
879	>	* remove(null), contains(null) always return false
880	>	*/
881	>	public void testNeverContainsNull() {
882	>	Collection<?>[] qs = {
883	>	new LinkedBlockingQueue<Object>(),
884	>	populatedQueue(2),
885	>	};
886	>
887	>	for (Collection<?> q : qs) {
888	>	assertFalse(q.contains(null));
889	>	assertFalse(q.remove(null));
890		}
891		}
892

Diff Legend

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