ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ArrayDequeTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ArrayDequeTest.java (file contents):
Revision 1.19 by jsr166, Thu Nov 4 01:04:54 2010 UTC vs.
Revision 1.21 by jsr166, Thu Nov 18 20:21:53 2010 UTC

# Line 26 | Line 26 | public class ArrayDequeTest extends JSR1
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 391 | Line 391 | public class ArrayDequeTest extends JSR1
391      public void testRemoveElement() {
392          ArrayDeque q = populatedDeque(SIZE);
393          for (int i = 1; i < SIZE; i+=2) {
394 <            assertTrue(q.remove(new Integer(i)));
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.remove(new Integer(i)));
401 <            assertFalse(q.remove(new Integer(i+1)));
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      }
# Line 633 | Line 639 | public class ArrayDequeTest extends JSR1
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 <        assertSame(ints, q.toArray(ints));
644 >        Integer[] array = q.toArray(ints);
645 >        assertSame(ints, array);
646          for (int i = 0; i < ints.length; i++)
647              assertSame(ints[i], q.remove());
648      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines