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.50 by jsr166, Sat Nov 26 05:19:17 2011 UTC vs.
Revision 1.81 by jsr166, Mon May 28 21:19:50 2018 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	>	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) {
285	<	long t0 = System.nanoTime();
284	>	long startTime = System.nanoTime();
285	>	for (int i = 0; i < SIZE; i++)
286		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
287	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
288	<	}
289	<	long t0 = System.nanoTime();
290	<	aboutToWait.countDown();
287	>
288	>	Thread.currentThread().interrupt();
289	>	try {
290	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
291	>	shouldThrow();
292	>	} catch (InterruptedException success) {}
293	>	assertFalse(Thread.interrupted());
294	>
295	>	pleaseInterrupt.countDown();
296		try {
297	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
297	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
298		shouldThrow();
299	<	} catch (InterruptedException success) {
300	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
301	<	}
299	>	} catch (InterruptedException success) {}
300	>	assertFalse(Thread.interrupted());
301	>
302	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
303		}});
304
305	<	aboutToWait.await();
306	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
305	>	await(pleaseInterrupt);
306	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
307		t.interrupt();
308	<	awaitTermination(t, MEDIUM_DELAY_MS);
308	>	awaitTermination(t);
309		checkEmpty(q);
310		}
311
#	Line 305 | Line 317 | public class LinkedTransferQueueTest ext
317		final BlockingQueue<Integer> q = populatedQueue(SIZE);
318		Thread t = newStartedThread(new CheckedRunnable() {
319		public void realRun() throws InterruptedException {
320	+	long startTime = System.nanoTime();
321		Thread.currentThread().interrupt();
322	<	for (int i = 0; i < SIZE; ++i) {
310	<	long t0 = System.nanoTime();
322	>	for (int i = 0; i < SIZE; ++i)
323		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
312	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
313	–	}
324		try {
325	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
325	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
326		shouldThrow();
327		} catch (InterruptedException success) {}
328	+	assertFalse(Thread.interrupted());
329	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
330		}});
331
332	<	awaitTermination(t, MEDIUM_DELAY_MS);
332	>	awaitTermination(t);
333		checkEmpty(q);
334		}
335
#	Line 413 | Line 425 | public class LinkedTransferQueueTest ext
425		*/
426		public void testContainsAll() {
427		LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
428	<	LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
428	>	LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
429		for (int i = 0; i < SIZE; ++i) {
430		assertTrue(q.containsAll(p));
431		assertFalse(p.containsAll(q));
#	Line 463 | Line 475 | public class LinkedTransferQueueTest ext
475		*/
476		public void testToArray() {
477		LinkedTransferQueue q = populatedQueue(SIZE);
478	<	Object[] o = q.toArray();
479	<	for (int i = 0; i < o.length; i++) {
480	<	assertSame(o[i], q.poll());
481	<	}
478	>	Object[] a = q.toArray();
479	>	assertSame(Object[].class, a.getClass());
480	>	for (Object o : a)
481	>	assertSame(o, q.poll());
482	>	assertTrue(q.isEmpty());
483		}
484
485		/**
#	Line 477 | Line 490 | public class LinkedTransferQueueTest ext
490		Integer[] ints = new Integer[SIZE];
491		Integer[] array = q.toArray(ints);
492		assertSame(ints, array);
493	<	for (int i = 0; i < ints.length; i++) {
494	<	assertSame(ints[i], q.poll());
495	<	}
493	>	for (Integer o : ints)
494	>	assertSame(o, q.poll());
495	>	assertTrue(q.isEmpty());
496		}
497
498		/**
#	Line 499 | Line 512 | public class LinkedTransferQueueTest ext
512		public void testIterator() throws InterruptedException {
513		LinkedTransferQueue q = populatedQueue(SIZE);
514		Iterator it = q.iterator();
515	<	int i = 0;
516	<	while (it.hasNext()) {
517	<	assertEquals(it.next(), i++);
518	<	}
515	>	int i;
516	>	for (i = 0; it.hasNext(); i++)
517	>	assertTrue(q.contains(it.next()));
518	>	assertEquals(i, SIZE);
519	>	assertIteratorExhausted(it);
520	>
521	>	it = q.iterator();
522	>	for (i = 0; it.hasNext(); i++)
523	>	assertEquals(it.next(), q.take());
524		assertEquals(i, SIZE);
525	+	assertIteratorExhausted(it);
526	+	}
527	+
528	+	/**
529	+	* iterator of empty collection has no elements
530	+	*/
531	+	public void testEmptyIterator() {
532	+	assertIteratorExhausted(new LinkedTransferQueue().iterator());
533		}
534
535		/**
#	Line 529 | Line 555 | public class LinkedTransferQueueTest ext
555		* iterator ordering is FIFO
556		*/
557		public void testIteratorOrdering() {
558	<	final LinkedTransferQueue<Integer> q
533	<	= new LinkedTransferQueue<Integer>();
558	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
559		assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
560		q.add(one);
561		q.add(two);
#	Line 575 | Line 600 | public class LinkedTransferQueueTest ext
600		public void testOfferInExecutor() {
601		final LinkedTransferQueue q = new LinkedTransferQueue();
602		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
603	<	ExecutorService executor = Executors.newFixedThreadPool(2);
604	<
580	<	executor.execute(new CheckedRunnable() {
581	<	public void realRun() throws InterruptedException {
582	<	threadsStarted.await();
583	<	assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
584	<	}});
603	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
604	>	try (PoolCleaner cleaner = cleaner(executor)) {
605
606	<	executor.execute(new CheckedRunnable() {
607	<	public void realRun() throws InterruptedException {
608	<	threadsStarted.await();
609	<	assertSame(one, q.take());
610	<	checkEmpty(q);
611	<	}});
606	>	executor.execute(new CheckedRunnable() {
607	>	public void realRun() throws InterruptedException {
608	>	threadsStarted.await();
609	>	long startTime = System.nanoTime();
610	>	assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
611	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
612	>	}});
613
614	<	joinPool(executor);
614	>	executor.execute(new CheckedRunnable() {
615	>	public void realRun() throws InterruptedException {
616	>	threadsStarted.await();
617	>	assertSame(one, q.take());
618	>	checkEmpty(q);
619	>	}});
620	>	}
621		}
622
623		/**
#	Line 599 | Line 626 | public class LinkedTransferQueueTest ext
626		public void testPollInExecutor() {
627		final LinkedTransferQueue q = new LinkedTransferQueue();
628		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
629	<	ExecutorService executor = Executors.newFixedThreadPool(2);
630	<
604	<	executor.execute(new CheckedRunnable() {
605	<	public void realRun() throws InterruptedException {
606	<	assertNull(q.poll());
607	<	threadsStarted.await();
608	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
609	<	checkEmpty(q);
610	<	}});
629	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
630	>	try (PoolCleaner cleaner = cleaner(executor)) {
631
632	<	executor.execute(new CheckedRunnable() {
633	<	public void realRun() throws InterruptedException {
634	<	threadsStarted.await();
635	<	q.put(one);
636	<	}});
632	>	executor.execute(new CheckedRunnable() {
633	>	public void realRun() throws InterruptedException {
634	>	assertNull(q.poll());
635	>	threadsStarted.await();
636	>	long startTime = System.nanoTime();
637	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
638	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
639	>	checkEmpty(q);
640	>	}});
641
642	<	joinPool(executor);
642	>	executor.execute(new CheckedRunnable() {
643	>	public void realRun() throws InterruptedException {
644	>	threadsStarted.await();
645	>	q.put(one);
646	>	}});
647	>	}
648		}
649
650		/**
651	<	* A deserialized serialized queue has same elements in same order
651	>	* A deserialized/reserialized queue has same elements in same order
652		*/
653		public void testSerialization() throws Exception {
654		Queue x = populatedQueue(SIZE);
655		Queue y = serialClone(x);
656
657	<	assertTrue(x != y);
657	>	assertNotSame(y, x);
658		assertEquals(x.size(), y.size());
659		assertEquals(x.toString(), y.toString());
660		assertTrue(Arrays.equals(x.toArray(), y.toArray()));
#	Line 646 | Line 675 | public class LinkedTransferQueueTest ext
675		assertEquals(0, q.size());
676		assertEquals(SIZE, l.size());
677		for (int i = 0; i < SIZE; ++i) {
678	<	assertEquals(l.get(i), i);
678	>	assertEquals(i, l.get(i));
679		}
680		q.add(zero);
681		q.add(one);
#	Line 658 | Line 687 | public class LinkedTransferQueueTest ext
687		assertEquals(0, q.size());
688		assertEquals(2, l.size());
689		for (int i = 0; i < 2; ++i) {
690	<	assertEquals(l.get(i), i);
690	>	assertEquals(i, l.get(i));
691		}
692		}
693
#	Line 674 | Line 703 | public class LinkedTransferQueueTest ext
703		ArrayList l = new ArrayList();
704		q.drainTo(l);
705		assertTrue(l.size() >= SIZE);
706	<	for (int i = 0; i < SIZE; ++i) {
707	<	assertEquals(l.get(i), i);
708	<	}
680	<	awaitTermination(t, MEDIUM_DELAY_MS);
706	>	for (int i = 0; i < SIZE; ++i)
707	>	assertEquals(i, l.get(i));
708	>	awaitTermination(t);
709		assertTrue(q.size() + l.size() >= SIZE);
710		}
711
#	Line 693 | Line 721 | public class LinkedTransferQueueTest ext
721		ArrayList l = new ArrayList();
722		q.drainTo(l, i);
723		int k = (i < SIZE) ? i : SIZE;
724	<	assertEquals(l.size(), k);
725	<	assertEquals(q.size(), SIZE - k);
726	<	for (int j = 0; j < k; ++j) {
727	<	assertEquals(l.get(j), j);
728	<	}
701	<	while (q.poll() != null)
702	<	;
724	>	assertEquals(k, l.size());
725	>	assertEquals(SIZE - k, q.size());
726	>	for (int j = 0; j < k; ++j)
727	>	assertEquals(j, l.get(j));
728	>	do {} while (q.poll() != null);
729		}
730		}
731
#	Line 716 | Line 742 | public class LinkedTransferQueueTest ext
742		Thread t = newStartedThread(new CheckedRunnable() {
743		public void realRun() throws InterruptedException {
744		threadStarted.countDown();
745	+	long startTime = System.nanoTime();
746		assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
747		assertEquals(0, q.getWaitingConsumerCount());
748		assertFalse(q.hasWaitingConsumer());
749	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
750		}});
751
752		threadStarted.await();
753	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
754	<	assertEquals(1, q.getWaitingConsumerCount());
755	<	assertTrue(q.hasWaitingConsumer());
753	>	Callable<Boolean> oneConsumer
754	>	= new Callable<Boolean>() { public Boolean call() {
755	>	return q.hasWaitingConsumer()
756	>	&& q.getWaitingConsumerCount() == 1; }};
757	>	waitForThreadToEnterWaitState(t, oneConsumer);
758
759		assertTrue(q.offer(one));
760		assertEquals(0, q.getWaitingConsumerCount());
761		assertFalse(q.hasWaitingConsumer());
762
763	<	awaitTermination(t, MEDIUM_DELAY_MS);
763	>	awaitTermination(t);
764		}
765
766		/**
#	Line 745 | Line 775 | public class LinkedTransferQueueTest ext
775		}
776
777		/**
778	<	* transfer waits until a poll occurs. The transfered element
779	<	* is returned by this associated poll.
778	>	* transfer waits until a poll occurs. The transferred element
779	>	* is returned by the associated poll.
780		*/
781		public void testTransfer2() throws InterruptedException {
782	<	final LinkedTransferQueue<Integer> q
753	<	= new LinkedTransferQueue<Integer>();
782	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
783		final CountDownLatch threadStarted = new CountDownLatch(1);
784
785		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 761 | Line 790 | public class LinkedTransferQueueTest ext
790		}});
791
792		threadStarted.await();
793	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
794	<	assertEquals(1, q.size());
793	>	Callable<Boolean> oneElement
794	>	= new Callable<Boolean>() { public Boolean call() {
795	>	return !q.isEmpty() && q.size() == 1; }};
796	>	waitForThreadToEnterWaitState(t, oneElement);
797	>
798		assertSame(five, q.poll());
799		checkEmpty(q);
800	<	awaitTermination(t, MEDIUM_DELAY_MS);
800	>	awaitTermination(t);
801		}
802
803		/**
804		* transfer waits until a poll occurs, and then transfers in fifo order
805		*/
806		public void testTransfer3() throws InterruptedException {
807	<	final LinkedTransferQueue<Integer> q
776	<	= new LinkedTransferQueue<Integer>();
807	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
808
809		Thread first = newStartedThread(new CheckedRunnable() {
810		public void realRun() throws InterruptedException {
811		q.transfer(four);
812	<	assertTrue(!q.contains(four));
812	>	assertFalse(q.contains(four));
813		assertEquals(1, q.size());
814		}});
815
#	Line 821 | Line 852 | public class LinkedTransferQueueTest ext
852		assertEquals(1, q.size());
853		assertTrue(q.offer(three));
854		assertSame(four, q.poll());
855	<	awaitTermination(t, MEDIUM_DELAY_MS);
855	>	awaitTermination(t);
856		}
857
858		/**
859	<	* transfer waits until a take occurs. The transfered element
860	<	* is returned by this associated take.
859	>	* transfer waits until a take occurs. The transferred element
860	>	* is returned by the associated take.
861		*/
862		public void testTransfer5() throws InterruptedException {
863	<	final LinkedTransferQueue<Integer> q
833	<	= new LinkedTransferQueue<Integer>();
863	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
864
865		Thread t = newStartedThread(new CheckedRunnable() {
866		public void realRun() throws InterruptedException {
#	Line 844 | Line 874 | public class LinkedTransferQueueTest ext
874		assertEquals(1, q.size());
875		assertSame(four, q.take());
876		checkEmpty(q);
877	<	awaitTermination(t, MEDIUM_DELAY_MS);
877	>	awaitTermination(t);
878		}
879
880		/**
881		* tryTransfer(null) throws NullPointerException
882		*/
883		public void testTryTransfer1() {
884	+	final LinkedTransferQueue q = new LinkedTransferQueue();
885		try {
855	–	final LinkedTransferQueue q = new LinkedTransferQueue();
886		q.tryTransfer(null);
887		shouldThrow();
888		} catch (NullPointerException success) {}
#	Line 886 | Line 916 | public class LinkedTransferQueueTest ext
916		assertTrue(q.tryTransfer(hotPotato));
917		}});
918
919	<	assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
919	>	long startTime = System.nanoTime();
920	>	assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
921	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
922		checkEmpty(q);
923	<	awaitTermination(t, MEDIUM_DELAY_MS);
923	>	awaitTermination(t);
924		}
925
926		/**
#	Line 910 | Line 942 | public class LinkedTransferQueueTest ext
942
943		assertSame(q.take(), hotPotato);
944		checkEmpty(q);
945	<	awaitTermination(t, MEDIUM_DELAY_MS);
945	>	awaitTermination(t);
946		}
947
948		/**
#	Line 923 | Line 955 | public class LinkedTransferQueueTest ext
955
956		Thread t = newStartedThread(new CheckedRunnable() {
957		public void realRun() throws InterruptedException {
958	+	long startTime = System.nanoTime();
959		Thread.currentThread().interrupt();
960		try {
961		q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
#	Line 936 | Line 969 | public class LinkedTransferQueueTest ext
969		shouldThrow();
970		} catch (InterruptedException success) {}
971		assertFalse(Thread.interrupted());
972	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
973		}});
974
975		await(pleaseInterrupt);
976	<	assertThreadStaysAlive(t);
976	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
977		t.interrupt();
978		awaitTermination(t);
979		checkEmpty(q);
#	Line 953 | Line 987 | public class LinkedTransferQueueTest ext
987
988		Thread t = newStartedThread(new CheckedRunnable() {
989		public void realRun() throws InterruptedException {
990	<	long t0 = System.nanoTime();
990	>	long startTime = System.nanoTime();
991		assertFalse(q.tryTransfer(new Object(),
992		timeoutMillis(), MILLISECONDS));
993	<	assertTrue(millisElapsedSince(t0) >= timeoutMillis());
993	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
994		checkEmpty(q);
995		}});
996
#	Line 974 | Line 1008 | public class LinkedTransferQueueTest ext
1008
1009		Thread t = newStartedThread(new CheckedRunnable() {
1010		public void realRun() throws InterruptedException {
1011	<	assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1011	>	long startTime = System.nanoTime();
1012	>	assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1013	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1014		checkEmpty(q);
1015		}});
1016
#	Line 984 | Line 1020 | public class LinkedTransferQueueTest ext
1020		assertSame(four, q.poll());
1021		assertSame(five, q.poll());
1022		checkEmpty(q);
1023	<	awaitTermination(t, MEDIUM_DELAY_MS);
1023	>	awaitTermination(t);
1024		}
1025
1026		/**
#	Line 995 | Line 1031 | public class LinkedTransferQueueTest ext
1031		final LinkedTransferQueue q = new LinkedTransferQueue();
1032		assertTrue(q.offer(four));
1033		assertEquals(1, q.size());
1034	<	long t0 = System.nanoTime();
1034	>	long startTime = System.nanoTime();
1035		assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1036	<	assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1036	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1037		assertEquals(1, q.size());
1038		assertSame(four, q.poll());
1039		assertNull(q.poll());
#	Line 1005 | Line 1041 | public class LinkedTransferQueueTest ext
1041		}
1042
1043		private LinkedTransferQueue<Integer> populatedQueue(int n) {
1044	<	LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1044	>	LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1045		checkEmpty(q);
1046		for (int i = 0; i < n; i++) {
1047		assertEquals(i, q.size());
#	Line 1015 | Line 1051 | public class LinkedTransferQueueTest ext
1051		assertFalse(q.isEmpty());
1052		return q;
1053		}
1054	+
1055	+	/**
1056	+	* remove(null), contains(null) always return false
1057	+	*/
1058	+	public void testNeverContainsNull() {
1059	+	Collection<?>[] qs = {
1060	+	new LinkedTransferQueue<Object>(),
1061	+	populatedQueue(2),
1062	+	};
1063	+
1064	+	for (Collection<?> q : qs) {
1065	+	assertFalse(q.contains(null));
1066	+	assertFalse(q.remove(null));
1067	+	}
1068	+	}
1069		}

Diff Legend

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