refactored version

PhoneBook.java

@@ -1,7 +1,96 @@
- 
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap; 
+import java.util.ArrayList;
 
-/**
- * Created by leon on 1/23/18.
- */
 public class PhoneBook {
+    public TreeMap<String, ArrayList<String>> bookEntries;
+
+    public PhoneBook (){
+        this.bookEntries = new TreeMap<String, ArrayList<String>>();
+    }
+
+    public void add(String name, String phoneNumber) {
+        ArrayList<String> addMe = new ArrayList<String>();
+        if (bookEntries.containsKey(name)) {
+            addMe = bookEntries.get(name);
+        }
+        addMe.add(phoneNumber);
+        bookEntries.put(name, addMe);
+    }
+
+    public void remove(String name, String phoneNumber) {
+        ArrayList listOfNumbers = new ArrayList();
+        if (bookEntries.containsKey(name)) {
+            listOfNumbers = bookEntries.get(name);
+            listOfNumbers.remove(phoneNumber);
+        }
+        if (listOfNumbers.size() == 0) {
+            bookEntries.remove(name);
+        }
+    }
+
+    public void removeRecord(String name) {
+        if (bookEntries.containsKey(name)) {
+            bookEntries.remove(name);
+        }
+    }
+
+    public String lookup(String name) {
+        String phoneNumber = "This entry doesn't exist. Please enter valid entry.";
+        if (bookEntries.containsKey(name)) {
+            phoneNumber = bookEntries.get(name).toString().replace("[", "").replace("]", "");
+        }
+        return phoneNumber;
+    }
+
+    public String reverseLookup(String phoneNumber) {
+        String name = "This entry doesn't exist. Please enter valid entry.";
+        Set<String> keys = bookEntries.keySet();
+        for(String key: keys){
+            if(bookEntries.get(key).contains(phoneNumber) == true) {
+                name = key;
+            }
+        }
+        return name;
+    }
+
+    public void display() {
+        Set<String> keys = bookEntries.keySet();
+        for(String key: keys){
+            System.out.println(key + ": " + bookEntries.get(key).toString().replace("[", "").replace("]", ""));
+        }
+    }
+
+    public void main(String[] args) {
+        PhoneBook myBook = new PhoneBook();
+        myBook.add("Tomato", "267-945-5231");
+        myBook.add("Asparagus", "305-504-1159");
+        myBook.add("Eggplant", "123-345-6789");
+        myBook.add("Beet", "233-464-1289");
+        myBook.add("Asparagus", "454-345-4566");
+        myBook.add("Leeks", "194-345-3458");
+        myBook.add("Leeks", "345-209-1095");
+        myBook.display();
+
+        System.out.println("***");
+        myBook.remove("Asparagus", "305-504-1159");
+        myBook.removeRecord("Beet");
+        System.out.println("Phonebook after removing Asparagus' number and Beets' record");
+        myBook.display();
+
+        System.out.println("***");
+        System.out.println("Looking for Leeks' phone number");
+        System.out.println(myBook.lookup("Leeks"));
+
+        System.out.println("***");
+        System.out.println("Looking for the owner of number 454-345-4566");
+        System.out.println(myBook.reverseLookup("454-345-4566"));
+
+        System.out.println("***");
+        System.out.println("Looking for Banana's phone number");
+        System.out.println(myBook.lookup("Banana"));
+    }
 }

PhoneBookTest.java

@@ -1,10 +1,14 @@
 
