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.67 by jsr166, Sat May 13 21:43:51 2017 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) {
61	>	private static LinkedBlockingQueue<Integer> populatedQueue(int n) {
62		LinkedBlockingQueue<Integer> q =
63		new LinkedBlockingQueue<Integer>(n);
64		assertTrue(q.isEmpty());
#	Line 49 | 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 62 | 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];
90	<	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];
101	<	for (int i = 0; i < SIZE-1; ++i)
102	<	ints[i] = new Integer(i);
103	<	LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
124	>	new LinkedBlockingQueue(elements);
125		shouldThrow();
126		} catch (NullPointerException success) {}
127		}
#	Line 136 | 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		/**
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	–	/**
174		* Offer succeeds if not full; fails if full
175		*/
176		public void testOffer() {
#	Line 181 | 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 {
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());
191		q.add(new Integer(SIZE));
192		shouldThrow();
193		} catch (IllegalStateException success) {}
194		}
195
196		/**
197	<	* 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
197	>	* addAll(this) throws IllegalArgumentException
198		*/
199		public void testAddAllSelf() {
200	+	LinkedBlockingQueue q = populatedQueue(SIZE);
201		try {
214	–	LinkedBlockingQueue q = populatedQueue(SIZE);
202		q.addAll(q);
203		shouldThrow();
204		} catch (IllegalArgumentException success) {}
205		}
206
207		/**
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	–	/**
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);
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));
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);
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));
233	>	q.addAll(elements);
234		shouldThrow();
235		} catch (IllegalStateException success) {}
236		}
#	Line 274 | Line 251 | public class LinkedBlockingQueueTest ext
251		}
252
253		/**
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	–	/**
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 357 | Line 323 | public class LinkedBlockingQueueTest ext
323		}});
324
325		await(pleaseTake);
326	<	assertEquals(q.remainingCapacity(), 0);
326	>	assertEquals(0, q.remainingCapacity());
327		assertEquals(0, q.take());
328
329		await(pleaseInterrupt);
330		assertThreadStaysAlive(t);
331		t.interrupt();
332		awaitTermination(t);
333	<	assertEquals(q.remainingCapacity(), 0);
333	>	assertEquals(0, q.remainingCapacity());
334		}
335
336		/**
#	Line 411 | Line 377 | public class LinkedBlockingQueueTest ext
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) {
415	<	assertEquals(i, q.take());
416	<	}
380	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
381
382		Thread.currentThread().interrupt();
383		try {
#	Line 431 | Line 395 | public class LinkedBlockingQueueTest ext
395		}});
396
397		await(pleaseInterrupt);
398	<	assertThreadStaysAlive(t);
398	>	assertThreadBlocks(t, Thread.State.WAITING);
399		t.interrupt();
400		awaitTermination(t);
401		}
#	Line 483 | Line 447 | public class LinkedBlockingQueueTest ext
447		final CountDownLatch aboutToWait = new CountDownLatch(1);
448		Thread t = newStartedThread(new CheckedRunnable() {
449		public void realRun() throws InterruptedException {
450	+	long startTime = System.nanoTime();
451		for (int i = 0; i < SIZE; ++i) {
487	–	long t0 = System.nanoTime();
452		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
489	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
453		}
491	–	long t0 = System.nanoTime();
454		aboutToWait.countDown();
455		try {
456	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
456	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
457		shouldThrow();
458		} catch (InterruptedException success) {
459	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
459	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
460		}
461		}});
462
463	<	aboutToWait.await();
464	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
463	>	await(aboutToWait);
464	>	waitForThreadToEnterWaitState(t);
465		t.interrupt();
466	<	awaitTermination(t, MEDIUM_DELAY_MS);
466	>	awaitTermination(t);
467		checkEmpty(q);
468		}
469
#	Line 549 | Line 511 | public class LinkedBlockingQueueTest ext
511		}
512
513		/**
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	–	/**
514		* An add following remove(x) succeeds
515		*/
516		public void testRemoveElementAndAdd() throws InterruptedException {
#	Line 579 | Line 520 | public class LinkedBlockingQueueTest ext
520		assertTrue(q.remove(new Integer(1)));
521		assertTrue(q.remove(new Integer(2)));
522		assertTrue(q.add(new Integer(3)));
523	<	assertTrue(q.take() != null);
523	>	assertNotNull(q.take());
524		}
525
526		/**
#	Line 638 | Line 579 | public class LinkedBlockingQueueTest ext
579		assertTrue(changed);
580
581		assertTrue(q.containsAll(p));
582	<	assertEquals(SIZE-i, q.size());
582	>	assertEquals(SIZE - i, q.size());
583		p.remove();
584		}
585		}
#	Line 651 | Line 592 | public class LinkedBlockingQueueTest ext
592		LinkedBlockingQueue q = populatedQueue(SIZE);
593		LinkedBlockingQueue p = populatedQueue(i);
594		assertTrue(q.removeAll(p));
595	<	assertEquals(SIZE-i, q.size());
595	>	assertEquals(SIZE - i, q.size());
596		for (int j = 0; j < i; ++j) {
597	<	Integer I = (Integer)(p.remove());
598	<	assertFalse(q.contains(I));
597	>	Integer x = (Integer)(p.remove());
598	>	assertFalse(q.contains(x));
599		}
600		}
601		}
#	Line 682 | Line 623 | public class LinkedBlockingQueueTest ext
623		}
624
625		/**
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	–	/**
626		* toArray(incompatible array type) throws ArrayStoreException
627		*/
628		public void testToArray1_BadArg() {
#	Line 709 | Line 639 | public class LinkedBlockingQueueTest ext
639		public void testIterator() throws InterruptedException {
640		LinkedBlockingQueue q = populatedQueue(SIZE);
641		Iterator it = q.iterator();
642	<	while (it.hasNext()) {
642	>	int i;
643	>	for (i = 0; it.hasNext(); i++)
644	>	assertTrue(q.contains(it.next()));
645	>	assertEquals(i, SIZE);
646	>	assertIteratorExhausted(it);
647	>
648	>	it = q.iterator();
649	>	for (i = 0; it.hasNext(); i++)
650		assertEquals(it.next(), q.take());
651	<	}
651	>	assertEquals(i, SIZE);
652	>	assertIteratorExhausted(it);
653	>	}
654	>
655	>	/**
656	>	* iterator of empty collection has no elements
657	>	*/
658	>	public void testEmptyIterator() {
659	>	assertIteratorExhausted(new LinkedBlockingQueue().iterator());
660		}
661
662		/**
#	Line 782 | Line 727 | public class LinkedBlockingQueueTest ext
727		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
728		q.add(one);
729		q.add(two);
785	–	ExecutorService executor = Executors.newFixedThreadPool(2);
730		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
731	<	executor.execute(new CheckedRunnable() {
732	<	public void realRun() throws InterruptedException {
733	<	assertFalse(q.offer(three));
734	<	threadsStarted.await();
735	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
736	<	assertEquals(0, q.remainingCapacity());
737	<	}});
738	<
739	<	executor.execute(new CheckedRunnable() {
740	<	public void realRun() throws InterruptedException {
741	<	threadsStarted.await();
742	<	assertSame(one, q.take());
743	<	}});
744	<
745	<	joinPool(executor);
731	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
732	>	try (PoolCleaner cleaner = cleaner(executor)) {
733	>	executor.execute(new CheckedRunnable() {
734	>	public void realRun() throws InterruptedException {
735	>	assertFalse(q.offer(three));
736	>	threadsStarted.await();
737	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
738	>	assertEquals(0, q.remainingCapacity());
739	>	}});
740	>
741	>	executor.execute(new CheckedRunnable() {
742	>	public void realRun() throws InterruptedException {
743	>	threadsStarted.await();
744	>	assertSame(one, q.take());
745	>	}});
746	>	}
747		}
748
749		/**
#	Line 807 | Line 752 | public class LinkedBlockingQueueTest ext
752		public void testPollInExecutor() {
753		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
754		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
755	<	ExecutorService executor = Executors.newFixedThreadPool(2);
756	<	executor.execute(new CheckedRunnable() {
757	<	public void realRun() throws InterruptedException {
758	<	assertNull(q.poll());
759	<	threadsStarted.await();
760	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
761	<	checkEmpty(q);
762	<	}});
763	<
764	<	executor.execute(new CheckedRunnable() {
765	<	public void realRun() throws InterruptedException {
766	<	threadsStarted.await();
767	<	q.put(one);
768	<	}});
769	<
770	<	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	>	assertNull(q.poll());
760	>	threadsStarted.await();
761	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
762	>	checkEmpty(q);
763	>	}});
764	>
765	>	executor.execute(new CheckedRunnable() {
766	>	public void realRun() throws InterruptedException {
767	>	threadsStarted.await();
768	>	q.put(one);
769	>	}});
770	>	}
771		}
772
773		/**
774		* A deserialized serialized queue has same elements in same order
775		*/
776		public void testSerialization() throws Exception {
777	<	LinkedBlockingQueue q = populatedQueue(SIZE);
778	<
834	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
835	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
836	<	out.writeObject(q);
837	<	out.close();
838	<
839	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
840	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
841	<	LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
842	<	assertEquals(q.size(), r.size());
843	<	while (!q.isEmpty())
844	<	assertEquals(q.remove(), r.remove());
845	<	}
777	>	Queue x = populatedQueue(SIZE);
778	>	Queue y = serialClone(x);
779
780	<	/**
781	<	* drainTo(null) throws NPE
782	<	*/
783	<	public void testDrainToNull() {
784	<	LinkedBlockingQueue q = populatedQueue(SIZE);
785	<	try {
786	<	q.drainTo(null);
787	<	shouldThrow();
788	<	} 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) {}
780	>	assertNotSame(x, y);
781	>	assertEquals(x.size(), y.size());
782	>	assertEquals(x.toString(), y.toString());
783	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
784	>	while (!x.isEmpty()) {
785	>	assertFalse(y.isEmpty());
786	>	assertEquals(x.remove(), y.remove());
787	>	}
788	>	assertTrue(y.isEmpty());
789		}
790
791		/**
#	Line 873 | Line 795 | public class LinkedBlockingQueueTest ext
795		LinkedBlockingQueue q = populatedQueue(SIZE);
796		ArrayList l = new ArrayList();
797		q.drainTo(l);
798	<	assertEquals(q.size(), 0);
799	<	assertEquals(l.size(), SIZE);
798	>	assertEquals(0, q.size());
799	>	assertEquals(SIZE, l.size());
800		for (int i = 0; i < SIZE; ++i)
801		assertEquals(l.get(i), new Integer(i));
802		q.add(zero);
#	Line 884 | Line 806 | public class LinkedBlockingQueueTest ext
806		assertTrue(q.contains(one));
807		l.clear();
808		q.drainTo(l);
809	<	assertEquals(q.size(), 0);
810	<	assertEquals(l.size(), 2);
809	>	assertEquals(0, q.size());
810	>	assertEquals(2, l.size());
811		for (int i = 0; i < 2; ++i)
812		assertEquals(l.get(i), new Integer(i));
813		}
#	Line 897 | Line 819 | public class LinkedBlockingQueueTest ext
819		final LinkedBlockingQueue q = populatedQueue(SIZE);
820		Thread t = new Thread(new CheckedRunnable() {
821		public void realRun() throws InterruptedException {
822	<	q.put(new Integer(SIZE+1));
822	>	q.put(new Integer(SIZE + 1));
823		}});
824
825		t.start();
#	Line 911 | Line 833 | public class LinkedBlockingQueueTest ext
833		}
834
835		/**
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	–	/**
836		* drainTo(c, n) empties first min(n, size) elements of queue into c
837		*/
838		public void testDrainToN() {
#	Line 943 | Line 843 | public class LinkedBlockingQueueTest ext
843		ArrayList l = new ArrayList();
844		q.drainTo(l, i);
845		int k = (i < SIZE) ? i : SIZE;
846	<	assertEquals(l.size(), k);
847	<	assertEquals(q.size(), SIZE-k);
846	>	assertEquals(k, l.size());
847	>	assertEquals(SIZE - k, q.size());
848		for (int j = 0; j < k; ++j)
849		assertEquals(l.get(j), new Integer(j));
850	<	while (q.poll() != null) ;
850	>	do {} while (q.poll() != null);
851	>	}
852	>	}
853	>
854	>	/**
855	>	* remove(null), contains(null) always return false
856	>	*/
857	>	public void testNeverContainsNull() {
858	>	Collection<?>[] qs = {
859	>	new LinkedBlockingQueue<Object>(),
860	>	populatedQueue(2),
861	>	};
862	>
863	>	for (Collection<?> q : qs) {
864	>	assertFalse(q.contains(null));
865	>	assertFalse(q.remove(null));
866		}
867		}
868

Diff Legend

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