jdk/test/java/util/Map/Defaults.java
author bpb
Fri, 20 Sep 2013 15:12:05 -0700
changeset 20189 1e618f2a82d9
parent 19855 bfe130545fe0
child 21352 0372edc9a995
permissions -rw-r--r--
8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent Summary: Explicitly check for null remappingFunction parameter. Reviewed-by: mduigou, forax, psandoz Contributed-by: Brian Burkhalter <brian.burkhalter@oracle.com>
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
     1
/*
16042
0bf6469a1cfb 8008785: IdentityHashMap.values().toArray(V[]) broken by JDK-8008167
mduigou
parents: 13817
diff changeset
     2
 * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
     4
 *
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
     7
 * published by the Free Software Foundation.
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
     8
 *
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    13
 * accompanied this code).
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    14
 *
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    18
 *
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    21
 * questions.
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    22
 */
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    23
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    24
/*
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    25
 * @test
20189
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
    26
 * @bug 8010122 8004518 8024331
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    27
 * @summary Test Map default methods
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    28
 * @author Mike Duigou
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    29
 * @run testng Defaults
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    30
 */
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    31
import java.util.AbstractMap;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    32
import java.util.AbstractSet;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    33
import java.util.ArrayList;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    34
import java.util.Arrays;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    35
import java.util.Collection;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    36
import java.util.Collections;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    37
import java.util.EnumMap;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    38
import java.util.HashMap;
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    39
import java.util.HashSet;
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    40
import java.util.Hashtable;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    41
import java.util.IdentityHashMap;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    42
import java.util.Iterator;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    43
import java.util.LinkedHashMap;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    44
import java.util.Map;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    45
import java.util.TreeMap;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    46
import java.util.Set;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    47
import java.util.WeakHashMap;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    48
import java.util.concurrent.ConcurrentMap;
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    49
import java.util.concurrent.ConcurrentHashMap;
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    50
import java.util.concurrent.ConcurrentSkipListMap;
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    51
import java.util.function.BiFunction;
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    52
import java.util.function.Supplier;
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    53
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    54
import org.testng.annotations.Test;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    55
import org.testng.annotations.DataProvider;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    56
import static org.testng.Assert.fail;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    57
import static org.testng.Assert.assertEquals;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    58
import static org.testng.Assert.assertTrue;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    59
import static org.testng.Assert.assertFalse;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    60
import static org.testng.Assert.assertNull;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    61
import static org.testng.Assert.assertSame;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    62
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    63
public class Defaults {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    64
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    65
    @Test(dataProvider = "Map<IntegerEnum,String> rw=all keys=withNull values=withNull")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    66
    public void testGetOrDefaultNulls(String description, Map<IntegerEnum, String> map) {
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    67
        assertTrue(map.containsKey(null), description + ": null key absent");
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    68
        assertNull(map.get(null), description + ": value not null");
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    69
        assertSame(map.get(null), map.getOrDefault(null, EXTRA_VALUE), description + ": values should match");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    70
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    71
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    72
    @Test(dataProvider = "Map<IntegerEnum,String> rw=all keys=all values=all")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    73
    public void testGetOrDefault(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    74
        assertTrue(map.containsKey(KEYS[1]), "expected key missing");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    75
        assertSame(map.get(KEYS[1]), map.getOrDefault(KEYS[1], EXTRA_VALUE), "values should match");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    76
        assertFalse(map.containsKey(EXTRA_KEY), "expected absent key");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    77
        assertSame(map.getOrDefault(EXTRA_KEY, EXTRA_VALUE), EXTRA_VALUE, "value not returned as default");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    78
        assertNull(map.getOrDefault(EXTRA_KEY, null), "null not returned as default");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    79
    }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    80
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    81
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=withNull values=withNull")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    82
    public void testPutIfAbsentNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    83
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    84
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    85
        assertNull(map.putIfAbsent(null, EXTRA_VALUE), "previous not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    86
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    87
        assertSame(map.get(null), EXTRA_VALUE, "unexpected value");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    88
        assertSame(map.putIfAbsent(null, null), EXTRA_VALUE, "previous not expected value");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    89
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    90
        assertSame(map.get(null), EXTRA_VALUE, "unexpected value");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    91
        assertSame(map.remove(null), EXTRA_VALUE, "removed unexpected value");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    92
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    93
        assertFalse(map.containsKey(null), description + ": key present after remove");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    94
        assertNull(map.putIfAbsent(null, null), "previous not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    95
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    96
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    97
        assertNull(map.putIfAbsent(null, EXTRA_VALUE), "previous not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    98
        assertSame(map.get(null), EXTRA_VALUE, "value not expected");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    99
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   100
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   101
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   102
    public void testPutIfAbsent(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   103
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   104
        Object expected = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   105
        assertTrue(null == expected || expected == VALUES[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   106
        assertSame(map.putIfAbsent(KEYS[1], EXTRA_VALUE), expected);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   107
        assertSame(map.get(KEYS[1]), expected);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   108
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   109
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   110
        assertSame(map.putIfAbsent(EXTRA_KEY, EXTRA_VALUE), null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   111
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   112
    }
13805
29e474ceeddc 7189926: Reduce test size for default run. Add additional run enabling alternative hashing.
mduigou
parents: 13025
diff changeset
   113
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   114
    @Test(dataProvider = "Map<IntegerEnum,String> rw=all keys=all values=all")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   115
    public void testForEach(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   116
        IntegerEnum[] EACH_KEY = new IntegerEnum[map.size()];
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   117
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   118
        map.forEach((k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   119
            int idx = (null == k) ? 0 : k.ordinal(); // substitute for index.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   120
            assertNull(EACH_KEY[idx]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   121
            EACH_KEY[idx] = (idx == 0) ? KEYS[0] : k; // substitute for comparison.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   122
            assertSame(v, map.get(k));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   123
        });
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   124
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   125
        assertEquals(KEYS, EACH_KEY, description);
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   126
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   127
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   128
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   129
    public static void testReplaceAll(String description, Map<IntegerEnum, String> map) {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   130
        IntegerEnum[] EACH_KEY = new IntegerEnum[map.size()];
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   131
        Set<String> EACH_REPLACE = new HashSet<>(map.size());
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   132
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   133
        map.replaceAll((k,v) -> {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   134
            int idx = (null == k) ? 0 : k.ordinal(); // substitute for index.
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   135
            assertNull(EACH_KEY[idx]);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   136
            EACH_KEY[idx] = (idx == 0) ? KEYS[0] : k; // substitute for comparison.
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   137
            assertSame(v, map.get(k));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   138
            String replacement = v + " replaced";
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   139
            EACH_REPLACE.add(replacement);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   140
            return replacement;
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   141
        });
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   142
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   143
        assertEquals(KEYS, EACH_KEY, description);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   144
        assertEquals(map.values().size(), EACH_REPLACE.size(), description + EACH_REPLACE);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   145
        assertTrue(EACH_REPLACE.containsAll(map.values()), description + " : " + EACH_REPLACE + " != " + map.values());
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   146
        assertTrue(map.values().containsAll(EACH_REPLACE), description + " : " + EACH_REPLACE + " != " + map.values());
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   147
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   148
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   149
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=nonNull values=nonNull")
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   150
    public static void testReplaceAllNoNullReplacement(String description, Map<IntegerEnum, String> map) {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   151
        assertThrows(
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   152
            () -> { map.replaceAll(null); },
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   153
            NullPointerException.class,
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   154
            description);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   155
        assertThrows(
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   156
            () -> { map.replaceAll((k,v) -> null); },
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   157
            NullPointerException.class,
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   158
            description + " should not allow replacement with null value");
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   159
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   160
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   161
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=withNull values=withNull")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   162
    public static void testRemoveNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   163
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   164
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   165
        assertFalse(map.remove(null, EXTRA_VALUE), description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   166
        assertTrue(map.containsKey(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   167
        assertNull(map.get(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   168
        assertTrue(map.remove(null, null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   169
        assertFalse(map.containsKey(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   170
        assertNull(map.get(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   171
        assertFalse(map.remove(null, null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   172
    }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   173
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   174
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   175
    public static void testRemove(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   176
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   177
        Object expected = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   178
        assertTrue(null == expected || expected == VALUES[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   179
        assertFalse(map.remove(KEYS[1], EXTRA_VALUE), description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   180
        assertSame(map.get(KEYS[1]), expected);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   181
        assertTrue(map.remove(KEYS[1], expected));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   182
        assertNull(map.get(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   183
        assertFalse(map.remove(KEYS[1], expected));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   184
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   185
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   186
        assertFalse(map.remove(EXTRA_KEY, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   187
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   188
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   189
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=withNull values=withNull")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   190
    public void testReplaceKVNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   191
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   192
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   193
        assertSame(map.replace(null, EXTRA_VALUE), null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   194
        assertSame(map.get(null), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   195
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   196
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   197
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=nonNull values=nonNull")
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   198
    public void testReplaceKVNoNulls(String description, Map<IntegerEnum, String> map) {
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   199
        assertTrue(map.containsKey(FIRST_KEY), "expected key missing");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   200
        assertSame(map.get(FIRST_KEY), FIRST_VALUE, "found wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   201
        assertThrows( () -> {map.replace(FIRST_KEY, null);}, NullPointerException.class, description + ": should throw NPE");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   202
        assertSame(map.replace(FIRST_KEY, EXTRA_VALUE), FIRST_VALUE, description + ": replaced wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   203
        assertSame(map.get(FIRST_KEY), EXTRA_VALUE, "found wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   204
    }
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   205
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   206
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   207
    public void testReplaceKV(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   208
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   209
        Object expected = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   210
        assertTrue(null == expected || expected == VALUES[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   211
        assertSame(map.replace(KEYS[1], EXTRA_VALUE), expected);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   212
        assertSame(map.get(KEYS[1]), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   213
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   214
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   215
        assertNull(map.replace(EXTRA_KEY, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   216
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   217
        assertNull(map.get(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   218
        assertNull(map.put(EXTRA_KEY, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   219
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   220
        assertSame(map.replace(EXTRA_KEY, (String)expected), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   221
        assertSame(map.get(EXTRA_KEY), expected);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   222
    }
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   223
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   224
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=withNull values=withNull")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   225
    public void testReplaceKVVNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   226
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   227
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   228
        assertFalse(map.replace(null, EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   229
        assertNull(map.get(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   230
        assertTrue(map.replace(null, null, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   231
        assertSame(map.get(null), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   232
        assertTrue(map.replace(null, EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   233
        assertSame(map.get(null), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   234
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   235
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   236
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=nonNull values=nonNull")
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   237
    public void testReplaceKVVNoNulls(String description, Map<IntegerEnum, String> map) {
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   238
        assertTrue(map.containsKey(FIRST_KEY), "expected key missing");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   239
        assertSame(map.get(FIRST_KEY), FIRST_VALUE, "found wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   240
        assertThrows( () -> {map.replace(FIRST_KEY, FIRST_VALUE, null);}, NullPointerException.class, description + ": should throw NPE");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   241
        assertThrows( () -> {if (!map.replace(FIRST_KEY, null, EXTRA_VALUE)) throw new NullPointerException("default returns false rather than throwing");}, NullPointerException.class,  description + ": should throw NPE");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   242
        assertTrue(map.replace(FIRST_KEY, FIRST_VALUE, EXTRA_VALUE), description + ": replaced wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   243
        assertSame(map.get(FIRST_KEY), EXTRA_VALUE, "found wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   244
    }
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   245
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   246
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   247
    public void testReplaceKVV(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   248
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   249
        Object expected = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   250
        assertTrue(null == expected || expected == VALUES[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   251
        assertFalse(map.replace(KEYS[1], EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   252
        assertSame(map.get(KEYS[1]), expected);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   253
        assertTrue(map.replace(KEYS[1], (String)expected, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   254
        assertSame(map.get(KEYS[1]), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   255
        assertTrue(map.replace(KEYS[1], EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   256
        assertSame(map.get(KEYS[1]), EXTRA_VALUE);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   257
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   258
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   259
        assertFalse(map.replace(EXTRA_KEY, EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   260
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   261
        assertNull(map.get(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   262
        assertNull(map.put(EXTRA_KEY, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   263
        assertTrue(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   264
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   265
        assertTrue(map.replace(EXTRA_KEY, EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   266
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   267
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   268
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   269
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=withNull values=withNull")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   270
    public void testComputeIfAbsentNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   271
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   272
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   273
        assertSame(map.computeIfAbsent(null, (k) -> EXTRA_VALUE), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   274
        assertSame(map.get(null), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   275
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   276
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   277
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   278
    public void testComputeIfAbsent(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   279
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   280
        Object expected = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   281
        assertTrue(null == expected || expected == VALUES[1], description + String.valueOf(expected));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   282
        expected = (null == expected) ? EXTRA_VALUE : expected;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   283
        assertSame(map.computeIfAbsent(KEYS[1], (k) -> EXTRA_VALUE), expected, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   284
        assertSame(map.get(KEYS[1]), expected, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   285
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   286
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   287
        assertSame(map.computeIfAbsent(EXTRA_KEY, (k) -> EXTRA_VALUE), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   288
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   289
    }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   290
20189
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   291
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   292
    public void testComputeIfAbsentNPEHashMap() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   293
        Object value = new HashMap().computeIfAbsent(KEYS[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   294
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   295
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   296
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   297
    public void testComputeIfAbsentNPEHashtable() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   298
        Object value = new Hashtable().computeIfAbsent(KEYS[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   299
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   300
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   301
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   302
    public void testComputeIfAbsentNPETreeMap() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   303
        Object value = new TreeMap().computeIfAbsent(KEYS[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   304
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   305
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   306
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=withNull values=withNull")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   307
    public void testComputeIfPresentNulls(String description, Map<IntegerEnum, String> map) {
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   308
        assertTrue(map.containsKey(null), description + ": null key absent");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   309
        assertNull(map.get(null), description + ": value not null");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   310
        assertSame(map.computeIfPresent(null, (k, v) -> {
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   311
            fail(description + ": null value is not deemed present");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   312
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   313
        }), null, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   314
        assertTrue(map.containsKey(null));
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   315
        assertNull(map.get(null), description);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   316
        assertNull(map.remove(EXTRA_KEY), description + ": unexpected mapping");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   317
        assertNull(map.put(EXTRA_KEY, null), description + ": unexpected value");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   318
        assertSame(map.computeIfPresent(EXTRA_KEY, (k, v) -> {
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   319
            fail(description + ": null value is not deemed present");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   320
            return EXTRA_VALUE;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   321
        }), null, description);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   322
        assertNull(map.get(EXTRA_KEY), description + ": null mapping gone");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   323
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   324
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   325
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   326
    public void testComputeIfPresent(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   327
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   328
        Object value = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   329
        assertTrue(null == value || value == VALUES[1], description + String.valueOf(value));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   330
        Object expected = (null == value) ? null : EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   331
        assertSame(map.computeIfPresent(KEYS[1], (k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   332
            assertSame(v, value);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   333
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   334
        }), expected, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   335
        assertSame(map.get(KEYS[1]), expected, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   336
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   337
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   338
        assertSame(map.computeIfPresent(EXTRA_KEY, (k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   339
            fail();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   340
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   341
        }), null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   342
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   343
        assertSame(map.get(EXTRA_KEY), null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   344
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   345
20189
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   346
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   347
    public void testComputeIfPresentNPEHashMap() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   348
        Object value = new HashMap().computeIfPresent(KEYS[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   349
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   350
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   351
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   352
    public void testComputeIfPresentNPEHashtable() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   353
        Object value = new Hashtable().computeIfPresent(KEYS[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   354
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   355
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   356
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   357
    public void testComputeIfPresentNPETreeMap() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   358
        Object value = new TreeMap().computeIfPresent(KEYS[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   359
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   360
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   361
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=withNull values=withNull")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   362
    public void testComputeNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   363
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   364
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   365
        assertSame(map.compute(null, (k, v) -> {
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   366
            assertNull(k);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   367
            assertNull(v);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   368
            return null;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   369
        }), null, description);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   370
        assertFalse(map.containsKey(null), description + ": null key present.");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   371
        assertSame(map.compute(null, (k, v) -> {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   372
            assertSame(k, null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   373
            assertNull(v);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   374
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   375
        }), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   376
        assertTrue(map.containsKey(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   377
        assertSame(map.get(null), EXTRA_VALUE, description);
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   378
        assertSame(map.remove(null), EXTRA_VALUE, description + ": removed value not expected");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   379
        // no mapping before and after
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   380
        assertFalse(map.containsKey(null), description + ": null key present");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   381
        assertSame(map.compute(null, (k, v) -> {
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   382
            assertNull(k);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   383
            assertNull(v);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   384
            return null;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   385
        }), null, description + ": expected null result" );
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   386
        assertFalse(map.containsKey(null), description + ": null key present");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   387
        // compute with map not containing value
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   388
        assertNull(map.remove(EXTRA_KEY),  description + ": unexpected mapping");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   389
        assertFalse(map.containsKey(EXTRA_KEY),  description + ": key present");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   390
        assertSame(map.compute(EXTRA_KEY, (k, v) -> {
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   391
            assertSame(k, EXTRA_KEY);
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   392
            assertNull(v);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   393
            return null;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   394
        }), null, description);
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   395
        assertFalse(map.containsKey(EXTRA_KEY),  description + ": null key present");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   396
        // ensure removal.
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   397
        assertNull(map.put(EXTRA_KEY, EXTRA_VALUE));
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   398
        assertSame(map.compute(EXTRA_KEY, (k, v) -> {
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   399
            assertSame(k, EXTRA_KEY);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   400
            assertSame(v, EXTRA_VALUE);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   401
            return null;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   402
        }), null, description + ": null resulted expected");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   403
        assertFalse(map.containsKey(EXTRA_KEY),  description + ": null key present");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   404
       // compute with map containing null value
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   405
        assertNull(map.put(EXTRA_KEY, null),  description + ": unexpected value");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   406
        assertSame(map.compute(EXTRA_KEY, (k, v) -> {
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   407
            assertSame(k, EXTRA_KEY);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   408
            assertNull(v);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   409
            return null;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   410
        }), null, description);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   411
        assertFalse(map.containsKey(EXTRA_KEY),  description + ": null key present");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   412
        assertNull(map.put(EXTRA_KEY, null),  description + ": unexpected value");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   413
        assertSame(map.compute(EXTRA_KEY, (k, v) -> {
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   414
            assertSame(k, EXTRA_KEY);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   415
            assertNull(v);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   416
            return EXTRA_VALUE;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   417
        }), EXTRA_VALUE, description);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   418
        assertTrue(map.containsKey(EXTRA_KEY), "null key present");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   419
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   420
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   421
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   422
    public void testCompute(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   423
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   424
        Object value = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   425
        assertTrue(null == value || value == VALUES[1], description + String.valueOf(value));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   426
        assertSame(map.compute(KEYS[1], (k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   427
            assertSame(k, KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   428
            assertSame(v, value);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   429
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   430
        }), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   431
        assertSame(map.get(KEYS[1]), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   432
        assertNull(map.compute(KEYS[1], (k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   433
            assertSame(v, EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   434
            return null;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   435
        }), description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   436
        assertFalse(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   437
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   438
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   439
        assertSame(map.compute(EXTRA_KEY, (k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   440
            assertNull(v);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   441
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   442
        }), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   443
        assertTrue(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   444
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   445
    }
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   446
20189
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   447
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   448
    public void testComputeNPEHashMap() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   449
        Object value = new HashMap().compute(KEYS[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   450
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   451
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   452
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   453
    public void testComputeNPEHashtable() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   454
        Object value = new Hashtable().compute(KEYS[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   455
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   456
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   457
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   458
    public void testComputeNPETreeMap() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   459
        Object value = new TreeMap().compute(KEYS[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   460
    }
13025
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
   461
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   462
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=withNull values=withNull")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   463
    public void testMergeNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   464
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   465
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   466
        assertSame(map.merge(null, EXTRA_VALUE, (v, vv) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   467
            assertNull(v);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   468
            assertSame(vv, EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   469
            return vv;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   470
        }), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   471
        assertTrue(map.containsKey(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   472
        assertSame(map.get(null), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   473
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   474
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   475
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   476
    public void testMerge(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   477
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   478
        Object value = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   479
        assertTrue(null == value || value == VALUES[1], description + String.valueOf(value));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   480
        assertSame(map.merge(KEYS[1], EXTRA_VALUE, (v, vv) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   481
            assertSame(v, value);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   482
            assertSame(vv, EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   483
            return vv;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   484
        }), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   485
        assertSame(map.get(KEYS[1]), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   486
        assertNull(map.merge(KEYS[1], EXTRA_VALUE, (v, vv) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   487
            assertSame(v, EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   488
            assertSame(vv, EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   489
            return null;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   490
        }), description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   491
        assertFalse(map.containsKey(KEYS[1]));
13025
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
   492
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   493
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   494
        assertSame(map.merge(EXTRA_KEY, EXTRA_VALUE, (v, vv) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   495
            assertNull(v);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   496
            assertSame(vv, EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   497
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   498
        }), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   499
        assertTrue(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   500
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   501
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   502
20189
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   503
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   504
    public void testMergeNPEHashMap() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   505
        Object value = new HashMap().merge(KEYS[1], VALUES[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   506
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   507
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   508
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   509
    public void testMergeNPEHashtable() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   510
        Object value = new Hashtable().merge(KEYS[1], VALUES[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   511
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   512
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   513
    @Test(expectedExceptions = {NullPointerException.class})
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   514
    public void testMergeNPETreeMap() {
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   515
        Object value = new TreeMap().merge(KEYS[1], VALUES[1], null);
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   516
    }
1e618f2a82d9 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent
bpb
parents: 19855
diff changeset
   517
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   518
    enum IntegerEnum {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   519
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   520
        e0, e1, e2, e3, e4, e5, e6, e7, e8, e9,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   521
        e10, e11, e12, e13, e14, e15, e16, e17, e18, e19,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   522
        e20, e21, e22, e23, e24, e25, e26, e27, e28, e29,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   523
        e30, e31, e32, e33, e34, e35, e36, e37, e38, e39,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   524
        e40, e41, e42, e43, e44, e45, e46, e47, e48, e49,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   525
        e50, e51, e52, e53, e54, e55, e56, e57, e58, e59,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   526
        e60, e61, e62, e63, e64, e65, e66, e67, e68, e69,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   527
        e70, e71, e72, e73, e74, e75, e76, e77, e78, e79,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   528
        e80, e81, e82, e83, e84, e85, e86, e87, e88, e89,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   529
        e90, e91, e92, e93, e94, e95, e96, e97, e98, e99,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   530
        EXTRA_KEY;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   531
        public static final int SIZE = values().length;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   532
    };
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   533
    private static final int TEST_SIZE = IntegerEnum.SIZE - 1;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   534
    /**
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   535
     * Realized keys ensure that there is always a hard ref to all test objects.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   536
     */
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   537
    private static final IntegerEnum[] KEYS = new IntegerEnum[TEST_SIZE];
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   538
    /**
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   539
     * Realized values ensure that there is always a hard ref to all test
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   540
     * objects.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   541
     */
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   542
    private static final String[] VALUES = new String[TEST_SIZE];
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   543
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   544
    static {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   545
        IntegerEnum[] keys = IntegerEnum.values();
16042
0bf6469a1cfb 8008785: IdentityHashMap.values().toArray(V[]) broken by JDK-8008167
mduigou
parents: 13817
diff changeset
   546
        for (int each = 0; each < TEST_SIZE; each++) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   547
            KEYS[each] = keys[each];
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   548
            VALUES[each] = String.valueOf(each);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   549
        }
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   550
    }
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   551
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   552
    private static final IntegerEnum FIRST_KEY = KEYS[0];
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   553
    private static final String FIRST_VALUE = VALUES[0];
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   554
    private static final IntegerEnum EXTRA_KEY = IntegerEnum.EXTRA_KEY;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   555
    private static final String EXTRA_VALUE = String.valueOf(TEST_SIZE);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   556
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   557
    @DataProvider(name = "Map<IntegerEnum,String> rw=all keys=all values=all", parallel = true)
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   558
    public static Iterator<Object[]> allMapProvider() {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   559
        return makeAllMaps().iterator();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   560
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   561
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   562
    @DataProvider(name = "Map<IntegerEnum,String> rw=all keys=withNull values=withNull", parallel = true)
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   563
    public static Iterator<Object[]> allMapWithNullsProvider() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   564
        return makeAllMapsWithNulls().iterator();
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   565
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   566
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   567
    @DataProvider(name = "Map<IntegerEnum,String> rw=true keys=nonNull values=nonNull", parallel = true)
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   568
    public static Iterator<Object[]> rwNonNullMapProvider() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   569
        return makeRWNoNullsMaps().iterator();
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   570
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   571
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   572
    @DataProvider(name = "Map<IntegerEnum,String> rw=true keys=nonNull values=all", parallel = true)
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   573
    public static Iterator<Object[]> rwNonNullKeysMapProvider() {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   574
        return makeRWMapsNoNulls().iterator();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   575
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   576
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   577
    @DataProvider(name = "Map<IntegerEnum,String> rw=true keys=all values=all", parallel = true)
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   578
    public static Iterator<Object[]> rwMapProvider() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   579
        return makeAllRWMaps().iterator();
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   580
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   581
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   582
    @DataProvider(name = "Map<IntegerEnum,String> rw=true keys=withNull values=withNull", parallel = true)
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   583
    public static Iterator<Object[]> rwNullsMapProvider() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   584
        return makeAllRWMapsWithNulls().iterator();
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   585
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   586
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   587
    private static Collection<Object[]> makeAllRWMapsWithNulls() {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   588
        Collection<Object[]> all = new ArrayList<>();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   589
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   590
        all.addAll(makeRWMaps(true, true));
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   591
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   592
        return all;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   593
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   594
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   595
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   596
    private static Collection<Object[]> makeRWMapsNoNulls() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   597
        Collection<Object[]> all = new ArrayList<>();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   598
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   599
        all.addAll(makeRWNoNullKeysMaps(false));
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   600
        all.addAll(makeRWNoNullsMaps());
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   601
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   602
        return all;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   603
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   604
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   605
    private static Collection<Object[]> makeAllROMaps() {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   606
        Collection<Object[]> all = new ArrayList<>();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   607
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   608
        all.addAll(makeROMaps(false));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   609
        all.addAll(makeROMaps(true));
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   610
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   611
        return all;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   612
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   613
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   614
    private static Collection<Object[]> makeAllRWMaps() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   615
        Collection<Object[]> all = new ArrayList<>();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   616
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   617
        all.addAll(makeRWNoNullsMaps());
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   618
        all.addAll(makeRWMaps(false,true));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   619
        all.addAll(makeRWMaps(true,true));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   620
        all.addAll(makeRWNoNullKeysMaps(true));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   621
        return all;
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   622
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   623
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   624
    private static Collection<Object[]> makeAllMaps() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   625
        Collection<Object[]> all = new ArrayList<>();
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   626
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   627
        all.addAll(makeAllROMaps());
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   628
        all.addAll(makeAllRWMaps());
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   629
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   630
        return all;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   631
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   632
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   633
    private static Collection<Object[]> makeAllMapsWithNulls() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   634
        Collection<Object[]> all = new ArrayList<>();
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   635
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   636
        all.addAll(makeROMaps(true));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   637
        all.addAll(makeRWMaps(true,true));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   638
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   639
        return all;
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   640
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   641
    /**
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   642
     *
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   643
     * @param nullKeys include null keys
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   644
     * @param nullValues include null values
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   645
     * @return
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   646
     */
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   647
    private static Collection<Object[]> makeRWMaps(boolean nullKeys, boolean nullValues) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   648
        return Arrays.asList(
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   649
            new Object[]{"HashMap", makeMap(HashMap::new, nullKeys, nullValues)},
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   650
            new Object[]{"IdentityHashMap", makeMap(IdentityHashMap::new, nullKeys, nullValues)},
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   651
            new Object[]{"LinkedHashMap", makeMap(LinkedHashMap::new, nullKeys, nullValues)},
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   652
            new Object[]{"WeakHashMap", makeMap(WeakHashMap::new, nullKeys, nullValues)},
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   653
            new Object[]{"Collections.checkedMap(HashMap)", Collections.checkedMap(makeMap(HashMap::new, nullKeys, nullValues), IntegerEnum.class, String.class)},
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   654
            new Object[]{"Collections.synchronizedMap(HashMap)", Collections.synchronizedMap(makeMap(HashMap::new, nullKeys, nullValues))},
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   655
            new Object[]{"ExtendsAbstractMap", makeMap(ExtendsAbstractMap::new, nullKeys, nullValues)});
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   656
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   657
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   658
    /**
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   659
     *
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   660
     * @param nulls include null values
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   661
     * @return
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   662
     */
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   663
    private static Collection<Object[]> makeRWNoNullKeysMaps(boolean nulls) {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   664
        return Arrays.asList(
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   665
                // null key hostile
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   666
                new Object[]{"EnumMap", makeMap(() -> new EnumMap(IntegerEnum.class), false, nulls)},
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   667
                new Object[]{"TreeMap", makeMap(TreeMap::new, false, nulls)},
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   668
                new Object[]{"ExtendsAbstractMap(TreeMap)", makeMap(() -> {return new ExtendsAbstractMap(new TreeMap());}, false, nulls)},
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   669
                new Object[]{"Collections.synchronizedMap(EnumMap)", Collections.synchronizedMap(makeMap(() -> new EnumMap(IntegerEnum.class), false, nulls))}
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   670
                );
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   671
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   672
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   673
    private static Collection<Object[]> makeRWNoNullsMaps() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   674
        return Arrays.asList(
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   675
            // null key and value hostile
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   676
            new Object[]{"Hashtable", makeMap(Hashtable::new, false, false)},
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   677
            new Object[]{"ConcurrentHashMap", makeMap(ConcurrentHashMap::new, false, false)},
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   678
            new Object[]{"ConcurrentSkipListMap", makeMap(ConcurrentSkipListMap::new, false, false)},
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   679
            new Object[]{"Collections.synchronizedMap(ConcurrentHashMap)", Collections.synchronizedMap(makeMap(ConcurrentHashMap::new, false, false))},
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   680
            new Object[]{"Collections.checkedMap(ConcurrentHashMap)", Collections.checkedMap(makeMap(ConcurrentHashMap::new, false, false), IntegerEnum.class, String.class)},
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   681
            new Object[]{"ExtendsAbstractMap(ConcurrentHashMap)", makeMap(() -> {return new ExtendsAbstractMap(new ConcurrentHashMap());}, false, false)},
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   682
            new Object[]{"ImplementsConcurrentMap", makeMap(ImplementsConcurrentMap::new, false, false)}
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   683
            );
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   684
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   685
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   686
    /**
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   687
     *
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   688
     * @param nulls include nulls
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   689
     * @return
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   690
     */
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   691
    private static Collection<Object[]> makeROMaps(boolean nulls) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   692
        return Arrays.asList(new Object[][]{
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   693
            new Object[]{"Collections.unmodifiableMap(HashMap)", Collections.unmodifiableMap(makeMap(HashMap::new, nulls, nulls))}
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   694
        });
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   695
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   696
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   697
     /**
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   698
     *
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   699
     * @param supplier a supplier of mutable map instances.
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   700
     *
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   701
     * @param nullKeys   include null keys
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   702
     * @param nullValues include null values
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   703
     * @return
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   704
     */
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   705
    private static Map<IntegerEnum, String> makeMap(Supplier<Map<IntegerEnum, String>> supplier, boolean nullKeys, boolean nullValues) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   706
        Map<IntegerEnum, String> result = supplier.get();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   707
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   708
        for (int each = 0; each < TEST_SIZE; each++) {
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   709
            IntegerEnum key = nullKeys ? (each == 0) ? null : KEYS[each] : KEYS[each];
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   710
            String value = nullValues ? (each == 0) ? null : VALUES[each] : VALUES[each];
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   711
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   712
            result.put(key, value);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   713
        }
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   714
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   715
        return result;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   716
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   717
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   718
    public interface Thrower<T extends Throwable> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   719
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   720
        public void run() throws T;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   721
    }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   722
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   723
    public static <T extends Throwable> void assertThrows(Thrower<T> thrower, Class<T> throwable) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   724
        assertThrows(thrower, throwable, null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   725
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   726
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   727
    public static <T extends Throwable> void assertThrows(Thrower<T> thrower, Class<T> throwable, String message) {
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   728
        Throwable thrown;
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   729
        try {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   730
            thrower.run();
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   731
            thrown = null;
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   732
        } catch (Throwable caught) {
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   733
            thrown = caught;
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   734
        }
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   735
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   736
        assertInstance(thrown, throwable,
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   737
            ((null != message) ? message : "") +
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   738
            " Failed to throw " + throwable.getCanonicalName());
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   739
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   740
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   741
    public static <T extends Throwable> void assertThrows(Class<T> throwable, String message, Thrower<T>... throwers) {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   742
        for(Thrower<T> thrower : throwers) {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   743
            assertThrows(thrower, throwable, message);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   744
        }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   745
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   746
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   747
    public static void assertInstance(Object actual, Class<?> expected) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   748
        assertInstance(expected.isInstance(actual), null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   749
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   750
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   751
    public static void assertInstance(Object actual, Class<?> expected, String message) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   752
        assertTrue(expected.isInstance(actual), message);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   753
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   754
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   755
    /**
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   756
     * A simple mutable map implementation that provides only default
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   757
     * implementations of all methods. ie. none of the Map interface default
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   758
     * methods have overridden implementations.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   759
     *
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   760
     * @param <K> Type of keys
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   761
     * @param <V> Type of values
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   762
     */
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   763
    public static class ExtendsAbstractMap<M extends Map<K,V>, K, V> extends AbstractMap<K, V> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   764
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   765
        protected final M map;
13025
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
   766
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   767
        public ExtendsAbstractMap() { this( (M) new HashMap<K,V>()); }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   768
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   769
        protected ExtendsAbstractMap(M map) { this.map = map; }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   770
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   771
        public Set<Map.Entry<K, V>> entrySet() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   772
            return new AbstractSet<Map.Entry<K, V>>() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   773
                public int size() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   774
                    return map.size();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   775
                }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   776
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   777
                public Iterator<Map.Entry<K,V>> iterator() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   778
                    final Iterator<Map.Entry<K,V>> source = map.entrySet().iterator();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   779
                    return new Iterator<Map.Entry<K,V>>() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   780
                       public boolean hasNext() { return source.hasNext(); }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   781
                       public Map.Entry<K,V> next() { return source.next(); }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   782
                       public void remove() { source.remove(); }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   783
                    };
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   784
                }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   785
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   786
                public boolean add(Map.Entry<K,V> e) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   787
                    return map.entrySet().add(e);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   788
                }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   789
            };
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   790
        }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   791
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   792
        public V put(K key, V value) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   793
            return map.put(key, value);
13025
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
   794
        }
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
   795
    }
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
   796
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   797
    /**
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   798
     * A simple mutable concurrent map implementation that provides only default
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   799
     * implementations of all methods. ie. none of the ConcurrentMap interface
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   800
     * default methods have overridden implementations.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   801
     *
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   802
     * @param <K> Type of keys
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   803
     * @param <V> Type of values
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   804
     */
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   805
    public static class ImplementsConcurrentMap<K, V> extends ExtendsAbstractMap<ConcurrentMap<K,V>, K, V> implements ConcurrentMap<K,V> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   806
        public ImplementsConcurrentMap() { super(new ConcurrentHashMap<K,V>()); }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   807
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   808
        // ConcurrentMap reabstracts these methods
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   809
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   810
        public V replace(K k, V v) { return map.replace(k, v); };
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   811
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   812
        public boolean replace(K k, V v, V vv) { return map.replace(k, v, vv); };
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   813
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   814
        public boolean remove(Object k, Object v) { return map.remove(k, v); }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   815
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   816
        public V putIfAbsent(K k, V v) { return map.putIfAbsent(k, v); }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   817
    }
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   818
}