almost finished draft

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

@@ -30,29 +30,40 @@ public class PhoneBook {
     }
 
     //remove a name & number entry
-    public void remove(String name) {
+    public String remove(String name) {
+        String removeName = name + " " + treeMap.get(name) + " has been removed";
         if(treeMap.containsKey(name)) {
             treeMap.remove(name);
         }
+        return removeName;
     }
 
     //find phone number lookup by name
-    public void lookup(String name) {
-        if(treeMap.containsKey(name)) {
-            treeMap.get(name);
+    public String lookup(String name) {
+        String look = "";
+        if (treeMap.containsKey(name)) {
+            look = treeMap.get(name);
+        } else {
+            look = name + " is not in database";
         }
-
+        return look;
     }
 
     //print out all of the entries in PhoneBook
     //need to work on code for formatting
+
     public String display(){
-        String printOut = "";
+        StringBuilder printOut = new StringBuilder();
         for(Map.Entry<String, String> entry: treeMap.entrySet()) {
-            printOut += entry.getKey() + " " + entry.getValue() + "\n";
+            printOut
+                    .append(entry.getKey())
+                    .append(" ")
+                    .append(entry.getValue())
+                    .append("\n");
         }
+        String print = printOut.toString();
         System.out.println(printOut);
-        return printOut;
+        return print;
     }
 
 

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

@@ -9,48 +9,68 @@ import java.util.TreeMap;
  * Created by leon on 1/23/18.
  */
 public class PhoneBookTest {
-
+    @Test
     public void testDefaultConstructor() {
 
         PhoneBook book = new PhoneBook();
+        book.add("Robert", "302-555-1234");
+        Assert.assertNotNull(book);
 
 
 
     }
-
+    @Test
     public void testConstructorWithArgument() {
 
     }
 
+    @Test
     public void testAdd() {
         PhoneBook book = new PhoneBook();
         book.add("Bob", "302-555-1234");
-        Assert.assertNotNull(book);
+
+
     }
 
+    @Test
     public void testRemove() {
 
+        //Given
+        PhoneBook book = new PhoneBook();
+        book.add("Robert", "302-555-1234");
+        String expectedValue = "Robert " + book.lookup("Robert") + " has been removed";
+        book.add("Robert", expectedValue);
+
+        //When
+        String actualNumber = book.remove("Robert");
+
+        //Then
+        Assert.assertEquals(expectedValue, actualNumber );
+
+
     }
 
+    @Test
     public void testLookup(){
 
         //Given
-        String expectedNumber = "302-555-1234";
         PhoneBook book = new PhoneBook();
-        book.add("Bob", "302-555-1234");
+        String expectedNumber = "302-555-1234";
+        book.add("Bob", expectedNumber);
 
         //When
-        book.lookup("Bob");
+        String actualNumber = book.lookup("Bob");
 
         //Then
-        Assert.assertEquals(expectedNumber, "302-555-1234");
+        Assert.assertEquals(expectedNumber, actualNumber);
     }
-
+    @Test
     public void testDisplay() {
-        //Given
-        String expectedNameNumber = "Bob 302-555-1234 \n";
+        //Given: need help from instructor
+        String expectedNameNumber = "Bob 302-555-1234\nFrank 777-555-1111\n";
         PhoneBook book = new PhoneBook();
         book.add("Bob", "302-555-1234");
+        book.add("Frank", "777-555-1111");
         //When
         String actualNameNumber = book.display();
         //Then