done

src/main/java/org/zipcoder/store/ListMap.java

@@ -9,40 +9,65 @@ public class ListMap implements MyMap {
 
     @Override
     public int size() {
-        return -1;
+        return entries.size();
     }
 
     @Override
     public boolean isEmptry() {
+        if(this.size() == 0){ return true;}
         return false;
     }
 
     @Override
     public Cart get(User key) {
         // find the cart associate with the key
-        return null;
+        Cart result = null;
+        for (Entry e: entries){
+            if(e.getKey().equals(key)){
+                result = e.getValue();
+            }
+        }
+        return result;
     }
 
     @Override
     public void put(User key, Cart value) {
         // add the key, value entry to the entries list
+        Entry thing = new Entry(key, value);
+        entries.add(thing);
     }
 
 
     @Override
     public List<User> getKeys() {
         // get all the keys in the map
-        return null;
+        List<User> keys = new ArrayList<>();
+        for (Entry e: entries){
+            keys.add(e.getKey());
+        }
+        return keys;
     }
 
     @Override
     public List<Cart> getValues() {
         // get all the values in the map
-        return null;
+        List<Cart> values = new ArrayList<>();
+        for (Entry e: entries){
+            values.add(e.getValue());
+        }
+        return values;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        Cart removed = null;
+        for (Entry e: entries){
+            if (e.getKey().equals(key)){
+                entries.remove(e);
+                removed = e.getValue();
+                break;
+            }
+        }
+        return removed;
     }
 }

src/main/java/org/zipcoder/store/MyHashMap.java

@@ -19,37 +19,73 @@ public class MyHashMap implements MyMap{
 
     @Override
     public int size() {
-        return -1;
+        int size = 0;
+        for (List<Entry> e: entries){
+            size += e.size();
+        }
+        return size;
     }
 
     @Override
     public boolean isEmptry() {
+        if (this.size() == 0){
+            return true;
+        }
         return false;
     }
 
     @Override
     public Cart get(User key) {
-        return null;
+        Cart value = null;
+        for(Entry element: entries[bucketIndex(key)]){
+                if (element.getKey().equals(key)){
+                    value = element.getValue();
+                }
+        }
+        return value;
     }
 
     @Override
     public void put(User key, Cart value) {
-
+        entries[bucketIndex(key)].add(new Entry(key, value));
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        List<User> result = new ArrayList<>();
+        for(List<Entry> e: entries){
+            for(Entry el: e){
+                result.add(el.getKey());
+            }
+        }
+        return result;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> result = new ArrayList<>();
+        for(List<Entry> e: entries){
+            for(Entry el: e){
+                result.add(el.getValue());
+            }
+        }
+        return result;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+
+        Cart value = null;
+        Entry entry = null;
+        for(Entry element: entries[bucketIndex(key)]){
+            if (element.getKey().equals(key)){
+                value = element.getValue();
+                entry = element;
+            }
+        }
+        entries[bucketIndex(key)].remove(entry);
+
+        return value;
     }
 
     private int bucketIndex(User key){

src/main/java/org/zipcoder/store/User.java

@@ -38,20 +38,35 @@ public class User {
         this.name = name;
     }
 
-    public boolean equals(User user){
-        if(user.getName() == null){
-            if (user.getId() == this.getId()){
-                return true;
-            }
-            return false;
-        }
-        if (user.getId() == this.getId() && user.getName().equals(this.getName())){
-            return true;
-        }
-        return false;
-    }
-
-    public int hashCode(){
-        return Objects.hash(this.getId(), this.getName());
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(id, name);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return id == user.id &&
+                Objects.equals(name, user.name);
     }
+
+//    public boolean equals(User user){
+//        if(user.getName() == null){
+//            if (user.getId() == this.getId()){
+//                return true;
+//            }
+//            return false;
+//        }
+//        if (user.getId() == this.getId() && user.getName().equals(this.getName())){
+//            return true;
+//        }
+//        return false;
+//    }
+
+//    public int hashCode(){
+//        return Objects.hash(this.getId(), this.getName());
+//    }
 }

src/test/java/org/zipcoder/store/ListMapTest.java

@@ -175,57 +175,57 @@ public class ListMapTest {
     }
 
 //    I commented this out because it takes a long time to run. Uncomment it when implement your put method, uncomment this test
-//    @Test
-//    public void testPutAndGet_WithManyItems(){
-//        // Given
-//        int numberOfEntries = 70000;
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            myMap.put(new User(i), new Cart(i));
-//        }
-//
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            // When
-//            Cart actualCart = myMap.get(new User(i));
-//            Cart expectedCart = new Cart(i);
-//
-//            // Then
-//            Assert.assertEquals(actualCart, expectedCart);
-//        }
-//    }
+    @Test
+    public void testPutAndGet_WithManyItems(){
+        // Given
+        int numberOfEntries = 70000;
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            myMap.put(new User(i), new Cart(i));
+        }
+
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            // When
+            Cart actualCart = myMap.get(new User(i));
+            Cart expectedCart = new Cart(i);
+
+            // Then
+            Assert.assertEquals(actualCart, expectedCart);
+        }
+    }
 
 //    BONUS
