Merge fdd899640afa2f4ad58047053ae7d0d19ec197ef into 74a9673e36c7d25c28315cb54247a91792f8fbc0

pom.xml

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

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

@@ -0,0 +1,54 @@
+package com.zipcodewilmington.phonebook;
+
+import java.util.ArrayList;
+
+public class Contact {
+
+
+    private String name;
+    private ArrayList<String> phoneNumbers;
+
+
+    public Contact(){
+        this.phoneNumbers = new ArrayList<>();
+    }
+
+
+    public Contact(String name, String phoneNumbers){
+        this.name = name;
+        this.phoneNumbers = new ArrayList<>();
+        addNumber(phoneNumbers);
+    }
+
+    public void addNumber(String number) {
+        getPhoneNumbers().add(number);
+    }
+
+    public void removeNumber(String number) {
+        getPhoneNumbers().remove(number);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public ArrayList<String> getPhoneNumbers() {
+        return phoneNumbers;
+    }
+    @Override
+    public String toString(){
+        return getName() + " " + getListOfPhoneNumbers();
+    }
+    public String getListOfPhoneNumbers(){
+        String listOfNumbers = "";
+        for(String number : getPhoneNumbers()){
+            listOfNumbers += number + " ";
+        }
+        return listOfNumbers.trim();
+    }
+
+}

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

@@ -1,7 +1,71 @@
 package com.zipcodewilmington.phonebook;
 
+import java.util.*;
+import java.util.TreeMap;
+
+
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBook {
+
+    private TreeMap<String, Contact> phoneBook;
+
+
+    public PhoneBook() {
+        this.phoneBook = new TreeMap<>(String::compareToIgnoreCase);
+    }
+    public void addNewEntry(String name, String number){
+        getPhoneBook().put(name, new Contact(name, number));
+    }
+
+    public void removeEntry(String name){
+        getPhoneBook().remove(name);
+    }
+    public void removeNumber(String name, String number){
+        getPhoneBook().get(name).getPhoneNumbers().remove(number);
+    }
+
+    public ArrayList<String> lookUpContactPhoneNumbers(String name){
+        return getPhoneBook().get(name).getPhoneNumbers();
+    }
+
+    public void listAllNamesAndNumbers() {
+        System.out.println(toString());
+
+    }
+    public String reverseLookUp(String number) {
+        for (Map.Entry<String, Contact> contactEntry : getPhoneBook().entrySet()) {
+            if (contactEntry.getValue().getPhoneNumbers().contains(number)) {
+                return contactEntry.getKey();
+            }
+
+        }
+        return "Contact not found";
+    }
+
+    @Override
+    public String toString(){
+        String toBeReturned = "";
+        for(Map.Entry<String, Contact> contactEntry : getPhoneBook().entrySet()){
+           toBeReturned += contactEntry.getValue().toString();
+           toBeReturned += " ";
+        }
+        return toBeReturned.trim();
+    }
+    public TreeMap<String, Contact> getPhoneBook(){
+        return phoneBook;
 }
+
+        }
+
+
+
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,66 @@
+package com.zipcodewilmington.phonebook;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+public class ContactTest {
+
+    Contact contact;
+
+    @Before
+    public void setUp(){
+        contact = new Contact();
+
+    }
+    @Test
+    public void addNumberTest(){
+        //Given
+        String number = "872-345-2298";
+        contact.addNumber(number);
+        //When
+        boolean numberHasBeenAdded = contact.getPhoneNumbers().contains(number);
+        //Then
+        assertTrue(numberHasBeenAdded);
+
+    }
+    @Test
+    public void removeNumberTest(){
+        //Given
+        String number = "872-345-2298";
+        contact.addNumber(number);
+        //When
+        contact.removeNumber(number);
+        boolean numberHasBeenRemoved = !contact.getPhoneNumbers().contains(number);
+        //Then
+        assertTrue(numberHasBeenRemoved);
+    }
+    @Test
+    public void toStringTest(){
+        //Given
+        String newName = "April";
+        String newNumber = "7584339876";
+        Contact contactUnderTest = new Contact(newName, newNumber);
+
+        String expectedString = "April 7584339876";
+        String actualString = contactUnderTest.toString();
+        assertEquals(expectedString, actualString);
+
+    }
+    @Test
+    public void getListOfPhoneNumbersTest(){
+        String newName = "April";
+        String newNumber = "7584339876";
+        Contact contactUnderTest = new Contact(newName, newNumber);
+        contactUnderTest.addNumber("3457765489");
+        String expectedListOfNumbers = "7584339876 3457765489";
+        String actualListOfNumbers = contactUnderTest.getListOfPhoneNumbers();
+        assertEquals(expectedListOfNumbers, actualListOfNumbers);
+
+    }
+
+
+}

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

@@ -1,7 +1,88 @@
 package com.zipcodewilmington.phonebook;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+
 /**
  * Created by leon on 1/23/18.
  */
-public class PhoneBookTest {
+ public class PhoneBookTest {
+
+    PhoneBook phoneBook;
+
+    @Before
+    public void setUp() {
+        phoneBook = new PhoneBook();
+    }
+
+    @Test
+    public void addNewEntryTest(){
+        String name = "April";
+        String number = "6547783321";
+        phoneBook.addNewEntry(name, number);
+        boolean entryHasBeenCreated = phoneBook.getPhoneBook().containsKey(name);
+        assertTrue(entryHasBeenCreated);
+    }
+    @Test
+    public void removeEntryTest(){
+        String name = "April";
+        String number = "6547783321";
+        phoneBook.addNewEntry(name, number);
+        phoneBook.removeEntry(name);
+        boolean entryHasBeenRemoved = !phoneBook.getPhoneBook().containsKey(name);
+        assertTrue(entryHasBeenRemoved);
+    }
+    @Test
+    public void removeNumberTest(){
+        String name = "April";
+        String number = "6547783321";
+        phoneBook.addNewEntry(name, number);
+        phoneBook.removeNumber(name, number);
+        boolean numberHasBeenRemovedFromContact = !phoneBook.getPhoneBook().get(name).getPhoneNumbers().contains(number);
+        assertTrue(numberHasBeenRemovedFromContact);
+    }
+    @Test
+    public void lookUpContactPhoneNumbersTest(){
+        String name = "April";
+        String number = "6547783321";
+        phoneBook.addNewEntry(name, number);
+        ArrayList<String> actualPhoneList = phoneBook.lookUpContactPhoneNumbers(name);
+        ArrayList<String> expectedPhoneList = new ArrayList<>();
+        expectedPhoneList.add(number);
+        assertEquals(expectedPhoneList, actualPhoneList);
+    }
+    @Test
+    public void listAllNamesAndNumbersTest(){
+        String name = "April";
+        String number = "6547783321";
+        String secondName = "Genya";
+        String secondNumber = "8753349987";
+        phoneBook.addNewEntry(name, number);
+        phoneBook.addNewEntry(secondName, secondNumber);
+        String actual = phoneBook.toString();
+        String expected = "April 6547783321 Genya 8753349987";
+        assertEquals(expected, actual);
+        //Print all the things
+        phoneBook.listAllNamesAndNumbers();
+    }
+    @Test
+    public void reverseLookUpTest(){
+        String name = "April";
+        String number = "6547783321";
+        String secondName = "Genya";
+        String secondNumber = "8753349987";
+        phoneBook.addNewEntry(name, number);
+        phoneBook.addNewEntry(secondName, secondNumber);
+        String actual = phoneBook.reverseLookUp(number);
+        String expected = "April";
+        assertEquals(expected, actual);
+    }
+
 }