diff --git a/src/seedu/addressbook/AddressBook.java b/src/seedu/addressbook/AddressBook.java index 5a158b67..335b3775 100644 --- a/src/seedu/addressbook/AddressBook.java +++ b/src/seedu/addressbook/AddressBook.java @@ -1069,8 +1069,7 @@ private static boolean isPersonPhoneValid(String phone) { * @return whether arg is a valid person email */ private static boolean isPersonEmailValid(String email) { - return email.matches("\\S+@\\S+\\.\\S+"); // email is [non-whitespace]@[non-whitespace].[non-whitespace] - //TODO: implement a more permissive validation + return email.matches("^.+@.+(\\.[^\\.]+)+$"); // email is [any]@[any, not ending in dot] } diff --git a/test/expected.txt b/test/expected.txt index f18922ac..e11656bc 100644 --- a/test/expected.txt +++ b/test/expected.txt @@ -121,11 +121,18 @@ || Example: add John Doe p/98765432 e/johnd@gmail.com || || =================================================== -|| Enter command: || [Command entered: add Adam Brown p/111111 e/adam@gmail.com] -|| New person added: Adam Brown, Phone: 111111, Email: adam@gmail.com +|| Enter command: || [Command entered: add Valid Name p/12345 e/thisEndsInADot.] +|| Invalid command format: add +|| add: Adds a person to the address book. +|| Parameters: NAME p/PHONE_NUMBER e/EMAIL +|| Example: add John Doe p/98765432 e/johnd@gmail.com +|| +|| =================================================== +|| Enter command: || [Command entered: add Azusagawa Kaede p/111111 e/"Azusagawa Kaede"@[192.168.2.1]] +|| New person added: Azusagawa Kaede, Phone: 111111, Email: "Azusagawa Kaede"@[192.168.2.1] || =================================================== || Enter command: || [Command entered: list] -|| 1. Adam Brown Phone Number: 111111 Email: adam@gmail.com +|| 1. Azusagawa Kaede Phone Number: 111111 Email: "Azusagawa Kaede"@[192.168.2.1] || || 1 persons found! || =================================================== @@ -133,7 +140,7 @@ || New person added: Betsy Choo, Phone: 222222, Email: benchoo@nus.edu.sg || =================================================== || Enter command: || [Command entered: list] -|| 1. Adam Brown Phone Number: 111111 Email: adam@gmail.com +|| 1. Azusagawa Kaede Phone Number: 111111 Email: "Azusagawa Kaede"@[192.168.2.1] || 2. Betsy Choo Phone Number: 222222 Email: benchoo@nus.edu.sg || || 2 persons found! @@ -142,7 +149,7 @@ || New person added: Charlie Dickson, Phone: 333333, Email: charlie.d@nus.edu.sg || =================================================== || Enter command: || [Command entered: list] -|| 1. Adam Brown Phone Number: 111111 Email: adam@gmail.com +|| 1. Azusagawa Kaede Phone Number: 111111 Email: "Azusagawa Kaede"@[192.168.2.1] || 2. Betsy Choo Phone Number: 222222 Email: benchoo@nus.edu.sg || 3. Charlie Dickson Phone Number: 333333 Email: charlie.d@nus.edu.sg || @@ -152,7 +159,7 @@ || New person added: Dickson Ee, Phone: 444444, Email: dickson@nus.edu.sg || =================================================== || Enter command: || [Command entered: list] -|| 1. Adam Brown Phone Number: 111111 Email: adam@gmail.com +|| 1. Azusagawa Kaede Phone Number: 111111 Email: "Azusagawa Kaede"@[192.168.2.1] || 2. Betsy Choo Phone Number: 222222 Email: benchoo@nus.edu.sg || 3. Charlie Dickson Phone Number: 333333 Email: charlie.d@nus.edu.sg || 4. Dickson Ee Phone Number: 444444 Email: dickson@nus.edu.sg @@ -163,7 +170,7 @@ || New person added: Esther Potato, Phone: 555555, Email: esther@notreal.potato || =================================================== || Enter command: || [Command entered: list] -|| 1. Adam Brown Phone Number: 111111 Email: adam@gmail.com +|| 1. Azusagawa Kaede Phone Number: 111111 Email: "Azusagawa Kaede"@[192.168.2.1] || 2. Betsy Choo Phone Number: 222222 Email: benchoo@nus.edu.sg || 3. Charlie Dickson Phone Number: 333333 Email: charlie.d@nus.edu.sg || 4. Dickson Ee Phone Number: 444444 Email: dickson@nus.edu.sg @@ -242,7 +249,7 @@ || Person could not be found in address book || =================================================== || Enter command: || [Command entered: list] -|| 1. Adam Brown Phone Number: 111111 Email: adam@gmail.com +|| 1. Azusagawa Kaede Phone Number: 111111 Email: "Azusagawa Kaede"@[192.168.2.1] || 2. Betsy Choo Phone Number: 222222 Email: benchoo@nus.edu.sg || 3. Dickson Ee Phone Number: 444444 Email: dickson@nus.edu.sg || 4. Esther Potato Phone Number: 555555 Email: esther@notreal.potato @@ -253,14 +260,14 @@ || Deleted Person: Esther Potato Phone Number: 555555 Email: esther@notreal.potato || =================================================== || Enter command: || [Command entered: list] -|| 1. Adam Brown Phone Number: 111111 Email: adam@gmail.com +|| 1. Azusagawa Kaede Phone Number: 111111 Email: "Azusagawa Kaede"@[192.168.2.1] || 2. Betsy Choo Phone Number: 222222 Email: benchoo@nus.edu.sg || 3. Dickson Ee Phone Number: 444444 Email: dickson@nus.edu.sg || || 3 persons found! || =================================================== || Enter command: || [Command entered: delete 1] -|| Deleted Person: Adam Brown Phone Number: 111111 Email: adam@gmail.com +|| Deleted Person: Azusagawa Kaede Phone Number: 111111 Email: "Azusagawa Kaede"@[192.168.2.1] || =================================================== || Enter command: || [Command entered: list] || 1. Betsy Choo Phone Number: 222222 Email: benchoo@nus.edu.sg diff --git a/test/input.txt b/test/input.txt index 0b99df54..822f92b0 100644 --- a/test/input.txt +++ b/test/input.txt @@ -26,9 +26,10 @@ add []\[;] p/12345 e/valid@e.mail add Valid Name p/not_numbers e/valid@e.mail add Valid Name p/12345 e/notAnEmail + add Valid Name p/12345 e/thisEndsInADot. # should add correctly - add Adam Brown p/111111 e/adam@gmail.com + add Azusagawa Kaede p/111111 e/"Azusagawa Kaede"@[192.168.2.1] list add Betsy Choo p/222222 e/benchoo@nus.edu.sg list