Merge dfc60d5595ebcf7ca501c3b60a3b928aa2b31064 into 74a9673e36c7d25c28315cb54247a91792f8fbc0

pom.xml

@@ -7,6 +7,25 @@
     <groupId>com.zipcodewilmington</groupId>
     <artifactId>phonebok</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+    </dependencies>
 
 
 </project>

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

@@ -0,0 +1,31 @@
+package com.zipcodewilmington.phonebook;
+
+
+import java.util.ArrayList;
+
+public class ContactEntry {
+
+    private String name;
+    private ArrayList<String> phoneNumbers = new ArrayList<String>();
+
+    public String getName(){
+
+        return name;
+    }
+
+    public void setName(String name){
+        this.name = name;
+    }
+
+    public void addNumber(String phoneNumber){
+        addNumberToEntry(phoneNumber);
+    }
+
+    public void addNumberToEntry(String phoneNumber){
+        this.phoneNumbers.add(phoneNumber);
+    }
+
+    public ContactEntry(String name){
+        this.name = name;
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.zipcodewilmington.phonebook;
+
+public class Person {
+    private String name;
+    private String number;
+
+
+    public Person(){
+        setName("");
+        setNumber("");
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+}

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

@@ -1,7 +1,102 @@
 package com.zipcodewilmington.phonebook;
 
+import com.sun.xml.internal.bind.v2.util.QNameMap;
+
+import java.util.*;
+
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBook {
+
+private String nameEntry;
+private String numberEntry;
+
+
+
+   private TreeMap<String, ArrayList<String>> phoneBook = new TreeMap<String, ArrayList<String>>();
+
+     public void addEntry(String nameEntry, String...numberEntry){
+        ArrayList<String> phoneList = new ArrayList<String>();
+        for (String number : numberEntry){
+            phoneList.add(number);
+        }
+         phoneBook.put(nameEntry, phoneList);
+
+    }
+
+//    public String addNewNumbertoEntry(String nameEntry, String numberEntry) {
+//         ContactEntry entry = new ContactEntry(nameEntry);
+//         entry.addNumber((entryLookup(nameEntry)));
+//         entry.addNumber(numberEntry);
+//         addEntry(nameEntry, numberEntry);
+//         return entryLookup(nameEntry);
+//    }
+
+     public void removeEntry(String nameEntry , String numberEntry){
+        phoneBook.remove(nameEntry, numberEntry);
+
+     }
+
+     protected String entryLookup(String nameEntry){
+        return phoneBook.get(nameEntry).toString();
+
+     }
+
+    public String entryListNames() {
+
+        return phoneBook.keySet().toString();
+
+        }
+
+//    public String entryListNumbers() {
+//        String fullListNumbers = "";
+//        Set<String> keys = phoneBook.keySet();
+//        for (String key: keys){
+//            fullListNumbers += phoneBook.get(key) + "\n";
+//
+//        }
+//        return fullListNumbers;
+//    }
+
+     public String entryListAll() {
+        String fullListAll = "";
+         Set<String> keys = phoneBook.keySet();
+        for (String key: keys){
+            fullListAll += key + " : " + phoneBook.get(key) + "\n";
+
+        }
+        return fullListAll;
+     }
+
+     public String reverseLookup(String numberEntry){
+         Set<String> keys = phoneBook.keySet();
+         for (String key: keys){
+             if(phoneBook.get(key).contains(numberEntry)) {
+                 return key;
+             }
+         }
+         return "That number does not exist";
+     }
+
+     public void removeOneNumberfromEntry(String nameEntry, String numberEntry){
+         int counter = 0;
+         for (String phoneNum : phoneBook.get(nameEntry)){
+             if (phoneNum.equals(numberEntry)){
+                 phoneBook.get(nameEntry).remove(counter);
+             }
+         } counter++;
+     }
+
+
+    public static void main(String[] args) {
+       PhoneBook nameNumber = new PhoneBook();
+       nameNumber.addEntry("Albert", "111111111");
+       nameNumber.addEntry("Bobby", "222222222");
+       nameNumber.addEntry("Albert", "333333333", "444444444");
+      //  System.out.println(nameNumber.entryLookup("Albert"));
+        System.out.println(nameNumber.entryListAll());
+        System.out.println(nameNumber.reverseLookup("333333333"));
+    }
+
 }

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

@@ -1,7 +1,136 @@
 package com.zipcodewilmington.phonebook;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 /**
  * Created by leon on 1/23/18.
  */
 public class PhoneBookTest {
+
+   private PhoneBook testPhoneBook;
+
+   @Before
+   public void createPhone(){
+      this.testPhoneBook = new PhoneBook();
+   }
+
+   @Test
+   public void testAddEntry(){
+      String number = "111111111";
+      String name = "Albert";
+      testPhoneBook.addEntry(name, number);
+      String actual = testPhoneBook.entryLookup(name);
+      String expected = "[111111111]";
+      Assert.assertEquals(expected, actual);
+
+
+   }
+
+   @Test
+   public void testAddEntry1(){
+      String expected = null;
+      String name = "Albert";
+      testPhoneBook.addEntry(name, expected);
+      String actual = testPhoneBook.entryLookup(name);
+      Assert.assertFalse("You did not enter a number", false);
+   }
+
+
+   @Test (expected =  NullPointerException.class)
+   public void testRemoveEntry(){
+      String name = "Albert";
+      String number = "111111111";
+      testPhoneBook.removeEntry(name, number);
+      String actual = testPhoneBook.entryLookup(name);
+
+
+   }
+
+   @Test (expected = NullPointerException.class)
+   public void testRemoveEntry1(){
+      String expected = "Albert";
+      String name = "Albert";
+      String number = "111111111";
+      testPhoneBook.removeEntry(name, number);
+      String actual = testPhoneBook.entryLookup(name);
+   }
+
+   @Test
+   public void testEntryLookup(){
+      String name = "Albert";
+      String number = "111111111";
+      testPhoneBook.addEntry("Albert", "111111111");
+      testPhoneBook.entryLookup(name);
+      String expected = "[111111111]";
+      String actual = testPhoneBook.entryLookup(name);
+      Assert.assertEquals(expected, actual);
+
+   }
+
+
+   @Test
+   public void testEntryListNames(){
+      String name = "Albert";
+      String number = "111111111";
+      testPhoneBook.addEntry(name, number);
+      String name1 = "Bobby";
+      String number1 = "222222222";
+      testPhoneBook.addEntry(name1, number1);
+      String name2 = "Catherine";
+      String number2 = "333333333";
+      testPhoneBook.addEntry(name2, number2);
+
+      String expected = "[Albert, Bobby, Catherine]";
+      String actual = testPhoneBook.entryListNames();
+      Assert.assertEquals(expected, actual);
+
+   }
+
+//   @Test
+//   public void testEntryListNumbers(){
+//
+//   }
+
+   @Test
+   public void testEntryListAll(){
+      String name = "Albert";
+      String number = "111111111";
+      testPhoneBook.addEntry(name, number);
+      String name1 = "Bobby";
+      String number1 = "222222222";
+      testPhoneBook.addEntry(name1, number1);
+      String name2 = "Catherine";
+      String number2 = "333333333";
+      testPhoneBook.addEntry(name2, number2);
+
+      String expected = "Albert : [111111111]\nBobby : [222222222]\nCatherine : [333333333]\n";
+      String actual = testPhoneBook.entryListAll();
+      Assert.assertEquals(expected, actual);
+   }
+
+   @Test
+   public void testReverseEntry(){
+      String name = "Albert";
+      String number = "111111111";
+      testPhoneBook.addEntry(name, number);
+      String expected = "Albert";
+      String actual = testPhoneBook.reverseLookup(number);
+      Assert.assertEquals(expected, actual);
+   }
+
+   @Test
+   public void testremoveOnePhoneNum(){
+      String name = "Albert";
+      String number = "111111111";
+      String number1 = "222222222";
+      testPhoneBook.addEntry(name, number, number1);
+      testPhoneBook.removeOneNumberfromEntry("Albert", "111111111");
+      String expected = "[222222222]";
+      String actual = testPhoneBook.entryLookup("Albert");
+      Assert.assertEquals(expected, actual);
+
+   }
+
 }