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.20 by jsr166, Tue Dec 1 09:48:13 2009 UTC vs.
Revision 1.62 by jsr166, Sun Sep 29 20:40:48 2019 UTC

# Line 1 | Line 1
1   /*
2 < * Written by Doug Lea with assistance from members of JCP JSR-166
3 < * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
2 > * Written by Doug Lea and Martin Buchholz with assistance from
3 > * members of JCP JSR-166 Expert Group and released to the public
4 > * domain, as explained at
5 > * http://creativecommons.org/publicdomain/zero/1.0/
6   * Other contributors include Andrew Wright, Jeffrey Hayes,
7   * Pat Fisher, Mike Judd.
8   */
9  
10 < import junit.framework.*;
11 < import java.util.*;
12 < import java.util.concurrent.*;
10 > import java.util.ArrayList;
11 > import java.util.Arrays;
12 > import java.util.Collection;
13 > import java.util.Collections;
14   import java.util.Enumeration;
15 < import java.io.*;
15 > import java.util.Iterator;
16 > import java.util.Map;
17 > import java.util.Random;
18 > import java.util.Set;
19 > import java.util.concurrent.ConcurrentHashMap;
20 >
21 > import junit.framework.Test;
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);
28 >        class Implementation implements MapImplementation {
29 >            public Class<?> klazz() { return ConcurrentHashMap.class; }
30 >            public Map emptyMap() { return new ConcurrentHashMap(); }
31 >            public boolean isConcurrent() { return true; }
32 >            public boolean permitsNullKeys() { return false; }
33 >            public boolean permitsNullValues() { return false; }
34 >            public boolean supportsSetValue() { return true; }
35 >        }
36 >        return newTestSuite(
37 >            ConcurrentHashMapTest.class,
38 >            MapTest.testSuite(new Implementation()));
39      }
40  
41      /**
42 <     * Create a map from Integers 1-5 to Strings "A"-"E".
42 >     * Returns a new map from Integers 1-5 to Strings "A"-"E".
43       */
44 <    private static ConcurrentHashMap map5() {
45 <        ConcurrentHashMap map = new ConcurrentHashMap(5);
44 >    private static ConcurrentHashMap<Integer, String> map5() {
45 >        ConcurrentHashMap<Integer, String> map = new ConcurrentHashMap<>(5);
46          assertTrue(map.isEmpty());
47          map.put(one, "A");
48          map.put(two, "B");
# Line 36 | Line 54 | public class ConcurrentHashMapTest exten
54          return map;
55      }
56  
57 +    // classes for testing Comparable fallbacks
58 +    static class BI implements Comparable<BI> {
59 +        private final int value;
60 +        BI(int value) { this.value = value; }
61 +        public int compareTo(BI other) {
62 +            return Integer.compare(value, other.value);
63 +        }
64 +        public boolean equals(Object x) {
65 +            return (x instanceof BI) && ((BI)x).value == value;
66 +        }
67 +        public int hashCode() { return 42; }
68 +    }
69 +    static class CI extends BI { CI(int value) { super(value); } }
70 +    static class DI extends BI { DI(int value) { super(value); } }
71 +
72 +    static class BS implements Comparable<BS> {
73 +        private final String value;
74 +        BS(String value) { this.value = value; }
75 +        public int compareTo(BS other) {
76 +            return value.compareTo(other.value);
77 +        }
78 +        public boolean equals(Object x) {
79 +            return (x instanceof BS) && value.equals(((BS)x).value);
80 +        }
81 +        public int hashCode() { return 42; }
82 +    }
83 +
84 +    static class LexicographicList<E extends Comparable<E>> extends ArrayList<E>
85 +        implements Comparable<LexicographicList<E>> {
86 +        LexicographicList(Collection<E> c) { super(c); }
87 +        LexicographicList(E e) { super(Collections.singleton(e)); }
88 +        public int compareTo(LexicographicList<E> other) {
89 +            int common = Math.min(size(), other.size());
90 +            int r = 0;
91 +            for (int i = 0; i < common; i++) {
92 +                if ((r = get(i).compareTo(other.get(i))) != 0)
93 +                    break;
94 +            }
95 +            if (r == 0)
96 +                r = Integer.compare(size(), other.size());
97 +            return r;
98 +        }
99 +        private static final long serialVersionUID = 0;
100 +    }
101 +
102 +    static class CollidingObject {
103 +        final String value;
104 +        CollidingObject(final String value) { this.value = value; }
105 +        public int hashCode() { return this.value.hashCode() & 1; }
106 +        public boolean equals(final Object obj) {
107 +            return (obj instanceof CollidingObject) && ((CollidingObject)obj).value.equals(value);
108 +        }
109 +    }
110 +
111 +    static class ComparableCollidingObject extends CollidingObject implements Comparable<ComparableCollidingObject> {
112 +        ComparableCollidingObject(final String value) { super(value); }
113 +        public int compareTo(final ComparableCollidingObject o) {
114 +            return value.compareTo(o.value);
115 +        }
116 +    }
117 +
118 +    /**
119 +     * Inserted elements that are subclasses of the same Comparable
120 +     * class are found.
121 +     */
122 +    public void testComparableFamily() {
123 +        int size = 500;         // makes measured test run time -> 60ms
124 +        ConcurrentHashMap<BI, Boolean> m = new ConcurrentHashMap<>();
125 +        for (int i = 0; i < size; i++) {
126 +            assertNull(m.put(new CI(i), true));
127 +        }
128 +        for (int i = 0; i < size; i++) {
129 +            assertTrue(m.containsKey(new CI(i)));
130 +            assertTrue(m.containsKey(new DI(i)));
131 +        }
132 +    }
133 +
134      /**
135 <     *  clear removes all pairs
135 >     * Elements of classes with erased generic type parameters based
136 >     * on Comparable can be inserted and found.
137 >     */
138 >    public void testGenericComparable() {
139 >        int size = 120;         // makes measured test run time -> 60ms
140 >        ConcurrentHashMap<Object, Boolean> m = new ConcurrentHashMap<>();
141 >        for (int i = 0; i < size; i++) {
142 >            BI bi = new BI(i);
143 >            BS bs = new BS(String.valueOf(i));
144 >            LexicographicList<BI> bis = new LexicographicList<>(bi);
145 >            LexicographicList<BS> bss = new LexicographicList<>(bs);
146 >            assertNull(m.putIfAbsent(bis, true));
147 >            assertTrue(m.containsKey(bis));
148 >            if (m.putIfAbsent(bss, true) == null)
149 >                assertTrue(m.containsKey(bss));
150 >            assertTrue(m.containsKey(bis));
151 >        }
152 >        for (int i = 0; i < size; i++) {
153 >            assertTrue(m.containsKey(Collections.singletonList(new BI(i))));
154 >        }
155 >    }
156 >
157 >    /**
158 >     * Elements of non-comparable classes equal to those of classes
159 >     * with erased generic type parameters based on Comparable can be
160 >     * inserted and found.
161 >     */
162 >    public void testGenericComparable2() {
163 >        int size = 500;         // makes measured test run time -> 60ms
164 >        ConcurrentHashMap<Object, Boolean> m = new ConcurrentHashMap<>();
165 >        for (int i = 0; i < size; i++) {
166 >            m.put(Collections.singletonList(new BI(i)), true);
167 >        }
168 >
169 >        for (int i = 0; i < size; i++) {
170 >            LexicographicList<BI> bis = new LexicographicList<>(new BI(i));
171 >            assertTrue(m.containsKey(bis));
172 >        }
173 >    }
174 >
175 >    /**
176 >     * Mixtures of instances of comparable and non-comparable classes
177 >     * can be inserted and found.
178 >     */
179 >    public void testMixedComparable() {
180 >        int size = 1200;        // makes measured test run time -> 35ms
181 >        ConcurrentHashMap<Object, Object> map = new ConcurrentHashMap<>();
182 >        Random rng = new Random();
183 >        for (int i = 0; i < size; i++) {
184 >            Object x;
185 >            switch (rng.nextInt(4)) {
186 >            case 0:
187 >                x = new Object();
188 >                break;
189 >            case 1:
190 >                x = new CollidingObject(Integer.toString(i));
191 >                break;
192 >            default:
193 >                x = new ComparableCollidingObject(Integer.toString(i));
194 >            }
195 >            assertNull(map.put(x, x));
196 >        }
197 >        int count = 0;
198 >        for (Object k : map.keySet()) {
199 >            assertEquals(map.get(k), k);
200 >            ++count;
201 >        }
202 >        assertEquals(count, size);
203 >        assertEquals(map.size(), size);
204 >        for (Object k : map.keySet()) {
205 >            assertEquals(map.put(k, k), k);
206 >        }
207 >    }
208 >
209 >    /**
210 >     * clear removes all pairs
211       */
212      public void testClear() {
213          ConcurrentHashMap map = map5();
214          map.clear();
215 <        assertEquals(map.size(), 0);
215 >        assertEquals(0, map.size());
216      }
217  
218      /**
219 <     *  Maps with same contents are equal
219 >     * Maps with same contents are equal
220       */
221      public void testEquals() {
222          ConcurrentHashMap map1 = map5();
# Line 59 | Line 229 | public class ConcurrentHashMapTest exten
229      }
230  
231      /**
232 <     *  contains returns true for contained value
232 >     * hashCode() equals sum of each key.hashCode ^ value.hashCode
233 >     */
234 >    public void testHashCode() {
235 >        ConcurrentHashMap<Integer,String> map = map5();
236 >        int sum = 0;
237 >        for (Map.Entry<Integer,String> e : map.entrySet())
238 >            sum += e.getKey().hashCode() ^ e.getValue().hashCode();
239 >        assertEquals(sum, map.hashCode());
240 >    }
241 >
242 >    /**
243 >     * contains returns true for contained value
244       */
245      public void testContains() {
246          ConcurrentHashMap map = map5();
# Line 68 | Line 249 | public class ConcurrentHashMapTest exten
249      }
250  
251      /**
252 <     *  containsKey returns true for contained key
252 >     * containsKey returns true for contained key
253       */
254      public void testContainsKey() {
255          ConcurrentHashMap map = map5();
# Line 77 | Line 258 | public class ConcurrentHashMapTest exten
258      }
259  
260      /**
261 <     *  containsValue returns true for held values
261 >     * containsValue returns true for held values
262       */
263      public void testContainsValue() {
264          ConcurrentHashMap map = map5();
# Line 86 | Line 267 | public class ConcurrentHashMapTest exten
267      }
268  
269      /**
270 <     *   enumeration returns an enumeration containing the correct
271 <     *   elements
270 >     * enumeration returns an enumeration containing the correct
271 >     * elements
272       */
273      public void testEnumeration() {
274          ConcurrentHashMap map = map5();
# Line 101 | Line 282 | public class ConcurrentHashMapTest exten
282      }
283  
284      /**
285 <     *  get returns the correct element at the given key,
286 <     *  or null if not present
285 >     * get returns the correct element at the given key,
286 >     * or null if not present
287       */
288      public void testGet() {
289          ConcurrentHashMap map = map5();
290          assertEquals("A", (String)map.get(one));
291          ConcurrentHashMap empty = new ConcurrentHashMap();
292          assertNull(map.get("anything"));
293 +        assertNull(empty.get("anything"));
294      }
295  
296      /**
297 <     *  isEmpty is true of empty map and false for non-empty
297 >     * isEmpty is true of empty map and false for non-empty
298       */
299      public void testIsEmpty() {
300          ConcurrentHashMap empty = new ConcurrentHashMap();
# Line 122 | Line 304 | public class ConcurrentHashMapTest exten
304      }
305  
306      /**
307 <     *   keys returns an enumeration containing all the keys from the map
307 >     * keys returns an enumeration containing all the keys from the map
308       */
309      public void testKeys() {
310          ConcurrentHashMap map = map5();
# Line 136 | Line 318 | public class ConcurrentHashMapTest exten
318      }
319  
320      /**
321 <     *   keySet returns a Set containing all the keys
321 >     * keySet returns a Set containing all the keys
322       */
323      public void testKeySet() {
324          ConcurrentHashMap map = map5();
# Line 150 | Line 332 | public class ConcurrentHashMapTest exten
332      }
333  
334      /**
335 <     *  keySet.toArray returns contains all keys
335 >     * Test keySet().removeAll on empty map
336 >     */
337 >    public void testKeySet_empty_removeAll() {
338 >        ConcurrentHashMap<Integer, String> map = new ConcurrentHashMap<>();
339 >        Set<Integer> set = map.keySet();
340 >        set.removeAll(Collections.emptyList());
341 >        assertTrue(map.isEmpty());
342 >        assertTrue(set.isEmpty());
343 >        // following is test for JDK-8163353
344 >        set.removeAll(Collections.emptySet());
345 >        assertTrue(map.isEmpty());
346 >        assertTrue(set.isEmpty());
347 >    }
348 >
349 >    /**
350 >     * keySet.toArray returns contains all keys
351       */
352      public void testKeySetToArray() {
353          ConcurrentHashMap map = map5();
# Line 163 | Line 360 | public class ConcurrentHashMapTest exten
360      }
361  
362      /**
363 <     *  Values.toArray contains all values
363 >     * Values.toArray contains all values
364       */
365      public void testValuesToArray() {
366          ConcurrentHashMap map = map5();
# Line 179 | Line 376 | public class ConcurrentHashMapTest exten
376      }
377  
378      /**
379 <     *  entrySet.toArray contains all entries
379 >     * entrySet.toArray contains all entries
380       */
381      public void testEntrySetToArray() {
382          ConcurrentHashMap map = map5();
# Line 226 | Line 423 | public class ConcurrentHashMapTest exten
423      }
424  
425      /**
426 <     *   putAll  adds all key-value pairs from the given map
426 >     * putAll adds all key-value pairs from the given map
427       */
428      public void testPutAll() {
429          ConcurrentHashMap empty = new ConcurrentHashMap();
# Line 241 | Line 438 | public class ConcurrentHashMapTest exten
438      }
439  
440      /**
441 <     *   putIfAbsent works when the given key is not present
441 >     * putIfAbsent works when the given key is not present
442       */
443      public void testPutIfAbsent() {
444          ConcurrentHashMap map = map5();
# Line 250 | Line 447 | public class ConcurrentHashMapTest exten
447      }
448  
449      /**
450 <     *   putIfAbsent does not add the pair if the key is already present
450 >     * putIfAbsent does not add the pair if the key is already present
451       */
452      public void testPutIfAbsent2() {
453          ConcurrentHashMap map = map5();
# Line 258 | Line 455 | public class ConcurrentHashMapTest exten
455      }
456  
457      /**
458 <     *   replace fails when the given key is not present
458 >     * replace fails when the given key is not present
459       */
460      public void testReplace() {
461          ConcurrentHashMap map = map5();
# Line 267 | Line 464 | public class ConcurrentHashMapTest exten
464      }
465  
466      /**
467 <     *   replace succeeds if the key is already present
467 >     * replace succeeds if the key is already present
468       */
469      public void testReplace2() {
470          ConcurrentHashMap map = map5();
# Line 275 | Line 472 | public class ConcurrentHashMapTest exten
472          assertEquals("Z", map.get(one));
473      }
474  
278
475      /**
476       * replace value fails when the given key not mapped to expected value
477       */
# Line 296 | Line 492 | public class ConcurrentHashMapTest exten
492          assertEquals("Z", map.get(one));
493      }
494  
299
495      /**
496 <     *   remove removes the correct key-value pair from the map
496 >     * remove removes the correct key-value pair from the map
497       */
498      public void testRemove() {
499          ConcurrentHashMap map = map5();
# Line 321 | Line 516 | public class ConcurrentHashMapTest exten
516      }
517  
518      /**
519 <     *   size returns the correct values
519 >     * size returns the correct values
520       */
521      public void testSize() {
522          ConcurrentHashMap map = map5();
# Line 337 | Line 532 | public class ConcurrentHashMapTest exten
532          ConcurrentHashMap map = map5();
533          String s = map.toString();
534          for (int i = 1; i <= 5; ++i) {
535 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
535 >            assertTrue(s.contains(String.valueOf(i)));
536          }
537      }
538  
539      // Exception tests
540  
541      /**
542 <     * Cannot create with negative capacity
542 >     * Cannot create with only negative capacity
543       */
544      public void testConstructor1() {
545          try {
546 <            new ConcurrentHashMap(-1,0,1);
546 >            new ConcurrentHashMap(-1);
547              shouldThrow();
548          } catch (IllegalArgumentException success) {}
549      }
550  
551      /**
552 <     * Cannot create with negative concurrency level
552 >     * Constructor (initialCapacity, loadFactor) throws
553 >     * IllegalArgumentException if either argument is negative
554       */
555      public void testConstructor2() {
556          try {
557 <            new ConcurrentHashMap(1,0,-1);
557 >            new ConcurrentHashMap(-1, .75f);
558 >            shouldThrow();
559 >        } catch (IllegalArgumentException success) {}
560 >
561 >        try {
562 >            new ConcurrentHashMap(16, -1);
563              shouldThrow();
564          } catch (IllegalArgumentException success) {}
565      }
566  
567      /**
568 <     * Cannot create with only negative capacity
568 >     * Constructor (initialCapacity, loadFactor, concurrencyLevel)
569 >     * throws IllegalArgumentException if any argument is negative
570       */
571      public void testConstructor3() {
572          try {
573 <            new ConcurrentHashMap(-1);
573 >            new ConcurrentHashMap(-1, .75f, 1);
574 >            shouldThrow();
575 >        } catch (IllegalArgumentException success) {}
576 >
577 >        try {
578 >            new ConcurrentHashMap(16, -1, 1);
579              shouldThrow();
580          } catch (IllegalArgumentException success) {}
581 +
582 +        try {
583 +            new ConcurrentHashMap(16, .75f, -1);
584 +            shouldThrow();
585 +        } catch (IllegalArgumentException success) {}
586 +    }
587 +
588 +    /**
589 +     * ConcurrentHashMap(map) throws NullPointerException if the given
590 +     * map is null
591 +     */
592 +    public void testConstructor4() {
593 +        try {
594 +            new ConcurrentHashMap(null);
595 +            shouldThrow();
596 +        } catch (NullPointerException success) {}
597 +    }
598 +
599 +    /**
600 +     * ConcurrentHashMap(map) creates a new map with the same mappings
601 +     * as the given map
602 +     */
603 +    public void testConstructor5() {
604 +        ConcurrentHashMap map1 = map5();
605 +        ConcurrentHashMap map2 = new ConcurrentHashMap(map5());
606 +        assertTrue(map2.equals(map1));
607 +        map2.put(one, "F");
608 +        assertFalse(map2.equals(map1));
609      }
610  
611      /**
612       * get(null) throws NPE
613       */
614      public void testGet_NullPointerException() {
615 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
616          try {
381            ConcurrentHashMap c = new ConcurrentHashMap(5);
617              c.get(null);
618              shouldThrow();
619          } catch (NullPointerException success) {}
# Line 388 | Line 623 | public class ConcurrentHashMapTest exten
623       * containsKey(null) throws NPE
624       */
625      public void testContainsKey_NullPointerException() {
626 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
627          try {
392            ConcurrentHashMap c = new ConcurrentHashMap(5);
628              c.containsKey(null);
629              shouldThrow();
630          } catch (NullPointerException success) {}
# Line 399 | Line 634 | public class ConcurrentHashMapTest exten
634       * containsValue(null) throws NPE
635       */
636      public void testContainsValue_NullPointerException() {
637 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
638          try {
403            ConcurrentHashMap c = new ConcurrentHashMap(5);
639              c.containsValue(null);
640              shouldThrow();
641          } catch (NullPointerException success) {}
# Line 410 | Line 645 | public class ConcurrentHashMapTest exten
645       * contains(null) throws NPE
646       */
647      public void testContains_NullPointerException() {
648 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
649          try {
414            ConcurrentHashMap c = new ConcurrentHashMap(5);
650              c.contains(null);
651              shouldThrow();
652          } catch (NullPointerException success) {}
# Line 421 | Line 656 | public class ConcurrentHashMapTest exten
656       * put(null,x) throws NPE
657       */
658      public void testPut1_NullPointerException() {
659 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
660          try {
425            ConcurrentHashMap c = new ConcurrentHashMap(5);
661              c.put(null, "whatever");
662              shouldThrow();
663          } catch (NullPointerException success) {}
# Line 432 | Line 667 | public class ConcurrentHashMapTest exten
667       * put(x, null) throws NPE
668       */
669      public void testPut2_NullPointerException() {
670 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
671          try {
436            ConcurrentHashMap c = new ConcurrentHashMap(5);
672              c.put("whatever", null);
673              shouldThrow();
674          } catch (NullPointerException success) {}
# Line 443 | Line 678 | public class ConcurrentHashMapTest exten
678       * putIfAbsent(null, x) throws NPE
679       */
680      public void testPutIfAbsent1_NullPointerException() {
681 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
682          try {
447            ConcurrentHashMap c = new ConcurrentHashMap(5);
683              c.putIfAbsent(null, "whatever");
684              shouldThrow();
685          } catch (NullPointerException success) {}
# Line 454 | Line 689 | public class ConcurrentHashMapTest exten
689       * replace(null, x) throws NPE
690       */
691      public void testReplace_NullPointerException() {
692 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
693          try {
458            ConcurrentHashMap c = new ConcurrentHashMap(5);
694              c.replace(null, "whatever");
695              shouldThrow();
696          } catch (NullPointerException success) {}
# Line 465 | Line 700 | public class ConcurrentHashMapTest exten
700       * replace(null, x, y) throws NPE
701       */
702      public void testReplaceValue_NullPointerException() {
703 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
704          try {
469            ConcurrentHashMap c = new ConcurrentHashMap(5);
705              c.replace(null, one, "whatever");
706              shouldThrow();
707          } catch (NullPointerException success) {}
# Line 476 | Line 711 | public class ConcurrentHashMapTest exten
711       * putIfAbsent(x, null) throws NPE
712       */
713      public void testPutIfAbsent2_NullPointerException() {
714 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
715          try {
480            ConcurrentHashMap c = new ConcurrentHashMap(5);
716              c.putIfAbsent("whatever", null);
717              shouldThrow();
718          } catch (NullPointerException success) {}
719      }
720  
486
721      /**
722       * replace(x, null) throws NPE
723       */
724      public void testReplace2_NullPointerException() {
725 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
726          try {
492            ConcurrentHashMap c = new ConcurrentHashMap(5);
727              c.replace("whatever", null);
728              shouldThrow();
729          } catch (NullPointerException success) {}
# Line 499 | Line 733 | public class ConcurrentHashMapTest exten
733       * replace(x, null, y) throws NPE
734       */
735      public void testReplaceValue2_NullPointerException() {
736 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
737          try {
503            ConcurrentHashMap c = new ConcurrentHashMap(5);
738              c.replace("whatever", null, "A");
739              shouldThrow();
740          } catch (NullPointerException success) {}
# Line 510 | Line 744 | public class ConcurrentHashMapTest exten
744       * replace(x, y, null) throws NPE
745       */
746      public void testReplaceValue3_NullPointerException() {
747 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
748          try {
514            ConcurrentHashMap c = new ConcurrentHashMap(5);
749              c.replace("whatever", one, null);
750              shouldThrow();
751          } catch (NullPointerException success) {}
752      }
753  
520
754      /**
755       * remove(null) throws NPE
756       */
757      public void testRemove1_NullPointerException() {
758 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
759 +        c.put("sadsdf", "asdads");
760          try {
526            ConcurrentHashMap c = new ConcurrentHashMap(5);
527            c.put("sadsdf", "asdads");
761              c.remove(null);
762              shouldThrow();
763          } catch (NullPointerException success) {}
# Line 534 | Line 767 | public class ConcurrentHashMapTest exten
767       * remove(null, x) throws NPE
768       */
769      public void testRemove2_NullPointerException() {
770 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
771 +        c.put("sadsdf", "asdads");
772          try {
538            ConcurrentHashMap c = new ConcurrentHashMap(5);
539            c.put("sadsdf", "asdads");
773              c.remove(null, "whatever");
774              shouldThrow();
775          } catch (NullPointerException success) {}
# Line 552 | Line 785 | public class ConcurrentHashMapTest exten
785      }
786  
787      /**
788 <     * A deserialized map equals original
788 >     * A deserialized/reserialized map equals original
789       */
790      public void testSerialization() throws Exception {
791 <        ConcurrentHashMap q = map5();
791 >        Map x = map5();
792 >        Map y = serialClone(x);
793  
794 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
795 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
796 <        out.writeObject(q);
797 <        out.close();
564 <
565 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
566 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
567 <        ConcurrentHashMap r = (ConcurrentHashMap)in.readObject();
568 <        assertEquals(q.size(), r.size());
569 <        assertTrue(q.equals(r));
570 <        assertTrue(r.equals(q));
794 >        assertNotSame(x, y);
795 >        assertEquals(x.size(), y.size());
796 >        assertEquals(x, y);
797 >        assertEquals(y, x);
798      }
799  
573
800      /**
801       * SetValue of an EntrySet entry sets value in the map.
802       */
# Line 582 | Line 808 | public class ConcurrentHashMapTest exten
808              map.put(new Integer(i), new Integer(i));
809          assertFalse(map.isEmpty());
810          Map.Entry entry1 = (Map.Entry)map.entrySet().iterator().next();
811 +        // Unless it happens to be first (in which case remainder of
812 +        // test is skipped), remove a possibly-colliding key from map
813 +        // which, under some implementations, may cause entry1 to be
814 +        // cloned in map
815 +        if (!entry1.getKey().equals(new Integer(16))) {
816 +            map.remove(new Integer(16));
817 +            entry1.setValue("XYZ");
818 +            assertTrue(map.containsValue("XYZ")); // fails if write-through broken
819 +        }
820 +    }
821  
822 <        // assert that entry1 is not 16
823 <        assertTrue("entry is 16, test not valid",
824 <                   !entry1.getKey().equals(new Integer(16)));
825 <
826 <        // remove 16 (a different key) from map
827 <        // which just happens to cause entry1 to be cloned in map
828 <        map.remove(new Integer(16));
829 <        entry1.setValue("XYZ");
830 <        assertTrue(map.containsValue("XYZ")); // fails
822 >    /**
823 >     * Tests performance of removeAll when the other collection is much smaller.
824 >     * ant -Djsr166.tckTestClass=ConcurrentHashMapTest -Djsr166.methodFilter=testRemoveAll_performance -Djsr166.expensiveTests=true tck
825 >     */
826 >    public void testRemoveAll_performance() {
827 >        final int mapSize = expensiveTests ? 1_000_000 : 100;
828 >        final int iterations = expensiveTests ? 500 : 2;
829 >        final ConcurrentHashMap<Integer, Integer> map = new ConcurrentHashMap<>();
830 >        for (int i = 0; i < mapSize; i++)
831 >            map.put(i, i);
832 >        Set<Integer> keySet = map.keySet();
833 >        Collection<Integer> removeMe = Arrays.asList(new Integer[] { -99, -86 });
834 >        for (int i = 0; i < iterations; i++)
835 >            assertFalse(keySet.removeAll(removeMe));
836 >        assertEquals(mapSize, map.size());
837 >    }
838 >
839 >    public void testReentrantComputeIfAbsent() {
840 >        ConcurrentHashMap<Integer, Integer> map = new ConcurrentHashMap<>(16);
841 >        try {
842 >            for (int i = 0; i < 100; i++) { // force a resize
843 >                map.computeIfAbsent(i, key -> findValue(map, key));
844 >            }
845 >            fail("recursive computeIfAbsent should throw IllegalStateException");
846 >        } catch (IllegalStateException success) {}
847 >    }
848 >
849 >    private Integer findValue(ConcurrentHashMap<Integer, Integer> map,
850 >                              Integer key) {
851 >        return (key % 5 == 0) ?  key :
852 >            map.computeIfAbsent(key + 1, k -> findValue(map, k));
853      }
854  
855   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines