ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ConcurrentLinkedDequeTest.java

Comparing jsr166/src/test/tck/ConcurrentLinkedDequeTest.java (file contents):
Revision 1.20 by jsr166, Fri May 15 18:21:19 2015 UTC vs.
Revision 1.22 by jsr166, Sun May 24 01:42:14 2015 UTC

#	Line 75 | Line 75 | public class ConcurrentLinkedDequeTest e
75		*/
76		public void testConstructor5() {
77		Integer[] ints = new Integer[SIZE];
78	<	for (int i = 0; i < SIZE-1; ++i)
78	>	for (int i = 0; i < SIZE - 1; ++i)
79		ints[i] = new Integer(i);
80		try {
81		new ConcurrentLinkedDeque(Arrays.asList(ints));
#	Line 115 | Line 115 | public class ConcurrentLinkedDequeTest e
115		public void testSize() {
116		ConcurrentLinkedDeque q = populatedDeque(SIZE);
117		for (int i = 0; i < SIZE; ++i) {
118	<	assertEquals(SIZE-i, q.size());
118	>	assertEquals(SIZE - i, q.size());
119		q.remove();
120		}
121		for (int i = 0; i < SIZE; ++i) {
#	Line 331 | Line 331 | public class ConcurrentLinkedDequeTest e
331		public void testAddAll3() {
332		ConcurrentLinkedDeque q = new ConcurrentLinkedDeque();
333		Integer[] ints = new Integer[SIZE];
334	<	for (int i = 0; i < SIZE-1; ++i)
334	>	for (int i = 0; i < SIZE - 1; ++i)
335		ints[i] = new Integer(i);
336		try {
337		q.addAll(Arrays.asList(ints));
#	Line 370 | Line 370 | public class ConcurrentLinkedDequeTest e
370		*/
371		public void testPollLast() {
372		ConcurrentLinkedDeque q = populatedDeque(SIZE);
373	<	for (int i = SIZE-1; i >= 0; --i) {
373	>	for (int i = SIZE - 1; i >= 0; --i) {
374		assertEquals(i, q.pollLast());
375		}
376		assertNull(q.pollLast());
#	Line 439 | Line 439 | public class ConcurrentLinkedDequeTest e
439		assertTrue(q.contains(i));
440		assertTrue(q.remove(i));
441		assertFalse(q.contains(i));
442	<	assertTrue(q.contains(i-1));
442	>	assertTrue(q.contains(i - 1));
443		}
444		for (int i = 0; i < SIZE; i += 2) {
445		assertTrue(q.contains(i));
446		assertTrue(q.remove(i));
447		assertFalse(q.contains(i));
448	<	assertFalse(q.remove(i+1));
449	<	assertFalse(q.contains(i+1));
448	>	assertFalse(q.remove(i + 1));
449	>	assertFalse(q.contains(i + 1));
450		}
451		assertTrue(q.isEmpty());
452		}
#	Line 470 | Line 470 | public class ConcurrentLinkedDequeTest e
470		*/
471		public void testPeekLast() {
472		ConcurrentLinkedDeque q = populatedDeque(SIZE);
473	<	for (int i = SIZE-1; i >= 0; --i) {
473	>	for (int i = SIZE - 1; i >= 0; --i) {
474		assertEquals(i, q.peekLast());
475		assertEquals(i, q.pollLast());
476		assertTrue(q.peekLast() == null ||
#	Line 499 | Line 499 | public class ConcurrentLinkedDequeTest e
499		*/
500		public void testLastElement() {
501		ConcurrentLinkedDeque q = populatedDeque(SIZE);
502	<	for (int i = SIZE-1; i >= 0; --i) {
502	>	for (int i = SIZE - 1; i >= 0; --i) {
503		assertEquals(i, q.getLast());
504		assertEquals(i, q.pollLast());
505		}
#	Line 550 | Line 550 | public class ConcurrentLinkedDequeTest e
550		}
551		for (int i = 0; i < SIZE; i += 2) {
552		assertTrue(q.removeFirstOccurrence(new Integer(i)));
553	<	assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
553	>	assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
554		}
555		assertTrue(q.isEmpty());
556		}
#	Line 565 | Line 565 | public class ConcurrentLinkedDequeTest e
565		}
566		for (int i = 0; i < SIZE; i += 2) {
567		assertTrue(q.removeLastOccurrence(new Integer(i)));
568	<	assertFalse(q.removeLastOccurrence(new Integer(i+1)));
568	>	assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
569		}
570		assertTrue(q.isEmpty());
571		}
#	Line 624 | Line 624 | public class ConcurrentLinkedDequeTest e
624		assertTrue(changed);
625
626		assertTrue(q.containsAll(p));
627	<	assertEquals(SIZE-i, q.size());
627	>	assertEquals(SIZE - i, q.size());
628		p.remove();
629		}
630		}
#	Line 637 | Line 637 | public class ConcurrentLinkedDequeTest e
637		ConcurrentLinkedDeque q = populatedDeque(SIZE);
638		ConcurrentLinkedDeque p = populatedDeque(i);
639		assertTrue(q.removeAll(p));
640	<	assertEquals(SIZE-i, q.size());
640	>	assertEquals(SIZE - i, q.size());
641		for (int j = 0; j < i; ++j) {
642		Integer x = (Integer)(p.remove());
643		assertFalse(q.contains(x));
#	Line 753 | Line 753 | public class ConcurrentLinkedDequeTest e
753		final Random rng = new Random();
754		for (int iters = 0; iters < 100; ++iters) {
755		int max = rng.nextInt(5) + 2;
756	<	int split = rng.nextInt(max-1) + 1;
756	>	int split = rng.nextInt(max - 1) + 1;
757		for (int j = 1; j <= max; ++j)
758		q.add(new Integer(j));
759		Iterator it = q.iterator();
760		for (int j = 1; j <= split; ++j)
761		assertEquals(it.next(), new Integer(j));
762		it.remove();
763	<	assertEquals(it.next(), new Integer(split+1));
763	>	assertEquals(it.next(), new Integer(split + 1));
764		for (int j = 1; j <= split; ++j)
765		q.remove(new Integer(j));
766		it = q.iterator();
767	<	for (int j = split+1; j <= max; ++j) {
767	>	for (int j = split + 1; j <= max; ++j) {
768		assertEquals(it.next(), new Integer(j));
769		it.remove();
770		}
#	Line 821 | Line 821 | public class ConcurrentLinkedDequeTest e
821		final Random rng = new Random();
822		for (int iters = 0; iters < 100; ++iters) {
823		int max = rng.nextInt(5) + 2;
824	<	int split = rng.nextInt(max-1) + 1;
824	>	int split = rng.nextInt(max - 1) + 1;
825		for (int j = max; j >= 1; --j)
826		q.add(new Integer(j));
827		Iterator it = q.descendingIterator();
828		for (int j = 1; j <= split; ++j)
829		assertEquals(it.next(), new Integer(j));
830		it.remove();
831	<	assertEquals(it.next(), new Integer(split+1));
831	>	assertEquals(it.next(), new Integer(split + 1));
832		for (int j = 1; j <= split; ++j)
833		q.remove(new Integer(j));
834		it = q.descendingIterator();
835	<	for (int j = split+1; j <= max; ++j) {
835	>	for (int j = split + 1; j <= max; ++j) {
836		assertEquals(it.next(), new Integer(j));
837		it.remove();
838		}

Diff Legend

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