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.14 by jsr166, Mon Jul 22 18:11:56 2013 UTC vs.
Revision 1.18 by jsr166, Wed Dec 31 19:05:42 2014 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 < import junit.framework.*;
8 < import java.util.*;
9 < import java.util.function.*;
10 < import java.util.concurrent.atomic.LongAdder;
7 > import static java.util.Spliterator.CONCURRENT;
8 > import static java.util.Spliterator.DISTINCT;
9 > import static java.util.Spliterator.NONNULL;
10 >
11 > import java.util.AbstractMap;
12 > import java.util.Arrays;
13 > import java.util.Collection;
14 > import java.util.Collections;
15 > import java.util.Iterator;
16 > import java.util.Map;
17 > import java.util.NoSuchElementException;
18 > import java.util.Set;
19 > import java.util.Spliterator;
20 > import java.util.Vector;
21   import java.util.concurrent.ConcurrentHashMap;
22 < import java.util.concurrent.ConcurrentHashMap.KeySetView;
22 > import java.util.concurrent.atomic.LongAdder;
23 > import java.util.function.BiFunction;
24 >
25 > import junit.framework.Test;
26 > import junit.framework.TestSuite;
27  
28   public class ConcurrentHashMap8Test extends JSR166TestCase {
29      public static void main(String[] args) {
# Line 196 | Line 210 | public class ConcurrentHashMap8Test exte
210          Set set1 = map.keySet();
211          Set set2 = map.keySet(true);
212          set2.add(six);
213 <        assertTrue(((KeySetView)set2).getMap() == map);
214 <        assertTrue(((KeySetView)set1).getMap() == map);
213 >        assertTrue(((ConcurrentHashMap.KeySetView)set2).getMap() == map);
214 >        assertTrue(((ConcurrentHashMap.KeySetView)set1).getMap() == map);
215          assertEquals(set2.size(), map.size());
216          assertEquals(set1.size(), map.size());
217          assertTrue((Boolean)map.get(six));
# Line 289 | Line 303 | public class ConcurrentHashMap8Test exte
303              map.keySet(null);
304              shouldThrow();
305          } catch (NullPointerException e) {}
306 <        KeySetView set = map.keySet(one);
306 >        ConcurrentHashMap.KeySetView set = map.keySet(one);
307          set.add(one);
308          set.add(six);
309          set.add(seven);
# Line 299 | Line 313 | public class ConcurrentHashMap8Test exte
313          assertTrue(map.get(seven) == one);
314      }
315  
316 +    void checkSpliteratorCharacteristics(Spliterator<?> sp,
317 +                                         int requiredCharacteristics) {
318 +        assertEquals(requiredCharacteristics,
319 +                     requiredCharacteristics & sp.characteristics());
320 +    }
321 +
322      /**
323       * KeySetView.spliterator returns spliterator over the elements in this set
324       */
# Line 307 | Line 327 | public class ConcurrentHashMap8Test exte
327          ConcurrentHashMap map = map5();
328          Set set = map.keySet();
329          Spliterator<Integer> sp = set.spliterator();
330 +        checkSpliteratorCharacteristics(sp, CONCURRENT | DISTINCT | NONNULL);
331          assertEquals(sp.estimateSize(), map.size());
332          Spliterator<Integer> sp2 = sp.trySplit();
333          sp.forEachRemaining((Integer x) -> adder.add(x.longValue()));
# Line 531 | Line 552 | public class ConcurrentHashMap8Test exte
552  
553          assertNotSame(x, y);
554          assertEquals(x.size(), y.size());
534 –        assertEquals(x.toString(), y.toString());
535 –        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
555          assertEquals(x, y);
556          assertEquals(y, x);
557      }

Diff Legend

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