lab finished

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 size() == 0;
     }
 
     @Override
     public Cart get(User key) {
         // find the cart associate with the key
+        for (Entry current : entries) {
+            if (current.getKey().equals(key)) {
+                return current.getValue();
+            }
+        }
         return null;
     }
 
     @Override
     public void put(User key, Cart value) {
         // add the key, value entry to the entries list
+        boolean entryNotAdded = true;
+        for (Entry current : entries) {
+            if (current.getKey().equals(key)) {
+                entryNotAdded = false;
+                current.setValue(value);
+            }
+        }
+        if (entryNotAdded) {
+            Entry entry = new Entry(key, value);
+            entries.add(entry);
+        }
     }
 
 
     @Override
     public List<User> getKeys() {
         // get all the keys in the map
-        return null;
+        List<User> listOfUsers = new ArrayList<>();
+        for (Entry current : entries) {
+            listOfUsers.add(current.getKey());
+        }
+        return listOfUsers;
     }
 
     @Override
     public List<Cart> getValues() {
         // get all the values in the map
-        return null;
+        List<Cart> listOfCarts = new ArrayList<>();
+        for (Entry current : entries) {
+            listOfCarts.add(current.getValue());
+        }
+        return listOfCarts;
     }
 
     @Override
     public Cart remove(User key) {
+        for (Entry current : entries) {
+            if (current.getKey().equals(key)) {
+                entries.remove(current);
+                return current.getValue();
+            }
+        }
         return null;
     }
 }

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,36 +19,73 @@ public class MyHashMap implements MyMap{
 
     @Override
     public int size() {
-        return -1;
+        int size = 0;
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            size += entries[i].size();
+        }
+        return size;
     }
 
     @Override
     public boolean isEmptry() {
-        return false;
+        return size() == 0;
     }
 
     @Override
     public Cart get(User key) {
+        for (Entry current : entries[bucketIndex(key)]) {
+            if (current.getKey().equals(key)) {
+                return current.getValue();
+            }
+        }
         return null;
     }
 
     @Override
     public void put(User key, Cart value) {
-
+        boolean entryNotAdded = true;
+        for (Entry current : entries[bucketIndex(key)]) {
+            if (current.getKey().equals(key)) {
+                entryNotAdded = false;
+                current.setValue(value);
+            }
+        }
+        if (entryNotAdded) {
+            Entry entry = new Entry(key, value);
+            entries[bucketIndex(key)].add(entry);
+        }
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        List<User> listOfUsers = new ArrayList<>();
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            for (Entry current : entries[i]) {
+                listOfUsers.add(current.getKey());
+            }
+        }
+        return listOfUsers;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> listOfCarts = new ArrayList<>();
+        for (int i = 0; i < BUCKET_SIZE; i++) {
+            for (Entry current : entries[i]) {
+                listOfCarts.add(current.getValue());
+            }
+        }
+        return listOfCarts;
     }
 
     @Override
     public Cart remove(User key) {
+        for (Entry current : entries[bucketIndex(key)]) {
+            if (current.getKey().equals(key)) {
+                entries[bucketIndex(key)].remove(current);
+                return current.getValue();
+            }
+        }
         return null;
     }
 

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

@@ -11,6 +11,7 @@ public interface MyMap {
 
     /**
      * @return true if the map has one or more item in it. False otherwise.
+     * Test is built vice versa - true when list is empty, false otherwise
      */
     public boolean isEmptry();
 

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

@@ -37,4 +37,12 @@ public class User {
     public void setName(String name) {
         this.name = name;
     }
+
+    public boolean equals(User user) {
+        return Objects.equals(user.getId(), this.id) && Objects.equals(user.getName(), this.name);
+    }
+
+    public int hashCode() {
+        return Objects.hash(this.id, this.name);
+    }
 }

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

@@ -175,57 +175,57 @@ public class ListMapTest {
     }
 
 //    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 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));
-//    }
+    @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));
+    }
 }