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

Comparing jsr166/src/test/tck/ConcurrentHashMapTest.java (file contents):
Revision 1.32 by jsr166, Wed Jun 12 18:09:00 2013 UTC vs.
Revision 1.55 by jsr166, Fri Aug 4 03:30:21 2017 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
9 > import java.util.ArrayList;
10 > import java.util.Arrays;
11 > import java.util.Collection;
12 > import java.util.Collections;
13 > import java.util.Enumeration;
14 > import java.util.Iterator;
15 > import java.util.Map;
16 > import java.util.Random;
17 > import java.util.Set;
18   import java.util.concurrent.ConcurrentHashMap;
19  
20 + import junit.framework.Test;
21 + import junit.framework.TestSuite;
22 +
23   public class ConcurrentHashMapTest extends JSR166TestCase {
24      public static void main(String[] args) {
25 <        junit.textui.TestRunner.run(suite());
25 >        main(suite(), args);
26      }
27      public static Test suite() {
28          return new TestSuite(ConcurrentHashMapTest.class);
# Line 21 | Line 31 | public class ConcurrentHashMapTest exten
31      /**
32       * Returns a new map from Integers 1-5 to Strings "A"-"E".
33       */
34 <    private static ConcurrentHashMap map5() {
35 <        ConcurrentHashMap map = new ConcurrentHashMap(5);
34 >    private static ConcurrentHashMap<Integer, String> map5() {
35 >        ConcurrentHashMap<Integer, String> map = new ConcurrentHashMap<>(5);
36          assertTrue(map.isEmpty());
37          map.put(one, "A");
38          map.put(two, "B");
# Line 34 | Line 44 | public class ConcurrentHashMapTest exten
44          return map;
45      }
46  
47 +    /** Re-implement Integer.compare for old java versions */
48 +    static int compare(int x, int y) {
49 +        return (x < y) ? -1 : (x > y) ? 1 : 0;
50 +    }
51 +
52      // classes for testing Comparable fallbacks
53      static class BI implements Comparable<BI> {
54          private final int value;
55          BI(int value) { this.value = value; }
56          public int compareTo(BI other) {
57 <            return Integer.compare(value, other.value);
57 >            return compare(value, other.value);
58          }
59          public boolean equals(Object x) {
60              return (x instanceof BI) && ((BI)x).value == value;
# Line 73 | Line 88 | public class ConcurrentHashMapTest exten
88                      break;
89              }
90              if (r == 0)
91 <                r = Integer.compare(size(), other.size());
91 >                r = compare(size(), other.size());
92              return r;
93          }
94          private static final long serialVersionUID = 0;
95      }
96  
97 +    static class CollidingObject {
98 +        final String value;
99 +        CollidingObject(final String value) { this.value = value; }
100 +        public int hashCode() { return this.value.hashCode() & 1; }
101 +        public boolean equals(final Object obj) {
102 +            return (obj instanceof CollidingObject) && ((CollidingObject)obj).value.equals(value);
103 +        }
104 +    }
105 +
106 +    static class ComparableCollidingObject extends CollidingObject implements Comparable<ComparableCollidingObject> {
107 +        ComparableCollidingObject(final String value) { super(value); }
108 +        public int compareTo(final ComparableCollidingObject o) {
109 +            return value.compareTo(o.value);
110 +        }
111 +    }
112 +
113      /**
114       * Inserted elements that are subclasses of the same Comparable
115       * class are found.
116       */
117      public void testComparableFamily() {
118 +        int size = 500;         // makes measured test run time -> 60ms
119          ConcurrentHashMap<BI, Boolean> m =
120              new ConcurrentHashMap<BI, Boolean>();
121 <        for (int i = 0; i < 1000; i++) {
122 <            assertTrue(m.put(new CI(i), true) == null);
121 >        for (int i = 0; i < size; i++) {
122 >            assertNull(m.put(new CI(i), true));
123          }
124 <        for (int i = 0; i < 1000; i++) {
124 >        for (int i = 0; i < size; i++) {
125              assertTrue(m.containsKey(new CI(i)));
126              assertTrue(m.containsKey(new DI(i)));
127          }
# Line 100 | Line 132 | public class ConcurrentHashMapTest exten
132       * on Comparable can be inserted and found.
133       */
134      public void testGenericComparable() {
135 +        int size = 120;         // makes measured test run time -> 60ms
136          ConcurrentHashMap<Object, Boolean> m =
137              new ConcurrentHashMap<Object, Boolean>();
138 <        for (int i = 0; i < 1000; i++) {
138 >        for (int i = 0; i < size; i++) {
139              BI bi = new BI(i);
140              BS bs = new BS(String.valueOf(i));
141              LexicographicList<BI> bis = new LexicographicList<BI>(bi);
142              LexicographicList<BS> bss = new LexicographicList<BS>(bs);
143 <            assertTrue(m.putIfAbsent(bis, true) == null);
143 >            assertNull(m.putIfAbsent(bis, true));
144              assertTrue(m.containsKey(bis));
145              if (m.putIfAbsent(bss, true) == null)
146                  assertTrue(m.containsKey(bss));
147              assertTrue(m.containsKey(bis));
148          }
149 <        for (int i = 0; i < 1000; i++) {
150 <            assertTrue(m.containsKey(new ArrayList(Collections.singleton(new BI(i)))));
149 >        for (int i = 0; i < size; i++) {
150 >            assertTrue(m.containsKey(Collections.singletonList(new BI(i))));
151          }
152      }
153  
# Line 124 | Line 157 | public class ConcurrentHashMapTest exten
157       * inserted and found.
158       */
159      public void testGenericComparable2() {
160 +        int size = 500;         // makes measured test run time -> 60ms
161          ConcurrentHashMap<Object, Boolean> m =
162              new ConcurrentHashMap<Object, Boolean>();
163 <        for (int i = 0; i < 1000; i++) {
164 <            m.put(new ArrayList(Collections.singleton(new BI(i))), true);
163 >        for (int i = 0; i < size; i++) {
164 >            m.put(Collections.singletonList(new BI(i)), true);
165          }
166  
167 <        for (int i = 0; i < 1000; i++) {
167 >        for (int i = 0; i < size; i++) {
168              LexicographicList<BI> bis = new LexicographicList<BI>(new BI(i));
169              assertTrue(m.containsKey(bis));
170          }
171      }
172  
173      /**
174 +     * Mixtures of instances of comparable and non-comparable classes
175 +     * can be inserted and found.
176 +     */
177 +    public void testMixedComparable() {
178 +        int size = 1200;        // makes measured test run time -> 35ms
179 +        ConcurrentHashMap<Object, Object> map =
180 +            new ConcurrentHashMap<Object, Object>();
181 +        Random rng = new Random();
182 +        for (int i = 0; i < size; i++) {
183 +            Object x;
184 +            switch (rng.nextInt(4)) {
185 +            case 0:
186 +                x = new Object();
187 +                break;
188 +            case 1:
189 +                x = new CollidingObject(Integer.toString(i));
190 +                break;
191 +            default:
192 +                x = new ComparableCollidingObject(Integer.toString(i));
193 +            }
194 +            assertNull(map.put(x, x));
195 +        }
196 +        int count = 0;
197 +        for (Object k : map.keySet()) {
198 +            assertEquals(map.get(k), k);
199 +            ++count;
200 +        }
201 +        assertEquals(count, size);
202 +        assertEquals(map.size(), size);
203 +        for (Object k : map.keySet()) {
204 +            assertEquals(map.put(k, k), k);
205 +        }
206 +    }
207 +
208 +    /**
209       * clear removes all pairs
210       */
211      public void testClear() {
# Line 159 | Line 228 | public class ConcurrentHashMapTest exten
228      }
229  
230      /**
231 +     * hashCode() equals sum of each key.hashCode ^ value.hashCode
232 +     */
233 +    public void testHashCode() {
234 +        ConcurrentHashMap<Integer,String> map = map5();
235 +        int sum = 0;
236 +        for (Map.Entry<Integer,String> e : map.entrySet())
237 +            sum += e.getKey().hashCode() ^ e.getValue().hashCode();
238 +        assertEquals(sum, map.hashCode());
239 +    }
240 +
241 +    /**
242       * contains returns true for contained value
243       */
244      public void testContains() {
# Line 209 | Line 289 | public class ConcurrentHashMapTest exten
289          assertEquals("A", (String)map.get(one));
290          ConcurrentHashMap empty = new ConcurrentHashMap();
291          assertNull(map.get("anything"));
292 +        assertNull(empty.get("anything"));
293      }
294  
295      /**
# Line 250 | Line 331 | public class ConcurrentHashMapTest exten
331      }
332  
333      /**
334 +     * Test keySet().removeAll on empty map
335 +     */
336 +    public void testKeySet_empty_removeAll() {
337 +        ConcurrentHashMap<Integer, String> map = new ConcurrentHashMap<>();
338 +        Set<Integer> set = map.keySet();
339 +        set.removeAll(Collections.emptyList());
340 +        assertTrue(map.isEmpty());
341 +        assertTrue(set.isEmpty());
342 +        // following is test for JDK-8163353
343 +        set.removeAll(Collections.emptySet());
344 +        assertTrue(map.isEmpty());
345 +        assertTrue(set.isEmpty());
346 +    }
347 +
348 +    /**
349       * keySet.toArray returns contains all keys
350       */
351      public void testKeySetToArray() {
# Line 442 | Line 538 | public class ConcurrentHashMapTest exten
538      // Exception tests
539  
540      /**
541 <     * Cannot create with negative capacity
541 >     * Cannot create with only negative capacity
542       */
543      public void testConstructor1() {
544          try {
545 <            new ConcurrentHashMap(-1,0,1);
545 >            new ConcurrentHashMap(-1);
546              shouldThrow();
547          } catch (IllegalArgumentException success) {}
548      }
549  
550      /**
551 <     * Cannot create with negative concurrency level
551 >     * Constructor (initialCapacity, loadFactor) throws
552 >     * IllegalArgumentException if either argument is negative
553       */
554      public void testConstructor2() {
555          try {
556 <            new ConcurrentHashMap(1,0,-1);
556 >            new ConcurrentHashMap(-1, .75f);
557 >            shouldThrow();
558 >        } catch (IllegalArgumentException success) {}
559 >
560 >        try {
561 >            new ConcurrentHashMap(16, -1);
562              shouldThrow();
563          } catch (IllegalArgumentException success) {}
564      }
565  
566      /**
567 <     * Cannot create with only negative capacity
567 >     * Constructor (initialCapacity, loadFactor, concurrencyLevel)
568 >     * throws IllegalArgumentException if any argument is negative
569       */
570      public void testConstructor3() {
571          try {
572 <            new ConcurrentHashMap(-1);
572 >            new ConcurrentHashMap(-1, .75f, 1);
573 >            shouldThrow();
574 >        } catch (IllegalArgumentException success) {}
575 >
576 >        try {
577 >            new ConcurrentHashMap(16, -1, 1);
578 >            shouldThrow();
579 >        } catch (IllegalArgumentException success) {}
580 >
581 >        try {
582 >            new ConcurrentHashMap(16, .75f, -1);
583              shouldThrow();
584          } catch (IllegalArgumentException success) {}
585      }
586  
587      /**
588 +     * ConcurrentHashMap(map) throws NullPointerException if the given
589 +     * map is null
590 +     */
591 +    public void testConstructor4() {
592 +        try {
593 +            new ConcurrentHashMap(null);
594 +            shouldThrow();
595 +        } catch (NullPointerException success) {}
596 +    }
597 +
598 +    /**
599 +     * ConcurrentHashMap(map) creates a new map with the same mappings
600 +     * as the given map
601 +     */
602 +    public void testConstructor5() {
603 +        ConcurrentHashMap map1 = map5();
604 +        ConcurrentHashMap map2 = new ConcurrentHashMap(map5());
605 +        assertTrue(map2.equals(map1));
606 +        map2.put(one, "F");
607 +        assertFalse(map2.equals(map1));
608 +    }
609 +
610 +    /**
611       * get(null) throws NPE
612       */
613      public void testGet_NullPointerException() {
614 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
615          try {
479 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
616              c.get(null);
617              shouldThrow();
618          } catch (NullPointerException success) {}
# Line 486 | Line 622 | public class ConcurrentHashMapTest exten
622       * containsKey(null) throws NPE
623       */
624      public void testContainsKey_NullPointerException() {
625 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
626          try {
490 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
627              c.containsKey(null);
628              shouldThrow();
629          } catch (NullPointerException success) {}
# Line 497 | Line 633 | public class ConcurrentHashMapTest exten
633       * containsValue(null) throws NPE
634       */
635      public void testContainsValue_NullPointerException() {
636 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
637          try {
501 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
638              c.containsValue(null);
639              shouldThrow();
640          } catch (NullPointerException success) {}
# Line 508 | Line 644 | public class ConcurrentHashMapTest exten
644       * contains(null) throws NPE
645       */
646      public void testContains_NullPointerException() {
647 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
648          try {
512 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
649              c.contains(null);
650              shouldThrow();
651          } catch (NullPointerException success) {}
# Line 519 | Line 655 | public class ConcurrentHashMapTest exten
655       * put(null,x) throws NPE
656       */
657      public void testPut1_NullPointerException() {
658 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
659          try {
523 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
660              c.put(null, "whatever");
661              shouldThrow();
662          } catch (NullPointerException success) {}
# Line 530 | Line 666 | public class ConcurrentHashMapTest exten
666       * put(x, null) throws NPE
667       */
668      public void testPut2_NullPointerException() {
669 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
670          try {
534 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
671              c.put("whatever", null);
672              shouldThrow();
673          } catch (NullPointerException success) {}
# Line 541 | Line 677 | public class ConcurrentHashMapTest exten
677       * putIfAbsent(null, x) throws NPE
678       */
679      public void testPutIfAbsent1_NullPointerException() {
680 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
681          try {
545 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
682              c.putIfAbsent(null, "whatever");
683              shouldThrow();
684          } catch (NullPointerException success) {}
# Line 552 | Line 688 | public class ConcurrentHashMapTest exten
688       * replace(null, x) throws NPE
689       */
690      public void testReplace_NullPointerException() {
691 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
692          try {
556 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
693              c.replace(null, "whatever");
694              shouldThrow();
695          } catch (NullPointerException success) {}
# Line 563 | Line 699 | public class ConcurrentHashMapTest exten
699       * replace(null, x, y) throws NPE
700       */
701      public void testReplaceValue_NullPointerException() {
702 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
703          try {
567 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
704              c.replace(null, one, "whatever");
705              shouldThrow();
706          } catch (NullPointerException success) {}
# Line 574 | Line 710 | public class ConcurrentHashMapTest exten
710       * putIfAbsent(x, null) throws NPE
711       */
712      public void testPutIfAbsent2_NullPointerException() {
713 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
714          try {
578 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
715              c.putIfAbsent("whatever", null);
716              shouldThrow();
717          } catch (NullPointerException success) {}
# Line 585 | Line 721 | public class ConcurrentHashMapTest exten
721       * replace(x, null) throws NPE
722       */
723      public void testReplace2_NullPointerException() {
724 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
725          try {
589 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
726              c.replace("whatever", null);
727              shouldThrow();
728          } catch (NullPointerException success) {}
# Line 596 | Line 732 | public class ConcurrentHashMapTest exten
732       * replace(x, null, y) throws NPE
733       */
734      public void testReplaceValue2_NullPointerException() {
735 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
736          try {
600 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
737              c.replace("whatever", null, "A");
738              shouldThrow();
739          } catch (NullPointerException success) {}
# Line 607 | Line 743 | public class ConcurrentHashMapTest exten
743       * replace(x, y, null) throws NPE
744       */
745      public void testReplaceValue3_NullPointerException() {
746 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
747          try {
611 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
748              c.replace("whatever", one, null);
749              shouldThrow();
750          } catch (NullPointerException success) {}
# Line 618 | Line 754 | public class ConcurrentHashMapTest exten
754       * remove(null) throws NPE
755       */
756      public void testRemove1_NullPointerException() {
757 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
758 +        c.put("sadsdf", "asdads");
759          try {
622 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
623 –            c.put("sadsdf", "asdads");
760              c.remove(null);
761              shouldThrow();
762          } catch (NullPointerException success) {}
# Line 630 | Line 766 | public class ConcurrentHashMapTest exten
766       * remove(null, x) throws NPE
767       */
768      public void testRemove2_NullPointerException() {
769 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
770 +        c.put("sadsdf", "asdads");
771          try {
634 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
635 –            c.put("sadsdf", "asdads");
772              c.remove(null, "whatever");
773              shouldThrow();
774          } catch (NullPointerException success) {}
# Line 648 | Line 784 | public class ConcurrentHashMapTest exten
784      }
785  
786      /**
787 <     * A deserialized map equals original
787 >     * A deserialized/reserialized map equals original
788       */
789      public void testSerialization() throws Exception {
790          Map x = map5();
# Line 682 | Line 818 | public class ConcurrentHashMapTest exten
818          }
819      }
820  
821 +    /**
822 +     * Tests performance of removeAll when the other collection is much smaller.
823 +     * ant -Djsr166.tckTestClass=ConcurrentHashMapTest -Djsr166.methodFilter=testRemoveAll_performance -Djsr166.expensiveTests=true tck
824 +     */
825 +    public void testRemoveAll_performance() {
826 +        final int mapSize = expensiveTests ? 1_000_000 : 100;
827 +        final int iterations = expensiveTests ? 500 : 2;
828 +        final ConcurrentHashMap<Integer, Integer> map = new ConcurrentHashMap<>();
829 +        for (int i = 0; i < mapSize; i++)
830 +            map.put(i, i);
831 +        Set<Integer> keySet = map.keySet();
832 +        Collection<Integer> removeMe = Arrays.asList(new Integer[] { -99, -86 });
833 +        for (int i = 0; i < iterations; i++)
834 +            assertFalse(keySet.removeAll(removeMe));
835 +        assertEquals(mapSize, map.size());
836 +    }
837 +
838   }

Diff Legend

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