--- jsr166/src/test/tck/ConcurrentHashMap8Test.java	2013/04/11 20:03:44	1.8
+++ jsr166/src/test/tck/ConcurrentHashMap8Test.java	2014/12/31 21:39:07	1.20
@@ -4,11 +4,26 @@
  * 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.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.Spliterator;
+import java.util.Vector;
 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) {
@@ -53,7 +68,7 @@ public class ConcurrentHashMap8Test exte
     }
 
     /**
-     * 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();
@@ -70,7 +85,7 @@ public class ConcurrentHashMap8Test exte
     }
 
     /**
-     * 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();
@@ -87,7 +102,7 @@ public class ConcurrentHashMap8Test exte
     }
 
     /**
-     * compute does not replace  if the function returns null
+     * compute does not replace if the function returns null
      */
     public void testCompute() {
         ConcurrentHashMap map = map5();
@@ -166,6 +181,19 @@ public class ConcurrentHashMap8Test exte
     }
 
     /**
+     * replaceAll replaces all matching values.
+     */
+    public void testReplaceAll() {
+        ConcurrentHashMap<Integer, String> map = map5();
+        map.replaceAll((x, y) -> { return x > 3 ? "Z" : y; });
+        assertEquals("A", map.get(one));
+        assertEquals("B", map.get(two));
+        assertEquals("C", map.get(three));
+        assertEquals("Z", map.get(four));
+        assertEquals("Z", map.get(five));
+    }
+
+    /**
      * Default-constructed set is empty
      */
     public void testNewKeySet() {
@@ -174,6 +202,29 @@ public class ConcurrentHashMap8Test exte
     }
 
     /**
+     * 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(true);
+        set2.add(six);
+        assertTrue(((ConcurrentHashMap.KeySetView)set2).getMap() == map);
+        assertTrue(((ConcurrentHashMap.KeySetView)set1).getMap() == map);
+        assertEquals(set2.size(), map.size());
+        assertEquals(set1.size(), map.size());
+        assertTrue((Boolean)map.get(six));
+        assertTrue(set1.contains(six));
+        assertTrue(set2.contains(six));
+        set2.remove(six);
+        assertNull(map.get(six));
+        assertFalse(set1.contains(six));
+        assertFalse(set2.contains(six));
+    }
+
+
+    /**
      * keySet.addAll adds each element from the given collection
      */
     public void testAddAll() {
@@ -219,6 +270,74 @@ public class ConcurrentHashMap8Test exte
     }
 
     /**
+     * keySet.add throws UnsupportedOperationException if no default
+     * mapped value
+     */
+    public void testAdd4() {
+        Set full = map5().keySet();
+        try {
+            full.add(three);
+            shouldThrow();
+        } catch (UnsupportedOperationException e){}
+    }
+
+    /**
+     * keySet.add throws NullPointerException if the specified key is
+     * null
+     */
+    public void testAdd5() {
+        Set full = populatedSet(3);
+        try {
+            full.add(null);
+            shouldThrow();
+        } catch (NullPointerException e){}
+    }
+
+    /**
+     * KeySetView.getMappedValue returns the map's mapped value
+     */
+    public void testGetMappedValue() {
+        ConcurrentHashMap map = map5();
+        assertNull(map.keySet().getMappedValue());
+        try {
+            map.keySet(null);
+            shouldThrow();
+        } catch (NullPointerException e) {}
+        ConcurrentHashMap.KeySetView set = map.keySet(one);
+        set.add(one);
+        set.add(six);
+        set.add(seven);
+        assertTrue(set.getMappedValue() == one);
+        assertTrue(map.get(one) != one);
+        assertTrue(map.get(six) == one);
+        assertTrue(map.get(seven) == one);
+    }
+
+    void checkSpliteratorCharacteristics(Spliterator<?> sp,
+                                         int requiredCharacteristics) {
+        assertEquals(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<Integer> sp = set.spliterator();
+        checkSpliteratorCharacteristics(sp, CONCURRENT | DISTINCT | NONNULL);
+        assertEquals(sp.estimateSize(), map.size());
+        Spliterator<Integer> sp2 = sp.trySplit();
+        sp.forEachRemaining((Integer x) -> adder.add(x.longValue()));
+        long v = adder.sumThenReset();
+        sp2.forEachRemaining((Integer x) -> adder.add(x.longValue()));
+        long v2 = adder.sum();
+        assertEquals(v + v2, 15);
+    }
+
+    /**
      * keyset.clear removes all elements from the set
      */
     public void testClear() {
@@ -431,15 +550,12 @@ public class ConcurrentHashMap8Test exte
         Set x = populatedSet(size);
         Set y = serialClone(x);
 
-        assertTrue(x != y);
+        assertNotSame(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);
     }
 
-
     static final int SIZE = 10000;
     static ConcurrentHashMap<Long, Long> longMap;
 
@@ -467,7 +583,7 @@ public class ConcurrentHashMap8Test exte
     public void testForEachKeySequentially() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> m = longMap();
-        m.forEachKeySequentially((Long x) -> adder.add(x.longValue()));
+        m.forEachKey(Long.MAX_VALUE, (Long x) -> adder.add(x.longValue()));
         assertEquals(adder.sum(), SIZE * (SIZE - 1) / 2);
     }
 
