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.44 by jsr166, Fri May 27 20:07:24 2011 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
#	Line 14 | Line 14 | import java.io.*;
14
15		public class LinkedBlockingQueueTest extends JSR166TestCase {
16
17	+	public static class Unbounded extends BlockingQueueTest {
18	+	protected BlockingQueue emptyCollection() {
19	+	return new LinkedBlockingQueue();
20	+	}
21	+	}
22	+
23	+	public static class Bounded extends BlockingQueueTest {
24	+	protected BlockingQueue emptyCollection() {
25	+	return new LinkedBlockingQueue(20);
26	+	}
27	+	}
28	+
29		public static void main(String[] args) {
30	<	junit.textui.TestRunner.run (suite());
30	>	junit.textui.TestRunner.run(suite());
31		}
32
33		public static Test suite() {
34	<	return new TestSuite(LinkedBlockingQueueTest.class);
34	>	return newTestSuite(LinkedBlockingQueueTest.class,
35	>	new Unbounded().testSuite(),
36	>	new Bounded().testSuite());
37		}
38
25	–
39		/**
40		* Create a queue of given size containing consecutive
41		* Integers 0 ... n.
42		*/
43	<	private LinkedBlockingQueue populatedQueue(int n) {
44	<	LinkedBlockingQueue q = new LinkedBlockingQueue(n);
43	>	private LinkedBlockingQueue<Integer> populatedQueue(int n) {
44	>	LinkedBlockingQueue<Integer> q =
45	>	new LinkedBlockingQueue<Integer>(n);
46		assertTrue(q.isEmpty());
47		for (int i = 0; i < n; i++)
48		assertTrue(q.offer(new Integer(i)));
#	Line 214 | Line 228 | public class LinkedBlockingQueueTest ext
228		shouldThrow();
229		} catch (NullPointerException success) {}
230		}
231	+
232		/**
233		* addAll of a collection with any null elements throws NPE after
234		* possibly adding some elements
#	Line 228 | Line 243 | public class LinkedBlockingQueueTest ext
243		shouldThrow();
244		} catch (NullPointerException success) {}
245		}
246	+
247		/**
248		* addAll throws ISE if not enough room
249		*/
#	Line 241 | Line 257 | public class LinkedBlockingQueueTest ext
257		shouldThrow();
258		} catch (IllegalStateException success) {}
259		}
260	+
261		/**
262		* Queue contains all elements, in traversal order, of successful addAll
263		*/
#	Line 259 | Line 276 | public class LinkedBlockingQueueTest ext
276		/**
277		* put(null) throws NPE
278		*/
279	<	public void testPutNull() throws InterruptedException {
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	<	}
285	>	}
286
287		/**
288		* all elements successfully put are contained
#	Line 284 | Line 301 | public class LinkedBlockingQueueTest ext
301		* put blocks interruptibly if full
302		*/
303		public void testBlockingPut() throws InterruptedException {
304	<	Thread t = new Thread(new CheckedRunnable() {
305	<	public void realRun() {
306	<	int added = 0;
304	>	final LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
305	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
306	>	Thread t = newStartedThread(new CheckedRunnable() {
307	>	public void realRun() throws InterruptedException {
308	>	for (int i = 0; i < SIZE; ++i)
309	>	q.put(i);
310	>	assertEquals(SIZE, q.size());
311	>	assertEquals(0, q.remainingCapacity());
312	>
313	>	Thread.currentThread().interrupt();
314		try {
315	<	LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
316	<	for (int i = 0; i < SIZE; ++i) {
317	<	q.put(new Integer(i));
318	<	++added;
319	<	}
320	<	q.put(new Integer(SIZE));
321	<	threadShouldThrow();
322	<	} catch (InterruptedException success) {
323	<	threadAssertEquals(added, SIZE);
324	<	}
315	>	q.put(99);
316	>	shouldThrow();
317	>	} catch (InterruptedException success) {}
318	>	assertFalse(Thread.interrupted());
319	>
320	>	pleaseInterrupt.countDown();
321	>	try {
322	>	q.put(99);
323	>	shouldThrow();
324	>	} catch (InterruptedException success) {}
325	>	assertFalse(Thread.interrupted());
326		}});
327
328	<	t.start();
329	<	Thread.sleep(SHORT_DELAY_MS);
328	>	await(pleaseInterrupt);
329	>	assertThreadStaysAlive(t);
330		t.interrupt();
331	<	t.join();
331	>	awaitTermination(t);
332	>	assertEquals(SIZE, q.size());
333	>	assertEquals(0, q.remainingCapacity());
334		}
335
336		/**
337	<	* put blocks waiting for take when full
337	>	* put blocks interruptibly waiting for take when full
338		*/
339		public void testPutWithTake() throws InterruptedException {
340	+	final int capacity = 2;
341		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
342	<	Thread t = new Thread(new CheckedRunnable() {
343	<	public void realRun() {
344	<	int added = 0;
342	>	final CountDownLatch pleaseTake = new CountDownLatch(1);
343	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
344	>	Thread t = newStartedThread(new CheckedRunnable() {
345	>	public void realRun() throws InterruptedException {
346	>	for (int i = 0; i < capacity; i++)
347	>	q.put(i);
348	>	pleaseTake.countDown();
349	>	q.put(86);
350	>
351	>	pleaseInterrupt.countDown();
352		try {
353	<	q.put(new Object());
354	<	++added;
355	<	q.put(new Object());
356	<	++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	<	}
353	>	q.put(99);
354	>	shouldThrow();
355	>	} catch (InterruptedException success) {}
356	>	assertFalse(Thread.interrupted());
357		}});
358
359	<	t.start();
360	<	Thread.sleep(SHORT_DELAY_MS);
361	<	q.take();
359	>	await(pleaseTake);
360	>	assertEquals(q.remainingCapacity(), 0);
361	>	assertEquals(0, q.take());
362	>
363	>	await(pleaseInterrupt);
364	>	assertThreadStaysAlive(t);
365		t.interrupt();
366	<	t.join();
366	>	awaitTermination(t);
367	>	assertEquals(q.remainingCapacity(), 0);
368		}
369
370		/**
371		* timed offer times out if full and elements not taken
372		*/
373	<	public void testTimedOffer() throws InterruptedException {
373	>	public void testTimedOffer() {
374		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
375	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
375	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
376	>	Thread t = newStartedThread(new CheckedRunnable() {
377		public void realRun() throws InterruptedException {
378		q.put(new Object());
379		q.put(new Object());
380	<	threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
381	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
382	<	}};
380	>	long startTime = System.nanoTime();
381	>	assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
382	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
383	>	pleaseInterrupt.countDown();
384	>	try {
385	>	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
386	>	shouldThrow();
387	>	} catch (InterruptedException success) {}
388	>	}});
389
390	<	t.start();
391	<	Thread.sleep(SMALL_DELAY_MS);
390	>	await(pleaseInterrupt);
391	>	assertThreadStaysAlive(t);
392		t.interrupt();
393	<	t.join();
393	>	awaitTermination(t);
394		}
395
396		/**
#	Line 361 | Line 399 | public class LinkedBlockingQueueTest ext
399		public void testTake() throws InterruptedException {
400		LinkedBlockingQueue q = populatedQueue(SIZE);
401		for (int i = 0; i < SIZE; ++i) {
402	<	assertEquals(i, ((Integer)q.take()).intValue());
402	>	assertEquals(i, q.take());
403		}
404		}
405
406		/**
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	–	/**
407		* Take removes existing elements until empty, then blocks interruptibly
408		*/
409		public void testBlockingTake() throws InterruptedException {
410	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
410	>	final BlockingQueue q = populatedQueue(SIZE);
411	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
412	>	Thread t = newStartedThread(new CheckedRunnable() {
413		public void realRun() throws InterruptedException {
390	–	LinkedBlockingQueue q = populatedQueue(SIZE);
414		for (int i = 0; i < SIZE; ++i) {
415	<	assertEquals(i, ((Integer)q.take()).intValue());
415	>	assertEquals(i, q.take());
416		}
394	–	q.take();
395	–	}};
417
418	<	t.start();
419	<	Thread.sleep(SHORT_DELAY_MS);
418	>	Thread.currentThread().interrupt();
419	>	try {
420	>	q.take();
421	>	shouldThrow();
422	>	} catch (InterruptedException success) {}
423	>	assertFalse(Thread.interrupted());
424	>
425	>	pleaseInterrupt.countDown();
426	>	try {
427	>	q.take();
428	>	shouldThrow();
429	>	} catch (InterruptedException success) {}
430	>	assertFalse(Thread.interrupted());
431	>	}});
432	>
433	>	await(pleaseInterrupt);
434	>	assertThreadStaysAlive(t);
435		t.interrupt();
436	<	t.join();
436	>	awaitTermination(t);
437		}
438
403	–
439		/**
440		* poll succeeds unless empty
441		*/
442		public void testPoll() {
443		LinkedBlockingQueue q = populatedQueue(SIZE);
444		for (int i = 0; i < SIZE; ++i) {
445	<	assertEquals(i, ((Integer)q.poll()).intValue());
445	>	assertEquals(i, q.poll());
446		}
447		assertNull(q.poll());
448		}
449
450		/**
451	<	* timed pool with zero timeout succeeds when non-empty, else times out
451	>	* timed poll with zero timeout succeeds when non-empty, else times out
452		*/
453		public void testTimedPoll0() throws InterruptedException {
454		LinkedBlockingQueue q = populatedQueue(SIZE);
455		for (int i = 0; i < SIZE; ++i) {
456	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
456	>	assertEquals(i, q.poll(0, MILLISECONDS));
457		}
458		assertNull(q.poll(0, MILLISECONDS));
459		}
460
461		/**
462	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
462	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
463		*/
464		public void testTimedPoll() throws InterruptedException {
465	<	LinkedBlockingQueue q = populatedQueue(SIZE);
465	>	LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
466		for (int i = 0; i < SIZE; ++i) {
467	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
468	<	}
469	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
467	>	long startTime = System.nanoTime();
468	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
469	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
470	>	}
471	>	long startTime = System.nanoTime();
472	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
473	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
474	>	checkEmpty(q);
475		}
476
477		/**
#	Line 439 | Line 479 | public class LinkedBlockingQueueTest ext
479		* returning timeout status
480		*/
481		public void testInterruptedTimedPoll() throws InterruptedException {
482	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
482	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
483	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
484	>	Thread t = newStartedThread(new CheckedRunnable() {
485		public void realRun() throws InterruptedException {
444	–	LinkedBlockingQueue q = populatedQueue(SIZE);
486		for (int i = 0; i < SIZE; ++i) {
487	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
487	>	long t0 = System.nanoTime();
488	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
489	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
490		}
491	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
492	<	}};
493	<
494	<	t.start();
495	<	Thread.sleep(SHORT_DELAY_MS);
496	<	t.interrupt();
497	<	t.join();
498	<	}
499	<
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	<	}};
491	>	long t0 = System.nanoTime();
492	>	aboutToWait.countDown();
493	>	try {
494	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
495	>	shouldThrow();
496	>	} catch (InterruptedException success) {
497	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
498	>	}
499	>	}});
500
501	<	t.start();
502	<	Thread.sleep(SMALL_DELAY_MS);
472	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
501	>	aboutToWait.await();
502	>	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
503		t.interrupt();
504	<	t.join();
504	>	awaitTermination(t, MEDIUM_DELAY_MS);
505	>	checkEmpty(q);
506		}
507
508		/**
#	Line 480 | Line 511 | public class LinkedBlockingQueueTest ext
511		public void testPeek() {
512		LinkedBlockingQueue q = populatedQueue(SIZE);
513		for (int i = 0; i < SIZE; ++i) {
514	<	assertEquals(i, ((Integer)q.peek()).intValue());
515	<	q.poll();
514	>	assertEquals(i, q.peek());
515	>	assertEquals(i, q.poll());
516		assertTrue(q.peek() == null ||
517	<	i != ((Integer)q.peek()).intValue());
517	>	!q.peek().equals(i));
518		}
519		assertNull(q.peek());
520		}
#	Line 494 | Line 525 | public class LinkedBlockingQueueTest ext
525		public void testElement() {
526		LinkedBlockingQueue q = populatedQueue(SIZE);
527		for (int i = 0; i < SIZE; ++i) {
528	<	assertEquals(i, ((Integer)q.element()).intValue());
529	<	q.poll();
528	>	assertEquals(i, q.element());
529	>	assertEquals(i, q.poll());
530		}
531		try {
532		q.element();
#	Line 509 | Line 540 | public class LinkedBlockingQueueTest ext
540		public void testRemove() {
541		LinkedBlockingQueue q = populatedQueue(SIZE);
542		for (int i = 0; i < SIZE; ++i) {
543	<	assertEquals(i, ((Integer)q.remove()).intValue());
543	>	assertEquals(i, q.remove());
544		}
545		try {
546		q.remove();
#	Line 523 | Line 554 | public class LinkedBlockingQueueTest ext
554		public void testRemoveElement() {
555		LinkedBlockingQueue q = populatedQueue(SIZE);
556		for (int i = 1; i < SIZE; i+=2) {
557	<	assertTrue(q.remove(new Integer(i)));
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.remove(new Integer(i)));
564	<	assertFalse(q.remove(new Integer(i+1)));
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		}
#	Line 623 | Line 660 | public class LinkedBlockingQueueTest ext
660		}
661
662		/**
663	<	* toArray contains all elements
663	>	* toArray contains all elements in FIFO order
664		*/
665	<	public void testToArray() throws InterruptedException {
665	>	public void testToArray() {
666		LinkedBlockingQueue q = populatedQueue(SIZE);
667		Object[] o = q.toArray();
668		for (int i = 0; i < o.length; i++)
669	<	assertEquals(o[i], q.take());
669	>	assertSame(o[i], q.poll());
670		}
671
672		/**
673	<	* toArray(a) contains all elements
673	>	* toArray(a) contains all elements in FIFO order
674		*/
675		public void testToArray2() throws InterruptedException {
676	<	LinkedBlockingQueue q = populatedQueue(SIZE);
676	>	LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
677		Integer[] ints = new Integer[SIZE];
678	<	ints = (Integer[])q.toArray(ints);
678	>	Integer[] array = q.toArray(ints);
679	>	assertSame(ints, array);
680		for (int i = 0; i < ints.length; i++)
681	<	assertEquals(ints[i], q.take());
681	>	assertSame(ints[i], q.poll());
682		}
683
684		/**
685	<	* toArray(null) throws NPE
685	>	* toArray(null) throws NullPointerException
686		*/
687	<	public void testToArray_BadArg() {
687	>	public void testToArray_NullArg() {
688	>	LinkedBlockingQueue q = populatedQueue(SIZE);
689		try {
690	<	LinkedBlockingQueue q = populatedQueue(SIZE);
652	<	Object o[] = q.toArray(null);
690	>	q.toArray(null);
691		shouldThrow();
692		} catch (NullPointerException success) {}
693		}
694
695		/**
696	<	* toArray with incompatible array type throws CCE
696	>	* toArray(incompatible array type) throws ArrayStoreException
697		*/
698		public void testToArray1_BadArg() {
699	+	LinkedBlockingQueue q = populatedQueue(SIZE);
700		try {
701	<	LinkedBlockingQueue q = populatedQueue(SIZE);
663	<	Object o[] = q.toArray(new String[10] );
701	>	q.toArray(new String[10]);
702		shouldThrow();
703		} catch (ArrayStoreException success) {}
704		}
705
668	–
706		/**
707		* iterator iterates through all elements
708		*/
#	Line 680 | Line 717 | public class LinkedBlockingQueueTest ext
717		/**
718		* iterator.remove removes current element
719		*/
720	<	public void testIteratorRemove () {
720	>	public void testIteratorRemove() {
721		final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
722		q.add(two);
723		q.add(one);
#	Line 691 | Line 728 | public class LinkedBlockingQueueTest ext
728		it.remove();
729
730		it = q.iterator();
731	<	assertEquals(it.next(), one);
732	<	assertEquals(it.next(), three);
731	>	assertSame(it.next(), one);
732	>	assertSame(it.next(), three);
733		assertFalse(it.hasNext());
734		}
735
699	–
736		/**
737		* iterator ordering is FIFO
738		*/
#	Line 708 | Line 744 | public class LinkedBlockingQueueTest ext
744		assertEquals(0, q.remainingCapacity());
745		int k = 0;
746		for (Iterator it = q.iterator(); it.hasNext();) {
747	<	int i = ((Integer)(it.next())).intValue();
712	<	assertEquals(++k, i);
747	>	assertEquals(++k, it.next());
748		}
749		assertEquals(3, k);
750		}
#	Line 717 | Line 752 | public class LinkedBlockingQueueTest ext
752		/**
753		* Modifications do not cause iterators to fail
754		*/
755	<	public void testWeaklyConsistentIteration () {
755	>	public void testWeaklyConsistentIteration() {
756		final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
757		q.add(one);
758		q.add(two);
#	Line 729 | Line 764 | public class LinkedBlockingQueueTest ext
764		assertEquals(0, q.size());
765		}
766
732	–
767		/**
768		* toString contains toStrings of elements
769		*/
#	Line 737 | Line 771 | public class LinkedBlockingQueueTest ext
771		LinkedBlockingQueue q = populatedQueue(SIZE);
772		String s = q.toString();
773		for (int i = 0; i < SIZE; ++i) {
774	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
774	>	assertTrue(s.contains(String.valueOf(i)));
775		}
776		}
777
744	–
778		/**
779		* offer transfers elements across Executor tasks
780		*/
#	Line 750 | Line 783 | public class LinkedBlockingQueueTest ext
783		q.add(one);
784		q.add(two);
785		ExecutorService executor = Executors.newFixedThreadPool(2);
786	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
787		executor.execute(new CheckedRunnable() {
788		public void realRun() throws InterruptedException {
789	<	threadAssertFalse(q.offer(three));
790	<	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
791	<	threadAssertEquals(0, q.remainingCapacity());
789	>	assertFalse(q.offer(three));
790	>	threadsStarted.await();
791	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
792	>	assertEquals(0, q.remainingCapacity());
793		}});
794
795		executor.execute(new CheckedRunnable() {
796		public void realRun() throws InterruptedException {
797	<	Thread.sleep(SMALL_DELAY_MS);
798	<	threadAssertEquals(one, q.take());
797	>	threadsStarted.await();
798	>	assertSame(one, q.take());
799		}});
800
801		joinPool(executor);
802		}
803
804		/**
805	<	* poll retrieves elements across Executor threads
805	>	* timed poll retrieves elements across Executor threads
806		*/
807		public void testPollInExecutor() {
808		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
809	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
810		ExecutorService executor = Executors.newFixedThreadPool(2);
811		executor.execute(new CheckedRunnable() {
812		public void realRun() throws InterruptedException {
813	<	threadAssertNull(q.poll());
814	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
815	<	threadAssertTrue(q.isEmpty());
813	>	assertNull(q.poll());
814	>	threadsStarted.await();
815	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
816	>	checkEmpty(q);
817		}});
818
819		executor.execute(new CheckedRunnable() {
820		public void realRun() throws InterruptedException {
821	<	Thread.sleep(SMALL_DELAY_MS);
821	>	threadsStarted.await();
822		q.put(one);
823		}});
824
#	Line 896 | Line 933 | public class LinkedBlockingQueueTest ext
933		}
934
935		/**
936	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
936	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
937		*/
938		public void testDrainToN() {
939		LinkedBlockingQueue q = new LinkedBlockingQueue();
#	Line 905 | Line 942 | public class LinkedBlockingQueueTest ext
942		assertTrue(q.offer(new Integer(j)));
943		ArrayList l = new ArrayList();
944		q.drainTo(l, i);
945	<	int k = (i < SIZE)? i : SIZE;
945	>	int k = (i < SIZE) ? i : SIZE;
946		assertEquals(l.size(), k);
947		assertEquals(q.size(), SIZE-k);
948		for (int j = 0; j < k; ++j)

Diff Legend

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