-//    @Test
-//    public void testRemove(){
-//        // Given
-//        User user1 = new User("Lena");
-//        Cart cart1 = new Cart(11);
-//
-//        User user2 = new User("Jamal");
-//        Cart cart2 = new Cart(21);
-//
-//        User user3 = new User("Kelvin");
-//        Cart cart3 = new Cart(31);
-//
-//        // When
-//        myMap.put(user1, cart1);
-//        myMap.put(user2, cart2);
-//        myMap.put(user3, cart3);
-//
-//        // Then
-//        Cart actualCart = myMap.remove(user2);
-//
-//        Assert.assertEquals(cart2, actualCart);
-//        Assert.assertNull(myMap.get(user2));
-//    }
-//
-//    @Test
-//    public void testRemove_CartNotInTheMap(){
-//        // Given
-//        User user1 = new User("Lena");
-//
-//        // When & Then
-//        Assert.assertNull(myMap.remove(user1));
-//    }
+    @Test
+    public void testRemove(){
+        // Given
+        User user1 = new User("Lena");
+        Cart cart1 = new Cart(11);
+
+        User user2 = new User("Jamal");
+        Cart cart2 = new Cart(21);
+
+        User user3 = new User("Kelvin");
+        Cart cart3 = new Cart(31);
+
+        // When
+        myMap.put(user1, cart1);
+        myMap.put(user2, cart2);
+        myMap.put(user3, cart3);
+
+        // Then
+        Cart actualCart = myMap.remove(user2);
+
+        Assert.assertEquals(cart2, actualCart);
+        Assert.assertNull(myMap.get(user2));
+    }
+
+    @Test
+    public void testRemove_CartNotInTheMap(){
+        // Given
+        User user1 = new User("Lena");
+
+        // When & Then
+        Assert.assertNull(myMap.remove(user1));
+    }
 }

src/test/java/org/zipcoder/store/MyHashMapTest.java

@@ -175,56 +175,56 @@ public class MyHashMapTest {
     }
 
 //    I commented this out because it takes a long time to run. Uncomment it when implement your put method, uncomment this test
-//    @Test
-//    public void testPutAndGet_WithManyItems(){
-//        // Given
-//        int numberOfEntries = 70000;
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            myMap.put(new User(i), new Cart(i));
-//        }
-//
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            // When
-//            Cart actualCart = myMap.get(new User(i));
-//            Cart expectedCart = new Cart(i);
-//
-//            // Then
-//            Assert.assertEquals(actualCart, expectedCart);
-//        }
-//    }
-
-//    @Test
-//    public void testRemove(){
-//        // Given
-//        User user1 = new User("Lena");
-//        Cart cart1 = new Cart(11);
-//
-//        User user2 = new User("Jamal");
-//        Cart cart2 = new Cart(21);
-//
-//        User user3 = new User("Kelvin");
-//        Cart cart3 = new Cart(31);
-//
-//        // When
-//        myMap.put(user1, cart1);
-//        myMap.put(user2, cart2);
-//        myMap.put(user3, cart3);
-//
-//        // Then
-//        Cart actualCart = myMap.remove(user2);
-//
-//        Assert.assertEquals(cart2, actualCart);
-//        Assert.assertNull(myMap.get(user2));
-//    }
-//
-//    @Test
-//    public void testRemove_CartNotInTheMap(){
-//        // Given
-//        User user1 = new User("Lena");
-//
-//        // When & Then
-//        Assert.assertNull(myMap.remove(user1));
-//    }
+    @Test
+    public void testPutAndGet_WithManyItems(){
+        // Given
+        int numberOfEntries = 70000;
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            myMap.put(new User(i), new Cart(i));
+        }
+
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            // When
+            Cart actualCart = myMap.get(new User(i));
+            Cart expectedCart = new Cart(i);
+
+            // Then
+            Assert.assertEquals(actualCart, expectedCart);
+        }
+    }
+
+    @Test
+    public void testRemove(){
+        // Given
+        User user1 = new User("Lena");
+        Cart cart1 = new Cart(11);
+
+        User user2 = new User("Jamal");
+        Cart cart2 = new Cart(21);
+
+        User user3 = new User("Kelvin");
+        Cart cart3 = new Cart(31);
+
+        // When
+        myMap.put(user1, cart1);
+        myMap.put(user2, cart2);
+        myMap.put(user3, cart3);
+
+        // Then
+        Cart actualCart = myMap.remove(user2);
+
+        Assert.assertEquals(cart2, actualCart);
+        Assert.assertNull(myMap.get(user2));
+    }
+
+    @Test
+    public void testRemove_CartNotInTheMap(){
+        // Given
+        User user1 = new User("Lena");
+
+        // When & Then
+        Assert.assertNull(myMap.remove(user1));
+    }
 }