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.8 by jsr166, Sat Nov 21 02:07:26 2009 UTC vs.
Revision 1.22 by jsr166, Tue Mar 15 19:47:06 2011 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
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7		import junit.framework.*;
8	+	import java.io.BufferedInputStream;
9	+	import java.io.BufferedOutputStream;
10	+	import java.io.ByteArrayInputStream;
11	+	import java.io.ByteArrayOutputStream;
12	+	import java.io.ObjectInputStream;
13	+	import java.io.ObjectOutputStream;
14		import java.util.*;
9	–	import java.util.concurrent.*;
15
16		public class ArrayDequeTest extends JSR166TestCase {
17		public static void main(String[] args) {
18	<	junit.textui.TestRunner.run (suite());
18	>	junit.textui.TestRunner.run(suite());
19		}
20
21		public static Test suite() {
#	Line 18 | Line 23 | public class ArrayDequeTest extends JSR1
23		}
24
25		/**
26	<	* Create a queue of given size containing consecutive
26	>	* Create a deque of given size containing consecutive
27		* Integers 0 ... n.
28		*/
29	<	private ArrayDeque populatedDeque(int n) {
30	<	ArrayDeque q = new ArrayDeque();
29	>	private ArrayDeque<Integer> populatedDeque(int n) {
30	>	ArrayDeque<Integer> q = new ArrayDeque<Integer>();
31		assertTrue(q.isEmpty());
32		for (int i = 0; i < n; ++i)
33		assertTrue(q.offerLast(new Integer(i)));
#	Line 32 | Line 37 | public class ArrayDequeTest extends JSR1
37		}
38
39		/**
40	<	* new queue is empty
40	>	* new deque is empty
41		*/
42		public void testConstructor1() {
43		assertEquals(0, new ArrayDeque().size());
#	Line 45 | Line 50 | public class ArrayDequeTest extends JSR1
50		try {
51		ArrayDeque q = new ArrayDeque((Collection)null);
52		shouldThrow();
53	<	}
49	<	catch (NullPointerException success) {}
53	>	} catch (NullPointerException success) {}
54		}
55
56		/**
57	<	* Queue contains all elements of collection used to initialize
57	>	* Initializing from Collection of null elements throws NPE
58	>	*/
59	>	public void testConstructor4() {
60	>	try {
61	>	Integer[] ints = new Integer[SIZE];
62	>	ArrayDeque q = new ArrayDeque(Arrays.asList(ints));
63	>	shouldThrow();
64	>	} catch (NullPointerException success) {}
65	>	}
66
67	+	/**
68	+	* Initializing from Collection with some null elements throws NPE
69		*/
70	<	public void testConstructor6() {
70	>	public void testConstructor5() {
71		try {
72		Integer[] ints = new Integer[SIZE];
73	<	for (int i = 0; i < SIZE; ++i)
73	>	for (int i = 0; i < SIZE-1; ++i)
74		ints[i] = new Integer(i);
75		ArrayDeque q = new ArrayDeque(Arrays.asList(ints));
76	<	for (int i = 0; i < SIZE; ++i)
77	<	assertEquals(ints[i], q.pollFirst());
78	<	}
79	<	finally {}
76	>	shouldThrow();
77	>	} catch (NullPointerException success) {}
78	>	}
79	>
80	>	/**
81	>	* Deque contains all elements of collection used to initialize
82	>	*/
83	>	public void testConstructor6() {
84	>	Integer[] ints = new Integer[SIZE];
85	>	for (int i = 0; i < SIZE; ++i)
86	>	ints[i] = new Integer(i);
87	>	ArrayDeque q = new ArrayDeque(Arrays.asList(ints));
88	>	for (int i = 0; i < SIZE; ++i)
89	>	assertEquals(ints[i], q.pollFirst());
90		}
91
92		/**
#	Line 102 | Line 126 | public class ArrayDequeTest extends JSR1
126		ArrayDeque q = new ArrayDeque(1);
127		q.push(null);
128		shouldThrow();
129	<	} catch (NullPointerException success) { }
129	>	} catch (NullPointerException success) {}
130		}
131
132		/**
133	<	* peekFirst returns element inserted with push
133	>	* peekFirst() returns element inserted with push
134		*/
135		public void testPush() {
136		ArrayDeque q = populatedDeque(3);
137		q.pollLast();
138		q.push(four);
139	<	assertEquals(four,q.peekFirst());
139	>	assertSame(four, q.peekFirst());
140		}
141
142		/**
143	<	*  pop removes next element, or throws NSEE if empty
143	>	* pop() removes next element, or throws NSEE if empty
144		*/
145		public void testPop() {
146		ArrayDeque q = populatedDeque(SIZE);
147		for (int i = 0; i < SIZE; ++i) {
148	<	assertEquals(i, ((Integer)q.pop()).intValue());
148	>	assertEquals(i, q.pop());
149		}
150		try {
151		q.pop();
152		shouldThrow();
153	<	} catch (NoSuchElementException success) {
130	<	}
153	>	} catch (NoSuchElementException success) {}
154		}
155
156		/**
157		* offer(null) throws NPE
158		*/
159	+	public void testOfferNull() {
160	+	try {
161	+	ArrayDeque q = new ArrayDeque();
162	+	q.offer(null);
163	+	shouldThrow();
164	+	} catch (NullPointerException success) {}
165	+	}
166	+
167	+	/**
168	+	* offerFirst(null) throws NPE
169	+	*/
170		public void testOfferFirstNull() {
171		try {
172		ArrayDeque q = new ArrayDeque();
173		q.offerFirst(null);
174		shouldThrow();
175	<	} catch (NullPointerException success) {
142	<	}
175	>	} catch (NullPointerException success) {}
176		}
177
178		/**
179	<	* OfferFirst succeeds
179	>	* offerLast(null) throws NPE
180	>	*/
181	>	public void testOfferLastNull() {
182	>	try {
183	>	ArrayDeque q = new ArrayDeque();
184	>	q.offerLast(null);
185	>	shouldThrow();
186	>	} catch (NullPointerException success) {}
187	>	}
188	>
189	>	/**
190	>	* offer(x) succeeds
191	>	*/
192	>	public void testOffer() {
193	>	ArrayDeque q = new ArrayDeque();
194	>	assertTrue(q.offer(zero));
195	>	assertTrue(q.offer(one));
196	>	assertSame(zero, q.peekFirst());
197	>	assertSame(one, q.peekLast());
198	>	}
199	>
200	>	/**
201	>	* offerFirst(x) succeeds
202		*/
203		public void testOfferFirst() {
204		ArrayDeque q = new ArrayDeque();
205	<	assertTrue(q.offerFirst(new Integer(0)));
206	<	assertTrue(q.offerFirst(new Integer(1)));
205	>	assertTrue(q.offerFirst(zero));
206	>	assertTrue(q.offerFirst(one));
207	>	assertSame(one, q.peekFirst());
208	>	assertSame(zero, q.peekLast());
209		}
210
211		/**
212	<	* OfferLast succeeds
212	>	* offerLast(x) succeeds
213		*/
214		public void testOfferLast() {
215		ArrayDeque q = new ArrayDeque();
216	<	assertTrue(q.offerLast(new Integer(0)));
217	<	assertTrue(q.offerLast(new Integer(1)));
216	>	assertTrue(q.offerLast(zero));
217	>	assertTrue(q.offerLast(one));
218	>	assertSame(zero, q.peekFirst());
219	>	assertSame(one, q.peekLast());
220	>	}
221	>
222	>	/**
223	>	* add(null) throws NPE
224	>	*/
225	>	public void testAddNull() {
226	>	try {
227	>	ArrayDeque q = new ArrayDeque();
228	>	q.add(null);
229	>	shouldThrow();
230	>	} catch (NullPointerException success) {}
231		}
232
233		/**
234	<	* add succeeds
234	>	* addFirst(null) throws NPE
235	>	*/
236	>	public void testAddFirstNull() {
237	>	try {
238	>	ArrayDeque q = new ArrayDeque();
239	>	q.addFirst(null);
240	>	shouldThrow();
241	>	} catch (NullPointerException success) {}
242	>	}
243	>
244	>	/**
245	>	* addLast(null) throws NPE
246	>	*/
247	>	public void testAddLastNull() {
248	>	try {
249	>	ArrayDeque q = new ArrayDeque();
250	>	q.addLast(null);
251	>	shouldThrow();
252	>	} catch (NullPointerException success) {}
253	>	}
254	>
255	>	/**
256	>	* add(x) succeeds
257		*/
258		public void testAdd() {
259		ArrayDeque q = new ArrayDeque();
260	<	for (int i = 0; i < SIZE; ++i) {
261	<	assertEquals(i, q.size());
262	<	assertTrue(q.add(new Integer(i)));
263	<	}
260	>	assertTrue(q.add(zero));
261	>	assertTrue(q.add(one));
262	>	assertSame(zero, q.peekFirst());
263	>	assertSame(one, q.peekLast());
264	>	}
265	>
266	>	/**
267	>	* addFirst(x) succeeds
268	>	*/
269	>	public void testAddFirst() {
270	>	ArrayDeque q = new ArrayDeque();
271	>	q.addFirst(zero);
272	>	q.addFirst(one);
273	>	assertSame(one, q.peekFirst());
274	>	assertSame(zero, q.peekLast());
275	>	}
276	>
277	>	/**
278	>	* addLast(x) succeeds
279	>	*/
280	>	public void testAddLast() {
281	>	ArrayDeque q = new ArrayDeque();
282	>	q.addLast(zero);
283	>	q.addLast(one);
284	>	assertSame(zero, q.peekFirst());
285	>	assertSame(one, q.peekLast());
286		}
287
288		/**
#	Line 179 | Line 293 | public class ArrayDequeTest extends JSR1
293		ArrayDeque q = new ArrayDeque();
294		q.addAll(null);
295		shouldThrow();
296	<	}
183	<	catch (NullPointerException success) {}
296	>	} catch (NullPointerException success) {}
297		}
298
299		/**
300	<	* Queue contains all elements, in traversal order, of successful addAll
300	>	* addAll of a collection with null elements throws NPE
301		*/
302	<	public void testAddAll5() {
302	>	public void testAddAll2() {
303		try {
304	<	Integer[] empty = new Integer[0];
304	>	ArrayDeque q = new ArrayDeque();
305		Integer[] ints = new Integer[SIZE];
306	<	for (int i = 0; i < SIZE; ++i)
307	<	ints[i] = new Integer(i);
306	>	q.addAll(Arrays.asList(ints));
307	>	shouldThrow();
308	>	} catch (NullPointerException success) {}
309	>	}
310	>
311	>	/**
312	>	* addAll of a collection with any null elements throws NPE after
313	>	* possibly adding some elements
314	>	*/
315	>	public void testAddAll3() {
316	>	try {
317		ArrayDeque q = new ArrayDeque();
318	<	assertFalse(q.addAll(Arrays.asList(empty)));
319	<	assertTrue(q.addAll(Arrays.asList(ints)));
320	<	for (int i = 0; i < SIZE; ++i)
321	<	assertEquals(ints[i], q.pollFirst());
322	<	}
323	<	finally {}
318	>	Integer[] ints = new Integer[SIZE];
319	>	for (int i = 0; i < SIZE-1; ++i)
320	>	ints[i] = new Integer(i);
321	>	q.addAll(Arrays.asList(ints));
322	>	shouldThrow();
323	>	} catch (NullPointerException success) {}
324		}
325
326		/**
327	<	*  pollFirst succeeds unless empty
327	>	* Deque contains all elements, in traversal order, of successful addAll
328	>	*/
329	>	public void testAddAll5() {
330	>	Integer[] empty = new Integer[0];
331	>	Integer[] ints = new Integer[SIZE];
332	>	for (int i = 0; i < SIZE; ++i)
333	>	ints[i] = new Integer(i);
334	>	ArrayDeque q = new ArrayDeque();
335	>	assertFalse(q.addAll(Arrays.asList(empty)));
336	>	assertTrue(q.addAll(Arrays.asList(ints)));
337	>	for (int i = 0; i < SIZE; ++i)
338	>	assertEquals(ints[i], q.pollFirst());
339	>	}
340	>
341	>	/**
342	>	* pollFirst() succeeds unless empty
343		*/
344		public void testPollFirst() {
345		ArrayDeque q = populatedDeque(SIZE);
346		for (int i = 0; i < SIZE; ++i) {
347	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
347	>	assertEquals(i, q.pollFirst());
348		}
349		assertNull(q.pollFirst());
350		}
351
352		/**
353	<	*  pollLast succeeds unless empty
353	>	* pollLast() succeeds unless empty
354		*/
355		public void testPollLast() {
356		ArrayDeque q = populatedDeque(SIZE);
357		for (int i = SIZE-1; i >= 0; --i) {
358	<	assertEquals(i, ((Integer)q.pollLast()).intValue());
358	>	assertEquals(i, q.pollLast());
359		}
360		assertNull(q.pollLast());
361		}
362
363		/**
364	<	*  poll succeeds unless empty
364	>	* poll() succeeds unless empty
365		*/
366		public void testPoll() {
367		ArrayDeque q = populatedDeque(SIZE);
368		for (int i = 0; i < SIZE; ++i) {
369	<	assertEquals(i, ((Integer)q.poll()).intValue());
369	>	assertEquals(i, q.poll());
370		}
371		assertNull(q.poll());
372		}
373
374		/**
375	<	*  remove removes next element, or throws NSEE if empty
375	>	* remove() removes next element, or throws NSEE if empty
376		*/
377		public void testRemove() {
378		ArrayDeque q = populatedDeque(SIZE);
379		for (int i = 0; i < SIZE; ++i) {
380	<	assertEquals(i, ((Integer)q.remove()).intValue());
380	>	assertEquals(i, q.remove());
381		}
382		try {
383		q.remove();
384		shouldThrow();
385	<	} catch (NoSuchElementException success) {
385	>	} catch (NoSuchElementException success) {}
386	>	}
387	>
388	>	/**
389	>	* remove(x) removes x and returns true if present
390	>	*/
391	>	public void testRemoveElement() {
392	>	ArrayDeque q = populatedDeque(SIZE);
393	>	for (int i = 1; i < SIZE; i+=2) {
394	>	assertTrue(q.contains(i));
395	>	assertTrue(q.remove(i));
396	>	assertFalse(q.contains(i));
397	>	assertTrue(q.contains(i-1));
398	>	}
399	>	for (int i = 0; i < SIZE; i+=2) {
400	>	assertTrue(q.contains(i));
401	>	assertTrue(q.remove(i));
402	>	assertFalse(q.contains(i));
403	>	assertFalse(q.remove(i+1));
404	>	assertFalse(q.contains(i+1));
405		}
406	+	assertTrue(q.isEmpty());
407		}
408
409		/**
410	<	*  peekFirst returns next element, or null if empty
410	>	* peekFirst() returns next element, or null if empty
411		*/
412		public void testPeekFirst() {
413		ArrayDeque q = populatedDeque(SIZE);
414		for (int i = 0; i < SIZE; ++i) {
415	<	assertEquals(i, ((Integer)q.peekFirst()).intValue());
416	<	q.pollFirst();
415	>	assertEquals(i, q.peekFirst());
416	>	assertEquals(i, q.pollFirst());
417		assertTrue(q.peekFirst() == null ||
418	<	i != ((Integer)q.peekFirst()).intValue());
418	>	!q.peekFirst().equals(i));
419		}
420		assertNull(q.peekFirst());
421		}
422
423		/**
424	<	*  peek returns next element, or null if empty
424	>	* peek() returns next element, or null if empty
425		*/
426		public void testPeek() {
427		ArrayDeque q = populatedDeque(SIZE);
428		for (int i = 0; i < SIZE; ++i) {
429	<	assertEquals(i, ((Integer)q.peek()).intValue());
430	<	q.poll();
429	>	assertEquals(i, q.peek());
430	>	assertEquals(i, q.poll());
431		assertTrue(q.peek() == null ||
432	<	i != ((Integer)q.peek()).intValue());
432	>	!q.peek().equals(i));
433		}
434		assertNull(q.peek());
435		}
436
437		/**
438	<	*  peekLast returns next element, or null if empty
438	>	* peekLast() returns next element, or null if empty
439		*/
440		public void testPeekLast() {
441		ArrayDeque q = populatedDeque(SIZE);
442		for (int i = SIZE-1; i >= 0; --i) {
443	<	assertEquals(i, ((Integer)q.peekLast()).intValue());
444	<	q.pollLast();
443	>	assertEquals(i, q.peekLast());
444	>	assertEquals(i, q.pollLast());
445		assertTrue(q.peekLast() == null ||
446	<	i != ((Integer)q.peekLast()).intValue());
446	>	!q.peekLast().equals(i));
447		}
448		assertNull(q.peekLast());
449		}
450
451		/**
452	<	* getFirst returns next getFirst, or throws NSEE if empty
452	>	* element() returns first element, or throws NSEE if empty
453	>	*/
454	>	public void testElement() {
455	>	ArrayDeque q = populatedDeque(SIZE);
456	>	for (int i = 0; i < SIZE; ++i) {
457	>	assertEquals(i, q.element());
458	>	assertEquals(i, q.poll());
459	>	}
460	>	try {
461	>	q.element();
462	>	shouldThrow();
463	>	} catch (NoSuchElementException success) {}
464	>	}
465	>
466	>	/**
467	>	* getFirst() returns first element, or throws NSEE if empty
468		*/
469		public void testFirstElement() {
470		ArrayDeque q = populatedDeque(SIZE);
471		for (int i = 0; i < SIZE; ++i) {
472	<	assertEquals(i, ((Integer)q.getFirst()).intValue());
473	<	q.pollFirst();
472	>	assertEquals(i, q.getFirst());
473	>	assertEquals(i, q.pollFirst());
474		}
475		try {
476		q.getFirst();
477		shouldThrow();
478	<	}
307	<	catch (NoSuchElementException success) {}
478	>	} catch (NoSuchElementException success) {}
479		}
480
481		/**
482	<	*  getLast returns next element, or throws NSEE if empty
482	>	* getLast() returns last element, or throws NSEE if empty
483		*/
484		public void testLastElement() {
485		ArrayDeque q = populatedDeque(SIZE);
486		for (int i = SIZE-1; i >= 0; --i) {
487	<	assertEquals(i, ((Integer)q.getLast()).intValue());
488	<	q.pollLast();
487	>	assertEquals(i, q.getLast());
488	>	assertEquals(i, q.pollLast());
489		}
490		try {
491		q.getLast();
492		shouldThrow();
493	<	}
323	<	catch (NoSuchElementException success) {}
493	>	} catch (NoSuchElementException success) {}
494		assertNull(q.peekLast());
495		}
496
497
498		/**
499	<	*  removeFirst removes next element, or throws NSEE if empty
499	>	* removeFirst() removes first element, or throws NSEE if empty
500		*/
501		public void testRemoveFirst() {
502		ArrayDeque q = populatedDeque(SIZE);
503		for (int i = 0; i < SIZE; ++i) {
504	<	assertEquals(i, ((Integer)q.removeFirst()).intValue());
504	>	assertEquals(i, q.removeFirst());
505		}
506		try {
507		q.removeFirst();
508		shouldThrow();
509	<	} catch (NoSuchElementException success) {
509	>	} catch (NoSuchElementException success) {}
510	>	assertNull(q.peekFirst());
511	>	}
512	>
513	>	/**
514	>	* removeLast() removes last element, or throws NSEE if empty
515	>	*/
516	>	public void testRemoveLast() {
517	>	ArrayDeque q = populatedDeque(SIZE);
518	>	for (int i = SIZE - 1; i >= 0; --i) {
519	>	assertEquals(i, q.removeLast());
520		}
521	+	try {
522	+	q.removeLast();
523	+	shouldThrow();
524	+	} catch (NoSuchElementException success) {}
525	+	assertNull(q.peekLast());
526		}
527
528		/**
#	Line 377 | Line 562 | public class ArrayDequeTest extends JSR1
562		ArrayDeque q = populatedDeque(SIZE);
563		for (int i = 0; i < SIZE; ++i) {
564		assertTrue(q.contains(new Integer(i)));
565	<	q.pollFirst();
565	>	assertEquals(i, q.pollFirst());
566		assertFalse(q.contains(new Integer(i)));
567		}
568		}
#	Line 390 | Line 575 | public class ArrayDequeTest extends JSR1
575		q.clear();
576		assertTrue(q.isEmpty());
577		assertEquals(0, q.size());
578	<	q.add(new Integer(1));
578	>	assertTrue(q.add(new Integer(1)));
579		assertFalse(q.isEmpty());
580		q.clear();
581		assertTrue(q.isEmpty());
#	Line 405 | Line 590 | public class ArrayDequeTest extends JSR1
590		for (int i = 0; i < SIZE; ++i) {
591		assertTrue(q.containsAll(p));
592		assertFalse(p.containsAll(q));
593	<	p.add(new Integer(i));
593	>	assertTrue(p.add(new Integer(i)));
594		}
595		assertTrue(p.containsAll(q));
596		}
#	Line 418 | Line 603 | public class ArrayDequeTest extends JSR1
603		ArrayDeque p = populatedDeque(SIZE);
604		for (int i = 0; i < SIZE; ++i) {
605		boolean changed = q.retainAll(p);
606	<	if (i == 0)
422	<	assertFalse(changed);
423	<	else
424	<	assertTrue(changed);
425	<
606	>	assertEquals(changed, (i > 0));
607		assertTrue(q.containsAll(p));
608		assertEquals(SIZE-i, q.size());
609		p.removeFirst();
#	Line 439 | Line 620 | public class ArrayDequeTest extends JSR1
620		assertTrue(q.removeAll(p));
621		assertEquals(SIZE-i, q.size());
622		for (int j = 0; j < i; ++j) {
623	<	Integer I = (Integer)(p.removeFirst());
443	<	assertFalse(q.contains(I));
623	>	assertFalse(q.contains(p.removeFirst()));
624		}
625		}
626		}
627
628		/**
629	<	*  toArray contains all elements
629	>	* toArray() contains all elements in FIFO order
630		*/
631		public void testToArray() {
632		ArrayDeque q = populatedDeque(SIZE);
633		Object[] o = q.toArray();
454	–	Arrays.sort(o);
634		for (int i = 0; i < o.length; i++)
635	<	assertEquals(o[i], q.pollFirst());
635	>	assertSame(o[i], q.pollFirst());
636		}
637
638		/**
639	<	*  toArray(a) contains all elements
639	>	* toArray(a) contains all elements in FIFO order
640		*/
641		public void testToArray2() {
642	<	ArrayDeque q = populatedDeque(SIZE);
642	>	ArrayDeque<Integer> q = populatedDeque(SIZE);
643		Integer[] ints = new Integer[SIZE];
644	<	ints = (Integer[])q.toArray(ints);
645	<	Arrays.sort(ints);
644	>	Integer[] array = q.toArray(ints);
645	>	assertSame(ints, array);
646		for (int i = 0; i < ints.length; i++)
647	<	assertEquals(ints[i], q.pollFirst());
647	>	assertSame(ints[i], q.remove());
648		}
649
650		/**
651	<	* toArray(null) throws NPE
651	>	* toArray(null) throws NullPointerException
652		*/
653	<	public void testToArray_BadArg() {
653	>	public void testToArray_NullArg() {
654	>	ArrayDeque l = new ArrayDeque();
655	>	l.add(new Object());
656		try {
657	<	ArrayDeque l = new ArrayDeque();
477	<	l.add(new Object());
478	<	Object o[] = l.toArray(null);
657	>	l.toArray(null);
658		shouldThrow();
659		} catch (NullPointerException success) {}
660		}
661
662		/**
663	<	* toArray with incompatable aray type throws CCE
663	>	* toArray(incompatible array type) throws ArrayStoreException
664		*/
665		public void testToArray1_BadArg() {
666	+	ArrayDeque l = new ArrayDeque();
667	+	l.add(new Integer(5));
668		try {
669	<	ArrayDeque l = new ArrayDeque();
489	<	l.add(new Integer(5));
490	<	Object o[] = l.toArray(new String[10] );
669	>	l.toArray(new String[10]);
670		shouldThrow();
671	<	} catch (ArrayStoreException  success) {}
671	>	} catch (ArrayStoreException success) {}
672		}
673
674		/**
675	<	*  iterator iterates through all elements
675	>	* Iterator iterates through all elements
676		*/
677		public void testIterator() {
678		ArrayDeque q = populatedDeque(SIZE);
#	Line 507 | Line 686 | public class ArrayDequeTest extends JSR1
686		}
687
688		/**
689	<	*  iterator ordering is FIFO
689	>	* Iterator ordering is FIFO
690		*/
691		public void testIteratorOrdering() {
692		final ArrayDeque q = new ArrayDeque();
693	<	q.add(new Integer(1));
694	<	q.add(new Integer(2));
695	<	q.add(new Integer(3));
693	>	q.add(one);
694	>	q.add(two);
695	>	q.add(three);
696		int k = 0;
697		for (Iterator it = q.iterator(); it.hasNext();) {
698	<	int i = ((Integer)(it.next())).intValue();
520	<	assertEquals(++k, i);
698	>	assertEquals(++k, it.next());
699		}
700
701		assertEquals(3, k);
702		}
703
704		/**
705	<	* iterator.remove removes current element
705	>	* iterator.remove() removes current element
706		*/
707	<	public void testIteratorRemove () {
707	>	public void testIteratorRemove() {
708		final ArrayDeque q = new ArrayDeque();
709		final Random rng = new Random();
710		for (int iters = 0; iters < 100; ++iters) {
#	Line 552 | Line 730 | public class ArrayDequeTest extends JSR1
730		}
731
732		/**
733	<	*  Descending iterator iterates through all elements
733	>	* Descending iterator iterates through all elements
734		*/
735		public void testDescendingIterator() {
736		ArrayDeque q = populatedDeque(SIZE);
#	Line 566 | Line 744 | public class ArrayDequeTest extends JSR1
744		assertFalse(it.hasNext());
745		try {
746		it.next();
747	<	} catch (NoSuchElementException success) {
748	<	}
747	>	shouldThrow();
748	>	} catch (NoSuchElementException success) {}
749		}
750
751		/**
752	<	*  Descending iterator ordering is reverse FIFO
752	>	* Descending iterator ordering is reverse FIFO
753		*/
754		public void testDescendingIteratorOrdering() {
755		final ArrayDeque q = new ArrayDeque();
#	Line 581 | Line 759 | public class ArrayDequeTest extends JSR1
759		q.add(new Integer(1));
760		int k = 0;
761		for (Iterator it = q.descendingIterator(); it.hasNext();) {
762	<	int i = ((Integer)(it.next())).intValue();
585	<	assertEquals(++k, i);
762	>	assertEquals(++k, it.next());
763		}
764
765		assertEquals(3, k);
#	Line 593 | Line 770 | public class ArrayDequeTest extends JSR1
770		}
771
772		/**
773	<	* descendingIterator.remove removes current element
773	>	* descendingIterator.remove() removes current element
774		*/
775	<	public void testDescendingIteratorRemove () {
775	>	public void testDescendingIteratorRemove() {
776		final ArrayDeque q = new ArrayDeque();
777		final Random rng = new Random();
778		for (int iters = 0; iters < 100; ++iters) {
#	Line 622 | Line 799 | public class ArrayDequeTest extends JSR1
799
800
801		/**
802	<	* toString contains toStrings of elements
802	>	* toString() contains toStrings of elements
803		*/
804		public void testToString() {
805		ArrayDeque q = populatedDeque(SIZE);
#	Line 633 | Line 810 | public class ArrayDequeTest extends JSR1
810		}
811
812		/**
813	<	* peekFirst returns element inserted with addFirst
813	>	* A deserialized serialized deque has same elements in same order
814		*/
815	<	public void testAddFirst() {
816	<	ArrayDeque q = populatedDeque(3);
817	<	q.addFirst(four);
818	<	assertEquals(four,q.peekFirst());
819	<	}
820	<
821	<	/**
822	<	* peekLast returns element inserted with addLast
823	<	*/
824	<	public void testAddLast() {
825	<	ArrayDeque q = populatedDeque(3);
826	<	q.addLast(four);
827	<	assertEquals(four,q.peekLast());
815	>	public void testSerialization() throws Exception {
816	>	ArrayDeque q = populatedDeque(SIZE);
817	>	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
818	>	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
819	>	out.writeObject(q);
820	>	out.close();
821	>
822	>	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
823	>	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
824	>	ArrayDeque r = (ArrayDeque)in.readObject();
825	>	assertEquals(q.size(), r.size());
826	>	while (!q.isEmpty())
827	>	assertEquals(q.remove(), r.remove());
828		}
829
830		}

Diff Legend

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