last commit

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

@@ -28,6 +28,10 @@ public class PhoneBook {
         contactsMap.put(contact.getName(), contact);
     }
 
+    public void addContact(Contact contact) {
+        contactsMap.put(contact.getName(), contact);
+    }
+
 
     public int getNumberOfContacts() {
         return contactsMap.size();
@@ -44,7 +48,7 @@ public class PhoneBook {
     }
 
 
-    public Collection listAllContacts() {
+    public Collection<Contact> listAllContacts() {
         return contactsMap.values();
     }
 
@@ -62,19 +66,7 @@ public class PhoneBook {
                 return contact.getName();
             }
         }
+        return "";
     }
 
-
-//
-//    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

@@ -50,12 +50,26 @@ public class ContactTests {
     }
 
     @Test
-    public void removePhoneNumber() {
+    public void removePhoneNumberTest() {
+    // Actual:
+    // Create new contact instance
         Contact contact1 = new Contact("Jerry");
+
+    // Add phone number to contact
+    // Remove number
         contact1.addPhoneNumber("89089");
+        contact1.removePhoneNumber("89089");
+
+    // Call getPhoneNumber method to check against
+        ArrayList actualRemovePhoneNumberTest = contact1.getPhoneNumbers();
+
+    // Expected:
+    // Create ArrayList to test/return empty ArrayList
+        ArrayList<String> expectedRemovePhoneNumberTest = new ArrayList<String>();
+
+
+        Assert.assertEquals(expectedRemovePhoneNumberTest, actualRemovePhoneNumberTest );
 
-        ArrayList<String> expectedPhoneNumbers = new ArrayList<String>();
-        expectedPhoneNumbers.remove("89089");
 
     }
 

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

@@ -36,8 +36,11 @@ public class PhoneBookTest {
         testPhoneBook.addContact("Newman", "90980");
         testPhoneBook.addContact("Elaine", "432345");
 
+        int actualNumberOfContacts = testPhoneBook.getNumberOfContacts();
         int expectedNumberOfContacts = 3;
-        //int actualNumberOfContacts =
+
+        Assert.assertEquals(expectedNumberOfContacts, actualNumberOfContacts);
+
     }
 
     @Test
@@ -46,19 +49,29 @@ public class PhoneBookTest {
         PhoneBook testPhoneBook = new PhoneBook();
         testPhoneBook.addContact("Madeline", "898098");
 
-
-        ArrayList expectedLookupByNameResult = new ArrayList();
+        // Actual
         ArrayList actualLookupByNameResult = testPhoneBook.lookupByName("Madeline");
 
+
+        // Expected
+        ArrayList<String> expectedLookupByNameResult = new ArrayList<String>();
+        expectedLookupByNameResult.add("898098");
+
+        Assert.assertEquals(expectedLookupByNameResult, actualLookupByNameResult);
+
+
     }
 
     @Test
     public void lookupByNumberTest() {
 
         PhoneBook testPhoneBook = new PhoneBook();
+        testPhoneBook.addContact("Jerry", "43984029830");
 
+        String actualLookupByNumberResult = testPhoneBook.lookupByNumber("43984029830");
+        String expectedLookupByNumberResult = "Jerry";
 
-
+        Assert.assertEquals(expectedLookupByNumberResult, actualLookupByNumberResult);
 
     }
 
@@ -73,95 +86,27 @@ public class PhoneBookTest {
         testPhoneBook.addContact(personNameToRemove, "23423");
         testPhoneBook.removeContact(personNameToRemove);
 
-
-
         Assert.assertEquals(expectedListSize, testPhoneBook.getNumberOfContacts());
     }
 
     @Test
     public void listAllContactsTest() {
-
+        // Given
         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);
-        }
-
+        Contact testContact = new Contact("Kramer");
+        testPhoneBook.addContact(testContact);
 
+        // When
+        Collection contacts = testPhoneBook.listAllContacts();
+        boolean outcome = contacts.contains(testContact);
 
 
+        // Then
+        Assert.assertTrue(outcome);
     }
 
+}
+
 
-    //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);
-//
-//    }