Fixes set and list maps not reading empty set/list from ObjectInputStream.

brianburton · brianburton · commit 93a36dc938b2 · 2017-12-04T20:11:56.000-05:00
diff --git a/src/main/java/org/javimmutable/collections/serialization/AbstractJImmutableListMapProxy.java b/src/main/java/org/javimmutable/collections/serialization/AbstractJImmutableListMapProxy.java
@@ -51,7 +51,7 @@ abstract class AbstractJImmutableListMapProxy
 {
     private static final int MAP_VERSION = 1001;
     private static final long serialVersionUID = -121805;
-    
+
     protected JImmutableListMap map;
 
     protected AbstractJImmutableListMapProxy(JImmutableListMap map)
@@ -91,13 +91,11 @@ public void readExternal(ObjectInput in)
         for (int i = 0; i < size; ++i) {
             final Object key = in.readObject();
             final int listSize = in.readInt();
-            if (listSize > 0) {
-                JImmutableList values = map.getList(key);
-                for (int k = 0; k < listSize; ++k) {
-                    values = values.insertLast(in.readObject());
-                }
-                map = map.assign(key, values);
+            JImmutableList values = map.getList(key);
+            for (int k = 0; k < listSize; ++k) {
+                values = values.insertLast(in.readObject());
             }
+            map = map.assign(key, values);
         }
     }
 
diff --git a/src/main/java/org/javimmutable/collections/serialization/AbstractJImmutableSetMapProxy.java b/src/main/java/org/javimmutable/collections/serialization/AbstractJImmutableSetMapProxy.java
@@ -90,14 +90,12 @@ public void readExternal(ObjectInput in)
         final int size = in.readInt();
         for (int i = 0; i < size; ++i) {
             final Object key = in.readObject();
+            JImmutableSet values = map.getSet(key);
             final int listSize = in.readInt();
-            if (listSize > 0) {
-                JImmutableSet values = map.getSet(key);
-                for (int k = 0; k < listSize; ++k) {
-                    values = values.insert(in.readObject());
-                }
-                map = map.assign(key, values);
+            for (int k = 0; k < listSize; ++k) {
+                values = values.insert(in.readObject());
             }
+            map = map.assign(key, values);
         }
     }
 
diff --git a/src/test/java/org/javimmutable/collections/listmap/JImmutableHashListMapTest.java b/src/test/java/org/javimmutable/collections/listmap/JImmutableHashListMapTest.java
@@ -116,5 +116,7 @@ public void testSerialization()
                                                      "H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszvDJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLyjkYGJhfMjAwMJYwMDqWs0BZiRUAkA8i9MsAAAA=");
         StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),
                                                      "H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszvDJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLyjkYGJhfMgCJEgZGx3IWIIsRyEosZKhjYIFzk4A4Cs5LrgAA5hv43egAAAA=");
+        StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").transform("A", l -> l.deleteLast()),
+                                                     "H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszvDJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLyjkYGJhfMjAwMJUwMDqWswBZDEBWEpjFCGQ5VQAAnoUVPdUAAAA=");
     }
 }
diff --git a/src/test/java/org/javimmutable/collections/listmap/JImmutableInsertOrderListMapTest.java b/src/test/java/org/javimmutable/collections/listmap/JImmutableInsertOrderListMapTest.java
@@ -109,5 +109,7 @@ public void testSerialization()
                                                      "H4sIAAAAAAAAAFvzloG1uIjBJ78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFvlkFpf4JhYEFOVXVP4HgX8qxjwMDBVFDJ4kGO2YVFxSlJhcgrACl7kF5RwMDMwvGRgYGEsYGB3LWaCsxAoAf4hpPdIAAAA=");
         StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),
                                                      "H4sIAAAAAAAAAFvzloG1uIjBJ78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFvlkFpf4JhYEFOVXVP4HgX8qxjwMDBVFDJ4kGO2YVFxSlJhcgrACl7kF5RwMDMwvGYBECQOjYzkLkMUIZCUWMtQxsMC5SUAcBeclVwAAS4EY5e8AAAA=");
