--- jsr166/src/test/tck/ConcurrentHashMap8Test.java	2017/03/18 20:42:20	1.34
+++ jsr166/src/test/tck/ConcurrentHashMap8Test.java	2018/05/28 21:36:41	1.37
@@ -173,8 +173,8 @@ public class ConcurrentHashMap8Test exte
     static Set populatedSet(Integer[] elements) {
         Set<Integer> a = ConcurrentHashMap.<Integer>newKeySet();
         assertTrue(a.isEmpty());
-        for (int i = 0; i < elements.length; i++)
-            assertTrue(a.add(elements[i]));
+        for (Integer element : elements)
+            assertTrue(a.add(element));
         assertFalse(a.isEmpty());
         assertEquals(elements.length, a.size());
         return a;
@@ -185,7 +185,7 @@ public class ConcurrentHashMap8Test exte
      */
     public void testReplaceAll() {
         ConcurrentHashMap<Integer, String> map = map5();
-        map.replaceAll((x, y) -> { return x > 3 ? "Z" : y; });
+        map.replaceAll((x, y) -> (x > 3) ? "Z" : y);
         assertEquals("A", map.get(one));
         assertEquals("B", map.get(two));
         assertEquals("C", map.get(three));
@@ -543,7 +543,7 @@ public class ConcurrentHashMap8Test exte
     }
 
     /**
-     * A deserialized serialized set is equal
+     * A deserialized/reserialized set equals original
      */
     public void testSerialization() throws Exception {
         int size = 20;