improves unit tests

Author: brianburton

src/test/java/org/javimmutable/collections/hash/JImmutableHashMapTest.java

@@ -243,6 +243,9 @@ public void testHashCollisions()
         JImmutableHashMap<ManualHashKey, String> map = JImmutableHashMap.of();
         map = map.assign(key1, "1").assign(key2, "2").assign(key3, "3");
         assertEquals(3, map.size());
+        assertEquals("1", map.get(key1));
+        assertEquals("2", map.get(key2));
+        assertEquals("3", map.get(key3));
         assertEquals("1", map.getValueOr(key1, "X"));
         assertEquals("2", map.getValueOr(key2, "X"));
         assertEquals("3", map.getValueOr(key3, "X"));
@@ -251,6 +254,9 @@ public void testHashCollisions()
         assertEquals("3", map.find(key3).getValueOr("X"));
         map = map.delete(key2);
         assertEquals(2, map.size());
+        assertEquals("1", map.get(key1));
+        assertEquals(null, map.get(key2));
+        assertEquals("3", map.get(key3));
         assertEquals("1", map.getValueOr(key1, "X"));
         assertEquals("X", map.getValueOr(key2, "X"));
         assertEquals("3", map.getValueOr(key3, "X"));
@@ -259,6 +265,9 @@ public void testHashCollisions()
         assertEquals("3", map.find(key3).getValueOr("X"));
         map = map.delete(key1);
         assertEquals(1, map.size());
+        assertEquals(null, map.get(key1));
+        assertEquals(null, map.get(key2));
+        assertEquals("3", map.get(key3));
         assertEquals("X", map.getValueOr(key1, "X"));
         assertEquals("X", map.getValueOr(key2, "X"));
         assertEquals("3", map.getValueOr(key3, "X"));
@@ -267,6 +276,9 @@ public void testHashCollisions()
         assertEquals("3", map.find(key3).getValueOr("X"));
         map = map.delete(key3);
         assertEquals(0, map.size());
+        assertEquals(null, map.get(key1));
+        assertEquals(null, map.get(key2));
+        assertEquals(null, map.get(key3));
         assertEquals("X", map.getValueOr(key1, "X"));
         assertEquals("X", map.getValueOr(key2, "X"));
         assertEquals("X", map.getValueOr(key3, "X"));

src/test/java/org/javimmutable/collections/tree/JImmutableTreeMapTest.java

@@ -171,13 +171,27 @@ public void testRandom2()
                     Integer value = random.nextInt(1000000);
                     expected.put(key, value);
                     map = add(map, key, value);
+                    assertEquals(expected.get(key), map.get(key));
+                    assertEquals(expected.get(key), map.getValueOr(key, -99));
+                    assertEquals(expected.get(key), map.find(key).getValue());
                 } else if (command == 2) {
                     Integer key = random.nextInt(maxKey);
                     expected.remove(key);
                     map = remove(map, key);
+                    assertEquals(null, map.get(key));
+                    assertEquals(Integer.valueOf(-99), map.getValueOr(key, -99));
+                    assertEquals(true, map.find(key).isEmpty());
                 } else {
                     Integer key = random.nextInt(maxKey);
-                    assertEquals(expected.get(key), map.find(key).getValueOrNull());
+                    if (expected.containsKey(key)) {
+                        assertEquals(expected.get(key), map.get(key));
+                        assertEquals(expected.get(key), map.getValueOr(key, -99));
+                        assertEquals(expected.get(key), map.find(key).getValue());
+                    } else {
+                        assertEquals(null, map.get(key));
+                        assertEquals(Integer.valueOf(-99), map.getValueOr(key, -99));
+                        assertEquals(true, map.find(key).isEmpty());
+                    }
                 }
                 assertEquals(expected.size(), map.size());
             }