Finished all, replaced HashMap with TreeMap

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

@@ -1,7 +1,7 @@
 package com.zipcodewilmington.phonebook;
 
 import java.util.Map;
-import java.util.HashMap;
+import java.util.TreeMap;
 import java.util.ArrayList;
 import java.util.Set;
 
@@ -10,42 +10,42 @@ import java.util.Set;
  */
 public class PhoneBook {
 
-    protected HashMap<String, Person> hashMap;
+    protected TreeMap<String, Person> treeMap;
     protected ArrayList<String> entryList;
     protected Set<String> keySet;
 
     public PhoneBook() {
-        this.hashMap = new HashMap<String, Person>();
+        this.treeMap = new TreeMap<String, Person>();
         this.entryList = new ArrayList<String>();
-        this.keySet = hashMap.keySet();
+        this.keySet = treeMap.keySet();
         //this.hashMap.put("Name_empty", new Person("Name_empty", "Phone_number_empty"));
     }
 
     //PART I
     public Person lookup(String name) {
-        return hashMap.get(name);
+        return treeMap.get(name);
     }
 
     public void addEntry(String name, String... phoneNumbers) {
-        hashMap.put(name, new Person(name, phoneNumbers));
+        treeMap.put(name, new Person(name, phoneNumbers));
     }
 
     // Changed method name for Part III
     public void removeRecord(String name) {
-        hashMap.remove(name);
+        treeMap.remove(name);
     }
 
     public Set<String> getKeySet() { //names and phone numbers
-        return hashMap.keySet();
+        return treeMap.keySet();
         //return all persons
     }
 
     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());
+        for (String key : treeMap.keySet()) {
+            sb.append(treeMap.get(key).getName() + "\n");
+            sb.append(treeMap.get(key).getPhoneNumberListString());
         }
 
         return sb;
@@ -54,8 +54,8 @@ public class PhoneBook {
 
     //PART II
     public String reverseLookup(String phoneNumber) { //lookup names from phone numbers
-        for (String name : hashMap.keySet()) {
-            if (hashMap.get(name).phoneNumberList.contains(phoneNumber) == true) {
+        for (String name : treeMap.keySet()) {
+            if (treeMap.get(name).phoneNumberList.contains(phoneNumber) == true) {
                 return name;
                 //break;
             }

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

@@ -32,7 +32,7 @@ public class PhoneBookTest {
         String actualPersonName = expectedPerson.getName();
         String actualPersonPhoneNumber = expectedPerson.phoneNumberList.get(0);
 
-        boolean actualPersonNameExists = this.phonebook.hashMap.containsKey("Jane");
+        boolean actualPersonNameExists = this.phonebook.treeMap.containsKey("Jane");
 
         Assert.assertTrue(actualPersonNameExists);
     }
@@ -42,16 +42,16 @@ public class PhoneBookTest {
     public void addEntryTest() {
         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"));
+        boolean actualPersonName = this.phonebook.treeMap.containsKey("Adam");
+        boolean actualPhoneNumber = this.phonebook.treeMap.containsValue(this.phonebook.treeMap.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);
+        String actualPhoneNumber1 = this.phonebook.treeMap.get("Adam").phoneNumberList.get(0);
+        String actualPhoneNumber2 = this.phonebook.treeMap.get("Adam").phoneNumberList.get(1);
 
         Assert.assertEquals(expectedPhoneNumber1, actualPhoneNumber1);
         Assert.assertEquals(expectedPhoneNumber2, actualPhoneNumber2);
@@ -63,8 +63,8 @@ public class PhoneBookTest {
         this.phonebook.addEntry("Bob", "(333) 444-5555");
         this.phonebook.removeRecord("Bob");
 
-        boolean actualPersonName = this.phonebook.hashMap.containsKey("Bob");
-        boolean actualPersonObject = this.phonebook.hashMap.containsValue(this.phonebook.hashMap.get("Bob"));
+        boolean actualPersonName = this.phonebook.treeMap.containsKey("Bob");
+        boolean actualPersonObject = this.phonebook.treeMap.containsValue(this.phonebook.treeMap.get("Bob"));
 
         Assert.assertFalse(actualPersonName);
         Assert.assertFalse(actualPersonObject);
@@ -76,7 +76,7 @@ public class PhoneBookTest {
         this.phonebook.addEntry("Gabriel", "(100) 000-0000", "(110) 000-0000");
 
         System.out.println("getAllEntriesTest:");
-        String expectedKeySet = "[Gabriel, Frank]";
+        String expectedKeySet = "[Frank, Gabriel]";
         String actualKeySet = this.phonebook.getKeySet().toString();
 
         Assert.assertEquals(expectedKeySet, actualKeySet);
@@ -87,12 +87,12 @@ public class PhoneBookTest {
         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" +
+        String expectedEntries = "Herbert" + "\n" +
                                  "\t" + "(200) 000-0000" + "\n" +
-                                 "\t" + "(210) 000-0000" + "\n";
+                                 "\t" + "(210) 000-0000" + "\n" +
+                                 "Isabel" + "\n" +
+                                 "\t" + "(300) 000-0000" + "\n" +
+                                 "\t" + "(310) 000-0000" + "\n";
         String actualEntries = this.phonebook.displayAllEntries().toString();
 
 //        System.out.println("displayAllEntriesTest:");
@@ -118,7 +118,7 @@ public class PhoneBookTest {
         String expectedPhoneNumber = "(000) 111-2222";
 
         String actualNameFromPhoneBook = "Ava";
-        boolean actualPhoneNumberFromPhoneBook = this.phonebook.hashMap.get(actualNameFromPhoneBook).phoneNumberList.contains(expectedPhoneNumber);
+        boolean actualPhoneNumberFromPhoneBook = this.phonebook.treeMap.get(actualNameFromPhoneBook).phoneNumberList.contains(expectedPhoneNumber);
 
         Assert.assertEquals(expectedName, this.phonebook.reverseLookup(givenPhoneNumber));
         // Then