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.79 by jsr166, Sun May 14 04:02:06 2017 UTC vs.
Revision 1.83 by jsr166, Mon May 28 21:19:50 2018 UTC

#	Line 442 | 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 492 | 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 506 | 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 655 | 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 665 | 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);
#	Line 892 | 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 902 | 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);
#	Line 1219 | 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 1241 | 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 1251 | 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 1513 | Line 1543 | public class LinkedBlockingDequeTest ext
1543		*/
1544		public void testToArray() throws InterruptedException {
1545		LinkedBlockingDeque q = populatedDeque(SIZE);
1546	<	Object[] o = q.toArray();
1547	<	for (int i = 0; i < o.length; i++)
1548	<	assertSame(o[i], q.poll());
1546	>	Object[] a = q.toArray();
1547	>	assertSame(Object[].class, a.getClass());
1548	>	for (Object o : a)
1549	>	assertSame(o, q.poll());
1550	>	assertTrue(q.isEmpty());
1551		}
1552
1553		/**
#	Line 1526 | Line 1558 | public class LinkedBlockingDequeTest ext
1558		Integer[] ints = new Integer[SIZE];
1559		Integer[] array = q.toArray(ints);
1560		assertSame(ints, array);
1561	<	for (int i = 0; i < ints.length; i++)
1562	<	assertSame(ints[i], q.remove());
1561	>	for (Integer o : ints)
1562	>	assertSame(o, q.remove());
1563	>	assertTrue(q.isEmpty());
1564		}
1565
1566		/**
#	Line 1743 | Line 1776 | public class LinkedBlockingDequeTest ext
1776		}
1777
1778		/**
1779	<	* A deserialized serialized deque has same elements in same order
1779	>	* A deserialized/reserialized deque has same elements in same order
1780		*/
1781		public void testSerialization() throws Exception {
1782		Queue x = populatedDeque(SIZE);

Diff Legend

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