Merge 1acd89902f4aa9ec150aa921f201a4b2093eb877 into 74a9673e36c7d25c28315cb54247a91792f8fbc0

pom.xml

@@ -7,6 +7,13 @@
     <groupId>com.zipcodewilmington</groupId>
     <artifactId>phonebok</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+    </dependencies>
 
 
 </project>

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

@@ -1,7 +1,87 @@
 package com.zipcodewilmington.phonebook;
+import java.util.*;
 
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBook {
+
+    //instance variable
+    private TreeMap<String, ArrayList<String>> treeMap;
+
+
+    // void "no arguments" constructor -creates empty map
+    public PhoneBook() {
+        this.treeMap= new TreeMap<String, ArrayList<String>>();
+    }
+
+    // single argument constructor -type Map -creates new map w/ same key/value mappings as argument
+    public PhoneBook(TreeMap treeMap) {
+        this.treeMap = treeMap;
+    }
+
+    //add a name & number entry, add number
+    public void addEntry(String name, ArrayList<String> number) {
+        if (!treeMap.containsKey(name)) {
+            treeMap.put(name, number);
+        }
+    }
+
+    //add numbers to existing entries
+    public void addNumberToEntry(String name, String number) {
+        for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) {
+            if (name.equals(entry.getKey())) {
+                ArrayList<String> value = entry.getValue();
+                value.add(number);
+            }
+        }
+    }
+
+    //remove numbers from existing entries
+    public void removeNumberFromEntry(String name, String number) {
+        for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) {
+            if (entry.getKey().equals(name)) {
+                if (entry.getValue().contains(number)) {
+                    entry.getValue().remove(number);
+                }
+            }
+        }
+    }
+
+    //remove entire entry
+    public void removeEntry(String name) {
+            treeMap.remove(name);
+    }
+
+    //lookup: find phone number from name
+    public ArrayList<String> lookup(String name) {
+        return treeMap.get(name);
+    }
+
+    //reverse lookup: find name from number
+    public String reverseLookup (String number) {
+        String name = "";
+        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;
+    }
+
+    //print out all of the entries in PhoneBook
+    public String display(){
+        StringBuilder printOut = new StringBuilder();
+        for(Map.Entry<String, ArrayList<String>> entry: treeMap.entrySet()) {
+            printOut.append(entry.getKey())
+                    .append(" ")
+                    .append(entry.getValue().toString())
+                    .append("\n");
+        }
+        return printOut.toString();
+    }
+
 }

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

@@ -1,7 +1,147 @@
 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.Arrays;
+import java.util.TreeMap;
+
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBookTest {
+    @Test
+    public void testDefaultConstructor() {
+        PhoneBook book = new PhoneBook();
+        Assert.assertNotNull(book);
+    }
+
+    @Test
+    public void testConstructorWithArgument() {
+        PhoneBook book = new PhoneBook();
+        ArrayList<String> number = new ArrayList<String>(Arrays.asList("302-555-2222","302-555-3456"));
+        book.addEntry("Bob", number);
+        Assert.assertNotNull(book);
+    }
+
+    @Test
+    public void testAddEntry() {
+        //Given
+        PhoneBook book = new PhoneBook();
+        ArrayList<String> expectedAddition = new ArrayList<String>(Arrays.asList("302-555-2222","302-555-3456"));
+        //When
+        book.addEntry("Bob", expectedAddition);
+        ArrayList<String> actualAddition = new ArrayList<String>(book.lookup("Bob"));
+        //Then
+        Assert.assertEquals(expectedAddition, actualAddition);
+    }
+
+    @Test
+    public void addNumberToEntry() {
+        //Given
+        PhoneBook book = new PhoneBook();
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-2234"));
+        book.addEntry("Bob", bobNumber);
+        //Expected
+        ArrayList<String> expectedAddition = new ArrayList<String>(Arrays.asList("302-555-2234","302-555-1111"));
+        //When
+        book.addNumberToEntry("Bob", "302-555-1111");
+        ArrayList<String> actualAddition = book.lookup("Bob");
+        //Then
+        Assert.assertEquals(expectedAddition, actualAddition);
+    }
+
+    @Test
+    public void removeNumberFromEntry() {
+        //Given
+        PhoneBook book = new PhoneBook();
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-2234","302-555-1111"));
+        book.addEntry("Bob", bobNumber);
+        //Expected
+        ArrayList<String> expectedAfterDeletion = new ArrayList<String>(Arrays.asList("302-555-2234"));
+        //When
+        book.removeNumberFromEntry("Bob", "302-555-1111");
+        ArrayList<String> actualAfterDeletion = book.lookup("Bob");
+        //Then
+        Assert.assertEquals(expectedAfterDeletion, actualAfterDeletion);
+    }
+
+    @Test
+    public void testRemoveEntry() {
+
+        //Given
+        PhoneBook book = new PhoneBook();
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-2222","302-555-3456"));
+        book.addEntry("Bob", bobNumber);
+        //Expected
+        String expectedValue = "";
+        //When
+        book.removeEntry("Bob");
+        String actualValue = book.display();
+        //Then
+        Assert.assertEquals(expectedValue, actualValue);
+    }
+
+    @Test
+    public void testLookup(){
+        //To test if lookup returns all of the person's phone numbers
+        //Given
+        PhoneBook book = new PhoneBook();
+        ArrayList<String> expectedNumber = new ArrayList<String>(Arrays.asList("302-555-2223","302-555-3456"));
+        book.addEntry("Bob", expectedNumber);
+        //When
+        ArrayList<String> actualNumber = new ArrayList<String>(book.lookup("Bob"));
+        //Then
+        Assert.assertEquals(expectedNumber, actualNumber);
+    }
+
+    @Test
+    public void testLookup2(){
+        //To test if lookup picks out the right person when there are multiple entries
+        //Given
+        PhoneBook book = new PhoneBook();
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-2223"));
+        book.addEntry("Bob", bobNumber);
+        //Expected
+        ArrayList<String> expectedNumber = new ArrayList<String>(Arrays.asList("302-555-9988"));
+        book.addEntry("Frank", expectedNumber);
+        //When
+        ArrayList<String> actualNumber = new ArrayList<String> (book.lookup("Frank"));
+        //Then
+        Assert.assertEquals(expectedNumber, actualNumber);
+    }
+
+    @Test
+    public void testreverseLookup(){
+        // to test if right person is returned when searching by one of multiple phone numbers
+        //Given
+        PhoneBook book = new PhoneBook();
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-2223","302-555-5555"));
+        String expectedName = "Bob";
+        book.addEntry(expectedName, bobNumber);
+        //When
+        String actualName = book.reverseLookup("302-555-2223");
+        //Then
+        Assert.assertEquals(expectedName, actualName);
+    }
+
+
+    @Test
+    public void testDisplay() {
+        //Given:
+        PhoneBook book = new PhoneBook();
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-1234","302-556-1245"));
+        book.addEntry("Bob", bobNumber);
+        ArrayList<String> frankNumber = new ArrayList<String>(Arrays.asList("777-555-1111"));
+        book.addEntry("Frank", frankNumber);
+        //Expected
+        String expectedNameNumber = "Bob " + bobNumber.toString() + "\n" + "Frank " + frankNumber.toString() + "\n";
+        //When
+        String actualNameNumber = book.display();
+        //Then
+        Assert.assertEquals(expectedNameNumber, actualNameNumber);
+    }
+
 }