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

Comparing jsr166/src/test/tck/CopyOnWriteArraySetTest.java (file contents):
Revision 1.18 by jsr166, Fri May 27 19:26:42 2011 UTC vs.
Revision 1.20 by jsr166, Sat Nov 26 07:39:02 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.Set;
13 > import java.util.Vector;
14 > import java.util.concurrent.CopyOnWriteArraySet;
15  
16   public class CopyOnWriteArraySetTest extends JSR166TestCase {
17      public static void main(String[] args) {
# Line 225 | Line 227 | public class CopyOnWriteArraySetTest ext
227       * toArray returns an Object array containing all elements from the set
228       */
229      public void testToArray() {
230 <        CopyOnWriteArraySet full = populatedSet(3);
231 <        Object[] o = full.toArray();
232 <        assertEquals(3, o.length);
233 <        assertEquals(0, o[0]);
234 <        assertEquals(1, o[1]);
235 <        assertEquals(2, o[2]);
230 >        CopyOnWriteArraySet<Integer> full = populatedSet(SIZE);
231 >        Object[] array = full.toArray();
232 >        Iterator<Integer> it = full.iterator();
233 >        for (int i = 0; i < SIZE; i++)
234 >            assertSame(array[i], it.next());
235 >        assertFalse(it.hasNext());
236      }
237  
238      /**
# Line 238 | Line 240 | public class CopyOnWriteArraySetTest ext
240       * the set
241       */
242      public void testToArray2() {
243 <        CopyOnWriteArraySet full = populatedSet(3);
244 <        Integer[] i = new Integer[3];
245 <        i = (Integer[])full.toArray(i);
246 <        assertEquals(3, i.length);
247 <        assertEquals(0, (int) i[0]);
248 <        assertEquals(1, (int) i[1]);
249 <        assertEquals(2, (int) i[2]);
243 >        CopyOnWriteArraySet<Integer> full = populatedSet(SIZE);
244 >        Integer[] ints = new Integer[SIZE];
245 >        assertSame(ints, full.toArray(ints));
246 >        Iterator<Integer> it = full.iterator();
247 >        for (int i = 0; i < SIZE; i++)
248 >            assertSame(ints[i], it.next());
249 >        assertFalse(it.hasNext());
250      }
251  
252      /**
# Line 265 | Line 267 | public class CopyOnWriteArraySetTest ext
267       * A deserialized serialized set is equal
268       */
269      public void testSerialization() throws Exception {
270 <        CopyOnWriteArraySet q = populatedSet(SIZE);
270 >        Set x = populatedSet(SIZE);
271 >        Set y = serialClone(x);
272  
273 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
274 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
275 <        out.writeObject(q);
276 <        out.close();
274 <
275 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
276 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
277 <        CopyOnWriteArraySet r = (CopyOnWriteArraySet)in.readObject();
278 <        assertEquals(q.size(), r.size());
279 <        assertTrue(q.equals(r));
280 <        assertTrue(r.equals(q));
273 >        assertTrue(x != y);
274 >        assertEquals(x.size(), y.size());
275 >        assertEquals(x, y);
276 >        assertEquals(y, x);
277      }
278  
279   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines