completed lab

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

@@ -4,7 +4,7 @@ import java.util.*;
 
 public class MyHashMap implements MyMap{
     // final field that doesn't change for any object
-    private static final int BUCKET_SIZE = 15;
+    private static final int BUCKET_SIZE = 100;
 
     // instance field that can only be set once. It is different for every Object
     private final List<Entry>[] entries;
@@ -19,40 +19,79 @@ public class MyHashMap implements MyMap{
 
     @Override
     public int size() {
-        return -1;
+        int count = 0;
+        for (List<Entry> list : entries) {
+            count += list.size();
+        }
+        return count;
     }
 
     @Override
     public boolean isEmptry() {
-        return false;
+        if (size() == 0) return true;
+        else return false;
     }
 
     @Override
     public Cart get(User key) {
-        return null;
+        List<Entry> bucket = entries[bucketIndex(key)];
+        int index = keyIndex(bucket, key);
+        if (index >= 0 ) return bucket.get(keyIndex(bucket, 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> keys = new ArrayList<User>();
+        for (List<Entry> list : entries) {
+            for (Entry e : list) {
+                keys.add(e.getKey());
+            }
+        }
+        return keys;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> values = new ArrayList<Cart>();
+        for (List<Entry> list : entries) {
+            for (Entry e : list) {
+                values.add(e.getValue());
+            }
+        }
+        return values;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        List<Entry> bucket = entries[bucketIndex(key)];
+        Iterator<Entry> iterator = bucket.iterator();
+        Cart removed = null;
+        while(iterator.hasNext()) {
+            Entry entry = iterator.next();
+            if (entry.getKey().equals(key)) {
+                removed = entry.getValue();
+                iterator.remove();
+            }
+        }
+        return removed;
     }
 
     private int bucketIndex(User key){
         return Math.abs(key.hashCode()) % entries.length;
     }
+    private int keyIndex(List<Entry> bucket, User key) {
+        int index = -1;
+        for (int i = 0; i < bucket.size(); i++) {
+            if (bucket.get(i).getKey().equals(key)) {
+                index = i;
+            }
+        }
+        return index;
+    }
 }

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