second commit

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

@@ -0,0 +1,48 @@
+package com.zipcodewilmington.phonebook;
+
+
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeMap;
+
+public class Contact {
+
+    private String name;
+    private ArrayList<String> phoneNumbers;
+
+
+    // Constructor
+    Contact(String name) {
+        this.name = name;
+        phoneNumbers = new ArrayList<String>();
+    }
+
+    // Getter
+    public String getName() {
+        return name;
+    }
+
+    // Getter
+    public ArrayList<String> getPhoneNumbers() {
+        return phoneNumbers;
+
+    }
+
+    public void addPhoneNumber(String phoneNumber) {
+        phoneNumbers.add(phoneNumber);
+    }
+
+    public void removePhoneNumber(String phoneNumber) {
+        phoneNumbers.remove(phoneNumber);
+    }
+
+
+
+
+
+}
+
+
+
+

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

@@ -1,28 +0,0 @@
-package com.zipcodewilmington.phonebook;
-
-import java.util.HashMap;
-
-public class Person {
-
-    private String name;
-    private String phoneNumber;
-
-
-        public Person(String name, String phoneNumber) {
-
-            this.name = name;
-            this.phoneNumber = phoneNumber;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-
-        public String getPhoneNumber() {
-            return phoneNumber;
-        }
-
-
-
-}

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

@@ -1,5 +1,7 @@
 package com.zipcodewilmington.phonebook;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.TreeMap;
 
@@ -10,32 +12,69 @@ import java.util.TreeMap;
 
 public class PhoneBook {
 
-    TreeMap<String, String> contacts;
+    private TreeMap<String, Contact> contactsMap;
 
-    public PhoneBook () {
-        contacts = new TreeMap();
+    // Constructor
+    public PhoneBook() {
+        contactsMap = new TreeMap<String, Contact>();
     }
 
-    public String addPerson(String name, String phoneNumber) {
-        return contacts.put(name, phoneNumber);
+
+    public void addContact(String name, String phoneNumber) {
+        //Create new contact instance, call addPhoneNumber method
+        Contact contact = new Contact(name);
+        contact.addPhoneNumber(phoneNumber);
+        // Call getName method to add key, contact is value
+        contactsMap.put(contact.getName(), contact);
     }
 
-    public String lookupPhoneNumber(String name) {
-        return contacts.get(name);
+
+    public int getNumberOfContacts() {
+        return contactsMap.size();
     }
 
-    public String removePerson(String name) {
-        return contacts.remove(name);
+
+    public void removeContact(String name) {
+        contactsMap.remove(name);
     }
 
-    public void  listNamesAndNums(String name, String phoneNumber) {
 
-        for (String key : contacts.keySet()){
-            String value = contacts.get(key);
-            System.out.println(key + ": " + value);
-        }
+    public ArrayList lookupByName(String name) {
+        return contactsMap.get(name).getPhoneNumbers();
+    }
+
 
+    public Collection listAllContacts() {
+        return contactsMap.values();
     }
 
+    public String lookupByNumber(String phoneNumber) {
+        // from phone book
+        // into contactsMap
+        // into Contact object
+        // into Contact object's arraylist
+        // evaluate values in arraylist
+
+        Collection<Contact> contacts = contactsMap.values();
+        for (Contact contact : contacts) {
+            ArrayList<String> phoneNumbers = contact.getPhoneNumbers();
+            if(phoneNumbers.contains(phoneNumber)) {
+                return contact.getName();
+            }
+        }
+    }
+
+
+//
+//    public void listNamesAndNums(String name, String phoneNumber) {
+//
+//        for (String key : contacts.keySet()){
+//            String value = contacts.get(key);
+//            System.out.println(key + ": " + value);
+//        }
+//
+//    }
+//
+
 
 }

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

@@ -0,0 +1,62 @@
+package com.zipcodewilmington.phonebook;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+
+public class ContactTests {
+
+    @Test
+    public void getNameTest() {
+
+        Contact contact1 = new Contact("Bob");
+
+        String actualName = contact1.getName();
+        Assert.assertEquals("Bob", actualName);
+    }
+
+    @Test
+    public void getPhoneNumbersTest() {
+
+        Contact contact1 = new Contact("Madeline");
+        Assert.assertTrue(contact1.getPhoneNumbers().isEmpty());
+    }
+
+    @Test
+    public void addPhoneNumbersTest() {
+
+    // Actual:
+    // Create new contact instance
+        Contact contact1 = new Contact("Madeline");
+
+    // Call addPhoneNumber method to add phone numbers to instance
+        contact1.addPhoneNumber("234234");
+        contact1.addPhoneNumber("767884");
+
+    // Call getMethod to see if numbers were actually added
+        ArrayList<String> actualPhoneNumbers = contact1.getPhoneNumbers();
+
+    // Expected:
+    // Create new ArrayList to test
+        ArrayList expectedPhoneNumbers = new ArrayList<String>();
+
+    // Add phone numbers to new ArrayList
+        expectedPhoneNumbers.add("234234");
+        expectedPhoneNumbers.add("767884");
+
+        Assert.assertEquals( expectedPhoneNumbers, actualPhoneNumbers);
+
+    }
+
+    @Test
+    public void removePhoneNumber() {
+        Contact contact1 = new Contact("Jerry");
+        contact1.addPhoneNumber("89089");
+
+        ArrayList<String> expectedPhoneNumbers = new ArrayList<String>();
+        expectedPhoneNumbers.remove("89089");
+
+    }
+
+}

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

@@ -1,8 +1,13 @@
 package com.zipcodewilmington.phonebook;
 
+
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.TreeMap;
+
 
 /**
  * Created by leon on 1/23/18.
@@ -10,36 +15,153 @@ import org.junit.Test;
 public class PhoneBookTest {
 
     @Test
-    public void testConstructor() {
-        // Given
-        String expectedName = "";
-        String expectedPhoneNumber = "";
+    public void addContactTest() {
+
+        PhoneBook testPhoneBook = new PhoneBook();
+
+        Contact contact1 = new Contact("Jerry");
+        contact1.addPhoneNumber("1234");
+
+        // Actual
+        testPhoneBook.addContact("Jerry", "43234");
+
+    }
+
+    @Test
+    public void getNumberOfContactsTest() {
+
+        PhoneBook testPhoneBook = new PhoneBook();
+
+        testPhoneBook.addContact("Jerry", "78998");
+        testPhoneBook.addContact("Newman", "90980");
+        testPhoneBook.addContact("Elaine", "432345");
+
+        int expectedNumberOfContacts = 3;
+        //int actualNumberOfContacts =
+    }
+
+    @Test
+    public void lookupByNameTest() {
+
+        PhoneBook testPhoneBook = new PhoneBook();
+        testPhoneBook.addContact("Madeline", "898098");
+
+
+        ArrayList expectedLookupByNameResult = new ArrayList();
+        ArrayList actualLookupByNameResult = testPhoneBook.lookupByName("Madeline");
+
+    }
+
+    @Test
+    public void lookupByNumberTest() {
+
+        PhoneBook testPhoneBook = new PhoneBook();
+
 
-        // When
-        Person person = new Person(expectedName, expectedPhoneNumber);
 
-        // Then
-        String actualName = person.getName();
-        String actualPhoneNumber = person.getPhoneNumber();
 
-        Assert.assertEquals(expectedName, actualName);
-        Assert.assertEquals(expectedPhoneNumber, actualPhoneNumber);
     }
 
     @Test
-    public void testConstructorWithNameAndPhonNumber() {
+    public void removeContactTest() {
         // Given
-        String expectedName = "Leon";
-        String expectedPhoneNumber = "123";
+        String personNameToRemove = "Bob";
+        int expectedListSize = 0;
 
         // When
-        Person person = new Person(expectedName, expectedPhoneNumber);
+        PhoneBook testPhoneBook = new PhoneBook();
+        testPhoneBook.addContact(personNameToRemove, "23423");
+        testPhoneBook.removeContact(personNameToRemove);
+
+
+
+        Assert.assertEquals(expectedListSize, testPhoneBook.getNumberOfContacts());
+    }
+
+    @Test
+    public void listAllContactsTest() {
+
+        PhoneBook testPhoneBook = new PhoneBook();
+        testPhoneBook.addContact("Kramer", "23423");
+
+        Collection actualContactsList = testPhoneBook.listAllContacts();
+
+
+        // Actual
+        // Create object
+        Collection expectedContactsList = new ArrayList<Contact>();
+        Contact contact1 = new Contact("Kramer");
+
+
+        contact1.addPhoneNumber("23423");
+
+        // add contacts to expectedList
+        expectedContactsList.add(contact1);
+
+
+        Assert.assertEquals(expectedContactsList, actualContactsList);
+        }
+
+
 
-        // Then
-        String actualPhoneNumber = person.getPhoneNumber();
-        String actualName = person.getName();
 
-        Assert.assertEquals(expectedPhoneNumber, actualPhoneNumber);
-        Assert.assertEquals(expectedName, actualName);
     }
-}
+
+
+    //addContact ---- done
+    //removeContact ----- done
+    //lookupByName ----- done
+    //lookupByNumber
+    //addPhoneNumber ---- done
+    //removePhoneNumber ---- done
+    //list all entries (names & phone numbers) ----- done
+
+
+//    @Test
+//    public void testGetName() {
+//        // Given
+//        String expectedName = "Bob";
+//
+//
+//        // When
+//        Person person = new Person("Bob", ;
+//
+//        // Then
+//        String actualName = person.getName();
+//        Assert.assertEquals(expectedName, actualName);
+//
+//    }
+
+
+    //    @Test
+//    public void testGetPhoneNumber() {
+//        // Given
+//        String expectedName = "Madeline";
+//        String expectedPhoneNumber = "123";
+//
+//        // When
+//        Person person = new Person(expectedName, expectedPhoneNumber);
+//
+//        // Then
+//        String actualPhoneNumber = person.getPhoneNumber();
+//        String actualName = person.getName();
+//
+//        Assert.assertEquals(expectedPhoneNumber, actualPhoneNumber);
+//        Assert.assertEquals(expectedName, actualName);
+//    }
+//
+
+//
+//
+//
+//    @Test
+//    public void testLookup() {
+//        PhoneBook testPB = new PhoneBook();
+//        testPB.addPerson("bob", "123");
+//
+//        String actualPhoneNumber = testPB.lookupPhoneNumber("Bob");
+//        Assert.assertEquals("123", actualPhoneNumber);
+//
+//    }
+
+