before reconstruction

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

@@ -1,28 +1,53 @@
 package com.zipcodewilmington.phonebook;
 
-class Person {
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class Person {
 
     private String personName;
-    private String phoneNumber;
+    private ArrayList<String> phoneNumbers;
 
-    public Person(String personName, String phoneNumber) {
+    public Person(String personName){
         this.personName = personName;
-        this.phoneNumber = phoneNumber;
+        this.phoneNumbers = new ArrayList<>();
+        phoneNumbers
     }
 
+
     public String getPersonName() {
         return personName;
     }
 
-    public void setPersonName(String personName) {
-        this.personName = personName;
-    }
 
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
+//public String addNumbers(){
+//        return null;
+//}
+
+
+   //find a way to print each item in the ArrayList in order
+   public String getPhoneNumbers() {
+       return phoneNumbers.toString();
+   }
+//       StringBuilder sb = new StringBuilder();
+//       for(int i = 0; i < phoneNumbers.size(); i++){
+//           if(i == phoneNumbers.size()){
+//               sb.append();
+//           }
+//       }
+//        return phoneNumbers;
+//    }
+
+
+
+
+
+
+
+
 
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
     }
-}
+
+
+
+

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

@@ -1,19 +1,22 @@
 package com.zipcodewilmington.phonebook;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.*;
 
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBook {
 
-    TreeMap<String, String> phoneBook = new TreeMap<String, String>();
+    TreeMap<String, Person> phoneBook;
+
+public phoneBook(){
+    phoneBook = new TreeMap<String, Person>();
+    }
 
 
     public void addEntryToPhoneBook(String name, String phoneNumber) {
-        phoneBook.put(name, phoneNumber);
+       Person person = new Person(name, phoneNumber);
+        phoneBook.put(name, person);
     }
 
 
@@ -22,7 +25,7 @@ public class PhoneBook {
     }
 
     public String lookUp(String name) {
-        return phoneBook.get(name);
+        return phoneBook.get(name).getPhoneNumbers();
     }
 
     public String listNames() {
@@ -36,7 +39,7 @@ public class PhoneBook {
 
     public String listNumbers() {
         String completeListOfNumbers = "";
-        for (Map.Entry<String, String> entry : phoneBook.entrySet()) {
+        for (Map.Entry<String, Person> entry : phoneBook.entrySet()) {
             completeListOfNumbers += entry.getValue() + "\n";
         }
         return completeListOfNumbers;
@@ -45,17 +48,18 @@ public class PhoneBook {
 
     public String entryListAll() {
         String fullList = "";
-        for (Map.Entry<String, String> entry : phoneBook.entrySet()) {
+        for (Map.Entry<String, Person> entry : phoneBook.entrySet()) {
             fullList += entry.getKey() + " : " + entry.getValue() + "\n"; //reverse lookup
 
         }
+        System.out.println(fullList);
         return fullList;
     }
 
     public String reverseLookup(String numberToLookUp) {
-        for (Map.Entry<String,String > e : phoneBook.entrySet()) {
-            if (e.getValue().equals(numberToLookUp)){
-                return e.getKey();
+        for (Map.Entry<String,Person > entry : phoneBook.entrySet()) {
+            if (entry.getValue().equals(numberToLookUp)){
+                return entry.getKey();
             }
         }return null;
     }

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

@@ -0,0 +1,67 @@
+package com.zipcodewilmington.phonebook;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import static org.junit.Assert.*;
+
+public class PersonTest {
+
+
+    @Test
+    public void getPersonNameTest() {
+        //Given
+        Person human = new Person("Eric", "302-999-1234");
+
+        //When
+        String expectedName = "Eric";
+        String expectedNumber = "302-999-1234";
+        String actual = human.getPersonName() + human.getPhoneNumbers();
+
+
+        Assert.assertTrue(actual.contains(expectedName) && actual.contains(expectedNumber));
+    }
+
+//@Test
+//    public void addNumbersTest() {
+//        //Given
+//    Person human = new Person("Eric", "302-999-1234");
+//
+//    //When
+//    human.addNumbers("302-222-9876");
+//    String expectedNumber = "302-222-1234";
+//    String actual = human.getPhoneNumbers();
+//
+//    Assert.assertTrue(actual.contains(expectedNumber));
+//}
+
+@Test
+    public void printNameTest(){
+        //Given
+    Person human = new Person("Eric", "302-999-1234");
+
+    //When
+    String expectedName = "Eric";
+    String actual = human.getPersonName();
+
+    Assert.assertTrue(actual.contains(expectedName));
+}
+
+//@Test
+//    public void printNumbersTest(){
+//        //Given
+//    Person human = new Person("Eric", "302-999-1234");
+//    human.addNumbers("302-222-9876");
+//
+//    //When
+//    String expectedNumbers = "";
+//
+//}
+
+
+}
+

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

@@ -5,6 +5,8 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.ArrayList;
+
 /**
  * Created by leon on 1/23/18.
  */
@@ -14,13 +16,14 @@ public class PhoneBookTest {
     @Before
     public void setUp() {
         phoneBook = new PhoneBook();
-        phoneBook.addEntryToPhoneBook("Eric", "3021234567");
-        phoneBook.addEntryToPhoneBook("Bob", "3029999999");
+        phoneBook.addEntryToPhoneBook("Eric", "302-123-4567");
+        phoneBook.addEntryToPhoneBook("Bob", "302-999-9999");
     }
 
+
     @Test
     public void testAddPhoneBookEntryToPhoneBook() {
-        String phoneNumber = "3025551111";
+        String phoneNumber = "302-555-1111";
         phoneBook.addEntryToPhoneBook("eric", phoneNumber);
         String actual = phoneBook.lookUp("eric");
         Assert.assertEquals(phoneNumber, actual);
@@ -28,7 +31,7 @@ public class PhoneBookTest {
 
     @Test
     public void testRemoveEntryFromPhoneBook() {
-        String phoneNumber = "3025551111";
+        String phoneNumber = "302-555-1111";
         String name = "eric";
         phoneBook.addEntryToPhoneBook(name, phoneNumber);
         phoneBook.removeEntryFromPhoneBook("eric", phoneNumber);
@@ -50,8 +53,8 @@ public class PhoneBookTest {
     public void testListNumber() {
 
 
-        String expected = "3029999999\n" +
-                "3021234567\n";
+        String expected = "302-999-9999\n" +
+                "302-123-4567\n";
         String actual = phoneBook.listNumbers();
 
         Assert.assertEquals(expected, actual);
@@ -61,8 +64,8 @@ public class PhoneBookTest {
     public void testEntryListAll() {
 
 
-        String expected = "Bob : 3029999999\n" +
-                "Eric : 3021234567\n";
+        String expected = "Bob : 302-999-9999\n" +
+                "Eric : 302-123-4567\n";
         String actual = phoneBook.entryListAll();
 
         Assert.assertEquals(expected, actual);
@@ -74,7 +77,7 @@ public class PhoneBookTest {
     public void testReverseLookup() {
         String expected = "Bob";
 
-        String actual = phoneBook.reverseLookup("3029999999");
+        String actual = phoneBook.reverseLookup("302-999-9999");
         Assert.assertEquals(expected,actual);
     }