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