ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ConcurrentHashMap8Test.java
(Generate patch)

Comparing jsr166/src/test/tck/ConcurrentHashMap8Test.java (file contents):
Revision 1.22 by jsr166, Sat Jan 17 22:55:06 2015 UTC vs.
Revision 1.23 by jsr166, Fri Feb 27 19:47:57 2015 UTC

# Line 17 | Line 17 | import java.util.Map;
17   import java.util.NoSuchElementException;
18   import java.util.Set;
19   import java.util.Spliterator;
20 – import java.util.Vector;
20   import java.util.concurrent.ConcurrentHashMap;
21   import java.util.concurrent.atomic.LongAdder;
22   import java.util.function.BiFunction;
# Line 165 | Line 164 | public class ConcurrentHashMap8Test exte
164          assertTrue(a.isEmpty());
165          for (int i = 0; i < n; i++)
166              a.add(i);
167 <        assertFalse(a.isEmpty());
167 >        assertEquals(n == 0, a.isEmpty());
168          assertEquals(n, a.size());
169          return a;
170      }
# Line 228 | Line 227 | public class ConcurrentHashMap8Test exte
227       */
228      public void testAddAll() {
229          Set full = populatedSet(3);
230 <        Vector v = new Vector();
231 <        v.add(three);
232 <        v.add(four);
234 <        v.add(five);
235 <        full.addAll(v);
230 >        assertTrue(full.addAll(Arrays.asList(three, four, five)));
231 >        assertEquals(6, full.size());
232 >        assertFalse(full.addAll(Arrays.asList(three, four, five)));
233          assertEquals(6, full.size());
234      }
235  
# Line 242 | Line 239 | public class ConcurrentHashMap8Test exte
239       */
240      public void testAddAll2() {
241          Set full = populatedSet(3);
242 <        Vector v = new Vector();
243 <        v.add(three);
244 <        v.add(four);
245 <        v.add(one); // will not add this element
249 <        full.addAll(v);
242 >        // "one" is duplicate and will not be added
243 >        assertTrue(full.addAll(Arrays.asList(three, four, one)));
244 >        assertEquals(5, full.size());
245 >        assertFalse(full.addAll(Arrays.asList(three, four, one)));
246          assertEquals(5, full.size());
247      }
248  
# Line 376 | Line 372 | public class ConcurrentHashMap8Test exte
372       * KeySet.containsAll returns true for collections with subset of elements
373       */
374      public void testContainsAll() {
375 <        Set full = populatedSet(3);
376 <        Vector v = new Vector();
377 <        v.add(one);
378 <        v.add(two);
379 <        assertTrue(full.containsAll(v));
380 <        v.add(six);
385 <        assertFalse(full.containsAll(v));
375 >        Collection full = populatedSet(3);
376 >        assertTrue(full.containsAll(Arrays.asList()));
377 >        assertTrue(full.containsAll(Arrays.asList(one)));
378 >        assertTrue(full.containsAll(Arrays.asList(one, two)));
379 >        assertFalse(full.containsAll(Arrays.asList(one, two, six)));
380 >        assertFalse(full.containsAll(Arrays.asList(six)));
381      }
382  
383      /**
384       * KeySet.isEmpty is true when empty, else false
385       */
386      public void testIsEmpty() {
387 <        Set empty = ConcurrentHashMap.newKeySet();
388 <        Set full = populatedSet(3);
394 <        assertTrue(empty.isEmpty());
395 <        assertFalse(full.isEmpty());
387 >        assertTrue(populatedSet(0).isEmpty());
388 >        assertFalse(populatedSet(3).isEmpty());
389      }
390  
391      /**
# Line 463 | Line 456 | public class ConcurrentHashMap8Test exte
456       */
457      public void testRemoveAll() {
458          Set full = populatedSet(3);
459 <        Vector v = new Vector();
460 <        v.add(one);
461 <        v.add(two);
469 <        full.removeAll(v);
459 >        assertTrue(full.removeAll(Arrays.asList(one, two)));
460 >        assertEquals(1, full.size());
461 >        assertFalse(full.removeAll(Arrays.asList(one, two)));
462          assertEquals(1, full.size());
463      }
464  

Diff Legend

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