@@ -477,7 +593,7 @@ public class ConcurrentHashMap8Test exte
     public void testForEachValueSequentially() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> m = longMap();
-        m.forEachValueSequentially((Long x) -> adder.add(x.longValue()));
+        m.forEachValue(Long.MAX_VALUE, (Long x) -> adder.add(x.longValue()));
         assertEquals(adder.sum(), SIZE * (SIZE - 1));
     }
 
@@ -487,7 +603,7 @@ public class ConcurrentHashMap8Test exte
     public void testForEachSequentially() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> m = longMap();
-        m.forEachSequentially((Long x, Long y) -> adder.add(x.longValue() + y.longValue()));
+        m.forEach(Long.MAX_VALUE, (Long x, Long y) -> adder.add(x.longValue() + y.longValue()));
         assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2);
     }
 
@@ -497,7 +613,7 @@ public class ConcurrentHashMap8Test exte
     public void testForEachEntrySequentially() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> m = longMap();
-        m.forEachEntrySequentially((Map.Entry<Long,Long> e) -> adder.add(e.getKey().longValue() + e.getValue().longValue()));
+        m.forEachEntry(Long.MAX_VALUE, (Map.Entry<Long,Long> e) -> adder.add(e.getKey().longValue() + e.getValue().longValue()));
         assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2);
     }
 
@@ -507,7 +623,7 @@ public class ConcurrentHashMap8Test exte
     public void testForEachKeyInParallel() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> m = longMap();
-        m.forEachKeyInParallel((Long x) -> adder.add(x.longValue()));
+        m.forEachKey(1L, (Long x) -> adder.add(x.longValue()));
         assertEquals(adder.sum(), SIZE * (SIZE - 1) / 2);
     }
 
@@ -517,7 +633,7 @@ public class ConcurrentHashMap8Test exte
     public void testForEachValueInParallel() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> m = longMap();
-        m.forEachValueInParallel((Long x) -> adder.add(x.longValue()));
+        m.forEachValue(1L, (Long x) -> adder.add(x.longValue()));
         assertEquals(adder.sum(), SIZE * (SIZE - 1));
     }
 
@@ -527,7 +643,7 @@ public class ConcurrentHashMap8Test exte
     public void testForEachInParallel() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> m = longMap();
-        m.forEachInParallel((Long x, Long y) -> adder.add(x.longValue() + y.longValue()));
+        m.forEach(1L, (Long x, Long y) -> adder.add(x.longValue() + y.longValue()));
         assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2);
     }
 
@@ -537,7 +653,7 @@ public class ConcurrentHashMap8Test exte
     public void testForEachEntryInParallel() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> m = longMap();
-        m.forEachEntryInParallel((Map.Entry<Long,Long> e) -> adder.add(e.getKey().longValue() + e.getValue().longValue()));
+        m.forEachEntry(1L, (Map.Entry<Long,Long> e) -> adder.add(e.getKey().longValue() + e.getValue().longValue()));
         assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2);
     }
 
@@ -548,7 +664,7 @@ public class ConcurrentHashMap8Test exte
     public void testMappedForEachKeySequentially() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> 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);
     }
@@ -560,7 +676,7 @@ public class ConcurrentHashMap8Test exte
     public void testMappedForEachValueSequentially() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> 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));
     }
@@ -572,7 +688,7 @@ public class ConcurrentHashMap8Test exte
     public void testMappedForEachSequentially() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> 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);
     }
@@ -584,7 +700,7 @@ public class ConcurrentHashMap8Test exte
     public void testMappedForEachEntrySequentially() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> m = longMap();
-        m.forEachEntrySequentially((Map.Entry<Long,Long> e) -> Long.valueOf(e.getKey().longValue() + e.getValue().longValue()),
+        m.forEachEntry(Long.MAX_VALUE, (Map.Entry<Long,Long> e) -> Long.valueOf(e.getKey().longValue() + e.getValue().longValue()),
                                    (Long x) -> adder.add(x.longValue()));
         assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2);
     }
@@ -596,7 +712,7 @@ public class ConcurrentHashMap8Test exte
     public void testMappedForEachKeyInParallel() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> 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);
     }
@@ -608,7 +724,7 @@ public class ConcurrentHashMap8Test exte
     public void testMappedForEachValueInParallel() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> 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));
     }
@@ -620,7 +736,7 @@ public class ConcurrentHashMap8Test exte
     public void testMappedForEachInParallel() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> 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);
     }
@@ -632,19 +748,18 @@ public class ConcurrentHashMap8Test exte
     public void testMappedForEachEntryInParallel() {
         LongAdder adder = new LongAdder();
         ConcurrentHashMap<Long, Long> m = longMap();
-        m.forEachEntryInParallel((Map.Entry<Long,Long> e) -> Long.valueOf(e.getKey().longValue() + e.getValue().longValue()),
+        m.forEachEntry(1L, (Map.Entry<Long,Long> e) -> Long.valueOf(e.getKey().longValue() + e.getValue().longValue()),
                                  (Long x) -> adder.add(x.longValue()));
         assertEquals(adder.sum(), 3 * SIZE * (SIZE - 1) / 2);
     }
 
-
     /**
      * reduceKeysSequentially accumulates across all keys,
      */
     public void testReduceKeysSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.reduceKeysSequentially((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()));
+        r = m.reduceKeys(Long.MAX_VALUE, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()));
         assertEquals((long)r, (long)SIZE * (SIZE - 1) / 2);
     }
 
@@ -654,18 +769,17 @@ public class ConcurrentHashMap8Test exte
     public void testReduceValuesSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.reduceKeysSequentially((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()));
+        r = m.reduceKeys(Long.MAX_VALUE, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()));
         assertEquals((long)r, (long)SIZE * (SIZE - 1) / 2);
     }
 
-
     /**
      * reduceEntriesSequentially accumulates across all entries
      */
     public void testReduceEntriesSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Map.Entry<Long,Long> r;
-        r = m.reduceEntriesSequentially(new AddKeys());
+        r = m.reduceEntries(Long.MAX_VALUE, new AddKeys());
         assertEquals(r.getKey().longValue(), (long)SIZE * (SIZE - 1) / 2);
     }
 
@@ -675,7 +789,7 @@ public class ConcurrentHashMap8Test exte
     public void testReduceKeysInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.reduceKeysInParallel((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()));
+        r = m.reduceKeys(1L, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()));
         assertEquals((long)r, (long)SIZE * (SIZE - 1) / 2);
     }
 
@@ -685,7 +799,7 @@ public class ConcurrentHashMap8Test exte
     public void testReduceValuesInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.reduceValuesInParallel((Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()));
+        r = m.reduceValues(1L, (Long x, Long y) -> Long.valueOf(x.longValue() + y.longValue()));
         assertEquals((long)r, (long)SIZE * (SIZE - 1));
     }
 
@@ -695,7 +809,7 @@ public class ConcurrentHashMap8Test exte
     public void testReduceEntriesInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Map.Entry<Long,Long> r;
-        r = m.reduceEntriesInParallel(new AddKeys());
+        r = m.reduceEntries(1L, new AddKeys());
         assertEquals(r.getKey().longValue(), (long)SIZE * (SIZE - 1) / 2);
     }
 
@@ -704,7 +818,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testMapReduceKeysSequentially() {
         ConcurrentHashMap<Long, Long> 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);
     }
@@ -714,7 +828,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testMapReduceValuesSequentially() {
         ConcurrentHashMap<Long, Long> 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));
     }
@@ -724,7 +838,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testMappedReduceSequentially() {
         ConcurrentHashMap<Long, Long> 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);
@@ -735,7 +849,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testMapReduceKeysInParallel() {
         ConcurrentHashMap<Long, Long> 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);
     }
@@ -745,7 +859,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testMapReduceValuesInParallel() {
         ConcurrentHashMap<Long, Long> 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));
     }
@@ -756,18 +870,17 @@ public class ConcurrentHashMap8Test exte
     public void testMappedReduceInParallel() {
         ConcurrentHashMap<Long, Long> 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);
     }
 
-
     /**
      * reduceKeysToLongSequentially accumulates mapped keys
      */
     public void testReduceKeysToLongSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        long lr = m.reduceKeysToLongSequentially((Long x) -> x.longValue(), 0L, Long::sum);
+        long lr = m.reduceKeysToLong(Long.MAX_VALUE, (Long x) -> x.longValue(), 0L, Long::sum);
         assertEquals(lr, (long)SIZE * (SIZE - 1) / 2);
     }
 
@@ -776,7 +889,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceKeysToIntSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        int ir = m.reduceKeysToIntSequentially((Long x) -> x.intValue(), 0, Integer::sum);
+        int ir = m.reduceKeysToInt(Long.MAX_VALUE, (Long x) -> x.intValue(), 0, Integer::sum);
         assertEquals(ir, SIZE * (SIZE - 1) / 2);
     }
 
@@ -785,7 +898,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceKeysToDoubleSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        double dr = m.reduceKeysToDoubleSequentially((Long x) -> x.doubleValue(), 0.0, Double::sum);
+        double dr = m.reduceKeysToDouble(Long.MAX_VALUE, (Long x) -> x.doubleValue(), 0.0, Double::sum);
         assertEquals(dr, (double)SIZE * (SIZE - 1) / 2);
     }
 
@@ -794,7 +907,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceValuesToLongSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        long lr = m.reduceValuesToLongSequentially((Long x) -> x.longValue(), 0L, Long::sum);
+        long lr = m.reduceValuesToLong(Long.MAX_VALUE, (Long x) -> x.longValue(), 0L, Long::sum);
         assertEquals(lr, (long)SIZE * (SIZE - 1));
     }
 
@@ -803,7 +916,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceValuesToIntSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        int ir = m.reduceValuesToIntSequentially((Long x) -> x.intValue(), 0, Integer::sum);
+        int ir = m.reduceValuesToInt(Long.MAX_VALUE, (Long x) -> x.intValue(), 0, Integer::sum);
         assertEquals(ir, SIZE * (SIZE - 1));
     }
 
@@ -812,7 +925,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceValuesToDoubleSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        double dr = m.reduceValuesToDoubleSequentially((Long x) -> x.doubleValue(), 0.0, Double::sum);
+        double dr = m.reduceValuesToDouble(Long.MAX_VALUE, (Long x) -> x.doubleValue(), 0.0, Double::sum);
         assertEquals(dr, (double)SIZE * (SIZE - 1));
     }
 
@@ -821,7 +934,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceKeysToLongInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        long lr = m.reduceKeysToLongInParallel((Long x) -> x.longValue(), 0L, Long::sum);
+        long lr = m.reduceKeysToLong(1L, (Long x) -> x.longValue(), 0L, Long::sum);
         assertEquals(lr, (long)SIZE * (SIZE - 1) / 2);
     }
 
@@ -830,7 +943,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceKeysToIntInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        int ir = m.reduceKeysToIntInParallel((Long x) -> x.intValue(), 0, Integer::sum);
+        int ir = m.reduceKeysToInt(1L, (Long x) -> x.intValue(), 0, Integer::sum);
         assertEquals(ir, SIZE * (SIZE - 1) / 2);
     }
 
@@ -839,7 +952,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceKeysToDoubleInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        double dr = m.reduceKeysToDoubleInParallel((Long x) -> x.doubleValue(), 0.0, Double::sum);
+        double dr = m.reduceKeysToDouble(1L, (Long x) -> x.doubleValue(), 0.0, Double::sum);
         assertEquals(dr, (double)SIZE * (SIZE - 1) / 2);
     }
 
@@ -848,7 +961,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceValuesToLongInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        long lr = m.reduceValuesToLongInParallel((Long x) -> x.longValue(), 0L, Long::sum);
+        long lr = m.reduceValuesToLong(1L, (Long x) -> x.longValue(), 0L, Long::sum);
         assertEquals(lr, (long)SIZE * (SIZE - 1));
     }
 
@@ -857,7 +970,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceValuesToIntInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        int ir = m.reduceValuesToIntInParallel((Long x) -> x.intValue(), 0, Integer::sum);
+        int ir = m.reduceValuesToInt(1L, (Long x) -> x.intValue(), 0, Integer::sum);
         assertEquals(ir, SIZE * (SIZE - 1));
     }
 
