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.33 by jsr166, Fri May 15 18:21:19 2015 UTC vs.
Revision 1.35 by jsr166, Tue May 26 19:22:09 2015 UTC

# 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 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      /**
# Line 149 | Line 181 | public class CopyOnWriteArraySetTest ext
181       */
182      public void testContainsAll() {
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      /**
# Line 284 | 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 308 | 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)));

Diff Legend

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