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.9 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.51 by jsr166, Tue Oct 25 01:32:55 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
4	<	* http://creativecommons.org/licenses/publicdomain
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
8	<	import junit.framework.*;
9	<	import java.util.*;
10	<	import java.util.concurrent.*;
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	<	* Create a queue of given size containing consecutive
41	<	* Integers 0 ... n.
42	<	*/
43	<	private ArrayDeque populatedDeque(int n) {
44	<	ArrayDeque q = new ArrayDeque();
40	>	* Returns a new deque of given size containing consecutive
41	>	* Integers 0 ... n - 1.
42	>	*/
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
85		/**
86	<	* new queue is empty
86	>	* new deque is empty
87		*/
88		public void testConstructor1() {
89		assertEquals(0, new ArrayDeque().size());
#	Line 43 | 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	>	}
101	>
102	>	/**
103	>	* Initializing from Collection of null elements throws NPE
104	>	*/
105	>	public void testConstructor4() {
106	>	try {
107	>	new ArrayDeque(Arrays.asList(new Integer[SIZE]));
108		shouldThrow();
109		} catch (NullPointerException success) {}
110		}
111
112		/**
113	<	* Queue contains all elements of collection used to initialize
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	>	new ArrayDeque(Arrays.asList(ints));
121	>	shouldThrow();
122	>	} catch (NullPointerException success) {}
123	>	}
124
125	+	/**
126	+	* Deque contains all elements of collection used to initialize
127		*/
128		public void testConstructor6() {
129		Integer[] ints = new Integer[SIZE];
#	Line 81 | 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 94 | 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 {
98	–	ArrayDeque q = new ArrayDeque(1);
172		q.push(null);
173		shouldThrow();
174		} catch (NullPointerException success) {}
175		}
176
177		/**
178	<	* peekFirst returns element inserted with push
178	>	* peekFirst() returns element inserted with push
179		*/
180		public void testPush() {
181		ArrayDeque q = populatedDeque(3);
182		q.pollLast();
183		q.push(four);
184	<	assertEquals(four,q.peekFirst());
184	>	assertSame(four, q.peekFirst());
185		}
186
187		/**
188	<	*  pop removes next element, or throws NSEE if empty
188	>	* pop() removes next element, or throws NSEE if empty
189		*/
190		public void testPop() {
191		ArrayDeque q = populatedDeque(SIZE);
192		for (int i = 0; i < SIZE; ++i) {
193	<	assertEquals(i, ((Integer)q.pop()).intValue());
193	>	assertEquals(i, q.pop());
194		}
195		try {
196		q.pop();
#	Line 128 | Line 201 | public class ArrayDequeTest extends JSR1
201		/**
202		* offer(null) throws NPE
203		*/
204	+	public void testOfferNull() {
205	+	ArrayDeque q = new ArrayDeque();
206	+	try {
207	+	q.offer(null);
208	+	shouldThrow();
209	+	} catch (NullPointerException success) {}
210	+	}
211	+
212	+	/**
213	+	* offerFirst(null) throws NPE
214	+	*/
215		public void testOfferFirstNull() {
216	+	ArrayDeque q = new ArrayDeque();
217		try {
133	–	ArrayDeque q = new ArrayDeque();
218		q.offerFirst(null);
219		shouldThrow();
220		} catch (NullPointerException success) {}
221		}
222
223		/**
224	<	* OfferFirst succeeds
224	>	* offerLast(null) throws NPE
225	>	*/
226	>	public void testOfferLastNull() {
227	>	ArrayDeque q = new ArrayDeque();
228	>	try {
229	>	q.offerLast(null);
230	>	shouldThrow();
231	>	} catch (NullPointerException success) {}
232	>	}
233	>
234	>	/**
235	>	* offer(x) succeeds
236	>	*/
237	>	public void testOffer() {
238	>	ArrayDeque q = new ArrayDeque();
239	>	assertTrue(q.offer(zero));
240	>	assertTrue(q.offer(one));
241	>	assertSame(zero, q.peekFirst());
242	>	assertSame(one, q.peekLast());
243	>	}
244	>
245	>	/**
246	>	* offerFirst(x) succeeds
247		*/
248		public void testOfferFirst() {
249		ArrayDeque q = new ArrayDeque();
250	<	assertTrue(q.offerFirst(new Integer(0)));
251	<	assertTrue(q.offerFirst(new Integer(1)));
250	>	assertTrue(q.offerFirst(zero));
251	>	assertTrue(q.offerFirst(one));
252	>	assertSame(one, q.peekFirst());
253	>	assertSame(zero, q.peekLast());
254		}
255
256		/**
257	<	* OfferLast succeeds
257	>	* offerLast(x) succeeds
258		*/
259		public void testOfferLast() {
260		ArrayDeque q = new ArrayDeque();
261	<	assertTrue(q.offerLast(new Integer(0)));
262	<	assertTrue(q.offerLast(new Integer(1)));
261	>	assertTrue(q.offerLast(zero));
262	>	assertTrue(q.offerLast(one));
263	>	assertSame(zero, q.peekFirst());
264	>	assertSame(one, q.peekLast());
265	>	}
266	>
267	>	/**
268	>	* add(null) throws NPE
269	>	*/
270	>	public void testAddNull() {
271	>	ArrayDeque q = new ArrayDeque();
272	>	try {
273	>	q.add(null);
274	>	shouldThrow();
275	>	} catch (NullPointerException success) {}
276	>	}
277	>
278	>	/**
279	>	* addFirst(null) throws NPE
280	>	*/
281	>	public void testAddFirstNull() {
282	>	ArrayDeque q = new ArrayDeque();
283	>	try {
284	>	q.addFirst(null);
285	>	shouldThrow();
286	>	} catch (NullPointerException success) {}
287	>	}
288	>
289	>	/**
290	>	* addLast(null) throws NPE
291	>	*/
292	>	public void testAddLastNull() {
293	>	ArrayDeque q = new ArrayDeque();
294	>	try {
295	>	q.addLast(null);
296	>	shouldThrow();
297	>	} catch (NullPointerException success) {}
298		}
299
300		/**
301	<	* add succeeds
301	>	* add(x) succeeds
302		*/
303		public void testAdd() {
304		ArrayDeque q = new ArrayDeque();
305	<	for (int i = 0; i < SIZE; ++i) {
306	<	assertEquals(i, q.size());
307	<	assertTrue(q.add(new Integer(i)));
308	<	}
305	>	assertTrue(q.add(zero));
306	>	assertTrue(q.add(one));
307	>	assertSame(zero, q.peekFirst());
308	>	assertSame(one, q.peekLast());
309	>	}
310	>
311	>	/**
312	>	* addFirst(x) succeeds
313	>	*/
314	>	public void testAddFirst() {
315	>	ArrayDeque q = new ArrayDeque();
316	>	q.addFirst(zero);
317	>	q.addFirst(one);
318	>	assertSame(one, q.peekFirst());
319	>	assertSame(zero, q.peekLast());
320	>	}
321	>
322	>	/**
323	>	* addLast(x) succeeds
324	>	*/
325	>	public void testAddLast() {
326	>	ArrayDeque q = new ArrayDeque();
327	>	q.addLast(zero);
328	>	q.addLast(one);
329	>	assertSame(zero, q.peekFirst());
330	>	assertSame(one, q.peekLast());
331		}
332
333		/**
334		* addAll(null) throws NPE
335		*/
336		public void testAddAll1() {
337	+	ArrayDeque q = new ArrayDeque();
338		try {
173	–	ArrayDeque q = new ArrayDeque();
339		q.addAll(null);
340		shouldThrow();
341		} catch (NullPointerException success) {}
342		}
343
344		/**
345	<	* Queue contains all elements, in traversal order, of successful addAll
345	>	* addAll of a collection with null elements throws NPE
346		*/
347	<	public void testAddAll5() {
347	>	public void testAddAll2() {
348	>	ArrayDeque q = new ArrayDeque();
349		try {
350	<	Integer[] empty = new Integer[0];
351	<	Integer[] ints = new Integer[SIZE];
352	<	for (int i = 0; i < SIZE; ++i)
187	<	ints[i] = new Integer(i);
188	<	ArrayDeque q = new ArrayDeque();
189	<	assertFalse(q.addAll(Arrays.asList(empty)));
190	<	assertTrue(q.addAll(Arrays.asList(ints)));
191	<	for (int i = 0; i < SIZE; ++i)
192	<	assertEquals(ints[i], q.pollFirst());
193	<	}
194	<	finally {}
350	>	q.addAll(Arrays.asList(new Integer[SIZE]));
351	>	shouldThrow();
352	>	} catch (NullPointerException success) {}
353		}
354
355		/**
356	<	*  pollFirst succeeds unless empty
356	>	* addAll of a collection with any null elements throws NPE after
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 {
365	>	q.addAll(Arrays.asList(ints));
366	>	shouldThrow();
367	>	} catch (NullPointerException success) {}
368	>	}
369	>
370	>	/**
371	>	* Deque contains all elements, in traversal order, of successful addAll
372	>	*/
373	>	public void testAddAll5() {
374	>	Integer[] empty = new Integer[0];
375	>	Integer[] ints = new Integer[SIZE];
376	>	for (int i = 0; i < SIZE; ++i)
377	>	ints[i] = new Integer(i);
378	>	ArrayDeque q = new ArrayDeque();
379	>	assertFalse(q.addAll(Arrays.asList(empty)));
380	>	assertTrue(q.addAll(Arrays.asList(ints)));
381	>	for (int i = 0; i < SIZE; ++i)
382	>	assertEquals(ints[i], q.pollFirst());
383	>	}
384	>
385	>	/**
386	>	* pollFirst() succeeds unless empty
387		*/
388		public void testPollFirst() {
389		ArrayDeque q = populatedDeque(SIZE);
390		for (int i = 0; i < SIZE; ++i) {
391	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
391	>	assertEquals(i, q.pollFirst());
392		}
393		assertNull(q.pollFirst());
394		}
395
396		/**
397	<	*  pollLast succeeds unless empty
397	>	* pollLast() succeeds unless empty
398		*/
399		public void testPollLast() {
400		ArrayDeque q = populatedDeque(SIZE);
401	<	for (int i = SIZE-1; i >= 0; --i) {
402	<	assertEquals(i, ((Integer)q.pollLast()).intValue());
401	>	for (int i = SIZE - 1; i >= 0; --i) {
402	>	assertEquals(i, q.pollLast());
403		}
404		assertNull(q.pollLast());
405		}
406
407		/**
408	<	*  poll succeeds unless empty
408	>	* poll() succeeds unless empty
409		*/
410		public void testPoll() {
411		ArrayDeque q = populatedDeque(SIZE);
412		for (int i = 0; i < SIZE; ++i) {
413	<	assertEquals(i, ((Integer)q.poll()).intValue());
413	>	assertEquals(i, q.poll());
414		}
415		assertNull(q.poll());
416		}
417
418		/**
419	<	*  remove removes next element, or throws NSEE if empty
419	>	* remove() removes next element, or throws NSEE if empty
420		*/
421		public void testRemove() {
422		ArrayDeque q = populatedDeque(SIZE);
423		for (int i = 0; i < SIZE; ++i) {
424	<	assertEquals(i, ((Integer)q.remove()).intValue());
424	>	assertEquals(i, q.remove());
425		}
426		try {
427		q.remove();
#	Line 242 | Line 430 | public class ArrayDequeTest extends JSR1
430		}
431
432		/**
433	<	*  peekFirst returns next element, or null if empty
433	>	* remove(x) removes x and returns true if present
434	>	*/
435	>	public void testRemoveElement() {
436	>	ArrayDeque q = populatedDeque(SIZE);
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));
442	>	}
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));
449	>	}
450	>	assertTrue(q.isEmpty());
451	>	}
452	>
453	>	/**
454	>	* peekFirst() returns next element, or null if empty
455		*/
456		public void testPeekFirst() {
457		ArrayDeque q = populatedDeque(SIZE);
458		for (int i = 0; i < SIZE; ++i) {
459	<	assertEquals(i, ((Integer)q.peekFirst()).intValue());
460	<	q.pollFirst();
459	>	assertEquals(i, q.peekFirst());
460	>	assertEquals(i, q.pollFirst());
461		assertTrue(q.peekFirst() == null ||
462	<	i != ((Integer)q.peekFirst()).intValue());
462	>	!q.peekFirst().equals(i));
463		}
464		assertNull(q.peekFirst());
465		}
466
467		/**
468	<	*  peek returns next element, or null if empty
468	>	* peek() returns next element, or null if empty
469		*/
470		public void testPeek() {
471		ArrayDeque q = populatedDeque(SIZE);
472		for (int i = 0; i < SIZE; ++i) {
473	<	assertEquals(i, ((Integer)q.peek()).intValue());
474	<	q.poll();
473	>	assertEquals(i, q.peek());
474	>	assertEquals(i, q.poll());
475		assertTrue(q.peek() == null ||
476	<	i != ((Integer)q.peek()).intValue());
476	>	!q.peek().equals(i));
477		}
478		assertNull(q.peek());
479		}
480
481		/**
482	<	*  peekLast returns next element, or null if empty
482	>	* peekLast() returns next element, or null if empty
483		*/
484		public void testPeekLast() {
485		ArrayDeque q = populatedDeque(SIZE);
486	<	for (int i = SIZE-1; i >= 0; --i) {
487	<	assertEquals(i, ((Integer)q.peekLast()).intValue());
488	<	q.pollLast();
486	>	for (int i = SIZE - 1; i >= 0; --i) {
487	>	assertEquals(i, q.peekLast());
488	>	assertEquals(i, q.pollLast());
489		assertTrue(q.peekLast() == null ||
490	<	i != ((Integer)q.peekLast()).intValue());
490	>	!q.peekLast().equals(i));
491		}
492		assertNull(q.peekLast());
493		}
494
495		/**
496	<	* getFirst returns next getFirst, or throws NSEE if empty
496	>	* element() returns first element, or throws NSEE if empty
497	>	*/
498	>	public void testElement() {
499	>	ArrayDeque q = populatedDeque(SIZE);
500	>	for (int i = 0; i < SIZE; ++i) {
501	>	assertEquals(i, q.element());
502	>	assertEquals(i, q.poll());
503	>	}
504	>	try {
505	>	q.element();
506	>	shouldThrow();
507	>	} catch (NoSuchElementException success) {}
508	>	}
509	>
510	>	/**
511	>	* getFirst() returns first element, or throws NSEE if empty
512		*/
513		public void testFirstElement() {
514		ArrayDeque q = populatedDeque(SIZE);
515		for (int i = 0; i < SIZE; ++i) {
516	<	assertEquals(i, ((Integer)q.getFirst()).intValue());
517	<	q.pollFirst();
516	>	assertEquals(i, q.getFirst());
517	>	assertEquals(i, q.pollFirst());
518		}
519		try {
520		q.getFirst();
#	Line 299 | Line 523 | public class ArrayDequeTest extends JSR1
523		}
524
525		/**
526	<	*  getLast returns next element, or throws NSEE if empty
526	>	* getLast() returns last element, or throws NSEE if empty
527		*/
528		public void testLastElement() {
529		ArrayDeque q = populatedDeque(SIZE);
530	<	for (int i = SIZE-1; i >= 0; --i) {
531	<	assertEquals(i, ((Integer)q.getLast()).intValue());
532	<	q.pollLast();
530	>	for (int i = SIZE - 1; i >= 0; --i) {
531	>	assertEquals(i, q.getLast());
532	>	assertEquals(i, q.pollLast());
533		}
534		try {
535		q.getLast();
#	Line 314 | Line 538 | public class ArrayDequeTest extends JSR1
538		assertNull(q.peekLast());
539		}
540
317	–
541		/**
542	<	*  removeFirst removes next element, or throws NSEE if empty
542	>	* removeFirst() removes first element, or throws NSEE if empty
543		*/
544		public void testRemoveFirst() {
545		ArrayDeque q = populatedDeque(SIZE);
546		for (int i = 0; i < SIZE; ++i) {
547	<	assertEquals(i, ((Integer)q.removeFirst()).intValue());
547	>	assertEquals(i, q.removeFirst());
548		}
549		try {
550		q.removeFirst();
551		shouldThrow();
552		} catch (NoSuchElementException success) {}
553	+	assertNull(q.peekFirst());
554	+	}
555	+
556	+	/**
557	+	* removeLast() removes last element, or throws NSEE if empty
558	+	*/
559	+	public void testRemoveLast() {
560	+	ArrayDeque q = populatedDeque(SIZE);
561	+	for (int i = SIZE - 1; i >= 0; --i) {
562	+	assertEquals(i, q.removeLast());
563	+	}
564	+	try {
565	+	q.removeLast();
566	+	shouldThrow();
567	+	} catch (NoSuchElementException success) {}
568	+	assertNull(q.peekLast());
569		}
570
571		/**
#	Line 334 | Line 573 | public class ArrayDequeTest extends JSR1
573		*/
574		public void testRemoveFirstOccurrence() {
575		ArrayDeque q = populatedDeque(SIZE);
576	<	for (int i = 1; i < SIZE; i+=2) {
576	>	assertFalse(q.removeFirstOccurrence(null));
577	>	for (int i = 1; i < SIZE; i += 2) {
578		assertTrue(q.removeFirstOccurrence(new Integer(i)));
579		}
580	<	for (int i = 0; i < SIZE; i+=2) {
580	>	for (int i = 0; i < SIZE; i += 2) {
581		assertTrue(q.removeFirstOccurrence(new Integer(i)));
582	<	assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
582	>	assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
583		}
584		assertTrue(q.isEmpty());
585	+	assertFalse(q.removeFirstOccurrence(null));
586	+	assertFalse(q.removeFirstOccurrence(42));
587	+	q = new ArrayDeque();
588	+	assertFalse(q.removeFirstOccurrence(null));
589	+	assertFalse(q.removeFirstOccurrence(42));
590		}
591
592		/**
#	Line 349 | Line 594 | public class ArrayDequeTest extends JSR1
594		*/
595		public void testRemoveLastOccurrence() {
596		ArrayDeque q = populatedDeque(SIZE);
597	<	for (int i = 1; i < SIZE; i+=2) {
597	>	assertFalse(q.removeLastOccurrence(null));
598	>	for (int i = 1; i < SIZE; i += 2) {
599		assertTrue(q.removeLastOccurrence(new Integer(i)));
600		}
601	<	for (int i = 0; i < SIZE; i+=2) {
601	>	for (int i = 0; i < SIZE; i += 2) {
602		assertTrue(q.removeLastOccurrence(new Integer(i)));
603	<	assertFalse(q.removeLastOccurrence(new Integer(i+1)));
603	>	assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
604		}
605		assertTrue(q.isEmpty());
606	+	assertFalse(q.removeLastOccurrence(null));
607	+	assertFalse(q.removeLastOccurrence(42));
608	+	q = new ArrayDeque();
609	+	assertFalse(q.removeLastOccurrence(null));
610	+	assertFalse(q.removeLastOccurrence(42));
611		}
612
613		/**
#	Line 366 | Line 617 | public class ArrayDequeTest extends JSR1
617		ArrayDeque q = populatedDeque(SIZE);
618		for (int i = 0; i < SIZE; ++i) {
619		assertTrue(q.contains(new Integer(i)));
620	<	q.pollFirst();
620	>	assertEquals(i, q.pollFirst());
621		assertFalse(q.contains(new Integer(i)));
622		}
623		}
#	Line 379 | Line 630 | public class ArrayDequeTest extends JSR1
630		q.clear();
631		assertTrue(q.isEmpty());
632		assertEquals(0, q.size());
633	<	q.add(new Integer(1));
633	>	assertTrue(q.add(new Integer(1)));
634		assertFalse(q.isEmpty());
635		q.clear();
636		assertTrue(q.isEmpty());
#	Line 394 | Line 645 | public class ArrayDequeTest extends JSR1
645		for (int i = 0; i < SIZE; ++i) {
646		assertTrue(q.containsAll(p));
647		assertFalse(p.containsAll(q));
648	<	p.add(new Integer(i));
648	>	assertTrue(p.add(new Integer(i)));
649		}
650		assertTrue(p.containsAll(q));
651		}
#	Line 407 | Line 658 | public class ArrayDequeTest extends JSR1
658		ArrayDeque p = populatedDeque(SIZE);
659		for (int i = 0; i < SIZE; ++i) {
660		boolean changed = q.retainAll(p);
661	<	if (i == 0)
411	<	assertFalse(changed);
412	<	else
413	<	assertTrue(changed);
414	<
661	>	assertEquals(changed, (i > 0));
662		assertTrue(q.containsAll(p));
663	<	assertEquals(SIZE-i, q.size());
663	>	assertEquals(SIZE - i, q.size());
664		p.removeFirst();
665		}
666		}
#	Line 426 | Line 673 | public class ArrayDequeTest extends JSR1
673		ArrayDeque q = populatedDeque(SIZE);
674		ArrayDeque p = populatedDeque(i);
675		assertTrue(q.removeAll(p));
676	<	assertEquals(SIZE-i, q.size());
676	>	assertEquals(SIZE - i, q.size());
677		for (int j = 0; j < i; ++j) {
678	<	Integer I = (Integer)(p.removeFirst());
432	<	assertFalse(q.contains(I));
678	>	assertFalse(q.contains(p.removeFirst()));
679		}
680		}
681		}
682
683	+	void checkToArray(ArrayDeque q) {
684	+	int size = q.size();
685	+	Object[] o = q.toArray();
686	+	assertEquals(size, o.length);
687	+	Iterator it = q.iterator();
688	+	for (int i = 0; i < size; i++) {
689	+	Integer x = (Integer) it.next();
690	+	assertEquals((Integer)o[0] + i, (int) x);
691	+	assertSame(o[i], x);
692	+	}
693	+	}
694	+
695		/**
696	<	*  toArray contains all elements
696	>	* toArray() contains all elements in FIFO order
697		*/
698		public void testToArray() {
699	<	ArrayDeque q = populatedDeque(SIZE);
700	<	Object[] o = q.toArray();
701	<	Arrays.sort(o);
702	<	for (int i = 0; i < o.length; i++)
703	<	assertEquals(o[i], q.pollFirst());
699	>	ArrayDeque q = new ArrayDeque();
700	>	for (int i = 0; i < SIZE; i++) {
701	>	checkToArray(q);
702	>	q.addLast(i);
703	>	}
704	>	// Provoke wraparound
705	>	for (int i = 0; i < SIZE; i++) {
706	>	checkToArray(q);
707	>	assertEquals(i, q.poll());
708	>	q.addLast(SIZE + i);
709	>	}
710	>	for (int i = 0; i < SIZE; i++) {
711	>	checkToArray(q);
712	>	assertEquals(SIZE + i, q.poll());
713	>	}
714	>	}
715	>
716	>	void checkToArray2(ArrayDeque q) {
717	>	int size = q.size();
718	>	Integer[] a1 = (size == 0) ? null : new Integer[size - 1];
719	>	Integer[] a2 = new Integer[size];
720	>	Integer[] a3 = new Integer[size + 2];
721	>	if (size > 0) Arrays.fill(a1, 42);
722	>	Arrays.fill(a2, 42);
723	>	Arrays.fill(a3, 42);
724	>	Integer[] b1 = (size == 0) ? null : (Integer[]) q.toArray(a1);
725	>	Integer[] b2 = (Integer[]) q.toArray(a2);
726	>	Integer[] b3 = (Integer[]) q.toArray(a3);
727	>	assertSame(a2, b2);
728	>	assertSame(a3, b3);
729	>	Iterator it = q.iterator();
730	>	for (int i = 0; i < size; i++) {
731	>	Integer x = (Integer) it.next();
732	>	assertSame(b1[i], x);
733	>	assertEquals(b1[0] + i, (int) x);
734	>	assertSame(b2[i], x);
735	>	assertSame(b3[i], x);
736	>	}
737	>	assertNull(a3[size]);
738	>	assertEquals(42, (int) a3[size + 1]);
739	>	if (size > 0) {
740	>	assertNotSame(a1, b1);
741	>	assertEquals(size, b1.length);
742	>	for (int i = 0; i < a1.length; i++) {
743	>	assertEquals(42, (int) a1[i]);
744	>	}
745	>	}
746		}
747
748		/**
749	<	*  toArray(a) contains all elements
749	>	* toArray(a) contains all elements in FIFO order
750		*/
751		public void testToArray2() {
752	<	ArrayDeque q = populatedDeque(SIZE);
753	<	Integer[] ints = new Integer[SIZE];
754	<	ints = (Integer[])q.toArray(ints);
755	<	Arrays.sort(ints);
756	<	for (int i = 0; i < ints.length; i++)
757	<	assertEquals(ints[i], q.pollFirst());
752	>	ArrayDeque q = new ArrayDeque();
753	>	for (int i = 0; i < SIZE; i++) {
754	>	checkToArray2(q);
755	>	q.addLast(i);
756	>	}
757	>	// Provoke wraparound
758	>	for (int i = 0; i < SIZE; i++) {
759	>	checkToArray2(q);
760	>	assertEquals(i, q.poll());
761	>	q.addLast(SIZE + i);
762	>	}
763	>	for (int i = 0; i < SIZE; i++) {
764	>	checkToArray2(q);
765	>	assertEquals(SIZE + i, q.poll());
766	>	}
767		}
768
769		/**
770	<	* toArray(null) throws NPE
770	>	* toArray(null) throws NullPointerException
771		*/
772	<	public void testToArray_BadArg() {
772	>	public void testToArray_NullArg() {
773	>	ArrayDeque l = new ArrayDeque();
774	>	l.add(new Object());
775		try {
776	<	ArrayDeque l = new ArrayDeque();
466	<	l.add(new Object());
467	<	Object o[] = l.toArray(null);
776	>	l.toArray(null);
777		shouldThrow();
778		} catch (NullPointerException success) {}
779		}
780
781		/**
782	<	* toArray with incompatable aray type throws CCE
782	>	* toArray(incompatible array type) throws ArrayStoreException
783		*/
784		public void testToArray1_BadArg() {
785	+	ArrayDeque l = new ArrayDeque();
786	+	l.add(new Integer(5));
787		try {
788	<	ArrayDeque l = new ArrayDeque();
478	<	l.add(new Integer(5));
479	<	Object o[] = l.toArray(new String[10] );
788	>	l.toArray(new String[10]);
789		shouldThrow();
790		} catch (ArrayStoreException success) {}
791		}
792
793		/**
794	<	*  iterator iterates through all elements
794	>	* Iterator iterates through all elements
795		*/
796		public void testIterator() {
797		ArrayDeque q = populatedDeque(SIZE);
489	–	int i = 0;
798		Iterator it = q.iterator();
799	<	while (it.hasNext()) {
799	>	int i;
800	>	for (i = 0; it.hasNext(); i++)
801		assertTrue(q.contains(it.next()));
493	–	++i;
494	–	}
802		assertEquals(i, SIZE);
803	+	assertIteratorExhausted(it);
804	+	}
805	+
806	+	/**
807	+	* iterator of empty collection has no elements
808	+	*/
809	+	public void testEmptyIterator() {
810	+	Deque c = new ArrayDeque();
811	+	assertIteratorExhausted(c.iterator());
812	+	assertIteratorExhausted(c.descendingIterator());
813		}
814
815		/**
816	<	*  iterator ordering is FIFO
816	>	* Iterator ordering is FIFO
817		*/
818		public void testIteratorOrdering() {
819		final ArrayDeque q = new ArrayDeque();
820	<	q.add(new Integer(1));
821	<	q.add(new Integer(2));
822	<	q.add(new Integer(3));
820	>	q.add(one);
821	>	q.add(two);
822	>	q.add(three);
823		int k = 0;
824		for (Iterator it = q.iterator(); it.hasNext();) {
825	<	int i = ((Integer)(it.next())).intValue();
509	<	assertEquals(++k, i);
825	>	assertEquals(++k, it.next());
826		}
827
828		assertEquals(3, k);
829		}
830
831		/**
832	<	* iterator.remove removes current element
832	>	* iterator.remove() removes current element
833		*/
834	<	public void testIteratorRemove () {
834	>	public void testIteratorRemove() {
835		final ArrayDeque q = new ArrayDeque();
836		final Random rng = new Random();
837		for (int iters = 0; iters < 100; ++iters) {
838		int max = rng.nextInt(5) + 2;
839	<	int split = rng.nextInt(max-1) + 1;
839	>	int split = rng.nextInt(max - 1) + 1;
840		for (int j = 1; j <= max; ++j)
841		q.add(new Integer(j));
842		Iterator it = q.iterator();
843		for (int j = 1; j <= split; ++j)
844		assertEquals(it.next(), new Integer(j));
845		it.remove();
846	<	assertEquals(it.next(), new Integer(split+1));
846	>	assertEquals(it.next(), new Integer(split + 1));
847		for (int j = 1; j <= split; ++j)
848		q.remove(new Integer(j));
849		it = q.iterator();
850	<	for (int j = split+1; j <= max; ++j) {
850	>	for (int j = split + 1; j <= max; ++j) {
851		assertEquals(it.next(), new Integer(j));
852		it.remove();
853		}
#	Line 541 | Line 857 | public class ArrayDequeTest extends JSR1
857		}
858
859		/**
860	<	*  Descending iterator iterates through all elements
860	>	* Descending iterator iterates through all elements
861		*/
862		public void testDescendingIterator() {
863		ArrayDeque q = populatedDeque(SIZE);
#	Line 555 | Line 871 | public class ArrayDequeTest extends JSR1
871		assertFalse(it.hasNext());
872		try {
873		it.next();
874	+	shouldThrow();
875		} catch (NoSuchElementException success) {}
876		}
877
878		/**
879	<	*  Descending iterator ordering is reverse FIFO
879	>	* Descending iterator ordering is reverse FIFO
880		*/
881		public void testDescendingIteratorOrdering() {
882		final ArrayDeque q = new ArrayDeque();
#	Line 569 | Line 886 | public class ArrayDequeTest extends JSR1
886		q.add(new Integer(1));
887		int k = 0;
888		for (Iterator it = q.descendingIterator(); it.hasNext();) {
889	<	int i = ((Integer)(it.next())).intValue();
573	<	assertEquals(++k, i);
889	>	assertEquals(++k, it.next());
890		}
891
892		assertEquals(3, k);
#	Line 581 | Line 897 | public class ArrayDequeTest extends JSR1
897		}
898
899		/**
900	<	* descendingIterator.remove removes current element
900	>	* descendingIterator.remove() removes current element
901		*/
902	<	public void testDescendingIteratorRemove () {
902	>	public void testDescendingIteratorRemove() {
903		final ArrayDeque q = new ArrayDeque();
904		final Random rng = new Random();
905		for (int iters = 0; iters < 100; ++iters) {
906		int max = rng.nextInt(5) + 2;
907	<	int split = rng.nextInt(max-1) + 1;
907	>	int split = rng.nextInt(max - 1) + 1;
908		for (int j = max; j >= 1; --j)
909		q.add(new Integer(j));
910		Iterator it = q.descendingIterator();
911		for (int j = 1; j <= split; ++j)
912		assertEquals(it.next(), new Integer(j));
913		it.remove();
914	<	assertEquals(it.next(), new Integer(split+1));
914	>	assertEquals(it.next(), new Integer(split + 1));
915		for (int j = 1; j <= split; ++j)
916		q.remove(new Integer(j));
917		it = q.descendingIterator();
918	<	for (int j = split+1; j <= max; ++j) {
918	>	for (int j = split + 1; j <= max; ++j) {
919		assertEquals(it.next(), new Integer(j));
920		it.remove();
921		}
#	Line 608 | Line 924 | public class ArrayDequeTest extends JSR1
924		}
925		}
926
611	–
927		/**
928	<	* toString contains toStrings of elements
928	>	* toString() contains toStrings of elements
929		*/
930		public void testToString() {
931		ArrayDeque q = populatedDeque(SIZE);
932		String s = q.toString();
933		for (int i = 0; i < SIZE; ++i) {
934	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
934	>	assertTrue(s.contains(String.valueOf(i)));
935		}
936		}
937
938		/**
939	<	* peekFirst returns element inserted with addFirst
939	>	* A deserialized serialized deque has same elements in same order
940		*/
941	<	public void testAddFirst() {
942	<	ArrayDeque q = populatedDeque(3);
943	<	q.addFirst(four);
944	<	assertEquals(four,q.peekFirst());
941	>	public void testSerialization() throws Exception {
942	>	Queue x = populatedDeque(SIZE);
943	>	Queue y = serialClone(x);
944	>
945	>	assertNotSame(y, x);
946	>	assertEquals(x.size(), y.size());
947	>	assertEquals(x.toString(), y.toString());
948	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
949	>	while (!x.isEmpty()) {
950	>	assertFalse(y.isEmpty());
951	>	assertEquals(x.remove(), y.remove());
952	>	}
953	>	assertTrue(y.isEmpty());
954		}
955
956		/**
957	<	* peekLast returns element inserted with addLast
957	>	* A cloned deque has same elements in same order
958		*/
959	<	public void testAddLast() {
960	<	ArrayDeque q = populatedDeque(3);
961	<	q.addLast(four);
962	<	assertEquals(four,q.peekLast());
959	>	public void testClone() throws Exception {
960	>	ArrayDeque<Integer> x = populatedDeque(SIZE);
961	>	ArrayDeque<Integer> y = x.clone();
962	>
963	>	assertNotSame(y, x);
964	>	assertEquals(x.size(), y.size());
965	>	assertEquals(x.toString(), y.toString());
966	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
967	>	while (!x.isEmpty()) {
968	>	assertFalse(y.isEmpty());
969	>	assertEquals(x.remove(), y.remove());
970	>	}
971	>	assertTrue(y.isEmpty());
972	>	}
973	>
974	>	/**
975	>	* remove(null), contains(null) always return false
976	>	*/
977	>	public void testNeverContainsNull() {
978	>	Deque<?>[] qs = {
979	>	new ArrayDeque<Object>(),
980	>	populatedDeque(2),
981	>	};
982	>
983	>	for (Deque<?> q : qs) {
984	>	assertFalse(q.contains(null));
985	>	assertFalse(q.remove(null));
986	>	assertFalse(q.removeFirstOccurrence(null));
987	>	assertFalse(q.removeLastOccurrence(null));
988	>	}
989		}
990
991		}

Diff Legend

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