Refactored and cleaned up

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

@@ -6,19 +6,19 @@ import java.util.*;
  * Created by leon on 1/23/18.
  */
 public class PhoneBook {
-    Map<String, List<String>> phoneBook;
+    Map<String, ArrayList<String>> phoneBook;
 
     public PhoneBook() {
-        this.phoneBook = new TreeMap<String, List<String>>();
+        this.phoneBook = new TreeMap<String, ArrayList<String>>();
     }
 
-    public boolean add(String name, String phone) {
-        if (phoneBook.containsKey(name)) {
-            phoneBook.get(name).add(phone);
+    protected boolean add(String name, String phone) {
+        if (hasEntry(name)) {
+            getArrayListFor(name).add(phone);
             return true;
 
         } else {
-            List<String> contactNumbers = new ArrayList<String>();
+            ArrayList<String> contactNumbers = new ArrayList<String>();
             contactNumbers.add(phone);
             phoneBook.put(name, contactNumbers);
         }
@@ -26,22 +26,20 @@ public class PhoneBook {
         return true;
     }
 
-    public boolean remove(String name) {
-        return phoneBook.remove(name) != null;
+    protected void remove(String name) {
+         phoneBook.remove(name);
     }
 
-    public String lookup(String name) {
-        String myNumbers = "";
-        for (String key : phoneBook.keySet()) {
-            for (int i = 0; i < phoneBook.get(key).size(); i++) {
-                myNumbers += phoneBook.get(key).get(i) + "  ";
-            }
-
+    protected String lookup(String name) {
+        String contactInfo = "";
+        ArrayList<String>phoneNumberLists = getArrayListFor(name);
+        for (String phoneNumbers:phoneNumberLists) {
+            contactInfo+=phoneNumbers + " ";
         }
-        return myNumbers;
+        return contactInfo;
     }
 
-    public String listNames() {
+    protected String listNames() {
         String names = "";
         for (String a : phoneBook.keySet()) {
             names += a + "\n";
@@ -50,27 +48,43 @@ public class PhoneBook {
         return names;
     }
 
-    public String listNamesAndNumbers() {
+    protected String listNamesAndNumbers() {
         StringBuilder namesAndNumbers = new StringBuilder();
         for (String keys : phoneBook.keySet()) {
-            List<String> contact = phoneBook.get(keys);
+            namesAndNumbers.append(keys+"==>");
+            ArrayList<String> contact = getArrayListFor(keys);
             for (String num : contact) {
-                namesAndNumbers.append(keys).append("    ").append(num);
+                namesAndNumbers.append(num+",");
             }
             namesAndNumbers.append("\n");
         }
         return namesAndNumbers.toString();
     }
 
-    public String reverseLookUp(String number) {
+    protected String reverseLookUp(String number) {
         for (String keys : phoneBook.keySet()) {
-            for (int i = 0; i < phoneBook.get(keys).size(); i++) {
-                if (phoneBook.get(keys).get(i).equals(number))
+            for (int i = 0; i < getArrayListFor(keys).size(); i++) {
+                if (getArrayListFor(keys).get(i).equals(number))
                     return keys;
             }
         }
         return null;
     }
+    protected boolean hasEntry(String name){
+        if(phoneBook.containsKey(name)){
+            return true;
+        }
+        return false;
+    }
+    protected ArrayList<String> getArrayListFor(String name){
+        return phoneBook.get(name);
+    }
+    protected void removeIndividualNumbers(String name,String number){
+        getArrayListFor(name).remove(number);
+    }
 
+    protected void removeRecord() {
 
+        phoneBook.clear();
+    }
 }

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

@@ -5,24 +5,16 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 
 /**
  * Created by leon on 1/23/18.
  */
 
 
-
-
 public class PhoneBookTest {
-    private static PhoneBook phoneBookTest;
 
-     @Before
-     public void setUp() {
-        PhoneBook phoneBookTest = new PhoneBook();
-        phoneBookTest.add("John","1234567890");
+    @Before
+    public void setUp() {
 
     }
 
@@ -31,62 +23,99 @@ public class PhoneBookTest {
     }
 
     @Test
-   public void testLookup() {
+    public void testLookup() {
         PhoneBook phoneBookTest = new PhoneBook();
-        phoneBookTest.add("James","555555555");
+        phoneBookTest.add("James", "555555555");
+        phoneBookTest.add("Charles", "2026783422");
 
-        String actual = phoneBookTest.lookup("John");
-        Assert.assertEquals("555555555  ",actual);
+        String actual = phoneBookTest.lookup("Charles");
+        Assert.assertEquals("2026783422 ", actual);
     }
+
     @Test
-    public void testListNames(){
+    public void testListNames() {
         PhoneBook phoneBookTest = new PhoneBook();
-        phoneBookTest.add("John","1234567890");
-        phoneBookTest.add("James","555555555");
+        phoneBookTest.add("John", "1234567890");
+        phoneBookTest.add("James", "555555555");
         String expected = "James\n" +
-                            "John\n";
+                "John\n";
         String actual = phoneBookTest.listNames();
         Assert.assertEquals(expected, actual);
 
     }
+
     @Test
-    public void testListNumbersAndNumbers(){
+    public void testListNumbersAndNumbers() {
         PhoneBook phoneBookTest = new PhoneBook();
-        phoneBookTest.add("John","1234567890");
-        phoneBookTest.add("James","555555555");
-        phoneBookTest.add("Micheal","5678901234");
-        String expected = "James    "+ "555555555\n"+
-                "John    "+"1234567890\n"+
-                "Micheal    "+"5678901234\n";
-        String actual =phoneBookTest.listNamesAndNumbers();
+        phoneBookTest.add("John", "1234567890");
+        phoneBookTest.add("James", "5555555555");
+        phoneBookTest.add("James", "6666666666");
+        phoneBookTest.add("Mike", "5678901234");
+        String expected = "James==>" + "5555555555,6666666666,\n" +
+                "John==>" + "1234567890,\n" +
+                "Mike==>" + "5678901234,\n";
+        String actual = phoneBookTest.listNamesAndNumbers();
         Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void testAdd(){
+    public void testAdd() {
         PhoneBook phoneBookTest = new PhoneBook();
         boolean expected = true;
-        boolean actual = phoneBookTest.add("Peter","7777777777");
+        boolean actual = phoneBookTest.add("Peter", "7777777777");
         Assert.assertEquals(expected, actual);
 
     }
+
     @Test
-    public void testRemove(){
+    public void testRemove() {
         PhoneBook phoneBookTest = new PhoneBook();
-        phoneBookTest.add("John","1234567890");
-        boolean expected =true;
-        boolean actual = phoneBookTest.remove("John");
+        phoneBookTest.add("John", "1234567890");
+        phoneBookTest.add("Peter", "7777777777");
+        String ListPreRemoving = "John==>1234567890,\n" +
+                "Peter==>7777777777,\n";
+        phoneBookTest.remove("John");
+        String postRemoving = "Peter==>7777777777,\n";
+        String expected = postRemoving;
+        String actual = phoneBookTest.listNamesAndNumbers();
         Assert.assertEquals(expected, actual);
     }
+
     @Test
     public void testReverseLookup() {
         PhoneBook phoneBookTest = new PhoneBook();
-        phoneBookTest.add("James","555555555");
+        phoneBookTest.add("James", "555555555");
 
         String actual = phoneBookTest.reverseLookUp("555555555");
-        Assert.assertEquals("James",actual);
+        Assert.assertEquals("James", actual);
+    }
+
+    @Test
+    public void testRemoveIndividualNumbers() {
+        PhoneBook phonebookeTest = new PhoneBook();
+        phonebookeTest.add("James", "2222222222");
+        phonebookeTest.add("James", "3333333333");
+
+        String expected = "James==>3333333333,\n";
+        phonebookeTest.removeIndividualNumbers("James", "2222222222");
+
+        String actual = phonebookeTest.listNamesAndNumbers();
+        Assert.assertEquals(expected, actual);
     }
 
+    @Test
+    public void testRemoveRecord() {
+        PhoneBook phoneBookTest = new PhoneBook();
+        phoneBookTest.add("Efrem", "1234567890");
+        phoneBookTest.add("Brhane", "1010101010");
+
+        phoneBookTest.removeRecord();
+
+        String expected = "";
+        String actual = phoneBookTest.listNamesAndNumbers();
+
+        Assert.assertEquals(expected, actual);
+    }
 
 
 }