ViewVC Help

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

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

Comparing jsr166/src/test/tck/LinkedBlockingDequeTest.java (file contents):
Revision 1.48 by jsr166, Mon Jul 16 13:17:43 2012 UTC vs.
Revision 1.76 by jsr166, Sun May 14 00:48:20 2017 UTC

#	Line 4 | Line 4
4		* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7	<	import junit.framework.*;
8	<	import java.util.Arrays;
7	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
8	>
9		import java.util.ArrayList;
10	+	import java.util.Arrays;
11		import java.util.Collection;
12	+	import java.util.Deque;
13		import java.util.Iterator;
14		import java.util.NoSuchElementException;
15		import java.util.Queue;
#	Line 17 | Line 19 | import java.util.concurrent.CountDownLat
19		import java.util.concurrent.Executors;
20		import java.util.concurrent.ExecutorService;
21		import java.util.concurrent.LinkedBlockingDeque;
22	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
22	>
23	>	import junit.framework.Test;
24
25		public class LinkedBlockingDequeTest extends JSR166TestCase {
26
#	Line 34 | Line 37 | public class LinkedBlockingDequeTest ext
37		}
38
39		public static void main(String[] args) {
40	<	junit.textui.TestRunner.run(suite());
40	>	main(suite(), args);
41		}
42
43		public static Test suite() {
44	+	class Implementation implements CollectionImplementation {
45	+	public Class<?> klazz() { return LinkedBlockingDeque.class; }
46	+	public Collection emptyCollection() { return new LinkedBlockingDeque(); }
47	+	public Object makeElement(int i) { return i; }
48	+	public boolean isConcurrent() { return true; }
49	+	public boolean permitsNulls() { return false; }
50	+	}
51		return newTestSuite(LinkedBlockingDequeTest.class,
52		new Unbounded().testSuite(),
53	<	new Bounded().testSuite());
53	>	new Bounded().testSuite(),
54	>	CollectionTest.testSuite(new Implementation()));
55		}
56
57		/**
58		* Returns a new deque of given size containing consecutive
59	<	* Integers 0 ... n.
59	>	* Integers 0 ... n - 1.
60		*/
61	<	private LinkedBlockingDeque<Integer> populatedDeque(int n) {
61	>	private static LinkedBlockingDeque<Integer> populatedDeque(int n) {
62		LinkedBlockingDeque<Integer> q =
63		new LinkedBlockingDeque<Integer>(n);
64		assertTrue(q.isEmpty());
#	Line 56 | Line 67 | public class LinkedBlockingDequeTest ext
67		assertFalse(q.isEmpty());
68		assertEquals(0, q.remainingCapacity());
69		assertEquals(n, q.size());
70	+	assertEquals((Integer) 0, q.peekFirst());
71	+	assertEquals((Integer) (n - 1), q.peekLast());
72		return q;
73		}
74
#	Line 79 | Line 92 | public class LinkedBlockingDequeTest ext
92		public void testSize() {
93		LinkedBlockingDeque q = populatedDeque(SIZE);
94		for (int i = 0; i < SIZE; ++i) {
95	<	assertEquals(SIZE-i, q.size());
95	>	assertEquals(SIZE - i, q.size());
96		q.removeFirst();
97		}
98		for (int i = 0; i < SIZE; ++i) {
#	Line 144 | Line 157 | public class LinkedBlockingDequeTest ext
157		*/
158		public void testPollLast() {
159		LinkedBlockingDeque q = populatedDeque(SIZE);
160	<	for (int i = SIZE-1; i >= 0; --i) {
160	>	for (int i = SIZE - 1; i >= 0; --i) {
161		assertEquals(i, q.pollLast());
162		}
163		assertNull(q.pollLast());
#	Line 183 | Line 196 | public class LinkedBlockingDequeTest ext
196		*/
197		public void testPeekLast() {
198		LinkedBlockingDeque q = populatedDeque(SIZE);
199	<	for (int i = SIZE-1; i >= 0; --i) {
199	>	for (int i = SIZE - 1; i >= 0; --i) {
200		assertEquals(i, q.peekLast());
201		assertEquals(i, q.pollLast());
202		assertTrue(q.peekLast() == null ||
#	Line 213 | Line 226 | public class LinkedBlockingDequeTest ext
226		*/
227		public void testLastElement() {
228		LinkedBlockingDeque q = populatedDeque(SIZE);
229	<	for (int i = SIZE-1; i >= 0; --i) {
229	>	for (int i = SIZE - 1; i >= 0; --i) {
230		assertEquals(i, q.getLast());
231		assertEquals(i, q.pollLast());
232		}
#	Line 273 | Line 286 | public class LinkedBlockingDequeTest ext
286		*/
287		public void testRemoveFirstOccurrence() {
288		LinkedBlockingDeque q = populatedDeque(SIZE);
289	<	for (int i = 1; i < SIZE; i+=2) {
289	>	for (int i = 1; i < SIZE; i += 2) {
290		assertTrue(q.removeFirstOccurrence(new Integer(i)));
291		}
292	<	for (int i = 0; i < SIZE; i+=2) {
292	>	for (int i = 0; i < SIZE; i += 2) {
293		assertTrue(q.removeFirstOccurrence(new Integer(i)));
294	<	assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
294	>	assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
295		}
296		assertTrue(q.isEmpty());
297		}
#	Line 288 | Line 301 | public class LinkedBlockingDequeTest ext
301		*/
302		public void testRemoveLastOccurrence() {
303		LinkedBlockingDeque q = populatedDeque(SIZE);
304	<	for (int i = 1; i < SIZE; i+=2) {
304	>	for (int i = 1; i < SIZE; i += 2) {
305		assertTrue(q.removeLastOccurrence(new Integer(i)));
306		}
307	<	for (int i = 0; i < SIZE; i+=2) {
307	>	for (int i = 0; i < SIZE; i += 2) {
308		assertTrue(q.removeLastOccurrence(new Integer(i)));
309	<	assertFalse(q.removeLastOccurrence(new Integer(i+1)));
309	>	assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
310		}
311		assertTrue(q.isEmpty());
312		}
#	Line 364 | Line 377 | public class LinkedBlockingDequeTest ext
377		*/
378		public void testConstructor5() {
379		Integer[] ints = new Integer[SIZE];
380	<	for (int i = 0; i < SIZE-1; ++i)
380	>	for (int i = 0; i < SIZE - 1; ++i)
381		ints[i] = i;
382		Collection<Integer> elements = Arrays.asList(ints);
383		try {
#	Line 404 | Line 417 | public class LinkedBlockingDequeTest ext
417		* remainingCapacity decreases on add, increases on remove
418		*/
419		public void testRemainingCapacity() {
420	<	LinkedBlockingDeque q = populatedDeque(SIZE);
420	>	BlockingQueue q = populatedDeque(SIZE);
421		for (int i = 0; i < SIZE; ++i) {
422		assertEquals(i, q.remainingCapacity());
423	<	assertEquals(SIZE-i, q.size());
424	<	q.remove();
423	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
424	>	assertEquals(i, q.remove());
425		}
426		for (int i = 0; i < SIZE; ++i) {
427	<	assertEquals(SIZE-i, q.remainingCapacity());
428	<	assertEquals(i, q.size());
429	<	q.add(new Integer(i));
427	>	assertEquals(SIZE - i, q.remainingCapacity());
428	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
429	>	assertTrue(q.add(i));
430		}
431		}
432
#	Line 421 | Line 434 | public class LinkedBlockingDequeTest ext
434		* push(null) throws NPE
435		*/
436		public void testPushNull() {
437	+	LinkedBlockingDeque q = new LinkedBlockingDeque(1);
438		try {
425	–	LinkedBlockingDeque q = new LinkedBlockingDeque(1);
439		q.push(null);
440		shouldThrow();
441		} catch (NullPointerException success) {}
#	Line 432 | Line 445 | public class LinkedBlockingDequeTest ext
445		* push succeeds if not full; throws ISE if full
446		*/
447		public void testPush() {
448	+	LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
449	+	for (int i = 0; i < SIZE; ++i) {
450	+	Integer x = new Integer(i);
451	+	q.push(x);
452	+	assertEquals(x, q.peek());
453	+	}
454	+	assertEquals(0, q.remainingCapacity());
455		try {
436	–	LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
437	–	for (int i = 0; i < SIZE; ++i) {
438	–	Integer I = new Integer(i);
439	–	q.push(I);
440	–	assertEquals(I, q.peek());
441	–	}
442	–	assertEquals(0, q.remainingCapacity());
456		q.push(new Integer(SIZE));
457		shouldThrow();
458		} catch (IllegalStateException success) {}
#	Line 510 | Line 523 | public class LinkedBlockingDequeTest ext
523		public void testAddAll3() {
524		LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
525		Integer[] ints = new Integer[SIZE];
526	<	for (int i = 0; i < SIZE-1; ++i)
526	>	for (int i = 0; i < SIZE - 1; ++i)
527		ints[i] = new Integer(i);
528		Collection<Integer> elements = Arrays.asList(ints);
529		try {
#	Line 555 | Line 568 | public class LinkedBlockingDequeTest ext
568		public void testPut() throws InterruptedException {
569		LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
570		for (int i = 0; i < SIZE; ++i) {
571	<	Integer I = new Integer(i);
572	<	q.put(I);
573	<	assertTrue(q.contains(I));
571	>	Integer x = new Integer(i);
572	>	q.put(x);
573	>	assertTrue(q.contains(x));
574		}
575		assertEquals(0, q.remainingCapacity());
576		}
#	Line 591 | Line 604 | public class LinkedBlockingDequeTest ext
604		}});
605
606		await(pleaseInterrupt);
607	<	assertThreadStaysAlive(t);
607	>	assertThreadBlocks(t, Thread.State.WAITING);
608		t.interrupt();
609		awaitTermination(t);
610		assertEquals(SIZE, q.size());
#	Line 626 | Line 639 | public class LinkedBlockingDequeTest ext
639		assertEquals(0, q.take());
640
641		await(pleaseInterrupt);
642	<	assertThreadStaysAlive(t);
642	>	assertThreadBlocks(t, Thread.State.WAITING);
643		t.interrupt();
644		awaitTermination(t);
645		assertEquals(0, q.remainingCapacity());
#	Line 653 | Line 666 | public class LinkedBlockingDequeTest ext
666		}});
667
668		await(pleaseInterrupt);
669	<	assertThreadStaysAlive(t);
669	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
670		t.interrupt();
671		awaitTermination(t);
672		}
#	Line 676 | Line 689 | public class LinkedBlockingDequeTest ext
689		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
690		Thread t = newStartedThread(new CheckedRunnable() {
691		public void realRun() throws InterruptedException {
692	<	for (int i = 0; i < SIZE; ++i) {
680	<	assertEquals(i, q.take());
681	<	}
692	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
693
694		Thread.currentThread().interrupt();
695		try {
#	Line 696 | Line 707 | public class LinkedBlockingDequeTest ext
707		}});
708
709		await(pleaseInterrupt);
710	<	assertThreadStaysAlive(t);
710	>	assertThreadBlocks(t, Thread.State.WAITING);
711		t.interrupt();
712		awaitTermination(t);
713		}
#	Line 745 | Line 756 | public class LinkedBlockingDequeTest ext
756		*/
757		public void testInterruptedTimedPoll() throws InterruptedException {
758		final BlockingQueue<Integer> q = populatedDeque(SIZE);
759	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
759	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
760		Thread t = newStartedThread(new CheckedRunnable() {
761		public void realRun() throws InterruptedException {
762	+	long startTime = System.nanoTime();
763		for (int i = 0; i < SIZE; ++i) {
752	–	long t0 = System.nanoTime();
764		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
754	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
765		}
766	<	long t0 = System.nanoTime();
767	<	aboutToWait.countDown();
766	>
767	>	pleaseInterrupt.countDown();
768		try {
769	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
769	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
770		shouldThrow();
771	<	} catch (InterruptedException success) {
772	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
773	<	}
771	>	} catch (InterruptedException success) {}
772	>	assertFalse(Thread.interrupted());
773	>
774	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
775		}});
776
777	<	aboutToWait.await();
778	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
777	>	await(pleaseInterrupt);
778	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
779		t.interrupt();
780	<	awaitTermination(t, MEDIUM_DELAY_MS);
780	>	awaitTermination(t);
781		checkEmpty(q);
782		}
783
#	Line 787 | Line 798 | public class LinkedBlockingDequeTest ext
798		public void testPutFirst() throws InterruptedException {
799		LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
800		for (int i = 0; i < SIZE; ++i) {
801	<	Integer I = new Integer(i);
802	<	q.putFirst(I);
803	<	assertTrue(q.contains(I));
801	>	Integer x = new Integer(i);
802	>	q.putFirst(x);
803	>	assertTrue(q.contains(x));
804		}
805		assertEquals(0, q.remainingCapacity());
806		}
#	Line 823 | Line 834 | public class LinkedBlockingDequeTest ext
834		}});
835
836		await(pleaseInterrupt);
837	<	assertThreadStaysAlive(t);
837	>	assertThreadBlocks(t, Thread.State.WAITING);
838		t.interrupt();
839		awaitTermination(t);
840		assertEquals(SIZE, q.size());
#	Line 858 | Line 869 | public class LinkedBlockingDequeTest ext
869		assertEquals(capacity - 1, q.take());
870
871		await(pleaseInterrupt);
872	<	assertThreadStaysAlive(t);
872	>	assertThreadBlocks(t, Thread.State.WAITING);
873		t.interrupt();
874		awaitTermination(t);
875		assertEquals(0, q.remainingCapacity());
#	Line 885 | Line 896 | public class LinkedBlockingDequeTest ext
896		}});
897
898		await(pleaseInterrupt);
899	<	assertThreadStaysAlive(t);
899	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
900		t.interrupt();
901		awaitTermination(t);
902		}
#	Line 917 | Line 928 | public class LinkedBlockingDequeTest ext
928		}});
929
930		await(threadStarted);
931	<	assertThreadStaysAlive(t);
931	>	assertThreadBlocks(t, Thread.State.WAITING);
932		t.interrupt();
933		awaitTermination(t);
934		}
#	Line 958 | Line 969 | public class LinkedBlockingDequeTest ext
969		}});
970
971		await(threadStarted);
972	<	assertThreadStaysAlive(t);
972	>	assertThreadBlocks(t, Thread.State.WAITING);
973		t.interrupt();
974		awaitTermination(t);
975		}
#	Line 990 | Line 1001 | public class LinkedBlockingDequeTest ext
1001		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1002		Thread t = newStartedThread(new CheckedRunnable() {
1003		public void realRun() throws InterruptedException {
1004	<	for (int i = 0; i < SIZE; ++i) {
994	<	assertEquals(i, q.takeFirst());
995	<	}
1004	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1005
1006		Thread.currentThread().interrupt();
1007		try {
#	Line 1010 | Line 1019 | public class LinkedBlockingDequeTest ext
1019		}});
1020
1021		await(pleaseInterrupt);
1022	<	assertThreadStaysAlive(t);
1022	>	assertThreadBlocks(t, Thread.State.WAITING);
1023		t.interrupt();
1024		awaitTermination(t);
1025		}
#	Line 1047 | Line 1056 | public class LinkedBlockingDequeTest ext
1056		* returning timeout status
1057		*/
1058		public void testInterruptedTimedPollFirst() throws InterruptedException {
1059	+	final LinkedBlockingDeque q = populatedDeque(SIZE);
1060		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1061		Thread t = newStartedThread(new CheckedRunnable() {
1062		public void realRun() throws InterruptedException {
1063	<	LinkedBlockingDeque q = populatedDeque(SIZE);
1063	>	long startTime = System.nanoTime();
1064		for (int i = 0; i < SIZE; ++i) {
1065		assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1066		}
1067
1068		Thread.currentThread().interrupt();
1069		try {
1070	<	q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1070	>	q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1071		shouldThrow();
1072		} catch (InterruptedException success) {}
1073		assertFalse(Thread.interrupted());
#	Line 1068 | Line 1078 | public class LinkedBlockingDequeTest ext
1078		shouldThrow();
1079		} catch (InterruptedException success) {}
1080		assertFalse(Thread.interrupted());
1081	+
1082	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1083		}});
1084
1085		await(pleaseInterrupt);
1086	<	assertThreadStaysAlive(t);
1086	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1087		t.interrupt();
1088		awaitTermination(t);
1089		}
#	Line 1112 | Line 1124 | public class LinkedBlockingDequeTest ext
1124		assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1125		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1126		barrier.await();
1127	<	assertThreadStaysAlive(t);
1127	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1128		t.interrupt();
1129		awaitTermination(t);
1130		}
#	Line 1134 | Line 1146 | public class LinkedBlockingDequeTest ext
1146		public void testPutLast() throws InterruptedException {
1147		LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
1148		for (int i = 0; i < SIZE; ++i) {
1149	<	Integer I = new Integer(i);
1150	<	q.putLast(I);
1151	<	assertTrue(q.contains(I));
1149	>	Integer x = new Integer(i);
1150	>	q.putLast(x);
1151	>	assertTrue(q.contains(x));
1152		}
1153		assertEquals(0, q.remainingCapacity());
1154		}
#	Line 1170 | Line 1182 | public class LinkedBlockingDequeTest ext
1182		}});
1183
1184		await(pleaseInterrupt);
1185	<	assertThreadStaysAlive(t);
1185	>	assertThreadBlocks(t, Thread.State.WAITING);
1186		t.interrupt();
1187		awaitTermination(t);
1188		assertEquals(SIZE, q.size());
#	Line 1205 | Line 1217 | public class LinkedBlockingDequeTest ext
1217		assertEquals(0, q.take());
1218
1219		await(pleaseInterrupt);
1220	<	assertThreadStaysAlive(t);
1220	>	assertThreadBlocks(t, Thread.State.WAITING);
1221		t.interrupt();
1222		awaitTermination(t);
1223		assertEquals(0, q.remainingCapacity());
#	Line 1232 | Line 1244 | public class LinkedBlockingDequeTest ext
1244		}});
1245
1246		await(pleaseInterrupt);
1247	<	assertThreadStaysAlive(t);
1247	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1248		t.interrupt();
1249		awaitTermination(t);
1250		}
#	Line 1243 | Line 1255 | public class LinkedBlockingDequeTest ext
1255		public void testTakeLast() throws InterruptedException {
1256		LinkedBlockingDeque q = populatedDeque(SIZE);
1257		for (int i = 0; i < SIZE; ++i) {
1258	<	assertEquals(SIZE-i-1, q.takeLast());
1258	>	assertEquals(SIZE - i - 1, q.takeLast());
1259		}
1260		}
1261
#	Line 1255 | Line 1267 | public class LinkedBlockingDequeTest ext
1267		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1268		Thread t = newStartedThread(new CheckedRunnable() {
1269		public void realRun() throws InterruptedException {
1270	<	for (int i = 0; i < SIZE; ++i) {
1271	<	assertEquals(SIZE-i-1, q.takeLast());
1260	<	}
1270	>	for (int i = 0; i < SIZE; i++)
1271	>	assertEquals(SIZE - i - 1, q.takeLast());
1272
1273		Thread.currentThread().interrupt();
1274		try {
#	Line 1275 | Line 1286 | public class LinkedBlockingDequeTest ext
1286		}});
1287
1288		await(pleaseInterrupt);
1289	<	assertThreadStaysAlive(t);
1289	>	assertThreadBlocks(t, Thread.State.WAITING);
1290		t.interrupt();
1291		awaitTermination(t);
1292		}
#	Line 1286 | Line 1297 | public class LinkedBlockingDequeTest ext
1297		public void testTimedPollLast0() throws InterruptedException {
1298		LinkedBlockingDeque q = populatedDeque(SIZE);
1299		for (int i = 0; i < SIZE; ++i) {
1300	<	assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1300	>	assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1301		}
1302		assertNull(q.pollLast(0, MILLISECONDS));
1303		}
#	Line 1298 | Line 1309 | public class LinkedBlockingDequeTest ext
1309		LinkedBlockingDeque q = populatedDeque(SIZE);
1310		for (int i = 0; i < SIZE; ++i) {
1311		long startTime = System.nanoTime();
1312	<	assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1312	>	assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1313		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1314		}
1315		long startTime = System.nanoTime();
#	Line 1312 | Line 1323 | public class LinkedBlockingDequeTest ext
1323		* returning timeout status
1324		*/
1325		public void testInterruptedTimedPollLast() throws InterruptedException {
1326	+	final LinkedBlockingDeque q = populatedDeque(SIZE);
1327		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1328		Thread t = newStartedThread(new CheckedRunnable() {
1329		public void realRun() throws InterruptedException {
1330	<	LinkedBlockingDeque q = populatedDeque(SIZE);
1330	>	long startTime = System.nanoTime();
1331		for (int i = 0; i < SIZE; ++i) {
1332	<	assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1332	>	assertEquals(SIZE - i - 1,
1333	>	q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1334		}
1335
1336		Thread.currentThread().interrupt();
#	Line 1333 | Line 1346 | public class LinkedBlockingDequeTest ext
1346		shouldThrow();
1347		} catch (InterruptedException success) {}
1348		assertFalse(Thread.interrupted());
1349	+
1350	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1351		}});
1352
1353		await(pleaseInterrupt);
1354	<	assertThreadStaysAlive(t);
1354	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1355		t.interrupt();
1356		awaitTermination(t);
1357	+	checkEmpty(q);
1358		}
1359
1360		/**
#	Line 1371 | Line 1387 | public class LinkedBlockingDequeTest ext
1387		shouldThrow();
1388		} catch (InterruptedException success) {}
1389		assertFalse(Thread.interrupted());
1390	+
1391	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1392		}});
1393
1394		barrier.await();
#	Line 1379 | Line 1397 | public class LinkedBlockingDequeTest ext
1397		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1398
1399		barrier.await();
1400	<	assertThreadStaysAlive(t);
1400	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1401		t.interrupt();
1402		awaitTermination(t);
1403		}
#	Line 1455 | Line 1473 | public class LinkedBlockingDequeTest ext
1473		assertTrue(changed);
1474
1475		assertTrue(q.containsAll(p));
1476	<	assertEquals(SIZE-i, q.size());
1476	>	assertEquals(SIZE - i, q.size());
1477		p.remove();
1478		}
1479		}
#	Line 1468 | Line 1486 | public class LinkedBlockingDequeTest ext
1486		LinkedBlockingDeque q = populatedDeque(SIZE);
1487		LinkedBlockingDeque p = populatedDeque(i);
1488		assertTrue(q.removeAll(p));
1489	<	assertEquals(SIZE-i, q.size());
1489	>	assertEquals(SIZE - i, q.size());
1490		for (int j = 0; j < i; ++j) {
1491	<	Integer I = (Integer)(p.remove());
1492	<	assertFalse(q.contains(I));
1491	>	Integer x = (Integer)(p.remove());
1492	>	assertFalse(q.contains(x));
1493		}
1494		}
1495		}
#	Line 1515 | Line 1533 | public class LinkedBlockingDequeTest ext
1533		public void testIterator() throws InterruptedException {
1534		LinkedBlockingDeque q = populatedDeque(SIZE);
1535		Iterator it = q.iterator();
1536	<	while (it.hasNext()) {
1536	>	int i;
1537	>	for (i = 0; it.hasNext(); i++)
1538	>	assertTrue(q.contains(it.next()));
1539	>	assertEquals(i, SIZE);
1540	>	assertIteratorExhausted(it);
1541	>
1542	>	it = q.iterator();
1543	>	for (i = 0; it.hasNext(); i++)
1544		assertEquals(it.next(), q.take());
1545	<	}
1545	>	assertEquals(i, SIZE);
1546	>	assertIteratorExhausted(it);
1547	>	}
1548	>
1549	>	/**
1550	>	* iterator of empty collection has no elements
1551	>	*/
1552	>	public void testEmptyIterator() {
1553	>	Deque c = new LinkedBlockingDeque();
1554	>	assertIteratorExhausted(c.iterator());
1555	>	assertIteratorExhausted(c.descendingIterator());
1556		}
1557
1558		/**
#	Line 1650 | Line 1685 | public class LinkedBlockingDequeTest ext
1685		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1686		q.add(one);
1687		q.add(two);
1653	–	ExecutorService executor = Executors.newFixedThreadPool(2);
1688		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1689	<	executor.execute(new CheckedRunnable() {
1690	<	public void realRun() throws InterruptedException {
1691	<	assertFalse(q.offer(three));
1692	<	threadsStarted.await();
1693	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1694	<	assertEquals(0, q.remainingCapacity());
1695	<	}});
1696	<
1697	<	executor.execute(new CheckedRunnable() {
1698	<	public void realRun() throws InterruptedException {
1699	<	threadsStarted.await();
1700	<	assertSame(one, q.take());
1701	<	}});
1702	<
1703	<	joinPool(executor);
1689	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
1690	>	try (PoolCleaner cleaner = cleaner(executor)) {
1691	>	executor.execute(new CheckedRunnable() {
1692	>	public void realRun() throws InterruptedException {
1693	>	assertFalse(q.offer(three));
1694	>	threadsStarted.await();
1695	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1696	>	assertEquals(0, q.remainingCapacity());
1697	>	}});
1698	>
1699	>	executor.execute(new CheckedRunnable() {
1700	>	public void realRun() throws InterruptedException {
1701	>	threadsStarted.await();
1702	>	assertSame(one, q.take());
1703	>	}});
1704	>	}
1705		}
1706
1707		/**
#	Line 1675 | Line 1710 | public class LinkedBlockingDequeTest ext
1710		public void testPollInExecutor() {
1711		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1712		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1713	<	ExecutorService executor = Executors.newFixedThreadPool(2);
1714	<	executor.execute(new CheckedRunnable() {
1715	<	public void realRun() throws InterruptedException {
1716	<	assertNull(q.poll());
1717	<	threadsStarted.await();
1718	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1719	<	checkEmpty(q);
1720	<	}});
1721	<
1722	<	executor.execute(new CheckedRunnable() {
1723	<	public void realRun() throws InterruptedException {
1724	<	threadsStarted.await();
1725	<	q.put(one);
1726	<	}});
1727	<
1728	<	joinPool(executor);
1713	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
1714	>	try (PoolCleaner cleaner = cleaner(executor)) {
1715	>	executor.execute(new CheckedRunnable() {
1716	>	public void realRun() throws InterruptedException {
1717	>	assertNull(q.poll());
1718	>	threadsStarted.await();
1719	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1720	>	checkEmpty(q);
1721	>	}});
1722	>
1723	>	executor.execute(new CheckedRunnable() {
1724	>	public void realRun() throws InterruptedException {
1725	>	threadsStarted.await();
1726	>	q.put(one);
1727	>	}});
1728	>	}
1729		}
1730
1731		/**
#	Line 1700 | Line 1735 | public class LinkedBlockingDequeTest ext
1735		Queue x = populatedDeque(SIZE);
1736		Queue y = serialClone(x);
1737
1738	<	assertTrue(x != y);
1738	>	assertNotSame(y, x);
1739		assertEquals(x.size(), y.size());
1740		assertEquals(x.toString(), y.toString());
1741		assertTrue(Arrays.equals(x.toArray(), y.toArray()));
#	Line 1742 | Line 1777 | public class LinkedBlockingDequeTest ext
1777		final LinkedBlockingDeque q = populatedDeque(SIZE);
1778		Thread t = new Thread(new CheckedRunnable() {
1779		public void realRun() throws InterruptedException {
1780	<	q.put(new Integer(SIZE+1));
1780	>	q.put(new Integer(SIZE + 1));
1781		}});
1782
1783		t.start();
#	Line 1767 | Line 1802 | public class LinkedBlockingDequeTest ext
1802		q.drainTo(l, i);
1803		int k = (i < SIZE) ? i : SIZE;
1804		assertEquals(k, l.size());
1805	<	assertEquals(SIZE-k, q.size());
1805	>	assertEquals(SIZE - k, q.size());
1806		for (int j = 0; j < k; ++j)
1807		assertEquals(l.get(j), new Integer(j));
1808	<	while (q.poll() != null) ;
1808	>	do {} while (q.poll() != null);
1809	>	}
1810	>	}
1811	>
1812	>	/**
1813	>	* remove(null), contains(null) always return false
1814	>	*/
1815	>	public void testNeverContainsNull() {
1816	>	Deque<?>[] qs = {
1817	>	new LinkedBlockingDeque<Object>(),
1818	>	populatedDeque(2),
1819	>	};
1820	>
1821	>	for (Deque<?> q : qs) {
1822	>	assertFalse(q.contains(null));
1823	>	assertFalse(q.remove(null));
1824	>	assertFalse(q.removeFirstOccurrence(null));
1825	>	assertFalse(q.removeLastOccurrence(null));
1826		}
1827		}
1828

Diff Legend

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