ViewVC Help

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

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

Comparing jsr166/src/test/tck/ArrayDequeTest.java (file contents):
Revision 1.27 by jsr166, Wed Feb 20 12:07:45 2013 UTC vs.
Revision 1.53 by jsr166, Thu Nov 3 15:45:56 2016 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by Doug Lea with assistance from members of JCP JSR-166
3	<	* Expert Group and released to the public domain, as explained at
2	>	* Written by Doug Lea and Martin Buchholz with assistance from
3	>	* members of JCP JSR-166 Expert Group and released to the public
4	>	* domain, as explained at
5		* http://creativecommons.org/publicdomain/zero/1.0/
6		*/
7
7	–	import junit.framework.*;
8	–	import java.util.Arrays;
8		import java.util.ArrayDeque;
9	+	import java.util.Arrays;
10		import java.util.Collection;
11	+	import java.util.Collections;
12		import java.util.Deque;
13		import java.util.Iterator;
14		import java.util.NoSuchElementException;
15		import java.util.Queue;
16		import java.util.Random;
17	+	import java.util.concurrent.ThreadLocalRandom;
18	+
19	+	import junit.framework.Test;
20	+	import junit.framework.TestSuite;
21
22		public class ArrayDequeTest extends JSR166TestCase {
23		public static void main(String[] args) {
24	<	junit.textui.TestRunner.run(suite());
24	>	main(suite(), args);
25		}
26
27		public static Test suite() {
28	<	return new TestSuite(ArrayDequeTest.class);
28	>	class Implementation implements CollectionImplementation {
29	>	public Class<?> klazz() { return ArrayDeque.class; }
30	>	public Collection emptyCollection() { return populatedDeque(0); }
31	>	public Object makeElement(int i) { return i; }
32	>	public boolean isConcurrent() { return false; }
33	>	public boolean permitsNulls() { return false; }
34	>	}
35	>	return newTestSuite(ArrayDequeTest.class,
36	>	CollectionTest.testSuite(new Implementation()));
37		}
38
39		/**
40		* Returns a new deque of given size containing consecutive
41	<	* Integers 0 ... n.
41	>	* Integers 0 ... n - 1.
42		*/
43	<	private ArrayDeque<Integer> populatedDeque(int n) {
44	<	ArrayDeque<Integer> q = new ArrayDeque<Integer>();
43	>	private static ArrayDeque<Integer> populatedDeque(int n) {
44	>	// Randomize various aspects of memory layout, including
45	>	// filled-to-capacity and wraparound.
46	>	final ArrayDeque<Integer> q;
47	>	ThreadLocalRandom rnd = ThreadLocalRandom.current();
48	>	switch (rnd.nextInt(6)) {
49	>	case 0: q = new ArrayDeque<Integer>();      break;
50	>	case 1: q = new ArrayDeque<Integer>(0);     break;
51	>	case 2: q = new ArrayDeque<Integer>(1);     break;
52	>	case 3: q = new ArrayDeque<Integer>(Math.max(0, n - 1)); break;
53	>	case 4: q = new ArrayDeque<Integer>(n);     break;
54	>	case 5: q = new ArrayDeque<Integer>(n + 1); break;
55	>	default: throw new AssertionError();
56	>	}
57	>	switch (rnd.nextInt(3)) {
58	>	case 0:
59	>	q.addFirst(42);
60	>	assertEquals((Integer) 42, q.removeLast());
61	>	break;
62	>	case 1:
63	>	q.addLast(42);
64	>	assertEquals((Integer) 42, q.removeFirst());
65	>	break;
66	>	case 2: /* do nothing */ break;
67	>	default: throw new AssertionError();
68	>	}
69		assertTrue(q.isEmpty());
70	<	for (int i = 0; i < n; ++i)
71	<	assertTrue(q.offerLast(new Integer(i)));
72	<	assertFalse(q.isEmpty());
70	>	if (rnd.nextBoolean())
71	>	for (int i = 0; i < n; i++)
72	>	assertTrue(q.offerLast((Integer) i));
73	>	else
74	>	for (int i = n; --i >= 0; )
75	>	q.addFirst((Integer) i);
76		assertEquals(n, q.size());
77	+	if (n > 0) {
78	+	assertFalse(q.isEmpty());
79	+	assertEquals((Integer) 0, q.peekFirst());
80	+	assertEquals((Integer) (n - 1), q.peekLast());
81	+	}
82		return q;
83		}
84
#	Line 49 | Line 94 | public class ArrayDequeTest extends JSR1
94		*/
95		public void testConstructor3() {
96		try {
97	<	ArrayDeque q = new ArrayDeque((Collection)null);
97	>	new ArrayDeque((Collection)null);
98		shouldThrow();
99		} catch (NullPointerException success) {}
100		}
#	Line 59 | Line 104 | public class ArrayDequeTest extends JSR1
104		*/
105		public void testConstructor4() {
106		try {
107	<	Integer[] ints = new Integer[SIZE];
63	<	ArrayDeque q = new ArrayDeque(Arrays.asList(ints));
107	>	new ArrayDeque(Arrays.asList(new Integer[SIZE]));
108		shouldThrow();
109		} catch (NullPointerException success) {}
110		}
#	Line 69 | Line 113 | public class ArrayDequeTest extends JSR1
113		* Initializing from Collection with some null elements throws NPE
114		*/
115		public void testConstructor5() {
116	+	Integer[] ints = new Integer[SIZE];
117	+	for (int i = 0; i < SIZE - 1; ++i)
118	+	ints[i] = new Integer(i);
119		try {
120	<	Integer[] ints = new Integer[SIZE];
74	<	for (int i = 0; i < SIZE-1; ++i)
75	<	ints[i] = new Integer(i);
76	<	ArrayDeque q = new ArrayDeque(Arrays.asList(ints));
120	>	new ArrayDeque(Arrays.asList(ints));
121		shouldThrow();
122		} catch (NullPointerException success) {}
123		}
#	Line 110 | Line 154 | public class ArrayDequeTest extends JSR1
154		public void testSize() {
155		ArrayDeque q = populatedDeque(SIZE);
156		for (int i = 0; i < SIZE; ++i) {
157	<	assertEquals(SIZE-i, q.size());
157	>	assertEquals(SIZE - i, q.size());
158		q.removeFirst();
159		}
160		for (int i = 0; i < SIZE; ++i) {
#	Line 123 | Line 167 | public class ArrayDequeTest extends JSR1
167		* push(null) throws NPE
168		*/
169		public void testPushNull() {
170	+	ArrayDeque q = new ArrayDeque(1);
171		try {
127	–	ArrayDeque q = new ArrayDeque(1);
172		q.push(null);
173		shouldThrow();
174		} catch (NullPointerException success) {}
#	Line 158 | Line 202 | public class ArrayDequeTest extends JSR1
202		* offer(null) throws NPE
203		*/
204		public void testOfferNull() {
205	+	ArrayDeque q = new ArrayDeque();
206		try {
162	–	ArrayDeque q = new ArrayDeque();
207		q.offer(null);
208		shouldThrow();
209		} catch (NullPointerException success) {}
#	Line 169 | Line 213 | public class ArrayDequeTest extends JSR1
213		* offerFirst(null) throws NPE
214		*/
215		public void testOfferFirstNull() {
216	+	ArrayDeque q = new ArrayDeque();
217		try {
173	–	ArrayDeque q = new ArrayDeque();
218		q.offerFirst(null);
219		shouldThrow();
220		} catch (NullPointerException success) {}
#	Line 180 | Line 224 | public class ArrayDequeTest extends JSR1
224		* offerLast(null) throws NPE
225		*/
226		public void testOfferLastNull() {
227	+	ArrayDeque q = new ArrayDeque();
228		try {
184	–	ArrayDeque q = new ArrayDeque();
229		q.offerLast(null);
230		shouldThrow();
231		} catch (NullPointerException success) {}
#	Line 224 | Line 268 | public class ArrayDequeTest extends JSR1
268		* add(null) throws NPE
269		*/
270		public void testAddNull() {
271	+	ArrayDeque q = new ArrayDeque();
272		try {
228	–	ArrayDeque q = new ArrayDeque();
273		q.add(null);
274		shouldThrow();
275		} catch (NullPointerException success) {}
#	Line 235 | Line 279 | public class ArrayDequeTest extends JSR1
279		* addFirst(null) throws NPE
280		*/
281		public void testAddFirstNull() {
282	+	ArrayDeque q = new ArrayDeque();
283		try {
239	–	ArrayDeque q = new ArrayDeque();
284		q.addFirst(null);
285		shouldThrow();
286		} catch (NullPointerException success) {}
#	Line 246 | Line 290 | public class ArrayDequeTest extends JSR1
290		* addLast(null) throws NPE
291		*/
292		public void testAddLastNull() {
293	+	ArrayDeque q = new ArrayDeque();
294		try {
250	–	ArrayDeque q = new ArrayDeque();
295		q.addLast(null);
296		shouldThrow();
297		} catch (NullPointerException success) {}
#	Line 290 | Line 334 | public class ArrayDequeTest extends JSR1
334		* addAll(null) throws NPE
335		*/
336		public void testAddAll1() {
337	+	ArrayDeque q = new ArrayDeque();
338		try {
294	–	ArrayDeque q = new ArrayDeque();
339		q.addAll(null);
340		shouldThrow();
341		} catch (NullPointerException success) {}
#	Line 301 | Line 345 | public class ArrayDequeTest extends JSR1
345		* addAll of a collection with null elements throws NPE
346		*/
347		public void testAddAll2() {
348	+	ArrayDeque q = new ArrayDeque();
349		try {
350	<	ArrayDeque q = new ArrayDeque();
306	<	Integer[] ints = new Integer[SIZE];
307	<	q.addAll(Arrays.asList(ints));
350	>	q.addAll(Arrays.asList(new Integer[SIZE]));
351		shouldThrow();
352		} catch (NullPointerException success) {}
353		}
#	Line 314 | Line 357 | public class ArrayDequeTest extends JSR1
357		* possibly adding some elements
358		*/
359		public void testAddAll3() {
360	+	ArrayDeque q = new ArrayDeque();
361	+	Integer[] ints = new Integer[SIZE];
362	+	for (int i = 0; i < SIZE - 1; ++i)
363	+	ints[i] = new Integer(i);
364		try {
318	–	ArrayDeque q = new ArrayDeque();
319	–	Integer[] ints = new Integer[SIZE];
320	–	for (int i = 0; i < SIZE-1; ++i)
321	–	ints[i] = new Integer(i);
365		q.addAll(Arrays.asList(ints));
366		shouldThrow();
367		} catch (NullPointerException success) {}
#	Line 355 | Line 398 | public class ArrayDequeTest extends JSR1
398		*/
399		public void testPollLast() {
400		ArrayDeque q = populatedDeque(SIZE);
401	<	for (int i = SIZE-1; i >= 0; --i) {
401	>	for (int i = SIZE - 1; i >= 0; --i) {
402		assertEquals(i, q.pollLast());
403		}
404		assertNull(q.pollLast());
#	Line 391 | Line 434 | public class ArrayDequeTest extends JSR1
434		*/
435		public void testRemoveElement() {
436		ArrayDeque q = populatedDeque(SIZE);
437	<	for (int i = 1; i < SIZE; i+=2) {
437	>	for (int i = 1; i < SIZE; i += 2) {
438		assertTrue(q.contains(i));
439		assertTrue(q.remove(i));
440		assertFalse(q.contains(i));
441	<	assertTrue(q.contains(i-1));
441	>	assertTrue(q.contains(i - 1));
442		}
443	<	for (int i = 0; i < SIZE; i+=2) {
443	>	for (int i = 0; i < SIZE; i += 2) {
444		assertTrue(q.contains(i));
445		assertTrue(q.remove(i));
446		assertFalse(q.contains(i));
447	<	assertFalse(q.remove(i+1));
448	<	assertFalse(q.contains(i+1));
447	>	assertFalse(q.remove(i + 1));
448	>	assertFalse(q.contains(i + 1));
449		}
450		assertTrue(q.isEmpty());
451		}
#	Line 440 | Line 483 | public class ArrayDequeTest extends JSR1
483		*/
484		public void testPeekLast() {
485		ArrayDeque q = populatedDeque(SIZE);
486	<	for (int i = SIZE-1; i >= 0; --i) {
486	>	for (int i = SIZE - 1; i >= 0; --i) {
487		assertEquals(i, q.peekLast());
488		assertEquals(i, q.pollLast());
489		assertTrue(q.peekLast() == null ||
#	Line 484 | Line 527 | public class ArrayDequeTest extends JSR1
527		*/
528		public void testLastElement() {
529		ArrayDeque q = populatedDeque(SIZE);
530	<	for (int i = SIZE-1; i >= 0; --i) {
530	>	for (int i = SIZE - 1; i >= 0; --i) {
531		assertEquals(i, q.getLast());
532		assertEquals(i, q.pollLast());
533		}
#	Line 529 | Line 572 | public class ArrayDequeTest extends JSR1
572		* removeFirstOccurrence(x) removes x and returns true if present
573		*/
574		public void testRemoveFirstOccurrence() {
575	<	ArrayDeque q = populatedDeque(SIZE);
576	<	for (int i = 1; i < SIZE; i+=2) {
577	<	assertTrue(q.removeFirstOccurrence(new Integer(i)));
575	>	Deque<Integer> q = populatedDeque(SIZE);
576	>	assertFalse(q.removeFirstOccurrence(null));
577	>	for (int i = 1; i < SIZE; i += 2) {
578	>	assertTrue(q.removeFirstOccurrence(i));
579	>	assertFalse(q.contains(i));
580		}
581	<	for (int i = 0; i < SIZE; i+=2) {
582	<	assertTrue(q.removeFirstOccurrence(new Integer(i)));
583	<	assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
581	>	for (int i = 0; i < SIZE; i += 2) {
582	>	assertTrue(q.removeFirstOccurrence(i));
583	>	assertFalse(q.removeFirstOccurrence(i + 1));
584	>	assertFalse(q.contains(i));
585	>	assertFalse(q.contains(i + 1));
586		}
587		assertTrue(q.isEmpty());
588	+	assertFalse(q.removeFirstOccurrence(null));
589	+	assertFalse(q.removeFirstOccurrence(42));
590	+	q = new ArrayDeque();
591	+	assertFalse(q.removeFirstOccurrence(null));
592	+	assertFalse(q.removeFirstOccurrence(42));
593		}
594
595		/**
596		* removeLastOccurrence(x) removes x and returns true if present
597		*/
598		public void testRemoveLastOccurrence() {
599	<	ArrayDeque q = populatedDeque(SIZE);
600	<	for (int i = 1; i < SIZE; i+=2) {
601	<	assertTrue(q.removeLastOccurrence(new Integer(i)));
599	>	Deque<Integer> q = populatedDeque(SIZE);
600	>	assertFalse(q.removeLastOccurrence(null));
601	>	for (int i = 1; i < SIZE; i += 2) {
602	>	assertTrue(q.removeLastOccurrence(i));
603	>	assertFalse(q.contains(i));
604		}
605	<	for (int i = 0; i < SIZE; i+=2) {
606	<	assertTrue(q.removeLastOccurrence(new Integer(i)));
607	<	assertFalse(q.removeLastOccurrence(new Integer(i+1)));
605	>	for (int i = 0; i < SIZE; i += 2) {
606	>	assertTrue(q.removeLastOccurrence(i));
607	>	assertFalse(q.removeLastOccurrence(i + 1));
608	>	assertFalse(q.contains(i));
609	>	assertFalse(q.contains(i + 1));
610		}
611		assertTrue(q.isEmpty());
612	+	assertFalse(q.removeLastOccurrence(null));
613	+	assertFalse(q.removeLastOccurrence(42));
614	+	q = new ArrayDeque();
615	+	assertFalse(q.removeLastOccurrence(null));
616	+	assertFalse(q.removeLastOccurrence(42));
617		}
618
619		/**
#	Line 605 | Line 666 | public class ArrayDequeTest extends JSR1
666		boolean changed = q.retainAll(p);
667		assertEquals(changed, (i > 0));
668		assertTrue(q.containsAll(p));
669	<	assertEquals(SIZE-i, q.size());
669	>	assertEquals(SIZE - i, q.size());
670		p.removeFirst();
671		}
672		}
#	Line 618 | Line 679 | public class ArrayDequeTest extends JSR1
679		ArrayDeque q = populatedDeque(SIZE);
680		ArrayDeque p = populatedDeque(i);
681		assertTrue(q.removeAll(p));
682	<	assertEquals(SIZE-i, q.size());
682	>	assertEquals(SIZE - i, q.size());
683		for (int j = 0; j < i; ++j) {
684		assertFalse(q.contains(p.removeFirst()));
685		}
686		}
687		}
688
689	<	void checkToArray(ArrayDeque q) {
689	>	void checkToArray(ArrayDeque<Integer> q) {
690		int size = q.size();
691	<	Object[] o = q.toArray();
692	<	assertEquals(size, o.length);
691	>	Object[] a1 = q.toArray();
692	>	assertEquals(size, a1.length);
693	>	Integer[] a2 = q.toArray(new Integer[0]);
694	>	assertEquals(size, a2.length);
695	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
696	>	assertEquals(size, a3.length);
697	>	Integer[] a4 = new Integer[size];
698	>	assertSame(a4, q.toArray(a4));
699	>	Integer[] a5 = new Integer[size + 1];
700	>	Arrays.fill(a5, 42);
701	>	assertSame(a5, q.toArray(a5));
702	>	Integer[] a6 = new Integer[size + 2];
703	>	Arrays.fill(a6, 42);
704	>	assertSame(a6, q.toArray(a6));
705	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
706	>	for (Object[] a : as) {
707	>	if (a.length > size) assertNull(a[size]);
708	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
709	>	}
710		Iterator it = q.iterator();
711	+	Integer s = q.peekFirst();
712		for (int i = 0; i < size; i++) {
713		Integer x = (Integer) it.next();
714	<	assertEquals((Integer)o[0] + i, (int) x);
715	<	assertSame(o[i], x);
714	>	assertEquals(s + i, (int) x);
715	>	for (Object[] a : as)
716	>	assertSame(a1[i], x);
717		}
718		}
719
720		/**
721	<	* toArray() contains all elements in FIFO order
721	>	* toArray() and toArray(a) contain all elements in FIFO order
722		*/
723		public void testToArray() {
724	<	ArrayDeque q = new ArrayDeque();
725	<	for (int i = 0; i < SIZE; i++) {
724	>	final int size = ThreadLocalRandom.current().nextInt(10);
725	>	ArrayDeque<Integer> q = new ArrayDeque<>(size);
726	>	for (int i = 0; i < size; i++) {
727		checkToArray(q);
728		q.addLast(i);
729		}
730		// Provoke wraparound
731	<	for (int i = 0; i < SIZE; i++) {
731	>	int added = size * 2;
732	>	for (int i = 0; i < added; i++) {
733		checkToArray(q);
734	<	assertEquals(i, q.poll());
735	<	q.addLast(SIZE+i);
734	>	assertEquals((Integer) i, q.poll());
735	>	q.addLast(size + i);
736		}
655	–	for (int i = 0; i < SIZE; i++) {
656	–	checkToArray(q);
657	–	assertEquals(SIZE+i, q.poll());
658	–	}
659	–	}
660	–
661	–	void checkToArray2(ArrayDeque q) {
662	–	int size = q.size();
663	–	Integer[] a1 = size == 0 ? null : new Integer[size-1];
664	–	Integer[] a2 = new Integer[size];
665	–	Integer[] a3 = new Integer[size+2];
666	–	if (size > 0) Arrays.fill(a1, 42);
667	–	Arrays.fill(a2, 42);
668	–	Arrays.fill(a3, 42);
669	–	Integer[] b1 = size == 0 ? null : (Integer[]) q.toArray(a1);
670	–	Integer[] b2 = (Integer[]) q.toArray(a2);
671	–	Integer[] b3 = (Integer[]) q.toArray(a3);
672	–	assertSame(a2, b2);
673	–	assertSame(a3, b3);
674	–	Iterator it = q.iterator();
737		for (int i = 0; i < size; i++) {
738	<	Integer x = (Integer) it.next();
739	<	assertSame(b1[i], x);
678	<	assertEquals(b1[0] + i, (int) x);
679	<	assertSame(b2[i], x);
680	<	assertSame(b3[i], x);
681	<	}
682	<	assertNull(a3[size]);
683	<	assertEquals(42, (int) a3[size+1]);
684	<	if (size > 0) {
685	<	assertNotSame(a1, b1);
686	<	assertEquals(size, b1.length);
687	<	for (int i = 0; i < a1.length; i++) {
688	<	assertEquals(42, (int) a1[i]);
689	<	}
690	<	}
691	<	}
692	<
693	<	/**
694	<	* toArray(a) contains all elements in FIFO order
695	<	*/
696	<	public void testToArray2() {
697	<	ArrayDeque q = new ArrayDeque();
698	<	for (int i = 0; i < SIZE; i++) {
699	<	checkToArray2(q);
700	<	q.addLast(i);
701	<	}
702	<	// Provoke wraparound
703	<	for (int i = 0; i < SIZE; i++) {
704	<	checkToArray2(q);
705	<	assertEquals(i, q.poll());
706	<	q.addLast(SIZE+i);
707	<	}
708	<	for (int i = 0; i < SIZE; i++) {
709	<	checkToArray2(q);
710	<	assertEquals(SIZE+i, q.poll());
738	>	checkToArray(q);
739	>	assertEquals((Integer) (added + i), q.poll());
740		}
741		}
742
#	Line 726 | Line 755 | public class ArrayDequeTest extends JSR1
755		/**
756		* toArray(incompatible array type) throws ArrayStoreException
757		*/
758	<	public void testToArray1_BadArg() {
758	>	public void testToArray_incompatibleArrayType() {
759		ArrayDeque l = new ArrayDeque();
760		l.add(new Integer(5));
761		try {
762		l.toArray(new String[10]);
763		shouldThrow();
764		} catch (ArrayStoreException success) {}
765	+	try {
766	+	l.toArray(new String[0]);
767	+	shouldThrow();
768	+	} catch (ArrayStoreException success) {}
769		}
770
771		/**
#	Line 740 | Line 773 | public class ArrayDequeTest extends JSR1
773		*/
774		public void testIterator() {
775		ArrayDeque q = populatedDeque(SIZE);
743	–	int i = 0;
776		Iterator it = q.iterator();
777	<	while (it.hasNext()) {
777	>	int i;
778	>	for (i = 0; it.hasNext(); i++)
779		assertTrue(q.contains(it.next()));
747	–	++i;
748	–	}
780		assertEquals(i, SIZE);
781	+	assertIteratorExhausted(it);
782	+	}
783	+
784	+	/**
785	+	* iterator of empty collection has no elements
786	+	*/
787	+	public void testEmptyIterator() {
788	+	Deque c = new ArrayDeque();
789	+	assertIteratorExhausted(c.iterator());
790	+	assertIteratorExhausted(c.descendingIterator());
791		}
792
793		/**
#	Line 773 | Line 814 | public class ArrayDequeTest extends JSR1
814		final Random rng = new Random();
815		for (int iters = 0; iters < 100; ++iters) {
816		int max = rng.nextInt(5) + 2;
817	<	int split = rng.nextInt(max-1) + 1;
817	>	int split = rng.nextInt(max - 1) + 1;
818		for (int j = 1; j <= max; ++j)
819		q.add(new Integer(j));
820		Iterator it = q.iterator();
821		for (int j = 1; j <= split; ++j)
822		assertEquals(it.next(), new Integer(j));
823		it.remove();
824	<	assertEquals(it.next(), new Integer(split+1));
824	>	assertEquals(it.next(), new Integer(split + 1));
825		for (int j = 1; j <= split; ++j)
826		q.remove(new Integer(j));
827		it = q.iterator();
828	<	for (int j = split+1; j <= max; ++j) {
828	>	for (int j = split + 1; j <= max; ++j) {
829		assertEquals(it.next(), new Integer(j));
830		it.remove();
831		}
#	Line 841 | Line 882 | public class ArrayDequeTest extends JSR1
882		final Random rng = new Random();
883		for (int iters = 0; iters < 100; ++iters) {
884		int max = rng.nextInt(5) + 2;
885	<	int split = rng.nextInt(max-1) + 1;
885	>	int split = rng.nextInt(max - 1) + 1;
886		for (int j = max; j >= 1; --j)
887		q.add(new Integer(j));
888		Iterator it = q.descendingIterator();
889		for (int j = 1; j <= split; ++j)
890		assertEquals(it.next(), new Integer(j));
891		it.remove();
892	<	assertEquals(it.next(), new Integer(split+1));
892	>	assertEquals(it.next(), new Integer(split + 1));
893		for (int j = 1; j <= split; ++j)
894		q.remove(new Integer(j));
895		it = q.descendingIterator();
896	<	for (int j = split+1; j <= max; ++j) {
896	>	for (int j = split + 1; j <= max; ++j) {
897		assertEquals(it.next(), new Integer(j));
898		it.remove();
899		}
#	Line 879 | Line 920 | public class ArrayDequeTest extends JSR1
920		Queue x = populatedDeque(SIZE);
921		Queue y = serialClone(x);
922
923	<	assertTrue(x != y);
923	>	assertNotSame(y, x);
924	>	assertEquals(x.size(), y.size());
925	>	assertEquals(x.toString(), y.toString());
926	>	assertEquals(Arrays.toString(x.toArray()), Arrays.toString(y.toArray()));
927	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
928	>	while (!x.isEmpty()) {
929	>	assertFalse(y.isEmpty());
930	>	assertEquals(x.remove(), y.remove());
931	>	}
932	>	assertTrue(y.isEmpty());
933	>	}
934	>
935	>	/**
936	>	* A cloned deque has same elements in same order
937	>	*/
938	>	public void testClone() throws Exception {
939	>	ArrayDeque<Integer> x = populatedDeque(SIZE);
940	>	ArrayDeque<Integer> y = x.clone();
941	>
942	>	assertNotSame(y, x);
943		assertEquals(x.size(), y.size());
944		assertEquals(x.toString(), y.toString());
945		assertTrue(Arrays.equals(x.toArray(), y.toArray()));
#	Line 890 | Line 950 | public class ArrayDequeTest extends JSR1
950		assertTrue(y.isEmpty());
951		}
952
953	+	/**
954	+	* remove(null), contains(null) always return false
955	+	*/
956	+	public void testNeverContainsNull() {
957	+	Deque<?>[] qs = {
958	+	new ArrayDeque<Object>(),
959	+	populatedDeque(2),
960	+	};
961	+
962	+	for (Deque<?> q : qs) {
963	+	assertFalse(q.contains(null));
964	+	assertFalse(q.remove(null));
965	+	assertFalse(q.removeFirstOccurrence(null));
966	+	assertFalse(q.removeLastOccurrence(null));
967	+	}
968	+	}
969	+
970		}

Diff Legend

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