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.64 by jsr166, Sat Aug 6 17:02:49 2016 UTC

#	Line 82 | Line 82 | public class LinkedBlockingDequeTest ext
82		public void testSize() {
83		LinkedBlockingDeque q = populatedDeque(SIZE);
84		for (int i = 0; i < SIZE; ++i) {
85	<	assertEquals(SIZE-i, q.size());
85	>	assertEquals(SIZE - i, q.size());
86		q.removeFirst();
87		}
88		for (int i = 0; i < SIZE; ++i) {
#	Line 147 | Line 147 | public class LinkedBlockingDequeTest ext
147		*/
148		public void testPollLast() {
149		LinkedBlockingDeque q = populatedDeque(SIZE);
150	<	for (int i = SIZE-1; i >= 0; --i) {
150	>	for (int i = SIZE - 1; i >= 0; --i) {
151		assertEquals(i, q.pollLast());
152		}
153		assertNull(q.pollLast());
#	Line 186 | Line 186 | public class LinkedBlockingDequeTest ext
186		*/
187		public void testPeekLast() {
188		LinkedBlockingDeque q = populatedDeque(SIZE);
189	<	for (int i = SIZE-1; i >= 0; --i) {
189	>	for (int i = SIZE - 1; i >= 0; --i) {
190		assertEquals(i, q.peekLast());
191		assertEquals(i, q.pollLast());
192		assertTrue(q.peekLast() == null ||
#	Line 216 | Line 216 | public class LinkedBlockingDequeTest ext
216		*/
217		public void testLastElement() {
218		LinkedBlockingDeque q = populatedDeque(SIZE);
219	<	for (int i = SIZE-1; i >= 0; --i) {
219	>	for (int i = SIZE - 1; i >= 0; --i) {
220		assertEquals(i, q.getLast());
221		assertEquals(i, q.pollLast());
222		}
#	Line 281 | Line 281 | public class LinkedBlockingDequeTest ext
281		}
282		for (int i = 0; i < SIZE; i += 2) {
283		assertTrue(q.removeFirstOccurrence(new Integer(i)));
284	<	assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
284	>	assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
285		}
286		assertTrue(q.isEmpty());
287		}
#	Line 296 | Line 296 | public class LinkedBlockingDequeTest ext
296		}
297		for (int i = 0; i < SIZE; i += 2) {
298		assertTrue(q.removeLastOccurrence(new Integer(i)));
299	<	assertFalse(q.removeLastOccurrence(new Integer(i+1)));
299	>	assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
300		}
301		assertTrue(q.isEmpty());
302		}
#	Line 367 | Line 367 | public class LinkedBlockingDequeTest ext
367		*/
368		public void testConstructor5() {
369		Integer[] ints = new Integer[SIZE];
370	<	for (int i = 0; i < SIZE-1; ++i)
370	>	for (int i = 0; i < SIZE - 1; ++i)
371		ints[i] = i;
372		Collection<Integer> elements = Arrays.asList(ints);
373		try {
#	Line 414 | Line 414 | public class LinkedBlockingDequeTest ext
414		assertEquals(i, q.remove());
415		}
416		for (int i = 0; i < SIZE; ++i) {
417	<	assertEquals(SIZE-i, q.remainingCapacity());
417	>	assertEquals(SIZE - i, q.remainingCapacity());
418		assertEquals(SIZE, q.size() + q.remainingCapacity());
419		assertTrue(q.add(i));
420		}
#	Line 424 | Line 424 | public class LinkedBlockingDequeTest ext
424		* push(null) throws NPE
425		*/
426		public void testPushNull() {
427	+	LinkedBlockingDeque q = new LinkedBlockingDeque(1);
428		try {
428	–	LinkedBlockingDeque q = new LinkedBlockingDeque(1);
429		q.push(null);
430		shouldThrow();
431		} catch (NullPointerException success) {}
#	Line 435 | Line 435 | public class LinkedBlockingDequeTest ext
435		* push succeeds if not full; throws ISE if full
436		*/
437		public void testPush() {
438	+	LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
439	+	for (int i = 0; i < SIZE; ++i) {
440	+	Integer x = new Integer(i);
441	+	q.push(x);
442	+	assertEquals(x, q.peek());
443	+	}
444	+	assertEquals(0, q.remainingCapacity());
445		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());
446		q.push(new Integer(SIZE));
447		shouldThrow();
448		} catch (IllegalStateException success) {}
#	Line 513 | Line 513 | public class LinkedBlockingDequeTest ext
513		public void testAddAll3() {
514		LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE);
515		Integer[] ints = new Integer[SIZE];
516	<	for (int i = 0; i < SIZE-1; ++i)
516	>	for (int i = 0; i < SIZE - 1; ++i)
517		ints[i] = new Integer(i);
518		Collection<Integer> elements = Arrays.asList(ints);
519		try {
#	Line 751 | Line 751 | public class LinkedBlockingDequeTest ext
751		final CountDownLatch aboutToWait = new CountDownLatch(1);
752		Thread t = newStartedThread(new CheckedRunnable() {
753		public void realRun() throws InterruptedException {
754	+	long startTime = System.nanoTime();
755		for (int i = 0; i < SIZE; ++i) {
755	–	long t0 = System.nanoTime();
756		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
757	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
757		}
759	–	long t0 = System.nanoTime();
758		aboutToWait.countDown();
759		try {
760	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
760	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
761		shouldThrow();
762		} catch (InterruptedException success) {
763	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
763	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
764		}
765		}});
766
767		aboutToWait.await();
768	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
768	>	waitForThreadToEnterWaitState(t);
769		t.interrupt();
770	<	awaitTermination(t, MEDIUM_DELAY_MS);
770	>	awaitTermination(t);
771		checkEmpty(q);
772		}
773
#	Line 1050 | Line 1048 | public class LinkedBlockingDequeTest ext
1048		* returning timeout status
1049		*/
1050		public void testInterruptedTimedPollFirst() throws InterruptedException {
1051	+	final LinkedBlockingDeque q = populatedDeque(SIZE);
1052		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1053		Thread t = newStartedThread(new CheckedRunnable() {
1054		public void realRun() throws InterruptedException {
1055	<	LinkedBlockingDeque q = populatedDeque(SIZE);
1055	>	long startTime = System.nanoTime();
1056		for (int i = 0; i < SIZE; ++i) {
1057		assertEquals(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS));
1058		}
1059
1060		Thread.currentThread().interrupt();
1061		try {
1062	<	q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
1062	>	q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
1063		shouldThrow();
1064		} catch (InterruptedException success) {}
1065		assertFalse(Thread.interrupted());
#	Line 1071 | Line 1070 | public class LinkedBlockingDequeTest ext
1070		shouldThrow();
1071		} catch (InterruptedException success) {}
1072		assertFalse(Thread.interrupted());
1073	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1074		}});
1075
1076		await(pleaseInterrupt);
#	Line 1246 | Line 1246 | public class LinkedBlockingDequeTest ext
1246		public void testTakeLast() throws InterruptedException {
1247		LinkedBlockingDeque q = populatedDeque(SIZE);
1248		for (int i = 0; i < SIZE; ++i) {
1249	<	assertEquals(SIZE-i-1, q.takeLast());
1249	>	assertEquals(SIZE - i - 1, q.takeLast());
1250		}
1251		}
1252
#	Line 1259 | Line 1259 | public class LinkedBlockingDequeTest ext
1259		Thread t = newStartedThread(new CheckedRunnable() {
1260		public void realRun() throws InterruptedException {
1261		for (int i = 0; i < SIZE; ++i) {
1262	<	assertEquals(SIZE-i-1, q.takeLast());
1262	>	assertEquals(SIZE - i - 1, q.takeLast());
1263		}
1264
1265		Thread.currentThread().interrupt();
#	Line 1289 | Line 1289 | public class LinkedBlockingDequeTest ext
1289		public void testTimedPollLast0() throws InterruptedException {
1290		LinkedBlockingDeque q = populatedDeque(SIZE);
1291		for (int i = 0; i < SIZE; ++i) {
1292	<	assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1292	>	assertEquals(SIZE - i - 1, q.pollLast(0, MILLISECONDS));
1293		}
1294		assertNull(q.pollLast(0, MILLISECONDS));
1295		}
#	Line 1301 | Line 1301 | public class LinkedBlockingDequeTest ext
1301		LinkedBlockingDeque q = populatedDeque(SIZE);
1302		for (int i = 0; i < SIZE; ++i) {
1303		long startTime = System.nanoTime();
1304	<	assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1304	>	assertEquals(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1305		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1306		}
1307		long startTime = System.nanoTime();
#	Line 1315 | Line 1315 | public class LinkedBlockingDequeTest ext
1315		* returning timeout status
1316		*/
1317		public void testInterruptedTimedPollLast() throws InterruptedException {
1318	+	final LinkedBlockingDeque q = populatedDeque(SIZE);
1319		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
1320		Thread t = newStartedThread(new CheckedRunnable() {
1321		public void realRun() throws InterruptedException {
1322	<	LinkedBlockingDeque q = populatedDeque(SIZE);
1322	>	long startTime = System.nanoTime();
1323		for (int i = 0; i < SIZE; ++i) {
1324	<	assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1324	>	assertEquals(SIZE - i - 1,
1325	>	q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1326		}
1327
1328		Thread.currentThread().interrupt();
#	Line 1336 | Line 1338 | public class LinkedBlockingDequeTest ext
1338		shouldThrow();
1339		} catch (InterruptedException success) {}
1340		assertFalse(Thread.interrupted());
1341	+
1342	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1343		}});
1344
1345		await(pleaseInterrupt);
1346		assertThreadStaysAlive(t);
1347		t.interrupt();
1348		awaitTermination(t);
1349	+	checkEmpty(q);
1350		}
1351
1352		/**
#	Line 1374 | Line 1379 | public class LinkedBlockingDequeTest ext
1379		shouldThrow();
1380		} catch (InterruptedException success) {}
1381		assertFalse(Thread.interrupted());
1382	+
1383	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1384		}});
1385
1386		barrier.await();
#	Line 1458 | Line 1465 | public class LinkedBlockingDequeTest ext
1465		assertTrue(changed);
1466
1467		assertTrue(q.containsAll(p));
1468	<	assertEquals(SIZE-i, q.size());
1468	>	assertEquals(SIZE - i, q.size());
1469		p.remove();
1470		}
1471		}
#	Line 1471 | Line 1478 | public class LinkedBlockingDequeTest ext
1478		LinkedBlockingDeque q = populatedDeque(SIZE);
1479		LinkedBlockingDeque p = populatedDeque(i);
1480		assertTrue(q.removeAll(p));
1481	<	assertEquals(SIZE-i, q.size());
1481	>	assertEquals(SIZE - i, q.size());
1482		for (int j = 0; j < i; ++j) {
1483		Integer x = (Integer)(p.remove());
1484		assertFalse(q.contains(x));
#	Line 1670 | Line 1677 | public class LinkedBlockingDequeTest ext
1677		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1678		q.add(one);
1679		q.add(two);
1673	–	ExecutorService executor = Executors.newFixedThreadPool(2);
1680		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1681	<	executor.execute(new CheckedRunnable() {
1682	<	public void realRun() throws InterruptedException {
1683	<	assertFalse(q.offer(three));
1684	<	threadsStarted.await();
1685	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1686	<	assertEquals(0, q.remainingCapacity());
1687	<	}});
1688	<
1689	<	executor.execute(new CheckedRunnable() {
1690	<	public void realRun() throws InterruptedException {
1691	<	threadsStarted.await();
1692	<	assertSame(one, q.take());
1693	<	}});
1694	<
1695	<	joinPool(executor);
1681	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
1682	>	try (PoolCleaner cleaner = cleaner(executor)) {
1683	>	executor.execute(new CheckedRunnable() {
1684	>	public void realRun() throws InterruptedException {
1685	>	assertFalse(q.offer(three));
1686	>	threadsStarted.await();
1687	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
1688	>	assertEquals(0, q.remainingCapacity());
1689	>	}});
1690	>
1691	>	executor.execute(new CheckedRunnable() {
1692	>	public void realRun() throws InterruptedException {
1693	>	threadsStarted.await();
1694	>	assertSame(one, q.take());
1695	>	}});
1696	>	}
1697		}
1698
1699		/**
#	Line 1695 | Line 1702 | public class LinkedBlockingDequeTest ext
1702		public void testPollInExecutor() {
1703		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
1704		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
1705	<	ExecutorService executor = Executors.newFixedThreadPool(2);
1706	<	executor.execute(new CheckedRunnable() {
1707	<	public void realRun() throws InterruptedException {
1708	<	assertNull(q.poll());
1709	<	threadsStarted.await();
1710	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1711	<	checkEmpty(q);
1712	<	}});
1713	<
1714	<	executor.execute(new CheckedRunnable() {
1715	<	public void realRun() throws InterruptedException {
1716	<	threadsStarted.await();
1717	<	q.put(one);
1718	<	}});
1719	<
1720	<	joinPool(executor);
1705	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
1706	>	try (PoolCleaner cleaner = cleaner(executor)) {
1707	>	executor.execute(new CheckedRunnable() {
1708	>	public void realRun() throws InterruptedException {
1709	>	assertNull(q.poll());
1710	>	threadsStarted.await();
1711	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
1712	>	checkEmpty(q);
1713	>	}});
1714	>
1715	>	executor.execute(new CheckedRunnable() {
1716	>	public void realRun() throws InterruptedException {
1717	>	threadsStarted.await();
1718	>	q.put(one);
1719	>	}});
1720	>	}
1721		}
1722
1723		/**
#	Line 1762 | Line 1769 | public class LinkedBlockingDequeTest ext
1769		final LinkedBlockingDeque q = populatedDeque(SIZE);
1770		Thread t = new Thread(new CheckedRunnable() {
1771		public void realRun() throws InterruptedException {
1772	<	q.put(new Integer(SIZE+1));
1772	>	q.put(new Integer(SIZE + 1));
1773		}});
1774
1775		t.start();
#	Line 1787 | Line 1794 | public class LinkedBlockingDequeTest ext
1794		q.drainTo(l, i);
1795		int k = (i < SIZE) ? i : SIZE;
1796		assertEquals(k, l.size());
1797	<	assertEquals(SIZE-k, q.size());
1797	>	assertEquals(SIZE - k, q.size());
1798		for (int j = 0; j < k; ++j)
1799		assertEquals(l.get(j), new Integer(j));
1800		do {} while (q.poll() != null);

Diff Legend

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