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.75 by jsr166, Sat May 13 23:50:00 2017 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 275 | Line 281 | public class LinkedTransferQueueTest ext
281		final CountDownLatch aboutToWait = 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));
281	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
282	–	}
283	–	long t0 = System.nanoTime();
287		aboutToWait.countDown();
288		try {
289	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
289	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
290		shouldThrow();
291	<	} catch (InterruptedException success) {
292	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
290	<	}
291	>	} catch (InterruptedException success) {}
292	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
293		}});
294
295	<	aboutToWait.await();
296	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
295	>	await(aboutToWait);
296	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
297		t.interrupt();
298	<	awaitTermination(t, MEDIUM_DELAY_MS);
298	>	awaitTermination(t);
299		checkEmpty(q);
300		}
301
#	Line 305 | Line 307 | public class LinkedTransferQueueTest ext
307		final BlockingQueue<Integer> q = populatedQueue(SIZE);
308		Thread t = newStartedThread(new CheckedRunnable() {
309		public void realRun() throws InterruptedException {
310	+	long startTime = System.nanoTime();
311		Thread.currentThread().interrupt();
312	<	for (int i = 0; i < SIZE; ++i) {
310	<	long t0 = System.nanoTime();
312	>	for (int i = 0; i < SIZE; ++i)
313		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
312	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
313	–	}
314		try {
315	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
315	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
316		shouldThrow();
317		} catch (InterruptedException success) {}
318	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
319		}});
320
321	<	awaitTermination(t, MEDIUM_DELAY_MS);
321	>	awaitTermination(t);
322		checkEmpty(q);
323		}
324
#	Line 413 | Line 414 | public class LinkedTransferQueueTest ext
414		*/
415		public void testContainsAll() {
416		LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
417	<	LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
417	>	LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
418		for (int i = 0; i < SIZE; ++i) {
419		assertTrue(q.containsAll(p));
420		assertFalse(p.containsAll(q));
#	Line 499 | Line 500 | public class LinkedTransferQueueTest ext
500		public void testIterator() throws InterruptedException {
501		LinkedTransferQueue q = populatedQueue(SIZE);
502		Iterator it = q.iterator();
503	<	int i = 0;
504	<	while (it.hasNext()) {
505	<	assertEquals(it.next(), i++);
506	<	}
503	>	int i;
504	>	for (i = 0; it.hasNext(); i++)
505	>	assertTrue(q.contains(it.next()));
506	>	assertEquals(i, SIZE);
507	>	assertIteratorExhausted(it);
508	>
509	>	it = q.iterator();
510	>	for (i = 0; it.hasNext(); i++)
511	>	assertEquals(it.next(), q.take());
512		assertEquals(i, SIZE);
513	+	assertIteratorExhausted(it);
514	+	}
515	+
516	+	/**
517	+	* iterator of empty collection has no elements
518	+	*/
519	+	public void testEmptyIterator() {
520	+	assertIteratorExhausted(new LinkedTransferQueue().iterator());
521		}
522
523		/**
#	Line 529 | Line 543 | public class LinkedTransferQueueTest ext
543		* iterator ordering is FIFO
544		*/
545		public void testIteratorOrdering() {
546	<	final LinkedTransferQueue<Integer> q
533	<	= new LinkedTransferQueue<Integer>();
546	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
547		assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
548		q.add(one);
549		q.add(two);
#	Line 575 | Line 588 | public class LinkedTransferQueueTest ext
588		public void testOfferInExecutor() {
589		final LinkedTransferQueue q = new LinkedTransferQueue();
590		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
591	<	ExecutorService executor = Executors.newFixedThreadPool(2);
592	<
580	<	executor.execute(new CheckedRunnable() {
581	<	public void realRun() throws InterruptedException {
582	<	threadsStarted.await();
583	<	assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
584	<	}});
591	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
592	>	try (PoolCleaner cleaner = cleaner(executor)) {
593
594	<	executor.execute(new CheckedRunnable() {
595	<	public void realRun() throws InterruptedException {
596	<	threadsStarted.await();
597	<	assertSame(one, q.take());
598	<	checkEmpty(q);
599	<	}});
594	>	executor.execute(new CheckedRunnable() {
595	>	public void realRun() throws InterruptedException {
596	>	threadsStarted.await();
597	>	long startTime = System.nanoTime();
598	>	assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
599	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
600	>	}});
601
602	<	joinPool(executor);
602	>	executor.execute(new CheckedRunnable() {
603	>	public void realRun() throws InterruptedException {
604	>	threadsStarted.await();
605	>	assertSame(one, q.take());
606	>	checkEmpty(q);
607	>	}});
608	>	}
609		}
610
611		/**
#	Line 599 | Line 614 | public class LinkedTransferQueueTest ext
614		public void testPollInExecutor() {
615		final LinkedTransferQueue q = new LinkedTransferQueue();
616		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
617	<	ExecutorService executor = Executors.newFixedThreadPool(2);
618	<
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	<	}});
617	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
618	>	try (PoolCleaner cleaner = cleaner(executor)) {
619
620	<	executor.execute(new CheckedRunnable() {
621	<	public void realRun() throws InterruptedException {
622	<	threadsStarted.await();
623	<	q.put(one);
624	<	}});
620	>	executor.execute(new CheckedRunnable() {
621	>	public void realRun() throws InterruptedException {
622	>	assertNull(q.poll());
623	>	threadsStarted.await();
624	>	long startTime = System.nanoTime();
625	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
626	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
627	>	checkEmpty(q);
628	>	}});
629
630	<	joinPool(executor);
630	>	executor.execute(new CheckedRunnable() {
631	>	public void realRun() throws InterruptedException {
632	>	threadsStarted.await();
633	>	q.put(one);
634	>	}});
635	>	}
636		}
637
638		/**
#	Line 625 | Line 642 | public class LinkedTransferQueueTest ext
642		Queue x = populatedQueue(SIZE);
643		Queue y = serialClone(x);
644
645	<	assertTrue(x != y);
645	>	assertNotSame(y, x);
646		assertEquals(x.size(), y.size());
647		assertEquals(x.toString(), y.toString());
648		assertTrue(Arrays.equals(x.toArray(), y.toArray()));
#	Line 646 | Line 663 | public class LinkedTransferQueueTest ext
663		assertEquals(0, q.size());
664		assertEquals(SIZE, l.size());
665		for (int i = 0; i < SIZE; ++i) {
666	<	assertEquals(l.get(i), i);
666	>	assertEquals(i, l.get(i));
667		}
668		q.add(zero);
669		q.add(one);
#	Line 658 | Line 675 | public class LinkedTransferQueueTest ext
675		assertEquals(0, q.size());
676		assertEquals(2, l.size());
677		for (int i = 0; i < 2; ++i) {
678	<	assertEquals(l.get(i), i);
678	>	assertEquals(i, l.get(i));
679		}
680		}
681
#	Line 674 | Line 691 | public class LinkedTransferQueueTest ext
691		ArrayList l = new ArrayList();
692		q.drainTo(l);
693		assertTrue(l.size() >= SIZE);
694	<	for (int i = 0; i < SIZE; ++i) {
695	<	assertEquals(l.get(i), i);
696	<	}
680	<	awaitTermination(t, MEDIUM_DELAY_MS);
694	>	for (int i = 0; i < SIZE; ++i)
695	>	assertEquals(i, l.get(i));
696	>	awaitTermination(t);
697		assertTrue(q.size() + l.size() >= SIZE);
698		}
699
#	Line 693 | Line 709 | public class LinkedTransferQueueTest ext
709		ArrayList l = new ArrayList();
710		q.drainTo(l, i);
711		int k = (i < SIZE) ? i : SIZE;
712	<	assertEquals(l.size(), k);
713	<	assertEquals(q.size(), SIZE - k);
714	<	for (int j = 0; j < k; ++j) {
715	<	assertEquals(l.get(j), j);
716	<	}
701	<	while (q.poll() != null)
702	<	;
712	>	assertEquals(k, l.size());
713	>	assertEquals(SIZE - k, q.size());
714	>	for (int j = 0; j < k; ++j)
715	>	assertEquals(j, l.get(j));
716	>	do {} while (q.poll() != null);
717		}
718		}
719
#	Line 716 | Line 730 | public class LinkedTransferQueueTest ext
730		Thread t = newStartedThread(new CheckedRunnable() {
731		public void realRun() throws InterruptedException {
732		threadStarted.countDown();
733	+	long startTime = System.nanoTime();
734		assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
735		assertEquals(0, q.getWaitingConsumerCount());
736		assertFalse(q.hasWaitingConsumer());
737	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
738		}});
739
740		threadStarted.await();
741	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
742	<	assertEquals(1, q.getWaitingConsumerCount());
743	<	assertTrue(q.hasWaitingConsumer());
741	>	Callable<Boolean> oneConsumer
742	>	= new Callable<Boolean>() { public Boolean call() {
743	>	return q.hasWaitingConsumer()
744	>	&& q.getWaitingConsumerCount() == 1; }};
745	>	waitForThreadToEnterWaitState(t, oneConsumer);
746
747		assertTrue(q.offer(one));
748		assertEquals(0, q.getWaitingConsumerCount());
749		assertFalse(q.hasWaitingConsumer());
750
751	<	awaitTermination(t, MEDIUM_DELAY_MS);
751	>	awaitTermination(t);
752		}
753
754		/**
#	Line 746 | Line 764 | public class LinkedTransferQueueTest ext
764
765		/**
766		* transfer waits until a poll occurs. The transfered element
767	<	* is returned by this associated poll.
767	>	* is returned by the associated poll.
768		*/
769		public void testTransfer2() throws InterruptedException {
770	<	final LinkedTransferQueue<Integer> q
753	<	= new LinkedTransferQueue<Integer>();
770	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
771		final CountDownLatch threadStarted = new CountDownLatch(1);
772
773		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 761 | Line 778 | public class LinkedTransferQueueTest ext
778		}});
779
780		threadStarted.await();
781	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
782	<	assertEquals(1, q.size());
781	>	Callable<Boolean> oneElement
782	>	= new Callable<Boolean>() { public Boolean call() {
783	>	return !q.isEmpty() && q.size() == 1; }};
784	>	waitForThreadToEnterWaitState(t, oneElement);
785	>
786		assertSame(five, q.poll());
787		checkEmpty(q);
788	<	awaitTermination(t, MEDIUM_DELAY_MS);
788	>	awaitTermination(t);
789		}
790
791		/**
792		* transfer waits until a poll occurs, and then transfers in fifo order
793		*/
794		public void testTransfer3() throws InterruptedException {
795	<	final LinkedTransferQueue<Integer> q
776	<	= new LinkedTransferQueue<Integer>();
795	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
796
797		Thread first = newStartedThread(new CheckedRunnable() {
798		public void realRun() throws InterruptedException {
799		q.transfer(four);
800	<	assertTrue(!q.contains(four));
800	>	assertFalse(q.contains(four));
801		assertEquals(1, q.size());
802		}});
803
#	Line 821 | Line 840 | public class LinkedTransferQueueTest ext
840		assertEquals(1, q.size());
841		assertTrue(q.offer(three));
842		assertSame(four, q.poll());
843	<	awaitTermination(t, MEDIUM_DELAY_MS);
843	>	awaitTermination(t);
844		}
845
846		/**
847		* transfer waits until a take occurs. The transfered element
848	<	* is returned by this associated take.
848	>	* is returned by the associated take.
849		*/
850		public void testTransfer5() throws InterruptedException {
851	<	final LinkedTransferQueue<Integer> q
833	<	= new LinkedTransferQueue<Integer>();
851	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
852
853		Thread t = newStartedThread(new CheckedRunnable() {
854		public void realRun() throws InterruptedException {
#	Line 844 | Line 862 | public class LinkedTransferQueueTest ext
862		assertEquals(1, q.size());
863		assertSame(four, q.take());
864		checkEmpty(q);
865	<	awaitTermination(t, MEDIUM_DELAY_MS);
865	>	awaitTermination(t);
866		}
867
868		/**
869		* tryTransfer(null) throws NullPointerException
870		*/
871		public void testTryTransfer1() {
872	+	final LinkedTransferQueue q = new LinkedTransferQueue();
873		try {
855	–	final LinkedTransferQueue q = new LinkedTransferQueue();
874		q.tryTransfer(null);
875		shouldThrow();
876		} catch (NullPointerException success) {}
#	Line 886 | Line 904 | public class LinkedTransferQueueTest ext
904		assertTrue(q.tryTransfer(hotPotato));
905		}});
906
907	<	assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
907	>	long startTime = System.nanoTime();
908	>	assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
909	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
910		checkEmpty(q);
911	<	awaitTermination(t, MEDIUM_DELAY_MS);
911	>	awaitTermination(t);
912		}
913
914		/**
#	Line 910 | Line 930 | public class LinkedTransferQueueTest ext
930
931		assertSame(q.take(), hotPotato);
932		checkEmpty(q);
933	<	awaitTermination(t, MEDIUM_DELAY_MS);
933	>	awaitTermination(t);
934		}
935
936		/**
#	Line 923 | Line 943 | public class LinkedTransferQueueTest ext
943
944		Thread t = newStartedThread(new CheckedRunnable() {
945		public void realRun() throws InterruptedException {
946	+	long startTime = System.nanoTime();
947		Thread.currentThread().interrupt();
948		try {
949		q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
#	Line 936 | Line 957 | public class LinkedTransferQueueTest ext
957		shouldThrow();
958		} catch (InterruptedException success) {}
959		assertFalse(Thread.interrupted());
960	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
961		}});
962
963		await(pleaseInterrupt);
964	<	assertThreadStaysAlive(t);
964	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
965		t.interrupt();
966		awaitTermination(t);
967		checkEmpty(q);
#	Line 953 | Line 975 | public class LinkedTransferQueueTest ext
975
976		Thread t = newStartedThread(new CheckedRunnable() {
977		public void realRun() throws InterruptedException {
978	<	long t0 = System.nanoTime();
978	>	long startTime = System.nanoTime();
979		assertFalse(q.tryTransfer(new Object(),
980		timeoutMillis(), MILLISECONDS));
981	<	assertTrue(millisElapsedSince(t0) >= timeoutMillis());
981	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
982		checkEmpty(q);
983		}});
984
#	Line 974 | Line 996 | public class LinkedTransferQueueTest ext
996
997		Thread t = newStartedThread(new CheckedRunnable() {
998		public void realRun() throws InterruptedException {
999	<	assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
999	>	long startTime = System.nanoTime();
1000	>	assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1001	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1002		checkEmpty(q);
1003		}});
1004
#	Line 984 | Line 1008 | public class LinkedTransferQueueTest ext
1008		assertSame(four, q.poll());
1009		assertSame(five, q.poll());
1010		checkEmpty(q);
1011	<	awaitTermination(t, MEDIUM_DELAY_MS);
1011	>	awaitTermination(t);
1012		}
1013
1014		/**
#	Line 995 | Line 1019 | public class LinkedTransferQueueTest ext
1019		final LinkedTransferQueue q = new LinkedTransferQueue();
1020		assertTrue(q.offer(four));
1021		assertEquals(1, q.size());
1022	<	long t0 = System.nanoTime();
1022	>	long startTime = System.nanoTime();
1023		assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1024	<	assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1024	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1025		assertEquals(1, q.size());
1026		assertSame(four, q.poll());
1027		assertNull(q.poll());
#	Line 1005 | Line 1029 | public class LinkedTransferQueueTest ext
1029		}
1030
1031		private LinkedTransferQueue<Integer> populatedQueue(int n) {
1032	<	LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1032	>	LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1033		checkEmpty(q);
1034		for (int i = 0; i < n; i++) {
1035		assertEquals(i, q.size());
#	Line 1015 | Line 1039 | public class LinkedTransferQueueTest ext
1039		assertFalse(q.isEmpty());
1040		return q;
1041		}
1042	+
1043	+	/**
1044	+	* remove(null), contains(null) always return false
1045	+	*/
1046	+	public void testNeverContainsNull() {
1047	+	Collection<?>[] qs = {
1048	+	new LinkedTransferQueue<Object>(),
1049	+	populatedQueue(2),
1050	+	};
1051	+
1052	+	for (Collection<?> q : qs) {
1053	+	assertFalse(q.contains(null));
1054	+	assertFalse(q.remove(null));
1055	+	}
1056	+	}
1057		}

Diff Legend

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