Finished display() entries method, but need alphabetical order

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

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 public class Person {
 
     private String name;
-    public ArrayList<String> phoneNumberList;
+    protected ArrayList<String> phoneNumberList;
 
     public Person(String name, String... phoneNumbers) {
         this.name = name;
@@ -23,6 +23,20 @@ public class Person {
         return name;
     }
 
+    public ArrayList<String> getPhoneNumberListArray() {
+        return phoneNumberList;
+    }
+
+    public String getPhoneNumberListString() {
+
+        StringBuilder sb = new StringBuilder();
+
+        for (String phoneNumber : phoneNumberList) {
+            sb.append("\t" + phoneNumber + "\n");
+        }
+        return sb.toString();
+    }
+
     public void addPhoneNumbers(String... phoneNumbersToAdd) {
         for (String phoneNumber : phoneNumbersToAdd) {
             this.phoneNumberList.add(phoneNumber);

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

@@ -3,6 +3,8 @@ package com.zipcodewilmington.phonebook;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.Set;
+
 /**
  * Created by leon on 1/23/18.
  */
@@ -10,10 +12,12 @@ public class PhoneBook {
 
     protected HashMap<String, Person> hashMap;
     protected ArrayList<String> entryList;
+    protected Set<String> keySet;
 
     public PhoneBook() {
         this.hashMap = new HashMap<String, Person>();
         this.entryList = new ArrayList<String>();
+        this.keySet = hashMap.keySet();
         //this.hashMap.put("Name_empty", new Person("Name_empty", "Phone_number_empty"));
     }
 
@@ -31,17 +35,21 @@ public class PhoneBook {
         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 Set<String> getKeySet() { //names and phone numbers
+        return hashMap.keySet();
+        //return all persons
     }
-    */
 
-    public String[] entriesList() { //names and phone numbers
-        return new String[0];
+    public StringBuilder displayAllEntries() { //names and phone numbers
+        StringBuilder sb = new StringBuilder();
+
+        for (String key : hashMap.keySet()) {
+            sb.append(hashMap.get(key).getName() + "\n");
+            sb.append(hashMap.get(key).getPhoneNumberListString());
+        }
+
+        return sb;
+        //call getentries
     }
 
     //PART II
@@ -55,8 +63,4 @@ public class PhoneBook {
         return "No_name";
     }
 
-    //PART III
-    //after I'm done w/ Part I and Part II
-
-
 }

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

@@ -1,9 +1,13 @@
 package com.zipcodewilmington.phonebook;
 
+import com.sun.tools.doclets.formats.html.SourceToHTMLConverter;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import javax.sound.midi.Soundbank;
+import java.util.Arrays;
+
 /**
  * Created by Luis J. Romero on 2/12/2018
  */
@@ -17,7 +21,6 @@ public class PersonTest {
         this.person = new Person("John Smith", "(111) 222-3333");
     }
 
-
     @Test
     public void setNameTest() {
         String expected = "John Smith";
@@ -34,6 +37,35 @@ public class PersonTest {
     }
 
     @Test
+    public void getPhoneNumberListArrayTest() {
+        this.person = new Person("Adam", "(000) 000-0000", "(011) 111-1111");
+
+        String expectedPhoneNumber1 = "(000) 000-0000";
+        String expectedPhoneNumber2 = "(011) 111-1111";
+
+        String actualPhoneNumber1 = person.getPhoneNumberListArray().get(0);
+        String actualPhoneNumber2 = person.getPhoneNumberListArray().get(1);
+
+        Assert.assertEquals(expectedPhoneNumber1, actualPhoneNumber1);
+        Assert.assertEquals(expectedPhoneNumber2, actualPhoneNumber2);
+    }
+
+    @Test
+    public void getPhoneNumberListArrayStringTest() {
+        this.person = new Person("Adam", "(000) 000-0000", "(011) 111-1111");
+
+        String expectedPhoneNumbers = "\t" + "(000) 000-0000" + "\n" +
+                                      "\t" + "(011) 111-1111" + "\n";
+        String actualPhoneNumbers = person.getPhoneNumberListString();
+
+//        System.out.println(expectedPhoneNumbers);
+//        System.out.println(person.getPhoneNumberListString());
+
+        Assert.assertEquals(expectedPhoneNumbers, actualPhoneNumbers);
+    }
+
+
+    @Test
     public void addPhoneNumbersTest() {
         this.person = new Person("John Smith", "(000) 000-0000");
         String expectedPhoneNumberToAdd1 = "(111) 111-1111";

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

@@ -33,10 +33,8 @@ public class PhoneBookTest {
         String actualPersonPhoneNumber = expectedPerson.phoneNumberList.get(0);
 
         boolean actualPersonNameExists = this.phonebook.hashMap.containsKey("Jane");
-        //boolean actualPhoneNumberExists = this.phonebook.hashMap.get("Jane").phoneNumberList.get(0);
 
         Assert.assertTrue(actualPersonNameExists);
-        //Assert.assertTrue(actualPhoneNumberExists);
     }
 
 
@@ -72,30 +70,37 @@ public class PhoneBookTest {
         Assert.assertFalse(actualPersonObject);
     }
 
-    /*
     @Test
-    public void getEntryListTest() {
-        this.phonebook.addEntry("Ava", "(000) 111-2222");
-        this.phonebook.addEntry("Brian", "(222) 333-4444");
-        this.phonebook.addEntry("Charlie", "(444) 555-6666");
-        this.phonebook.addEntry("David", "(666) 777-8888");
-        this.phonebook.addEntry("Edward", "(777) 888-9999");
-        this.phonebook.addEntry("Frank", "(888) 999-0000");
-
-        Assert.assertNotNull(this.phonebook.getEntryList());
+    public void getKeySetTest() {
+        this.phonebook.addEntry("Frank", "(000) 000-0000", "(100) 000-0000");
+        this.phonebook.addEntry("Gabriel", "(100) 000-0000", "(110) 000-0000");
 
-        /*
-        this.phonebook.removeEntry("Bob");
+        System.out.println("getAllEntriesTest:");
+        String expectedKeySet = "[Gabriel, Frank]";
+        String actualKeySet = this.phonebook.getKeySet().toString();
 
-        boolean actualPersonName = this.phonebook.hashMap.containsKey("Bob");
-        boolean actualPersonObject = this.phonebook.hashMap.containsValue(this.phonebook.hashMap.get("Bob"));
+        Assert.assertEquals(expectedKeySet, actualKeySet);
+    }
 
-        Assert.assertFalse(actualPersonName);
-        Assert.assertFalse(actualPersonObject);
-        */
-    /*
+    @Test
+    public void displayAllEntriesTest() {
+        this.phonebook.addEntry("Herbert", "(200) 000-0000", "(210) 000-0000");
+        this.phonebook.addEntry("Isabel", "(300) 000-0000", "(310) 000-0000");
+
+        String expectedEntries = "Isabel" + "\n" +
+                                 "\t" + "(300) 000-0000" + "\n" +
+                                 "\t" + "(310) 000-0000" + "\n" +
+                                 "Herbert" + "\n" +
+                                 "\t" + "(200) 000-0000" + "\n" +
+                                 "\t" + "(210) 000-0000" + "\n";
+        String actualEntries = this.phonebook.displayAllEntries().toString();
+
+//        System.out.println("displayAllEntriesTest:");
+//        System.out.println(expectedEntries);
+//        System.out.println(actualEntries);
+
+        Assert.assertEquals(expectedEntries, actualEntries);
     }
-    */
 
     @Test
     public void reverseLookupTest() {
@@ -112,9 +117,6 @@ public class PhoneBookTest {
         String expectedName = "Ava";
         String expectedPhoneNumber = "(000) 111-2222";
 
-        //String actualNameFromPerson = expectedPerson.getName();
-        //String actualPhoneNumberFromPerson = expectedPerson.getPhoneNumber();
-
         String actualNameFromPhoneBook = "Ava";
         boolean actualPhoneNumberFromPhoneBook = this.phonebook.hashMap.get(actualNameFromPhoneBook).phoneNumberList.contains(expectedPhoneNumber);