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

Comparing jsr166/src/test/tck/CopyOnWriteArrayListTest.java (file contents):
Revision 1.21 by jsr166, Sun May 29 13:45:35 2011 UTC vs.
Revision 1.23 by jsr166, Sat Jun 18 14:32:14 2011 UTC

# Line 7 | Line 7
7   */
8  
9   import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
12 < import java.io.*;
10 > import java.util.Arrays;
11 > import java.util.Iterator;
12 > import java.util.LinkedList;
13 > import java.util.List;
14 > import java.util.ListIterator;
15 > import java.util.Vector;
16 > import java.util.concurrent.CopyOnWriteArrayList;
17  
18   public class CopyOnWriteArrayListTest extends JSR166TestCase {
19  
# Line 31 | Line 35 | public class CopyOnWriteArrayListTest ex
35          return a;
36      }
37  
34 –
38      /**
39       * a new list is empty
40       */
# Line 64 | Line 67 | public class CopyOnWriteArrayListTest ex
67              assertEquals(ints[i], a.get(i));
68      }
69  
67 –
70      /**
71       * addAll adds each element from the given collection
72       */
# Line 119 | Line 121 | public class CopyOnWriteArrayListTest ex
121          assertEquals(0, full.size());
122      }
123  
122 –
124      /**
125       * Cloned list is equal
126       */
# Line 174 | Line 175 | public class CopyOnWriteArrayListTest ex
175          assertEquals(a.hashCode(), b.hashCode());
176      }
177  
177 –
178      /**
179       * containsAll returns true for collection with subset of elements
180       */
# Line 373 | Line 373 | public class CopyOnWriteArrayListTest ex
373          assertEquals(2, i[2].intValue());
374      }
375  
376 –
376      /**
377       * sublists contains elements at indexes offset from their base
378       */
# Line 596 | Line 595 | public class CopyOnWriteArrayListTest ex
595       * a deserialized serialized list is equal
596       */
597      public void testSerialization() throws Exception {
598 <        CopyOnWriteArrayList q = populatedArray(SIZE);
598 >        List x = populatedArray(SIZE);
599 >        List y = serialClone(x);
600  
601 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
602 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
603 <        out.writeObject(q);
604 <        out.close();
605 <
606 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
607 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
608 <        CopyOnWriteArrayList r = (CopyOnWriteArrayList)in.readObject();
609 <        assertEquals(q.size(), r.size());
610 <        assertTrue(q.equals(r));
611 <        assertTrue(r.equals(q));
601 >        assertTrue(x != y);
602 >        assertEquals(x.size(), y.size());
603 >        assertEquals(x.toString(), y.toString());
604 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
605 >        assertEquals(x, y);
606 >        assertEquals(y, x);
607 >        while (!x.isEmpty()) {
608 >            assertFalse(y.isEmpty());
609 >            assertEquals(x.remove(0), y.remove(0));
610 >        }
611 >        assertTrue(y.isEmpty());
612      }
613  
614   }

Diff Legend

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