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.24 by jsr166, Tue Nov 29 20:59:24 2011 UTC vs.
Revision 1.29 by jsr166, Sat Jan 17 22:55:06 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
9 > import java.util.ArrayList;
10   import java.util.Arrays;
11   import java.util.Collection;
12   import java.util.Collections;
# Line 16 | Line 16 | import java.util.Set;
16   import java.util.Vector;
17   import java.util.concurrent.CopyOnWriteArraySet;
18  
19 + import junit.framework.Test;
20 + import junit.framework.TestSuite;
21 +
22   public class CopyOnWriteArraySetTest extends JSR166TestCase {
23      public static void main(String[] args) {
24          junit.textui.TestRunner.run(suite());
# Line 173 | Line 176 | public class CopyOnWriteArraySetTest ext
176       * set in insertion order
177       */
178      public void testIterator() {
179 <        Set empty = new CopyOnWriteArraySet();
179 >        Collection empty = new CopyOnWriteArraySet();
180          assertFalse(empty.iterator().hasNext());
181          try {
182              empty.iterator().next();
# Line 191 | Line 194 | public class CopyOnWriteArraySetTest ext
194              assertTrue(it.hasNext());
195              assertEquals(elements[j], it.next());
196          }
197 <        assertFalse(it.hasNext());
198 <        try {
199 <            it.next();
200 <            shouldThrow();
201 <        } catch (NoSuchElementException success) {}
197 >        assertIteratorExhausted(it);
198 >    }
199 >
200 >    /**
201 >     * iterator of empty collection has no elements
202 >     */
203 >    public void testEmptyIterator() {
204 >        assertIteratorExhausted(new CopyOnWriteArraySet().iterator());
205      }
206  
207      /**
# Line 215 | Line 221 | public class CopyOnWriteArraySetTest ext
221       * toString holds toString of elements
222       */
223      public void testToString() {
224 +        assertEquals("[]", new CopyOnWriteArraySet().toString());
225          CopyOnWriteArraySet full = populatedSet(3);
226          String s = full.toString();
227 <        for (int i = 0; i < 3; ++i) {
227 >        for (int i = 0; i < 3; ++i)
228              assertTrue(s.contains(String.valueOf(i)));
229 <        }
229 >        assertEquals(new ArrayList(full).toString(),
230 >                     full.toString());
231      }
232  
233      /**
# Line 338 | Line 346 | public class CopyOnWriteArraySetTest ext
346          Set x = populatedSet(SIZE);
347          Set y = serialClone(x);
348  
349 <        assertTrue(x != y);
349 >        assertNotSame(y, x);
350          assertEquals(x.size(), y.size());
351          assertEquals(x.toString(), y.toString());
352          assertTrue(Arrays.equals(x.toArray(), y.toArray()));
353          assertEquals(x, y);
354          assertEquals(y, x);
355      }
356 +
357 +    /**
358 +     * addAll is idempotent
359 +     */
360 +    public void testAddAll_idempotent() throws Exception {
361 +        Set x = populatedSet(SIZE);
362 +        Set y = new CopyOnWriteArraySet(x);
363 +        y.addAll(x);
364 +        assertEquals(x, y);
365 +        assertEquals(y, x);
366 +    }
367  
368   }

Diff Legend

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