Skip to content

Lab Completed with updates #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 40 additions & 12 deletions src/main/java/com/zipcodewilmington/phonebook/PhoneBook.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package com.zipcodewilmington.phonebook;

import java.util.List;
import java.util.ArrayList;
import java.util.*;
//import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;


/**
* Created by leon on 1/23/18.
Expand All @@ -16,39 +13,70 @@ public class PhoneBook {
private final Map<String, List<String>> phonebook;

public PhoneBook(Map<String, List<String>> map) {
this.phonebook = null;

phonebook = map;
}

public PhoneBook() {
this(null);

phonebook = new LinkedHashMap<>();
}

public void add(String name, String phoneNumber) {
List<String> phoneNumberList = Arrays.asList(phoneNumber);
phonebook.put(name,phoneNumberList);
}

public void addAll(String name, String... phoneNumbers) {
List<String> phoneNumList = Arrays.asList(phoneNumbers);
phonebook.put(name,phoneNumList);
}

public void remove(String name) {
phonebook.remove(name);
}

public Boolean hasEntry(String name) {
return null;

if(phonebook.containsKey(name)){
return true;
}else {
return false;
}
}

public List<String> lookup(String name) {
return null;

return phonebook.get(name);
}

public String reverseLookup(String phoneNumber) {
return null;
for(Map.Entry<String,List<String>> entry : phonebook.entrySet()){
if(entry.getValue().contains(phoneNumber)){
return entry.getKey();
}

}
return null;
}

public List<String> getAllContactNames() {
return null;
List<String> allNames = new ArrayList<>();
for(String name : phonebook.keySet()){
allNames.add(name);
}
return allNames;
}

public Map<String, List<String>> getMap() {
return null;

return phonebook;
}

@Override
public String toString() {
return "PhoneBook{" +
"phonebook=" + phonebook +
'}';
}
}
6 changes: 3 additions & 3 deletions src/test/java/com/zipcodewilmington/phonebook/RemoveTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public void test1() {
String name = "John";
String phoneNumber = "302-555-4545";
phoneBook.add(name, phoneNumber);
Assert.assertTrue(phoneBook.hasEntry(name, phoneNumber));
Assert.assertTrue(phoneBook.hasEntry(name));

// when
phoneBook.remove(name);
Expand All @@ -27,7 +27,7 @@ public void test2() {
String name = "Joe";
String phoneNumber = "302-554-4545";
phoneBook.add(name, phoneNumber);
Assert.assertTrue(phoneBook.hasEntry(name, phoneNumber));
Assert.assertTrue(phoneBook.hasEntry(name));

// when
phoneBook.remove(name);
Expand All @@ -44,7 +44,7 @@ public void test3() {
String name = "Smith";
String phoneNumber = "302-554-4535";
phoneBook.add(name, phoneNumber);
Assert.assertTrue(phoneBook.hasEntry(name, phoneNumber));
Assert.assertTrue(phoneBook.hasEntry(name));

// when
phoneBook.remove(name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public void test1() {
String expectedName = "John";
String phoneNumber = "302-555-4545";
phoneBook.add(expectedName, phoneNumber);
Assert.assertTrue(phoneBook.hasEntry(expectedName, phoneNumber));
Assert.assertTrue(phoneBook.hasEntry(expectedName));

// when
String actualName = phoneBook.reverseLookup(phoneNumber);
Expand All @@ -27,7 +27,7 @@ public void test2() {
String expectedName = "Joe";
String phoneNumber = "302-554-4545";
phoneBook.add(expectedName, phoneNumber);
Assert.assertTrue(phoneBook.hasEntry(expectedName, phoneNumber));
Assert.assertTrue(phoneBook.hasEntry(expectedName));

// when
String actualName = phoneBook.reverseLookup(phoneNumber);
Expand All @@ -44,7 +44,7 @@ public void test3() {
String expectedName = "Smith";
String phoneNumber = "302-554-4535";
phoneBook.add(expectedName, phoneNumber);
Assert.assertTrue(phoneBook.hasEntry(expectedName, phoneNumber));
Assert.assertTrue(phoneBook.hasEntry(expectedName));

// when
String actualName = phoneBook.reverseLookup(phoneNumber);
Expand Down