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 instanceof Cart)) return false;
+        Cart cart = (Cart) o;
+        return getId() == cart.getId();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getId());
+    }
 }

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

@@ -1,7 +1,9 @@
 package org.zipcoder.store;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class ListMap implements MyMap {
     // instance field that is intialize to an ArrayList
@@ -9,40 +11,71 @@ public class ListMap implements MyMap {
 
     @Override
     public int size() {
-        return -1;
+        return entries.size();
     }
 
     @Override
     public boolean isEmptry() {
-        return false;
+        return (this.size() == 0);
     }
 
     @Override
     public Cart get(User key) {
         // find the cart associate with the key
+
+            for (Entry e: entries) {
+                if (e.getKey().equals(key)) {
+                    return e.getValue();
+                }
+            }
         return null;
     }
 
     @Override
     public void put(User key, Cart value) {
-        // add the key, value entry to the entries list
+        if (get(key) == null) {
+            entries.add(new Entry(key, value));
+        } else {
+            for (Entry e: entries) {
+                if (e.getKey().equals(key)) {
+                    e.setValue(value);
+                }
+            }
+        }
     }
 
-
     @Override
     public List<User> getKeys() {
         // get all the keys in the map
-        return null;
+
+        List<User> idSet = new ArrayList<>();
+
+        for (Entry e:entries) {
+            idSet.add(e.getKey());
+        }
+        return idSet;
     }
 
     @Override
     public List<Cart> getValues() {
-        // get all the values in the map
-        return null;
+        List<Cart> valueSet = new ArrayList<>();
+        for (Entry e: entries) {
+            valueSet.add(e.getValue());
+        }
+        return valueSet;
     }
 
     @Override
     public Cart remove(User key) {
+        Entry eTemp = null;
+
+        for (Entry e: entries) {
+            if (e.getKey().equals(key)) {
+                eTemp = e;
+                entries.remove(e);
+                return eTemp.getValue();
+            }
+        }
         return null;
     }
 }

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

@@ -17,39 +17,95 @@ public class MyHashMap implements MyMap{
         }
     }
 
+    public List<Entry>[] getEntries() {
+        return entries;
+    }
+
     @Override
     public int size() {
-        return -1;
+        int count = 0;
+        for (List<Entry> e: entries) {
+            count += e.size();
+        }
+        return count;
     }
 
     @Override
     public boolean isEmptry() {
-        return false;
+        return this.size() == 0;
     }
 
     @Override
     public Cart get(User key) {
+            int bucket = bucketIndex(key);
+
+            for (Entry e : getEntries()[bucket]) {
+                if (e.getKey().equals(key)) {
+                    return e.getValue();
+                }
+            }
         return null;
     }
 
     @Override
     public void put(User key, Cart value) {
 
+//        if(get(key) != null) {
+//            for (Entry e: getEntries()[bucketIndex(key)]) {
+//                if (e.getKey().equals(key)) {
+//                    e.setValue(value);
+//                }
+//            }
+//        } else {
+//            getEntries()[bucketIndex(key)].add(new Entry(key, value));
+//        }
+
+        if (!getKeys().contains(key)) {
+            entries[bucketIndex(key)].add(new Entry(key, value));
+        } else {
+            for (Entry e: entries[bucketIndex(key)]) {
+                if (e.getKey().equals(key)) {
+                    e.setValue(value);
+                }
+            }
+        }
+
+
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        List<User> keys = new ArrayList<>();
+        for (List<Entry> list: getEntries()) {
+            for (Entry e: list)
+                keys.add(e.getKey());
+        }
+        return keys;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> values = new ArrayList<>();
+        for (List<Entry> list:entries) {
+            for (Entry e: list )
+                values.add(e.getValue());
+        }
+        return values;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        int bucket = bucketIndex(key);
+        Entry e = new Entry(null, null);
+        Iterator<Entry> iterator = entries[bucket].iterator();
+        while (iterator.hasNext()) {
+            e = iterator.next();
+            if (e.getKey().equals(key)) {
+                getEntries()[bucket].remove(e);
+                break;
+            }
+        }
+        return e.getValue();
     }
 
     private int bucketIndex(User key){

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

@@ -22,6 +22,20 @@ public class User {
         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);
+           }
+
+    public int hashCode() {
+        Objects.hash(getId(), getName());
+        return Objects.hash(getId(), getName());
+    }
+
     public long getId() {
         return id;
     }

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

@@ -174,58 +174,58 @@ public class ListMapTest {
         Assert.assertTrue(values.contains(cart2));
     }
 
-//    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);
-//        }
-//    }
-
-//    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));
-//    }
+    //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);
+        }
+    }
+
+    //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));
+    }
 }

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