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.59 by jsr166, Sat May 23 00:53:08 2015 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 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 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 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 1320 | Line 1320 | public class LinkedBlockingDequeTest ext
1320		public void realRun() throws InterruptedException {
1321		LinkedBlockingDeque q = populatedDeque(SIZE);
1322		for (int i = 0; i < SIZE; ++i) {
1323	<	assertEquals(SIZE-i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1323	>	assertEquals(SIZE - i-1, q.pollLast(LONG_DELAY_MS, MILLISECONDS));
1324		}
1325
1326		Thread.currentThread().interrupt();
#	Line 1458 | Line 1458 | public class LinkedBlockingDequeTest ext
1458		assertTrue(changed);
1459
1460		assertTrue(q.containsAll(p));
1461	<	assertEquals(SIZE-i, q.size());
1461	>	assertEquals(SIZE - i, q.size());
1462		p.remove();
1463		}
1464		}
#	Line 1471 | Line 1471 | public class LinkedBlockingDequeTest ext
1471		LinkedBlockingDeque q = populatedDeque(SIZE);
1472		LinkedBlockingDeque p = populatedDeque(i);
1473		assertTrue(q.removeAll(p));
1474	<	assertEquals(SIZE-i, q.size());
1474	>	assertEquals(SIZE - i, q.size());
1475		for (int j = 0; j < i; ++j) {
1476		Integer x = (Integer)(p.remove());
1477		assertFalse(q.contains(x));
#	Line 1762 | Line 1762 | public class LinkedBlockingDequeTest ext
1762		final LinkedBlockingDeque q = populatedDeque(SIZE);
1763		Thread t = new Thread(new CheckedRunnable() {
1764		public void realRun() throws InterruptedException {
1765	<	q.put(new Integer(SIZE+1));
1765	>	q.put(new Integer(SIZE + 1));
1766		}});
1767
1768		t.start();
#	Line 1787 | Line 1787 | public class LinkedBlockingDequeTest ext
1787		q.drainTo(l, i);
1788		int k = (i < SIZE) ? i : SIZE;
1789		assertEquals(k, l.size());
1790	<	assertEquals(SIZE-k, q.size());
1790	>	assertEquals(SIZE - k, q.size());
1791		for (int j = 0; j < k; ++j)
1792		assertEquals(l.get(j), new Integer(j));
1793		do {} while (q.poll() != null);

Diff Legend

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