jdk/test/java/util/Map/Defaults.java
author dl
Fri, 29 Jan 2016 11:49:37 -0800
changeset 35396 c58a744d0bb4
parent 32991 b27c76b82713
child 45006 1c15ce5f636c
permissions -rw-r--r--
8145164: Default implementation of ConcurrentMap::compute can throw NPE Reviewed-by: martin, psandoz, chegar
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
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
    26
 * @bug 8010122 8004518 8024331 8024688
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;
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
    39
import java.util.Hashtable;
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    40
import java.util.HashSet;
16867
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;
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
    51
import java.util.concurrent.atomic.AtomicBoolean;
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    52
import java.util.function.BiFunction;
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
    53
import java.util.function.Function;
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    54
import java.util.function.Supplier;
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    55
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    56
import org.testng.annotations.Test;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    57
import org.testng.annotations.DataProvider;
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
    58
import static java.util.Objects.requireNonNull;
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    59
import static org.testng.Assert.fail;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    60
import static org.testng.Assert.assertEquals;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    61
import static org.testng.Assert.assertTrue;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    62
import static org.testng.Assert.assertFalse;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    63
import static org.testng.Assert.assertNull;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    64
import static org.testng.Assert.assertSame;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    65
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    66
public class Defaults {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    67
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    68
    @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
    69
    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
    70
        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
    71
        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
    72
        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
    73
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    74
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    75
    @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
    76
    public void testGetOrDefault(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    77
        assertTrue(map.containsKey(KEYS[1]), "expected key missing");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    78
        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
    79
        assertFalse(map.containsKey(EXTRA_KEY), "expected absent key");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    80
        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
    81
        assertNull(map.getOrDefault(EXTRA_KEY, null), "null not returned as default");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    82
    }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
    83
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
    84
    @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
    85
    public void testPutIfAbsentNulls(String description, Map<IntegerEnum, String> map) {
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
    86
        // null -> null
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    87
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    88
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    89
        assertNull(map.putIfAbsent(null, EXTRA_VALUE), "previous not null");
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
    90
        // null -> EXTRA_VALUE
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    91
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    92
        assertSame(map.get(null), EXTRA_VALUE, "unexpected value");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    93
        assertSame(map.putIfAbsent(null, null), EXTRA_VALUE, "previous not expected value");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    94
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    95
        assertSame(map.get(null), EXTRA_VALUE, "unexpected value");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    96
        assertSame(map.remove(null), EXTRA_VALUE, "removed unexpected value");
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
    97
        // null -> <absent>
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    98
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
    99
        assertFalse(map.containsKey(null), description + ": key present after remove");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   100
        assertNull(map.putIfAbsent(null, null), "previous not null");
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   101
        // null -> null
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   102
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   103
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   104
        assertNull(map.putIfAbsent(null, EXTRA_VALUE), "previous not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   105
        assertSame(map.get(null), EXTRA_VALUE, "value not expected");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   106
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   107
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   108
    @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
   109
    public void testPutIfAbsent(String description, Map<IntegerEnum, String> map) {
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   110
        // 1 -> 1
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   111
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   112
        Object expected = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   113
        assertTrue(null == expected || expected == VALUES[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   114
        assertSame(map.putIfAbsent(KEYS[1], EXTRA_VALUE), expected);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   115
        assertSame(map.get(KEYS[1]), expected);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   116
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   117
        // EXTRA_KEY -> <absent>
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   118
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   119
        assertSame(map.putIfAbsent(EXTRA_KEY, EXTRA_VALUE), null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   120
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   121
        assertSame(map.putIfAbsent(EXTRA_KEY, VALUES[2]), EXTRA_VALUE);
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   122
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   123
    }
13805
29e474ceeddc 7189926: Reduce test size for default run. Add additional run enabling alternative hashing.
mduigou
parents: 13025
diff changeset
   124
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   125
    @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
   126
    public void testForEach(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   127
        IntegerEnum[] EACH_KEY = new IntegerEnum[map.size()];
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   128
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   129
        map.forEach((k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   130
            int idx = (null == k) ? 0 : k.ordinal(); // substitute for index.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   131
            assertNull(EACH_KEY[idx]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   132
            EACH_KEY[idx] = (idx == 0) ? KEYS[0] : k; // substitute for comparison.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   133
            assertSame(v, map.get(k));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   134
        });
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   135
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   136
        assertEquals(KEYS, EACH_KEY, description);
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   137
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   138
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   139
    @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
   140
    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
   141
        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
   142
        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
   143
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   144
        map.replaceAll((k,v) -> {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   145
            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
   146
            assertNull(EACH_KEY[idx]);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   147
            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
   148
            assertSame(v, map.get(k));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   149
            String replacement = v + " replaced";
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   150
            EACH_REPLACE.add(replacement);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   151
            return replacement;
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   152
        });
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   153
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   154
        assertEquals(KEYS, EACH_KEY, description);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   155
        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
   156
        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
   157
        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
   158
    }
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
    @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
   161
    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
   162
        assertThrows(
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   163
            () -> { map.replaceAll(null); },
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   164
            NullPointerException.class,
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   165
            description);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   166
        assertThrows(
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   167
            () -> { map.replaceAll((k,v) -> null); },
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   168
            NullPointerException.class,
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   169
            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
   170
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   171
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   172
    @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
   173
    public static void testRemoveNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   174
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   175
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   176
        assertFalse(map.remove(null, EXTRA_VALUE), description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   177
        assertTrue(map.containsKey(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   178
        assertNull(map.get(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   179
        assertTrue(map.remove(null, null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   180
        assertFalse(map.containsKey(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   181
        assertNull(map.get(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   182
        assertFalse(map.remove(null, null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   183
    }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   184
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   185
    @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
   186
    public static void testRemove(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   187
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   188
        Object expected = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   189
        assertTrue(null == expected || expected == VALUES[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   190
        assertFalse(map.remove(KEYS[1], EXTRA_VALUE), description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   191
        assertSame(map.get(KEYS[1]), expected);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   192
        assertTrue(map.remove(KEYS[1], expected));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   193
        assertNull(map.get(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   194
        assertFalse(map.remove(KEYS[1], expected));
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
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   197
        assertFalse(map.remove(EXTRA_KEY, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   198
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   199
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   200
    @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
   201
    public void testReplaceKVNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   202
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   203
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   204
        assertSame(map.replace(null, EXTRA_VALUE), null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   205
        assertSame(map.get(null), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   206
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   207
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   208
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=nonNull values=nonNull")
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   209
    public void testReplaceKVNoNulls(String description, Map<IntegerEnum, String> map) {
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   210
        assertTrue(map.containsKey(FIRST_KEY), "expected key missing");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   211
        assertSame(map.get(FIRST_KEY), FIRST_VALUE, "found wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   212
        assertThrows( () -> {map.replace(FIRST_KEY, null);}, NullPointerException.class, description + ": should throw NPE");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   213
        assertSame(map.replace(FIRST_KEY, EXTRA_VALUE), FIRST_VALUE, description + ": replaced wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   214
        assertSame(map.get(FIRST_KEY), EXTRA_VALUE, "found wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   215
    }
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   216
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   217
    @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
   218
    public void testReplaceKV(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   219
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   220
        Object expected = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   221
        assertTrue(null == expected || expected == VALUES[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   222
        assertSame(map.replace(KEYS[1], EXTRA_VALUE), expected);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   223
        assertSame(map.get(KEYS[1]), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   224
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   225
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   226
        assertNull(map.replace(EXTRA_KEY, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   227
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   228
        assertNull(map.get(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   229
        assertNull(map.put(EXTRA_KEY, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   230
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   231
        assertSame(map.replace(EXTRA_KEY, (String)expected), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   232
        assertSame(map.get(EXTRA_KEY), expected);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   233
    }
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   234
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   235
    @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
   236
    public void testReplaceKVVNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   237
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   238
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   239
        assertFalse(map.replace(null, EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   240
        assertNull(map.get(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   241
        assertTrue(map.replace(null, null, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   242
        assertSame(map.get(null), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   243
        assertTrue(map.replace(null, EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   244
        assertSame(map.get(null), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   245
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   246
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   247
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=nonNull values=nonNull")
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   248
    public void testReplaceKVVNoNulls(String description, Map<IntegerEnum, String> map) {
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   249
        assertTrue(map.containsKey(FIRST_KEY), "expected key missing");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   250
        assertSame(map.get(FIRST_KEY), FIRST_VALUE, "found wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   251
        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
   252
        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
   253
        assertTrue(map.replace(FIRST_KEY, FIRST_VALUE, EXTRA_VALUE), description + ": replaced wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   254
        assertSame(map.get(FIRST_KEY), EXTRA_VALUE, "found wrong value");
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   255
    }
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   256
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   257
    @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
   258
    public void testReplaceKVV(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   259
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   260
        Object expected = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   261
        assertTrue(null == expected || expected == VALUES[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   262
        assertFalse(map.replace(KEYS[1], EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   263
        assertSame(map.get(KEYS[1]), expected);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   264
        assertTrue(map.replace(KEYS[1], (String)expected, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   265
        assertSame(map.get(KEYS[1]), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   266
        assertTrue(map.replace(KEYS[1], EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   267
        assertSame(map.get(KEYS[1]), EXTRA_VALUE);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   268
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   269
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   270
        assertFalse(map.replace(EXTRA_KEY, EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   271
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   272
        assertNull(map.get(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   273
        assertNull(map.put(EXTRA_KEY, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   274
        assertTrue(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   275
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   276
        assertTrue(map.replace(EXTRA_KEY, EXTRA_VALUE, EXTRA_VALUE));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   277
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   278
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   279
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   280
    @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
   281
    public void testComputeIfAbsentNulls(String description, Map<IntegerEnum, String> map) {
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   282
        // null -> null
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   283
        assertTrue(map.containsKey(null), "null key absent");
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   284
        assertNull(map.get(null), "value not null");
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   285
        assertSame(map.computeIfAbsent(null, (k) -> null), null,  "not expected result");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   286
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   287
        assertNull(map.get(null), "value not null");
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   288
        assertSame(map.computeIfAbsent(null, (k) -> EXTRA_VALUE), EXTRA_VALUE, "not mapped to result");
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   289
        // null -> EXTRA_VALUE
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   290
        assertTrue(map.containsKey(null), "null key absent");
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   291
        assertSame(map.get(null), EXTRA_VALUE,  "not expected value");
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   292
        assertSame(map.remove(null), EXTRA_VALUE, "removed unexpected value");
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   293
        // null -> <absent>
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   294
        assertFalse(map.containsKey(null), "null key present");
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   295
        assertSame(map.computeIfAbsent(null, (k) -> EXTRA_VALUE), EXTRA_VALUE, "not mapped to result");
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   296
        // null -> EXTRA_VALUE
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   297
        assertTrue(map.containsKey(null), "null key absent");
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   298
        assertSame(map.get(null), EXTRA_VALUE,  "not expected value");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   299
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   300
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   301
    @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
   302
    public void testComputeIfAbsent(String description, Map<IntegerEnum, String> map) {
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   303
        // 1 -> 1
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   304
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   305
        Object expected = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   306
        assertTrue(null == expected || expected == VALUES[1], description + String.valueOf(expected));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   307
        expected = (null == expected) ? EXTRA_VALUE : expected;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   308
        assertSame(map.computeIfAbsent(KEYS[1], (k) -> EXTRA_VALUE), expected, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   309
        assertSame(map.get(KEYS[1]), expected, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   310
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   311
        // EXTRA_KEY -> <absent>
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   312
        assertFalse(map.containsKey(EXTRA_KEY));
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   313
        assertNull(map.computeIfAbsent(EXTRA_KEY, (k) -> null));
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   314
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   315
        assertSame(map.computeIfAbsent(EXTRA_KEY, (k) -> EXTRA_VALUE), EXTRA_VALUE);
22054
503bc3781dfe 8030016: HashMap.computeIfAbsent generates spurious access event
mduigou
parents: 21352
diff changeset
   316
        // EXTRA_KEY -> EXTRA_VALUE
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   317
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   318
    }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   319
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   320
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   321
    public void testComputeIfAbsentNullFunction(String description, Map<IntegerEnum, String> map) {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   322
        assertThrows( () -> { map.computeIfAbsent(KEYS[1], null);},
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   323
                NullPointerException.class,
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   324
                "Should throw NPE");
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
   325
    }
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
   326
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   327
    @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
   328
    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
   329
        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
   330
        assertNull(map.get(null), description + ": value not null");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   331
        assertSame(map.computeIfPresent(null, (k, v) -> {
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   332
            fail(description + ": null value is not deemed present");
16867
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
        }), null, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   335
        assertTrue(map.containsKey(null));
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   336
        assertNull(map.get(null), description);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   337
        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
   338
        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
   339
        assertSame(map.computeIfPresent(EXTRA_KEY, (k, v) -> {
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   340
            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
   341
            return EXTRA_VALUE;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   342
        }), null, description);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   343
        assertNull(map.get(EXTRA_KEY), description + ": null mapping gone");
16867
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
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   346
    @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
   347
    public void testComputeIfPresent(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   348
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   349
        Object value = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   350
        assertTrue(null == value || value == VALUES[1], description + String.valueOf(value));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   351
        Object expected = (null == value) ? null : EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   352
        assertSame(map.computeIfPresent(KEYS[1], (k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   353
            assertSame(v, value);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   354
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   355
        }), expected, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   356
        assertSame(map.get(KEYS[1]), expected, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   357
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   358
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   359
        assertSame(map.computeIfPresent(EXTRA_KEY, (k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   360
            fail();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   361
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   362
        }), null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   363
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   364
        assertSame(map.get(EXTRA_KEY), null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   365
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   366
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   367
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   368
    public void testComputeIfPresentNullFunction(String description, Map<IntegerEnum, String> map) {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   369
        assertThrows( () -> { map.computeIfPresent(KEYS[1], null);},
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   370
                NullPointerException.class,
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   371
                "Should throw NPE");
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
   372
    }
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
   373
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   374
     @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
   375
    public void testComputeNulls(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   376
        assertTrue(map.containsKey(null), "null key absent");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   377
        assertNull(map.get(null), "value not null");
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   378
        assertSame(map.compute(null, (k, v) -> {
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   379
            assertNull(k);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   380
            assertNull(v);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   381
            return null;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   382
        }), null, description);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   383
        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
   384
        assertSame(map.compute(null, (k, v) -> {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   385
            assertSame(k, null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   386
            assertNull(v);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   387
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   388
        }), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   389
        assertTrue(map.containsKey(null));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   390
        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
   391
        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
   392
        // no mapping before and after
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   393
        assertFalse(map.containsKey(null), description + ": null key present");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   394
        assertSame(map.compute(null, (k, v) -> {
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   395
            assertNull(k);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   396
            assertNull(v);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   397
            return null;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   398
        }), null, description + ": expected null result" );
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   399
        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
   400
        // compute with map not containing value
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   401
        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
   402
        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
   403
        assertSame(map.compute(EXTRA_KEY, (k, v) -> {
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   404
            assertSame(k, EXTRA_KEY);
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   405
            assertNull(v);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   406
            return null;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   407
        }), null, description);
18532
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   408
        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
   409
        // ensure removal.
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   410
        assertNull(map.put(EXTRA_KEY, EXTRA_VALUE));
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   411
        assertSame(map.compute(EXTRA_KEY, (k, v) -> {
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   412
            assertSame(k, EXTRA_KEY);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   413
            assertSame(v, EXTRA_VALUE);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   414
            return null;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   415
        }), null, description + ": null resulted expected");
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   416
        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
   417
       // compute with map containing null value
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   418
        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
   419
        assertSame(map.compute(EXTRA_KEY, (k, v) -> {
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   420
            assertSame(k, EXTRA_KEY);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   421
            assertNull(v);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   422
            return null;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   423
        }), null, description);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   424
        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
   425
        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
   426
        assertSame(map.compute(EXTRA_KEY, (k, v) -> {
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   427
            assertSame(k, EXTRA_KEY);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   428
            assertNull(v);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   429
            return EXTRA_VALUE;
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   430
        }), EXTRA_VALUE, description);
0bbca0914946 8017088: Map/HashMap.compute() incorrect with key mapping to null value
mduigou
parents: 18280
diff changeset
   431
        assertTrue(map.containsKey(EXTRA_KEY), "null key present");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   432
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   433
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   434
    @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
   435
    public void testCompute(String description, Map<IntegerEnum, String> map) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   436
        assertTrue(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   437
        Object value = map.get(KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   438
        assertTrue(null == value || value == VALUES[1], description + String.valueOf(value));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   439
        assertSame(map.compute(KEYS[1], (k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   440
            assertSame(k, KEYS[1]);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   441
            assertSame(v, value);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   442
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   443
        }), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   444
        assertSame(map.get(KEYS[1]), EXTRA_VALUE, description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   445
        assertNull(map.compute(KEYS[1], (k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   446
            assertSame(v, EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   447
            return null;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   448
        }), description);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   449
        assertFalse(map.containsKey(KEYS[1]));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   450
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   451
        assertFalse(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   452
        assertSame(map.compute(EXTRA_KEY, (k, v) -> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   453
            assertNull(v);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   454
            return EXTRA_VALUE;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   455
        }), EXTRA_VALUE);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   456
        assertTrue(map.containsKey(EXTRA_KEY));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   457
        assertSame(map.get(EXTRA_KEY), EXTRA_VALUE);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   458
    }
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   459
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   460
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   461
    public void testComputeNullFunction(String description, Map<IntegerEnum, String> map) {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   462
        assertThrows( () -> { map.compute(KEYS[1], null);},
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   463
                NullPointerException.class,
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   464
                "Should throw NPE");
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
   465
    }
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
   466
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   467
    @Test(dataProvider = "MergeCases")
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   468
    private void testMerge(String description, Map<IntegerEnum, String> map, Merging.Value oldValue, Merging.Value newValue, Merging.Merger merger, Merging.Value put, Merging.Value result) {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   469
            // add and check initial conditions.
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
   470
            switch (oldValue) {
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   471
                case ABSENT :
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   472
                    map.remove(EXTRA_KEY);
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   473
                    assertFalse(map.containsKey(EXTRA_KEY), "key not absent");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   474
                    break;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   475
                case NULL :
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   476
                    map.put(EXTRA_KEY, null);
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   477
                    assertTrue(map.containsKey(EXTRA_KEY), "key absent");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   478
                    assertNull(map.get(EXTRA_KEY), "wrong value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   479
                    break;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   480
                case OLDVALUE :
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   481
                    map.put(EXTRA_KEY, VALUES[1]);
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   482
                    assertTrue(map.containsKey(EXTRA_KEY), "key absent");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   483
                    assertSame(map.get(EXTRA_KEY), VALUES[1], "wrong value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   484
                    break;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   485
                default:
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   486
                    fail("unexpected old value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   487
            }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   488
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   489
            String returned = map.merge(EXTRA_KEY,
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   490
                newValue == Merging.Value.NULL ? (String) null : VALUES[2],
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   491
                merger
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   492
                );
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   493
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   494
            // check result
13025
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
   495
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
   496
            switch (result) {
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   497
                case NULL :
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   498
                    assertNull(returned, "wrong value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   499
                    break;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   500
                case NEWVALUE :
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   501
                    assertSame(returned, VALUES[2], "wrong value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   502
                    break;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   503
                case RESULT :
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   504
                    assertSame(returned, VALUES[3], "wrong value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   505
                    break;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   506
                default:
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   507
                    fail("unexpected new value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   508
            }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   509
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   510
            // check map
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
   511
            switch (put) {
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   512
                case ABSENT :
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   513
                    assertFalse(map.containsKey(EXTRA_KEY), "key not absent");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   514
                    break;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   515
                case NULL :
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   516
                    assertTrue(map.containsKey(EXTRA_KEY), "key absent");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   517
                    assertNull(map.get(EXTRA_KEY), "wrong value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   518
                    break;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   519
                case NEWVALUE :
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   520
                    assertTrue(map.containsKey(EXTRA_KEY), "key absent");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   521
                    assertSame(map.get(EXTRA_KEY), VALUES[2], "wrong value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   522
                    break;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   523
                case RESULT :
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   524
                    assertTrue(map.containsKey(EXTRA_KEY), "key absent");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   525
                    assertSame(map.get(EXTRA_KEY), VALUES[3], "wrong value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   526
                    break;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   527
                default:
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   528
                    fail("unexpected new value");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   529
            }
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   530
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   531
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   532
    @Test(dataProvider = "Map<IntegerEnum,String> rw=true keys=all values=all")
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   533
    public void testMergeNullMerger(String description, Map<IntegerEnum, String> map) {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   534
        assertThrows( () -> { map.merge(KEYS[1], VALUES[1], null);},
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   535
                NullPointerException.class,
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   536
                "Should throw NPE");
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   537
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   538
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   539
    /** A function that flipflops between running two other functions. */
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   540
    static <T,U,V> BiFunction<T,U,V> twoStep(AtomicBoolean b,
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   541
                                             BiFunction<T,U,V> first,
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   542
                                             BiFunction<T,U,V> second) {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   543
        return (t, u) -> {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   544
            boolean bb = b.get();
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   545
            try {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   546
                return (b.get() ? first : second).apply(t, u);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   547
            } finally {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   548
                b.set(!bb);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   549
            }};
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   550
    }
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   551
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   552
    /**
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   553
     * Simulates races by modifying the map within the mapping function.
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   554
     */
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   555
    @Test
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   556
    public void testConcurrentMap_computeIfAbsent_racy() {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   557
        final ConcurrentMap<Long,Long> map = new ImplementsConcurrentMap<>();
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   558
        final Long two = 2L;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   559
        Function<Long,Long> f, g;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   560
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   561
        // race not detected if function returns null
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   562
        f = (k) -> { map.put(two, 42L); return null; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   563
        assertNull(map.computeIfAbsent(two, f));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   564
        assertEquals(42L, (long)map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   565
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   566
        map.clear();
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   567
        f = (k) -> { map.put(two, 42L); return 86L; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   568
        assertEquals(42L, (long)map.computeIfAbsent(two, f));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   569
        assertEquals(42L, (long)map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   570
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   571
        // mapping function ignored if value already exists
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   572
        map.put(two, 99L);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   573
        assertEquals(99L, (long)map.computeIfAbsent(two, f));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   574
        assertEquals(99L, (long)map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   575
    }
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   576
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   577
    /**
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   578
     * Simulates races by modifying the map within the remapping function.
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   579
     */
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   580
    @Test
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   581
    public void testConcurrentMap_computeIfPresent_racy() {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   582
        final AtomicBoolean b = new AtomicBoolean(true);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   583
        final ConcurrentMap<Long,Long> map = new ImplementsConcurrentMap<>();
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   584
        final Long two = 2L;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   585
        BiFunction<Long,Long,Long> f, g;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   586
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   587
        for (Long val : new Long[] { null, 86L }) {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   588
            map.clear();
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   589
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   590
            // Function not invoked if no mapping exists
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   591
            f = (k, v) -> { map.put(two, 42L); return val; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   592
            assertNull(map.computeIfPresent(two, f));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   593
            assertNull(map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   594
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   595
            map.put(two, 42L);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   596
            f = (k, v) -> { map.put(two, 86L); return val; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   597
            g = (k, v) -> {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   598
                assertSame(two, k);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   599
                assertEquals(86L, (long)v);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   600
                return null;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   601
            };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   602
            assertNull(map.computeIfPresent(two, twoStep(b, f, g)));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   603
            assertFalse(map.containsKey(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   604
            assertTrue(b.get());
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   605
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   606
            map.put(two, 42L);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   607
            f = (k, v) -> { map.put(two, 86L); return val; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   608
            g = (k, v) -> {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   609
                assertSame(two, k);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   610
                assertEquals(86L, (long)v);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   611
                return 99L;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   612
            };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   613
            assertEquals(99L, (long)map.computeIfPresent(two, twoStep(b, f, g)));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   614
            assertTrue(map.containsKey(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   615
            assertTrue(b.get());
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   616
        }
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   617
    }
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   618
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   619
    @Test
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   620
    public void testConcurrentMap_compute_simple() {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   621
        final ConcurrentMap<Long,Long> map = new ImplementsConcurrentMap<>();
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   622
        BiFunction<Long,Long,Long> fun = (k, v) -> ((v == null) ? 0L : k + v);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   623
        assertEquals(Long.valueOf(0L), map.compute(3L, fun));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   624
        assertEquals(Long.valueOf(3L), map.compute(3L, fun));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   625
        assertEquals(Long.valueOf(6L), map.compute(3L, fun));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   626
        assertNull(map.compute(3L, (k, v) -> null));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   627
        assertTrue(map.isEmpty());
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   628
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   629
        assertEquals(Long.valueOf(0L), map.compute(new Long(3L), fun));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   630
        assertEquals(Long.valueOf(3L), map.compute(new Long(3L), fun));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   631
        assertEquals(Long.valueOf(6L), map.compute(new Long(3L), fun));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   632
        assertNull(map.compute(3L, (k, v) -> null));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   633
        assertTrue(map.isEmpty());
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   634
    }
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   635
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   636
    /**
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   637
     * Simulates races by modifying the map within the remapping function.
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   638
     */
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   639
    @Test
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   640
    public void testConcurrentMap_compute_racy() {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   641
        final AtomicBoolean b = new AtomicBoolean(true);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   642
        final ConcurrentMap<Long,Long> map = new ImplementsConcurrentMap<>();
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   643
        final Long two = 2L;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   644
        BiFunction<Long,Long,Long> f, g;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   645
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   646
        // null -> null is a no-op; race not detected
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   647
        f = (k, v) -> { map.put(two, 42L); return null; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   648
        assertNull(map.compute(two, f));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   649
        assertEquals(42L, (long)map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   650
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   651
        for (Long val : new Long[] { null, 86L }) {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   652
            map.clear();
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   653
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   654
            f = (k, v) -> { map.put(two, 42L); return 86L; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   655
            g = (k, v) -> {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   656
                assertSame(two, k);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   657
                assertEquals(42L, (long)v);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   658
                return k + v;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   659
            };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   660
            assertEquals(44L, (long)map.compute(two, twoStep(b, f, g)));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   661
            assertEquals(44L, (long)map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   662
            assertTrue(b.get());
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   663
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   664
            f = (k, v) -> { map.remove(two); return val; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   665
            g = (k, v) -> {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   666
                assertSame(two, k);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   667
                assertNull(v);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   668
                return 44L;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   669
            };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   670
            assertEquals(44L, (long)map.compute(two, twoStep(b, f, g)));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   671
            assertEquals(44L, (long)map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   672
            assertTrue(map.containsKey(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   673
            assertTrue(b.get());
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   674
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   675
            f = (k, v) -> { map.remove(two); return val; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   676
            g = (k, v) -> {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   677
                assertSame(two, k);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   678
                assertNull(v);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   679
                return null;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   680
            };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   681
            assertNull(map.compute(two, twoStep(b, f, g)));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   682
            assertNull(map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   683
            assertFalse(map.containsKey(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   684
            assertTrue(b.get());
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   685
        }
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   686
    }
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   687
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   688
    /**
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   689
     * Simulates races by modifying the map within the remapping function.
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   690
     */
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   691
    @Test
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   692
    public void testConcurrentMap_merge_racy() {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   693
        final AtomicBoolean b = new AtomicBoolean(true);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   694
        final ConcurrentMap<Long,Long> map = new ImplementsConcurrentMap<>();
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   695
        final Long two = 2L;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   696
        BiFunction<Long,Long,Long> f, g;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   697
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   698
        for (Long val : new Long[] { null, 86L }) {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   699
            map.clear();
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   700
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   701
            f = (v, w) -> { throw new AssertionError(); };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   702
            assertEquals(99L, (long)map.merge(two, 99L, f));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   703
            assertEquals(99L, (long)map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   704
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   705
            f = (v, w) -> { map.put(two, 42L); return val; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   706
            g = (v, w) -> {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   707
                assertEquals(42L, (long)v);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   708
                assertEquals(3L, (long)w);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   709
                return v + w;
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   710
            };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   711
            assertEquals(45L, (long)map.merge(two, 3L, twoStep(b, f, g)));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   712
            assertEquals(45L, (long)map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   713
            assertTrue(b.get());
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   714
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   715
            f = (v, w) -> { map.remove(two); return val; };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   716
            g = (k, v) -> { throw new AssertionError(); };
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   717
            assertEquals(55L, (long)map.merge(two, 55L, twoStep(b, f, g)));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   718
            assertEquals(55L, (long)map.get(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   719
            assertTrue(map.containsKey(two));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   720
            assertFalse(b.get()); b.set(true);
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   721
        }
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   722
    }
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
   723
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   724
    public enum IntegerEnum {
16867
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
        e0, e1, e2, e3, e4, e5, e6, e7, e8, e9,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   727
        e10, e11, e12, e13, e14, e15, e16, e17, e18, e19,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   728
        e20, e21, e22, e23, e24, e25, e26, e27, e28, e29,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   729
        e30, e31, e32, e33, e34, e35, e36, e37, e38, e39,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   730
        e40, e41, e42, e43, e44, e45, e46, e47, e48, e49,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   731
        e50, e51, e52, e53, e54, e55, e56, e57, e58, e59,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   732
        e60, e61, e62, e63, e64, e65, e66, e67, e68, e69,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   733
        e70, e71, e72, e73, e74, e75, e76, e77, e78, e79,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   734
        e80, e81, e82, e83, e84, e85, e86, e87, e88, e89,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   735
        e90, e91, e92, e93, e94, e95, e96, e97, e98, e99,
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   736
        EXTRA_KEY;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   737
        public static final int SIZE = values().length;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   738
    };
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   739
    private static final int TEST_SIZE = IntegerEnum.SIZE - 1;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   740
    /**
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   741
     * 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
   742
     */
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   743
    private static final IntegerEnum[] KEYS = new IntegerEnum[TEST_SIZE];
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   744
    /**
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   745
     * 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
   746
     * objects.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   747
     */
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   748
    private static final String[] VALUES = new String[TEST_SIZE];
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
    static {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   751
        IntegerEnum[] keys = IntegerEnum.values();
16042
0bf6469a1cfb 8008785: IdentityHashMap.values().toArray(V[]) broken by JDK-8008167
mduigou
parents: 13817
diff changeset
   752
        for (int each = 0; each < TEST_SIZE; each++) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   753
            KEYS[each] = keys[each];
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   754
            VALUES[each] = String.valueOf(each);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   755
        }
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   756
    }
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   757
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   758
    private static final IntegerEnum FIRST_KEY = KEYS[0];
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   759
    private static final String FIRST_VALUE = VALUES[0];
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   760
    private static final IntegerEnum EXTRA_KEY = IntegerEnum.EXTRA_KEY;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   761
    private static final String EXTRA_VALUE = String.valueOf(TEST_SIZE);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   762
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   763
    @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
   764
    public static Iterator<Object[]> allMapProvider() {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   765
        return makeAllMaps().iterator();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   766
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   767
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   768
    @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
   769
    public static Iterator<Object[]> allMapWithNullsProvider() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   770
        return makeAllMapsWithNulls().iterator();
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   771
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   772
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   773
    @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
   774
    public static Iterator<Object[]> rwNonNullMapProvider() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   775
        return makeRWNoNullsMaps().iterator();
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   776
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   777
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   778
    @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
   779
    public static Iterator<Object[]> rwNonNullKeysMapProvider() {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   780
        return makeRWMapsNoNulls().iterator();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   781
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   782
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   783
    @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
   784
    public static Iterator<Object[]> rwMapProvider() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   785
        return makeAllRWMaps().iterator();
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   786
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   787
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   788
    @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
   789
    public static Iterator<Object[]> rwNullsMapProvider() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   790
        return makeAllRWMapsWithNulls().iterator();
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   791
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   792
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   793
    private static Collection<Object[]> makeAllRWMapsWithNulls() {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   794
        Collection<Object[]> all = new ArrayList<>();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   795
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   796
        all.addAll(makeRWMaps(true, true));
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
        return all;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   799
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   800
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   801
    private static Collection<Object[]> makeRWMapsNoNulls() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   802
        Collection<Object[]> all = new ArrayList<>();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   803
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   804
        all.addAll(makeRWNoNullKeysMaps(false));
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   805
        all.addAll(makeRWNoNullsMaps());
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   806
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   807
        return all;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   808
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   809
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   810
    private static Collection<Object[]> makeAllROMaps() {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   811
        Collection<Object[]> all = new ArrayList<>();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   812
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   813
        all.addAll(makeROMaps(false));
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   814
        all.addAll(makeROMaps(true));
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
        return all;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   817
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   818
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   819
    private static Collection<Object[]> makeAllRWMaps() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   820
        Collection<Object[]> all = new ArrayList<>();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   821
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   822
        all.addAll(makeRWNoNullsMaps());
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   823
        all.addAll(makeRWMaps(false,true));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   824
        all.addAll(makeRWMaps(true,true));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   825
        all.addAll(makeRWNoNullKeysMaps(true));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   826
        return all;
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   827
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   828
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   829
    private static Collection<Object[]> makeAllMaps() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   830
        Collection<Object[]> all = new ArrayList<>();
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   831
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   832
        all.addAll(makeAllROMaps());
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   833
        all.addAll(makeAllRWMaps());
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   834
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   835
        return all;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   836
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   837
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   838
    private static Collection<Object[]> makeAllMapsWithNulls() {
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   839
        Collection<Object[]> all = new ArrayList<>();
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   840
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   841
        all.addAll(makeROMaps(true));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   842
        all.addAll(makeRWMaps(true,true));
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   843
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   844
        return all;
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   845
    }
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
   846
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   847
    /**
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   848
     * @param nullKeys include null keys
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   849
     * @param nullValues include null values
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   850
     * @return
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   851
     */
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   852
    private static Collection<Object[]> makeRWMaps(boolean nullKeys, boolean nullValues) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   853
        return Arrays.asList(
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   854
            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
   855
            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
   856
            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
   857
            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
   858
            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
   859
            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
   860
            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
   861
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   862
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   863
    /**
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   864
     * @param nulls include null values
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   865
     * @return
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   866
     */
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   867
    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
   868
        return Arrays.asList(
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   869
                // null key hostile
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   870
                new Object[]{"EnumMap", makeMap(() -> new EnumMap(IntegerEnum.class), false, nulls)},
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   871
                new Object[]{"TreeMap", makeMap(TreeMap::new, false, nulls)},
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   872
                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
   873
                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
   874
                );
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   875
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   876
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   877
    private static Collection<Object[]> makeRWNoNullsMaps() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   878
        return Arrays.asList(
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   879
            // null key and value hostile
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   880
            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
   881
            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
   882
            new Object[]{"ConcurrentSkipListMap", makeMap(ConcurrentSkipListMap::new, false, false)},
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   883
            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
   884
            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
   885
            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
   886
            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
   887
            );
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   888
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   889
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   890
    /**
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   891
     * @param nulls include nulls
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   892
     * @return
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   893
     */
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   894
    private static Collection<Object[]> makeROMaps(boolean nulls) {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   895
        return Arrays.asList(new Object[][]{
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   896
            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
   897
        });
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   898
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   899
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
   900
    /**
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   901
     * @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
   902
     *
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   903
     * @param nullKeys   include null keys
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   904
     * @param nullValues include null values
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   905
     * @return
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   906
     */
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   907
    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
   908
        Map<IntegerEnum, String> result = supplier.get();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   909
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   910
        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
   911
            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
   912
            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
   913
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   914
            result.put(key, value);
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   915
        }
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   916
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   917
        return result;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   918
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   919
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   920
    static class Merging {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   921
        public enum Value {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   922
            ABSENT,
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   923
            NULL,
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   924
            OLDVALUE,
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   925
            NEWVALUE,
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   926
            RESULT
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   927
        }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   928
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   929
        public enum Merger implements BiFunction<String,String,String> {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   930
            UNUSED {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   931
                public String apply(String oldValue, String newValue) {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   932
                    fail("should not be called");
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   933
                    return null;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   934
                }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   935
            },
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   936
            NULL {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   937
                public String apply(String oldValue, String newValue) {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   938
                    return null;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   939
                }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   940
            },
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   941
            RESULT {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   942
                public String apply(String oldValue, String newValue) {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   943
                    return VALUES[3];
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   944
                }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   945
            },
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   946
        }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   947
    }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   948
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   949
    @DataProvider(name = "MergeCases", parallel = true)
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   950
    public Iterator<Object[]> mergeCasesProvider() {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   951
        Collection<Object[]> cases = new ArrayList<>();
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   952
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   953
        cases.addAll(makeMergeTestCases());
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   954
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   955
        return cases.iterator();
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   956
    }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   957
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   958
    static Collection<Object[]> makeMergeTestCases() {
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   959
        Collection<Object[]> cases = new ArrayList<>();
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   960
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
   961
        for (Object[] mapParams : makeAllRWMaps() ) {
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   962
            cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.ABSENT, Merging.Value.NEWVALUE, Merging.Merger.UNUSED, Merging.Value.NEWVALUE, Merging.Value.NEWVALUE });
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   963
        }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   964
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
   965
        for (Object[] mapParams : makeAllRWMaps() ) {
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   966
            cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.OLDVALUE, Merging.Value.NEWVALUE, Merging.Merger.NULL, Merging.Value.ABSENT, Merging.Value.NULL });
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   967
        }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   968
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
   969
        for (Object[] mapParams : makeAllRWMaps() ) {
21352
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   970
            cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.OLDVALUE, Merging.Value.NEWVALUE, Merging.Merger.RESULT, Merging.Value.RESULT, Merging.Value.RESULT });
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   971
        }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   972
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   973
        return cases;
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   974
    }
0372edc9a995 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
mduigou
parents: 20189
diff changeset
   975
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   976
    public interface Thrower<T extends Throwable> {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   977
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   978
        public void run() throws T;
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   979
    }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   980
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   981
    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
   982
        assertThrows(thrower, throwable, null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   983
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   984
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   985
    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
   986
        Throwable thrown;
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   987
        try {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   988
            thrower.run();
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   989
            thrown = null;
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   990
        } catch (Throwable caught) {
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   991
            thrown = caught;
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   992
        }
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
   993
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   994
        assertInstance(thrown, throwable,
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   995
            ((null != message) ? message : "") +
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
   996
            " Failed to throw " + throwable.getCanonicalName());
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   997
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
   998
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
   999
    public static <T extends Throwable> void assertThrows(Class<T> throwable, String message, Thrower<T>... throwers) {
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
  1000
        for (Thrower<T> thrower : throwers) {
18280
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
  1001
            assertThrows(thrower, throwable, message);
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
  1002
        }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
  1003
    }
6c3c0ff49eb5 8016446: Improve forEach/replaceAll for Map, HashMap, Hashtable, IdentityHashMap, WeakHashMap, TreeMap, ConcurrentMap
mduigou
parents: 16867
diff changeset
  1004
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
  1005
    public static void assertInstance(Object actual, Class<?> expected) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1006
        assertInstance(expected.isInstance(actual), null);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1007
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1008
19855
bfe130545fe0 8021591: Additional explicit null checks
mduigou
parents: 18532
diff changeset
  1009
    public static void assertInstance(Object actual, Class<?> expected, String message) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1010
        assertTrue(expected.isInstance(actual), message);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1011
    }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1012
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1013
    /**
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1014
     * A simple mutable map implementation that provides only default
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1015
     * implementations of all methods. ie. none of the Map interface default
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1016
     * methods have overridden implementations.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1017
     *
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1018
     * @param <K> Type of keys
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1019
     * @param <V> Type of values
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1020
     */
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
  1021
    public static class ExtendsAbstractMap<M extends Map<K,V>, K, V> extends AbstractMap<K,V> {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1022
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1023
        protected final M map;
13025
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
  1024
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1025
        public ExtendsAbstractMap() { this( (M) new HashMap<K,V>()); }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1026
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1027
        protected ExtendsAbstractMap(M map) { this.map = map; }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1028
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1029
        @Override public Set<Map.Entry<K,V>> entrySet() {
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
  1030
            return new AbstractSet<Map.Entry<K,V>>() {
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1031
                @Override public int size() {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1032
                    return map.size();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1033
                }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1034
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1035
                @Override public Iterator<Map.Entry<K,V>> iterator() {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1036
                    final Iterator<Map.Entry<K,V>> source = map.entrySet().iterator();
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1037
                    return new Iterator<Map.Entry<K,V>>() {
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1038
                       public boolean hasNext() { return source.hasNext(); }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1039
                       public Map.Entry<K,V> next() { return source.next(); }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1040
                       public void remove() { source.remove(); }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1041
                    };
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1042
                }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1043
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1044
                @Override public boolean add(Map.Entry<K,V> e) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1045
                    return map.entrySet().add(e);
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1046
                }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1047
            };
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1048
        }
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1049
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1050
        @Override public V put(K key, V value) {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1051
            return map.put(key, value);
13025
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
  1052
        }
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
  1053
    }
e070f58ad775 7175758: Improve unit test of Map iterators and Iterator.remove()
mduigou
parents: 12859
diff changeset
  1054
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1055
    /**
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1056
     * A simple mutable concurrent map implementation that provides only default
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1057
     * implementations of all methods, i.e. none of the ConcurrentMap interface
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1058
     * default methods have overridden implementations.
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1059
     *
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1060
     * @param <K> Type of keys
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1061
     * @param <V> Type of values
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1062
     */
32991
b27c76b82713 8134853: Bulk integration of java.util.concurrent classes
dl
parents: 22055
diff changeset
  1063
    public static class ImplementsConcurrentMap<K,V> extends ExtendsAbstractMap<ConcurrentMap<K,V>, K, V> implements ConcurrentMap<K,V> {
16867
76499721c6c1 8004518: Add in-place operations to Map
mduigou
parents: 16042
diff changeset
  1064
        public ImplementsConcurrentMap() { super(new ConcurrentHashMap<K,V>()); }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
  1065
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1066
        // ConcurrentMap reabstracts these methods.
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1067
        //
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1068
        // Unlike ConcurrentHashMap, we have zero tolerance for null values.
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
  1069
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1070
        @Override public V replace(K k, V v) {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1071
            return map.replace(requireNonNull(k), requireNonNull(v));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1072
        }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
  1073
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1074
        @Override public boolean replace(K k, V v, V vv) {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1075
            return map.replace(requireNonNull(k),
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1076
                               requireNonNull(v),
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1077
                               requireNonNull(vv));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1078
        }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
  1079
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1080
        @Override public boolean remove(Object k, Object v) {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1081
            return map.remove(requireNonNull(k), requireNonNull(v));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1082
        }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
  1083
35396
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1084
        @Override public V putIfAbsent(K k, V v) {
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1085
            return map.putIfAbsent(requireNonNull(k), requireNonNull(v));
c58a744d0bb4 8145164: Default implementation of ConcurrentMap::compute can throw NPE
dl
parents: 32991
diff changeset
  1086
        }
12859
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
  1087
    }
c44b88bb9b5e 7126277: Alternative String hashing implementation
mduigou
parents:
diff changeset
  1088
}