updated commit

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,81 @@ 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 entry : list) {
+                keys.add(entry.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/main/java/org/zipcoder/store/User.java

@@ -10,10 +10,13 @@ public class User {
     public User(){}
 
     public User(long id) {
+
         this.id = id;
+        name = "";
     }
 
     public User(String name) {
+        id = 0;
         this.name = name;
     }
 

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

@@ -1,230 +1,230 @@
-//package org.zipcoder.store;
-//
-//import org.junit.Assert;
-//import org.junit.Before;
-//import org.junit.Test;
-//
-//import java.util.List;
-//
-//public class MyHashMapTest {
-//    private MyMap myMap;
-//
-//    @Before
-//    public void setup(){
-//        myMap = new MyHashMap();
-//    }
-//
-//    @Test
-//    public void testPutAndGet_WithOneItem(){
-//        User user = new User("Tiana");
-//        Cart cart = new Cart(1);
-//
-//        // When
-//        myMap.put(user, cart);
-//
-//        // Then
-//        Cart actualCart = myMap.get(user);
-//        Assert.assertEquals(cart, actualCart);
-//    }
-//
-//    @Test
-//    public void testPutAndGet_WithTwoItems(){
-//        User tiana = new User("Tiana");
-//        Cart tianasCart = new Cart(1134);
-//
-//        User john = new User("John");
-//        Cart johnsCart = new Cart(42);
-//
-//        // When
-//        myMap.put(john, johnsCart);
-//        myMap.put(tiana, tianasCart);
-//
-//        // Then
-//        Cart actualJohnsCart = myMap.get(john);
-//        Assert.assertEquals(johnsCart, actualJohnsCart);
-//
-//        Cart actualTianasCart = myMap.get(tiana);
-//        Assert.assertEquals(tianasCart, actualTianasCart);
-//    }
-//
-//    @Test
-//    public void testPutAndGet_UpdateCart(){
-//        User tiana = new User("Tiana");
-//        Cart tianasCart = new Cart(11);
-//        myMap.put(tiana, tianasCart);
-//
-//        // When
-//        Cart updatedCart = new Cart(99);
-//        myMap.put(tiana, updatedCart);
-//
-//        // Then
-//        Cart actualCart = myMap.get(tiana);
-//        Assert.assertEquals(updatedCart, actualCart);
-//    }
-//
-//    @Test
-//    public void testGetWithoutPut(){
-//        // Given
-//        User user = new User("Tiana");
-//
-//        // When
-//        Cart actualCart = myMap.get(user);
-//
-//        // Then
-//        Assert.assertNull(actualCart);
-//    }
-//
-//    @Test
-//    public void testPutAndGet_WithDifferentKeyInstance(){
-//        // Given
-//        String name = "Tiana";
-//        User tiana = new User(name);
-//        Cart cart = new Cart(76);
-//
-//        // When
-//        myMap.put(tiana, cart);
-//        User cloneTiana = new User(name);
-//        Cart actualCart = myMap.get(cloneTiana);
-//
-//        // Then
-//        Assert.assertEquals(cart, actualCart);
-//    }
-//
-//    @Test
-//    public void testSize_WithNoEntry(){
-//        int expectedSize = 0;
-//        Assert.assertEquals(expectedSize, myMap.size());
-//    }
-//
-//    @Test
-//    public void testSize_WithEntries(){
-//        // Given
-//        User user1 = new User("Monica");
-//        Cart cart1 = new Cart(45);
-//
-//        User user2 = new User("Quincy");
-//        Cart cart2 = new Cart(78);
-//
-//        // When
-//        myMap.put(user1, cart1);
-//        myMap.put(user2, cart2);
-//
-//        // Then
-//        int expectedSize = 2;
-//        Assert.assertEquals(expectedSize, myMap.size());
-//    }
-//
-//    @Test
-//    public void testIsEmpty_WithoutEntry(){
-//        Assert.assertTrue(myMap.isEmptry());
-//    }
-//
-//    @Test
-//    public void testisEmpty_WithEntries(){
-//        // Given
-//        User user1 = new User("Monica");
-//        Cart cart1 = new Cart(45);
-//
-//        // When
-//        myMap.put(user1, cart1);
-//
-//        // Then
-//        Assert.assertFalse(myMap.isEmptry());
-//    }
-//
-//    @Test
-//    public void testGetKeys(){
-//        // Given
-//        User user1 = new User("Zeke");
-//        Cart cart1 = new Cart(7);
-//
-//        User user2 = new User("Nona");
-//        Cart cart2 = new Cart(29);
-//
-//        // When
-//        myMap.put(user1, cart1);
-//        myMap.put(user2, cart2);
-//
-//        // Then
-//        List<User> keys = myMap.getKeys();
-//        int expectedKeySize = 2;
-//        Assert.assertEquals(expectedKeySize, keys.size());
-//        Assert.assertTrue(keys.contains(user1));
-//        Assert.assertTrue(keys.contains(user2));
-//    }
-//
-//    @Test
-//    public void testGetValues(){
-//        // Given
-//        User user1 = new User("Camille");
-//        Cart cart1 = new Cart(433);
-//
-//        User user2 = new User("Nathan");
-//        Cart cart2 = new Cart(71);
-//
-//        // When
-//        myMap.put(user1, cart1);
-//        myMap.put(user2, cart2);
-//
-//        // Then
-//        List<Cart> values = myMap.getValues();
-//        int expectedKeySize = 2;
-//        Assert.assertEquals(expectedKeySize, values.size());
-//        Assert.assertTrue(values.contains(cart1));
-//        Assert.assertTrue(values.contains(cart2));
-//    }
+package org.zipcoder.store;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+public class MyHashMapTest {
+    private MyMap myMap;
+
+    @Before
+    public void setup(){
+        myMap = new MyHashMap();
+    }
+
+    @Test
+    public void testPutAndGet_WithOneItem(){
+        User user = new User("Tiana");
+        Cart cart = new Cart(1);
+
+        // When
+        myMap.put(user, cart);
+
+        // Then
+        Cart actualCart = myMap.get(user);
+        Assert.assertEquals(cart, actualCart);
+    }
+
+    @Test
+    public void testPutAndGet_WithTwoItems(){
+        User tiana = new User("Tiana");
+        Cart tianasCart = new Cart(1134);
+
+        User john = new User("John");
+        Cart johnsCart = new Cart(42);
+
+        // When
+        myMap.put(john, johnsCart);
+        myMap.put(tiana, tianasCart);
+
+        // Then
+        Cart actualJohnsCart = myMap.get(john);
+        Assert.assertEquals(johnsCart, actualJohnsCart);
+
+        Cart actualTianasCart = myMap.get(tiana);
+        Assert.assertEquals(tianasCart, actualTianasCart);
+    }
+
+    @Test
+    public void testPutAndGet_UpdateCart(){
+        User tiana = new User("Tiana");
+        Cart tianasCart = new Cart(11);
+        myMap.put(tiana, tianasCart);
+
+        // When
+        Cart updatedCart = new Cart(99);
+        myMap.put(tiana, updatedCart);
+
+        // Then
+        Cart actualCart = myMap.get(tiana);
+        Assert.assertEquals(updatedCart, actualCart);
+    }
+
+    @Test
+    public void testGetWithoutPut(){
+        // Given
+        User user = new User("Tiana");
+
+        // When
+        Cart actualCart = myMap.get(user);
+
+        // Then
+        Assert.assertNull(actualCart);
+    }
+
+    @Test
+    public void testPutAndGet_WithDifferentKeyInstance(){
+        // Given
+        String name = "Tiana";
+        User tiana = new User(name);
+        Cart cart = new Cart(76);
+
+        // When
+        myMap.put(tiana, cart);
+        User cloneTiana = new User(name);
+        Cart actualCart = myMap.get(cloneTiana);
+
+        // Then
+        Assert.assertEquals(cart, actualCart);
+    }
+
+    @Test
+    public void testSize_WithNoEntry(){
+        int expectedSize = 0;
+        Assert.assertEquals(expectedSize, myMap.size());
+    }
+
+    @Test
+    public void testSize_WithEntries(){
+        // Given
+        User user1 = new User("Monica");
+        Cart cart1 = new Cart(45);
+
+        User user2 = new User("Quincy");
+        Cart cart2 = new Cart(78);
+
+        // When
+        myMap.put(user1, cart1);
+        myMap.put(user2, cart2);
+
+        // Then
+        int expectedSize = 2;
+        Assert.assertEquals(expectedSize, myMap.size());
+    }
+
+    @Test
+    public void testIsEmpty_WithoutEntry(){
+        Assert.assertTrue(myMap.isEmptry());
+    }
+
+    @Test
+    public void testisEmpty_WithEntries(){
+        // Given
+        User user1 = new User("Monica");
+        Cart cart1 = new Cart(45);
+
+        // When
+        myMap.put(user1, cart1);
+
+        // Then
+        Assert.assertFalse(myMap.isEmptry());
+    }
+
+    @Test
+    public void testGetKeys(){
+        // Given
+        User user1 = new User("Zeke");
+        Cart cart1 = new Cart(7);
+
+        User user2 = new User("Nona");
+        Cart cart2 = new Cart(29);
+
+        // When
+        myMap.put(user1, cart1);
+        myMap.put(user2, cart2);
+
+        // Then
+        List<User> keys = myMap.getKeys();
+        int expectedKeySize = 2;
+        Assert.assertEquals(expectedKeySize, keys.size());
+        Assert.assertTrue(keys.contains(user1));
+        Assert.assertTrue(keys.contains(user2));
+    }
+
+    @Test
+    public void testGetValues(){
+        // Given
+        User user1 = new User("Camille");
+        Cart cart1 = new Cart(433);
+
+        User user2 = new User("Nathan");
+        Cart cart2 = new Cart(71);
+
+        // When
+        myMap.put(user1, cart1);
+        myMap.put(user2, cart2);
+
+        // Then
+        List<Cart> values = myMap.getValues();
+        int expectedKeySize = 2;
+        Assert.assertEquals(expectedKeySize, values.size());
+        Assert.assertTrue(values.contains(cart1));
+        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);
-//        }
-//    }
-
-//    @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));
+    }
 }