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.22 by jsr166, Tue Mar 15 19:47:06 2011 UTC vs.
Revision 1.24 by jsr166, Tue May 31 16:16:23 2011 UTC

# Line 5 | Line 5
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.*;
8 > import java.util.Arrays;
9 > import java.util.ArrayDeque;
10 > import java.util.Collection;
11 > import java.util.Deque;
12 > import java.util.Iterator;
13 > import java.util.NoSuchElementException;
14 > import java.util.Queue;
15 > import java.util.Random;
16  
17   public class ArrayDequeTest extends JSR166TestCase {
18      public static void main(String[] args) {
# Line 494 | Line 495 | public class ArrayDequeTest extends JSR1
495          assertNull(q.peekLast());
496      }
497  
497 –
498      /**
499       * removeFirst() removes first element, or throws NSEE if empty
500       */
# Line 797 | Line 797 | public class ArrayDequeTest extends JSR1
797          }
798      }
799  
800 –
800      /**
801       * toString() contains toStrings of elements
802       */
# Line 805 | Line 804 | public class ArrayDequeTest extends JSR1
804          ArrayDeque q = populatedDeque(SIZE);
805          String s = q.toString();
806          for (int i = 0; i < SIZE; ++i) {
807 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
807 >            assertTrue(s.contains(String.valueOf(i)));
808          }
809      }
810  
# Line 813 | Line 812 | public class ArrayDequeTest extends JSR1
812       * A deserialized serialized deque has same elements in same order
813       */
814      public void testSerialization() throws Exception {
815 <        ArrayDeque q = populatedDeque(SIZE);
816 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
817 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
818 <        out.writeObject(q);
819 <        out.close();
820 <
821 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
822 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
823 <        ArrayDeque r = (ArrayDeque)in.readObject();
824 <        assertEquals(q.size(), r.size());
825 <        while (!q.isEmpty())
826 <            assertEquals(q.remove(), r.remove());
815 >        Queue x = populatedDeque(SIZE);
816 >        Queue y = serialClone(x);
817 >
818 >        assertTrue(x != y);
819 >        assertEquals(x.size(), y.size());
820 >        assertEquals(x.toString(), y.toString());
821 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
822 >        while (!x.isEmpty()) {
823 >            assertFalse(y.isEmpty());
824 >            assertEquals(x.remove(), y.remove());
825 >        }
826 >        assertTrue(y.isEmpty());
827      }
828  
829   }

Diff Legend

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