hooray

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

@@ -1,101 +1,81 @@
 package com.zipcodewilmington.phonebook;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
+import java.util.*;
 
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBook {
+    //instance vairable
+    private Map<String, List<String>> contacts;
 
-    private TreeMap<String String> contacts;
-
+    //constructor has to be the same as class w a capital letter
     public PhoneBook() {
-
-        contacts = new TreeMap<>();
-    }
-    public void add (String name, String number){
-        contacts.put(name, number);
-    }
-    public String lookup (String name){
-        return contacts.get(name);
-    }
-    public void remove (String name){
-        contacts.remove(name);
-    }
-    public String display (){
-        StringBuilder sb = new StringBuilder();
-        for (Map.Entry<String, String>entry : contacts.entrySet()){
-            String name = entry.getKey();
-            String number = entry.getValue();
-            sb.append(name + "     " + number + "\n");
-        }
-        return sb.toString();
-    }
-    public String reverseLookup (String number){
-        for (Map.Entry <String, String>entry: contacts.entrySet()){
-            if (entry.getValue().equals(number){
-            }
-            return null;
-        }
+        contacts = new TreeMap<String, List<String>>();
     }
 
+    public Boolean add(String name, String number) {
+        // contains key is to add a phone number to an already existing person
+        if (contacts.containsKey(name)) {
+            contacts.get(name).add(number);
+            return true;
+        }
+        List<String> newNum = new ArrayList<String>();
+        newNum.add(number);
+        contacts.put(name, newNum);
+        return true;
 
+    }
 
+    public boolean delete(String name) {
+        return contacts.remove(name) != null;
+    }
 
+    public String lookup(String name) {
+        return join(contacts.get(name));
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    public void addAContact(String name, String number) {
-        tmap.put(name, number);
     }
 
-    public String listOfAllNames(){
-        StringBuilder result = new StringBuilder();
-        for (Map.Entry<String, String> entry: tmap.entrySet()){
-            result.append(String.format("%-20s %8s\n", entry.getKey(), entry.getValue()));
-            //formats the way a string will print out on console^^^^^^
+    public String reverseLookup(String number) {
+        for (String nameKey : contacts.keySet()) {
+            List<String> numForName = contacts.get(nameKey);
+            if (numForName.contains(number)) {
+                return nameKey;
+            }
         }
-        return String.valueOf(result);
+        return "";
     }
 
-    public void removeAContact(String name) {
-        tmap.remove(name);
-    }
-
-    public String lookupContactName(String name) {
-        if (tmap.containsKey(name)) {
-            return tmap.get(name);
-        } else {
-            return "This Name Does Not Exist";
+    public String listAllNames() {
+        StringBuilder list = new StringBuilder();
+        Formatter formatList = new Formatter(list);
+        for (String nameKey : contacts.keySet()) {
+            formatList.format("Name %s%n", nameKey);
         }
+        return list.toString();
     }
 
-
-
-    public reverseLookUpNumber (String number){
-
+    public String listAllNamesAndNumbers() {
+        StringBuilder list = new StringBuilder();
+        Formatter formatList = new Formatter(list);
+        for (String nameKey : contacts.keySet()) {
+            formatList.format("Name %s%n Number: %-10s%n", nameKey, join(contacts.get(nameKey)));
         }
+        return list.toString();
 
+    }
 
-}
-
-
-
+    public static String join(List<String> listNum){
+        if (listNum.size() == 1){
+            return listNum.get(0);
+        }
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < listNum.size(); i++){
+            sb.append(listNum.get(i));
+            if (i< listNum.size()-1){
+                sb.append(", ");
+            }
+        }
+        return sb.toString();
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.zipcodewilmington.phonebook;
 
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -9,69 +10,76 @@ import java.util.TreeMap;
 /**
  * Created by leon on 1/23/18.
  */
+
 public class PhoneBookTest {
-    // constructor
-    String name = "Jess";
-    String number = "1234567";
-    String nameA = "Alice";
-    String numberA = "1111111";
-    String nameB = "Sean";
-    String numberB = "2222222";
-
-    private PhoneBook phoneBook = new PhoneBook();
-    // instance
-
-
-   @Before
-   public void setUp(){
-       phoneBook = new PhoneBook();
-   }
-
-   @Test
-   public boolean testAddAContact() {
-    //instance of new phone book
-//    phoneBook.addAContact(name, number);
-//    Assert.assertTrue(phoneBook.addAContact(name, number).equals(name, number));
-       TreeMap.containsKey(String);
-       Assert.assertTrue(phoneBook.addAContact(name));
-
-   }
-@Test
-    public void removeAContact(String name){
-       //Given
-        String expected = "Null";
-
-        //When
-        phoneBook.addAContact(expected);
-        tmap.add(name);
-        //first must add a name to map
-
-        phoneBook.lookupContactName(expected);
-        String actual = phoneBook.removeAContact();
-        tmap.remove(name);
-        //Then
-        Assert.assertTrue(expected, actual);
+    private static PhoneBook phoneBookTest;
+
+    public void setUp() {
+        phoneBookTest = new PhoneBook();
+    }
+
+    @Test
+    public void testAdd() {
+        PhoneBook phoneBook = new PhoneBook();
+        phoneBook.add("Jess", "3333333");
+        String expected = phoneBook.lookup("Jess");
+        Assert.assertEquals(expected, "3333333");
     }
+
     @Test
-    public void testLookupContactName (){
-       //Given
-       phoneBook.lookupContactName("Jess");
-       String expected = "1234567";
+    public void testDelete() {
+        PhoneBook phoneBook = new PhoneBook();
+        phoneBook.add("Kat", "2342233");
+        Boolean actual = phoneBook.delete("Kat");
+        Assert.assertTrue(actual);
+    }
 
-       //When
-       String actual = phoneBook.lookupContactName("Jess");
+    @Test
+    public void testLookup() {
+        PhoneBook phoneBook = new PhoneBook();
+        phoneBook.add("Sean", "556665");
+        String actual = phoneBook.lookup("Sean");
+        Assert.assertEquals("556665", actual);
+    }
 
-       //Then
-       Assert.assertEquals(expected, actual);
+    // actual is what method in Phonebook class gives us back
+    @Test
+    public void testReverseLookup() {
+        PhoneBook phoneBook = new PhoneBook();
+        phoneBook.add("Sean", "556665");
+        String actual = phoneBook.reverseLookup("556665");
+        Assert.assertEquals("Sean", actual);
     }
 
     @Test
-    public void printOut(){
-        System.out.println(phoneBook.listOfAllNames());
+    public void testListAllNames() {
+        PhoneBook phoneBook = new PhoneBook();
+        phoneBook.add("Sean", "556665");
+        phoneBook.add("Joe", "9766847");
+        phoneBook.add("Bree", "993255");
+        String expected = "Name Bree\nName Joe\nName Sean\n";
+        String actual = phoneBook.listAllNames();
+        Assert.assertEquals(expected, actual);
+    }
 
+    @Test
+    public void testListAllNamesAndNumbers() {
+        PhoneBook phoneBook = new PhoneBook();
+        phoneBook.add("Sean", "5566651111");
+        phoneBook.add("Joe", "9766847111");
+        phoneBook.add("Bree", "9932551111");
+        String expected = "Name Bree\n Number: 9932551111\n" +
+                          "Name Joe\n Number: 9766847111\n" +
+                            "Name Sean\n Number: 5566651111\n";
+        String actual = phoneBook.listAllNamesAndNumbers();
+        Assert.assertEquals(expected, actual);
     }
 }
 
 
 
 
+
+
+
+