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

@@ -12,4 +12,17 @@ public class Cart {
     public long getId(){
         return this.id;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Cart cart = (Cart) o;
+        return id == cart.id;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }

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

@@ -6,43 +6,89 @@ import java.util.List;
 public class ListMap implements MyMap {
     // instance field that is intialize to an ArrayList
     private List<Entry> entries = new ArrayList<>();
+    private int size = 0;
+
+//    public ListMap() {
+//
+//        this.entries = new ArrayList<>();
+//    }
 
     @Override
     public int size() {
-        return -1;
+        return this.size;
     }
 
     @Override
     public boolean isEmptry() {
+        if (this.getSize() == 0) {
+            return true;
+        }
         return false;
     }
 
     @Override
     public Cart get(User key) {
         // find the cart associate with the key
+        for (Entry entry : entries) {
+            if (entry.getKey().equals(key)) {
+                return entry.getValue();
+            }
+        }
         return null;
     }
 
     @Override
     public void put(User key, Cart value) {
-        // add the key, value entry to the entries list
+        if (get(key) != null) {
+            for (Entry entry : entries) {
+                if (entry.getKey().equals(key)) {
+                    entry.setValue(value);
+                }
+            }
+        } else {
+            Entry newEntry = new Entry(key, value);
+            entries.add(newEntry);
+            setSize(size + 1);
+        }
     }
 
 
     @Override
     public List<User> getKeys() {
         // get all the keys in the map
-        return null;
+        List<User> userKeys = new ArrayList<>();
+        for (Entry entry : this.entries) {
+            userKeys.add(entry.getKey());
+        }
+        return userKeys;
     }
 
     @Override
     public List<Cart> getValues() {
         // get all the values in the map
-        return null;
+        List<Cart> cartValues = new ArrayList<>();
+        for (Entry entry : entries) {
+            cartValues.add(entry.getValue());
+        }
+        return cartValues;
     }
 
     @Override
     public Cart remove(User key) {
+        for (Entry entry : entries) {
+            if (entry.getKey().equals(key)) {
+                entries.remove(entry);
+                return entry.getValue();
+            }
+        }
         return null;
     }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
 }

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

@@ -2,57 +2,118 @@ package org.zipcoder.store;
 
 import java.util.*;
 
-public class MyHashMap implements MyMap{
+public class MyHashMap implements MyMap {
     // final field that doesn't change for any object
     private static final int BUCKET_SIZE = 15;
 
     // instance field that can only be set once. It is different for every Object
     private final List<Entry>[] entries;
+    private int entryListSize;
 
-    public MyHashMap(){
+    public MyHashMap() {
         entries = new List[BUCKET_SIZE];
 
-        for(int i = 0; i < BUCKET_SIZE; i++) {
+        for (int i = 0; i < BUCKET_SIZE; i++) {
             entries[i] = new ArrayList<>();
         }
+
+        this.entryListSize = 0;
     }
 
     @Override
     public int size() {
-        return -1;
+        return this.entryListSize;
     }
 
     @Override
     public boolean isEmptry() {
+        if (this.entryListSize == 0) {
+            return true;
+        }
         return false;
     }
 
     @Override
     public Cart get(User key) {
+        List<Entry> bucket = entries[bucketIndex(key)];
+        for (Entry entry : bucket) {
+            if (entry.getKey().equals(key)) {
+                return entry.getValue();
+            }
+        }
         return null;
     }
 
     @Override
     public void put(User key, Cart value) {
+        List<Entry> bucket = entries[bucketIndex(key)];
 
+
+        if (get(key) != null) {
+            for (Entry entry : bucket) {
+                if (entry.getKey().equals(key)) {
+                    entry.setValue(value);
+                }
+            }
+        } else {
+            Entry entry = new Entry(key, value);
+            bucket.add(entry);
+            setEntryListSize(getEntryListSize() + 1);
+        }
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        List<User> userKeys = new ArrayList<>();
+
+        for (List<Entry> entryArray : entries) {
+            for (Entry entry : entryArray) {
+                userKeys.add(entry.getKey());
+            }
+        }
+
+        return userKeys;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> userValues = new ArrayList<>();
+
+        for (List<Entry> entryArray : entries) {
+            for (Entry entry : entryArray) {
+                userValues.add(entry.getValue());
+            }
+        }
+
+        return userValues;
     }
 
     @Override
     public Cart remove(User key) {
+        for (List<Entry> entryArray : entries) {
+            for (Entry entry : entryArray) {
+                if (entry.getKey().equals(key)) {
+                    entryArray.remove(entry);
+                    return entry.getValue();
+                }
+            }
+        }
         return null;
     }
 
-    private int bucketIndex(User key){
+    private int bucketIndex(User key) {
         return Math.abs(key.hashCode()) % entries.length;
     }
+
+    public int getEntryListSize() {
+        return entryListSize;
+    }
+
+    public void setEntryListSize(int entryListSize) {
+        this.entryListSize = entryListSize;
+    }
+
+    public List<Entry>[] getEntries() {
+        return entries;
+    }
 }

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

@@ -7,7 +7,8 @@ public class User {
     private long id;
     private String name;
 
-    public User(){}
+    public User() {
+    }
 
     public User(long id) {
         this.id = id;
@@ -17,7 +18,7 @@ public class User {
         this.name = name;
     }
 
-    public User(long id, String name){
+    public User(long id, String name) {
         this.id = id;
         this.name = name;
     }
@@ -37,4 +38,18 @@ public class User {
     public void setName(String name) {
         this.name = name;
     }
+
+    public boolean equals(User user) {
+        if (this.getId() == user.getId() && this.getName() == user.getName()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public int hashCode() {
+        return Objects.hash(id, name);
+    }
+
+
 }

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));
+    }
 }