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.43 by jsr166, Sun Nov 28 08:43:53 2010 UTC vs.
Revision 1.77 by jsr166, Sun May 14 00:56:43 2017 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.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	>
24		import junit.framework.Test;
23	–	import junit.framework.TestSuite;
25
26		@SuppressWarnings({"unchecked", "rawtypes"})
27		public class LinkedTransferQueueTest extends JSR166TestCase {
27	–
28		public static class Generic extends BlockingQueueTest {
29		protected BlockingQueue emptyCollection() {
30		return new LinkedTransferQueue();
#	Line 32 | 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 65 | Line 73 | public class LinkedTransferQueueTest ext
73		* NullPointerException
74		*/
75		public void testConstructor3() {
76	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
77		try {
78	<	Integer[] ints = new Integer[SIZE];
70	<	new LinkedTransferQueue(Arrays.asList(ints));
78	>	new LinkedTransferQueue(elements);
79		shouldThrow();
80		} catch (NullPointerException success) {}
81		}
#	Line 77 | Line 85 | public class LinkedTransferQueueTest ext
85		* throws NullPointerException
86		*/
87		public void testConstructor4() {
88	+	Integer[] ints = new Integer[SIZE];
89	+	for (int i = 0; i < SIZE - 1; ++i)
90	+	ints[i] = i;
91	+	Collection<Integer> elements = Arrays.asList(ints);
92		try {
93	<	Integer[] ints = new Integer[SIZE];
82	<	for (int i = 0; i < SIZE - 1; ++i) {
83	<	ints[i] = i;
84	<	}
85	<	new LinkedTransferQueue(Arrays.asList(ints));
93	>	new LinkedTransferQueue(elements);
94		shouldThrow();
95		} catch (NullPointerException success) {}
96		}
#	Line 115 | 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
139		/**
132	–	* offer(null) throws NullPointerException
133	–	*/
134	–	public void testOfferNull() {
135	–	try {
136	–	LinkedTransferQueue q = new LinkedTransferQueue();
137	–	q.offer(null);
138	–	shouldThrow();
139	–	} catch (NullPointerException success) {}
140	–	}
141	–
142	–	/**
143	–	* add(null) throws NullPointerException
144	–	*/
145	–	public void testAddNull() {
146	–	try {
147	–	LinkedTransferQueue q = new LinkedTransferQueue();
148	–	q.add(null);
149	–	shouldThrow();
150	–	} catch (NullPointerException success) {}
151	–	}
152	–
153	–	/**
154	–	* addAll(null) throws NullPointerException
155	–	*/
156	–	public void testAddAll1() {
157	–	try {
158	–	LinkedTransferQueue q = new LinkedTransferQueue();
159	–	q.addAll(null);
160	–	shouldThrow();
161	–	} catch (NullPointerException success) {}
162	–	}
163	–
164	–	/**
140		* addAll(this) throws IllegalArgumentException
141		*/
142		public void testAddAllSelf() {
143	+	LinkedTransferQueue q = populatedQueue(SIZE);
144		try {
169	–	LinkedTransferQueue q = populatedQueue(SIZE);
145		q.addAll(q);
146		shouldThrow();
147		} catch (IllegalArgumentException success) {}
148		}
149
150		/**
176	–	* addAll of a collection with null elements throws NullPointerException
177	–	*/
178	–	public void testAddAll2() {
179	–	try {
180	–	LinkedTransferQueue q = new LinkedTransferQueue();
181	–	Integer[] ints = new Integer[SIZE];
182	–	q.addAll(Arrays.asList(ints));
183	–	shouldThrow();
184	–	} catch (NullPointerException success) {}
185	–	}
186	–
187	–	/**
151		* addAll of a collection with any null elements throws
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 {
193	–	LinkedTransferQueue q = new LinkedTransferQueue();
194	–	Integer[] ints = new Integer[SIZE];
195	–	for (int i = 0; i < SIZE - 1; ++i) {
196	–	ints[i] = i;
197	–	}
160		q.addAll(Arrays.asList(ints));
161		shouldThrow();
162		} catch (NullPointerException success) {}
#	Line 218 | Line 180 | public class LinkedTransferQueueTest ext
180		}
181
182		/**
221	–	* put(null) throws NullPointerException
222	–	*/
223	–	public void testPutNull() throws InterruptedException {
224	–	try {
225	–	LinkedTransferQueue q = new LinkedTransferQueue();
226	–	q.put(null);
227	–	shouldThrow();
228	–	} catch (NullPointerException success) {}
229	–	}
230	–
231	–	/**
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 254 | Line 205 | public class LinkedTransferQueueTest ext
205		* take removes existing elements until empty, then blocks interruptibly
206		*/
207		public void testBlockingTake() throws InterruptedException {
208	<	final BlockingQueue<Integer> q = populatedQueue(SIZE);
209	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
208	>	final BlockingQueue q = populatedQueue(SIZE);
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) {
213	<	assertEquals(i, (int) q.take());
214	<	}
264	<	aboutToWait.countDown();
212	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
213	>
214	>	Thread.currentThread().interrupt();
215		try {
216		q.take();
217		shouldThrow();
218		} catch (InterruptedException success) {}
219	+	assertFalse(Thread.interrupted());
220	+
221	+	pleaseInterrupt.countDown();
222	+	try {
223	+	q.take();
224	+	shouldThrow();
225	+	} catch (InterruptedException success) {}
226	+	assertFalse(Thread.interrupted());
227		}});
228
229	<	aboutToWait.await();
230	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
229	>	await(pleaseInterrupt);
230	>	assertThreadBlocks(t, Thread.State.WAITING);
231		t.interrupt();
232	<	awaitTermination(t, MEDIUM_DELAY_MS);
275	<	checkEmpty(q);
232	>	awaitTermination(t);
233		}
234
235		/**
#	Line 304 | Line 261 | public class LinkedTransferQueueTest ext
261		*/
262		public void testTimedPoll() throws InterruptedException {
263		LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
264	<	for (int i = 0; i < SIZE; ++i) {
265	<	long t0 = System.nanoTime();
266	<	assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
267	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
268	<	}
269	<	long t0 = System.nanoTime();
270	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
271	<	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
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);
273		}
274
#	Line 321 | 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	<	}
332	<	long t0 = System.nanoTime();
333	<	aboutToWait.countDown();
287	>
288	>	pleaseInterrupt.countDown();
289		try {
290	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
290	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
291		shouldThrow();
292	<	} catch (InterruptedException success) {
293	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
294	<	}
292	>	} catch (InterruptedException success) {}
293	>	assertFalse(Thread.interrupted());
294	>
295	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
296		}});
297
298	<	aboutToWait.await();
299	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
298	>	await(pleaseInterrupt);
299	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
300		t.interrupt();
301	<	awaitTermination(t, MEDIUM_DELAY_MS);
301	>	awaitTermination(t);
302		checkEmpty(q);
303		}
304
#	Line 354 | Line 310 | public class LinkedTransferQueueTest ext
310		final BlockingQueue<Integer> q = populatedQueue(SIZE);
311		Thread t = newStartedThread(new CheckedRunnable() {
312		public void realRun() throws InterruptedException {
313	+	long startTime = System.nanoTime();
314		Thread.currentThread().interrupt();
315	<	for (int i = 0; i < SIZE; ++i) {
359	<	long t0 = System.nanoTime();
315	>	for (int i = 0; i < SIZE; ++i)
316		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
361	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
362	–	}
317		try {
318	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
318	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
319		shouldThrow();
320		} catch (InterruptedException success) {}
321	+	assertFalse(Thread.interrupted());
322	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
323		}});
324
325	<	awaitTermination(t, MEDIUM_DELAY_MS);
325	>	awaitTermination(t);
326		checkEmpty(q);
327		}
328
#	Line 417 | Line 373 | public class LinkedTransferQueueTest ext
373		}
374
375		/**
420	–	* remove(x) removes x and returns true if present
421	–	*/
422	–	public void testRemoveElement() throws InterruptedException {
423	–	LinkedTransferQueue q = populatedQueue(SIZE);
424	–	for (int i = 1; i < SIZE; i+=2) {
425	–	assertTrue(q.contains(i));
426	–	assertTrue(q.remove(i));
427	–	assertFalse(q.contains(i));
428	–	assertTrue(q.contains(i-1));
429	–	}
430	–	for (int i = 0; i < SIZE; i+=2) {
431	–	assertTrue(q.contains(i));
432	–	assertTrue(q.remove(i));
433	–	assertFalse(q.contains(i));
434	–	assertFalse(q.remove(i+1));
435	–	assertFalse(q.contains(i+1));
436	–	}
437	–	checkEmpty(q);
438	–	}
439	–
440	–	/**
376		* An add following remove(x) succeeds
377		*/
378		public void testRemoveElementAndAdd() throws InterruptedException {
#	Line 483 | Line 418 | public class LinkedTransferQueueTest ext
418		*/
419		public void testContainsAll() {
420		LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
421	<	LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
421	>	LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
422		for (int i = 0; i < SIZE; ++i) {
423		assertTrue(q.containsAll(p));
424		assertFalse(p.containsAll(q));
#	Line 553 | Line 488 | public class LinkedTransferQueueTest ext
488		}
489
490		/**
556	–	* toArray(null) throws NullPointerException
557	–	*/
558	–	public void testToArray_NullArg() {
559	–	LinkedTransferQueue q = populatedQueue(SIZE);
560	–	try {
561	–	q.toArray(null);
562	–	shouldThrow();
563	–	} catch (NullPointerException success) {}
564	–	}
565	–
566	–	/**
491		* toArray(incompatible array type) throws ArrayStoreException
492		*/
493		public void testToArray1_BadArg() {
#	Line 580 | Line 504 | public class LinkedTransferQueueTest ext
504		public void testIterator() throws InterruptedException {
505		LinkedTransferQueue q = populatedQueue(SIZE);
506		Iterator it = q.iterator();
507	<	int i = 0;
508	<	while (it.hasNext()) {
509	<	assertEquals(it.next(), i++);
510	<	}
507	>	int i;
508	>	for (i = 0; it.hasNext(); i++)
509	>	assertTrue(q.contains(it.next()));
510	>	assertEquals(i, SIZE);
511	>	assertIteratorExhausted(it);
512	>
513	>	it = q.iterator();
514	>	for (i = 0; it.hasNext(); i++)
515	>	assertEquals(it.next(), q.take());
516		assertEquals(i, SIZE);
517	+	assertIteratorExhausted(it);
518	+	}
519	+
520	+	/**
521	+	* iterator of empty collection has no elements
522	+	*/
523	+	public void testEmptyIterator() {
524	+	assertIteratorExhausted(new LinkedTransferQueue().iterator());
525		}
526
527		/**
#	Line 610 | Line 547 | public class LinkedTransferQueueTest ext
547		* iterator ordering is FIFO
548		*/
549		public void testIteratorOrdering() {
550	<	final LinkedTransferQueue<Integer> q
614	<	= new LinkedTransferQueue<Integer>();
550	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
551		assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
552		q.add(one);
553		q.add(two);
#	Line 646 | Line 582 | public class LinkedTransferQueueTest ext
582		LinkedTransferQueue q = populatedQueue(SIZE);
583		String s = q.toString();
584		for (int i = 0; i < SIZE; ++i) {
585	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
585	>	assertTrue(s.contains(String.valueOf(i)));
586		}
587		}
588
#	Line 655 | Line 591 | public class LinkedTransferQueueTest ext
591		*/
592		public void testOfferInExecutor() {
593		final LinkedTransferQueue q = new LinkedTransferQueue();
594	<	final CountDownLatch threadsStarted = new CountDownLatch(2);
595	<	ExecutorService executor = Executors.newFixedThreadPool(2);
596	<
661	<	executor.execute(new CheckedRunnable() {
662	<	public void realRun() throws InterruptedException {
663	<	threadsStarted.countDown();
664	<	threadsStarted.await();
665	<	assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
666	<	}});
594	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
595	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
596	>	try (PoolCleaner cleaner = cleaner(executor)) {
597
598	<	executor.execute(new CheckedRunnable() {
599	<	public void realRun() throws InterruptedException {
600	<	threadsStarted.countDown();
601	<	threadsStarted.await();
602	<	assertSame(one, q.take());
603	<	checkEmpty(q);
604	<	}});
598	>	executor.execute(new CheckedRunnable() {
599	>	public void realRun() throws InterruptedException {
600	>	threadsStarted.await();
601	>	long startTime = System.nanoTime();
602	>	assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
603	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
604	>	}});
605
606	<	joinPool(executor);
606	>	executor.execute(new CheckedRunnable() {
607	>	public void realRun() throws InterruptedException {
608	>	threadsStarted.await();
609	>	assertSame(one, q.take());
610	>	checkEmpty(q);
611	>	}});
612	>	}
613		}
614
615		/**
#	Line 681 | Line 617 | public class LinkedTransferQueueTest ext
617		*/
618		public void testPollInExecutor() {
619		final LinkedTransferQueue q = new LinkedTransferQueue();
620	<	final CountDownLatch threadsStarted = new CountDownLatch(2);
621	<	ExecutorService executor = Executors.newFixedThreadPool(2);
622	<
687	<	executor.execute(new CheckedRunnable() {
688	<	public void realRun() throws InterruptedException {
689	<	assertNull(q.poll());
690	<	threadsStarted.countDown();
691	<	threadsStarted.await();
692	<	assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
693	<	checkEmpty(q);
694	<	}});
620	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
621	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
622	>	try (PoolCleaner cleaner = cleaner(executor)) {
623
624	<	executor.execute(new CheckedRunnable() {
625	<	public void realRun() throws InterruptedException {
626	<	threadsStarted.countDown();
627	<	threadsStarted.await();
628	<	q.put(one);
629	<	}});
624	>	executor.execute(new CheckedRunnable() {
625	>	public void realRun() throws InterruptedException {
626	>	assertNull(q.poll());
627	>	threadsStarted.await();
628	>	long startTime = System.nanoTime();
629	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
630	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
631	>	checkEmpty(q);
632	>	}});
633
634	<	joinPool(executor);
634	>	executor.execute(new CheckedRunnable() {
635	>	public void realRun() throws InterruptedException {
636	>	threadsStarted.await();
637	>	q.put(one);
638	>	}});
639	>	}
640		}
641
642		/**
643		* A deserialized serialized queue has same elements in same order
644		*/
645		public void testSerialization() throws Exception {
646	<	LinkedTransferQueue q = populatedQueue(SIZE);
646	>	Queue x = populatedQueue(SIZE);
647	>	Queue y = serialClone(x);
648
649	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
650	<	ObjectOutputStream out
651	<	= new ObjectOutputStream(new BufferedOutputStream(bout));
652	<	out.writeObject(q);
653	<	out.close();
654	<
655	<	ByteArrayInputStream bin
719	<	= new ByteArrayInputStream(bout.toByteArray());
720	<	ObjectInputStream in
721	<	= new ObjectInputStream(new BufferedInputStream(bin));
722	<	LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
723	<
724	<	assertEquals(q.size(), r.size());
725	<	assertEquals(q.toString(), r.toString());
726	<	assertTrue(Arrays.equals(q.toArray(), r.toArray()));
727	<	while (!q.isEmpty()) {
728	<	assertEquals(q.remove(), r.remove());
649	>	assertNotSame(y, x);
650	>	assertEquals(x.size(), y.size());
651	>	assertEquals(x.toString(), y.toString());
652	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
653	>	while (!x.isEmpty()) {
654	>	assertFalse(y.isEmpty());
655	>	assertEquals(x.remove(), y.remove());
656		}
657	<	}
731	<
732	<	/**
733	<	* drainTo(null) throws NullPointerException
734	<	*/
735	<	public void testDrainToNull() {
736	<	LinkedTransferQueue q = populatedQueue(SIZE);
737	<	try {
738	<	q.drainTo(null);
739	<	shouldThrow();
740	<	} catch (NullPointerException success) {}
741	<	}
742	<
743	<	/**
744	<	* drainTo(this) throws IllegalArgumentException
745	<	*/
746	<	public void testDrainToSelf() {
747	<	LinkedTransferQueue q = populatedQueue(SIZE);
748	<	try {
749	<	q.drainTo(q);
750	<	shouldThrow();
751	<	} catch (IllegalArgumentException success) {}
657	>	assertTrue(y.isEmpty());
658		}
659
660		/**
#	Line 758 | Line 664 | public class LinkedTransferQueueTest ext
664		LinkedTransferQueue q = populatedQueue(SIZE);
665		ArrayList l = new ArrayList();
666		q.drainTo(l);
667	<	assertEquals(q.size(), 0);
668	<	assertEquals(l.size(), SIZE);
667	>	assertEquals(0, q.size());
668	>	assertEquals(SIZE, l.size());
669		for (int i = 0; i < SIZE; ++i) {
670	<	assertEquals(l.get(i), i);
670	>	assertEquals(i, l.get(i));
671		}
672		q.add(zero);
673		q.add(one);
#	Line 770 | Line 676 | public class LinkedTransferQueueTest ext
676		assertTrue(q.contains(one));
677		l.clear();
678		q.drainTo(l);
679	<	assertEquals(q.size(), 0);
680	<	assertEquals(l.size(), 2);
679	>	assertEquals(0, q.size());
680	>	assertEquals(2, l.size());
681		for (int i = 0; i < 2; ++i) {
682	<	assertEquals(l.get(i), i);
682	>	assertEquals(i, l.get(i));
683		}
684		}
685
#	Line 789 | Line 695 | public class LinkedTransferQueueTest ext
695		ArrayList l = new ArrayList();
696		q.drainTo(l);
697		assertTrue(l.size() >= SIZE);
698	<	for (int i = 0; i < SIZE; ++i) {
699	<	assertEquals(l.get(i), i);
700	<	}
795	<	awaitTermination(t, MEDIUM_DELAY_MS);
698	>	for (int i = 0; i < SIZE; ++i)
699	>	assertEquals(i, l.get(i));
700	>	awaitTermination(t);
701		assertTrue(q.size() + l.size() >= SIZE);
702		}
703
704		/**
800	–	* drainTo(null, n) throws NullPointerException
801	–	*/
802	–	public void testDrainToNullN() {
803	–	LinkedTransferQueue q = populatedQueue(SIZE);
804	–	try {
805	–	q.drainTo(null, SIZE);
806	–	shouldThrow();
807	–	} catch (NullPointerException success) {}
808	–	}
809	–
810	–	/**
811	–	* drainTo(this, n) throws IllegalArgumentException
812	–	*/
813	–	public void testDrainToSelfN() {
814	–	LinkedTransferQueue q = populatedQueue(SIZE);
815	–	try {
816	–	q.drainTo(q, SIZE);
817	–	shouldThrow();
818	–	} catch (IllegalArgumentException success) {}
819	–	}
820	–
821	–	/**
705		* drainTo(c, n) empties first min(n, size) elements of queue into c
706		*/
707		public void testDrainToN() {
#	Line 830 | Line 713 | public class LinkedTransferQueueTest ext
713		ArrayList l = new ArrayList();
714		q.drainTo(l, i);
715		int k = (i < SIZE) ? i : SIZE;
716	<	assertEquals(l.size(), k);
717	<	assertEquals(q.size(), SIZE - k);
718	<	for (int j = 0; j < k; ++j) {
719	<	assertEquals(l.get(j), j);
720	<	}
838	<	while (q.poll() != null)
839	<	;
716	>	assertEquals(k, l.size());
717	>	assertEquals(SIZE - k, q.size());
718	>	for (int j = 0; j < k; ++j)
719	>	assertEquals(j, l.get(j));
720	>	do {} while (q.poll() != null);
721		}
722		}
723
#	Line 846 | Line 727 | public class LinkedTransferQueueTest ext
727		*/
728		public void testWaitingConsumer() throws InterruptedException {
729		final LinkedTransferQueue q = new LinkedTransferQueue();
730	<	assertEquals(q.getWaitingConsumerCount(), 0);
730	>	assertEquals(0, q.getWaitingConsumerCount());
731		assertFalse(q.hasWaitingConsumer());
732		final CountDownLatch threadStarted = new CountDownLatch(1);
733
734		Thread t = newStartedThread(new CheckedRunnable() {
735		public void realRun() throws InterruptedException {
736		threadStarted.countDown();
737	+	long startTime = System.nanoTime();
738		assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
739	<	assertEquals(q.getWaitingConsumerCount(), 0);
739	>	assertEquals(0, q.getWaitingConsumerCount());
740		assertFalse(q.hasWaitingConsumer());
741	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
742		}});
743
744		threadStarted.await();
745	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
746	<	assertEquals(q.getWaitingConsumerCount(), 1);
747	<	assertTrue(q.hasWaitingConsumer());
745	>	Callable<Boolean> oneConsumer
746	>	= new Callable<Boolean>() { public Boolean call() {
747	>	return q.hasWaitingConsumer()
748	>	&& q.getWaitingConsumerCount() == 1; }};
749	>	waitForThreadToEnterWaitState(t, oneConsumer);
750
751		assertTrue(q.offer(one));
752	<	assertEquals(q.getWaitingConsumerCount(), 0);
752	>	assertEquals(0, q.getWaitingConsumerCount());
753		assertFalse(q.hasWaitingConsumer());
754
755	<	awaitTermination(t, MEDIUM_DELAY_MS);
755	>	awaitTermination(t);
756		}
757
758		/**
#	Line 883 | Line 768 | public class LinkedTransferQueueTest ext
768
769		/**
770		* transfer waits until a poll occurs. The transfered element
771	<	* is returned by this associated poll.
771	>	* is returned by the associated poll.
772		*/
773		public void testTransfer2() throws InterruptedException {
774	<	final LinkedTransferQueue<Integer> q
890	<	= new LinkedTransferQueue<Integer>();
774	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
775		final CountDownLatch threadStarted = new CountDownLatch(1);
776
777		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 898 | Line 782 | public class LinkedTransferQueueTest ext
782		}});
783
784		threadStarted.await();
785	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
786	<	assertEquals(1, q.size());
785	>	Callable<Boolean> oneElement
786	>	= new Callable<Boolean>() { public Boolean call() {
787	>	return !q.isEmpty() && q.size() == 1; }};
788	>	waitForThreadToEnterWaitState(t, oneElement);
789	>
790		assertSame(five, q.poll());
791		checkEmpty(q);
792	<	awaitTermination(t, MEDIUM_DELAY_MS);
792	>	awaitTermination(t);
793		}
794
795		/**
796		* transfer waits until a poll occurs, and then transfers in fifo order
797		*/
798		public void testTransfer3() throws InterruptedException {
799	<	final LinkedTransferQueue<Integer> q
913	<	= new LinkedTransferQueue<Integer>();
799	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
800
801		Thread first = newStartedThread(new CheckedRunnable() {
802		public void realRun() throws InterruptedException {
803		q.transfer(four);
804	<	assertTrue(!q.contains(four));
804	>	assertFalse(q.contains(four));
805		assertEquals(1, q.size());
806		}});
807
#	Line 958 | Line 844 | public class LinkedTransferQueueTest ext
844		assertEquals(1, q.size());
845		assertTrue(q.offer(three));
846		assertSame(four, q.poll());
847	<	awaitTermination(t, MEDIUM_DELAY_MS);
847	>	awaitTermination(t);
848		}
849
850		/**
851		* transfer waits until a take occurs. The transfered element
852	<	* is returned by this associated take.
852	>	* is returned by the associated take.
853		*/
854		public void testTransfer5() throws InterruptedException {
855	<	final LinkedTransferQueue<Integer> q
970	<	= new LinkedTransferQueue<Integer>();
855	>	final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
856
857		Thread t = newStartedThread(new CheckedRunnable() {
858		public void realRun() throws InterruptedException {
#	Line 981 | Line 866 | public class LinkedTransferQueueTest ext
866		assertEquals(1, q.size());
867		assertSame(four, q.take());
868		checkEmpty(q);
869	<	awaitTermination(t, MEDIUM_DELAY_MS);
869	>	awaitTermination(t);
870		}
871
872		/**
873		* tryTransfer(null) throws NullPointerException
874		*/
875		public void testTryTransfer1() {
876	+	final LinkedTransferQueue q = new LinkedTransferQueue();
877		try {
992	–	final LinkedTransferQueue q = new LinkedTransferQueue();
878		q.tryTransfer(null);
879		shouldThrow();
880		} catch (NullPointerException success) {}
#	Line 1023 | Line 908 | public class LinkedTransferQueueTest ext
908		assertTrue(q.tryTransfer(hotPotato));
909		}});
910
911	<	assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
911	>	long startTime = System.nanoTime();
912	>	assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
913	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
914		checkEmpty(q);
915	<	awaitTermination(t, MEDIUM_DELAY_MS);
915	>	awaitTermination(t);
916		}
917
918		/**
#	Line 1047 | Line 934 | public class LinkedTransferQueueTest ext
934
935		assertSame(q.take(), hotPotato);
936		checkEmpty(q);
937	<	awaitTermination(t, MEDIUM_DELAY_MS);
937	>	awaitTermination(t);
938		}
939
940		/**
941	<	* tryTransfer waits the amount given, and throws
1055	<	* InterruptedException when interrupted.
941	>	* tryTransfer blocks interruptibly if no takers
942		*/
943		public void testTryTransfer5() throws InterruptedException {
944		final LinkedTransferQueue q = new LinkedTransferQueue();
945	<	final CountDownLatch threadStarted = new CountDownLatch(1);
945	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
946		assertTrue(q.isEmpty());
947
948		Thread t = newStartedThread(new CheckedRunnable() {
949		public void realRun() throws InterruptedException {
950	<	long t0 = System.nanoTime();
951	<	threadStarted.countDown();
950	>	long startTime = System.nanoTime();
951	>	Thread.currentThread().interrupt();
952	>	try {
953	>	q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
954	>	shouldThrow();
955	>	} catch (InterruptedException success) {}
956	>	assertFalse(Thread.interrupted());
957	>
958	>	pleaseInterrupt.countDown();
959		try {
960		q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
961		shouldThrow();
962		} catch (InterruptedException success) {}
963	<	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
964	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
963	>	assertFalse(Thread.interrupted());
964	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
965		}});
966
967	<	threadStarted.await();
968	<	while (q.isEmpty())
1076	<	Thread.yield();
1077	<	Thread.sleep(SHORT_DELAY_MS);
967	>	await(pleaseInterrupt);
968	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
969		t.interrupt();
970	<	awaitTermination(t, MEDIUM_DELAY_MS);
970	>	awaitTermination(t);
971		checkEmpty(q);
972		}
973
#	Line 1088 | Line 979 | public class LinkedTransferQueueTest ext
979
980		Thread t = newStartedThread(new CheckedRunnable() {
981		public void realRun() throws InterruptedException {
982	<	long t0 = System.nanoTime();
982	>	long startTime = System.nanoTime();
983		assertFalse(q.tryTransfer(new Object(),
984	<	SHORT_DELAY_MS, MILLISECONDS));
985	<	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
984	>	timeoutMillis(), MILLISECONDS));
985	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
986		checkEmpty(q);
987		}});
988
989	<	awaitTermination(t, MEDIUM_DELAY_MS);
989	>	awaitTermination(t);
990		checkEmpty(q);
991		}
992
#	Line 1109 | Line 1000 | public class LinkedTransferQueueTest ext
1000
1001		Thread t = newStartedThread(new CheckedRunnable() {
1002		public void realRun() throws InterruptedException {
1003	<	assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1003	>	long startTime = System.nanoTime();
1004	>	assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1005	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1006		checkEmpty(q);
1007		}});
1008
#	Line 1119 | Line 1012 | public class LinkedTransferQueueTest ext
1012		assertSame(four, q.poll());
1013		assertSame(five, q.poll());
1014		checkEmpty(q);
1015	<	awaitTermination(t, MEDIUM_DELAY_MS);
1015	>	awaitTermination(t);
1016		}
1017
1018		/**
#	Line 1130 | Line 1023 | public class LinkedTransferQueueTest ext
1023		final LinkedTransferQueue q = new LinkedTransferQueue();
1024		assertTrue(q.offer(four));
1025		assertEquals(1, q.size());
1026	<	long t0 = System.nanoTime();
1027	<	assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1028	<	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1026	>	long startTime = System.nanoTime();
1027	>	assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1028	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1029		assertEquals(1, q.size());
1030		assertSame(four, q.poll());
1031		assertNull(q.poll());
#	Line 1140 | Line 1033 | public class LinkedTransferQueueTest ext
1033		}
1034
1035		private LinkedTransferQueue<Integer> populatedQueue(int n) {
1036	<	LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1036	>	LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1037		checkEmpty(q);
1038		for (int i = 0; i < n; i++) {
1039		assertEquals(i, q.size());
#	Line 1150 | Line 1043 | public class LinkedTransferQueueTest ext
1043		assertFalse(q.isEmpty());
1044		return q;
1045		}
1046	+
1047	+	/**
1048	+	* remove(null), contains(null) always return false
1049	+	*/
1050	+	public void testNeverContainsNull() {
1051	+	Collection<?>[] qs = {
1052	+	new LinkedTransferQueue<Object>(),
1053	+	populatedQueue(2),
1054	+	};
1055	+
1056	+	for (Collection<?> q : qs) {
1057	+	assertFalse(q.contains(null));
1058	+	assertFalse(q.remove(null));
1059	+	}
1060	+	}
1061		}

Diff Legend

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