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.57 by jsr166, Sat Apr 25 04:55:31 2015 UTC vs.
Revision 1.86 by jsr166, Thu Sep 5 21:11:13 2019 UTC

#	Line 41 | Line 41 | public class LinkedBlockingDequeTest ext
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 59 | 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 82 | 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 147 | 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 186 | 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 216 | 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 281 | Line 291 | public class LinkedBlockingDequeTest ext
291		}
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 296 | Line 306 | public class LinkedBlockingDequeTest ext
306		}
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 367 | 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 414 | Line 424 | public class LinkedBlockingDequeTest ext
424		assertEquals(i, q.remove());
425		}
426		for (int i = 0; i < SIZE; ++i) {
427	<	assertEquals(SIZE-i, q.remainingCapacity());
427	>	assertEquals(SIZE - i, q.remainingCapacity());
428		assertEquals(SIZE, q.size() + q.remainingCapacity());
429		assertTrue(q.add(i));
430		}
#	Line 424 | Line 434 | public class LinkedBlockingDequeTest ext
434		* push(null) throws NPE
435		*/
436		public void testPushNull() {
437	+	LinkedBlockingDeque q = new LinkedBlockingDeque(1);
438		try {
428	–	LinkedBlockingDeque q = new LinkedBlockingDeque(1);
439		q.push(null);
440		shouldThrow();
441		} catch (NullPointerException success) {}
442		}
443
444		/**
445	<	* push succeeds if not full; throws ISE if full
445	>	* push succeeds if not full; throws IllegalStateException 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 {
439	–	LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
440	–	for (int i = 0; i < SIZE; ++i) {
441	–	Integer x = new Integer(i);
442	–	q.push(x);
443	–	assertEquals(x, q.peek());
444	–	}
445	–	assertEquals(0, q.remainingCapacity());
456		q.push(new Integer(SIZE));
457		shouldThrow();
458		} catch (IllegalStateException success) {}
#	Line 482 | Line 492 | public class LinkedBlockingDequeTest ext
492		}
493
494		/**
495	<	* add succeeds if not full; throws ISE if full
495	>	* add succeeds if not full; throws IllegalStateException if full
496		*/
497		public void testAdd() {
498		LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
#	Line 496 | Line 506 | public class LinkedBlockingDequeTest ext
506		}
507
508		/**
509	<	* addAll(this) throws IAE
509	>	* addAll(this) throws IllegalArgumentException
510		*/
511		public void testAddAllSelf() {
512		LinkedBlockingDeque q = populatedDeque(SIZE);
#	Line 513 | 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 594 | Line 604 | public class LinkedBlockingDequeTest ext
604		}});
605
606		await(pleaseInterrupt);
607	<	assertThreadStaysAlive(t);
607	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
608		t.interrupt();
609		awaitTermination(t);
610		assertEquals(SIZE, q.size());
#	Line 616 | Line 626 | public class LinkedBlockingDequeTest ext
626		pleaseTake.countDown();
627		q.put(86);
628
629	+	Thread.currentThread().interrupt();
630	+	try {
631	+	q.put(99);
632	+	shouldThrow();
633	+	} catch (InterruptedException success) {}
634	+	assertFalse(Thread.interrupted());
635	+
636		pleaseInterrupt.countDown();
637		try {
638		q.put(99);
#	Line 629 | Line 646 | public class LinkedBlockingDequeTest ext
646		assertEquals(0, q.take());
647
648		await(pleaseInterrupt);
649	<	assertThreadStaysAlive(t);
649	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
650		t.interrupt();
651		awaitTermination(t);
652		assertEquals(0, q.remainingCapacity());
#	Line 638 | Line 655 | public class LinkedBlockingDequeTest ext
655		/**
656		* timed offer times out if full and elements not taken
657		*/
658	<	public void testTimedOffer() throws InterruptedException {
658	>	public void testTimedOffer() {
659		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
660		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
661		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 646 | Line 663 | public class LinkedBlockingDequeTest ext
663		q.put(new Object());
664		q.put(new Object());
665		long startTime = System.nanoTime();
666	+
667		assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
668		assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
669	+
670	+	Thread.currentThread().interrupt();
671	+	try {
672	+	q.offer(new Object(), randomTimeout(), randomTimeUnit());
673	+	shouldThrow();
674	+	} catch (InterruptedException success) {}
675	+	assertFalse(Thread.interrupted());
676	+
677		pleaseInterrupt.countDown();
678		try {
679	<	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
679	>	q.offer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
680		shouldThrow();
681		} catch (InterruptedException success) {}
682	+	assertFalse(Thread.interrupted());
683		}});
684
685		await(pleaseInterrupt);
686	<	assertThreadStaysAlive(t);
686	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
687		t.interrupt();
688		awaitTermination(t);
689		}
#	Line 679 | Line 706 | public class LinkedBlockingDequeTest ext
706		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
707		Thread t = newStartedThread(new CheckedRunnable() {
708		public void realRun() throws InterruptedException {
709	<	for (int i = 0; i < SIZE; ++i) {
683	<	assertEquals(i, q.take());
684	<	}
709	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
710
711		Thread.currentThread().interrupt();
712		try {
#	Line 699 | Line 724 | public class LinkedBlockingDequeTest ext
724		}});
725
726		await(pleaseInterrupt);
727	<	assertThreadStaysAlive(t);
727	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
728		t.interrupt();
729		awaitTermination(t);
730		}
#	Line 748 | Line 773 | public class LinkedBlockingDequeTest ext
773		*/
774		public void testInterruptedTimedPoll() throws InterruptedException {
775		final BlockingQueue<Integer> q = populatedDeque(SIZE);
776	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
776	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
777		Thread t = newStartedThread(new CheckedRunnable() {
778		public void realRun() throws InterruptedException {
779	<	for (int i = 0; i < SIZE; ++i) {
755	<	long t0 = System.nanoTime();
779	>	for (int i = 0; i < SIZE; i++)
780		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
781	<	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
782	<	}
783	<	long t0 = System.nanoTime();
784	<	aboutToWait.countDown();
781	>
782	>	Thread.currentThread().interrupt();
783	>	try {
784	>	q.poll(randomTimeout(), randomTimeUnit());
785	>	shouldThrow();
786	>	} catch (InterruptedException success) {}
787	>	assertFalse(Thread.interrupted());
788	>
789	>	pleaseInterrupt.countDown();
790		try {
791	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
791	>	q.poll(LONGER_DELAY_MS, MILLISECONDS);
792		shouldThrow();
793	<	} catch (InterruptedException success) {
794	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
766	<	}
793	>	} catch (InterruptedException success) {}
794	>	assertFalse(Thread.interrupted());
795		}});
796
797	<	aboutToWait.await();
798	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
797	>	await(pleaseInterrupt);
798	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
799		t.interrupt();
800	<	awaitTermination(t, MEDIUM_DELAY_MS);
800	>	awaitTermination(t);
801		checkEmpty(q);
802		}
803
#	Line 826 | Line 854 | public class LinkedBlockingDequeTest ext
854		}});
855
856		await(pleaseInterrupt);
857	<	assertThreadStaysAlive(t);
857	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
858		t.interrupt();
859		awaitTermination(t);
860		assertEquals(SIZE, q.size());
#	Line 861 | Line 889 | public class LinkedBlockingDequeTest ext
889		assertEquals(capacity - 1, q.take());
890
891		await(pleaseInterrupt);
892	<	assertThreadStaysAlive(t);
892	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
893		t.interrupt();
894		awaitTermination(t);
895		assertEquals(0, q.remainingCapacity());
#	Line 870 | Line 898 | public class LinkedBlockingDequeTest ext
898		/**
899		* timed offerFirst times out if full and elements not taken
900		*/
901	<	public void testTimedOfferFirst() throws InterruptedException {
901	>	public void testTimedOfferFirst() {
902		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
903		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
904		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 878 | Line 906 | public class LinkedBlockingDequeTest ext
906		q.putFirst(new Object());
907		q.putFirst(new Object());
908		long startTime = System.nanoTime();
909	+
910		assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
911		assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
912	+
913	+	Thread.currentThread().interrupt();
914	+	try {
915	+	q.offerFirst(new Object(), randomTimeout(), randomTimeUnit());
916	+	shouldThrow();
917	+	} catch (InterruptedException success) {}
918	+	assertFalse(Thread.interrupted());
919	+
920		pleaseInterrupt.countDown();
921		try {
922	<	q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
922	>	q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS);
923		shouldThrow();
924		} catch (InterruptedException success) {}
925	+	assertFalse(Thread.interrupted());
926	+
927	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
928		}});
929
930		await(pleaseInterrupt);
931	<	assertThreadStaysAlive(t);
931	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
932		t.interrupt();
933		awaitTermination(t);
934		}
#	Line 920 | Line 960 | public class LinkedBlockingDequeTest ext
960		}});
961
962		await(threadStarted);
963	<	assertThreadStaysAlive(t);
963	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
964		t.interrupt();
965		awaitTermination(t);
966		}
#	Line 961 | Line 1001 | public class LinkedBlockingDequeTest ext
1001		}});
1002
1003		await(threadStarted);
1004	<	assertThreadStaysAlive(t);
1004	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1005		t.interrupt();
1006		awaitTermination(t);
1007		}
#	Line 993 | Line 1033 | public class LinkedBlockingDequeTest ext
1033		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1034		Thread t = newStartedThread(new CheckedRunnable() {
1035		public void realRun() throws InterruptedException {
1036	<	for (int i = 0; i < SIZE; ++i) {
997	<	assertEquals(i, q.takeFirst());
998	<	}
1036	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1037
1038		Thread.currentThread().interrupt();
1039		try {
#	Line 1013 | Line 1051 | public class LinkedBlockingDequeTest ext
1051		}});
1052
1053		await(pleaseInterrupt);
1054	<	assertThreadStaysAlive(t);
1054	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1055		t.interrupt();
1056		awaitTermination(t);
1057		}
#	Line 1050 | Line 1088 | public class LinkedBlockingDequeTest ext
1088		* returning timeout status
1089		*/
1090		public void testInterruptedTimedPollFirst() throws InterruptedException {
1091	+	final LinkedBlockingDeque q = populatedDeque(SIZE);
1092		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1093		Thread t = newStartedThread(new CheckedRunnable() {
1094		public void realRun() throws InterruptedException {
1095	<	LinkedBlockingDeque q = populatedDeque(SIZE);
1057	<	for (int i = 0; i < SIZE; ++i) {
1095	>	for (int i = 0; i < SIZE; i++)
1096		assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1059	–	}
1097
1098		Thread.currentThread().interrupt();
1099		try {
1100	<	q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1100	>	q.pollFirst(randomTimeout(), randomTimeUnit());
1101		shouldThrow();
1102		} catch (InterruptedException success) {}
1103		assertFalse(Thread.interrupted());
1104
1105		pleaseInterrupt.countDown();
1106		try {
1107	<	q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1107	>	q.pollFirst(LONGER_DELAY_MS, MILLISECONDS);
1108		shouldThrow();
1109		} catch (InterruptedException success) {}
1110		assertFalse(Thread.interrupted());
1111		}});
1112
1113		await(pleaseInterrupt);
1114	<	assertThreadStaysAlive(t);
1114	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1115		t.interrupt();
1116		awaitTermination(t);
1117		}
#	Line 1098 | Line 1135 | public class LinkedBlockingDequeTest ext
1135
1136		Thread.currentThread().interrupt();
1137		try {
1138	<	q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1138	>	q.pollFirst(randomTimeout(), randomTimeUnit());
1139		shouldThrow();
1140		} catch (InterruptedException success) {}
1141
#	Line 1107 | Line 1144 | public class LinkedBlockingDequeTest ext
1144		q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1145		shouldThrow();
1146		} catch (InterruptedException success) {}
1147	+	assertFalse(Thread.interrupted());
1148	+
1149		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1150		}});
1151
#	Line 1115 | Line 1154 | public class LinkedBlockingDequeTest ext
1154		assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1155		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1156		barrier.await();
1157	<	assertThreadStaysAlive(t);
1157	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1158		t.interrupt();
1159		awaitTermination(t);
1160		}
#	Line 1173 | Line 1212 | public class LinkedBlockingDequeTest ext
1212		}});
1213
1214		await(pleaseInterrupt);
1215	<	assertThreadStaysAlive(t);
1215	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1216		t.interrupt();
1217		awaitTermination(t);
1218		assertEquals(SIZE, q.size());
#	Line 1195 | Line 1234 | public class LinkedBlockingDequeTest ext
1234		pleaseTake.countDown();
1235		q.putLast(86);
1236
1237	+	Thread.currentThread().interrupt();
1238	+	try {
1239	+	q.putLast(99);
1240	+	shouldThrow();
1241	+	} catch (InterruptedException success) {}
1242	+	assertFalse(Thread.interrupted());
1243	+
1244		pleaseInterrupt.countDown();
1245		try {
1246		q.putLast(99);
#	Line 1208 | Line 1254 | public class LinkedBlockingDequeTest ext
1254		assertEquals(0, q.take());
1255
1256		await(pleaseInterrupt);
1257	<	assertThreadStaysAlive(t);
1257	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1258		t.interrupt();
1259		awaitTermination(t);
1260		assertEquals(0, q.remainingCapacity());
#	Line 1217 | Line 1263 | public class LinkedBlockingDequeTest ext
1263		/**
1264		* timed offerLast times out if full and elements not taken
1265		*/
1266	<	public void testTimedOfferLast() throws InterruptedException {
1266	>	public void testTimedOfferLast() {
1267		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1268		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1269		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 1225 | Line 1271 | public class LinkedBlockingDequeTest ext
1271		q.putLast(new Object());
1272		q.putLast(new Object());
1273		long startTime = System.nanoTime();
1274	+
1275		assertFalse(q.offerLast(new Object(), timeoutMillis(), MILLISECONDS));
1276		assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1277	+
1278	+	Thread.currentThread().interrupt();
1279	+	try {
1280	+	q.offerLast(new Object(), randomTimeout(), randomTimeUnit());
1281	+	shouldThrow();
1282	+	} catch (InterruptedException success) {}
1283	+
1284		pleaseInterrupt.countDown();
1285		try {
1286	<	q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
1286	>	q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS);
1287		shouldThrow();
1288		} catch (InterruptedException success) {}
1289	+
1290	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1291		}});
1292
1293		await(pleaseInterrupt);
1294	<	assertThreadStaysAlive(t);
1294	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1295		t.interrupt();
1296		awaitTermination(t);
1297		}
#	Line 1246 | Line 1302 | public class LinkedBlockingDequeTest ext
1302		public void testTakeLast() throws InterruptedException {
1303		LinkedBlockingDeque q = populatedDeque(SIZE);
1304		for (int i = 0; i < SIZE; ++i) {
1305	<	assertEquals(SIZE-i-1, q.takeLast());
1305	>	assertEquals(SIZE - i - 1, q.takeLast());
1306		}
1307		}
1308
#	Line 1258 | Line 1314 | public class LinkedBlockingDequeTest ext
1314		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1315		Thread t = newStartedThread(new CheckedRunnable() {
1316		public void realRun() throws InterruptedException {
1317	<	for (int i = 0; i < SIZE; ++i) {
1318	<	assertEquals(SIZE-i-1, q.takeLast());
1263	<	}
1317	>	for (int i = 0; i < SIZE; i++)
1318	>	assertEquals(SIZE - i - 1, q.takeLast());
1319
1320		Thread.currentThread().interrupt();
1321		try {
#	Line 1278 | Line 1333 | public class LinkedBlockingDequeTest ext
1333		}});
1334
1335		await(pleaseInterrupt);
1336	<	assertThreadStaysAlive(t);
1336	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
1337		t.interrupt();
1338		awaitTermination(t);
1339		}
#	Line 1289 | Line 1344 | public class LinkedBlockingDequeTest ext
1344		public void testTimedPollLast0() throws InterruptedException {
1345		LinkedBlockingDeque q = populatedDeque(SIZE);
1346		for (int i = 0; i < SIZE; ++i) {
1347	<	assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1347	>	assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1348		}
1349		assertNull(q.pollLast(0, MILLISECONDS));
1350		}
#	Line 1301 | Line 1356 | public class LinkedBlockingDequeTest ext
1356		LinkedBlockingDeque q = populatedDeque(SIZE);
1357		for (int i = 0; i < SIZE; ++i) {
1358		long startTime = System.nanoTime();
1359	<	assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1359	>	assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1360		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1361		}
1362		long startTime = System.nanoTime();
#	Line 1315 | Line 1370 | public class LinkedBlockingDequeTest ext
1370		* returning timeout status
1371		*/
1372		public void testInterruptedTimedPollLast() throws InterruptedException {
1373	+	final LinkedBlockingDeque q = populatedDeque(SIZE);
1374		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1375		Thread t = newStartedThread(new CheckedRunnable() {
1376		public void realRun() throws InterruptedException {
1377	<	LinkedBlockingDeque q = populatedDeque(SIZE);
1378	<	for (int i = 0; i < SIZE; ++i) {
1379	<	assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1324	<	}
1377	>	for (int i = 0; i < SIZE; i++)
1378	>	assertEquals(SIZE - i - 1,
1379	>	q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1380
1381		Thread.currentThread().interrupt();
1382		try {
1383	<	q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1383	>	q.pollLast(randomTimeout(), randomTimeUnit());
1384		shouldThrow();
1385		} catch (InterruptedException success) {}
1386		assertFalse(Thread.interrupted());
1387
1388		pleaseInterrupt.countDown();
1389		try {
1390	<	q.pollLast(LONG_DELAY_MS, MILLISECONDS);
1390	>	q.pollLast(LONGER_DELAY_MS, MILLISECONDS);
1391		shouldThrow();
1392		} catch (InterruptedException success) {}
1393		assertFalse(Thread.interrupted());
1394		}});
1395
1396		await(pleaseInterrupt);
1397	<	assertThreadStaysAlive(t);
1397	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1398		t.interrupt();
1399		awaitTermination(t);
1400	+	checkEmpty(q);
1401		}
1402
1403		/**
#	Line 1363 | Line 1419 | public class LinkedBlockingDequeTest ext
1419
1420		Thread.currentThread().interrupt();
1421		try {
1422	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
1422	>	q.poll(randomTimeout(), randomTimeUnit());
1423		shouldThrow();
1424		} catch (InterruptedException success) {}
1425		assertFalse(Thread.interrupted());
#	Line 1374 | Line 1430 | public class LinkedBlockingDequeTest ext
1430		shouldThrow();
1431		} catch (InterruptedException success) {}
1432		assertFalse(Thread.interrupted());
1433	+
1434	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1435		}});
1436
1437		barrier.await();
#	Line 1382 | Line 1440 | public class LinkedBlockingDequeTest ext
1440		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1441
1442		barrier.await();
1443	<	assertThreadStaysAlive(t);
1443	>	if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1444		t.interrupt();
1445		awaitTermination(t);
1446		}
#	Line 1458 | Line 1516 | public class LinkedBlockingDequeTest ext
1516		assertTrue(changed);
1517
1518		assertTrue(q.containsAll(p));
1519	<	assertEquals(SIZE-i, q.size());
1519	>	assertEquals(SIZE - i, q.size());
1520		p.remove();
1521		}
1522		}
#	Line 1471 | Line 1529 | public class LinkedBlockingDequeTest ext
1529		LinkedBlockingDeque q = populatedDeque(SIZE);
1530		LinkedBlockingDeque p = populatedDeque(i);
1531		assertTrue(q.removeAll(p));
1532	<	assertEquals(SIZE-i, q.size());
1532	>	assertEquals(SIZE - i, q.size());
1533		for (int j = 0; j < i; ++j) {
1534		Integer x = (Integer)(p.remove());
1535		assertFalse(q.contains(x));
#	Line 1484 | Line 1542 | public class LinkedBlockingDequeTest ext
1542		*/
1543		public void testToArray() throws InterruptedException {
1544		LinkedBlockingDeque q = populatedDeque(SIZE);
1545	<	Object[] o = q.toArray();
1546	<	for (int i = 0; i < o.length; i++)
1547	<	assertSame(o[i], q.poll());
1545	>	Object[] a = q.toArray();
1546	>	assertSame(Object[].class, a.getClass());
1547	>	for (Object o : a)
1548	>	assertSame(o, q.poll());
1549	>	assertTrue(q.isEmpty());
1550		}
1551
1552		/**
#	Line 1497 | Line 1557 | public class LinkedBlockingDequeTest ext
1557		Integer[] ints = new Integer[SIZE];
1558		Integer[] array = q.toArray(ints);
1559		assertSame(ints, array);
1560	<	for (int i = 0; i < ints.length; i++)
1561	<	assertSame(ints[i], q.remove());
1560	>	for (Integer o : ints)
1561	>	assertSame(o, q.remove());
1562	>	assertTrue(q.isEmpty());
1563		}
1564
1565		/**
#	Line 1670 | Line 1731 | public class LinkedBlockingDequeTest ext
1731		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1732		q.add(one);
1733		q.add(two);
1673	–	ExecutorService executor = Executors.newFixedThreadPool(2);
1734		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1735	<	executor.execute(new CheckedRunnable() {
1736	<	public void realRun() throws InterruptedException {
1737	<	assertFalse(q.offer(three));
1738	<	threadsStarted.await();
1739	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1740	<	assertEquals(0, q.remainingCapacity());
1741	<	}});
1742	<
1743	<	executor.execute(new CheckedRunnable() {
1744	<	public void realRun() throws InterruptedException {
1745	<	threadsStarted.await();
1746	<	assertSame(one, q.take());
1747	<	}});
1748	<
1749	<	joinPool(executor);
1735	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
1736	>	try (PoolCleaner cleaner = cleaner(executor)) {
1737	>	executor.execute(new CheckedRunnable() {
1738	>	public void realRun() throws InterruptedException {
1739	>	assertFalse(q.offer(three));
1740	>	threadsStarted.await();
1741	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1742	>	assertEquals(0, q.remainingCapacity());
1743	>	}});
1744	>
1745	>	executor.execute(new CheckedRunnable() {
1746	>	public void realRun() throws InterruptedException {
1747	>	threadsStarted.await();
1748	>	assertSame(one, q.take());
1749	>	}});
1750	>	}
1751		}
1752
1753		/**
#	Line 1695 | Line 1756 | public class LinkedBlockingDequeTest ext
1756		public void testPollInExecutor() {
1757		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1758		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1759	<	ExecutorService executor = Executors.newFixedThreadPool(2);
1760	<	executor.execute(new CheckedRunnable() {
1761	<	public void realRun() throws InterruptedException {
1762	<	assertNull(q.poll());
1763	<	threadsStarted.await();
1764	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1765	<	checkEmpty(q);
1766	<	}});
1767	<
1768	<	executor.execute(new CheckedRunnable() {
1769	<	public void realRun() throws InterruptedException {
1770	<	threadsStarted.await();
1771	<	q.put(one);
1772	<	}});
1773	<
1774	<	joinPool(executor);
1759	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
1760	>	try (PoolCleaner cleaner = cleaner(executor)) {
1761	>	executor.execute(new CheckedRunnable() {
1762	>	public void realRun() throws InterruptedException {
1763	>	assertNull(q.poll());
1764	>	threadsStarted.await();
1765	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1766	>	checkEmpty(q);
1767	>	}});
1768	>
1769	>	executor.execute(new CheckedRunnable() {
1770	>	public void realRun() throws InterruptedException {
1771	>	threadsStarted.await();
1772	>	q.put(one);
1773	>	}});
1774	>	}
1775		}
1776
1777		/**
1778	<	* A deserialized serialized deque has same elements in same order
1778	>	* A deserialized/reserialized deque has same elements in same order
1779		*/
1780		public void testSerialization() throws Exception {
1781		Queue x = populatedDeque(SIZE);
#	Line 1762 | Line 1823 | public class LinkedBlockingDequeTest ext
1823		final LinkedBlockingDeque q = populatedDeque(SIZE);
1824		Thread t = new Thread(new CheckedRunnable() {
1825		public void realRun() throws InterruptedException {
1826	<	q.put(new Integer(SIZE+1));
1826	>	q.put(new Integer(SIZE + 1));
1827		}});
1828
1829		t.start();
#	Line 1787 | Line 1848 | public class LinkedBlockingDequeTest ext
1848		q.drainTo(l, i);
1849		int k = (i < SIZE) ? i : SIZE;
1850		assertEquals(k, l.size());
1851	<	assertEquals(SIZE-k, q.size());
1851	>	assertEquals(SIZE - k, q.size());
1852		for (int j = 0; j < k; ++j)
1853		assertEquals(l.get(j), new Integer(j));
1854		do {} while (q.poll() != null);

Diff Legend

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