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

@@ -7,42 +7,84 @@ public class ListMap implements MyMap {
     // instance field that is intialize to an ArrayList
     private List<Entry> entries = new ArrayList<>();
 
+    public ListMap() {
+
+    }
+
+    public List<Entry> getEntries() {
+        return entries;
+    }
+
     @Override
     public int size() {
-        return -1;
+        return entries.size();
     }
 
     @Override
-    public boolean isEmptry() {
+    public boolean isEmpty() {
+
+        if(size() == 0) {
+            return true;
+        }
+
         return false;
     }
 
     @Override
     public Cart get(User key) {
-        // find the cart associate with the key
+
+        for(Entry e : getEntries()) {
+            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) {
+            for(Entry e : getEntries()) {
+                if(e.getKey().equals(key)) {
+                    e.setValue(value);
+                }
+            }
+        } else {
+            Entry entry = new Entry(key, value);
+            getEntries().add(entry);
+        }
     }
 
 
     @Override
     public List<User> getKeys() {
-        // get all the keys in the map
-        return null;
+        List<User> keys = new ArrayList<>();
+        for(Entry e : getEntries()) {
+            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 : getEntries()) {
+            values.add(e.getValue());
+        }
+        return values;
     }
 
     @Override
     public Cart remove(User key) {
+
+        for(Entry e : getEntries()) {
+            if(e.getKey() == key) {
+                getEntries().remove(e);
+                return e.getValue();
+            }
+        }
+
         return null;
     }
 }

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

@@ -17,41 +17,93 @@ public class MyHashMap implements MyMap{
         }
     }
 
+    public List<Entry>[] getEntries() {
+        return entries;
+    }
+
     @Override
     public int size() {
-        return -1;
+        int count = 0;
+        for(int i = 0; i < BUCKET_SIZE; i++) {
+            if(!getEntries()[i].isEmpty()) {
+                count++;
+            }
+        }
+        return count;
     }
 
     @Override
-    public boolean isEmptry() {
+    public boolean isEmpty() {
+
+        if(size() == 0) {
+            return true;
+        }
+
         return false;
     }
 
     @Override
     public Cart get(User key) {
+        for(Entry e: getEntries()[bucketIndex(key)]) {
+            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 {
+
+            Entry entry = new Entry(key, value);
+            getEntries()[bucketIndex(key)].add(entry);
 
+        }
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        List<User> keys = new ArrayList<>();
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            for (Entry e : getEntries()[i]) {
+                keys.add(e.getKey());
+            }
+        }
+        return keys;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> values = new ArrayList<>();
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            for (Entry e : getEntries()[i]) {
+                values.add(e.getValue());
+            }
+        }
+        return values;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
-    }
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            for (Entry e : getEntries()[i]) {
+                if (e.getKey().equals(key)) {
+                    getEntries()[i].remove(e);
+                    return e.getValue();
+                }
+            }
+        }
+            return null;
 
+    }
     private int bucketIndex(User key){
         return Math.abs(key.hashCode()) % entries.length;
     }

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

@@ -12,7 +12,7 @@ public interface MyMap {
     /**
      * @return true if the map has one or more item in it. False otherwise.
      */
-    public boolean isEmptry();
+    public boolean isEmpty();
 
     /**
      * Return the cart associated with the user
@@ -44,4 +44,6 @@ public interface MyMap {
      * @return The cart associated with the user
      */
     public Cart remove(User key);
+
+
 }

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

@@ -37,4 +37,37 @@ public class User {
     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 boolean equals(Object otherUser) {
+//
+//        try {
+//        if (this.getName().equalsIgnoreCase(otherUser.getName()) && this.getId() == otherUser.getId()) {
+//            return true;
+//        }
+//        } catch (NullPointerException e) {
+//
+//        if (this.getName() == null && otherUser.getName() == null) {
+//            return true;
+//        } else {
+//            return false;
+//        }
+//        }
+//        return false;
+//        }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name);
+
+    }
 }

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

@@ -116,7 +116,7 @@ public class ListMapTest {
 
     @Test
     public void testIsEmpty_WithoutEntry(){
-        Assert.assertTrue(myMap.isEmptry());
+        Assert.assertTrue(myMap.isEmpty());
     }
 
     @Test
@@ -129,7 +129,7 @@ public class ListMapTest {
         myMap.put(user1, cart1);
 
         // Then
-        Assert.assertFalse(myMap.isEmptry());
+        Assert.assertFalse(myMap.isEmpty());
     }
 
     @Test
@@ -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

@@ -116,7 +116,7 @@ public class MyHashMapTest {
 
     @Test
     public void testIsEmpty_WithoutEntry(){
-        Assert.assertTrue(myMap.isEmptry());
+        Assert.assertTrue(myMap.isEmpty());
     }
 
     @Test
@@ -129,7 +129,7 @@ public class MyHashMapTest {
         myMap.put(user1, cart1);
 
         // Then
-        Assert.assertFalse(myMap.isEmptry());
+        Assert.assertFalse(myMap.isEmpty());
     }
 
     @Test
@@ -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));
+    }
 }

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

@@ -65,6 +65,15 @@ public class UserTest {
     }
 
     @Test
+    public void testEqual_withOneNamed(){
+        long id = 613;
+        User user1 = new User(id);
+        User user2 = new User(id, "Fiona");
+
+        Assert.assertFalse(user1.equals(user2));
+    }
+
+    @Test
     public void testEqual_withSameNameDifferentId(){
         String name = "Asher";
         User user1 = new User(92, name);