almost finished part 3 but not quite

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

@@ -1,8 +1,5 @@
 package com.zipcodewilmington.phonebook;
-import java.util.TreeMap;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by leon on 1/23/18.
@@ -10,12 +7,12 @@ import java.util.Map;
 public class PhoneBook {
 
     //instance variable
-    private TreeMap<String, String> treeMap;
+    private TreeMap<String, ArrayList<String>> treeMap;
 
 
     // void "no arguments" constructor -creates empty map
     public PhoneBook() {
-        this.treeMap= new TreeMap<String, String>();
+        this.treeMap= new TreeMap<String, ArrayList<String>>();
     }
 
     // single argument constructor -type Map -creates new map w/ same key/value mappings as argument
@@ -23,32 +20,45 @@ public class PhoneBook {
         this.treeMap = treeMap;
     }
 
-    //add a name & number entry
-    public void add(String name, String number) {
-
-        if(!treeMap.containsKey(name)) {
+    //add a name & number entry, add number
+    public void inputEntry(String name, ArrayList<String> number) {
+        if (!treeMap.containsKey(name)) {
             treeMap.put(name, number);
         }
+    }
+
+    //add and remove numbers from existing names
+    //unfinished, no test cases yet
+    public void modifyNumbers(String name, ArrayList<String> number) {
+        for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) {
+            ArrayList<String> value = entry.getValue();
+            for (String firstNumber : value) {
+
+            }
+        }
 
     }
 
+
     //remove a name & number entry
-    public void remove(String name) {
+    public void removeEntry(String name) {
             treeMap.remove(name);
     }
 
     //find phone number lookup by name
-    public String lookup(String name) {
-        String number = treeMap.get(name);
-        return number;
+    public ArrayList<String> lookup(String name) {
+        return treeMap.get(name);
     }
 
     //reverse lookup
     public String reverseLookup (String number) {
         String name = "";
-        for(Map.Entry<String, String> entry: treeMap.entrySet()) {
-            if(entry.getValue().equals(number)) {
-                name = entry.getKey();
+        for(Map.Entry<String, ArrayList<String>> entry: treeMap.entrySet()) {
+            ArrayList<String> value = entry.getValue();
+            for(String revnumber: value) {
+                if(number.contains(revnumber)) {
+                    name = entry.getKey();
+                }
             }
         }
         return name;
@@ -57,15 +67,14 @@ public class PhoneBook {
     //print out all of the entries in PhoneBook
     public String display(){
         StringBuilder printOut = new StringBuilder();
-        for(Map.Entry<String, String> entry: treeMap.entrySet()) {
+        for(Map.Entry<String, ArrayList<String>> entry: treeMap.entrySet()) {
             printOut
                     .append(entry.getKey())
                     .append(" ")
-                    .append(entry.getValue())
+                    .append(entry.getValue().toString())
                     .append("\n");
         }
-        String print = printOut.toString();
-        return print;
+        return printOut.toString();
     }
 
 

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

@@ -2,7 +2,9 @@ package com.zipcodewilmington.phonebook;
 
 import org.junit.Assert;
 import org.junit.Test;
+import sun.nio.cs.ext.SJIS;
 
+import java.util.ArrayList;
 import java.util.TreeMap;
 
 /**
@@ -19,7 +21,10 @@ public class PhoneBookTest {
     @Test
     public void testConstructorWithArgument() {
         PhoneBook book = new PhoneBook();
-        book.add("Bob", "302-555-1234");
+        ArrayList<String> number = new ArrayList<String>();
+        number.add("302-555-2222");
+        number.add("302-555-3456");
+        book.inputEntry("Bob", number);
         Assert.assertNotNull(book);
     }
 
@@ -28,11 +33,13 @@ public class PhoneBookTest {
 
         //Given
         PhoneBook book = new PhoneBook();
-        String expectedAddition = "302-555-1234";
 
+        ArrayList<String> expectedAddition = new ArrayList<String>();
+        expectedAddition.add("302-555-2222");
+        expectedAddition.add("302-555-3456");
         //When
-        book.add("Bob", "302-555-1234");
-        String actualAddition = book.lookup("Bob");
+        book.inputEntry("Bob", expectedAddition);
+        ArrayList<String> actualAddition = new ArrayList<String>(book.lookup("Bob"));
 
         //Then
         Assert.assertEquals(expectedAddition, actualAddition);
@@ -40,15 +47,18 @@ public class PhoneBookTest {
     }
 
     @Test
-    public void testRemove() {
+    public void testRemoveEntry() {
 
         //Given
         PhoneBook book = new PhoneBook();
-        book.add("Bob", "302-555-1234");
+        ArrayList<String> bobNumber = new ArrayList<String>();
+        bobNumber.add("302-555-2222");
+        bobNumber.add("302-555-3456");
+        book.inputEntry("Bob", bobNumber);
         String expectedValue = "";
 
         //When
-        book.remove("Bob");
+        book.removeEntry("Bob");
         String actualValue = book.display();
 
         //Then
@@ -56,46 +66,37 @@ public class PhoneBookTest {
     }
 
     @Test
-    public void testRemove2() {
+    public void testRemoveEntry2() {
 
         //Given
         PhoneBook book = new PhoneBook();
-        book.add("Bob", "302-555-1234");
-        String expectedValue = "";
+
+        ArrayList<String> expectedValue = new ArrayList<String>();
+        expectedValue.add("302-555-2222");
+        expectedValue.add("302-555-3456");
+        book.inputEntry("Bob", expectedValue);
 
         //When
-        book.remove("Robert");
+        book.removeEntry("Robert");
         String actualValue = book.display();
 
         //Then
         Assert.assertNotEquals(expectedValue, actualValue);
-
-
     }
 
-
     @Test
     public void testLookup(){
-
         //Given
         PhoneBook book = new PhoneBook();
-        String expectedNumber = "302-555-1234";
-        book.add("Bob", expectedNumber);
-        //When
-        String actualNumber = book.lookup("Bob");
-        //Then
-        Assert.assertEquals(expectedNumber, actualNumber);
-    }
 
-    @Test
-    public void testLookup2(){
+        ArrayList<String> expectedNumber = new ArrayList<String>();
+        expectedNumber.add("302-555-2223");
+        expectedNumber.add("302-555-3456");
+        book.inputEntry("Bob", expectedNumber);
 
-        //Given
-        PhoneBook book = new PhoneBook();
-        book.add("Bob", "302-555-1234");
-        String expectedNumber = null;
         //When
-        String actualNumber = book.lookup("Frank");
+        ArrayList<String> actualNumber = new ArrayList<String>(book.lookup("Bob"));
+
         //Then
         Assert.assertEquals(expectedNumber, actualNumber);
     }
@@ -105,11 +106,17 @@ public class PhoneBookTest {
 
         //Given
         PhoneBook book = new PhoneBook();
-        book.add("Bob", "302-555-1234");
-        String expectedNumber = "302-555-9988";
-        book.add("Frank", expectedNumber);
+
+        ArrayList<String> bobNumber = new ArrayList<String>();
+        bobNumber.add("302-555-2223");
+        book.inputEntry("Bob", bobNumber);
+
+        ArrayList<String> expectedNumber = new ArrayList<String>();
+        expectedNumber.add("302-555-9988");
+        book.inputEntry("Frank", expectedNumber);
+
         //When
-        String actualNumber = book.lookup("Frank");
+        ArrayList<String> actualNumber = new ArrayList<String> (book.lookup("Frank"));
         //Then
         Assert.assertEquals(expectedNumber, actualNumber);
     }
@@ -120,9 +127,13 @@ public class PhoneBookTest {
         //Given
         PhoneBook book = new PhoneBook();
         String expectedName = "Bob";
-        book.add(expectedName, "302-555-1234");
-        //When
-        String actualName = book.reverseLookup("302-555-1234");
+        ArrayList<String> bobNumber = new ArrayList<String>();
+        bobNumber.add("302-555-2223");
+        book.inputEntry(expectedName, bobNumber);
+
+        //When;
+        String actualName = book.reverseLookup("302-555-2223");
+
         //Then
         Assert.assertEquals(expectedName, actualName);
     }
@@ -130,11 +141,18 @@ public class PhoneBookTest {
 
     @Test
     public void testDisplay() {
-        //Given: need help from instructor
-        String expectedNameNumber = "Bob 302-555-1234\nFrank 777-555-1111\n";
+        //Given:
         PhoneBook book = new PhoneBook();
-        book.add("Bob", "302-555-1234");
-        book.add("Frank", "777-555-1111");
+        ArrayList<String> bobNumber = new ArrayList<String>();
+        bobNumber.add("302-555-1234");
+        bobNumber.add("302-556-1245");
+        ArrayList<String> frankNumber = new ArrayList<String>();
+        frankNumber.add("777-555-1111");
+        book.inputEntry("Bob", bobNumber);
+        book.inputEntry("Frank", frankNumber);
+
+        String expectedNameNumber = "Bob " + bobNumber.toString() + "\n" + "Frank " + frankNumber.toString() + "\n";
+
         //When
         String actualNameNumber = book.display();
         //Then