finished phonebook

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

@@ -1,53 +0,0 @@
-package com.zipcodewilmington.phonebook;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-public class Person {
-
-    private String personName;
-    private ArrayList<String> phoneNumbers;
-
-    public Person(String personName){
-        this.personName = personName;
-        this.phoneNumbers = new ArrayList<>();
-        phoneNumbers
-    }
-
-
-    public String getPersonName() {
-        return personName;
-    }
-
-
-//public String addNumbers(){
-//        return null;
-//}
-
-
-   //find a way to print each item in the ArrayList in order
-   public String getPhoneNumbers() {
-       return phoneNumbers.toString();
-   }
-//       StringBuilder sb = new StringBuilder();
-//       for(int i = 0; i < phoneNumbers.size(); i++){
-//           if(i == phoneNumbers.size()){
-//               sb.append();
-//           }
-//       }
-//        return phoneNumbers;
-//    }
-
-
-
-
-
-
-
-
-
-    }
-
-
-
-

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

@@ -2,70 +2,77 @@ package com.zipcodewilmington.phonebook;
 
 import java.util.*;
 
-/**
- * Created by leon on 1/23/18.
- */
 public class PhoneBook {
 
-    TreeMap<String, Person> phoneBook;
-
-public phoneBook(){
-    phoneBook = new TreeMap<String, Person>();
-    }
+    // created class variables
+    protected TreeMap<String, ArrayList<String>> treeMap;
 
 
-    public void addEntryToPhoneBook(String name, String phoneNumber) {
-       Person person = new Person(name, phoneNumber);
-        phoneBook.put(name, person);
+    // initiate instance variables in constructor
+    public PhoneBook() {
+        this.treeMap = new TreeMap<>();
     }
 
+    // .getKey =    name
+    // .getValue =  arraylist phone #'s
+    // .entrySet = efficient way of iterating over map
+    // .containsKey = used to return true if map contains
 
-    public void removeEntryFromPhoneBook(String name, String phoneNumber) {
-        phoneBook.remove(name, phoneNumber);
-    }
-
-    public String lookUp(String name) {
-        return phoneBook.get(name).getPhoneNumbers();
+    public void addEntryToPhoneBook(String name, ArrayList<String> phoneNumber) {
+        // checking name if it's in map
+        if (!treeMap.containsKey(name)) {
+            treeMap.put(name, phoneNumber); //not there, add info
+        }
     }
 
-    public String listNames() {
-        String completeListOfNames = "";
-        for (String key : phoneBook.keySet()) {
-            completeListOfNames += key + "\n";
-        }
 
-        return completeListOfNames;
+    public void removeEntryFromPhoneBook(String name) {
+        treeMap.remove(name);
     }
 
-    public String listNumbers() {
-        String completeListOfNumbers = "";
-        for (Map.Entry<String, Person> entry : phoneBook.entrySet()) {
-            completeListOfNumbers += entry.getValue() + "\n";
-        }
-        return completeListOfNumbers;
+    public ArrayList<String> lookUp(String name) {
+        return treeMap.get(name);
     }
 
 
     public String entryListAll() {
-        String fullList = "";
-        for (Map.Entry<String, Person> entry : phoneBook.entrySet()) {
-            fullList += entry.getKey() + " : " + entry.getValue() + "\n"; //reverse lookup
 
+        StringBuilder fullList = new StringBuilder();
+
+        for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) {
+            fullList.append(entry.getKey())
+                    .append(" ")
+                    .append(entry.getValue())
+                    .append("\n"); // appended on new lines for readability
         }
         System.out.println(fullList);
-        return fullList;
+        return fullList.toString();
+
+//        Noting originally had below syntax
+//        String fullList = "";
+//        for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) {
+//            fullList += entry.getKey() + " : " + entry.getValue() + "\n";
+//
+//        }
+//        System.out.println(fullList);
+//        return fullList;
     }
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+    // want to look up number and return the persons name
     public String reverseLookup(String numberToLookUp) {
-        for (Map.Entry<String,Person > entry : phoneBook.entrySet()) {
-            if (entry.getValue().equals(numberToLookUp)){
-                return entry.getKey();
-            }
-        }return null;
-    }
-
 
+        String name = "";   //empty string
 
+        for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) { //Looping entire TreeMap
 
+            for (String numberWeWant : entry.getValue()) { //searching #'s in TreeMap value
+                if (numberToLookUp.contains(numberWeWant)) {
+                    name = entry.getKey();  // getKey reps names in TreeMap
+                }
+            }
+        }
+        System.out.println(name);
+        return name;
+    }
 }
-

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

@@ -1,67 +0,0 @@
-package com.zipcodewilmington.phonebook;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import static org.junit.Assert.*;
-
-public class PersonTest {
-
-
-    @Test
-    public void getPersonNameTest() {
-        //Given
-        Person human = new Person("Eric", "302-999-1234");
-
-        //When
-        String expectedName = "Eric";
-        String expectedNumber = "302-999-1234";
-        String actual = human.getPersonName() + human.getPhoneNumbers();
-
-
-        Assert.assertTrue(actual.contains(expectedName) && actual.contains(expectedNumber));
-    }
-
-//@Test
-//    public void addNumbersTest() {
-//        //Given
-//    Person human = new Person("Eric", "302-999-1234");
-//
-//    //When
-//    human.addNumbers("302-222-9876");
-//    String expectedNumber = "302-222-1234";
-//    String actual = human.getPhoneNumbers();
-//
-//    Assert.assertTrue(actual.contains(expectedNumber));
-//}
-
-@Test
-    public void printNameTest(){
-        //Given
-    Person human = new Person("Eric", "302-999-1234");
-
-    //When
-    String expectedName = "Eric";
-    String actual = human.getPersonName();
-
-    Assert.assertTrue(actual.contains(expectedName));
-}
-
-//@Test
-//    public void printNumbersTest(){
-//        //Given
-//    Person human = new Person("Eric", "302-999-1234");
-//    human.addNumbers("302-222-9876");
-//
-//    //When
-//    String expectedNumbers = "";
-//
-//}
-
-
-}
-

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

@@ -6,66 +6,68 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Set;
 
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBookTest {
-    PhoneBook phoneBook;
+    PhoneBook phoneBook = new PhoneBook();
 
     @Before
     public void setUp() {
-        phoneBook = new PhoneBook();
-        phoneBook.addEntryToPhoneBook("Eric", "302-123-4567");
-        phoneBook.addEntryToPhoneBook("Bob", "302-999-9999");
+        phoneBook = new PhoneBook();  // automatically goes in each test
+//        phoneBook.addEntryToPhoneBook("Eric", "302-555-1111");
+//        phoneBook.addEntryToPhoneBook("Bob", "302-999-9999");
     }
 
 
     @Test
     public void testAddPhoneBookEntryToPhoneBook() {
-        String phoneNumber = "302-555-1111";
-        phoneBook.addEntryToPhoneBook("eric", phoneNumber);
-        String actual = phoneBook.lookUp("eric");
-        Assert.assertEquals(phoneNumber, actual);
+
+        ArrayList<String> addition = new ArrayList<>(Arrays.asList("302-555-1111", "302-222-2222"));
+
+        phoneBook.addEntryToPhoneBook("Eric", addition);
+
+        ArrayList<String> actual = new ArrayList<String>(phoneBook.lookUp("Eric"));
+        Assert.assertEquals(addition, actual);
     }
 
     @Test
     public void testRemoveEntryFromPhoneBook() {
-        String phoneNumber = "302-555-1111";
-        String name = "eric";
-        phoneBook.addEntryToPhoneBook(name, phoneNumber);
-        phoneBook.removeEntryFromPhoneBook("eric", phoneNumber);
+        ArrayList<String> ericsNumbers = new ArrayList<>(Arrays.asList("302-555-1111", "302-222-2222"));
 
-        String actual = phoneBook.lookUp("eric");
-        Assert.assertEquals(null, actual);
-    }
+        phoneBook.addEntryToPhoneBook("Eric", ericsNumbers);
 
-    @Test
-    public void testListNames() {
-        String expected = "Bob\n" +
-                "Eric\n";
-        String actual = phoneBook.listNames();
+        String expected = "";
+        phoneBook.removeEntryFromPhoneBook("Eric");
+
+        String actual = phoneBook.entryListAll();
 
         Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void testListNumber() {
+    public void lookUpTest() {
+        ArrayList<String> addition = new ArrayList<>(Arrays.asList("302-555-1111", "302-222-2222"));
 
+        phoneBook.addEntryToPhoneBook("Eric", addition);
 
-        String expected = "302-999-9999\n" +
-                "302-123-4567\n";
-        String actual = phoneBook.listNumbers();
-
-        Assert.assertEquals(expected, actual);
+        ArrayList<String> actual = new ArrayList<String>(phoneBook.lookUp("Eric"));
+        Assert.assertEquals(addition, actual);
     }
 
+
     @Test
     public void testEntryListAll() {
 
+        ArrayList<String> ericsNumbers = new ArrayList<>(Arrays.asList("302-111-1111", "302-222-2222", "302-333-3333"));
+        phoneBook.addEntryToPhoneBook("Eric :", ericsNumbers);
+
+        String expected = "Eric : " + ericsNumbers + "\n";
 
-        String expected = "Bob : 302-999-9999\n" +
-                "Eric : 302-123-4567\n";
         String actual = phoneBook.entryListAll();
 
         Assert.assertEquals(expected, actual);
@@ -75,9 +77,14 @@ public class PhoneBookTest {
 
     @Test
     public void testReverseLookup() {
-        String expected = "Bob";
+        ArrayList<String> ericsNumbers = new ArrayList<>(Arrays.asList("302-555-1111", "302-222-2222"));
+
+        String expected = "Eric";
+
+        phoneBook.addEntryToPhoneBook("Eric", ericsNumbers);
+
+        String actual = phoneBook.reverseLookup("302-555-1111");
 
-        String actual = phoneBook.reverseLookup("302-999-9999");
         Assert.assertEquals(expected,actual);
     }