Improves unit test coverage.

Author: brianburton

src/main/java/org/javimmutable/collections/btree_list/JImmutableBtreeList.java

@@ -190,7 +190,7 @@ public JImmutableBtreeList<T> insert(int index,
 
     @Nonnull
     @Override
-    public JImmutableList<T> getInsertableSelf()
+    public JImmutableBtreeList<T> getInsertableSelf()
     {
         return this;
     }
@@ -355,9 +355,9 @@ public T get(int index)
 
     @Nonnull
     @Override
-    public JImmutableRandomAccessList<T> insert(@Nonnull Iterable<? extends T> values)
+    public JImmutableBtreeList<T> insert(@Nonnull Iterable<? extends T> values)
     {
-        JImmutableRandomAccessList<T> answer = this;
+        JImmutableBtreeList<T> answer = this;
         for (T value : values) {
             answer = answer.insertLast(value);
         }

src/main/java/org/javimmutable/collections/indexed/IndexedList.java

@@ -43,7 +43,7 @@
 
 @Immutable
 public class IndexedList<T>
-        implements Indexed<T>
+    implements Indexed<T>
 {
     private final List<? extends T> values;
 
@@ -56,10 +56,6 @@ private IndexedList(List<? extends T> values)
      * Produces an instance using a copy of the specified List to ensure that changes to the List
      * will not influence the values returned by the instance's methods.  This is generally preferred
      * to the unsafe() constructor.
-     *
-     * @param values
-     * @param <T>
-     * @return
      */
     public static <T> IndexedList<T> copied(List<? extends T> values)
     {
@@ -71,10 +67,6 @@ public static <T> IndexedList<T> copied(List<? extends T> values)
      * changes to the List will cause changes to this instance's values.  However this can be useful
      * when performance is important and the instance will not be shared or retained beyond a single
      * method scope.
-     *
-     * @param values
-     * @param <T>
-     * @return
      */
     public static <T> IndexedList<T> retained(List<? extends T> values)
     {

src/main/java/org/javimmutable/collections/listmap/AbstractJImmutableListMap.java

@@ -219,7 +219,6 @@ protected void checkListMapInvariants()
         for (JImmutableMap.Entry<K, JImmutableList<V>> entry : contents) {
             entry.getValue().checkInvariants();
         }
-        //TODO: review checkListMapInvariants()
     }
 
     /**

src/test/java/org/javimmutable/collections/listmap/AbstractJImmutableListMapTestTestCase.java renamed to src/test/java/org/javimmutable/collections/listmap/AbstractJImmutableListMapTestCase.java

@@ -40,13 +40,18 @@
 import org.javimmutable.collections.JImmutableList;
 import org.javimmutable.collections.JImmutableListMap;
 import org.javimmutable.collections.MapEntry;
+import org.javimmutable.collections.cursors.StandardCursor;
 import org.javimmutable.collections.cursors.StandardCursorTest;
+import org.javimmutable.collections.indexed.IndexedList;
 import org.javimmutable.collections.list.JImmutableArrayList;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
-public abstract class AbstractJImmutableListMapTestTestCase
+import static com.google.common.primitives.Ints.asList;
+
+public abstract class AbstractJImmutableListMapTestCase
     extends TestCase
 {
     public JImmutableListMap<Integer, Integer> verifyOperations(JImmutableListMap<Integer, Integer> map)
@@ -81,6 +86,7 @@ public JImmutableListMap<Integer, Integer> verifyOperations(JImmutableListMap<In
         assertEquals(Arrays.asList(87), map.getList(3).getList());
         assertSame(map.getList(3), map.get(3));
 
+        JImmutableListMap<Integer, Integer> preInsertMap = map;
         map = map.assign(3, JImmutableArrayList.<Integer>of().insert(300).insert(7).insert(7).insert(14));
         assertFalse(map.isEmpty());
         assertEquals(3, map.size());
@@ -91,6 +97,16 @@ public JImmutableListMap<Integer, Integer> verifyOperations(JImmutableListMap<In
         assertEquals(Arrays.asList(300, 7, 7, 14), map.getList(3).getList());
         assertSame(map.getList(3), map.get(3));
 
+        preInsertMap = preInsertMap.delete(3);
+        final List<Integer> insertValuesList = asList(300, 7, 7, 14);
+        assertEquals(map, preInsertMap.insertAll(3, insertValuesList));
+        assertEquals(map, preInsertMap.insertAll(3, insertValuesList.iterator()));
+        assertEquals(map, preInsertMap.insertAll(3, StandardCursor.of(IndexedList.retained(insertValuesList))));
+
+        assertEquals(map.delete(1).delete(3), map.deleteAll(asList(3, 1)));
+        assertEquals(map.delete(1).delete(3), map.deleteAll(asList(3, 1).iterator()));
+        assertEquals(map.delete(1).delete(3), map.deleteAll(StandardCursor.of(IndexedList.retained(asList(3, 1)))));
+        
         final JImmutableList<Integer> defaultValue = JImmutableArrayList.<Integer>of().insert(17);
         assertTrue(map.find(8).isEmpty());
         assertNull(map.get(8));

src/test/java/org/javimmutable/collections/listmap/JImmutableHashListMapTest.java

@@ -45,7 +45,7 @@
 import static java.util.stream.Collectors.toList;
 
 public class JImmutableHashListMapTest
-    extends AbstractJImmutableListMapTestTestCase
+    extends AbstractJImmutableListMapTestCase
 {
     @SuppressWarnings("unchecked")
     public void test()

src/test/java/org/javimmutable/collections/listmap/JImmutableInsertOrderListMapTest.java

@@ -45,7 +45,7 @@
 import static java.util.stream.Collectors.toList;
 
 public class JImmutableInsertOrderListMapTest
-    extends AbstractJImmutableListMapTestTestCase
+    extends AbstractJImmutableListMapTestCase
 {
     @SuppressWarnings("unchecked")
     public void test()

src/test/java/org/javimmutable/collections/listmap/JImmutableTreeListMapTest.java

@@ -46,7 +46,7 @@
 import static java.util.stream.Collectors.toList;
 
 public class JImmutableTreeListMapTest
-    extends AbstractJImmutableListMapTestTestCase
+    extends AbstractJImmutableListMapTestCase
 {
     @SuppressWarnings("unchecked")
     public void testNormalOrder()

src/test/java/org/javimmutable/collections/setmap/AbstractJImmutableSetMapTestCase.java

@@ -57,6 +57,7 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public abstract class AbstractJImmutableSetMapTestCase
     extends TestCase
@@ -107,6 +108,7 @@ public JImmutableSetMap<Integer, Integer> verifyOperations(JImmutableSetMap<Inte
         assertSame(map.getSet(2), map.get(2));
         assertEquals(new HashSet<>(Arrays.asList(300, 7, 14)), map.getSet(3).getSet());
         assertSame(map.getSet(3), map.get(3));
+        assertEquals(map.getSet(3), map.values(3).stream().collect(Collectors.toSet()));
 
         final JImmutableSet<Integer> defaultValue = JImmutableHashSet.<Integer>of().insert(17);
         assertTrue(map.find(8).isEmpty());