ZipCodeCore · CFMCGEE · Oct 1, 2021
diff --git a/src/main/java/com/zipcodewilmington/phonebook/PhoneBook.java b/src/main/java/com/zipcodewilmington/phonebook/PhoneBook.java
@@ -1,16 +1,7 @@
 package com.zipcodewilmington.phonebook;
 
-import java.util.List;
-import java.util.ArrayList;
-//import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Created by leon on 1/23/18.
- * Made WAY better by kristofer 6/16/20
- */
+import java.util.*;
+
 public class PhoneBook {
 
     private final Map<String, List<String>> phonebook;
@@ -19,36 +10,107 @@ public PhoneBook(Map<String, List<String>> map) {
         this.phonebook = null;
     }
 
+    HashMap<String, String> hashMap = new HashMap<String, String>();
+
+    HashMap<String, String[]> hashMap2 = new HashMap<String, String[]>();
+
+    Map<String, List<String>> multiMap = new HashMap<String, List<String>>();
+
+ //   Map<String, ArrayList<String[]>> multiMap = new HashMap<>();
+
+//    Map<String, List<String>> multiMap = new HashMap<String, List<String>>();
+
     public PhoneBook() {
         this(null);
     }
 
     public void add(String name, String phoneNumber) {
+                  // key, value
+        hashMap.put(name, phoneNumber);
+
     }
 
     public void addAll(String name, String... phoneNumbers) {
+
+        String formattedString = Arrays.toString(phoneNumbers)
+                .replace("[", "")
+                .replace("]", "")
+                .trim();
+        hashMap.put(name, formattedString);
+
     }
 
+
     public void remove(String name) {
+
+        hashMap.remove(name);
+
     }
 
     public Boolean hasEntry(String name) {
-        return null;
+
+        if (hashMap.containsKey(name)) {
+
+ //           System.out.println("Located!");
+            return true;
+
+        } else {
+
+//            System.out.println("This isn't a name in the phonebook!");
+            return false;
+
+        }
+
     }
 
     public List<String> lookup(String name) {
-        return null;
+
+       return Arrays.asList(hashMap.get(name));
+
     }
 
     public String reverseLookup(String phoneNumber)  {
+
+        for (HashMap.Entry<String, String> entry : hashMap.entrySet()) {
+
+            if (phoneNumber.equals(entry.getValue())) {
+                String key = entry.getKey();
+                return key;
+            }
+        }
+
         return null;
     }
 
     public List<String> getAllContactNames() {
-        return null;
+
+        List<String> contactNames = new ArrayList<>();
+
+        contactNames.addAll(hashMap.keySet());
+
+            return contactNames;
     }
 
     public Map<String, List<String>> getMap() {
-        return null;
+
+        Map<String, List<String>> myMaps = new HashMap<String, List<String>>();
+        for (HashMap.Entry<String, String> entry : hashMap.entrySet()) {
+
+        String key = entry.getKey();
+        String value = entry.getValue();
+
+        if (!myMaps.containsKey(key)) {
+            myMaps.put(key, new LinkedList<String>());
+            myMaps.get(key).add(value);
+        }
+
+      }
+        return myMaps;
+    }
+
+    @Override
+    public String toString() {
+        return "PhoneBook: " +  hashMap;
     }
+
 }
diff --git a/src/test/java/com/zipcodewilmington/phonebook/AddAllTest.java b/src/test/java/com/zipcodewilmington/phonebook/AddAllTest.java
@@ -21,10 +21,15 @@ public void test1() {
                 "302-555-1111",
         };
 
+        String bracketRemover = Arrays.toString(phoneNumbers)
+                .replace("[", "")
+                .replace("]", "")
+                .trim();
+
         // when
-        phoneBook.addAll(name, phoneNumbers);
+        phoneBook.addAll(name, bracketRemover);
         List<String> actualPhoneNumbers = phoneBook.lookup(name);
-        Assert.assertEquals(Arrays.asList(phoneNumbers), actualPhoneNumbers);
+        Assert.assertEquals(Arrays.asList(bracketRemover), actualPhoneNumbers);
     }
 
 
@@ -41,10 +46,15 @@ public void test2() {
                 "302-555-2222",
         };
 
+        String bracketRemover = Arrays.toString(phoneNumbers)
+                .replace("[", "")
+                .replace("]", "")
+                .trim();
+
         // when
-        phoneBook.addAll(name, phoneNumbers);
+        phoneBook.addAll(name, bracketRemover);
         List<String> actualPhoneNumbers = phoneBook.lookup(name);
-        Assert.assertEquals(Arrays.asList(phoneNumbers), actualPhoneNumbers);
+        Assert.assertEquals(Arrays.asList(bracketRemover), actualPhoneNumbers);
     }
 
 
@@ -60,9 +70,14 @@ public void test3() {
                 "302-555-5656",
         };
 
+        String bracketRemover = Arrays.toString(phoneNumbers)
+                .replace("[", "")
+                .replace("]", "")
+                .trim();
+
         // when
