completed

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

@@ -12,4 +12,18 @@ 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

@@ -9,40 +9,70 @@ 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
-        return null;
+
+        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> userKeys = new ArrayList<User>();
+        for (Entry e: entries ) {
+            userKeys.add(e.getKey());
+        }
+
+        return userKeys;
     }
 
     @Override
     public List<Cart> getValues() {
         // get all the values in the map
-        return null;
+        List<Cart> cartValues = new ArrayList<Cart>();
+        for(Entry e: entries){
+            cartValues.add(e.getValue());
+        }
+        return cartValues;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        Cart removed= null;
+        for(Entry e: entries){
+            if(e.getKey().equals(key)){
+                removed = e.getValue();
+                entries.remove(e);
+            }
+        }
+        return removed;
     }
 }

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

@@ -19,40 +19,88 @@ public class MyHashMap implements MyMap{
 
     @Override
     public int size() {
-        return -1;
+        int totalSize = 0;
+
+        for(List<Entry> e: entries){
+            totalSize += e.size();
+        }
+        return totalSize;
     }
 
     @Override
     public boolean isEmptry() {
-        return false;
+        if(size() == 0) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override
     public Cart get(User key) {
-        return null;
+        List<Entry> bin = entries[bucketIndex(key)];
+        int index = keyIndex(bin, key);
+
+        if(index >= 0){
+            return bin.get(keyIndex(bin, key)).getValue();
+        }else return null;
     }
 
     @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> userList = new ArrayList<User>();
+        for(List<Entry> entryList: entries){
+            for(Entry entry: entryList){
+                userList.add(entry.getKey());
+            }
+        }
+        return userList;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> userCarts = new ArrayList<Cart>();
+        for(List<Entry> entryList: entries){
+            for(Entry entry: entryList){
+                userCarts.add(entry.getValue());
+            }
+        }
+        return userCarts;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        List<Entry> bin = entries[bucketIndex(key)];
+        Iterator<Entry> iterator = bin.iterator();
+
+        Cart removedCart = null;
+
+        while(iterator.hasNext()) {
+            Entry entry = iterator.next();
+            if (entry.getKey().equals(key)) {
+                removedCart = entry.getValue();
+                iterator.remove();
+            }
+        }
+        return removedCart;
     }
 
     private int bucketIndex(User key){
         return Math.abs(key.hashCode()) % entries.length;
     }
+
+    private int keyIndex(List<Entry> bin, User key) {
+        int index = -1;
+        for (int i = 0; i < bin.size(); i++) {
+            if (bin.get(i).getKey().equals(key)) {
+                index = i;
+            }
+        }
+        return index;
+    }
 }

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

@@ -37,4 +37,21 @@ 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 int hashCode() {
+
+        return Objects.hash(id, name);
+    }
 }
+
+

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