+        StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").transform("A", l -> l.deleteLast()),
+                                                     "H4sIAAAAAAAAAFvzloG1uIjBJ78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFvlkFpf4JhYEFOVXVP4HgX8qxjwMDBVFDJ4kGO2YVFxSlJhcgrACl7kF5RwMDMwvGRgYmEoYGB3LWYAsBiArCcxiBLKcKgAHurrU3AAAAA==");
     }
 }
diff --git a/src/test/java/org/javimmutable/collections/listmap/JImmutableTreeListMapTest.java b/src/test/java/org/javimmutable/collections/listmap/JImmutableTreeListMapTest.java
@@ -126,14 +126,18 @@ public void testSerialization()
                                                      "H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCilKTfXJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLylkYGJhfAt1shtf8EqDb9JzzcwsSi0ByUFZJfhHMMCaYYQyMJQyMjnBWYgUArB9/AxQBAAA=");
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTreeListMapTest::extraSerializationChecks, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),
                                                      "H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCilKTfXJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLylkYGJhfAt1shtf8EqDb9JzzcwsSi0ByUFZJfhHMMCaYYQzMJQyMjmAWI5CVCMRRcF5yIUMdAxucm1QBANqG5HMxAQAA");
-
+        StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").transform("A", l -> l.deleteLast()),
+                                                     "H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCilKTfXJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLylkYGJhfAt1shtf8EqDb9JzzcwsSi0ByUFZJfhHMMCaYYQxMJQyMjmAWA5CVBGYxAllOFQAZR+CMHgEAAA==");
+                                      
         empty = JImmutableTreeListMap.of(String.CASE_INSENSITIVE_ORDER);
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTreeListMapTest::extraSerializationChecks, empty,
                                                      "H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCilKTfXJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLylkYGJhfAt2sBTQ7US8nMS9dL7ikKDMvXcU5sTjVM684Na84sySzLNU5P7cgsSixJL+onDmmNibg6TkmmAFAGgAG1XVw+gAAAA==");
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTreeListMapTest::extraSerializationChecks, empty.insert(MapEntry.of("A", "a")),
                                                      "H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCilKTfXJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLylkYGJhfAt2sBTQ7US8nMS9dL7ikKDMvXcU5sTjVM684Na84sySzLNU5P7cgsSixJL+onDmmNibg6TkmmAEMjCUMjI5wVmIFAAOWtngIAQAA");
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTreeListMapTest::extraSerializationChecks, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),
                                                      "H4sIAAAAAAAAAJWOMQrCQBBFx2g6j2FlsY0nkGARURC0kjSTsISVzW6cHTUKeiLP4i0sLLyCulGClYUDH/7/DI9/vkPoCEaWcrHCrSqKDWOqpcis1jJjZY0TTpJCrQ5YRzGOm6cFSTlRjqdYzshW+2d9j96gC1ARxH8wh6ljwoy/7F/cctcBaN/85r5no9BocjFnUibvRehkbJw0TrHaysgWJRKypV07OSaz6yVoABAwtPDj1nCC0MfUa/muWt5l1Qs2SrO7GwEAAA==");
+        StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").transform("A", l -> l.deleteLast()),
+                                                     "H4sIAAAAAAAAAJXOMQrCUAyA4dTq5jE6ObzFE6g4VBQKOnZJSyhPXt8rebGtgjfyLN7CwcErqFUQJwcz/YHwkdMNBp5h7rhQW6x1We4EM0Mqd8ZQLtpZrzyxRqMP+FrVIv4cbZhoqb2ssErYtfvHa+7ReAjQMsR/mJPMC2MuX/uXWzV9gPDa/TzqbFQGbaHWwtoW0Qw9xdaT9Vp0TTNXVsgojpswPabJ5dz7ANATCCbvgq6ydwVdTdsnnHjDlRIBAAA=");
     }
 
     public static void extraSerializationChecks(Object a,
diff --git a/src/test/java/org/javimmutable/collections/setmap/JImmutableHashSetMapTest.java b/src/test/java/org/javimmutable/collections/setmap/JImmutableHashSetMapTest.java
@@ -97,5 +97,7 @@ public void testSerialization()
                                                      "H4sIAAAAAAAAAFvzloG1uIjBJb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszghOLfFNLAgoyq+o/A8C/1SMeRgYKooYPEgw0jGpuKQoMbkEYTQOYwvKORgYmF8yMDAwljAwOpazQFmJFQCP8YNUyQAAAA==");
         StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),
                                                      "H4sIAAAAAAAAAFvzloG1uIjBJb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszghOLfFNLAgoyq+o/A8C/1SMeRgYKooYPEgw0jGpuKQoMbkEYTQOYwvKORgYmF8yAIkSBkbHchYgixHISixkqGNggXOTgDgKzkuuAADcYrsE5gAAAA==");
+        StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").delete("A", "a"),
+                                                     "H4sIAAAAAAAAAFvzloG1uIjBJb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszghOLfFNLAgoyq+o/A8C/1SMeRgYKooYPEgw0jGpuKQoMbkEYTQOYwvKORgYmF8yMDAwlTAwOpazAFkMQFYSmMUIZDlVAACPc8iU0wAAAA==");
     }
 }
diff --git a/src/test/java/org/javimmutable/collections/setmap/JImmutableInsertOrderSetMapTest.java b/src/test/java/org/javimmutable/collections/setmap/JImmutableInsertOrderSetMapTest.java
@@ -96,5 +96,7 @@ public void testSerialization()
                                                      "H4sIAAAAAAAAAFvzloG1uIjBO78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFgWnlvgmFgQU5VdU/geBfyrGPAwMFUUMHiSY7JhUXFKUmFyCsAGHsQXlHAwMzC8ZGBgYSxgYHctZoKzECgAGGrCE0AAAAA==");
         StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),
                                                      "H4sIAAAAAAAAAFvzloG1uIjBO78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFgWnlvgmFgQU5VdU/geBfyrGPAwMFUUMHiSY7JhUXFKUmFyCsAGHsQXlHAwMzC8ZgEQJA6NjOQuQxQhkJRYy1DGwwLlJQBwF5yVXAAA7ognH7QAAAA==");
+        StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").delete("A", "a"),
+                                                     "H4sIAAAAAAAAAFvzloG1uIjBO78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFgWnlvgmFgQU5VdU/geBfyrGPAwMFUUMHiSY7JhUXFKUmFyCsAGHsQXlHAwMzC8ZGBiYShgYHctZgCwGICsJzGIEspwqAKkZOpbaAAAA");
     }
 }
diff --git a/src/test/java/org/javimmutable/collections/setmap/JImmutableTemplateSetMapTest.java b/src/test/java/org/javimmutable/collections/setmap/JImmutableTemplateSetMapTest.java
@@ -128,14 +128,18 @@ public void testSerialization()
                                                      "H4sIAAAAAAAAAFvzloG1uIjBI78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCknNLchJLEkNTi3xTSwIKMqvqPwPAv9UjHkYGCpIM9YxqbikKDG5BGE8DmMLylkYGJhfAl3tSJ6ri1JTsTvXlSLn4nerGV6zS4Bu0nPOzy1ILALJQVkl+UUww5hghgFpinwODFSq+xybmTCfFzLUMbBBHQ6mGEsYGB3hrMQKAL1djtGCAgAA");
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTemplateSetMapTest::extraSerializationChecks, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),
                                                      "H4sIAAAAAAAAAFvzloG1uIjBI78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCknNLchJLEkNTi3xTSwIKMqvqPwPAv9UjHkYGCpIM9YxqbikKDG5BGE8DmMLylkYGJhfAl3tSJ6ri1JTsTvXlSLn4nerGV6zS4Bu0nPOzy1ILALJQVkl+UUww5hghgFpinwODFSq+xybmTCfFzLUMbBBHQ6mmEsYGB3BLEYgKxGIo+C8ZJBqXjg3qQIAfGkuEJ8CAAA=");
-
+        StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").delete("A", "a"),
+                                                     "H4sIAAAAAAAAAFvzloG1uIjBI78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCknNLchJLEkNTi3xTSwIKMqvqPwPAv9UjHkYGCpIM9YxqbikKDG5BGE8DmMLylkYGJhfAl3tSJ6ri1JTsTvXlSLn4nerGV6zS4Bu0nPOzy1ILALJQVkl+UUww5hghgFpinwODFSq+xybmTCfFzLUMbBBHQ6mmEoYGB0hAkBWEpjFCGQ5VQAA9oB1u4wCAAA=");
+                   
         empty = JImmutableTemplateSetMap.of(JImmutableTreeMap.of(String.CASE_INSENSITIVE_ORDER), JImmutableTreeSet.of(String.CASE_INSENSITIVE_ORDER));
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTemplateSetMapTest::extraSerializationChecks, empty,
                                                      "H4sIAAAAAAAAAFvzloG1uIjBI78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCknNLchJLEkNTi3xTSwIKMqvqPwPAv9UjHkYGCpIM9YxqbikKDG5BGE8DmMLylkYGJhfAl3tSJ6ri1JTsTvXlSLn4nerFtDcRL2cxLx0veCSosy8dBXnxOJUz7zi1LzizJLMslTn/NyCxKLEkvyicuaY2piAp+eYYAYAaYp8CwxIqvsWm5lQ3xYy1DGwQ90NpQAsnvP+ZwIAAA==");
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTemplateSetMapTest::extraSerializationChecks, empty.insert(MapEntry.of("A", "a")),
                                                      "H4sIAAAAAAAAAFvzloG1uIjBI78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCknNLchJLEkNTi3xTSwIKMqvqPwPAv9UjHkYGCpIM9YxqbikKDG5BGE8DmMLylkYGJhfAl3tSJ6ri1JTsTvXlSLn4nerFtDcRL2cxLx0veCSosy8dBXnxOJUz7zi1LzizJLMslTn/NyCxKLEkvyicuaY2piAp+eYYAYAaYp8CwxIqvsWm5lQ3xYy1DGwQ90NphhLGBgd4azECgDRzsyXdQIAAA==");
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTemplateSetMapTest::extraSerializationChecks, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),
                                                      "H4sIAAAAAAAAAFvzloG1uIjBI78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCknNLchJLEkNTi3xTSwIKMqvqPwPAv9UjHkYGCpIM9YxqbikKDG5BGE8DmMLylkYGJhfAl3tSJ6ri1JTsTvXlSLn4nerFtDcRL2cxLx0veCSosy8dBXnxOJUz7zi1LzizJLMslTn/NyCxKLEkvyicuaY2piAp+eYYAYAaYp8CwxIqvsWm5lQ3xYy1DGwQ90NpphKGBgTISyQHDeQmwTEUWAhRiAruQIAxZwVLIgCAAA=");
+        StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").delete("A", "a"),
+                                                     "H4sIAAAAAAAAAFvzloG1uIjBI78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCknNLchJLEkNTi3xTSwIKMqvqPwPAv9UjHkYGCpIM9YxqbikKDG5BGE8DmMLylkYGJhfAl3tSJ6ri1JTsTvXlSLn4nerFtDcRL2cxLx0veCSosy8dBXnxOJUz7zi1LzizJLMslTn/NyCxKLEkvyicuaY2piAp+eYYAYAaYp8CwxIqvsWm5lQ3xYy1DGwQ90NpphKGBgdIQJAVhKYxQhkOVUAACCf1c9/AgAA");
     }
 
     public static void extraSerializationChecks(Object a,
diff --git a/src/test/java/org/javimmutable/collections/setmap/JImmutableTreeSetMapTest.java b/src/test/java/org/javimmutable/collections/setmap/JImmutableTreeSetMapTest.java
@@ -111,14 +111,18 @@ public void testSerialization()
                                                      "H4sIAAAAAAAAAFvzloG1uIjBJb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCilKTQ1OLfFNLAgoyq+o/A8C/1SMeRgYKooYPEgw0jGpuKQoMbkEYTQOYwvKWRgYmF8CXWyG1/gSoMv0nPNzCxKLQHJQVkl+EcwwJphhDIwlDIyOcFZiBQDScJPFEgEAAA==");
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTreeSetMapTest::extraSerializationChecks, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),
                                                      "H4sIAAAAAAAAAFvzloG1uIjBJb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCilKTQ1OLfFNLAgoyq+o/A8C/1SMeRgYKooYPEgw0jGpuKQoMbkEYTQOYwvKWRgYmF8CXWyG1/gSoMv0nPNzCxKLQHJQVkl+EcwwJphhDMwlDIyOYBYjkJUIxFFwXnIhQx0DG5ybVAEAraHYsi8BAAA=");
-
+        StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").delete("A", "a"),
+                                                     "H4sIAAAAAAAAAFvzloG1uIjBJb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCilKTQ1OLfFNLAgoyq+o/A8C/1SMeRgYKooYPEgw0jGpuKQoMbkEYTQOYwvKWRgYmF8CXWyG1/gSoMv0nPNzCxKLQHJQVkl+EcwwJphhDEwlDIyOYBYDkJUEZjECWU4VANgmCJwcAQAA");
+                        
         empty = JImmutableTreeSetMap.of(String.CASE_INSENSITIVE_ORDER);
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTreeSetMapTest::extraSerializationChecks, empty,
                                                      "H4sIAAAAAAAAAFvzloG1uIjBJb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQpCilKTQ1OLfFNLAgoyq+o/A8C/1SMeRgYKooYPEgw0jGpuKQoMbkEYTQOYwvKWRgYmF8CXawFNDpRLycxL10vuKQoMy9dxTmxONUzrzg1rzizJLMs1Tk/tyCxKLEkv6icOaY2JuDpOSaYAUAaAHaXI874AAAA");
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTreeSetMapTest::extraSerializationChecks, empty.insert(MapEntry.of("A", "a")),
                                                      "H4sIAAAAAAAAAJXOMQrCQBAF0InRzmOkstjGEwQtjCAEtEwzCUNY2eyG2TFGwRt5Fm9hYeEV1FhEKwun+h8+jznfYeQZ5o5LtcVGV9VOMDekCmcMFaKd9coTazT6iO+qlkk/2jDRmmSFdcquPTzf94imY4CWYfEHGedeGAv50j/Yej8ECG/dx5OORmXQlmotrG0ZzdBTYj1Zr0U3NHNVjYzieB9mpyy9XgY9AIFAEH8Sti/Pq7ORBgEAAA==");
         StandardSerializableTests.verifySerializable(iteratorFactory, JImmutableTreeSetMapTest::extraSerializationChecks, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),
                                                      "H4sIAAAAAAAAAJWOPQrCQBCFJ/50HsPKYhtPIFoYQRC0kjSTMISVzW6cHTUKeiLP4i0sLLyCuipiZeHAg/cew8c7XqHpGQaOc7XAtS6KlWBqSGXOGMpEO+uVJ9Zo9A6fUY3iz9OMiaYkYywn7Krt/Xm3drcFUDEM/0D2Ui+MmXzRP7DlpgFQv4TFnYBGZdDmaiqsbd7uo6fYerJei15T3xUlMorjTT3ZJ5PzqfYBQE0gwrdbwgGaIaZB81cVBZdVD8vHREAZAQAA");
+        StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").delete("A", "a"),
+                                                     "H4sIAAAAAAAAAJXOMQrCUAyA4Wh18xidHN7iCbQOVhAKOrqkJZQnr++VvNhWwRt5Fm/h4OAV1CoUJwcz/YHwkfMdhp5h7jhXO6x0UewFU0Mqc8ZQJtpZrzyxRqOP+F7VMu6ONky0JllhmbBrDs/3PMLJCKBhWPxBTlMvjJl86R9sWQ8Aglv78bilURm0uVoLa5uHEXqKrSfrteiKIleUyCiO62B72ibXS78DoC/Qm34K2ko/1Wtr1rwAllzm9hABAAA=");
     }
 
     public static void extraSerializationChecks(Object a,
diff --git a/src/test/java/org/javimmutable/collections/stress_test/JImmutableSetMapStressTester.java b/src/test/java/org/javimmutable/collections/stress_test/JImmutableSetMapStressTester.java
@@ -107,7 +107,7 @@ public void execute(Random random,
             while (expected.size() < step.growthSize()) {
                 String key = keys.randomUnallocatedKey();
                 keys.allocate(key);
-                switch (random.nextInt(4) + 7) {
+                switch (random.nextInt(11)) {
                     case 0: { //assign(K, JSet)
                         JImmutableSet<String> values = makeGrowingSet(tokens, random);
                         setmap = setmap.assign(key, values);

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ abstract class AbstractJImmutableListMapProxy`
`51`	`51`	`{`
`52`	`52`	`private static final int MAP_VERSION = 1001;`
`53`	`53`	`private static final long serialVersionUID = -121805;`
`54`		`-`
	`54`	`+`
`55`	`55`	`protected JImmutableListMap map;`
`56`	`56`
`57`	`57`	`protected AbstractJImmutableListMapProxy(JImmutableListMap map)`
`@@ -91,13 +91,11 @@ public void readExternal(ObjectInput in)`
`91`	`91`	`for (int i = 0; i < size; ++i) {`
`92`	`92`	`final Object key = in.readObject();`
`93`	`93`	`final int listSize = in.readInt();`
`94`		`- if (listSize > 0) {`
`95`		`- JImmutableList values = map.getList(key);`
`96`		`- for (int k = 0; k < listSize; ++k) {`
`97`		`- values = values.insertLast(in.readObject());`
`98`		`- }`
`99`		`- map = map.assign(key, values);`
	`94`	`+ JImmutableList values = map.getList(key);`
	`95`	`+ for (int k = 0; k < listSize; ++k) {`
	`96`	`+ values = values.insertLast(in.readObject());`
`100`	`97`	`}`
	`98`	`+ map = map.assign(key, values);`
`101`	`99`	`}`
`102`	`100`	`}`
`103`	`101`
Original file line number	Diff line number	Diff line change
`@@ -90,14 +90,12 @@ public void readExternal(ObjectInput in)`
`90`	`90`	`final int size = in.readInt();`
`91`	`91`	`for (int i = 0; i < size; ++i) {`
`92`	`92`	`final Object key = in.readObject();`
	`93`	`+ JImmutableSet values = map.getSet(key);`
`93`	`94`	`final int listSize = in.readInt();`
`94`		`- if (listSize > 0) {`
`95`		`- JImmutableSet values = map.getSet(key);`
`96`		`- for (int k = 0; k < listSize; ++k) {`
`97`		`- values = values.insert(in.readObject());`
`98`		`- }`
`99`		`- map = map.assign(key, values);`
	`95`	`+ for (int k = 0; k < listSize; ++k) {`
	`96`	`+ values = values.insert(in.readObject());`
`100`	`97`	`}`
	`98`	`+ map = map.assign(key, values);`
`101`	`99`	`}`
`102`	`100`	`}`
`103`	`101`
Original file line number	Diff line number	Diff line change
`@@ -116,5 +116,7 @@ public void testSerialization()`
`116`	`116`	`"H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszvDJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLyjkYGJhfMjAwMJYwMDqWs0BZiRUAkA8i9MsAAAA=");`
`117`	`117`	`StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),`
`118`	`118`	`"H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszvDJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLyjkYGJhfMgCJEgZGx3IWIIsRyEosZKhjYIFzk4A4Cs5LrgAA5hv43egAAAA=");`
	`119`	`+ StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").transform("A", l -> l.deleteLast()),`
	`120`	`+ "H4sIAAAAAAAAAFvzloG1uIjBNb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszvDJLC7xTSwIKMqvqPwPAv9UjHkYGCqKGDxJMNMxqbikKDG5BGE2LnMLyjkYGJhfMjAwMJUwMDqWswBZDEBWEpjFCGQ5VQAAnoUVPdUAAAA=");`
`119`	`121`	`}`
`120`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,5 +109,7 @@ public void testSerialization()`
`109`	`109`	`"H4sIAAAAAAAAAFvzloG1uIjBJ78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFvlkFpf4JhYEFOVXVP4HgX8qxjwMDBVFDJ4kGO2YVFxSlJhcgrACl7kF5RwMDMwvGRgYGEsYGB3LWaCsxAoAf4hpPdIAAAA=");`
`110`	`110`	`StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),`
`111`	`111`	`"H4sIAAAAAAAAAFvzloG1uIjBJ78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFvlkFpf4JhYEFOVXVP4HgX8qxjwMDBVFDJ4kGO2YVFxSlJhcgrACl7kF5RwMDMwvGYBECQOjYzkLkMUIZCUWMtQxsMC5SUAcBeclVwAAS4EY5e8AAAA=");`
	`112`	`+ StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").transform("A", l -> l.deleteLast()),`
	`113`	`+ "H4sIAAAAAAAAAFvzloG1uIjBJ78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFvlkFpf4JhYEFOVXVP4HgX8qxjwMDBVFDJ4kGO2YVFxSlJhcgrACl7kF5RwMDMwvGRgYmEoYGB3LWYAsBiArCcxiBLKcKgAHurrU3AAAAA==");`
`112`	`114`	`}`
`113`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,5 +97,7 @@ public void testSerialization()`
`97`	`97`	`"H4sIAAAAAAAAAFvzloG1uIjBJb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszghOLfFNLAgoyq+o/A8C/1SMeRgYKooYPEgw0jGpuKQoMbkEYTQOYwvKORgYmF8yMDAwljAwOpazQFmJFQCP8YNUyQAAAA==");`
`98`	`98`	`StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),`
`99`	`99`	`"H4sIAAAAAAAAAFvzloG1uIjBJb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszghOLfFNLAgoyq+o/A8C/1SMeRgYKooYPEgw0jGpuKQoMbkEYTQOYwvKORgYmF8yAIkSBkbHchYgixHISixkqGNggXOTgDgKzkuuAADcYrsE5gAAAA==");`
	`100`	`+ StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").delete("A", "a"),`
	`101`	`+ "H4sIAAAAAAAAAFvzloG1uIjBJb8oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8kgszghOLfFNLAgoyq+o/A8C/1SMeRgYKooYPEgw0jGpuKQoMbkEYTQOYwvKORgYmF8yMDAwlTAwOpazAFkMQFYSmMUIZDlVAACPc8iU0wAAAA==");`
`100`	`102`	`}`
`101`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,5 +96,7 @@ public void testSerialization()`
`96`	`96`	`"H4sIAAAAAAAAAFvzloG1uIjBO78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFgWnlvgmFgQU5VdU/geBfyrGPAwMFUUMHiSY7JhUXFKUmFyCsAGHsQXlHAwMzC8ZGBgYSxgYHctZoKzECgAGGrCE0AAAAA==");`
`97`	`97`	`StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insertAll(asList(MapEntry.of("A", "a"), MapEntry.of("a", "b"), MapEntry.of("Z", "c"))),`
`98`	`98`	`"H4sIAAAAAAAAAFvzloG1uIjBO78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFgWnlvgmFgQU5VdU/geBfyrGPAwMFUUMHiSY7JhUXFKUmFyCsAGHsQXlHAwMzC8ZgEQJA6NjOQuQxQhkJRYy1DGwwLlJQBwF5yVXAAA7ognH7QAAAA==");`
	`99`	`+ StandardSerializableTests.verifySerializable(iteratorFactory, null, empty.insert("A", "a").insert("b", "B").delete("A", "a"),`
	`100`	`+ "H4sIAAAAAAAAAFvzloG1uIjBO78oXS8rsSwzN7e0JDEpJ1UvOT8nJzW5JDM/r1ivOLUoMzEnsyoRxNXz8oQp8swDypT4F6WkFgWnlvgmFgQU5VdU/geBfyrGPAwMFUUMHiSY7JhUXFKUmFyCsAGHsQXlHAwMzC8ZGBiYShgYHctZgCwGICsJzGIEspwqAKkZOpbaAAAA");`
`99`	`101`	`}`
`100`	`102`	`}`