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.16 by jsr166, Sat Oct 9 19:30:35 2010 UTC vs.
Revision 1.19 by jsr166, Tue May 31 16:16:23 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
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 49 | Line 51 | public class CopyOnWriteArraySetTest ext
51              assertTrue(a.contains(ints[i]));
52      }
53  
52 –
54      /**
55       * addAll adds each element from the given collection
56       */
# Line 131 | Line 132 | public class CopyOnWriteArraySetTest ext
132          assertEquals(a.hashCode(), b.hashCode());
133      }
134  
134 –
135      /**
136       * containsAll returns true for collections with subset of elements
137       */
# Line 187 | Line 187 | public class CopyOnWriteArraySetTest ext
187          CopyOnWriteArraySet full = populatedSet(3);
188          String s = full.toString();
189          for (int i = 0; i < 3; ++i) {
190 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
190 >            assertTrue(s.contains(String.valueOf(i)));
191          }
192      }
193  
194 –
194      /**
195       * removeAll removes all elements from the given collection
196       */
# Line 204 | Line 203 | public class CopyOnWriteArraySetTest ext
203          assertEquals(1, full.size());
204      }
205  
207 –
206      /**
207       * remove removes an element
208       */
# Line 251 | Line 249 | public class CopyOnWriteArraySetTest ext
249          assertEquals(2, (int) i[2]);
250      }
251  
254 –
252      /**
253       * toArray throws an ArrayStoreException when the given array can
254       * not store the objects inside the set
# Line 270 | 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();
279 <
280 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
281 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
282 <        CopyOnWriteArraySet r = (CopyOnWriteArraySet)in.readObject();
283 <        assertEquals(q.size(), r.size());
284 <        assertTrue(q.equals(r));
285 <        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