-
-import static org.junit.Assert.*;
+import org.junit.Assert;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap; 
+import java.util.ArrayList;
 /**
  * The test class PhoneBookTest.
  *
@@ -13,30 +17,87 @@ import org.junit.Test;
  */
 public class PhoneBookTest
 {
-    /**
-     * Default constructor for test class PhoneBookTest
-     */
-    public PhoneBookTest()
-    {
-    }
-
-    /**
-     * Sets up the test fixture.
-     *
-     * Called before every test case method.
-     */
+    PhoneBook book;
     @Before
     public void setUp()
     {
+        this.book = new PhoneBook();
     }
 
-    /**
-     * Tears down the test fixture.
-     *
-     * Called after every test case method.
-     */
-    @After
-    public void tearDown()
-    {
+    @Test
+    public void addTest() {
+        //Given
+
+        //When
+        book.add("Leeks", "194-345-3458");
+        String lookup = book.lookup("Leeks");
+        //Then
+        Assert.assertEquals("194-345-3458", lookup);
+    }
+
+    @Test
+    public void lookupTest() {
+        //Given
+        book.add("Leeks", "194-345-3458");
+        book.add("Leeks", "345-234-4643");
+        String phoneNumber = book.lookup("Leeks");
+        //Then
+        Assert.assertEquals("194-345-3458, 345-234-4643", phoneNumber);
+    }
+
+    @Test
+    public void lookupTest1() {
+        //Given
+        book.add("Leeks", "194-345-3458");
+        book.add("Leeks", "345-234-4643");
+        String phoneNumber = book.lookup("Banana");
+        //Then
+        Assert.assertEquals("This entry doesn't exist. Please enter valid entry.", phoneNumber);
+    }
+
+    @Test
+    public void removeTest() {
+        //Given
+        book.add("Leeks", "194-345-3458");
+        book.add("Leeks", "345-234-4643");
+        book.remove("Leeks", "194-345-3458");
+        //When
+        String phoneNumber = book.lookup("Leeks");
+        //Then
+        Assert.assertEquals("345-234-4643", phoneNumber);
+    }
+
+    @Test
+    public void removeTest1() {
+        //Given
+        //When
+        book.add("Leeks", "194-345-3458");
+        book.add("Leeks", "345-234-4643");
+        book.remove("Leeks", "194-345-3458");
+        book.remove("Leeks", "345-234-4643");
+        //Then
+        Assert.assertEquals("This entry doesn't exist. Please enter valid entry.", book.lookup("Leeks"));
+    }
+
+    @Test
+    public void reverseLookupTest() {
+        //Given
+        book.add("Leeks", "194-345-3458");
+        //When
+        String name = book.reverseLookup("194-345-3458");
+        //Then
+        Assert.assertEquals("Leeks", name);
+    }
+
+    @Test
+    public void reverseLookupTest1() {
+        //Given
+        book.add("Leeks", "194-345-3458");
+        book.remove("Leeks", "194-345-3458");
+        //When
+        String name = book.reverseLookup("194-345-3458");
+        //Then
+        Assert.assertEquals("This entry doesn't exist. Please enter valid entry.", name);
     }
 }
+

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
+dependency1.from=PhoneBookTest
+dependency1.to=PhoneBook
+dependency1.type=UsesDependency
+editor.fx.0.height=816
+editor.fx.0.width=854
+editor.fx.0.x=422
+editor.fx.0.y=31
 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.editor.x=23
+package.editor.y=89
 package.frame.height=600
 package.frame.width=800
-package.numDependencies=0
-package.numTargets=1
+package.numDependencies=1
+package.numTargets=2
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -23,4 +26,18 @@ readme.name=@README
 readme.width=47
 readme.x=10
 readme.y=10
-
+target1.height=50
+target1.name=PhoneBookTest
+target1.showInterface=false
+target1.type=UnitTestTargetJunit4
+target1.width=100
+target1.x=100
+target1.y=40
+target2.association=PhoneBookTest
+target2.height=50
+target2.name=PhoneBook
+target2.showInterface=false
+target2.type=ClassTarget
+target2.width=100
+target2.x=70
+target2.y=70

results.txt

@@ -0,0 +1,20 @@
+Asparagus: 305-504-1159, 454-345-4566
+Beet: 233-464-1289
+Eggplant: 123-345-6789
+Leeks: 194-345-3458, 345-209-1095
+Tomato: 267-945-5231
+***
+Phonebook after removing Asparagus' number and Beets' record
+Asparagus: 454-345-4566
+Eggplant: 123-345-6789
+Leeks: 194-345-3458, 345-209-1095
+Tomato: 267-945-5231
+***
+Looking for Leeks' phone number
+194-345-3458, 345-209-1095
+***
+Looking for the owner of number 454-345-4566
+Asparagus
+***
+Looking for Banana's phone number
+This entry doesn't exist. Please enter valid entry.