finish

PhoneBook.java

@@ -1,7 +1,69 @@
- 
-
 /**
  * Created by leon on 1/23/18.
  */
+import java.util.*;
+
 public class PhoneBook {
+    private TreeMap<String, ArrayList<String>> book = new TreeMap<String, ArrayList<String>>();
+
+    public ArrayList<String> add(String name, String phoneNumber) {
+        ArrayList<String> converted = new ArrayList<String>();
+
+        if (book.containsKey(name)) converted = book.get(name);
+
+        converted.add(phoneNumber);
+        add(name, converted);
+        return book.get(name);
+    }
+
+    public ArrayList<String> add(String name, ArrayList<String> phoneNumbers) {
+        book.put(name, phoneNumbers);
+        return book.get(name);
+    }
+
+    public TreeMap<String, ArrayList<String>> remove(String name) {
+        book.remove(name);
+        return book;
+    }
+
+    public ArrayList<String> remove(String name, String number) {
+        ArrayList<String> numbers = book.get(name);
+        numbers.remove(numbers.indexOf(number));
+        book.put(name, numbers);
+        return book.get(name);
+    }
+
+    public ArrayList<String> lookup(String name) {
+        return book.get(name);
+    }
+
+    public String reverseLookup(String phoneNumber) {
+        String result = "none";
+        for(Map.Entry<String, ArrayList<String>> entry : book.entrySet()) {
+            ArrayList<String> numbers = entry.getValue();
+            for (String number : numbers) {
+                if (number.equals(phoneNumber)) result = entry.getKey();
+            }
+        }
+        return result;
+    }
+
+    public String display() {
+        StringBuilder result = new StringBuilder();
+        for(Map.Entry<String, ArrayList<String>> entry : book.entrySet()) {
+            result.append(entry.getKey() + " ");
+
+            ArrayList<String> numbers = entry.getValue();
+            for (String number : numbers) {
+                result.append(number + " ");
+            }
+
+            result.append("\n");
+        }
+        return result.toString();
+    }
+
+    public static void main(String[] args) {
+        PhoneBook phoneBook = new PhoneBook();
+    };
 }

PhoneBookTest.java

@@ -1,9 +1,8 @@
-
-
 import static org.junit.Assert.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import java.util.*;
 
 /**
  * The test class PhoneBookTest.
@@ -13,30 +12,73 @@ import org.junit.Test;
  */
 public class PhoneBookTest
 {
-    /**
-     * Default constructor for test class PhoneBookTest
-     */
-    public PhoneBookTest()
-    {
-    }
+    private PhoneBook pb = new PhoneBook();
 
-    /**
-     * Sets up the test fixture.
-     *
-     * Called before every test case method.
-     */
     @Before
-    public void setUp()
-    {
+    public void setup() {
+        pb = new PhoneBook();
+    }
+
+    @Test
+    public void addNameStringNumbers() {
+        assertEquals(
+            pb.add("John", "101-101-1011"),
+            new ArrayList<String>(
+                Arrays.asList("101-101-1011")
+                )
+        );
     }
 
-    /**
-     * Tears down the test fixture.
-     *
-     * Called after every test case method.
-     */
-    @After
-    public void tearDown()
-    {
+    @Test
+    public void addNameArrayList() {
+        ArrayList<String> numbers = new ArrayList<String>(Arrays.asList(
+                    "101-101-1011",
+                    "202-202-2022"
+                    ));
+        assertEquals(
+                pb.add("John", numbers),
+                numbers
+                );
+    };
+
+    @Test
+    public void removeByName() {
+        pb.add("John", "101-101-1011");
+        pb.remove("John");
+        
+        assertEquals(
+                pb.lookup("John"),
+                null
+                );
+    }
+    
+    @Test
+    public void removeMultipleNumbers() {
+        pb.add("John", "101-101-1011");
+        pb.add("John", "201-101-1011");
+        pb.remove("John", "201-101-1011");
+        
+        assertEquals(
+            pb.lookup("John"),
+            new ArrayList<String>(Arrays.asList("101-101-1011"))
+            );
+    }
+    
+    @Test
+    public void lookup() {
+        pb.add("John", "101-101-1011");
+        assertEquals(
+            pb.lookup("John"),
+            new ArrayList<String>(Arrays.asList("101-101-1011"))
+            );
+    }
+    
+    @Test
+    public void reverseLookup() {
+        pb.add("John", "101-101-1011");
+        assertEquals(
+            pb.reverseLookup("101-101-1011"),
+            "John"
+            );
     }
 }

package.bluej

@@ -3,18 +3,18 @@ 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
+objectbench.height=164
+objectbench.width=776
 package.divider.horizontal=0.6
-package.divider.vertical=0.8007380073800738
-package.editor.height=427
+package.divider.vertical=0.6845018450184502
+package.editor.height=364
 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
+package.numTargets=2
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -23,4 +23,17 @@ readme.name=@README
 readme.width=47
 readme.x=10
 readme.y=10
-
+target1.height=50
+target1.name=PhoneBookTest
+target1.showInterface=false
+target1.type=ClassTarget
+target1.width=120
+target1.x=100
+target1.y=10
+target2.height=50
+target2.name=PhoneBook
+target2.showInterface=false
+target2.type=ClassTarget
+target2.width=100
+target2.x=70
+target2.y=70