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.33 by jsr166, Fri Oct 29 06:22:12 2010 UTC vs.
Revision 1.56 by jsr166, Wed Dec 31 19:21:20 2014 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 John Vint
6		*/
7
8	<	import java.io.BufferedInputStream;
9	<	import java.io.BufferedOutputStream;
10	<	import java.io.ByteArrayInputStream;
11	<	import java.io.ByteArrayOutputStream;
12	<	import java.io.ObjectInputStream;
13	<	import java.io.ObjectOutputStream;
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.concurrent.*;
17	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
18	<	import static java.util.concurrent.TimeUnit.NANOSECONDS;
16	>	import java.util.Queue;
17	>	import java.util.concurrent.BlockingQueue;
18	>	import java.util.concurrent.CountDownLatch;
19	>	import java.util.concurrent.Executors;
20	>	import java.util.concurrent.ExecutorService;
21	>	import java.util.concurrent.LinkedTransferQueue;
22	>
23		import junit.framework.Test;
23	–	import junit.framework.TestSuite;
24
25		@SuppressWarnings({"unchecked", "rawtypes"})
26		public class LinkedTransferQueueTest extends JSR166TestCase {
#	Line 40 | Line 40 | public class LinkedTransferQueueTest ext
40		new Generic().testSuite());
41		}
42
43	–	void checkEmpty(BlockingQueue q) {
44	–	try {
45	–	assertTrue(q.isEmpty());
46	–	assertEquals(0, q.size());
47	–	assertNull(q.peek());
48	–	assertNull(q.poll());
49	–	assertNull(q.poll(0, MILLISECONDS));
50	–	assertEquals(q.toString(), "[]");
51	–	assertTrue(Arrays.equals(q.toArray(), new Object[0]));
52	–	assertFalse(q.iterator().hasNext());
53	–	try {
54	–	q.element();
55	–	shouldThrow();
56	–	} catch (NoSuchElementException success) {}
57	–	try {
58	–	q.iterator().next();
59	–	shouldThrow();
60	–	} catch (NoSuchElementException success) {}
61	–	try {
62	–	q.remove();
63	–	shouldThrow();
64	–	} catch (NoSuchElementException success) {}
65	–	} catch (InterruptedException ie) {
66	–	threadUnexpectedException(ie);
67	–	}
68	–	}
69	–
43		/**
44		* Constructor builds new queue with size being zero and empty
45		* being true
#	Line 92 | Line 65 | public class LinkedTransferQueueTest ext
65		* NullPointerException
66		*/
67		public void testConstructor3() {
68	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
69		try {
70	<	Integer[] ints = new Integer[SIZE];
97	<	new LinkedTransferQueue(Arrays.asList(ints));
70	>	new LinkedTransferQueue(elements);
71		shouldThrow();
72		} catch (NullPointerException success) {}
73		}
#	Line 104 | Line 77 | public class LinkedTransferQueueTest ext
77		* throws NullPointerException
78		*/
79		public void testConstructor4() {
80	+	Integer[] ints = new Integer[SIZE];
81	+	for (int i = 0; i < SIZE-1; ++i)
82	+	ints[i] = i;
83	+	Collection<Integer> elements = Arrays.asList(ints);
84		try {
85	<	Integer[] ints = new Integer[SIZE];
109	<	for (int i = 0; i < SIZE - 1; ++i) {
110	<	ints[i] = i;
111	<	}
112	<	new LinkedTransferQueue(Arrays.asList(ints));
85	>	new LinkedTransferQueue(elements);
86		shouldThrow();
87		} catch (NullPointerException success) {}
88		}
#	Line 156 | Line 129 | public class LinkedTransferQueueTest ext
129		}
130
131		/**
159	–	* offer(null) throws NullPointerException
160	–	*/
161	–	public void testOfferNull() {
162	–	try {
163	–	LinkedTransferQueue q = new LinkedTransferQueue();
164	–	q.offer(null);
165	–	shouldThrow();
166	–	} catch (NullPointerException success) {}
167	–	}
168	–
169	–	/**
170	–	* add(null) throws NullPointerException
171	–	*/
172	–	public void testAddNull() {
173	–	try {
174	–	LinkedTransferQueue q = new LinkedTransferQueue();
175	–	q.add(null);
176	–	shouldThrow();
177	–	} catch (NullPointerException success) {}
178	–	}
179	–
180	–	/**
181	–	* addAll(null) throws NullPointerException
182	–	*/
183	–	public void testAddAll1() {
184	–	try {
185	–	LinkedTransferQueue q = new LinkedTransferQueue();
186	–	q.addAll(null);
187	–	shouldThrow();
188	–	} catch (NullPointerException success) {}
189	–	}
190	–
191	–	/**
132		* addAll(this) throws IllegalArgumentException
133		*/
134		public void testAddAllSelf() {
#	Line 200 | Line 140 | public class LinkedTransferQueueTest ext
140		}
141
142		/**
203	–	* addAll of a collection with null elements throws NullPointerException
204	–	*/
205	–	public void testAddAll2() {
206	–	try {
207	–	LinkedTransferQueue q = new LinkedTransferQueue();
208	–	Integer[] ints = new Integer[SIZE];
209	–	q.addAll(Arrays.asList(ints));
210	–	shouldThrow();
211	–	} catch (NullPointerException success) {}
212	–	}
213	–
214	–	/**
143		* addAll of a collection with any null elements throws
144		* NullPointerException after possibly adding some elements
145		*/
#	Line 245 | Line 173 | public class LinkedTransferQueueTest ext
173		}
174
175		/**
248	–	* put(null) throws NullPointerException
249	–	*/
250	–	public void testPutNull() throws InterruptedException {
251	–	try {
252	–	LinkedTransferQueue q = new LinkedTransferQueue();
253	–	q.put(null);
254	–	shouldThrow();
255	–	} catch (NullPointerException success) {}
256	–	}
257	–
258	–	/**
176		* all elements successfully put are contained
177		*/
178		public void testPut() {
179		LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
180		for (int i = 0; i < SIZE; ++i) {
181	<	assertEquals(q.size(), i);
181	>	assertEquals(i, q.size());
182		q.put(i);
183		assertTrue(q.contains(i));
184		}
#	Line 281 | Line 198 | public class LinkedTransferQueueTest ext
198		* take removes existing elements until empty, then blocks interruptibly
199		*/
200		public void testBlockingTake() throws InterruptedException {
201	<	final BlockingQueue<Integer> q = populatedQueue(SIZE);
202	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
201	>	final BlockingQueue q = populatedQueue(SIZE);
202	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
203		Thread t = newStartedThread(new CheckedRunnable() {
204		public void realRun() throws InterruptedException {
205		for (int i = 0; i < SIZE; ++i) {
206	<	assertEquals(i, (int) q.take());
206	>	assertEquals(i, q.take());
207		}
208	<	aboutToWait.countDown();
208	>
209	>	Thread.currentThread().interrupt();
210		try {
211		q.take();
212		shouldThrow();
213		} catch (InterruptedException success) {}
214	+	assertFalse(Thread.interrupted());
215	+
216	+	pleaseInterrupt.countDown();
217	+	try {
218	+	q.take();
219	+	shouldThrow();
220	+	} catch (InterruptedException success) {}
221	+	assertFalse(Thread.interrupted());
222		}});
223
224	<	aboutToWait.await();
225	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
224	>	await(pleaseInterrupt);
225	>	assertThreadStaysAlive(t);
226		t.interrupt();
227	<	awaitTermination(t, MEDIUM_DELAY_MS);
302	<	checkEmpty(q);
227	>	awaitTermination(t);
228		}
229
230		/**
#	Line 332 | Line 257 | public class LinkedTransferQueueTest ext
257		public void testTimedPoll() throws InterruptedException {
258		LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
259		for (int i = 0; i < SIZE; ++i) {
260	<	long t0 = System.nanoTime();
261	<	assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
262	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
263	<	}
264	<	long t0 = System.nanoTime();
265	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
266	<	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
260	>	long startTime = System.nanoTime();
261	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
262	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
263	>	}
264	>	long startTime = System.nanoTime();
265	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
266	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
267		checkEmpty(q);
268		}
269
#	Line 354 | Line 279 | public class LinkedTransferQueueTest ext
279		for (int i = 0; i < SIZE; ++i) {
280		long t0 = System.nanoTime();
281		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
282	<	assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
282	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
283		}
284	+	long t0 = System.nanoTime();
285		aboutToWait.countDown();
286		try {
287		q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
288		shouldThrow();
289	<	} catch (InterruptedException success) {}
289	>	} catch (InterruptedException success) {
290	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
291	>	}
292		}});
293
294		aboutToWait.await();
#	Line 382 | Line 310 | public class LinkedTransferQueueTest ext
310		for (int i = 0; i < SIZE; ++i) {
311		long t0 = System.nanoTime();
312		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
313	<	assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
313	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
314		}
315		try {
316		q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
#	Line 441 | Line 369 | public class LinkedTransferQueueTest ext
369		}
370
371		/**
444	–	* remove(x) removes x and returns true if present
445	–	*/
446	–	public void testRemoveElement() throws InterruptedException {
447	–	LinkedTransferQueue q = populatedQueue(SIZE);
448	–	for (int i = 1; i < SIZE; i += 2) {
449	–	assertTrue(q.remove(i));
450	–	}
451	–	for (int i = 0; i < SIZE; i += 2) {
452	–	assertTrue(q.remove(i));
453	–	assertFalse(q.remove(i + 1));
454	–	}
455	–	checkEmpty(q);
456	–	}
457	–
458	–	/**
372		* An add following remove(x) succeeds
373		*/
374		public void testRemoveElementAndAdd() throws InterruptedException {
#	Line 547 | Line 460 | public class LinkedTransferQueueTest ext
460		}
461
462		/**
463	<	* toArray() contains all elements
463	>	* toArray() contains all elements in FIFO order
464		*/
465	<	public void testToArray() throws InterruptedException {
465	>	public void testToArray() {
466		LinkedTransferQueue q = populatedQueue(SIZE);
467		Object[] o = q.toArray();
468		for (int i = 0; i < o.length; i++) {
469	<	assertEquals(o[i], q.take());
469	>	assertSame(o[i], q.poll());
470		}
471		}
472
473		/**
474	<	* toArray(a) contains all elements
474	>	* toArray(a) contains all elements in FIFO order
475		*/
476	<	public void testToArray2() throws InterruptedException {
476	>	public void testToArray2() {
477		LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
478		Integer[] ints = new Integer[SIZE];
479	<	ints = q.toArray(ints);
479	>	Integer[] array = q.toArray(ints);
480	>	assertSame(ints, array);
481		for (int i = 0; i < ints.length; i++) {
482	<	assertEquals(ints[i], q.take());
482	>	assertSame(ints[i], q.poll());
483		}
484		}
485
486		/**
487	<	* toArray(null) throws NullPointerException
574	<	*/
575	<	public void testToArray_BadArg() {
576	<	LinkedTransferQueue q = populatedQueue(SIZE);
577	<	try {
578	<	Object o[] = q.toArray(null);
579	<	shouldThrow();
580	<	} catch (NullPointerException success) {}
581	<	}
582	<
583	<	/**
584	<	* toArray(incompatible array type) throws CCE
487	>	* toArray(incompatible array type) throws ArrayStoreException
488		*/
489		public void testToArray1_BadArg() {
490		LinkedTransferQueue q = populatedQueue(SIZE);
491		try {
492	<	Object o[] = q.toArray(new String[10]);
492	>	q.toArray(new String[10]);
493		shouldThrow();
494		} catch (ArrayStoreException success) {}
495		}
#	Line 663 | Line 566 | public class LinkedTransferQueueTest ext
566		LinkedTransferQueue q = populatedQueue(SIZE);
567		String s = q.toString();
568		for (int i = 0; i < SIZE; ++i) {
569	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
569	>	assertTrue(s.contains(String.valueOf(i)));
570		}
571		}
572
#	Line 672 | Line 575 | public class LinkedTransferQueueTest ext
575		*/
576		public void testOfferInExecutor() {
577		final LinkedTransferQueue q = new LinkedTransferQueue();
578	<	final CountDownLatch threadsStarted = new CountDownLatch(2);
578	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
579		ExecutorService executor = Executors.newFixedThreadPool(2);
580
581		executor.execute(new CheckedRunnable() {
582		public void realRun() throws InterruptedException {
680	–	threadsStarted.countDown();
583		threadsStarted.await();
584	<	assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
584	>	assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
585		}});
586
587		executor.execute(new CheckedRunnable() {
588		public void realRun() throws InterruptedException {
687	–	threadsStarted.countDown();
589		threadsStarted.await();
590		assertSame(one, q.take());
591		checkEmpty(q);
#	Line 698 | Line 599 | public class LinkedTransferQueueTest ext
599		*/
600		public void testPollInExecutor() {
601		final LinkedTransferQueue q = new LinkedTransferQueue();
602	<	final CountDownLatch threadsStarted = new CountDownLatch(2);
602	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
603		ExecutorService executor = Executors.newFixedThreadPool(2);
604
605		executor.execute(new CheckedRunnable() {
606		public void realRun() throws InterruptedException {
607		assertNull(q.poll());
707	–	threadsStarted.countDown();
608		threadsStarted.await();
609	<	assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
609	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
610		checkEmpty(q);
611		}});
612
613		executor.execute(new CheckedRunnable() {
614		public void realRun() throws InterruptedException {
715	–	threadsStarted.countDown();
615		threadsStarted.await();
616		q.put(one);
617		}});
#	Line 724 | Line 623 | public class LinkedTransferQueueTest ext
623		* A deserialized serialized queue has same elements in same order
624		*/
625		public void testSerialization() throws Exception {
626	<	LinkedTransferQueue q = populatedQueue(SIZE);
626	>	Queue x = populatedQueue(SIZE);
627	>	Queue y = serialClone(x);
628
629	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
630	<	ObjectOutputStream out
631	<	= new ObjectOutputStream(new BufferedOutputStream(bout));
632	<	out.writeObject(q);
633	<	out.close();
634	<
635	<	ByteArrayInputStream bin
736	<	= new ByteArrayInputStream(bout.toByteArray());
737	<	ObjectInputStream in
738	<	= new ObjectInputStream(new BufferedInputStream(bin));
739	<	LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
740	<
741	<	assertEquals(q.size(), r.size());
742	<	assertEquals(q.toString(), r.toString());
743	<	assertTrue(Arrays.equals(q.toArray(), r.toArray()));
744	<	while (!q.isEmpty()) {
745	<	assertEquals(q.remove(), r.remove());
629	>	assertNotSame(y, x);
630	>	assertEquals(x.size(), y.size());
631	>	assertEquals(x.toString(), y.toString());
632	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
633	>	while (!x.isEmpty()) {
634	>	assertFalse(y.isEmpty());
635	>	assertEquals(x.remove(), y.remove());
636		}
637	<	}
748	<
749	<	/**
750	<	* drainTo(null) throws NullPointerException
751	<	*/
752	<	public void testDrainToNull() {
753	<	LinkedTransferQueue q = populatedQueue(SIZE);
754	<	try {
755	<	q.drainTo(null);
756	<	shouldThrow();
757	<	} catch (NullPointerException success) {}
758	<	}
759	<
760	<	/**
761	<	* drainTo(this) throws IllegalArgumentException
762	<	*/
763	<	public void testDrainToSelf() {
764	<	LinkedTransferQueue q = populatedQueue(SIZE);
765	<	try {
766	<	q.drainTo(q);
767	<	shouldThrow();
768	<	} catch (IllegalArgumentException success) {}
637	>	assertTrue(y.isEmpty());
638		}
639
640		/**
#	Line 775 | Line 644 | public class LinkedTransferQueueTest ext
644		LinkedTransferQueue q = populatedQueue(SIZE);
645		ArrayList l = new ArrayList();
646		q.drainTo(l);
647	<	assertEquals(q.size(), 0);
648	<	assertEquals(l.size(), SIZE);
647	>	assertEquals(0, q.size());
648	>	assertEquals(SIZE, l.size());
649		for (int i = 0; i < SIZE; ++i) {
650	<	assertEquals(l.get(i), i);
650	>	assertEquals(i, l.get(i));
651		}
652		q.add(zero);
653		q.add(one);
#	Line 787 | Line 656 | public class LinkedTransferQueueTest ext
656		assertTrue(q.contains(one));
657		l.clear();
658		q.drainTo(l);
659	<	assertEquals(q.size(), 0);
660	<	assertEquals(l.size(), 2);
659	>	assertEquals(0, q.size());
660	>	assertEquals(2, l.size());
661		for (int i = 0; i < 2; ++i) {
662	<	assertEquals(l.get(i), i);
662	>	assertEquals(i, l.get(i));
663		}
664		}
665
#	Line 806 | Line 675 | public class LinkedTransferQueueTest ext
675		ArrayList l = new ArrayList();
676		q.drainTo(l);
677		assertTrue(l.size() >= SIZE);
678	<	for (int i = 0; i < SIZE; ++i) {
679	<	assertEquals(l.get(i), i);
811	<	}
678	>	for (int i = 0; i < SIZE; ++i)
679	>	assertEquals(i, l.get(i));
680		awaitTermination(t, MEDIUM_DELAY_MS);
681		assertTrue(q.size() + l.size() >= SIZE);
682		}
683
684		/**
817	–	* drainTo(null, n) throws NullPointerException
818	–	*/
819	–	public void testDrainToNullN() {
820	–	LinkedTransferQueue q = populatedQueue(SIZE);
821	–	try {
822	–	q.drainTo(null, SIZE);
823	–	shouldThrow();
824	–	} catch (NullPointerException success) {}
825	–	}
826	–
827	–	/**
828	–	* drainTo(this, n) throws IllegalArgumentException
829	–	*/
830	–	public void testDrainToSelfN() {
831	–	LinkedTransferQueue q = populatedQueue(SIZE);
832	–	try {
833	–	q.drainTo(q, SIZE);
834	–	shouldThrow();
835	–	} catch (IllegalArgumentException success) {}
836	–	}
837	–
838	–	/**
685		* drainTo(c, n) empties first min(n, size) elements of queue into c
686		*/
687		public void testDrainToN() {
#	Line 847 | Line 693 | public class LinkedTransferQueueTest ext
693		ArrayList l = new ArrayList();
694		q.drainTo(l, i);
695		int k = (i < SIZE) ? i : SIZE;
696	<	assertEquals(l.size(), k);
697	<	assertEquals(q.size(), SIZE - k);
698	<	for (int j = 0; j < k; ++j) {
699	<	assertEquals(l.get(j), j);
700	<	}
855	<	while (q.poll() != null)
856	<	;
696	>	assertEquals(k, l.size());
697	>	assertEquals(SIZE - k, q.size());
698	>	for (int j = 0; j < k; ++j)
699	>	assertEquals(j, l.get(j));
700	>	do {} while (q.poll() != null);
701		}
702		}
703
#	Line 863 | Line 707 | public class LinkedTransferQueueTest ext
707		*/
708		public void testWaitingConsumer() throws InterruptedException {
709		final LinkedTransferQueue q = new LinkedTransferQueue();
710	<	assertEquals(q.getWaitingConsumerCount(), 0);
710	>	assertEquals(0, q.getWaitingConsumerCount());
711		assertFalse(q.hasWaitingConsumer());
712		final CountDownLatch threadStarted = new CountDownLatch(1);
713
#	Line 871 | Line 715 | public class LinkedTransferQueueTest ext
715		public void realRun() throws InterruptedException {
716		threadStarted.countDown();
717		assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
718	<	assertEquals(q.getWaitingConsumerCount(), 0);
718	>	assertEquals(0, q.getWaitingConsumerCount());
719		assertFalse(q.hasWaitingConsumer());
720		}});
721
722		threadStarted.await();
723		waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
724	<	assertEquals(q.getWaitingConsumerCount(), 1);
724	>	assertEquals(1, q.getWaitingConsumerCount());
725		assertTrue(q.hasWaitingConsumer());
726
727		assertTrue(q.offer(one));
728	<	assertEquals(q.getWaitingConsumerCount(), 0);
728	>	assertEquals(0, q.getWaitingConsumerCount());
729		assertFalse(q.hasWaitingConsumer());
730
731		awaitTermination(t, MEDIUM_DELAY_MS);
#	Line 910 | Line 754 | public class LinkedTransferQueueTest ext
754		Thread t = newStartedThread(new CheckedRunnable() {
755		public void realRun() throws InterruptedException {
756		threadStarted.countDown();
757	<	q.transfer(SIZE);
757	>	q.transfer(five);
758		checkEmpty(q);
759		}});
760
761		threadStarted.await();
762		waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
919	–	assertTrue(t.isAlive());
763		assertEquals(1, q.size());
764	<	assertEquals(SIZE, (int) q.poll());
764	>	assertSame(five, q.poll());
765		checkEmpty(q);
766		awaitTermination(t, MEDIUM_DELAY_MS);
767		}
#	Line 1069 | Line 912 | public class LinkedTransferQueueTest ext
912		}
913
914		/**
915	<	* tryTransfer waits the amount given if interrupted, and
1073	<	* throws interrupted exception
915	>	* tryTransfer blocks interruptibly if no takers
916		*/
917		public void testTryTransfer5() throws InterruptedException {
918		final LinkedTransferQueue q = new LinkedTransferQueue();
919	<	final CountDownLatch threadStarted = new CountDownLatch(1);
919	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
920	>	assertTrue(q.isEmpty());
921
922		Thread t = newStartedThread(new CheckedRunnable() {
923		public void realRun() throws InterruptedException {
924	<	long t0 = System.nanoTime();
1082	<	threadStarted.countDown();
924	>	Thread.currentThread().interrupt();
925		try {
926		q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
927		shouldThrow();
928		} catch (InterruptedException success) {}
929	<	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
929	>	assertFalse(Thread.interrupted());
930	>
931	>	pleaseInterrupt.countDown();
932	>	try {
933	>	q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
934	>	shouldThrow();
935	>	} catch (InterruptedException success) {}
936	>	assertFalse(Thread.interrupted());
937		}});
938
939	<	threadStarted.await();
940	<	Thread.sleep(SHORT_DELAY_MS);
939	>	await(pleaseInterrupt);
940	>	assertThreadStaysAlive(t);
941		t.interrupt();
942	<	awaitTermination(t, MEDIUM_DELAY_MS);
942	>	awaitTermination(t);
943		checkEmpty(q);
944		}
945
#	Line 1104 | Line 953 | public class LinkedTransferQueueTest ext
953		public void realRun() throws InterruptedException {
954		long t0 = System.nanoTime();
955		assertFalse(q.tryTransfer(new Object(),
956	<	SHORT_DELAY_MS, MILLISECONDS));
957	<	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
956	>	timeoutMillis(), MILLISECONDS));
957	>	assertTrue(millisElapsedSince(t0) >= timeoutMillis());
958		checkEmpty(q);
959		}});
960
961	<	awaitTermination(t, MEDIUM_DELAY_MS);
961	>	awaitTermination(t);
962		checkEmpty(q);
963		}
964
#	Line 1137 | Line 986 | public class LinkedTransferQueueTest ext
986		}
987
988		/**
989	<	* tryTransfer attempts to enqueue into the q and fails returning
990	<	* false not enqueueing and the successive poll is null
989	>	* tryTransfer attempts to enqueue into the queue and fails
990	>	* returning false not enqueueing and the successive poll is null
991		*/
992		public void testTryTransfer8() throws InterruptedException {
993		final LinkedTransferQueue q = new LinkedTransferQueue();
994		assertTrue(q.offer(four));
995		assertEquals(1, q.size());
996		long t0 = System.nanoTime();
997	<	assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
998	<	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
997	>	assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
998	>	assertTrue(millisElapsedSince(t0) >= timeoutMillis());
999		assertEquals(1, q.size());
1000		assertSame(four, q.poll());
1001		assertNull(q.poll());
#	Line 1164 | Line 1013 | public class LinkedTransferQueueTest ext
1013		assertFalse(q.isEmpty());
1014		return q;
1015		}
1016	+
1017	+	/**
1018	+	* remove(null), contains(null) always return false
1019	+	*/
1020	+	public void testNeverContainsNull() {
1021	+	Collection<?>[] qs = {
1022	+	new LinkedTransferQueue<Object>(),
1023	+	populatedQueue(2),
1024	+	};
1025	+
1026	+	for (Collection<?> q : qs) {
1027	+	assertFalse(q.contains(null));
1028	+	assertFalse(q.remove(null));
1029	+	}
1030	+	}
1031		}

Diff Legend

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