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.58 by jsr166, Fri May 15 18:21:19 2015 UTC vs.
Revision 1.81 by jsr166, Mon May 29 22:44:27 2017 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 432 | Line 442 | public class LinkedBlockingDequeTest ext
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);
#	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	>	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	>	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 648 | Line 665 | public class LinkedBlockingDequeTest ext
665		long startTime = System.nanoTime();
666		assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
667		assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
668	+
669	+	Thread.currentThread().interrupt();
670	+	try {
671	+	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
672	+	shouldThrow();
673	+	} catch (InterruptedException success) {}
674	+	assertFalse(Thread.interrupted());
675	+
676		pleaseInterrupt.countDown();
677		try {
678		q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
679		shouldThrow();
680		} catch (InterruptedException success) {}
681	+	assertFalse(Thread.interrupted());
682		}});
683
684		await(pleaseInterrupt);
685	<	assertThreadStaysAlive(t);
685	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
686		t.interrupt();
687		awaitTermination(t);
688		}
#	Line 679 | Line 705 | public class LinkedBlockingDequeTest ext
705		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
706		Thread t = newStartedThread(new CheckedRunnable() {
707		public void realRun() throws InterruptedException {
708	<	for (int i = 0; i < SIZE; ++i) {
683	<	assertEquals(i, q.take());
684	<	}
708	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
709
710		Thread.currentThread().interrupt();
711		try {
#	Line 699 | Line 723 | public class LinkedBlockingDequeTest ext
723		}});
724
725		await(pleaseInterrupt);
726	<	assertThreadStaysAlive(t);
726	>	assertThreadBlocks(t, Thread.State.WAITING);
727		t.interrupt();
728		awaitTermination(t);
729		}
#	Line 748 | Line 772 | public class LinkedBlockingDequeTest ext
772		*/
773		public void testInterruptedTimedPoll() throws InterruptedException {
774		final BlockingQueue<Integer> q = populatedDeque(SIZE);
775	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
775	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
776		Thread t = newStartedThread(new CheckedRunnable() {
777		public void realRun() throws InterruptedException {
778	<	for (int i = 0; i < SIZE; ++i) {
779	<	long t0 = System.nanoTime();
778	>	long startTime = 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	<	}
759	<	long t0 = System.nanoTime();
760	<	aboutToWait.countDown();
781	>
782	>	Thread.currentThread().interrupt();
783		try {
784	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
784	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
785		shouldThrow();
786	<	} catch (InterruptedException success) {
787	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
788	<	}
786	>	} catch (InterruptedException success) {}
787	>	assertFalse(Thread.interrupted());
788	>
789	>	pleaseInterrupt.countDown();
790	>	try {
791	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
792	>	shouldThrow();
793	>	} catch (InterruptedException success) {}
794	>	assertFalse(Thread.interrupted());
795	>
796	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
797		}});
798
799	<	aboutToWait.await();
800	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
799	>	await(pleaseInterrupt);
800	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
801		t.interrupt();
802	<	awaitTermination(t, MEDIUM_DELAY_MS);
802	>	awaitTermination(t);
803		checkEmpty(q);
804		}
805
#	Line 826 | Line 856 | public class LinkedBlockingDequeTest ext
856		}});
857
858		await(pleaseInterrupt);
859	<	assertThreadStaysAlive(t);
859	>	assertThreadBlocks(t, Thread.State.WAITING);
860		t.interrupt();
861		awaitTermination(t);
862		assertEquals(SIZE, q.size());
#	Line 861 | Line 891 | public class LinkedBlockingDequeTest ext
891		assertEquals(capacity - 1, q.take());
892
893		await(pleaseInterrupt);
894	<	assertThreadStaysAlive(t);
894	>	assertThreadBlocks(t, Thread.State.WAITING);
895		t.interrupt();
896		awaitTermination(t);
897		assertEquals(0, q.remainingCapacity());
#	Line 870 | Line 900 | public class LinkedBlockingDequeTest ext
900		/**
901		* timed offerFirst times out if full and elements not taken
902		*/
903	<	public void testTimedOfferFirst() throws InterruptedException {
903	>	public void testTimedOfferFirst() {
904		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
905		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
906		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 880 | Line 910 | public class LinkedBlockingDequeTest ext
910		long startTime = System.nanoTime();
911		assertFalse(q.offerFirst(new Object(), timeoutMillis(), MILLISECONDS));
912		assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
913	+
914	+	Thread.currentThread().interrupt();
915	+	try {
916	+	q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
917	+	shouldThrow();
918	+	} catch (InterruptedException success) {}
919	+	assertFalse(Thread.interrupted());
920	+
921		pleaseInterrupt.countDown();
922		try {
923		q.offerFirst(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
924		shouldThrow();
925		} catch (InterruptedException success) {}
926	+	assertFalse(Thread.interrupted());
927		}});
928
929		await(pleaseInterrupt);
930	<	assertThreadStaysAlive(t);
930	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
931		t.interrupt();
932		awaitTermination(t);
933		}
#	Line 920 | Line 959 | public class LinkedBlockingDequeTest ext
959		}});
960
961		await(threadStarted);
962	<	assertThreadStaysAlive(t);
962	>	assertThreadBlocks(t, Thread.State.WAITING);
963		t.interrupt();
964		awaitTermination(t);
965		}
#	Line 961 | Line 1000 | public class LinkedBlockingDequeTest ext
1000		}});
1001
1002		await(threadStarted);
1003	<	assertThreadStaysAlive(t);
1003	>	assertThreadBlocks(t, Thread.State.WAITING);
1004		t.interrupt();
1005		awaitTermination(t);
1006		}
#	Line 993 | Line 1032 | public class LinkedBlockingDequeTest ext
1032		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1033		Thread t = newStartedThread(new CheckedRunnable() {
1034		public void realRun() throws InterruptedException {
1035	<	for (int i = 0; i < SIZE; ++i) {
997	<	assertEquals(i, q.takeFirst());
998	<	}
1035	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.takeFirst());
1036
1037		Thread.currentThread().interrupt();
1038		try {
#	Line 1013 | Line 1050 | public class LinkedBlockingDequeTest ext
1050		}});
1051
1052		await(pleaseInterrupt);
1053	<	assertThreadStaysAlive(t);
1053	>	assertThreadBlocks(t, Thread.State.WAITING);
1054		t.interrupt();
1055		awaitTermination(t);
1056		}
#	Line 1050 | Line 1087 | public class LinkedBlockingDequeTest ext
1087		* returning timeout status
1088		*/
1089		public void testInterruptedTimedPollFirst() throws InterruptedException {
1090	+	final LinkedBlockingDeque q = populatedDeque(SIZE);
1091		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1092		Thread t = newStartedThread(new CheckedRunnable() {
1093		public void realRun() throws InterruptedException {
1094	<	LinkedBlockingDeque q = populatedDeque(SIZE);
1095	<	for (int i = 0; i < SIZE; ++i) {
1094	>	long startTime = System.nanoTime();
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(LONG_DELAY_MS, MILLISECONDS);
1101		shouldThrow();
1102		} catch (InterruptedException success) {}
1103		assertFalse(Thread.interrupted());
#	Line 1071 | Line 1108 | public class LinkedBlockingDequeTest ext
1108		shouldThrow();
1109		} catch (InterruptedException success) {}
1110		assertFalse(Thread.interrupted());
1111	+
1112	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1113		}});
1114
1115		await(pleaseInterrupt);
1116	<	assertThreadStaysAlive(t);
1116	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1117		t.interrupt();
1118		awaitTermination(t);
1119		}
#	Line 1107 | Line 1146 | public class LinkedBlockingDequeTest ext
1146		q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1147		shouldThrow();
1148		} catch (InterruptedException success) {}
1149	+	assertFalse(Thread.interrupted());
1150		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1151		}});
1152
#	Line 1115 | Line 1155 | public class LinkedBlockingDequeTest ext
1155		assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS));
1156		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1157		barrier.await();
1158	<	assertThreadStaysAlive(t);
1158	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1159		t.interrupt();
1160		awaitTermination(t);
1161		}
#	Line 1173 | Line 1213 | public class LinkedBlockingDequeTest ext
1213		}});
1214
1215		await(pleaseInterrupt);
1216	<	assertThreadStaysAlive(t);
1216	>	assertThreadBlocks(t, Thread.State.WAITING);
1217		t.interrupt();
1218		awaitTermination(t);
1219		assertEquals(SIZE, q.size());
#	Line 1195 | Line 1235 | public class LinkedBlockingDequeTest ext
1235		pleaseTake.countDown();
1236		q.putLast(86);
1237
1238	+	Thread.currentThread().interrupt();
1239	+	try {
1240	+	q.putLast(99);
1241	+	shouldThrow();
1242	+	} catch (InterruptedException success) {}
1243	+	assertFalse(Thread.interrupted());
1244	+
1245		pleaseInterrupt.countDown();
1246		try {
1247		q.putLast(99);
#	Line 1208 | Line 1255 | public class LinkedBlockingDequeTest ext
1255		assertEquals(0, q.take());
1256
1257		await(pleaseInterrupt);
1258	<	assertThreadStaysAlive(t);
1258	>	assertThreadBlocks(t, Thread.State.WAITING);
1259		t.interrupt();
1260		awaitTermination(t);
1261		assertEquals(0, q.remainingCapacity());
#	Line 1217 | Line 1264 | public class LinkedBlockingDequeTest ext
1264		/**
1265		* timed offerLast times out if full and elements not taken
1266		*/
1267	<	public void testTimedOfferLast() throws InterruptedException {
1267	>	public void testTimedOfferLast() {
1268		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1269		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1270		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 1227 | Line 1274 | public class LinkedBlockingDequeTest ext
1274		long startTime = System.nanoTime();
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(), 2 * LONG_DELAY_MS, MILLISECONDS);
1281	+	shouldThrow();
1282	+	} catch (InterruptedException success) {}
1283	+
1284		pleaseInterrupt.countDown();
1285		try {
1286		q.offerLast(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
#	Line 1235 | Line 1289 | public class LinkedBlockingDequeTest ext
1289		}});
1290
1291		await(pleaseInterrupt);
1292	<	assertThreadStaysAlive(t);
1292	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1293		t.interrupt();
1294		awaitTermination(t);
1295		}
#	Line 1246 | Line 1300 | public class LinkedBlockingDequeTest ext
1300		public void testTakeLast() throws InterruptedException {
1301		LinkedBlockingDeque q = populatedDeque(SIZE);
1302		for (int i = 0; i < SIZE; ++i) {
1303	<	assertEquals(SIZE-i-1, q.takeLast());
1303	>	assertEquals(SIZE - i - 1, q.takeLast());
1304		}
1305		}
1306
#	Line 1258 | Line 1312 | public class LinkedBlockingDequeTest ext
1312		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1313		Thread t = newStartedThread(new CheckedRunnable() {
1314		public void realRun() throws InterruptedException {
1315	<	for (int i = 0; i < SIZE; ++i) {
1316	<	assertEquals(SIZE-i-1, q.takeLast());
1263	<	}
1315	>	for (int i = 0; i < SIZE; i++)
1316	>	assertEquals(SIZE - i - 1, q.takeLast());
1317
1318		Thread.currentThread().interrupt();
1319		try {
#	Line 1278 | Line 1331 | public class LinkedBlockingDequeTest ext
1331		}});
1332
1333		await(pleaseInterrupt);
1334	<	assertThreadStaysAlive(t);
1334	>	assertThreadBlocks(t, Thread.State.WAITING);
1335		t.interrupt();
1336		awaitTermination(t);
1337		}
#	Line 1289 | Line 1342 | public class LinkedBlockingDequeTest ext
1342		public void testTimedPollLast0() throws InterruptedException {
1343		LinkedBlockingDeque q = populatedDeque(SIZE);
1344		for (int i = 0; i < SIZE; ++i) {
1345	<	assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1345	>	assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1346		}
1347		assertNull(q.pollLast(0, MILLISECONDS));
1348		}
#	Line 1301 | Line 1354 | public class LinkedBlockingDequeTest ext
1354		LinkedBlockingDeque q = populatedDeque(SIZE);
1355		for (int i = 0; i < SIZE; ++i) {
1356		long startTime = System.nanoTime();
1357	<	assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1357	>	assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1358		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1359		}
1360		long startTime = System.nanoTime();
#	Line 1315 | Line 1368 | public class LinkedBlockingDequeTest ext
1368		* returning timeout status
1369		*/
1370		public void testInterruptedTimedPollLast() throws InterruptedException {
1371	+	final LinkedBlockingDeque q = populatedDeque(SIZE);
1372		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1373		Thread t = newStartedThread(new CheckedRunnable() {
1374		public void realRun() throws InterruptedException {
1375	<	LinkedBlockingDeque q = populatedDeque(SIZE);
1376	<	for (int i = 0; i < SIZE; ++i) {
1377	<	assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1378	<	}
1375	>	long startTime = System.nanoTime();
1376	>	for (int i = 0; i < SIZE; i++)
1377	>	assertEquals(SIZE - i - 1,
1378	>	q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1379
1380		Thread.currentThread().interrupt();
1381		try {
#	Line 1336 | Line 1390 | public class LinkedBlockingDequeTest ext
1390		shouldThrow();
1391		} catch (InterruptedException success) {}
1392		assertFalse(Thread.interrupted());
1393	+
1394	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1395		}});
1396
1397		await(pleaseInterrupt);
1398	<	assertThreadStaysAlive(t);
1398	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1399		t.interrupt();
1400		awaitTermination(t);
1401	+	checkEmpty(q);
1402		}
1403
1404		/**
#	Line 1374 | Line 1431 | public class LinkedBlockingDequeTest ext
1431		shouldThrow();
1432		} catch (InterruptedException success) {}
1433		assertFalse(Thread.interrupted());
1434	+
1435	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1436		}});
1437
1438		barrier.await();
#	Line 1382 | Line 1441 | public class LinkedBlockingDequeTest ext
1441		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1442
1443		barrier.await();
1444	<	assertThreadStaysAlive(t);
1444	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1445		t.interrupt();
1446		awaitTermination(t);
1447		}
#	Line 1458 | Line 1517 | public class LinkedBlockingDequeTest ext
1517		assertTrue(changed);
1518
1519		assertTrue(q.containsAll(p));
1520	<	assertEquals(SIZE-i, q.size());
1520	>	assertEquals(SIZE - i, q.size());
1521		p.remove();
1522		}
1523		}
#	Line 1471 | Line 1530 | public class LinkedBlockingDequeTest ext
1530		LinkedBlockingDeque q = populatedDeque(SIZE);
1531		LinkedBlockingDeque p = populatedDeque(i);
1532		assertTrue(q.removeAll(p));
1533	<	assertEquals(SIZE-i, q.size());
1533	>	assertEquals(SIZE - i, q.size());
1534		for (int j = 0; j < i; ++j) {
1535		Integer x = (Integer)(p.remove());
1536		assertFalse(q.contains(x));
#	Line 1670 | Line 1729 | public class LinkedBlockingDequeTest ext
1729		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1730		q.add(one);
1731		q.add(two);
1673	–	ExecutorService executor = Executors.newFixedThreadPool(2);
1732		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1733	<	executor.execute(new CheckedRunnable() {
1734	<	public void realRun() throws InterruptedException {
1735	<	assertFalse(q.offer(three));
1736	<	threadsStarted.await();
1737	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1738	<	assertEquals(0, q.remainingCapacity());
1739	<	}});
1740	<
1741	<	executor.execute(new CheckedRunnable() {
1742	<	public void realRun() throws InterruptedException {
1743	<	threadsStarted.await();
1744	<	assertSame(one, q.take());
1745	<	}});
1746	<
1747	<	joinPool(executor);
1733	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
1734	>	try (PoolCleaner cleaner = cleaner(executor)) {
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		}
1750
1751		/**
#	Line 1695 | Line 1754 | public class LinkedBlockingDequeTest ext
1754		public void testPollInExecutor() {
1755		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1756		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1757	<	ExecutorService executor = Executors.newFixedThreadPool(2);
1758	<	executor.execute(new CheckedRunnable() {
1759	<	public void realRun() throws InterruptedException {
1760	<	assertNull(q.poll());
1761	<	threadsStarted.await();
1762	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1763	<	checkEmpty(q);
1764	<	}});
1765	<
1766	<	executor.execute(new CheckedRunnable() {
1767	<	public void realRun() throws InterruptedException {
1768	<	threadsStarted.await();
1769	<	q.put(one);
1770	<	}});
1771	<
1772	<	joinPool(executor);
1757	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
1758	>	try (PoolCleaner cleaner = cleaner(executor)) {
1759	>	executor.execute(new CheckedRunnable() {
1760	>	public void realRun() throws InterruptedException {
1761	>	assertNull(q.poll());
1762	>	threadsStarted.await();
1763	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1764	>	checkEmpty(q);
1765	>	}});
1766	>
1767	>	executor.execute(new CheckedRunnable() {
1768	>	public void realRun() throws InterruptedException {
1769	>	threadsStarted.await();
1770	>	q.put(one);
1771	>	}});
1772	>	}
1773		}
1774
1775		/**
#	Line 1762 | Line 1821 | public class LinkedBlockingDequeTest ext
1821		final LinkedBlockingDeque q = populatedDeque(SIZE);
1822		Thread t = new Thread(new CheckedRunnable() {
1823		public void realRun() throws InterruptedException {
1824	<	q.put(new Integer(SIZE+1));
1824	>	q.put(new Integer(SIZE + 1));
1825		}});
1826
1827		t.start();
#	Line 1787 | Line 1846 | public class LinkedBlockingDequeTest ext
1846		q.drainTo(l, i);
1847		int k = (i < SIZE) ? i : SIZE;
1848		assertEquals(k, l.size());
1849	<	assertEquals(SIZE-k, q.size());
1849	>	assertEquals(SIZE - k, q.size());
1850		for (int j = 0; j < k; ++j)
1851		assertEquals(l.get(j), new Integer(j));
1852		do {} while (q.poll() != null);

Diff Legend

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