completed

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

@@ -14,38 +14,62 @@ public class ListMap implements MyMap {
 
     @Override
     public boolean isEmptry() {
-        return entries.size()==0;
+        return size()==0;
     }
 
     @Override
     public Cart get(User key) {
         // find the cart associate with the key
+        Cart cart = null;
         for(int i=0; i<entries.size(); i++){
-
+        if(entries.get(i).getKey().equals(key)){
+            cart = entries.get(i).getValue();
+        }
         }
-        return null;
+
+        return cart;
     }
 
     @Override
     public void put(User key, Cart value) {
         // add the key, value entry to the entries list
+        Entry entry= new Entry(key, value);
+        remove(key);
+        this.entries.add(entry);
     }
 
 
     @Override
     public List<User> getKeys() {
         // get all the keys in the map
-        return null;
+        List<User> keys = new ArrayList<>();
+        for (Entry entry : entries) {
+            keys.add(entry.getKey());
+        }
+
+        return keys;
     }
 
     @Override
     public List<Cart> getValues() {
         // get all the values in the map
-        return null;
+        List<Cart> values = new ArrayList<>();
+        for (Entry entry : this.entries) {
+            values.add(entry.getValue());
+        }
+        return values;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        Cart cart = get(key);
+
+        for(int i=0; i<entries.size(); i++){
+            if(entries.get(i).getKey().equals(key)){
+                entries.remove(i);
+            }
+        }
+
+        return cart;
     }
 }

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

@@ -19,37 +19,77 @@ public class MyHashMap implements MyMap{
 
     @Override
     public int size() {
-        return -1;
+        int count= 0;
+        for(int i=0; i<BUCKET_SIZE;i++){
+            if(entries[i].size()>0){
+                count++;
+            }
+        }
+
+        return count;
     }
 
     @Override
     public boolean isEmptry() {
-        return false;
+        return size() == 0;
     }
 
     @Override
     public Cart get(User key) {
-        return null;
+        Cart cart = null;
+
+        for (int j = 0; j < entries[bucketIndex(key)].size(); j++) {
+            if (entries[bucketIndex(key)].get(j).getKey().equals(key)) {
+                    cart = entries[bucketIndex(key)].get(j).getValue();
+            }
+         }
+
+
+        return cart;
     }
 
     @Override
     public void put(User key, Cart value) {
+        Entry entry= new Entry(key, value);
+
+         entries[bucketIndex(key)].add(entry);
 
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        List<User> keys = new ArrayList<>();
+         for(List<Entry> list: entries)
+            for (Entry entry : list) {
+                keys.add(entry.getKey());
+            }
+
+        return keys;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> values = new ArrayList<>();
+        for(List<Entry> list: entries)
+            for (Entry entry : list) {
+                values.add(entry.getValue());
+            }
+
+        return values;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        Cart cart = get(key);
+
+        for (int j = 0; j < entries[bucketIndex(key)].size(); j++) {
+            if (entries[bucketIndex(key)].get(j).getKey().equals(key)) {
+                entries[bucketIndex(key)].remove(j);
+            }
+        }
+
+
+        return cart;
     }
 
     private int bucketIndex(User key){

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

@@ -174,7 +174,7 @@ 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
+    //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
@@ -195,37 +195,37 @@ public class ListMapTest {
 //        }
 //    }
 
-//    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));
-//    }
+    //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

@@ -174,7 +174,7 @@ public class MyHashMapTest {
         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
+//    //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
@@ -195,36 +195,36 @@ public class MyHashMapTest {
 //        }
 //    }
 
-//    @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));
+    }
 }