Part Three Commit

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

@@ -42,8 +42,10 @@ public class PhoneBook {
     //no test cases yet
     public void removeNumberFromEntry(String name, String number) {
         for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) {
-            if (entry.getValue().contains(number)) {
-                entry.getValue().remove(number);
+            if (entry.getKey().equals(name)) {
+                if (entry.getValue().contains(number)) {
+                    entry.getValue().remove(number);
+                }
             }
         }
     }

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

@@ -13,7 +13,6 @@ import java.util.TreeMap;
 public class PhoneBookTest {
     @Test
     public void testDefaultConstructor() {
-
         PhoneBook book = new PhoneBook();
         Assert.assertNotNull(book);
     }
@@ -50,92 +49,83 @@ public class PhoneBookTest {
         //Given
         PhoneBook book = new PhoneBook();
         ArrayList<String> bobNumber = new ArrayList<String>();
-        bobNumber.add("302-555-2222");
+        bobNumber.add("302-555-2234");
         book.inputEntry("Bob", bobNumber);
-        book.display();
-        //Expected
         ArrayList<String> expectedAddition = new ArrayList<String>();
-        expectedAddition.add("302-555-2222");
+        expectedAddition.add("302-555-2234");
         expectedAddition.add("302-555-1111");
         //When
         book.addNumberToEntry("Bob", "302-555-1111");
         ArrayList<String> actualAddition = book.lookup("Bob");
         //Then
         Assert.assertEquals(expectedAddition, actualAddition);
-
     }
 
-    //add test for removeNumberFromEntry
-
     @Test
-    public void testRemoveEntry() {
-
+    public void removeNumberFromEntry() {
         //Given
         PhoneBook book = new PhoneBook();
         ArrayList<String> bobNumber = new ArrayList<String>();
-        bobNumber.add("302-555-2222");
-        bobNumber.add("302-555-3456");
+        bobNumber.add("302-555-2234");
+        bobNumber.add("302-555-1111");
         book.inputEntry("Bob", bobNumber);
-        String expectedValue = "";
 
-        //When
-        book.removeEntry("Bob");
-        String actualValue = book.display();
+        ArrayList<String> expectedAfterDeletion = new ArrayList<String>();
+        expectedAfterDeletion.add("302-555-2234");
 
+        //When
+        book.removeNumberFromEntry("Bob", "302-555-1111");
+        ArrayList<String> actualAfterDeletion = book.lookup("Bob");
         //Then
-        Assert.assertEquals(expectedValue, actualValue);
+        Assert.assertEquals(expectedAfterDeletion, actualAfterDeletion);
     }
 
     @Test
-    public void testRemoveEntry2() {
+    public void testRemoveEntry() {
 
         //Given
         PhoneBook book = new PhoneBook();
-
-        ArrayList<String> expectedValue = new ArrayList<String>();
-        expectedValue.add("302-555-2222");
-        expectedValue.add("302-555-3456");
-        book.inputEntry("Bob", expectedValue);
+        ArrayList<String> bobNumber = new ArrayList<String>();
+        bobNumber.add("302-555-2222");
+        bobNumber.add("302-555-3456");
+        book.inputEntry("Bob", bobNumber);
+        String expectedValue = "";
 
         //When
-        book.removeEntry("Robert");
+        book.removeEntry("Bob");
         String actualValue = book.display();
 
         //Then
-        Assert.assertNotEquals(expectedValue, actualValue);
+        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>();
         expectedNumber.add("302-555-2223");
         expectedNumber.add("302-555-3456");
         book.inputEntry("Bob", expectedNumber);
-
         //When
         ArrayList<String> actualNumber = new ArrayList<String>(book.lookup("Bob"));
-
         //Then
         Assert.assertEquals(expectedNumber, actualNumber);
     }
 
     @Test
-    public void testLookup3(){
-
+    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>();
         bobNumber.add("302-555-2223");
         book.inputEntry("Bob", bobNumber);
-
+        //Expected
         ArrayList<String> expectedNumber = new ArrayList<String>();
         expectedNumber.add("302-555-9988");
         book.inputEntry("Frank", expectedNumber);
-
         //When
         ArrayList<String> actualNumber = new ArrayList<String> (book.lookup("Frank"));
         //Then
@@ -144,18 +134,16 @@ public class PhoneBookTest {
 
     @Test
     public void testreverseLookup(){
-
+        // to test if right person is returned when searching by one of multiple phone numbers
         //Given
         PhoneBook book = new PhoneBook();
-        String expectedName = "Bob";
         ArrayList<String> bobNumber = new ArrayList<String>();
         bobNumber.add("302-555-2223");
         bobNumber.add("302-555-5555");
+        String expectedName = "Bob";
         book.inputEntry(expectedName, bobNumber);
-
-        //When;
+        //When
         String actualName = book.reverseLookup("302-555-2223");
-
         //Then
         Assert.assertEquals(expectedName, actualName);
     }
@@ -165,22 +153,21 @@ public class PhoneBookTest {
     public void testDisplay() {
         //Given:
         PhoneBook book = new PhoneBook();
+
         ArrayList<String> bobNumber = new ArrayList<String>();
         bobNumber.add("302-555-1234");
         bobNumber.add("302-556-1245");
+        book.inputEntry("Bob", bobNumber);
+
         ArrayList<String> frankNumber = new ArrayList<String>();
         frankNumber.add("777-555-1111");
-        book.inputEntry("Bob", bobNumber);
         book.inputEntry("Frank", frankNumber);
-
+        //Expected
         String expectedNameNumber = "Bob " + bobNumber.toString() + "\n" + "Frank " + frankNumber.toString() + "\n";
-
         //When
         String actualNameNumber = book.display();
         //Then
         Assert.assertEquals(expectedNameNumber, actualNameNumber);
-
     }
 
-
 }