ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/LinkedTransferQueueTest.java

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.48 by jsr166, Tue May 31 16:16:24 2011 UTC vs.
Revision 1.84 by jsr166, Fri Sep 6 22:43:50 2019 UTC

#	Line 5 | Line 5
5		* Other contributors include John Vint
6		*/
7
8	<	import junit.framework.*;
9	<	import java.util.Arrays;
8	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
9	>
10		import java.util.ArrayList;
11	+	import java.util.Arrays;
12		import java.util.Collection;
13		import java.util.Iterator;
14		import java.util.List;
15		import java.util.NoSuchElementException;
16		import java.util.Queue;
17		import java.util.concurrent.BlockingQueue;
18	+	import java.util.concurrent.Callable;
19		import java.util.concurrent.CountDownLatch;
20		import java.util.concurrent.Executors;
21		import java.util.concurrent.ExecutorService;
22		import java.util.concurrent.LinkedTransferQueue;
23	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
24	<	import static java.util.concurrent.TimeUnit.NANOSECONDS;
23	>
24	>	import junit.framework.Test;
25
26		@SuppressWarnings({"unchecked", "rawtypes"})
27		public class LinkedTransferQueueTest extends JSR166TestCase {
26	–
28		public static class Generic extends BlockingQueueTest {
29		protected BlockingQueue emptyCollection() {
30		return new LinkedTransferQueue();
#	Line 31 | Line 32 | public class LinkedTransferQueueTest ext
32		}
33
34		public static void main(String[] args) {
35	<	junit.textui.TestRunner.run(suite());
35	>	main(suite(), args);
36		}
37
38		public static Test suite() {
39	+	class Implementation implements CollectionImplementation {
40	+	public Class<?> klazz() { return LinkedTransferQueue.class; }
41	+	public Collection emptyCollection() { return new LinkedTransferQueue(); }
42	+	public Object makeElement(int i) { return i; }
43	+	public boolean isConcurrent() { return true; }
44	+	public boolean permitsNulls() { return false; }
45	+	}
46		return newTestSuite(LinkedTransferQueueTest.class,
47	<	new Generic().testSuite());
47	>	new Generic().testSuite(),
48	>	CollectionTest.testSuite(new Implementation()));
49		}
50
51		/**
#	Line 77 | Line 86 | public class LinkedTransferQueueTest ext
86		*/
87		public void testConstructor4() {
88		Integer[] ints = new Integer[SIZE];
89	<	for (int i = 0; i < SIZE-1; ++i)
89	>	for (int i = 0; i < SIZE - 1; ++i)
90		ints[i] = i;
91		Collection<Integer> elements = Arrays.asList(ints);
92		try {
#	Line 114 | Line 123 | public class LinkedTransferQueueTest ext
123		* remainingCapacity() always returns Integer.MAX_VALUE
124		*/
125		public void testRemainingCapacity() {
126	<	LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
126	>	BlockingQueue q = populatedQueue(SIZE);
127		for (int i = 0; i < SIZE; ++i) {
128		assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
129		assertEquals(SIZE - i, q.size());
130	<	q.remove();
130	>	assertEquals(i, q.remove());
131		}
132		for (int i = 0; i < SIZE; ++i) {
133		assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
134		assertEquals(i, q.size());
135	<	q.add(i);
135	>	assertTrue(q.add(i));
136		}
137		}
138
#	Line 131 | Line 140 | public class LinkedTransferQueueTest ext
140		* addAll(this) throws IllegalArgumentException
141		*/
142		public void testAddAllSelf() {
143	+	LinkedTransferQueue q = populatedQueue(SIZE);
144		try {
135	–	LinkedTransferQueue q = populatedQueue(SIZE);
145		q.addAll(q);
146		shouldThrow();
147		} catch (IllegalArgumentException success) {}
#	Line 143 | Line 152 | public class LinkedTransferQueueTest ext
152		* NullPointerException after possibly adding some elements
153		*/
154		public void testAddAll3() {
155	+	LinkedTransferQueue q = new LinkedTransferQueue();
156	+	Integer[] ints = new Integer[SIZE];
157	+	for (int i = 0; i < SIZE - 1; ++i)
158	+	ints[i] = i;
159		try {
147	–	LinkedTransferQueue q = new LinkedTransferQueue();
148	–	Integer[] ints = new Integer[SIZE];
149	–	for (int i = 0; i < SIZE - 1; ++i) {
150	–	ints[i] = i;
151	–	}
160		q.addAll(Arrays.asList(ints));
161		shouldThrow();
162		} catch (NullPointerException success) {}
#	Line 175 | Line 183 | public class LinkedTransferQueueTest ext
183		* all elements successfully put are contained
184		*/
185		public void testPut() {
186	<	LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
186	>	LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
187		for (int i = 0; i < SIZE; ++i) {
188	<	assertEquals(q.size(), i);
188	>	assertEquals(i, q.size());
189		q.put(i);
190		assertTrue(q.contains(i));
191		}
#	Line 201 | Line 209 | public class LinkedTransferQueueTest ext
209		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
210		Thread t = newStartedThread(new CheckedRunnable() {
211		public void realRun() throws InterruptedException {
212	<	for (int i = 0; i < SIZE; ++i) {
205	<	assertEquals(i, q.take());
206	<	}
212	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
213
214		Thread.currentThread().interrupt();
215		try {
#	Line 221 | Line 227 | public class LinkedTransferQueueTest ext
227		}});
228
229		await(pleaseInterrupt);
230	<	assertThreadStaysAlive(t);
230	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
231		t.interrupt();
232		awaitTermination(t);
233		}
#	Line 255 | Line 261 | public class LinkedTransferQueueTest ext
261		*/
262		public void testTimedPoll() throws InterruptedException {
263		LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
258	–	for (int i = 0; i < SIZE; ++i) {
259	–	long startTime = System.nanoTime();
260	–	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
261	–	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
262	–	}
264		long startTime = System.nanoTime();
265	+	for (int i = 0; i < SIZE; ++i)
266	+	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
267	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
268	+
269	+	startTime = System.nanoTime();
270		assertNull(q.poll(timeoutMillis(), MILLISECONDS));
271		assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
272		checkEmpty(q);
#	Line 272 | Line 278 | public class LinkedTransferQueueTest ext
278		*/
279		public void testInterruptedTimedPoll() throws InterruptedException {
280		final BlockingQueue<Integer> q = populatedQueue(SIZE);
281	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
281	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
282		Thread t = newStartedThread(new CheckedRunnable() {
283		public void realRun() throws InterruptedException {
284	<	for (int i = 0; i < SIZE; ++i) {
279	<	long t0 = System.nanoTime();
284	>	for (int i = 0; i < SIZE; i++)
285		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
286	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
287	<	}
283	<	long t0 = System.nanoTime();
284	<	aboutToWait.countDown();
286	>
287	>	Thread.currentThread().interrupt();
288		try {
289	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
289	>	q.poll(randomTimeout(), randomTimeUnit());
290		shouldThrow();
291	<	} catch (InterruptedException success) {
292	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
293	<	}
291	>	} catch (InterruptedException success) {}
292	>	assertFalse(Thread.interrupted());
293	>
294	>	pleaseInterrupt.countDown();
295	>	try {
296	>	q.poll(LONGER_DELAY_MS, MILLISECONDS);
297	>	shouldThrow();
298	>	} catch (InterruptedException success) {}
299	>	assertFalse(Thread.interrupted());
300		}});
301
302	<	aboutToWait.await();
303	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
302	>	await(pleaseInterrupt);
303	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
304		t.interrupt();
305	<	awaitTermination(t, MEDIUM_DELAY_MS);
305	>	awaitTermination(t);
306		checkEmpty(q);
307		}
308
#	Line 306 | Line 315 | public class LinkedTransferQueueTest ext
315		Thread t = newStartedThread(new CheckedRunnable() {
316		public void realRun() throws InterruptedException {
317		Thread.currentThread().interrupt();
318	<	for (int i = 0; i < SIZE; ++i) {
319	<	long t0 = System.nanoTime();
311	<	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
312	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
313	<	}
318	>	for (int i = 0; i < SIZE; ++i)
319	>	assertEquals(i, (int) q.poll(randomTimeout(), randomTimeUnit()));
320		try {
321	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
321	>	q.poll(randomTimeout(), randomTimeUnit());
322		shouldThrow();
323		} catch (InterruptedException success) {}
324	+	assertFalse(Thread.interrupted());
325		}});
326
327	<	awaitTermination(t, MEDIUM_DELAY_MS);
327	>	awaitTermination(t);
328		checkEmpty(q);
329		}
330
#	Line 368 | Line 375 | public class LinkedTransferQueueTest ext
375		}
376
377		/**
371	–	* remove(x) removes x and returns true if present
372	–	*/
373	–	public void testRemoveElement() throws InterruptedException {
374	–	LinkedTransferQueue q = populatedQueue(SIZE);
375	–	for (int i = 1; i < SIZE; i+=2) {
376	–	assertTrue(q.contains(i));
377	–	assertTrue(q.remove(i));
378	–	assertFalse(q.contains(i));
379	–	assertTrue(q.contains(i-1));
380	–	}
381	–	for (int i = 0; i < SIZE; i+=2) {
382	–	assertTrue(q.contains(i));
383	–	assertTrue(q.remove(i));
384	–	assertFalse(q.contains(i));
385	–	assertFalse(q.remove(i+1));
386	–	assertFalse(q.contains(i+1));
387	–	}
388	–	checkEmpty(q);
389	–	}
390	–
391	–	/**
378		* An add following remove(x) succeeds
379		*/
380		public void testRemoveElementAndAdd() throws InterruptedException {
#	Line 434 | Line 420 | public class LinkedTransferQueueTest ext
420		*/
421		public void testContainsAll() {
422		LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
423	<	LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
423	>	LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
424		for (int i = 0; i < SIZE; ++i) {
425		assertTrue(q.containsAll(p));
426		assertFalse(p.containsAll(q));
#	Line 484 | Line 470 | public class LinkedTransferQueueTest ext
470		*/
471		public void testToArray() {
472		LinkedTransferQueue q = populatedQueue(SIZE);
473	<	Object[] o = q.toArray();
474	<	for (int i = 0; i < o.length; i++) {
475	<	assertSame(o[i], q.poll());
476	<	}
473	>	Object[] a = q.toArray();
474	>	assertSame(Object[].class, a.getClass());
475	>	for (Object o : a)
476	>	assertSame(o, q.poll());
477	>	assertTrue(q.isEmpty());
478		}
479
480		/**
#	Line 498 | Line 485 | public class LinkedTransferQueueTest ext
485		Integer[] ints = new Integer[SIZE];
486		Integer[] array = q.toArray(ints);
487		assertSame(ints, array);
488	<	for (int i = 0; i < ints.length; i++) {
489	<	assertSame(ints[i], q.poll());
490	<	}
488	>	for (Integer o : ints)
489	>	assertSame(o, q.poll());
490	>	assertTrue(q.isEmpty());
491		}
492
493		/**
#	Line 520 | Line 507 | public class LinkedTransferQueueTest ext
507		public void testIterator() throws InterruptedException {
508		LinkedTransferQueue q = populatedQueue(SIZE);
509		Iterator it = q.iterator();
510	<	int i = 0;
511	<	while (it.hasNext()) {
512	<	assertEquals(it.next(), i++);
526	<	}
510	>	int i;
511	>	for (i = 0; it.hasNext(); i++)
512	>	assertTrue(q.contains(it.next()));
513		assertEquals(i, SIZE);
514	+	assertIteratorExhausted(it);
515	+
516	+	it = q.iterator();
517	+	for (i = 0; it.hasNext(); i++)
518	+	assertEquals(it.next(), q.take());
519	+	assertEquals(i, SIZE);
520	+	assertIteratorExhausted(it);
521	+	}
522	+
523	+	/**
524	+	* iterator of empty collection has no elements
525	+	*/
526	+	public void testEmptyIterator() {
527	+	assertIteratorExhausted(new LinkedTransferQueue().iterator());
528		}
529
530		/**
#	Line 550 | Line 550 | public class LinkedTransferQueueTest ext
550		* iterator ordering is FIFO
551		*/
552		public void testIteratorOrdering() {
553	<	final LinkedTransferQueue<Integer> q
554	<	= new LinkedTransferQueue<Integer>();
553	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
554		assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
555		q.add(one);
556		q.add(two);
#	Line 596 | Line 595 | public class LinkedTransferQueueTest ext
595		public void testOfferInExecutor() {
596		final LinkedTransferQueue q = new LinkedTransferQueue();
597		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
598	<	ExecutorService executor = Executors.newFixedThreadPool(2);
599	<
601	<	executor.execute(new CheckedRunnable() {
602	<	public void realRun() throws InterruptedException {
603	<	threadsStarted.await();
604	<	assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
605	<	}});
598	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
599	>	try (PoolCleaner cleaner = cleaner(executor)) {
600
601	<	executor.execute(new CheckedRunnable() {
602	<	public void realRun() throws InterruptedException {
603	<	threadsStarted.await();
604	<	assertSame(one, q.take());
605	<	checkEmpty(q);
606	<	}});
601	>	executor.execute(new CheckedRunnable() {
602	>	public void realRun() throws InterruptedException {
603	>	threadsStarted.await();
604	>	long startTime = System.nanoTime();
605	>	assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
606	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
607	>	}});
608
609	<	joinPool(executor);
609	>	executor.execute(new CheckedRunnable() {
610	>	public void realRun() throws InterruptedException {
611	>	threadsStarted.await();
612	>	assertSame(one, q.take());
613	>	checkEmpty(q);
614	>	}});
615	>	}
616		}
617
618		/**
#	Line 620 | Line 621 | public class LinkedTransferQueueTest ext
621		public void testPollInExecutor() {
622		final LinkedTransferQueue q = new LinkedTransferQueue();
623		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
624	<	ExecutorService executor = Executors.newFixedThreadPool(2);
625	<
625	<	executor.execute(new CheckedRunnable() {
626	<	public void realRun() throws InterruptedException {
627	<	assertNull(q.poll());
628	<	threadsStarted.await();
629	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
630	<	checkEmpty(q);
631	<	}});
624	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
625	>	try (PoolCleaner cleaner = cleaner(executor)) {
626
627	<	executor.execute(new CheckedRunnable() {
628	<	public void realRun() throws InterruptedException {
629	<	threadsStarted.await();
630	<	q.put(one);
631	<	}});
627	>	executor.execute(new CheckedRunnable() {
628	>	public void realRun() throws InterruptedException {
629	>	assertNull(q.poll());
630	>	threadsStarted.await();
631	>	long startTime = System.nanoTime();
632	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
633	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
634	>	checkEmpty(q);
635	>	}});
636
637	<	joinPool(executor);
637	>	executor.execute(new CheckedRunnable() {
638	>	public void realRun() throws InterruptedException {
639	>	threadsStarted.await();
640	>	q.put(one);
641	>	}});
642	>	}
643		}
644
645		/**
646	<	* A deserialized serialized queue has same elements in same order
646	>	* A deserialized/reserialized queue has same elements in same order
647		*/
648		public void testSerialization() throws Exception {
649		Queue x = populatedQueue(SIZE);
650		Queue y = serialClone(x);
651
652	<	assertTrue(x != y);
652	>	assertNotSame(y, x);
653		assertEquals(x.size(), y.size());
654		assertEquals(x.toString(), y.toString());
655		assertTrue(Arrays.equals(x.toArray(), y.toArray()));
#	Line 664 | Line 667 | public class LinkedTransferQueueTest ext
667		LinkedTransferQueue q = populatedQueue(SIZE);
668		ArrayList l = new ArrayList();
669		q.drainTo(l);
670	<	assertEquals(q.size(), 0);
671	<	assertEquals(l.size(), SIZE);
670	>	assertEquals(0, q.size());
671	>	assertEquals(SIZE, l.size());
672		for (int i = 0; i < SIZE; ++i) {
673	<	assertEquals(l.get(i), i);
673	>	assertEquals(i, l.get(i));
674		}
675		q.add(zero);
676		q.add(one);
#	Line 676 | Line 679 | public class LinkedTransferQueueTest ext
679		assertTrue(q.contains(one));
680		l.clear();
681		q.drainTo(l);
682	<	assertEquals(q.size(), 0);
683	<	assertEquals(l.size(), 2);
682	>	assertEquals(0, q.size());
683	>	assertEquals(2, l.size());
684		for (int i = 0; i < 2; ++i) {
685	<	assertEquals(l.get(i), i);
685	>	assertEquals(i, l.get(i));
686		}
687		}
688
#	Line 695 | Line 698 | public class LinkedTransferQueueTest ext
698		ArrayList l = new ArrayList();
699		q.drainTo(l);
700		assertTrue(l.size() >= SIZE);
701	<	for (int i = 0; i < SIZE; ++i) {
702	<	assertEquals(l.get(i), i);
703	<	}
701	<	awaitTermination(t, MEDIUM_DELAY_MS);
701	>	for (int i = 0; i < SIZE; ++i)
702	>	assertEquals(i, l.get(i));
703	>	awaitTermination(t);
704		assertTrue(q.size() + l.size() >= SIZE);
705		}
706
#	Line 714 | Line 716 | public class LinkedTransferQueueTest ext
716		ArrayList l = new ArrayList();
717		q.drainTo(l, i);
718		int k = (i < SIZE) ? i : SIZE;
719	<	assertEquals(l.size(), k);
720	<	assertEquals(q.size(), SIZE - k);
721	<	for (int j = 0; j < k; ++j) {
722	<	assertEquals(l.get(j), j);
723	<	}
722	<	while (q.poll() != null)
723	<	;
719	>	assertEquals(k, l.size());
720	>	assertEquals(SIZE - k, q.size());
721	>	for (int j = 0; j < k; ++j)
722	>	assertEquals(j, l.get(j));
723	>	do {} while (q.poll() != null);
724		}
725		}
726
#	Line 730 | Line 730 | public class LinkedTransferQueueTest ext
730		*/
731		public void testWaitingConsumer() throws InterruptedException {
732		final LinkedTransferQueue q = new LinkedTransferQueue();
733	<	assertEquals(q.getWaitingConsumerCount(), 0);
733	>	assertEquals(0, q.getWaitingConsumerCount());
734		assertFalse(q.hasWaitingConsumer());
735		final CountDownLatch threadStarted = new CountDownLatch(1);
736
737		Thread t = newStartedThread(new CheckedRunnable() {
738		public void realRun() throws InterruptedException {
739		threadStarted.countDown();
740	+	long startTime = System.nanoTime();
741		assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
742	<	assertEquals(q.getWaitingConsumerCount(), 0);
742	>	assertEquals(0, q.getWaitingConsumerCount());
743		assertFalse(q.hasWaitingConsumer());
744	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
745		}});
746
747		threadStarted.await();
748	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
749	<	assertEquals(q.getWaitingConsumerCount(), 1);
750	<	assertTrue(q.hasWaitingConsumer());
748	>	Callable<Boolean> oneConsumer
749	>	= new Callable<Boolean>() { public Boolean call() {
750	>	return q.hasWaitingConsumer()
751	>	&& q.getWaitingConsumerCount() == 1; }};
752	>	waitForThreadToEnterWaitState(t, oneConsumer);
753
754		assertTrue(q.offer(one));
755	<	assertEquals(q.getWaitingConsumerCount(), 0);
755	>	assertEquals(0, q.getWaitingConsumerCount());
756		assertFalse(q.hasWaitingConsumer());
757
758	<	awaitTermination(t, MEDIUM_DELAY_MS);
758	>	awaitTermination(t);
759		}
760
761		/**
#	Line 766 | Line 770 | public class LinkedTransferQueueTest ext
770		}
771
772		/**
773	<	* transfer waits until a poll occurs. The transfered element
774	<	* is returned by this associated poll.
773	>	* transfer waits until a poll occurs. The transferred element
774	>	* is returned by the associated poll.
775		*/
776		public void testTransfer2() throws InterruptedException {
777	<	final LinkedTransferQueue<Integer> q
774	<	= new LinkedTransferQueue<Integer>();
777	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
778		final CountDownLatch threadStarted = new CountDownLatch(1);
779
780		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 782 | Line 785 | public class LinkedTransferQueueTest ext
785		}});
786
787		threadStarted.await();
788	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
789	<	assertEquals(1, q.size());
788	>	Callable<Boolean> oneElement
789	>	= new Callable<Boolean>() { public Boolean call() {
790	>	return !q.isEmpty() && q.size() == 1; }};
791	>	waitForThreadToEnterWaitState(t, oneElement);
792	>
793		assertSame(five, q.poll());
794		checkEmpty(q);
795	<	awaitTermination(t, MEDIUM_DELAY_MS);
795	>	awaitTermination(t);
796		}
797
798		/**
799		* transfer waits until a poll occurs, and then transfers in fifo order
800		*/
801		public void testTransfer3() throws InterruptedException {
802	<	final LinkedTransferQueue<Integer> q
797	<	= new LinkedTransferQueue<Integer>();
802	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
803
804		Thread first = newStartedThread(new CheckedRunnable() {
805		public void realRun() throws InterruptedException {
806		q.transfer(four);
807	<	assertTrue(!q.contains(four));
807	>	assertFalse(q.contains(four));
808		assertEquals(1, q.size());
809		}});
810
#	Line 842 | Line 847 | public class LinkedTransferQueueTest ext
847		assertEquals(1, q.size());
848		assertTrue(q.offer(three));
849		assertSame(four, q.poll());
850	<	awaitTermination(t, MEDIUM_DELAY_MS);
850	>	awaitTermination(t);
851		}
852
853		/**
854	<	* transfer waits until a take occurs. The transfered element
855	<	* is returned by this associated take.
854	>	* transfer waits until a take occurs. The transferred element
855	>	* is returned by the associated take.
856		*/
857		public void testTransfer5() throws InterruptedException {
858	<	final LinkedTransferQueue<Integer> q
854	<	= new LinkedTransferQueue<Integer>();
858	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
859
860		Thread t = newStartedThread(new CheckedRunnable() {
861		public void realRun() throws InterruptedException {
#	Line 865 | Line 869 | public class LinkedTransferQueueTest ext
869		assertEquals(1, q.size());
870		assertSame(four, q.take());
871		checkEmpty(q);
872	<	awaitTermination(t, MEDIUM_DELAY_MS);
872	>	awaitTermination(t);
873		}
874
875		/**
876		* tryTransfer(null) throws NullPointerException
877		*/
878		public void testTryTransfer1() {
879	+	final LinkedTransferQueue q = new LinkedTransferQueue();
880		try {
876	–	final LinkedTransferQueue q = new LinkedTransferQueue();
881		q.tryTransfer(null);
882		shouldThrow();
883		} catch (NullPointerException success) {}
#	Line 907 | Line 911 | public class LinkedTransferQueueTest ext
911		assertTrue(q.tryTransfer(hotPotato));
912		}});
913
914	<	assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
914	>	long startTime = System.nanoTime();
915	>	assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
916	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
917		checkEmpty(q);
918	<	awaitTermination(t, MEDIUM_DELAY_MS);
918	>	awaitTermination(t);
919		}
920
921		/**
#	Line 931 | Line 937 | public class LinkedTransferQueueTest ext
937
938		assertSame(q.take(), hotPotato);
939		checkEmpty(q);
940	<	awaitTermination(t, MEDIUM_DELAY_MS);
940	>	awaitTermination(t);
941		}
942
943		/**
#	Line 944 | Line 950 | public class LinkedTransferQueueTest ext
950
951		Thread t = newStartedThread(new CheckedRunnable() {
952		public void realRun() throws InterruptedException {
953	+	long startTime = System.nanoTime();
954		Thread.currentThread().interrupt();
955		try {
956	<	q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
956	>	q.tryTransfer(new Object(), randomTimeout(), randomTimeUnit());
957		shouldThrow();
958		} catch (InterruptedException success) {}
959		assertFalse(Thread.interrupted());
#	Line 957 | Line 964 | public class LinkedTransferQueueTest ext
964		shouldThrow();
965		} catch (InterruptedException success) {}
966		assertFalse(Thread.interrupted());
967	+
968	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
969		}});
970
971		await(pleaseInterrupt);
972	<	assertThreadStaysAlive(t);
972	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
973		t.interrupt();
974		awaitTermination(t);
975		checkEmpty(q);
#	Line 974 | Line 983 | public class LinkedTransferQueueTest ext
983
984		Thread t = newStartedThread(new CheckedRunnable() {
985		public void realRun() throws InterruptedException {
986	<	long t0 = System.nanoTime();
986	>	long startTime = System.nanoTime();
987		assertFalse(q.tryTransfer(new Object(),
988		timeoutMillis(), MILLISECONDS));
989	<	assertTrue(millisElapsedSince(t0) >= timeoutMillis());
989	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
990		checkEmpty(q);
991		}});
992
#	Line 995 | Line 1004 | public class LinkedTransferQueueTest ext
1004
1005		Thread t = newStartedThread(new CheckedRunnable() {
1006		public void realRun() throws InterruptedException {
1007	<	assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1007	>	long startTime = System.nanoTime();
1008	>	assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1009	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1010		checkEmpty(q);
1011		}});
1012
#	Line 1005 | Line 1016 | public class LinkedTransferQueueTest ext
1016		assertSame(four, q.poll());
1017		assertSame(five, q.poll());
1018		checkEmpty(q);
1019	<	awaitTermination(t, MEDIUM_DELAY_MS);
1019	>	awaitTermination(t);
1020		}
1021
1022		/**
#	Line 1016 | Line 1027 | public class LinkedTransferQueueTest ext
1027		final LinkedTransferQueue q = new LinkedTransferQueue();
1028		assertTrue(q.offer(four));
1029		assertEquals(1, q.size());
1030	<	long t0 = System.nanoTime();
1030	>	long startTime = System.nanoTime();
1031		assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1032	<	assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1032	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1033		assertEquals(1, q.size());
1034		assertSame(four, q.poll());
1035		assertNull(q.poll());
#	Line 1026 | Line 1037 | public class LinkedTransferQueueTest ext
1037		}
1038
1039		private LinkedTransferQueue<Integer> populatedQueue(int n) {
1040	<	LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1040	>	LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1041		checkEmpty(q);
1042		for (int i = 0; i < n; i++) {
1043		assertEquals(i, q.size());
#	Line 1036 | Line 1047 | public class LinkedTransferQueueTest ext
1047		assertFalse(q.isEmpty());
1048		return q;
1049		}
1050	+
1051	+	/**
1052	+	* remove(null), contains(null) always return false
1053	+	*/
1054	+	public void testNeverContainsNull() {
1055	+	Collection<?>[] qs = {
1056	+	new LinkedTransferQueue<Object>(),
1057	+	populatedQueue(2),
1058	+	};
1059	+
1060	+	for (Collection<?> q : qs) {
1061	+	assertFalse(q.contains(null));
1062	+	assertFalse(q.remove(null));
1063	+	}
1064	+	}
1065		}

Diff Legend

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