passed test cases

PhoneBook.java

@@ -1,39 +1,78 @@
-import java.util.*; 
+import java.util.*;
 
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBook {
-    String name;
-    String phoneNumber;
-    SortedMap<String, String> phoneBook = new TreeMap<String, String>();
-    
-    public void add(String name, String phoneNumber){
-        phoneBook.put(name, phoneNumber);
+    Map<String, List<String>> phoneBook = new TreeMap<String, List<String>>();
+
+    public void addEntry(String name, String... phoneNumbers){
+        phoneBook.put(name, Arrays.asList(phoneNumbers));
     }
-    
-    public void remove(String name){
+
+    public void removeEntry(String name){
         phoneBook.remove(name);
     }
-    
+
+    public void addNumberToEntry(String name, String... phoneNumbers){
+        List<String> listToUpdate = new ArrayList<>(phoneBook.get(name));
+        for (String aNumber : phoneNumbers){
+            listToUpdate.add(aNumber);
+        }
+        String[] updatedNumbers = listToUpdate.toArray(new String[listToUpdate.size()]);
+        addEntry(name, updatedNumbers);
+    }
+
+    public void removeNumberFromEntry(String name, String... phoneNumbers){
+        List<String> listToUpdate = new ArrayList<>(phoneBook.get(name));
+        Iterator<String> i = listToUpdate.iterator();
+        while(i.hasNext()){
+            String aNumberInList = i.next();
+            for (String aNumberToDelete : phoneNumbers){
+                if (aNumberInList.equals(aNumberToDelete)){
+                    i.remove();
+                }
+            }
+        }
+        String[] updatedNumbers = listToUpdate.toArray(new String[listToUpdate.size()]);
+        addEntry(name, updatedNumbers);
+    }
+
     public String lookup(String name){
-        return phoneBook.get(name);
+        if(phoneBook.get(name)==null){
+            return null;
+        }
+        StringBuilder numbers = new StringBuilder();
+        int counter = 0;
+        for (String aNumber : phoneBook.get(name)){
+            numbers.append(aNumber);
+            counter++;
+            if(counter != phoneBook.get(name).size()){
+                numbers.append(", ");
+            }
+        }
+        return numbers.toString();
     }
-    
-    public String reverseLookup(String phoneNumber){
-        for(Map.Entry<String, String> e : phoneBook.entrySet()){
-            if(e.getValue().equals(phoneNumber)){
-                return e.getKey();
+
+    public String reverseLookup(String... phoneNumbers){
+        for(Map.Entry<String, List<String>> e : phoneBook.entrySet()){
+            String name = e.getKey();
+            for(String aNumberInList : phoneBook.get(name)){
+                for (String aNumberToLookup : phoneNumbers){
+                    if(aNumberInList.equals(aNumberToLookup)){
+                        return e.getKey();
+                    }
+                }
             }
         }
         return null;
     }
-    
+
     public void display(){
-        System.out.printf("%-20s%-12s\n", "Name", "Phone Number");
-        for(Map.Entry<String, String> e : phoneBook.entrySet()){
+        System.out.printf("%-20s%-12s\n", "Name", "Phone Number(s)");
+        for(Map.Entry<String, List<String>> e : phoneBook.entrySet()){
             String printName = e.getKey();
-            String printNumber = e.getValue();
+            List<String> printNumber = e.getValue();
             System.out.printf(" %-20s %-12s\n", printName, printNumber);
         }
         System.out.printf("-----End of the phone book-----\n");

PhoneBookTest.java

@@ -1,4 +1,4 @@
-
+import java.util.*; 
 import static org.junit.Assert.*;
 import org.junit.After;
 import org.junit.Before;
@@ -13,37 +13,37 @@ import org.junit.Test;
 public class PhoneBookTest
 {
     @Test
-    public void testAdd(){
+    public void testAddEntry(){
         //given
         PhoneBook phoneBook = new PhoneBook();
 
         //actual
-        phoneBook.add("eric", "3025884804");
+        phoneBook.addEntry("eric", "3025884804", "3025884805", "3025884806");
         String actual = phoneBook.lookup("eric");
 
         //expected
-        String expected = "3025884804";
+        String expected = "3025884804, 3025884805, 3025884806";
 
         //test
         assertEquals(expected, actual);
     }
 
     @Test
-    public void testAddMultiple(){
+    public void testAddEntryMultiple(){
         //given
         PhoneBook phoneBook = new PhoneBook();
 
         //actual
-        phoneBook.add("eric", "3025884804");
-        phoneBook.add("john", "3025844804");
-        phoneBook.add("jane", "3025884704");
+        phoneBook.addEntry("eric", "3025884804", "3025884805", "3025884806");
+        phoneBook.addEntry("john", "3025844804", "3025884705");
+        phoneBook.addEntry("jane", "3025884704");
         String actual = phoneBook.lookup("eric");
         String actual1 = phoneBook.lookup("john");
         String actual2 = phoneBook.lookup("jane");
 
         //expected
-        String expected = "3025884804";
-        String expected1 = "3025844804";
+        String expected = "3025884804, 3025884805, 3025884806";
+        String expected1 = "3025844804, 3025884705";
         String expected2 = "3025884704";
 
         //test
@@ -51,13 +51,13 @@ public class PhoneBookTest
     }
 
     @Test
-    public void testRemove(){
+    public void testRemoveEntry(){
         //given
         PhoneBook phoneBook = new PhoneBook();
 
         //actual
-        phoneBook.add("eric", "3025884804");
-        phoneBook.remove("eric");
+        phoneBook.addEntry("eric", "3025884804", "3025884805", "3025884806");
+        phoneBook.removeEntry("eric");
         String actual = phoneBook.lookup("eric");
 
         //expected
@@ -68,16 +68,16 @@ public class PhoneBookTest
     }
 
     @Test
-    public void testRemoveMultiple(){
+    public void testRemoveEntryMultiple(){
         //given
         PhoneBook phoneBook = new PhoneBook();
 
         //actual
-        phoneBook.add("eric", "3025884804");
-        phoneBook.add("john", "3025844804");
-        phoneBook.add("jane", "3025884704");
-        phoneBook.remove("john");
-        phoneBook.remove("eric");
+        phoneBook.addEntry("eric", "3025884804", "3025884805", "3025884806");
+        phoneBook.addEntry("john", "3025844804", "3025884705");
+        phoneBook.addEntry("jane", "3025884704");
+        phoneBook.removeEntry("john");
+        phoneBook.removeEntry("eric");
         String actual = phoneBook.lookup("john");
         String actual1 = phoneBook.lookup("eric");
         String actual2 = phoneBook.lookup("jane");
@@ -99,11 +99,11 @@ public class PhoneBookTest
         PhoneBook phoneBook = new PhoneBook();
 
         //actual
-        phoneBook.add("eric", "3025884804");
-        phoneBook.add("john", "3025844804");
-        phoneBook.add("jane", "3025884704");
-        String actual = phoneBook.reverseLookup("3025884804");
-        String actual1 = phoneBook.reverseLookup("3025844804");
+        phoneBook.addEntry("eric", "3025884804", "3025884805", "3025884806");
+        phoneBook.addEntry("john", "3025844804", "3025884705");
+        phoneBook.addEntry("jane", "3025884704");
+        String actual = phoneBook.reverseLookup("3025884804", "3025884805", "3025884806");
+        String actual1 = phoneBook.reverseLookup("3025844804", "3025884705");
         String actual2 = phoneBook.reverseLookup("3025884704");
         String actual3 = phoneBook.reverseLookup("4025884704");
 
@@ -117,5 +117,74 @@ public class PhoneBookTest
         assertEquals(expected, actual);
         assertEquals(expected1, actual1);
         assertEquals(expected2, actual2);
+        assertEquals(expected3, actual3);
+    }
+    
+    @Test
+    public void testAddNumberToEntry(){
+        //given
+        PhoneBook phoneBook = new PhoneBook();
+
+        //actual
+        phoneBook.addEntry("eric", "3025884804", "3025884805", "3025884806");
+        phoneBook.addNumberToEntry("eric", "3025884807");
+        String actual = phoneBook.lookup("eric");
+
+        //expected
+        String expected = "3025884804, 3025884805, 3025884806, 3025884807";
+
+        //test
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testAddNumberToEntryMultiple(){
+        //given
+        PhoneBook phoneBook = new PhoneBook();
+
+        //actual
+        phoneBook.addEntry("john", "3025884804", "3025884705");
+        phoneBook.addNumberToEntry("john", "3025884788", "3025884789");
+        String actual = phoneBook.lookup("john");
+
+        //expected
+        String expected = "3025884804, 3025884705, 3025884788, 3025884789";
+
+        //test
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRemoveNumberFromEntry(){
+        //given
+        PhoneBook phoneBook = new PhoneBook();
+
+        //actual
+        phoneBook.addEntry("eric", "3025884804", "3025884805", "3025884806");
+        phoneBook.removeNumberFromEntry("eric", "3025884805");
+        String actual = phoneBook.lookup("eric");
+
+        //expected
+        String expected = "3025884804, 3025884806";
+
+        //test
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRemoveNumberFromEntryMultiple(){
+        //given
+        PhoneBook phoneBook = new PhoneBook();
+
+        //actual
+        phoneBook.addEntry("eric", "3025884804", "3025884805", "3025884806", "3025884807");
+        phoneBook.removeNumberFromEntry("eric", "3025884804", "3025884806");
+        String actual = phoneBook.lookup("eric");
+
+        //expected
+        String expected = "3025884805, 3025884807";
+
+        //test
+        assertEquals(expected, actual);
     }
 }

PhoneNumbers.java

@@ -1,33 +0,0 @@
-
-/**
- * Write a description of class PhoneNumbers here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
-public class PhoneNumbers
-{
-    // instance variables - replace the example below with your own
-    private int x;
-
-    /**
-     * Constructor for objects of class PhoneNumbers
-     */
-    public PhoneNumbers()
-    {
-        // initialise instance variables
-        x = 0;
-    }
-
-    /**
-     * An example of a method - replace this comment with your own
-     *
-     * @param  y  a sample parameter for a method
-     * @return    the sum of x and y
-     */
-    public int sampleMethod(int y)
-    {
-        // put your code here
-        return x + y;
-    }
-}

package.bluej

@@ -1,20 +1,23 @@
 #BlueJ package file
-editor.fx.0.height=0
-editor.fx.0.width=0
-editor.fx.0.x=0
-editor.fx.0.y=0
-objectbench.height=101
-objectbench.width=461
-package.divider.horizontal=0.6
-package.divider.vertical=0.8007380073800738
-package.editor.height=427
-package.editor.width=674
-package.editor.x=427
-package.editor.y=143
-package.frame.height=600
-package.frame.width=800
-package.numDependencies=0
-package.numTargets=1
+dependency1.from=PhoneBookTest
+dependency1.to=PhoneBook
+dependency1.type=UsesDependency
+editor.fx.0.height=713
+editor.fx.0.width=800
+editor.fx.0.x=-122
+editor.fx.0.y=-943
+objectbench.height=123
+objectbench.width=381
+package.divider.horizontal=0.5914634146341463
+package.divider.vertical=0.7644927536231884
+package.editor.height=415
+package.editor.width=550
+package.editor.x=46
+package.editor.y=-873
+package.frame.height=610
+package.frame.width=676
+package.numDependencies=1
+package.numTargets=3
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -23,4 +26,24 @@ readme.name=@README
 readme.width=47
 readme.x=10
 readme.y=10
-
+target1.height=50
+target1.name=PhoneNumbers
+target1.showInterface=false
+target1.type=ClassTarget
+target1.width=120
+target1.x=240
+target1.y=70
+target2.height=50
+target2.name=PhoneBookTest
+target2.showInterface=false
+target2.type=UnitTestTargetJunit4
+target2.width=120
+target2.x=100
+target2.y=10
+target3.height=50
+target3.name=PhoneBook
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=100
+target3.x=70
+target3.y=70