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.23 by jsr166, Tue Nov 29 20:49:39 2011 UTC vs.
Revision 1.24 by jsr166, Tue Nov 29 20:59:24 2011 UTC

# Line 11 | Line 11 | import java.util.Arrays;
11   import java.util.Collection;
12   import java.util.Collections;
13   import java.util.Iterator;
14 + import java.util.NoSuchElementException;
15   import java.util.Set;
16   import java.util.Vector;
17   import java.util.concurrent.CopyOnWriteArraySet;
# Line 168 | Line 169 | public class CopyOnWriteArraySetTest ext
169      }
170  
171      /**
172 <     * iterator() returns an iterator containing the elements of the set
172 >     * iterator() returns an iterator containing the elements of the
173 >     * set in insertion order
174       */
175      public void testIterator() {
176 <        CopyOnWriteArraySet full = populatedSet(3);
177 <        Iterator i = full.iterator();
178 <        int j;
179 <        for (j = 0; i.hasNext(); j++)
180 <            assertEquals(j, i.next());
181 <        assertEquals(3, j);
176 >        Set empty = new CopyOnWriteArraySet();
177 >        assertFalse(empty.iterator().hasNext());
178 >        try {
179 >            empty.iterator().next();
180 >            shouldThrow();
181 >        } catch (NoSuchElementException success) {}
182 >
183 >        Integer[] elements = new Integer[SIZE];
184 >        for (int i = 0; i < SIZE; i++)
185 >            elements[i] = i;
186 >        Collections.shuffle(Arrays.asList(elements));
187 >        Collection<Integer> full = populatedSet(elements);
188 >
189 >        Iterator it = full.iterator();
190 >        for (int j = 0; j < SIZE; j++) {
191 >            assertTrue(it.hasNext());
192 >            assertEquals(elements[j], it.next());
193 >        }
194 >        assertFalse(it.hasNext());
195 >        try {
196 >            it.next();
197 >            shouldThrow();
198 >        } catch (NoSuchElementException success) {}
199      }
200  
201      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines