Fix entrySet.remove

Author: vlsi

core/src/main/java/vlsi/utils/CompactHashMapClass.java

@@ -312,7 +312,10 @@ public boolean contains(Object o) {
 
         @Override
         public boolean remove(Object o) {
-            return map.remove(o) != null; // TODO: support null as "previous" value
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry<K, V> e = (Map.Entry<K, V>) o;
+            return map.remove(e.getKey()) != null; // TODO: support "return true" when value was null
         }
 
         @Override

core/src/test/java/vlsi/utils/CompactHashMapClassTest.java

@@ -24,6 +24,7 @@
 import org.testng.annotations.Test;
 
 import java.io.*;
+import java.util.Map;
 
 public class CompactHashMapClassTest {
     @BeforeMethod
@@ -227,4 +228,24 @@ public void deleteNullWorks() {
         Assert.assertEquals(map.size(), 0);
         Assert.assertEquals(map.get("k1"), null);
     }
+
+    @Test
+    public void deleteFromEntrySet() {
+        CompactHashMap<String, Object> map = new CompactHashMap<String, Object>();
+        map.put("k1", "v1");
+        Assert.assertTrue(map.entrySet().remove(new Map.Entry() {
+            public Object getKey() {
+                return "k1";
+            }
+
+            public Object getValue() {
+                return "v1";
+            }
+
+            public Object setValue(Object value) {
+                return null;
+            }
+        }), "entry was removed");
+        Assert.assertEquals(map.size(), 0);
+    }
 }