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.11 by jsr166, Sat Nov 21 02:07:26 2009 UTC vs.
Revision 1.17 by jsr166, Tue Mar 15 19:47:06 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   */
# Line 13 | Line 13 | import java.io.*;
13  
14   public class CopyOnWriteArraySetTest extends JSR166TestCase {
15      public static void main(String[] args) {
16 <        junit.textui.TestRunner.run (suite());
16 >        junit.textui.TestRunner.run(suite());
17      }
18      public static Test suite() {
19          return new TestSuite(CopyOnWriteArraySetTest.class);
# Line 51 | Line 51 | public class CopyOnWriteArraySetTest ext
51  
52  
53      /**
54 <     *   addAll  adds each element from the given collection
54 >     * addAll adds each element from the given collection
55       */
56      public void testAddAll() {
57          CopyOnWriteArraySet full = populatedSet(3);
# Line 64 | Line 64 | public class CopyOnWriteArraySetTest ext
64      }
65  
66      /**
67 <     *   addAll adds each element from the given collection that did not
68 <     *  already exist in the set
67 >     * addAll adds each element from the given collection that did not
68 >     * already exist in the set
69       */
70      public void testAddAll2() {
71          CopyOnWriteArraySet full = populatedSet(3);
# Line 78 | Line 78 | public class CopyOnWriteArraySetTest ext
78      }
79  
80      /**
81 <     *   add will not add the element if it already exists in the set
81 >     * add will not add the element if it already exists in the set
82       */
83      public void testAdd2() {
84          CopyOnWriteArraySet full = populatedSet(3);
# Line 87 | Line 87 | public class CopyOnWriteArraySetTest ext
87      }
88  
89      /**
90 <     *   add  adds the element when it does not exist
91 <     *   in the set
90 >     * add adds the element when it does not exist in the set
91       */
92      public void testAdd3() {
93          CopyOnWriteArraySet full = populatedSet(3);
# Line 97 | Line 96 | public class CopyOnWriteArraySetTest ext
96      }
97  
98      /**
99 <     *   clear  removes all elements from the set
99 >     * clear removes all elements from the set
100       */
101      public void testClear() {
102          CopyOnWriteArraySet full = populatedSet(3);
# Line 106 | Line 105 | public class CopyOnWriteArraySetTest ext
105      }
106  
107      /**
108 <     *   contains returns true for added elements
108 >     * contains returns true for added elements
109       */
110      public void testContains() {
111          CopyOnWriteArraySet full = populatedSet(3);
# Line 134 | Line 133 | public class CopyOnWriteArraySetTest ext
133  
134  
135      /**
136 <     *   containsAll returns true for collections with subset of elements
136 >     * containsAll returns true for collections with subset of elements
137       */
138      public void testContainsAll() {
139          CopyOnWriteArraySet full = populatedSet(3);
# Line 147 | Line 146 | public class CopyOnWriteArraySetTest ext
146      }
147  
148      /**
149 <     *   isEmpty is true when empty, else false
149 >     * isEmpty is true when empty, else false
150       */
151      public void testIsEmpty() {
152          CopyOnWriteArraySet empty = new CopyOnWriteArraySet();
# Line 157 | Line 156 | public class CopyOnWriteArraySetTest ext
156      }
157  
158      /**
159 <     *   iterator() returns an iterator containing the elements of the set
159 >     * iterator() returns an iterator containing the elements of the set
160       */
161      public void testIterator() {
162          CopyOnWriteArraySet full = populatedSet(3);
163          Iterator i = full.iterator();
164          int j;
165          for (j = 0; i.hasNext(); j++)
166 <            assertEquals(j, ((Integer)i.next()).intValue());
166 >            assertEquals(j, i.next());
167          assertEquals(3, j);
168      }
169  
170      /**
171       * iterator remove is unsupported
172       */
173 <    public void testIteratorRemove () {
173 >    public void testIteratorRemove() {
174          CopyOnWriteArraySet full = populatedSet(3);
175          Iterator it = full.iterator();
176          it.next();
177          try {
178              it.remove();
179              shouldThrow();
180 <        }
182 <        catch (UnsupportedOperationException success) {}
180 >        } catch (UnsupportedOperationException success) {}
181      }
182  
183      /**
# Line 195 | Line 193 | public class CopyOnWriteArraySetTest ext
193  
194  
195      /**
196 <     *   removeAll  removes all elements from the given collection
196 >     * removeAll removes all elements from the given collection
197       */
198      public void testRemoveAll() {
199          CopyOnWriteArraySet full = populatedSet(3);
# Line 218 | Line 216 | public class CopyOnWriteArraySetTest ext
216      }
217  
218      /**
219 <     *   size returns the number of elements
219 >     * size returns the number of elements
220       */
221      public void testSize() {
222          CopyOnWriteArraySet empty = new CopyOnWriteArraySet();
# Line 228 | Line 226 | public class CopyOnWriteArraySetTest ext
226      }
227  
228      /**
229 <     *   toArray returns an Object array containing all elements from the set
229 >     * toArray returns an Object array containing all elements from the set
230       */
231      public void testToArray() {
232          CopyOnWriteArraySet full = populatedSet(3);
233          Object[] o = full.toArray();
234          assertEquals(3, o.length);
235 <        assertEquals(0, ((Integer)o[0]).intValue());
236 <        assertEquals(1, ((Integer)o[1]).intValue());
237 <        assertEquals(2, ((Integer)o[2]).intValue());
235 >        assertEquals(0, o[0]);
236 >        assertEquals(1, o[1]);
237 >        assertEquals(2, o[2]);
238      }
239  
240      /**
241 <     *   toArray returns an Integer array containing all elements from
242 <     *   the set
241 >     * toArray returns an Integer array containing all elements from
242 >     * the set
243       */
244      public void testToArray2() {
245          CopyOnWriteArraySet full = populatedSet(3);
246          Integer[] i = new Integer[3];
247          i = (Integer[])full.toArray(i);
248          assertEquals(3, i.length);
249 <        assertEquals(0, i[0].intValue());
250 <        assertEquals(1, i[1].intValue());
251 <        assertEquals(2, i[2].intValue());
249 >        assertEquals(0, (int) i[0]);
250 >        assertEquals(1, (int) i[1]);
251 >        assertEquals(2, (int) i[2]);
252      }
253  
254  
255      /**
256 <     *  toArray throws an ArrayStoreException when the given array can
257 <     *  not store the objects inside the set
256 >     * toArray throws an ArrayStoreException when the given array can
257 >     * not store the objects inside the set
258       */
259      public void testToArray_ArrayStoreException() {
260          try {
# Line 265 | Line 263 | public class CopyOnWriteArraySetTest ext
263              c.add("asdadasd");
264              c.toArray(new Long[5]);
265              shouldThrow();
266 <        } catch (ArrayStoreException e) {}
266 >        } catch (ArrayStoreException success) {}
267      }
268  
269      /**
270       * A deserialized serialized set is equal
271       */
272 <    public void testSerialization() {
272 >    public void testSerialization() throws Exception {
273          CopyOnWriteArraySet q = populatedSet(SIZE);
274  
275 <        try {
276 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
277 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
278 <            out.writeObject(q);
279 <            out.close();
280 <
281 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
282 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
283 <            CopyOnWriteArraySet r = (CopyOnWriteArraySet)in.readObject();
284 <            assertEquals(q.size(), r.size());
285 <            assertTrue(q.equals(r));
288 <            assertTrue(r.equals(q));
289 <        } catch (Exception e) {
290 <            unexpectedException();
291 <        }
275 >        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
276 >        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
277 >        out.writeObject(q);
278 >        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));
286      }
287  
288   }

Diff Legend

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