@@ -866,7 +979,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReduceValuesToDoubleInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
-        double dr = m.reduceValuesToDoubleInParallel((Long x) -> x.doubleValue(), 0.0, Double::sum);
+        double dr = m.reduceValuesToDouble(1L, (Long x) -> x.doubleValue(), 0.0, Double::sum);
         assertEquals(dr, (double)SIZE * (SIZE - 1));
     }
 
@@ -877,9 +990,9 @@ public class ConcurrentHashMap8Test exte
     public void testSearchKeysSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.searchKeysSequentially((Long x) -> x.longValue() == (long)(SIZE/2) ? x : null);
+        r = m.searchKeys(Long.MAX_VALUE, (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() < 0L ? x : null);
         assertNull(r);
     }
 
@@ -890,9 +1003,11 @@ public class ConcurrentHashMap8Test exte
     public void testSearchValuesSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.searchValuesSequentially((Long x) -> x.longValue() == (long)(SIZE/2)? x : null);
+        r = m.searchValues(Long.MAX_VALUE,
+            (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() < 0L) ? x : null);
         assertNull(r);
     }
 
@@ -903,9 +1018,9 @@ public class ConcurrentHashMap8Test exte
     public void testSearchSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.searchSequentially((Long x, Long y) -> x.longValue() == (long)(SIZE/2) ? x : null);
+        r = m.search(Long.MAX_VALUE, (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() < 0L ? x : null);
         assertNull(r);
     }
 
@@ -916,9 +1031,9 @@ public class ConcurrentHashMap8Test exte
     public void testSearchEntriesSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.searchEntriesSequentially((Map.Entry<Long,Long> e) -> e.getKey().longValue() == (long)(SIZE/2) ? e.getKey() : null);
+        r = m.searchEntries(Long.MAX_VALUE, (Map.Entry<Long,Long> e) -> e.getKey().longValue() == (long)(SIZE/2) ? e.getKey() : null);
         assertEquals((long)r, (long)(SIZE/2));
-        r = m.searchEntriesSequentially((Map.Entry<Long,Long> e) -> e.getKey().longValue() < 0L ? e.getKey() : null);
+        r = m.searchEntries(Long.MAX_VALUE, (Map.Entry<Long,Long> e) -> e.getKey().longValue() < 0L ? e.getKey() : null);
         assertNull(r);
     }
 
@@ -929,9 +1044,9 @@ public class ConcurrentHashMap8Test exte
     public void testSearchKeysInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.searchKeysInParallel((Long x) -> x.longValue() == (long)(SIZE/2) ? x : null);
+        r = m.searchKeys(1L, (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() < 0L ? x : null);
         assertNull(r);
     }
 
@@ -942,9 +1057,9 @@ public class ConcurrentHashMap8Test exte
     public void testSearchValuesInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.searchValuesInParallel((Long x) -> x.longValue() == (long)(SIZE/2) ? x : null);
+        r = m.searchValues(1L, (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() < 0L ? x : null);
         assertNull(r);
     }
 
@@ -955,9 +1070,9 @@ public class ConcurrentHashMap8Test exte
     public void testSearchInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.searchInParallel((Long x, Long y) -> x.longValue() == (long)(SIZE/2) ? x : null);
+        r = m.search(1L, (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() < 0L ? x : null);
         assertNull(r);
     }
 
@@ -968,109 +1083,10 @@ public class ConcurrentHashMap8Test exte
     public void testSearchEntriesInParallel() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.searchEntriesInParallel((Map.Entry<Long,Long> e) -> e.getKey().longValue() == (long)(SIZE/2) ? e.getKey() : null);
+        r = m.searchEntries(1L, (Map.Entry<Long,Long> e) -> e.getKey().longValue() == (long)(SIZE/2) ? e.getKey() : null);
         assertEquals((long)r, (long)(SIZE/2));
-        r = m.searchEntriesInParallel((Map.Entry<Long,Long> e) -> e.getKey().longValue() < 0L ? e.getKey() : null);
+        r = m.searchEntries(1L, (Map.Entry<Long,Long> 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<Long, Long> 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<Long,Long> 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<Long,Long> 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<Long,Long> 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, 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, 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<Long,Long> e) -> e.getKey().longValue() == (long)(SIZE/2)? e.getKey() : null).invoke();
-        assertEquals((long)r, (long)(SIZE/2));
-    }
 }