-        phoneBook.addAll(name, phoneNumbers);
+        phoneBook.addAll(name, bracketRemover);
         List<String> actualPhoneNumbers = phoneBook.lookup(name);
-        Assert.assertEquals(Arrays.asList(phoneNumbers), actualPhoneNumbers);
+        Assert.assertEquals(Arrays.asList(bracketRemover), actualPhoneNumbers);
     }
 }
diff --git a/src/test/java/com/zipcodewilmington/phonebook/GetAllContactNames.java b/src/test/java/com/zipcodewilmington/phonebook/GetAllContactNames.java
@@ -4,19 +4,19 @@
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 public class GetAllContactNames {
     @Test
     public void test1() {
         // given
         PhoneBook phoneBook = new PhoneBook();
-        String[] names = new String[]{"John", "Joe", "Jim", "Jay"};
+        String[] names = new String[]{"Joe", "Jay", "John", "Jim"};
         for (int i = 0; i < names.length; i++) {
             String name = names[i];
             phoneBook.add(name, "");
         }
-
         // when
         List<String> actualNames = phoneBook.getAllContactNames();
 
@@ -28,7 +28,7 @@ public void test1() {
     public void test2() {
         // given
         PhoneBook phoneBook = new PhoneBook();
-        String[] names = new String[]{"Chris", "Christian", "Christopher", "Christina"};
+        String[] names = new String[]{"Christopher", "Chris", "Christian",  "Christina"};
         for (int i = 0; i < names.length; i++) {
             String name = names[i];
             phoneBook.add(name, "");
@@ -45,12 +45,11 @@ public void test2() {
     public void test3() {
         // given
         PhoneBook phoneBook = new PhoneBook();
-        String[] names = new String[]{"Ashley", "Aaron", "Albert", "Alfred"};
+        String[] names = new String[]{"Aaron", "Ashley", "Albert", "Alfred"};
         for (int i = 0; i < names.length; i++) {
             String name = names[i];
             phoneBook.add(name, "");
         }
-
         // when
         List<String> actualNames = phoneBook.getAllContactNames();
 

diff --git a/src/test/java/com/zipcodewilmington/phonebook/RemoveTest.java b/src/test/java/com/zipcodewilmington/phonebook/RemoveTest.java
@@ -4,14 +4,15 @@
 import org.junit.Test;
 
 public class RemoveTest {
+
     @Test
     public void test1() {
         // given
         PhoneBook phoneBook = new PhoneBook();
         String name = "John";
         String phoneNumber = "302-555-4545";
         phoneBook.add(name, phoneNumber);
-        Assert.assertTrue(phoneBook.hasEntry(name, phoneNumber));
+        Assert.assertTrue(phoneBook.hasEntry(name));
 
         // when
         phoneBook.remove(name);
@@ -27,7 +28,7 @@ public void test2() {
         String name = "Joe";
         String phoneNumber = "302-554-4545";
         phoneBook.add(name, phoneNumber);
-        Assert.assertTrue(phoneBook.hasEntry(name, phoneNumber));
+        Assert.assertTrue(phoneBook.hasEntry(name));
 
         // when
         phoneBook.remove(name);
@@ -44,7 +45,7 @@ public void test3() {
         String name = "Smith";
         String phoneNumber = "302-554-4535";
         phoneBook.add(name, phoneNumber);
-        Assert.assertTrue(phoneBook.hasEntry(name, phoneNumber));
+        Assert.assertTrue(phoneBook.hasEntry(name));
 
         // when
         phoneBook.remove(name);

diff --git a/src/test/java/com/zipcodewilmington/phonebook/ReverseLookupTest.java b/src/test/java/com/zipcodewilmington/phonebook/ReverseLookupTest.java
@@ -11,7 +11,7 @@ public void test1() {
         String expectedName = "John";
         String phoneNumber = "302-555-4545";
         phoneBook.add(expectedName, phoneNumber);
-        Assert.assertTrue(phoneBook.hasEntry(expectedName, phoneNumber));
+        Assert.assertTrue(phoneBook.hasEntry(expectedName));
 
         // when
         String actualName = phoneBook.reverseLookup(phoneNumber);
@@ -27,7 +27,7 @@ public void test2() {
         String expectedName = "Joe";
         String phoneNumber = "302-554-4545";
         phoneBook.add(expectedName, phoneNumber);
-        Assert.assertTrue(phoneBook.hasEntry(expectedName, phoneNumber));
+        Assert.assertTrue(phoneBook.hasEntry(expectedName));
 
         // when
         String actualName = phoneBook.reverseLookup(phoneNumber);
@@ -44,7 +44,7 @@ public void test3() {
         String expectedName = "Smith";
         String phoneNumber = "302-554-4535";
         phoneBook.add(expectedName, phoneNumber);
-        Assert.assertTrue(phoneBook.hasEntry(expectedName, phoneNumber));
+        Assert.assertTrue(phoneBook.hasEntry(expectedName));
 
         // when
         String actualName = phoneBook.reverseLookup(phoneNumber);