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.18 by jsr166, Wed Nov 3 16:46:34 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 620 | Line 626 | public class ArrayDequeTest extends JSR1
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();
628 –        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      /**

Diff Legend

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