finished all except display() all entries in part I

src/main/java/com/zipcodewilmington/phonebook/Person.java

@@ -1,29 +1,43 @@
 package com.zipcodewilmington.phonebook;
 
+import java.util.ArrayList;
+
 public class Person {
 
     private String name;
-    private String phoneNumber;
+    public ArrayList<String> phoneNumberList;
 
-    public Person(String name, String phoneNumber) {
+    public Person(String name, String... phoneNumbers) {
         this.name = name;
-        this.phoneNumber = phoneNumber;
+        this.phoneNumberList = new ArrayList<String>();
+        for (String phoneNumber : phoneNumbers) {
+            this.phoneNumberList.add(phoneNumber);
+        }
     }
 
     public void setName(String name) {
         this.name = name;
     }
 
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
     public String getName() {
         return name;
     }
 
-    public String getPhoneNumber() {
-        return phoneNumber;
+    public void addPhoneNumbers(String... phoneNumbersToAdd) {
+        for (String phoneNumber : phoneNumbersToAdd) {
+            this.phoneNumberList.add(phoneNumber);
+        }
+
     }
 
+    public void removePhoneNumbers(String... phoneNumbersToRemove) {
+        for (String phoneNumber : phoneNumbersToRemove) {
+            this.phoneNumberList.remove(phoneNumber);
+        }
+
+    }
+
+    // method to return phone number list?
+
+
 }

src/main/java/com/zipcodewilmington/phonebook/PhoneBook.java

@@ -13,7 +13,8 @@ public class PhoneBook {
 
     public PhoneBook() {
         this.hashMap = new HashMap<String, Person>();
-        this.hashMap.put("Name_empty", new Person("Name_empty", "Phone_number_empty"));
+        this.entryList = new ArrayList<String>();
+        //this.hashMap.put("Name_empty", new Person("Name_empty", "Phone_number_empty"));
     }
 
     //PART I
@@ -21,20 +22,23 @@ public class PhoneBook {
         return hashMap.get(name);
     }
 
-    public void addEntry(String name, String phoneNumber) {
-        hashMap.put(name, new Person(name, phoneNumber));
+    public void addEntry(String name, String... phoneNumbers) {
+        hashMap.put(name, new Person(name, phoneNumbers));
     }
 
-    public void removeEntry(String name) {
+    // Changed method name for Part III
+    public void removeRecord(String name) {
         hashMap.remove(name);
     }
 
+    /*
     public ArrayList<String> getEntryList() { //names
         for (Map.Entry<String, Person> entry: hashMap.entrySet()) {
             entryList.add(entry.getKey() + " : " + entry.getValue().getPhoneNumber());
         }
         return entryList;
     }
+    */
 
     public String[] entriesList() { //names and phone numbers
         return new String[0];
@@ -43,7 +47,7 @@ public class PhoneBook {
     //PART II
     public String reverseLookup(String phoneNumber) { //lookup names from phone numbers
         for (String name : hashMap.keySet()) {
-            if (hashMap.get(name).getPhoneNumber() == phoneNumber) {
+            if (hashMap.get(name).phoneNumberList.contains(phoneNumber) == true) {
                 return name;
                 //break;
             }

src/test/java/com/zipcodewilmington/phonebook/PersonTest.java

@@ -17,8 +17,9 @@ public class PersonTest {
         this.person = new Person("John Smith", "(111) 222-3333");
     }
 
+
     @Test
-    public void testSetName() {
+    public void setNameTest() {
         String expected = "John Smith";
         person.setName(expected);
         String actual = person.getName();
@@ -26,25 +27,40 @@ public class PersonTest {
     }
 
     @Test
-    public void testSetPhoneNumber() {
-        String expected = "(111) 222-3333";
-        person.setPhoneNumber(expected);
-        String actual = person.getPhoneNumber();
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
-    public void testGetName() {
+    public void getNameTest() {
         String expected = "John Smith";
         String actual = person.getName();
         Assert.assertEquals(expected, actual);
     }
 
-    @Test
-    public void testGetPhoneNumber() {
-        String expected = "(111) 222-3333";
-        String actual = person.getPhoneNumber();
-        Assert.assertEquals(expected, actual);
+    public void addPhoneNumbersTest() {
+        this.person = new Person("John Smith", "(000) 000-0000");
+        String expectedPhoneNumberToAdd1 = "(111) 111-1111";
+        String expectedPhoneNumberToAdd2 = "(222) 222-2222";
+
+        this.person.addPhoneNumbers(expectedPhoneNumberToAdd1, expectedPhoneNumberToAdd2);
+
+        String actualPhoneNumberAdded1 = this.person.phoneNumberList.get(1);
+        String actualPhoneNumberAdded2 = this.person.phoneNumberList.get(2);
+
+        Assert.assertEquals(expectedPhoneNumberToAdd1, actualPhoneNumberAdded1);
+        Assert.assertEquals(expectedPhoneNumberToAdd2, actualPhoneNumberAdded2);
+
+    }
+
+    public void removePhoneNumbersTest() {
+        this.person = new Person("John Smith", "(000) 000-0000", "(111) 111-1111", "(222) 222-2222");
+        String expectedPhoneNumberToDelete1 = "(111) 111-1111";
+        String expectedPhoneNumberToDelete2 = "(222) 222-2222";
+
+        this.person.removePhoneNumbers(expectedPhoneNumberToDelete1, expectedPhoneNumberToDelete2);
+
+        boolean isPhoneNumberInList1 = this.person.phoneNumberList.contains(expectedPhoneNumberToDelete1);
+        boolean isPhoneNumberInList2 = this.person.phoneNumberList.contains(expectedPhoneNumberToDelete2);
+
+        Assert.assertFalse(isPhoneNumberInList1);
+        Assert.assertFalse(isPhoneNumberInList2);
     }
 
 }
+

src/test/java/com/zipcodewilmington/phonebook/PhoneBookTest.java

@@ -23,36 +23,47 @@ public class PhoneBookTest {
         Assert.assertNotNull(this.phonebook);
     }
 
+
     @Test
     public void lookupTest() {
         Person expectedPerson = new Person("Jane", "(111) 222-3333");
         this.phonebook.addEntry("Jane", "(111) 222-3333");
 
-        String expectedPersonName = expectedPerson.getName();
-        String expectedPersonPhoneNumber = expectedPerson.getPhoneNumber();
+        String actualPersonName = expectedPerson.getName();
+        String actualPersonPhoneNumber = expectedPerson.phoneNumberList.get(0);
 
-        boolean actualPersonName = this.phonebook.hashMap.containsKey("Jane");
-        boolean actualPhoneNumber = this.phonebook.hashMap.containsValue(this.phonebook.hashMap.get("Jane"));
+        boolean actualPersonNameExists = this.phonebook.hashMap.containsKey("Jane");
+        //boolean actualPhoneNumberExists = this.phonebook.hashMap.get("Jane").phoneNumberList.get(0);
 
-        Assert.assertTrue(actualPersonName);
-        Assert.assertTrue(actualPhoneNumber);
+        Assert.assertTrue(actualPersonNameExists);
+        //Assert.assertTrue(actualPhoneNumberExists);
     }
 
+
     @Test
     public void addEntryTest() {
-        this.phonebook.addEntry("Adam", "(222) 333-4444");
+        this.phonebook.addEntry("Adam", "(000) 000-0000", "(111) 111-1111");
 
         boolean actualPersonName = this.phonebook.hashMap.containsKey("Adam");
         boolean actualPhoneNumber = this.phonebook.hashMap.containsValue(this.phonebook.hashMap.get("Adam"));
-
         Assert.assertTrue(actualPersonName);
         Assert.assertTrue(actualPhoneNumber);
+
+        String expectedPhoneNumber1 = "(000) 000-0000";
+        String expectedPhoneNumber2 = "(111) 111-1111";
+
+        String actualPhoneNumber1 = this.phonebook.hashMap.get("Adam").phoneNumberList.get(0);
+        String actualPhoneNumber2 = this.phonebook.hashMap.get("Adam").phoneNumberList.get(1);
+
+        Assert.assertEquals(expectedPhoneNumber1, actualPhoneNumber1);
+        Assert.assertEquals(expectedPhoneNumber2, actualPhoneNumber2);
+
     }
 
     @Test
-    public void removeEntryTest() {
+    public void removeRecordTest() {
         this.phonebook.addEntry("Bob", "(333) 444-5555");
-        this.phonebook.removeEntry("Bob");
+        this.phonebook.removeRecord("Bob");
 
         boolean actualPersonName = this.phonebook.hashMap.containsKey("Bob");
         boolean actualPersonObject = this.phonebook.hashMap.containsValue(this.phonebook.hashMap.get("Bob"));
@@ -61,6 +72,7 @@ public class PhoneBookTest {
         Assert.assertFalse(actualPersonObject);
     }
 
+    /*
     @Test
     public void getEntryListTest() {
         this.phonebook.addEntry("Ava", "(000) 111-2222");
@@ -81,7 +93,9 @@ public class PhoneBookTest {
         Assert.assertFalse(actualPersonName);
         Assert.assertFalse(actualPersonObject);
         */
+    /*
     }
+    */
 
     @Test
     public void reverseLookupTest() {
@@ -98,11 +112,11 @@ public class PhoneBookTest {
         String expectedName = "Ava";
         String expectedPhoneNumber = "(000) 111-2222";
 
-        String actualNameFromPerson = expectedPerson.getName();
-        String actualPhoneNumberFromPerson = expectedPerson.getPhoneNumber();
+        //String actualNameFromPerson = expectedPerson.getName();
+        //String actualPhoneNumberFromPerson = expectedPerson.getPhoneNumber();
 
         String actualNameFromPhoneBook = "Ava";
-        String actualPhoneNumberFromPhoneBook = this.phonebook.hashMap.get(actualNameFromPhoneBook).getPhoneNumber();
+        boolean actualPhoneNumberFromPhoneBook = this.phonebook.hashMap.get(actualNameFromPhoneBook).phoneNumberList.contains(expectedPhoneNumber);
 
         Assert.assertEquals(expectedName, this.phonebook.reverseLookup(givenPhoneNumber));
         // Then