finished lab

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

@@ -32,31 +32,59 @@ public class MyHashMap implements MyMap{
 
     @Override
     public Cart get(User key) {
-        for(int i = 0; i < BUCKET_SIZE; i++) {
-            entries[i] = new ArrayList<>();
+        int bucket = bucketIndex(key);
+        Iterator<Entry> entryIterator = entries[bucket].iterator();
+        Entry retrievedEntry;
+        Cart retrievedCart = null;
+        while (entryIterator.hasNext()){
+            retrievedEntry = entryIterator.next();
+            if (retrievedEntry.getKey().equals(key)){
+                retrievedCart = retrievedEntry.getValue();
+            }
         }
-        return null;
+        return retrievedCart;
     }
 
     @Override
     public void put(User key, Cart value) {
+        int bucket = bucketIndex(key);
         Entry newEntry = new Entry(key, value);
-        entries[0].add(newEntry);
+        entries[bucket].add(newEntry);
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        List<User> entriesUser = new ArrayList<>();
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            for (Entry e : entries[i]) {
+                entriesUser.add(e.getKey());
+            }
+        }
+        return entriesUser;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> entriesCart = new ArrayList<>();
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            for (Entry e : entries[i]) {
+                entriesCart.add(e.getValue());
+            }
+        }
+        return entriesCart;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        int bucket = bucketIndex(key);
+        Cart removedCart = null;
+        for (int i=0; i<entries[bucket].size(); i++){
+            if (entries[bucket].get(i).getKey() == key){
+                removedCart = entries[bucket].get(i).getValue();
+                entries[bucket].remove(entries[bucket].get(i));
+            }
+        }
+        return removedCart;
     }
 
     private int bucketIndex(User key){

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