Merge c79c69a07719120f7359ae38b18ba3a1c8d73acb 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/Person.java

@@ -0,0 +1,57 @@
+package com.zipcodewilmington.phonebook;
+
+import java.util.ArrayList;
+
+public class Person {
+
+    private String name;
+    protected ArrayList<String> phoneNumberList;
+
+    public Person(String name, String... phoneNumbers) {
+        this.name = name;
+        this.phoneNumberList = new ArrayList<String>();
+        for (String phoneNumber : phoneNumbers) {
+            this.phoneNumberList.add(phoneNumber);
+        }
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public ArrayList<String> getPhoneNumberListArray() {
+        return phoneNumberList;
+    }
+
+    public String getPhoneNumberListString() {
+
+        StringBuilder sb = new StringBuilder();
+
+        for (String phoneNumber : phoneNumberList) {
+            sb.append("\t" + phoneNumber + "\n");
+        }
+        return sb.toString();
+    }
+
+    public void addPhoneNumbers(String... phoneNumbersToAdd) {
+        for (String phoneNumber : phoneNumbersToAdd) {
+            this.phoneNumberList.add(phoneNumber);
+        }
+
+    }
+
+    public void removePhoneNumbers(String... phoneNumbersToRemove) {
+        for (String phoneNumber : phoneNumbersToRemove) {
+            this.phoneNumberList.remove(phoneNumber);
+        }
+
+    }
+
+    // method to return phone number list?
+
+
+}

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

@@ -1,7 +1,67 @@
 package com.zipcodewilmington.phonebook;
 
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.ArrayList;
+import java.util.Set;
+
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBook {
+
+    protected TreeMap<String, Person> treeMap;
+    protected ArrayList<String> entryList;
+    protected Set<String> keySet;
+
+    public PhoneBook() {
+        this.treeMap = new TreeMap<String, Person>();
+        this.entryList = new ArrayList<String>();
+        this.keySet = treeMap.keySet();
+        //this.hashMap.put("Name_empty", new Person("Name_empty", "Phone_number_empty"));
+    }
+
+    //PART I
+    public Person lookup(String name) {
+        return treeMap.get(name);
+    }
+
+    public void addEntry(String name, String... phoneNumbers) {
+        treeMap.put(name, new Person(name, phoneNumbers));
+    }
+
+    // Changed method name for Part III
+    public void removeRecord(String name) {
+        treeMap.remove(name);
+    }
+
+    public Set<String> getKeySet() { //names and phone numbers
+        return treeMap.keySet();
+        //return all persons
+    }
+
+    public StringBuilder displayAllEntries() { //names and phone numbers
+        StringBuilder sb = new StringBuilder();
+
+        for (String key : treeMap.keySet()) {
+            Person p = treeMap.get(key);
+            sb.append(p.getName() + "\n");
+            sb.append(p.getPhoneNumberListString() + "\n");
+        }
+
+        return sb;
+        //call getentries
+    }
+
+    //PART II
+    public String reverseLookup(String phoneNumber) { //lookup names from phone numbers
+        for (String name : treeMap.keySet()) {
+            if (treeMap.get(name).phoneNumberList.contains(phoneNumber) == true) {
+                return name;
+                //break;
+            }
+        }
+        return "No_name";
+    }
+
 }

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

@@ -0,0 +1,100 @@
+package com.zipcodewilmington.phonebook;
+
+import com.sun.tools.doclets.formats.html.SourceToHTMLConverter;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.sound.midi.Soundbank;
+import java.util.Arrays;
+
+/**
+ * Created by Luis J. Romero on 2/12/2018
+ */
+
+public class PersonTest {
+
+    private static Person person;
+
+    @Before
+    public void setup() {
+        this.person = new Person("John Smith", "(111) 222-3333");
+    }
+
+    @Test
+    public void setNameTest() {
+        String expected = "John Smith";
+        person.setName(expected);
+        String actual = person.getName();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getNameTest() {
+        String expected = "John Smith";
+        String actual = person.getName();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getPhoneNumberListArrayTest() {
+        this.person = new Person("Adam", "(000) 000-0000", "(011) 111-1111");
+
+        String expectedPhoneNumber1 = "(000) 000-0000";
+        String expectedPhoneNumber2 = "(011) 111-1111";
+
+        String actualPhoneNumber1 = person.getPhoneNumberListArray().get(0);
+        String actualPhoneNumber2 = person.getPhoneNumberListArray().get(1);
+
+        Assert.assertEquals(expectedPhoneNumber1, actualPhoneNumber1);
+        Assert.assertEquals(expectedPhoneNumber2, actualPhoneNumber2);
+    }
+
+    @Test
+    public void getPhoneNumberListArrayStringTest() {
+        this.person = new Person("Adam", "(000) 000-0000", "(011) 111-1111");
+
+        String expectedPhoneNumbers = "\t" + "(000) 000-0000" + "\n" +
+                                      "\t" + "(011) 111-1111" + "\n";
+        String actualPhoneNumbers = person.getPhoneNumberListString();
+
+//        System.out.println(expectedPhoneNumbers);
+//        System.out.println(person.getPhoneNumberListString());
+
+        Assert.assertEquals(expectedPhoneNumbers, actualPhoneNumbers);
+    }
+
+
+    @Test
+    public void addPhoneNumbersTest() {
+        this.person = new Person("John Smith", "(000) 000-0000");
+        String expectedPhoneNumberToAdd1 = "(111) 111-1111";
+        String expectedPhoneNumberToAdd2 = "(222) 222-2222";
+
+        this.person.addPhoneNumbers(expectedPhoneNumberToAdd1, expectedPhoneNumberToAdd2);
+
+        String actualPhoneNumberAdded1 = this.person.phoneNumberList.get(1);
+        String actualPhoneNumberAdded2 = this.person.phoneNumberList.get(2);
+
+        Assert.assertEquals(expectedPhoneNumberToAdd1, actualPhoneNumberAdded1);
+        Assert.assertEquals(expectedPhoneNumberToAdd2, actualPhoneNumberAdded2);
+
+    }
+
+    @Test
+    public void removePhoneNumbersTest() {
+        this.person = new Person("John Smith", "(000) 000-0000", "(111) 111-1111", "(222) 222-2222");
+        String expectedPhoneNumberToDelete1 = "(111) 111-1111";
+        String expectedPhoneNumberToDelete2 = "(222) 222-2222";
+
+        this.person.removePhoneNumbers(expectedPhoneNumberToDelete1, expectedPhoneNumberToDelete2);
+
+        boolean isPhoneNumberInList1 = this.person.phoneNumberList.contains(expectedPhoneNumberToDelete1);
+        boolean isPhoneNumberInList2 = this.person.phoneNumberList.contains(expectedPhoneNumberToDelete2);
+
+        Assert.assertFalse(isPhoneNumberInList1);
+        Assert.assertFalse(isPhoneNumberInList2);
+    }
+
+}
+

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

@@ -1,7 +1,134 @@
 package com.zipcodewilmington.phonebook;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBookTest {
+
+    private static PhoneBook phonebook;
+
+    @Before
+    public void setup() {
+        this.phonebook = new PhoneBook() ;
+    }
+
+    @Test
+    public void defaultConstructorTest() {
+        Assert.assertNotNull(this.phonebook);
+    }
+
+
+    @Test
+    public void lookupTest() {
+        Person expectedPerson = new Person("Jane", "(111) 222-3333");
+        this.phonebook.addEntry("Jane", "(111) 222-3333");
+
+        String actualPersonName = expectedPerson.getName();
+        String actualPersonPhoneNumber = expectedPerson.phoneNumberList.get(0);
+
+        boolean actualPersonNameExists = this.phonebook.treeMap.containsKey("Jane");
+
+        Assert.assertTrue(actualPersonNameExists);
+    }
+
+
+    @Test
+    public void addEntryTest() {
+        this.phonebook.addEntry("Adam", "(000) 000-0000", "(111) 111-1111");
+
+        boolean actualPersonName = this.phonebook.treeMap.containsKey("Adam");
+        boolean actualPhoneNumber = this.phonebook.treeMap.containsValue(this.phonebook.treeMap.get("Adam"));
+        Assert.assertTrue(actualPersonName);
+        Assert.assertTrue(actualPhoneNumber);
+
+        String expectedPhoneNumber1 = "(000) 000-0000";
+        String expectedPhoneNumber2 = "(111) 111-1111";
+
+        String actualPhoneNumber1 = this.phonebook.treeMap.get("Adam").phoneNumberList.get(0);
+        String actualPhoneNumber2 = this.phonebook.treeMap.get("Adam").phoneNumberList.get(1);
+
+        Assert.assertEquals(expectedPhoneNumber1, actualPhoneNumber1);
+        Assert.assertEquals(expectedPhoneNumber2, actualPhoneNumber2);
+
+    }
+
+    @Test
+    public void removeRecordTest() {
+        this.phonebook.addEntry("Bob", "(333) 444-5555");
+        this.phonebook.removeRecord("Bob");
+
+        boolean actualPersonName = this.phonebook.treeMap.containsKey("Bob");
+        boolean actualPersonObject = this.phonebook.treeMap.containsValue(this.phonebook.treeMap.get("Bob"));
+
+        Assert.assertFalse(actualPersonName);
+        Assert.assertFalse(actualPersonObject);
+    }
+
+    @Test
+    public void getKeySetTest() {
+        this.phonebook.addEntry("Frank", "(000) 000-0000", "(100) 000-0000");
+        this.phonebook.addEntry("Gabriel", "(100) 000-0000", "(110) 000-0000");
+
+        System.out.println("getAllEntriesTest:");
+        String expectedKeySet = "[Frank, Gabriel]";
+        String actualKeySet = this.phonebook.getKeySet().toString();
+
+        Assert.assertEquals(expectedKeySet, actualKeySet);
+    }
+
+    @Test
+    public void displayAllEntriesTest() {
+        this.phonebook.addEntry("Herbert", "(200) 000-0000", "(210) 000-0000");
+        this.phonebook.addEntry("Isabel", "(300) 000-0000", "(310) 000-0000");
+
+        String expectedEntries = "Herbert" + "\n" +
+                                 "\t" + "(200) 000-0000" + "\n" +
+                                 "\t" + "(210) 000-0000" + "\n" +
+                                 "Isabel" + "\n" +
+                                 "\t" + "(300) 000-0000" + "\n" +
+                                 "\t" + "(310) 000-0000" + "\n";
+        String actualEntries = this.phonebook.displayAllEntries().toString();
+
+//        System.out.println("displayAllEntriesTest:");
+//        System.out.println(expectedEntries);
+//        System.out.println(actualEntries);
+
+        Assert.assertEquals(expectedEntries, actualEntries);
+    }
+
+    @Test
+    public void reverseLookupTest() {
+
+        // This method should allow you to look up names by the phone number associated with them.
+
+        // Given
+        String givenPhoneNumber = "(000) 111-2222";
+
+        // When
+        this.phonebook.addEntry("Ava", "(000) 111-2222");
+        Person expectedPerson = new Person("Ava", "(000) 111-2222");
+
+        String expectedName = "Ava";
+        String expectedPhoneNumber = "(000) 111-2222";
+
+        String actualNameFromPhoneBook = "Ava";
+        boolean actualPhoneNumberFromPhoneBook = this.phonebook.treeMap.get(actualNameFromPhoneBook).phoneNumberList.contains(expectedPhoneNumber);
+
+        Assert.assertEquals(expectedName, this.phonebook.reverseLookup(givenPhoneNumber));
+        // Then
+
+
+
+    }
+
 }
+
+
+
+