--- jsr166/src/test/tck/ConcurrentHashMap8Test.java 2013/03/22 14:11:32 1.3 +++ jsr166/src/test/tck/ConcurrentHashMap8Test.java 2021/01/26 13:33:05 1.38 @@ -4,25 +4,40 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -import junit.framework.*; -import java.util.*; -import java.util.function.*; -import java.util.concurrent.atomic.LongAdder; +import static java.util.Spliterator.CONCURRENT; +import static java.util.Spliterator.DISTINCT; +import static java.util.Spliterator.NONNULL; + +import java.util.AbstractMap; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.Spliterator; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.LongAdder; +import java.util.function.BiFunction; + +import junit.framework.Test; +import junit.framework.TestSuite; public class ConcurrentHashMap8Test extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); + main(suite(), args); } public static Test suite() { return new TestSuite(ConcurrentHashMap8Test.class); } /** - * Returns a new map from Integers 1-5 to Strings "A"-"E". + * Returns a new map from Items 1-5 to Strings "A"-"E". */ - private static ConcurrentHashMap map5() { - ConcurrentHashMap map = new ConcurrentHashMap(5); + private static ConcurrentHashMap map5() { + ConcurrentHashMap map = new ConcurrentHashMap(5); assertTrue(map.isEmpty()); map.put(one, "A"); map.put(two, "B"); @@ -30,7 +45,7 @@ public class ConcurrentHashMap8Test exte map.put(four, "D"); map.put(five, "E"); assertFalse(map.isEmpty()); - assertEquals(5, map.size()); + mustEqual(5, map.size()); return map; } @@ -38,42 +53,42 @@ public class ConcurrentHashMap8Test exte * getOrDefault returns value if present, else default */ public void testGetOrDefault() { - ConcurrentHashMap map = map5(); - assertEquals(map.getOrDefault(one, "Z"), "A"); - assertEquals(map.getOrDefault(six, "Z"), "Z"); + ConcurrentHashMap map = map5(); + mustEqual(map.getOrDefault(one, "Z"), "A"); + mustEqual(map.getOrDefault(six, "Z"), "Z"); } /** * computeIfAbsent adds when the given key is not present */ public void testComputeIfAbsent() { - ConcurrentHashMap map = map5(); - map.computeIfAbsent(six, (x) -> "Z"); + ConcurrentHashMap map = map5(); + map.computeIfAbsent(six, x -> "Z"); assertTrue(map.containsKey(six)); } /** - * computeIfAbsent does not replace if the key is already present + * computeIfAbsent does not replace if the key is already present */ public void testComputeIfAbsent2() { - ConcurrentHashMap map = map5(); - assertEquals("A", map.computeIfAbsent(one, (x) -> "Z")); + ConcurrentHashMap map = map5(); + mustEqual("A", map.computeIfAbsent(one, x -> "Z")); } /** * computeIfAbsent does not add if function returns null */ public void testComputeIfAbsent3() { - ConcurrentHashMap map = map5(); - map.computeIfAbsent(six, (x) -> null); + ConcurrentHashMap map = map5(); + map.computeIfAbsent(six, x -> null); assertFalse(map.containsKey(six)); } - + /** - * computeIfPresent does not replace if the key is already present + * computeIfPresent does not replace if the key is already present */ public void testComputeIfPresent() { - ConcurrentHashMap map = map5(); + ConcurrentHashMap map = map5(); map.computeIfPresent(six, (x, y) -> "Z"); assertFalse(map.containsKey(six)); } @@ -82,15 +97,15 @@ public class ConcurrentHashMap8Test exte * computeIfPresent adds when the given key is not present */ public void testComputeIfPresent2() { - ConcurrentHashMap map = map5(); - assertEquals("Z", map.computeIfPresent(one, (x, y) -> "Z")); + ConcurrentHashMap map = map5(); + mustEqual("Z", map.computeIfPresent(one, (x, y) -> "Z")); } /** - * compute does not replace if the function returns null + * compute does not replace if the function returns null */ public void testCompute() { - ConcurrentHashMap map = map5(); + ConcurrentHashMap map = map5(); map.compute(six, (x, y) -> null); assertFalse(map.containsKey(six)); } @@ -99,23 +114,23 @@ public class ConcurrentHashMap8Test exte * compute adds when the given key is not present */ public void testCompute2() { - ConcurrentHashMap map = map5(); - assertEquals("Z", map.compute(six, (x, y) -> "Z")); + ConcurrentHashMap map = map5(); + mustEqual("Z", map.compute(six, (x, y) -> "Z")); } /** * compute replaces when the given key is present */ public void testCompute3() { - ConcurrentHashMap map = map5(); - assertEquals("Z", map.compute(one, (x, y) -> "Z")); + ConcurrentHashMap map = map5(); + mustEqual("Z", map.compute(one, (x, y) -> "Z")); } /** * compute removes when the given key is present and function returns null */ public void testCompute4() { - ConcurrentHashMap map = map5(); + ConcurrentHashMap map = map5(); map.compute(one, (x, y) -> null); assertFalse(map.containsKey(one)); } @@ -124,66 +139,99 @@ public class ConcurrentHashMap8Test exte * merge adds when the given key is not present */ public void testMerge1() { - ConcurrentHashMap map = map5(); - assertEquals("Y", map.merge(six, "Y", (x, y) -> "Z")); + ConcurrentHashMap map = map5(); + mustEqual("Y", map.merge(six, "Y", (x, y) -> "Z")); } /** * merge replaces when the given key is present */ public void testMerge2() { - ConcurrentHashMap map = map5(); - assertEquals("Z", map.merge(one, "Y", (x, y) -> "Z")); + ConcurrentHashMap map = map5(); + mustEqual("Z", map.merge(one, "Y", (x, y) -> "Z")); } /** * merge removes when the given key is present and function returns null */ public void testMerge3() { - ConcurrentHashMap map = map5(); + ConcurrentHashMap map = map5(); map.merge(one, "Y", (x, y) -> null); assertFalse(map.containsKey(one)); } - static Set populatedSet(int n) { - Set a = ConcurrentHashMap.newKeySet(); + static Set populatedSet(int n) { + Set a = ConcurrentHashMap.newKeySet(); assertTrue(a.isEmpty()); for (int i = 0; i < n; i++) - a.add(i); - assertFalse(a.isEmpty()); - assertEquals(n, a.size()); + mustAdd(a, i); + mustEqual(n == 0, a.isEmpty()); + mustEqual(n, a.size()); return a; } - static Set populatedSet(Integer[] elements) { - Set a = ConcurrentHashMap.newKeySet(); + static Set populatedSet(Item[] elements) { + Set a = ConcurrentHashMap.newKeySet(); assertTrue(a.isEmpty()); - for (int i = 0; i < elements.length; i++) - a.add(elements[i]); + for (Item element : elements) + assertTrue(a.add(element)); assertFalse(a.isEmpty()); - assertEquals(elements.length, a.size()); + mustEqual(elements.length, a.size()); return a; } /** + * replaceAll replaces all matching values. + */ + public void testReplaceAll() { + ConcurrentHashMap map = map5(); + map.replaceAll((x, y) -> (x.value > 3) ? "Z" : y); + mustEqual("A", map.get(one)); + mustEqual("B", map.get(two)); + mustEqual("C", map.get(three)); + mustEqual("Z", map.get(four)); + mustEqual("Z", map.get(five)); + } + + /** * Default-constructed set is empty */ public void testNewKeySet() { - Set a = ConcurrentHashMap.newKeySet(); + Set a = ConcurrentHashMap.newKeySet(); assertTrue(a.isEmpty()); } /** + * keySet.add adds the key with the established value to the map; + * remove removes it. + */ + public void testKeySetAddRemove() { + ConcurrentHashMap map = map5(); + Set set1 = map.keySet(); + Set set2 = map.keySet("added"); + set2.add(six); + assertSame(map, ((ConcurrentHashMap.KeySetView)set2).getMap()); + assertSame(map, ((ConcurrentHashMap.KeySetView)set1).getMap()); + mustEqual(set2.size(), map.size()); + mustEqual(set1.size(), map.size()); + assertEquals(map.get(six), "added"); + mustContain(set1, six); + mustContain(set2, six); + mustRemove(set2, six); + assertNull(map.get(six)); + mustNotContain(set1, six); + mustNotContain(set2, six); + } + + /** * keySet.addAll adds each element from the given collection */ public void testAddAll() { - Set full = populatedSet(3); - Vector v = new Vector(); - v.add(three); - v.add(four); - v.add(five); - full.addAll(v); - assertEquals(6, full.size()); + Set full = populatedSet(3); + assertTrue(full.addAll(Arrays.asList(three, four, five))); + mustEqual(6, full.size()); + assertFalse(full.addAll(Arrays.asList(three, four, five))); + mustEqual(6, full.size()); } /** @@ -191,90 +239,157 @@ public class ConcurrentHashMap8Test exte * already exist in the set */ public void testAddAll2() { - Set full = populatedSet(3); - Vector v = new Vector(); - v.add(three); - v.add(four); - v.add(one); // will not add this element - full.addAll(v); - assertEquals(5, full.size()); + Set full = populatedSet(3); + // "one" is duplicate and will not be added + assertTrue(full.addAll(Arrays.asList(three, four, one))); + mustEqual(5, full.size()); + assertFalse(full.addAll(Arrays.asList(three, four, one))); + mustEqual(5, full.size()); } /** * keySet.add will not add the element if it already exists in the set */ public void testAdd2() { - Set full = populatedSet(3); - full.add(one); - assertEquals(3, full.size()); + Set full = populatedSet(3); + assertFalse(full.add(one)); + mustEqual(3, full.size()); } /** * keySet.add adds the element when it does not exist in the set */ public void testAdd3() { - Set full = populatedSet(3); - full.add(three); - assertTrue(full.contains(three)); + Set full = populatedSet(3); + assertTrue(full.add(three)); + mustContain(full, three); + assertFalse(full.add(three)); + mustContain(full, three); + } + + /** + * keySet.add throws UnsupportedOperationException if no default + * mapped value + */ + public void testAdd4() { + Set full = map5().keySet(); + try { + full.add(three); + shouldThrow(); + } catch (UnsupportedOperationException success) {} + } + + /** + * keySet.add throws NullPointerException if the specified key is + * null + */ + public void testAdd5() { + Set full = populatedSet(3); + try { + full.add(null); + shouldThrow(); + } catch (NullPointerException success) {} + } + + /** + * KeySetView.getMappedValue returns the map's mapped value + */ + public void testGetMappedValue() { + ConcurrentHashMap map = map5(); + assertNull(map.keySet().getMappedValue()); + String added = "added"; + try { + map.keySet(null); + shouldThrow(); + } catch (NullPointerException success) {} + ConcurrentHashMap.KeySetView set = map.keySet(added); + assertFalse(set.add(one)); + assertTrue(set.add(six)); + assertTrue(set.add(seven)); + assertSame(added, set.getMappedValue()); + assertNotSame(added, map.get(one)); + assertSame(added, map.get(six)); + assertSame(added, map.get(seven)); + } + + void checkSpliteratorCharacteristics(Spliterator sp, + int requiredCharacteristics) { + mustEqual(requiredCharacteristics, + requiredCharacteristics & sp.characteristics()); + } + + /** + * KeySetView.spliterator returns spliterator over the elements in this set + */ + public void testKeySetSpliterator() { + LongAdder adder = new LongAdder(); + ConcurrentHashMap map = map5(); + Set set = map.keySet(); + Spliterator sp = set.spliterator(); + checkSpliteratorCharacteristics(sp, CONCURRENT | DISTINCT | NONNULL); + mustEqual(sp.estimateSize(), map.size()); + Spliterator sp2 = sp.trySplit(); + sp.forEachRemaining((Item x) -> adder.add(x.longValue())); + long v = adder.sumThenReset(); + sp2.forEachRemaining((Item x) -> adder.add(x.longValue())); + long v2 = adder.sum(); + mustEqual(v + v2, 15); } /** * keyset.clear removes all elements from the set */ public void testClear() { - Set full = populatedSet(3); + Set full = populatedSet(3); full.clear(); - assertEquals(0, full.size()); + mustEqual(0, full.size()); } /** * keyset.contains returns true for added elements */ public void testContains() { - Set full = populatedSet(3); - assertTrue(full.contains(one)); - assertFalse(full.contains(five)); + Set full = populatedSet(3); + mustContain(full, one); + mustNotContain(full, five); } /** * KeySets with equal elements are equal */ public void testEquals() { - Set a = populatedSet(3); - Set b = populatedSet(3); + Set a = populatedSet(3); + Set b = populatedSet(3); assertTrue(a.equals(b)); assertTrue(b.equals(a)); - assertEquals(a.hashCode(), b.hashCode()); - a.add(m1); + mustEqual(a.hashCode(), b.hashCode()); + a.add(minusOne); assertFalse(a.equals(b)); assertFalse(b.equals(a)); - b.add(m1); + b.add(minusOne); assertTrue(a.equals(b)); assertTrue(b.equals(a)); - assertEquals(a.hashCode(), b.hashCode()); + mustEqual(a.hashCode(), b.hashCode()); } /** * KeySet.containsAll returns true for collections with subset of elements */ public void testContainsAll() { - Set full = populatedSet(3); - Vector v = new Vector(); - v.add(one); - v.add(two); - assertTrue(full.containsAll(v)); - v.add(six); - assertFalse(full.containsAll(v)); + Collection full = populatedSet(3); + assertTrue(full.containsAll(Arrays.asList())); + assertTrue(full.containsAll(Arrays.asList(one))); + assertTrue(full.containsAll(Arrays.asList(one, two))); + assertFalse(full.containsAll(Arrays.asList(one, two, six))); + assertFalse(full.containsAll(Arrays.asList(six))); } /** * KeySet.isEmpty is true when empty, else false */ public void testIsEmpty() { - Set empty = ConcurrentHashMap.newKeySet(); - Set full = populatedSet(3); - assertTrue(empty.isEmpty()); - assertFalse(full.isEmpty()); + assertTrue(populatedSet(0).isEmpty()); + assertFalse(populatedSet(3).isEmpty()); } /** @@ -282,7 +397,7 @@ public class ConcurrentHashMap8Test exte * set */ public void testIterator() { - Collection empty = ConcurrentHashMap.newKeySet(); + Collection empty = ConcurrentHashMap.newKeySet(); int size = 20; assertFalse(empty.iterator().hasNext()); try { @@ -290,30 +405,34 @@ public class ConcurrentHashMap8Test exte shouldThrow(); } catch (NoSuchElementException success) {} - Integer[] elements = new Integer[size]; - for (int i = 0; i < size; i++) - elements[i] = i; - Collections.shuffle(Arrays.asList(elements)); - Collection full = populatedSet(elements); + Item[] elements = seqItems(size); + shuffle(elements); + Collection full = populatedSet(elements); - Iterator it = full.iterator(); + Iterator it = full.iterator(); for (int j = 0; j < size; j++) { assertTrue(it.hasNext()); it.next(); } - assertFalse(it.hasNext()); - try { - it.next(); - shouldThrow(); - } catch (NoSuchElementException success) {} + assertIteratorExhausted(it); + } + + /** + * iterator of empty collections has no elements + */ + public void testEmptyIterator() { + assertIteratorExhausted(ConcurrentHashMap.newKeySet().iterator()); + assertIteratorExhausted(new ConcurrentHashMap().entrySet().iterator()); + assertIteratorExhausted(new ConcurrentHashMap().values().iterator()); + assertIteratorExhausted(new ConcurrentHashMap().keySet().iterator()); } /** * KeySet.iterator.remove removes current element */ public void testIteratorRemove() { - Set q = populatedSet(3); - Iterator it = q.iterator(); + Set q = populatedSet(3); + Iterator it = q.iterator(); Object removed = it.next(); it.remove(); @@ -327,8 +446,8 @@ public class ConcurrentHashMap8Test exte * KeySet.toString holds toString of elements */ public void testToString() { - assertEquals("[]", ConcurrentHashMap.newKeySet().toString()); - Set full = populatedSet(3); + mustEqual("[]", ConcurrentHashMap.newKeySet().toString()); + Set full = populatedSet(3); String s = full.toString(); for (int i = 0; i < 3; ++i) assertTrue(s.contains(String.valueOf(i))); @@ -338,32 +457,31 @@ public class ConcurrentHashMap8Test exte * KeySet.removeAll removes all elements from the given collection */ public void testRemoveAll() { - Set full = populatedSet(3); - Vector v = new Vector(); - v.add(one); - v.add(two); - full.removeAll(v); - assertEquals(1, full.size()); + Set full = populatedSet(3); + assertTrue(full.removeAll(Arrays.asList(one, two))); + mustEqual(1, full.size()); + assertFalse(full.removeAll(Arrays.asList(one, two))); + mustEqual(1, full.size()); } /** * KeySet.remove removes an element */ public void testRemove() { - Set full = populatedSet(3); + Set full = populatedSet(3); full.remove(one); - assertFalse(full.contains(one)); - assertEquals(2, full.size()); + mustNotContain(full, one); + mustEqual(2, full.size()); } /** * keySet.size returns the number of elements */ public void testSize() { - Set empty = ConcurrentHashMap.newKeySet(); - Set full = populatedSet(3); - assertEquals(3, full.size()); - assertEquals(0, empty.size()); + Set empty = ConcurrentHashMap.newKeySet(); + Set full = populatedSet(3); + mustEqual(3, full.size()); + mustEqual(0, empty.size()); } /** @@ -375,74 +493,67 @@ public class ConcurrentHashMap8Test exte assertTrue(Arrays.equals(new Object[0], a)); assertSame(Object[].class, a.getClass()); int size = 20; - Integer[] elements = new Integer[size]; - for (int i = 0; i < size; i++) - elements[i] = i; - Collections.shuffle(Arrays.asList(elements)); - Collection full = populatedSet(elements); - + Item[] elements = seqItems(size); + shuffle(elements); + Collection full = populatedSet(elements); + assertTrue(Arrays.asList(elements).containsAll(Arrays.asList(full.toArray()))); assertTrue(full.containsAll(Arrays.asList(full.toArray()))); assertSame(Object[].class, full.toArray().getClass()); } /** - * toArray(Integer array) returns an Integer array containing all + * toArray(Item array) returns an Item array containing all * elements from the set */ public void testToArray2() { - Collection empty = ConcurrentHashMap.newKeySet(); - Integer[] a; + Collection empty = ConcurrentHashMap.newKeySet(); + Item[] a; int size = 20; - a = new Integer[0]; + a = new Item[0]; assertSame(a, empty.toArray(a)); - a = new Integer[size/2]; - Arrays.fill(a, 42); + a = new Item[size / 2]; + Arrays.fill(a, fortytwo); assertSame(a, empty.toArray(a)); assertNull(a[0]); for (int i = 1; i < a.length; i++) - assertEquals(42, (int) a[i]); + mustEqual(42, a[i]); - Integer[] elements = new Integer[size]; - for (int i = 0; i < size; i++) - elements[i] = i; - Collections.shuffle(Arrays.asList(elements)); - Collection full = populatedSet(elements); + Item[] elements = seqItems(size); + shuffle(elements); + Collection full = populatedSet(elements); - Arrays.fill(a, 42); + Arrays.fill(a, fortytwo); assertTrue(Arrays.asList(elements).containsAll(Arrays.asList(full.toArray(a)))); for (int i = 0; i < a.length; i++) - assertEquals(42, (int) a[i]); - assertSame(Integer[].class, full.toArray(a).getClass()); + mustEqual(42, a[i]); + assertSame(Item[].class, full.toArray(a).getClass()); - a = new Integer[size]; - Arrays.fill(a, 42); + a = new Item[size]; + Arrays.fill(a, fortytwo); assertSame(a, full.toArray(a)); assertTrue(Arrays.asList(elements).containsAll(Arrays.asList(full.toArray(a)))); } /** - * A deserialized serialized set is equal + * A deserialized/reserialized set equals original */ public void testSerialization() throws Exception { int size = 20; - Set x = populatedSet(size); - Set y = serialClone(x); + Set x = populatedSet(size); + Set y = serialClone(x); - assertTrue(x != y); - assertEquals(x.size(), y.size()); - assertEquals(x.toString(), y.toString()); - assertTrue(Arrays.equals(x.toArray(), y.toArray())); - assertEquals(x, y); - assertEquals(y, x); + assertNotSame(x, y); + mustEqual(x.size(), y.size()); + mustEqual(x, y); + mustEqual(y, x); } - static final int SIZE = 10000; static ConcurrentHashMap longMap; - + static ConcurrentHashMap longMap() { if (longMap == null) { longMap = new ConcurrentHashMap(SIZE); @@ -456,7 +567,7 @@ public class ConcurrentHashMap8Test exte static class AddKeys implements BiFunction, Map.Entry, Map.Entry> { public Map.Entry apply(Map.Entry x, Map.Entry y) { return new AbstractMap.SimpleEntry - (Long.valueOf(x.getKey().longValue() + y.getKey().longValue()), + (Long.valueOf(x.getKey().longValue() + y.getKey().longValue()), Long.valueOf(1L)); } } @@ -467,8 +578,8 @@ public class ConcurrentHashMap8Test exte public void testForEachKeySequentially() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachKeySequentially((Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), SIZE * (SIZE - 1) / 2); + m.forEachKey(Long.MAX_VALUE, (Long x) -> adder.add(x.longValue())); + mustEqual(adder.sum(), SIZE * (SIZE - 1) / 2); } /** @@ -477,8 +588,8 @@ public class ConcurrentHashMap8Test exte public void testForEachValueSequentially() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachValueSequentially((Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), SIZE * (SIZE - 1)); + m.forEachValue(Long.MAX_VALUE, (Long x) -> adder.add(x.longValue())); + mustEqual(adder.sum(), SIZE * (SIZE - 1)); } /** @@ -487,8 +598,8 @@ public class ConcurrentHashMap8Test exte public void testForEachSequentially() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachSequentially((Long x, Long y) -> adder.add(x.longValue() + y.longValue())); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); + m.forEach(Long.MAX_VALUE, (Long x, Long y) -> adder.add(x.longValue() + y.longValue())); + mustEqual(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); } /** @@ -497,8 +608,8 @@ public class ConcurrentHashMap8Test exte public void testForEachEntrySequentially() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachEntrySequentially((Map.Entry e) -> adder.add(e.getKey().longValue() + e.getValue().longValue())); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); + m.forEachEntry(Long.MAX_VALUE, (Map.Entry e) -> adder.add(e.getKey().longValue() + e.getValue().longValue())); + mustEqual(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); } /** @@ -507,8 +618,8 @@ public class ConcurrentHashMap8Test exte public void testForEachKeyInParallel() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachKeyInParallel((Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), SIZE * (SIZE - 1) / 2); + m.forEachKey(1L, (Long x) -> adder.add(x.longValue())); + mustEqual(adder.sum(), SIZE * (SIZE - 1) / 2); } /** @@ -517,8 +628,8 @@ public class ConcurrentHashMap8Test exte public void testForEachValueInParallel() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachValueInParallel((Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), SIZE * (SIZE - 1)); + m.forEachValue(1L, (Long x) -> adder.add(x.longValue())); + mustEqual(adder.sum(), SIZE * (SIZE - 1)); } /** @@ -527,8 +638,8 @@ public class ConcurrentHashMap8Test exte public void testForEachInParallel() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachInParallel((Long x, Long y) -> adder.add(x.longValue() + y.longValue())); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); + m.forEach(1L, (Long x, Long y) -> adder.add(x.longValue() + y.longValue())); + mustEqual(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); } /** @@ -537,8 +648,8 @@ public class ConcurrentHashMap8Test exte public void testForEachEntryInParallel() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachEntryInParallel((Map.Entry e) -> adder.add(e.getKey().longValue() + e.getValue().longValue())); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); + m.forEachEntry(1L, (Map.Entry e) -> adder.add(e.getKey().longValue() + e.getValue().longValue())); + mustEqual(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); } /** @@ -548,9 +659,9 @@ public class ConcurrentHashMap8Test exte public void testMappedForEachKeySequentially() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachKeySequentially((Long x) -> Long.valueOf(4 * x.longValue()), + m.forEachKey(Long.MAX_VALUE, (Long x) -> Long.valueOf(4 * x.longValue()), (Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), 4 * SIZE * (SIZE - 1) / 2); + mustEqual(adder.sum(), 4 * SIZE * (SIZE - 1) / 2); } /** @@ -560,9 +671,9 @@ public class ConcurrentHashMap8Test exte public void testMappedForEachValueSequentially() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachValueSequentially((Long x) -> Long.valueOf(4 * x.longValue()), + m.forEachValue(Long.MAX_VALUE, (Long x) -> Long.valueOf(4 * x.longValue()), (Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), 4 * SIZE * (SIZE - 1)); + mustEqual(adder.sum(), 4 * SIZE * (SIZE - 1)); } /** @@ -572,9 +683,9 @@ public class ConcurrentHashMap8Test exte public void testMappedForEachSequentially() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachSequentially((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()), + m.forEach(Long.MAX_VALUE, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()), (Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); + mustEqual(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); } /** @@ -584,9 +695,9 @@ public class ConcurrentHashMap8Test exte public void testMappedForEachEntrySequentially() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachEntrySequentially((Map.Entry e) -> Long.valueOf(e.getKey().longValue() + e.getValue().longValue()), + m.forEachEntry(Long.MAX_VALUE, (Map.Entry e) -> Long.valueOf(e.getKey().longValue() + e.getValue().longValue()), (Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); + mustEqual(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); } /** @@ -596,9 +707,9 @@ public class ConcurrentHashMap8Test exte public void testMappedForEachKeyInParallel() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachKeyInParallel((Long x) -> Long.valueOf(4 * x.longValue()), + m.forEachKey(1L, (Long x) -> Long.valueOf(4 * x.longValue()), (Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), 4 * SIZE * (SIZE - 1) / 2); + mustEqual(adder.sum(), 4 * SIZE * (SIZE - 1) / 2); } /** @@ -608,9 +719,9 @@ public class ConcurrentHashMap8Test exte public void testMappedForEachValueInParallel() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachValueInParallel((Long x) -> Long.valueOf(4 * x.longValue()), + m.forEachValue(1L, (Long x) -> Long.valueOf(4 * x.longValue()), (Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), 4 * SIZE * (SIZE - 1)); + mustEqual(adder.sum(), 4 * SIZE * (SIZE - 1)); } /** @@ -620,9 +731,9 @@ public class ConcurrentHashMap8Test exte public void testMappedForEachInParallel() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachInParallel((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()), + m.forEach(1L, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()), (Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); + mustEqual(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); } /** @@ -632,20 +743,19 @@ public class ConcurrentHashMap8Test exte public void testMappedForEachEntryInParallel() { LongAdder adder = new LongAdder(); ConcurrentHashMap m = longMap(); - m.forEachEntryInParallel((Map.Entry e) -> Long.valueOf(e.getKey().longValue() + e.getValue().longValue()), + m.forEachEntry(1L, (Map.Entry e) -> Long.valueOf(e.getKey().longValue() + e.getValue().longValue()), (Long x) -> adder.add(x.longValue())); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); + mustEqual(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); } - /** * reduceKeysSequentially accumulates across all keys, */ public void testReduceKeysSequentially() { ConcurrentHashMap m = longMap(); Long r; - r = m.reduceKeysSequentially((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); - assertEquals((long)r, (long)SIZE * (SIZE - 1) / 2); + r = m.reduceKeys(Long.MAX_VALUE, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); + mustEqual((long)r, (long)SIZE * (SIZE - 1) / 2); } /** @@ -654,19 +764,18 @@ public class ConcurrentHashMap8Test exte public void testReduceValuesSequentially() { ConcurrentHashMap m = longMap(); Long r; - r = m.reduceKeysSequentially((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); - assertEquals((long)r, (long)SIZE * (SIZE - 1) / 2); + r = m.reduceKeys(Long.MAX_VALUE, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); + mustEqual((long)r, (long)SIZE * (SIZE - 1) / 2); } - /** * reduceEntriesSequentially accumulates across all entries */ public void testReduceEntriesSequentially() { ConcurrentHashMap m = longMap(); Map.Entry r; - r = m.reduceEntriesSequentially(new AddKeys()); - assertEquals(r.getKey().longValue(), (long)SIZE * (SIZE - 1) / 2); + r = m.reduceEntries(Long.MAX_VALUE, new AddKeys()); + mustEqual(r.getKey().longValue(), (long)SIZE * (SIZE - 1) / 2); } /** @@ -675,8 +784,8 @@ public class ConcurrentHashMap8Test exte public void testReduceKeysInParallel() { ConcurrentHashMap m = longMap(); Long r; - r = m.reduceKeysInParallel((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); - assertEquals((long)r, (long)SIZE * (SIZE - 1) / 2); + r = m.reduceKeys(1L, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); + mustEqual((long)r, (long)SIZE * (SIZE - 1) / 2); } /** @@ -685,8 +794,8 @@ public class ConcurrentHashMap8Test exte public void testReduceValuesInParallel() { ConcurrentHashMap m = longMap(); Long r; - r = m.reduceValuesInParallel((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); - assertEquals((long)r, (long)SIZE * (SIZE - 1)); + r = m.reduceValues(1L, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); + mustEqual((long)r, (long)SIZE * (SIZE - 1)); } /** @@ -695,28 +804,28 @@ public class ConcurrentHashMap8Test exte public void testReduceEntriesInParallel() { ConcurrentHashMap m = longMap(); Map.Entry r; - r = m.reduceEntriesInParallel(new AddKeys()); - assertEquals(r.getKey().longValue(), (long)SIZE * (SIZE - 1) / 2); + r = m.reduceEntries(1L, new AddKeys()); + mustEqual(r.getKey().longValue(), (long)SIZE * (SIZE - 1) / 2); } - /* + /** * Mapped reduceKeysSequentially accumulates mapped keys */ public void testMapReduceKeysSequentially() { ConcurrentHashMap m = longMap(); - Long r = m.reduceKeysSequentially((Long x) -> Long.valueOf(4 * x.longValue()), + Long r = m.reduceKeys(Long.MAX_VALUE, (Long x) -> Long.valueOf(4 * x.longValue()), (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); - assertEquals((long)r, (long)4 * SIZE * (SIZE - 1) / 2); + mustEqual((long)r, (long)4 * SIZE * (SIZE - 1) / 2); } - /* + /** * Mapped reduceValuesSequentially accumulates mapped values */ public void testMapReduceValuesSequentially() { ConcurrentHashMap m = longMap(); - Long r = m.reduceValuesSequentially((Long x) -> Long.valueOf(4 * x.longValue()), + Long r = m.reduceValues(Long.MAX_VALUE, (Long x) -> Long.valueOf(4 * x.longValue()), (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); - assertEquals((long)r, (long)4 * SIZE * (SIZE - 1)); + mustEqual((long)r, (long)4 * SIZE * (SIZE - 1)); } /** @@ -724,30 +833,30 @@ public class ConcurrentHashMap8Test exte */ public void testMappedReduceSequentially() { ConcurrentHashMap m = longMap(); - Long r = m.reduceSequentially((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()), + Long r = m.reduce(Long.MAX_VALUE, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()), (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); - - assertEquals((long)r, (long)3 * SIZE * (SIZE - 1) / 2); + + mustEqual((long)r, (long)3 * SIZE * (SIZE - 1) / 2); } - /* + /** * Mapped reduceKeysInParallel, accumulates mapped keys */ public void testMapReduceKeysInParallel() { ConcurrentHashMap m = longMap(); - Long r = m.reduceKeysInParallel((Long x) -> Long.valueOf(4 * x.longValue()), + Long r = m.reduceKeys(1L, (Long x) -> Long.valueOf(4 * x.longValue()), (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); - assertEquals((long)r, (long)4 * SIZE * (SIZE - 1) / 2); + mustEqual((long)r, (long)4 * SIZE * (SIZE - 1) / 2); } - /* + /** * Mapped reduceValuesInParallel accumulates mapped values */ public void testMapReduceValuesInParallel() { ConcurrentHashMap m = longMap(); - Long r = m.reduceValuesInParallel((Long x) -> Long.valueOf(4 * x.longValue()), + Long r = m.reduceValues(1L, (Long x) -> Long.valueOf(4 * x.longValue()), (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); - assertEquals((long)r, (long)4 * SIZE * (SIZE - 1)); + mustEqual((long)r, (long)4 * SIZE * (SIZE - 1)); } /** @@ -756,118 +865,117 @@ public class ConcurrentHashMap8Test exte public void testMappedReduceInParallel() { ConcurrentHashMap m = longMap(); Long r; - r = m.reduceInParallel((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()), + r = m.reduce(1L, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()), (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())); - assertEquals((long)r, (long)3 * SIZE * (SIZE - 1) / 2); + mustEqual((long)r, (long)3 * SIZE * (SIZE - 1) / 2); } - - /* + /** * reduceKeysToLongSequentially accumulates mapped keys */ public void testReduceKeysToLongSequentially() { ConcurrentHashMap m = longMap(); - long lr = m.reduceKeysToLongSequentially((Long x) -> x.longValue(), 0L, Long::sum); - assertEquals(lr, (long)SIZE * (SIZE - 1) / 2); + long lr = m.reduceKeysToLong(Long.MAX_VALUE, (Long x) -> x.longValue(), 0L, Long::sum); + mustEqual(lr, (long)SIZE * (SIZE - 1) / 2); } - /* + /** * reduceKeysToIntSequentially accumulates mapped keys */ public void testReduceKeysToIntSequentially() { ConcurrentHashMap m = longMap(); - int ir = m.reduceKeysToIntSequentially((Long x) -> x.intValue(), 0, Integer::sum); - assertEquals(ir, (int)SIZE * (SIZE - 1) / 2); + int ir = m.reduceKeysToInt(Long.MAX_VALUE, (Long x) -> x.intValue(), 0, Integer::sum); + mustEqual(ir, SIZE * (SIZE - 1) / 2); } - /* + /** * reduceKeysToDoubleSequentially accumulates mapped keys */ public void testReduceKeysToDoubleSequentially() { ConcurrentHashMap m = longMap(); - double dr = m.reduceKeysToDoubleSequentially((Long x) -> x.doubleValue(), 0.0, Double::sum); - assertEquals(dr, (double)SIZE * (SIZE - 1) / 2); + double dr = m.reduceKeysToDouble(Long.MAX_VALUE, (Long x) -> x.doubleValue(), 0.0, Double::sum); + mustEqual(dr, (double)SIZE * (SIZE - 1) / 2); } - /* + /** * reduceValuesToLongSequentially accumulates mapped values */ public void testReduceValuesToLongSequentially() { ConcurrentHashMap m = longMap(); - long lr = m.reduceValuesToLongSequentially((Long x) -> x.longValue(), 0L, Long::sum); - assertEquals(lr, (long)SIZE * (SIZE - 1)); + long lr = m.reduceValuesToLong(Long.MAX_VALUE, (Long x) -> x.longValue(), 0L, Long::sum); + mustEqual(lr, (long)SIZE * (SIZE - 1)); } - /* + /** * reduceValuesToIntSequentially accumulates mapped values */ public void testReduceValuesToIntSequentially() { ConcurrentHashMap m = longMap(); - int ir = m.reduceValuesToIntSequentially((Long x) -> x.intValue(), 0, Integer::sum); - assertEquals(ir, (int)SIZE * (SIZE - 1)); + int ir = m.reduceValuesToInt(Long.MAX_VALUE, (Long x) -> x.intValue(), 0, Integer::sum); + mustEqual(ir, SIZE * (SIZE - 1)); } - /* + /** * reduceValuesToDoubleSequentially accumulates mapped values */ public void testReduceValuesToDoubleSequentially() { ConcurrentHashMap m = longMap(); - double dr = m.reduceValuesToDoubleSequentially((Long x) -> x.doubleValue(), 0.0, Double::sum); - assertEquals(dr, (double)SIZE * (SIZE - 1)); + double dr = m.reduceValuesToDouble(Long.MAX_VALUE, (Long x) -> x.doubleValue(), 0.0, Double::sum); + mustEqual(dr, (double)SIZE * (SIZE - 1)); } - /* + /** * reduceKeysToLongInParallel accumulates mapped keys */ public void testReduceKeysToLongInParallel() { ConcurrentHashMap m = longMap(); - long lr = m.reduceKeysToLongInParallel((Long x) -> x.longValue(), 0L, Long::sum); - assertEquals(lr, (long)SIZE * (SIZE - 1) / 2); + long lr = m.reduceKeysToLong(1L, (Long x) -> x.longValue(), 0L, Long::sum); + mustEqual(lr, (long)SIZE * (SIZE - 1) / 2); } - /* + /** * reduceKeysToIntInParallel accumulates mapped keys */ public void testReduceKeysToIntInParallel() { ConcurrentHashMap m = longMap(); - int ir = m.reduceKeysToIntInParallel((Long x) -> x.intValue(), 0, Integer::sum); - assertEquals(ir, (int)SIZE * (SIZE - 1) / 2); + int ir = m.reduceKeysToInt(1L, (Long x) -> x.intValue(), 0, Integer::sum); + mustEqual(ir, SIZE * (SIZE - 1) / 2); } - /* + /** * reduceKeysToDoubleInParallel accumulates mapped values */ public void testReduceKeysToDoubleInParallel() { ConcurrentHashMap m = longMap(); - double dr = m.reduceKeysToDoubleInParallel((Long x) -> x.doubleValue(), 0.0, Double::sum); - assertEquals(dr, (double)SIZE * (SIZE - 1) / 2); + double dr = m.reduceKeysToDouble(1L, (Long x) -> x.doubleValue(), 0.0, Double::sum); + mustEqual(dr, (double)SIZE * (SIZE - 1) / 2); } - /* + /** * reduceValuesToLongInParallel accumulates mapped values */ public void testReduceValuesToLongInParallel() { ConcurrentHashMap m = longMap(); - long lr = m.reduceValuesToLongInParallel((Long x) -> x.longValue(), 0L, Long::sum); - assertEquals(lr, (long)SIZE * (SIZE - 1)); + long lr = m.reduceValuesToLong(1L, (Long x) -> x.longValue(), 0L, Long::sum); + mustEqual(lr, (long)SIZE * (SIZE - 1)); } - /* + /** * reduceValuesToIntInParallel accumulates mapped values */ public void testReduceValuesToIntInParallel() { ConcurrentHashMap m = longMap(); - int ir = m.reduceValuesToIntInParallel((Long x) -> x.intValue(), 0, Integer::sum); - assertEquals(ir, (int)SIZE * (SIZE - 1)); + int ir = m.reduceValuesToInt(1L, (Long x) -> x.intValue(), 0, Integer::sum); + mustEqual(ir, SIZE * (SIZE - 1)); } - /* + /** * reduceValuesToDoubleInParallel accumulates mapped values */ public void testReduceValuesToDoubleInParallel() { ConcurrentHashMap m = longMap(); - double dr = m.reduceValuesToDoubleInParallel((Long x) -> x.doubleValue(), 0.0, Double::sum); - assertEquals(dr, (double)SIZE * (SIZE - 1)); + double dr = m.reduceValuesToDouble(1L, (Long x) -> x.doubleValue(), 0.0, Double::sum); + mustEqual(dr, (double)SIZE * (SIZE - 1)); } /** @@ -877,9 +985,9 @@ public class ConcurrentHashMap8Test exte public void testSearchKeysSequentially() { ConcurrentHashMap m = longMap(); Long r; - r = m.searchKeysSequentially((Long x) -> x.longValue() == (long)(SIZE/2)? x : null); - assertEquals((long)r, (long)(SIZE/2)); - r = m.searchKeysSequentially((Long x) -> x.longValue() < 0L? x : null); + r = m.searchKeys(Long.MAX_VALUE, (Long x) -> x.longValue() == (long)(SIZE/2) ? x : null); + mustEqual((long)r, (long)(SIZE/2)); + r = m.searchKeys(Long.MAX_VALUE, (Long x) -> x.longValue() < 0L ? x : null); assertNull(r); } @@ -890,9 +998,11 @@ public class ConcurrentHashMap8Test exte public void testSearchValuesSequentially() { ConcurrentHashMap m = longMap(); Long r; - r = m.searchValuesSequentially((Long x) -> x.longValue() == (long)(SIZE/2)? x : null); - assertEquals((long)r, (long)(SIZE/2)); - r = m.searchValuesSequentially((Long x) -> x.longValue() < 0L? x : null); + r = m.searchValues(Long.MAX_VALUE, + (Long x) -> (x.longValue() == (long)(SIZE/2)) ? x : null); + mustEqual((long)r, (long)(SIZE/2)); + r = m.searchValues(Long.MAX_VALUE, + (Long x) -> (x.longValue() < 0L) ? x : null); assertNull(r); } @@ -903,9 +1013,9 @@ public class ConcurrentHashMap8Test exte public void testSearchSequentially() { ConcurrentHashMap m = longMap(); Long r; - r = m.searchSequentially((Long x, Long y) -> x.longValue() == (long)(SIZE/2)? x : null); - assertEquals((long)r, (long)(SIZE/2)); - r = m.searchSequentially((Long x, Long y) -> x.longValue() < 0L? x : null); + r = m.search(Long.MAX_VALUE, (Long x, Long y) -> x.longValue() == (long)(SIZE/2) ? x : null); + mustEqual((long)r, (long)(SIZE/2)); + r = m.search(Long.MAX_VALUE, (Long x, Long y) -> x.longValue() < 0L ? x : null); assertNull(r); } @@ -916,9 +1026,9 @@ public class ConcurrentHashMap8Test exte public void testSearchEntriesSequentially() { ConcurrentHashMap m = longMap(); Long r; - r = m.searchEntriesSequentially((Map.Entry e) -> e.getKey().longValue() == (long)(SIZE/2)? e.getKey() : null); - assertEquals((long)r, (long)(SIZE/2)); - r = m.searchEntriesSequentially((Map.Entry e) -> e.getKey().longValue() < 0L? e.getKey() : null); + r = m.searchEntries(Long.MAX_VALUE, (Map.Entry e) -> e.getKey().longValue() == (long)(SIZE/2) ? e.getKey() : null); + mustEqual((long)r, (long)(SIZE/2)); + r = m.searchEntries(Long.MAX_VALUE, (Map.Entry e) -> e.getKey().longValue() < 0L ? e.getKey() : null); assertNull(r); } @@ -929,9 +1039,9 @@ public class ConcurrentHashMap8Test exte public void testSearchKeysInParallel() { ConcurrentHashMap m = longMap(); Long r; - r = m.searchKeysInParallel((Long x) -> x.longValue() == (long)(SIZE/2)? x : null); - assertEquals((long)r, (long)(SIZE/2)); - r = m.searchKeysInParallel((Long x) -> x.longValue() < 0L? x : null); + r = m.searchKeys(1L, (Long x) -> x.longValue() == (long)(SIZE/2) ? x : null); + mustEqual((long)r, (long)(SIZE/2)); + r = m.searchKeys(1L, (Long x) -> x.longValue() < 0L ? x : null); assertNull(r); } @@ -942,9 +1052,9 @@ public class ConcurrentHashMap8Test exte public void testSearchValuesInParallel() { ConcurrentHashMap m = longMap(); Long r; - r = m.searchValuesInParallel((Long x) -> x.longValue() == (long)(SIZE/2)? x : null); - assertEquals((long)r, (long)(SIZE/2)); - r = m.searchValuesInParallel((Long x) -> x.longValue() < 0L? x : null); + r = m.searchValues(1L, (Long x) -> x.longValue() == (long)(SIZE/2) ? x : null); + mustEqual((long)r, (long)(SIZE/2)); + r = m.searchValues(1L, (Long x) -> x.longValue() < 0L ? x : null); assertNull(r); } @@ -955,9 +1065,9 @@ public class ConcurrentHashMap8Test exte public void testSearchInParallel() { ConcurrentHashMap m = longMap(); Long r; - r = m.searchInParallel((Long x, Long y) -> x.longValue() == (long)(SIZE/2)? x : null); - assertEquals((long)r, (long)(SIZE/2)); - r = m.searchInParallel((Long x, Long y) -> x.longValue() < 0L? x : null); + r = m.search(1L, (Long x, Long y) -> x.longValue() == (long)(SIZE/2) ? x : null); + mustEqual((long)r, (long)(SIZE/2)); + r = m.search(1L, (Long x, Long y) -> x.longValue() < 0L ? x : null); assertNull(r); } @@ -968,109 +1078,38 @@ public class ConcurrentHashMap8Test exte public void testSearchEntriesInParallel() { ConcurrentHashMap m = longMap(); Long r; - r = m.searchEntriesInParallel((Map.Entry e) -> e.getKey().longValue() == (long)(SIZE/2)? e.getKey() : null); - assertEquals((long)r, (long)(SIZE/2)); - r = m.searchEntriesInParallel((Map.Entry e) -> e.getKey().longValue() < 0L? e.getKey() : null); + r = m.searchEntries(1L, (Map.Entry e) -> e.getKey().longValue() == (long)(SIZE/2) ? e.getKey() : null); + mustEqual((long)r, (long)(SIZE/2)); + r = m.searchEntries(1L, (Map.Entry e) -> e.getKey().longValue() < 0L ? e.getKey() : null); assertNull(r); } /** - * Invoking task versions of bulk methods has same effect as - * parallel methods - */ - public void testForkJoinTasks() { - LongAdder adder = new LongAdder(); - ConcurrentHashMap m = longMap(); - ConcurrentHashMap.ForkJoinTasks.forEachKey - (m, (Long x) -> adder.add(x.longValue())).invoke(); - assertEquals(adder.sum(), SIZE * (SIZE - 1) / 2); - adder.reset(); - ConcurrentHashMap.ForkJoinTasks.forEachValue - (m, (Long x) -> adder.add(x.longValue())).invoke(); - assertEquals(adder.sum(), SIZE * (SIZE - 1)); - adder.reset(); - ConcurrentHashMap.ForkJoinTasks.forEach - (m, (Long x, Long y) -> adder.add(x.longValue() + y.longValue())).invoke(); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); - adder.reset(); - ConcurrentHashMap.ForkJoinTasks.forEachEntry - (m, - (Map.Entry e) -> adder.add(e.getKey().longValue() + e.getValue().longValue())).invoke(); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); - adder.reset(); - ConcurrentHashMap.ForkJoinTasks.forEachKey - (m, (Long x) -> Long.valueOf(4 * x.longValue()), - (Long x) -> adder.add(x.longValue())).invoke(); - assertEquals(adder.sum(), 4 * SIZE * (SIZE - 1) / 2); - adder.reset(); - ConcurrentHashMap.ForkJoinTasks.forEachValue - (m, (Long x) -> Long.valueOf(4 * x.longValue()), - (Long x) -> adder.add(x.longValue())).invoke(); - assertEquals(adder.sum(), 4 * SIZE * (SIZE - 1)); - adder.reset(); - ConcurrentHashMap.ForkJoinTasks.forEach - (m, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()), - (Long x) -> adder.add(x.longValue())).invoke(); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); - adder.reset(); - ConcurrentHashMap.ForkJoinTasks.forEachEntry - (m, (Map.Entry e) -> Long.valueOf(e.getKey().longValue() + e.getValue().longValue()), - (Long x) -> adder.add(x.longValue())).invoke(); - assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2); - adder.reset(); - - Long r; long lr; int ir; double dr; - r = ConcurrentHashMap.ForkJoinTasks.reduceKeys - (m, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())).invoke(); - assertEquals((long)r, (long)SIZE * (SIZE - 1) / 2); - r = ConcurrentHashMap.ForkJoinTasks.reduceValues - (m, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())).invoke(); - assertEquals((long)r, (long)SIZE * (SIZE - 1)); - r = ConcurrentHashMap.ForkJoinTasks.reduce - (m, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()), - (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())).invoke(); - assertEquals((long)r, (long)3 * SIZE * (SIZE - 1) / 2); - r = ConcurrentHashMap.ForkJoinTasks.reduceEntries - (m, (Map.Entry e) -> Long.valueOf(e.getKey().longValue() + e.getValue().longValue()), - (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())).invoke(); - assertEquals((long)r, (long)3 * SIZE * (SIZE - 1) / 2); - r = ConcurrentHashMap.ForkJoinTasks.reduceKeys - (m, (Long x) -> Long.valueOf(4 * x.longValue()), - (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())).invoke(); - assertEquals((long)r, (long)4 * SIZE * (SIZE - 1) / 2); - lr = ConcurrentHashMap.ForkJoinTasks.reduceKeysToLong - (m, (Long x) -> x.longValue(), 0L, Long::sum).invoke(); - assertEquals(lr, (long)SIZE * (SIZE - 1) / 2); - ir = ConcurrentHashMap.ForkJoinTasks.reduceKeysToInt - (m, (Long x) -> x.intValue(), 0, Integer::sum).invoke(); - assertEquals(ir, (int)SIZE * (SIZE - 1) / 2); - dr = ConcurrentHashMap.ForkJoinTasks.reduceKeysToDouble - (m, (Long x) -> x.doubleValue(), 0.0, Double::sum).invoke(); - assertEquals(dr, (double)SIZE * (SIZE - 1) / 2); - r = ConcurrentHashMap.ForkJoinTasks.reduceValues - (m, (Long x) -> Long.valueOf(4 * x.longValue()), - (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue())).invoke(); - assertEquals((long)r, (long)4 * SIZE * (SIZE - 1)); - lr = ConcurrentHashMap.ForkJoinTasks.reduceValuesToLong - (m, (Long x) -> x.longValue(), 0L, Long::sum).invoke(); - assertEquals(lr, (long)SIZE * (SIZE - 1)); - ir = ConcurrentHashMap.ForkJoinTasks.reduceValuesToInt - (m, (Long x) -> x.intValue(), 0, Integer::sum).invoke(); - assertEquals(ir, (int)SIZE * (SIZE - 1)); - dr = ConcurrentHashMap.ForkJoinTasks.reduceValuesToDouble - (m, (Long x) -> x.doubleValue(), 0.0, Double::sum).invoke(); - assertEquals(dr, (double)SIZE * (SIZE - 1)); - r = ConcurrentHashMap.ForkJoinTasks.searchKeys - (m, (Long x) -> x.longValue() == (long)(SIZE/2)? x : null).invoke(); - assertEquals((long)r, (long)(SIZE/2)); - r = ConcurrentHashMap.ForkJoinTasks.searchValues - (m, (Long x) -> x.longValue() == (long)(SIZE/2)? x : null).invoke(); - assertEquals((long)r, (long)(SIZE/2)); - r = ConcurrentHashMap.ForkJoinTasks.search - (m, (Long x, Long y) -> x.longValue() == (long)(SIZE/2)? x : null).invoke(); - assertEquals((long)r, (long)(SIZE/2)); - r = ConcurrentHashMap.ForkJoinTasks.searchEntries - (m, (Map.Entry e) -> e.getKey().longValue() == (long)(SIZE/2)? e.getKey() : null).invoke(); - assertEquals((long)r, (long)(SIZE/2)); - } + * Tests performance of computeIfAbsent when the element is present. + * See JDK-8161372 + * ant -Djsr166.tckTestClass=ConcurrentHashMapTest -Djsr166.methodFilter=testcomputeIfAbsent_performance -Djsr166.expensiveTests=true tck + */ + public void testcomputeIfAbsent_performance() { + final int mapSize = 20; + final int iterations = expensiveTests ? (1 << 23) : mapSize * 2; + final int threads = expensiveTests ? 10 : 2; + final ConcurrentHashMap map = new ConcurrentHashMap<>(); + for (int i = 0; i < mapSize; i++) { + Item I = itemFor(i); + map.put(I, I); + } + final ExecutorService pool = Executors.newFixedThreadPool(2); + try (PoolCleaner cleaner = cleaner(pool)) { + Runnable r = new CheckedRunnable() { + public void realRun() { + int result = 0; + for (int i = 0; i < iterations; i++) + result += map.computeIfAbsent(itemFor(i % mapSize), k -> itemFor(k.value * 2)).value; + if (result == -42) throw new Error(); + }}; + for (int i = 0; i < threads; i++) + pool.execute(r); + } + } + }