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

@@ -1,7 +1,9 @@
 package org.zipcoder.store;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 public class ListMap implements MyMap {
     // instance field that is intialize to an ArrayList
@@ -9,40 +11,67 @@ public class ListMap implements MyMap {
 
     @Override
     public int size() {
-        return -1;
+        return entries.size();
     }
 
     @Override
     public boolean isEmptry() {
-        return false;
+        return entries.size() == 0;
     }
 
     @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
+        for (Entry entry : entries) {
+            if (entry.getKey().equals(key)) {
+                entry.setValue(value);
+                return;
+            }
+        }
+        entries.add(new Entry(key, value));
     }
 
 
     @Override
     public List<User> getKeys() {
         // get all the keys in the map
-        return null;
+        List<User> users = new ArrayList<>();
+        for (Entry entry : entries) {
+            users.add(entry.getKey());
+        }
+        return users;
     }
 
     @Override
     public List<Cart> getValues() {
         // get all the values in the map
-        return null;
+        List<Cart> carts = new ArrayList<>();
+        for (Entry entry : entries) {
+            carts.add(entry.getValue());
+        }
+        return carts;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        Cart cart = null;
+
+        for (Iterator<Entry> i = entries.iterator(); i.hasNext();) {
+            Entry entry = i.next();
+            if (entry.getKey().equals(key)) {
+                cart = entry.getValue();
+                i.remove();
+            }
+        }
+
+        return cart;
     }
 }

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

@@ -4,7 +4,7 @@ import java.util.*;
 
 public class MyHashMap implements MyMap{
     // final field that doesn't change for any object
-    private static final int BUCKET_SIZE = 15;
+    private static final int BUCKET_SIZE = 100;
 
     // instance field that can only be set once. It is different for every Object
     private final List<Entry>[] entries;
@@ -17,39 +17,82 @@ public class MyHashMap implements MyMap{
         }
     }
 
+    int sizeCounter = 0;
+
     @Override
     public int size() {
-        return -1;
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            if (entries[i].size() > 0) {
+                for (Entry e : entries[i]) {
+                    sizeCounter++;
+                }
+            }
+        }
+        return sizeCounter;
     }
 
     @Override
     public boolean isEmptry() {
-        return false;
+        return size() == 0;
     }
 
     @Override
     public Cart get(User key) {
+        for (Entry e : entries[bucketIndex(key)]) {
+            if (e.getKey().equals(key)) {
+                return e.getValue();
+            }
+        }
         return null;
     }
 
     @Override
     public void put(User key, Cart value) {
-
+        for (Entry e : entries[bucketIndex(key)]) {
+            if (e.getKey().equals(key)) {
+                e.setValue(value);
+                return;
+            }
+        }
+        entries[bucketIndex(key)].add(new Entry(key,value));
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        List<User> users = new ArrayList<>();
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            if (entries[i].size() > 0) {
+                for (Entry e : entries[i]) {
+                    users.add(e.getKey());
+                }
+            }
+        }
+        return users;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> values = new ArrayList<>();
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            if (entries[i].size() > 0) {
+                for (Entry e : entries[i]) {
+                    values.add(e.getValue());
+                }
+            }
+        }
+        return values;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        Cart cart = null;
+        for (Entry e : entries[bucketIndex(key)]) {
+            if (e.getKey().equals(key)) {
+                cart = e.getValue();
+                remove(key);
+            }
+        }
+        return cart;
     }
 
     private int bucketIndex(User key){

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

@@ -34,7 +34,19 @@ public class User {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setName(String name) { this.name = 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);
+    }
+
+    @Override
+    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));
+    }
 }