add attributes to AddressBook

2 files changed, 58 insertions, 3 deletions

diff --git a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/AddressBook.java b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/AddressBook.java
index d794bbd..0e529b0 100644
--- a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/AddressBook.java
+++ b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/AddressBook.java
@@ -2,17 +2,36 @@ package ca.mokhan.assignment1;
 
 public class AddressBook
 {
+  private String businessPhone;
+  private String cellPhone;
+  private String facebookId;
   private String firstName;
+  private String homeAddress;
+  private String homePhone;
   private String lastName;
   private String middleName;
-  private String homeAddress;
+  private String personalWebSite;
+  private String skypeId;
 
+  public String getBusinessPhone() { return this.businessPhone; }
+  public String getCellPhone() { return this.cellPhone; }
+  public String getFacebookId() { return this.facebookId; }
   public String getFirstName() { return this.firstName; }
+  public String getHomeAddress() { return this.homeAddress; }
+  public String getHomePhone() { return this.homePhone; }
   public String getLastName() { return this.lastName; }
   public String getMiddleName() { return this.middleName; }
-  public String getHomeAddress() { return this.homeAddress; }
+  public String getPersonalWebSite() { return this.personalWebSite; }
+  public String getSkypeId() { return this.skypeId; }
+
+  public void setBusinessPhone(String value) { this.businessPhone = value; }
+  public void setCellPhone(String value) { this.cellPhone = value; }
+  public void setFacebookId(String value) { this.facebookId = value; }
   public void setFirstName(String name) { this.firstName = name; }
+  public void setHomeAddress(String address) { this.homeAddress = address; }
+  public void setHomePhone(String value) { this.homePhone = value; }
   public void setLastName(String name) { this.lastName = name; }
   public void setMiddleName(String name) { this.middleName = name; }
-  public void setHomeAddress(String address) { this.homeAddress = address; }
+  public void setPersonalWebSite(String value) { this.personalWebSite = value; }
+  public void setSkypeId(String value) { this.skypeId = value; }
 }
diff --git a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/AddressBookTest.java b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/AddressBookTest.java
index 066a918..4f363b8 100644
--- a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/AddressBookTest.java
+++ b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/AddressBookTest.java
@@ -42,4 +42,40 @@ public class AddressBookTest extends TestCase
     subject.setHomeAddress("1 University Dr, Athabasca, AB T9S 3A3");
     assertEquals(subject.getHomeAddress(), "1 University Dr, Athabasca, AB T9S 3A3");
   }
+
+  public void testBusinessPhone()
+  {
+    subject.setBusinessPhone("1-800-788-9041");
+    assertEquals(subject.getBusinessPhone(), "1-800-788-9041");
+  }
+
+  public void testHomePhone()
+  {
+    subject.setHomePhone("1-800-788-9041");
+    assertEquals(subject.getHomePhone(), "1-800-788-9041");
+  }
+
+  public void testCellPhone()
+  {
+    subject.setCellPhone("1-800-788-9041");
+    assertEquals(subject.getCellPhone(), "1-800-788-9041");
+  }
+
+  public void testSkypeId()
+  {
+    subject.setSkypeId("1-800-788-9041");
+    assertEquals(subject.getSkypeId(), "1-800-788-9041");
+  }
+
+  public void testFacebookId()
+  {
+    subject.setFacebookId("1-800-788-9041");
+    assertEquals(subject.getFacebookId(), "1-800-788-9041");
+  }
+
+  public void testPersonalWebsite()
+  {
+    subject.setPersonalWebSite("https://www.mokhan.ca/");
+    assertEquals(subject.getPersonalWebSite(), "https://www.mokhan.ca/");
+  }
 }