Part 2 of PhoneBook

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

@@ -3,11 +3,10 @@ package com.zipcodewilmington.phonebook;
 class Person {
 
     private String personName;
-
     private String phoneNumber;
 
-    public Person(String name, String phoneNumber){
-        this.personName = name;
+    public Person(String personName, String phoneNumber) {
+        this.personName = personName;
         this.phoneNumber = phoneNumber;
     }
 
@@ -15,7 +14,15 @@ class Person {
         return personName;
     }
 
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
     public String getPhoneNumber() {
         return phoneNumber;
     }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
 }

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

@@ -1,6 +1,5 @@
 package com.zipcodewilmington.phonebook;
 
-import java.util.ArrayList;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -10,45 +9,58 @@ import java.util.TreeMap;
  */
 public class PhoneBook {
 
-    TreeMap<String, Person> phoneBook = new TreeMap<String, Person>();
+    TreeMap<String, String> phoneBook = new TreeMap<String, String>();
 
 
     public void addEntryToPhoneBook(String name, String phoneNumber) {
-        phoneBook.put(name, new Person(name, phoneNumber));
+        phoneBook.put(name, phoneNumber);
     }
 
 
-    public void removePhoneBookEntryFromPhoneBook(String name) {
-        phoneBook.remove(name);
+    public void removeEntryFromPhoneBook(String name, String phoneNumber) {
+        phoneBook.remove(name, phoneNumber);
     }
 
-    public String[] listNames() {
-        return null;
+    public String lookUp(String name) {
+        return phoneBook.get(name);
+    }
+
+    public String listNames() {
+        String completeListOfNames = "";
+        for (String key : phoneBook.keySet()) {
+            completeListOfNames += key + "\n";
+        }
+
+        return completeListOfNames;
+    }
+
+    public String listNumbers() {
+        String completeListOfNumbers = "";
+        for (Map.Entry<String, String> entry : phoneBook.entrySet()) {
+            completeListOfNumbers += entry.getValue() + "\n";
+        }
+        return completeListOfNumbers;
     }
 
+
     public String entryListAll() {
         String fullList = "";
-        Set<String> keys = phoneBook.keySet();
-        for (Map.Entry<String, Person> entry: phoneBook.entrySet()) {
-            fullList += entry.getKey() + " : " + entry.getValue().getPhoneNumber();
+        for (Map.Entry<String, String> entry : phoneBook.entrySet()) {
+            fullList += entry.getKey() + " : " + entry.getValue() + "\n"; //reverse lookup
 
         }
         return fullList;
     }
-    public static void main(String[] args) {
-        PhoneBook nameNumber = new PhoneBook();
-        nameNumber.addEntryToPhoneBook("eric", "3025551111 \n");
-        nameNumber.addEntryToPhoneBook("eyan", "3025552222 \n");
-        nameNumber.entryListAll();
-        System.out.println(nameNumber.entryListAll());
 
+    public String reverseLookup(String numberToLookUp) {
+        for (Map.Entry<String,String > e : phoneBook.entrySet()) {
+            if (e.getValue().equals(numberToLookUp)){
+                return e.getKey();
+            }
+        }return null;
     }
 
 
-    public Person lookUp(String name) {
-        return phoneBook.get(name);
-
-    }
 
 
 }

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

@@ -2,21 +2,80 @@ package com.zipcodewilmington.phonebook;
 
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBookTest {
+    PhoneBook phoneBook;
+
+    @Before
+    public void setUp() {
+        phoneBook = new PhoneBook();
+        phoneBook.addEntryToPhoneBook("Eric", "3021234567");
+        phoneBook.addEntryToPhoneBook("Bob", "3029999999");
+    }
 
     @Test
     public void testAddPhoneBookEntryToPhoneBook() {
-        PhoneBook phoneBook = new PhoneBook();
         String phoneNumber = "3025551111";
         phoneBook.addEntryToPhoneBook("eric", phoneNumber);
-        String actual = phoneBook.lookUp("eric").getPhoneNumber();
+        String actual = phoneBook.lookUp("eric");
         Assert.assertEquals(phoneNumber, actual);
     }
 
+    @Test
+    public void testRemoveEntryFromPhoneBook() {
+        String phoneNumber = "3025551111";
+        String name = "eric";
+        phoneBook.addEntryToPhoneBook(name, phoneNumber);
+        phoneBook.removeEntryFromPhoneBook("eric", phoneNumber);
+
+        String actual = phoneBook.lookUp("eric");
+        Assert.assertEquals(null, actual);
+    }
+
+    @Test
+    public void testListNames() {
+        String expected = "Bob\n" +
+                "Eric\n";
+        String actual = phoneBook.listNames();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testListNumber() {
+
+
+        String expected = "3029999999\n" +
+                "3021234567\n";
+        String actual = phoneBook.listNumbers();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testEntryListAll() {
+
+
+        String expected = "Bob : 3029999999\n" +
+                "Eric : 3021234567\n";
+        String actual = phoneBook.entryListAll();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+
+
+    @Test
+    public void testReverseLookup() {
+        String expected = "Bob";
+
+        String actual = phoneBook.reverseLookup("3029999999");
+        Assert.assertEquals(expected,actual);
+    }
 
 }