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.30 by jsr166, Fri Feb 27 19:28:23 2015 UTC vs.
Revision 1.35 by jsr166, Tue May 26 19:22:09 2015 UTC

# Line 20 | Line 20 | import junit.framework.TestSuite;
20  
21   public class CopyOnWriteArraySetTest extends JSR166TestCase {
22      public static void main(String[] args) {
23 <        junit.textui.TestRunner.run(suite());
23 >        main(suite(), args);
24      }
25      public static Test suite() {
26          return new TestSuite(CopyOnWriteArraySetTest.class);
# Line 31 | Line 31 | public class CopyOnWriteArraySetTest ext
31          assertTrue(a.isEmpty());
32          for (int i = 0; i < n; i++)
33              a.add(i);
34 <        assertFalse(a.isEmpty());
34 >        assertEquals(n == 0, a.isEmpty());
35          assertEquals(n, a.size());
36          return a;
37      }
# Line 59 | Line 59 | public class CopyOnWriteArraySetTest ext
59       */
60      public void testConstructor3() {
61          Integer[] ints = new Integer[SIZE];
62 <        for (int i = 0; i < SIZE-1; ++i)
62 >        for (int i = 0; i < SIZE - 1; ++i)
63              ints[i] = new Integer(i);
64          CopyOnWriteArraySet a = new CopyOnWriteArraySet(Arrays.asList(ints));
65          for (int i = 0; i < SIZE; ++i)
# Line 67 | Line 67 | public class CopyOnWriteArraySetTest ext
67      }
68  
69      /**
70 <     * addAll adds each element from the given collection
70 >     * addAll adds each non-duplicate element from the given collection
71       */
72      public void testAddAll() {
73 <        CopyOnWriteArraySet full = populatedSet(3);
73 >        Set full = populatedSet(3);
74          assertTrue(full.addAll(Arrays.asList(three, four, five)));
75          assertEquals(6, full.size());
76          assertFalse(full.addAll(Arrays.asList(three, four, five)));
# Line 78 | Line 78 | public class CopyOnWriteArraySetTest ext
78      }
79  
80      /**
81 <     * addAll adds each element from the given collection that did not
82 <     * already exist in the set
81 >     * addAll adds each non-duplicate element from the given collection
82       */
83      public void testAddAll2() {
84 <        CopyOnWriteArraySet full = populatedSet(3);
84 >        Set full = populatedSet(3);
85          // "one" is duplicate and will not be added
86          assertTrue(full.addAll(Arrays.asList(three, four, one)));
87          assertEquals(5, full.size());
# Line 94 | Line 93 | public class CopyOnWriteArraySetTest ext
93       * add will not add the element if it already exists in the set
94       */
95      public void testAdd2() {
96 <        CopyOnWriteArraySet full = populatedSet(3);
96 >        Set full = populatedSet(3);
97          full.add(one);
98          assertEquals(3, full.size());
99      }
# Line 103 | Line 102 | public class CopyOnWriteArraySetTest ext
102       * add adds the element when it does not exist in the set
103       */
104      public void testAdd3() {
105 <        CopyOnWriteArraySet full = populatedSet(3);
105 >        Set full = populatedSet(3);
106          full.add(three);
107          assertTrue(full.contains(three));
108      }
# Line 112 | Line 111 | public class CopyOnWriteArraySetTest ext
111       * clear removes all elements from the set
112       */
113      public void testClear() {
114 <        CopyOnWriteArraySet full = populatedSet(3);
114 >        Collection full = populatedSet(3);
115          full.clear();
116          assertEquals(0, full.size());
117 +        assertTrue(full.isEmpty());
118      }
119  
120      /**
121       * contains returns true for added elements
122       */
123      public void testContains() {
124 <        CopyOnWriteArraySet full = populatedSet(3);
124 >        Collection full = populatedSet(3);
125          assertTrue(full.contains(one));
126          assertFalse(full.contains(five));
127      }
# Line 134 | Line 134 | public class CopyOnWriteArraySetTest ext
134          CopyOnWriteArraySet b = populatedSet(3);
135          assertTrue(a.equals(b));
136          assertTrue(b.equals(a));
137 +        assertTrue(a.containsAll(b));
138 +        assertTrue(b.containsAll(a));
139          assertEquals(a.hashCode(), b.hashCode());
140 +        assertEquals(a.size(), b.size());
141 +
142          a.add(m1);
143          assertFalse(a.equals(b));
144          assertFalse(b.equals(a));
145 +        assertTrue(a.containsAll(b));
146 +        assertFalse(b.containsAll(a));
147          b.add(m1);
148          assertTrue(a.equals(b));
149          assertTrue(b.equals(a));
150 +        assertTrue(a.containsAll(b));
151 +        assertTrue(b.containsAll(a));
152 +        assertEquals(a.hashCode(), b.hashCode());
153 +
154 +        Object x = a.iterator().next();
155 +        a.remove(x);
156 +        assertFalse(a.equals(b));
157 +        assertFalse(b.equals(a));
158 +        assertFalse(a.containsAll(b));
159 +        assertTrue(b.containsAll(a));
160 +        a.add(x);
161 +        assertTrue(a.equals(b));
162 +        assertTrue(b.equals(a));
163 +        assertTrue(a.containsAll(b));
164 +        assertTrue(b.containsAll(a));
165          assertEquals(a.hashCode(), b.hashCode());
166 +        assertEquals(a.size(), b.size());
167 +
168 +        CopyOnWriteArraySet empty1 = new CopyOnWriteArraySet(Arrays.asList());
169 +        CopyOnWriteArraySet empty2 = new CopyOnWriteArraySet(Arrays.asList());
170 +        assertTrue(empty1.equals(empty1));
171 +        assertTrue(empty1.equals(empty2));
172 +
173 +        assertFalse(empty1.equals(a));
174 +        assertFalse(a.equals(empty1));
175 +
176 +        assertFalse(a.equals(null));
177      }
178  
179      /**
180       * containsAll returns true for collections with subset of elements
181       */
182      public void testContainsAll() {
183 <        CopyOnWriteArraySet full = populatedSet(3);
183 >        Collection full = populatedSet(3);
184 >        assertTrue(full.containsAll(full));
185          assertTrue(full.containsAll(Arrays.asList()));
186          assertTrue(full.containsAll(Arrays.asList(one)));
187          assertTrue(full.containsAll(Arrays.asList(one, two)));
188          assertFalse(full.containsAll(Arrays.asList(one, two, six)));
189          assertFalse(full.containsAll(Arrays.asList(six)));
190 +
191 +        CopyOnWriteArraySet empty1 = new CopyOnWriteArraySet(Arrays.asList());
192 +        CopyOnWriteArraySet empty2 = new CopyOnWriteArraySet(Arrays.asList());
193 +        assertTrue(empty1.containsAll(empty2));
194 +        assertTrue(empty1.containsAll(empty1));
195 +        assertFalse(empty1.containsAll(full));
196 +        assertTrue(full.containsAll(empty1));
197 +
198 +        try {
199 +            full.containsAll(null);
200 +            shouldThrow();
201 +        } catch (NullPointerException success) {}
202      }
203  
204      /**
205       * isEmpty is true when empty, else false
206       */
207      public void testIsEmpty() {
208 <        CopyOnWriteArraySet empty = new CopyOnWriteArraySet();
209 <        CopyOnWriteArraySet full = populatedSet(3);
165 <        assertTrue(empty.isEmpty());
166 <        assertFalse(full.isEmpty());
208 >        assertTrue(populatedSet(0).isEmpty());
209 >        assertFalse(populatedSet(3).isEmpty());
210      }
211  
212      /**
# Line 203 | Line 246 | public class CopyOnWriteArraySetTest ext
246       * iterator remove is unsupported
247       */
248      public void testIteratorRemove() {
249 <        CopyOnWriteArraySet full = populatedSet(3);
249 >        Collection full = populatedSet(3);
250          Iterator it = full.iterator();
251          it.next();
252          try {
# Line 217 | Line 260 | public class CopyOnWriteArraySetTest ext
260       */
261      public void testToString() {
262          assertEquals("[]", new CopyOnWriteArraySet().toString());
263 <        CopyOnWriteArraySet full = populatedSet(3);
263 >        Collection full = populatedSet(3);
264          String s = full.toString();
265          for (int i = 0; i < 3; ++i)
266              assertTrue(s.contains(String.valueOf(i)));
# Line 229 | Line 272 | public class CopyOnWriteArraySetTest ext
272       * removeAll removes all elements from the given collection
273       */
274      public void testRemoveAll() {
275 <        CopyOnWriteArraySet full = populatedSet(3);
275 >        Set full = populatedSet(3);
276          assertTrue(full.removeAll(Arrays.asList(one, two)));
277          assertEquals(1, full.size());
278          assertFalse(full.removeAll(Arrays.asList(one, two)));
# Line 240 | Line 283 | public class CopyOnWriteArraySetTest ext
283       * remove removes an element
284       */
285      public void testRemove() {
286 <        CopyOnWriteArraySet full = populatedSet(3);
286 >        Collection full = populatedSet(3);
287          full.remove(one);
288          assertFalse(full.contains(one));
289          assertEquals(2, full.size());
# Line 250 | Line 293 | public class CopyOnWriteArraySetTest ext
293       * size returns the number of elements
294       */
295      public void testSize() {
296 <        CopyOnWriteArraySet empty = new CopyOnWriteArraySet();
297 <        CopyOnWriteArraySet full = populatedSet(3);
296 >        Collection empty = new CopyOnWriteArraySet();
297 >        Collection full = populatedSet(3);
298          assertEquals(3, full.size());
299          assertEquals(0, empty.size());
300      }
# Line 286 | Line 329 | public class CopyOnWriteArraySetTest ext
329          a = new Integer[0];
330          assertSame(a, empty.toArray(a));
331  
332 <        a = new Integer[SIZE/2];
332 >        a = new Integer[SIZE / 2];
333          Arrays.fill(a, 42);
334          assertSame(a, empty.toArray(a));
335          assertNull(a[0]);
# Line 310 | Line 353 | public class CopyOnWriteArraySetTest ext
353          assertSame(a, full.toArray(a));
354          assertTrue(Arrays.equals(elements, a));
355  
356 <        a = new Integer[2*SIZE];
356 >        a = new Integer[2 * SIZE];
357          Arrays.fill(a, 42);
358          assertSame(a, full.toArray(a));
359          assertTrue(Arrays.equals(elements, Arrays.copyOf(a, SIZE)));
# Line 324 | Line 367 | public class CopyOnWriteArraySetTest ext
367       * not store the objects inside the set
368       */
369      public void testToArray_ArrayStoreException() {
370 +        CopyOnWriteArraySet c = new CopyOnWriteArraySet();
371 +        c.add("zfasdfsdf");
372 +        c.add("asdadasd");
373          try {
328 –            CopyOnWriteArraySet c = new CopyOnWriteArraySet();
329 –            c.add("zfasdfsdf");
330 –            c.add("asdadasd");
374              c.toArray(new Long[5]);
375              shouldThrow();
376          } catch (ArrayStoreException success) {}

Diff Legend

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