Merge branch 'master' into branch-DG_v1.4a

AY2324S2-CS2103T-W12-1 · Apr 10, 2024 · aeab494 · aeab494
2 parents ec07b4f + 13f28d3
commit aeab494
Show file tree

Hide file tree

Showing 32 changed files with 343 additions and 33 deletions.
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/images/ug/addpolicyA.png b/docs/images/ug/addpolicyA.png
diff --git a/docs/images/ug/clear.png b/docs/images/ug/clear.png
diff --git a/docs/images/ug/clientViewAndList.png b/docs/images/ug/clientViewAndList.png
diff --git a/docs/images/ug/delete.png b/docs/images/ug/delete.png
diff --git a/docs/images/ug/deletepolicyA.png b/docs/images/ug/deletepolicyA.png
diff --git a/docs/images/ug/edit.png b/docs/images/ug/edit.png
diff --git a/docs/images/ug/find.png b/docs/images/ug/find.png
diff --git a/docs/images/ug/list.png b/docs/images/ug/list.png
diff --git a/docs/images/ug/mark.png b/docs/images/ug/mark.png
diff --git a/docs/images/ug/met.png b/docs/images/ug/met.png
diff --git a/docs/images/ug/remark.png b/docs/images/ug/remark.png
diff --git a/docs/images/ug/scheduleA.png b/docs/images/ug/scheduleA.png
diff --git a/docs/images/ug/set.png b/docs/images/ug/set.png
diff --git a/docs/images/ug/sort.png b/docs/images/ug/sort.png
diff --git a/docs/images/ug/success_addpolicyA.png b/docs/images/ug/success_addpolicyA.png
diff --git a/docs/images/ug/success_clear.png b/docs/images/ug/success_clear.png
diff --git a/docs/images/ug/success_delete.png b/docs/images/ug/success_delete.png
diff --git a/docs/images/ug/success_deletepolicyA.png b/docs/images/ug/success_deletepolicyA.png
diff --git a/docs/images/ug/success_edit.png b/docs/images/ug/success_edit.png
diff --git a/docs/images/ug/success_find.png b/docs/images/ug/success_find.png
diff --git a/docs/images/ug/success_list.png b/docs/images/ug/success_list.png
diff --git a/docs/images/ug/success_mark.png b/docs/images/ug/success_mark.png
diff --git a/docs/images/ug/success_met.png b/docs/images/ug/success_met.png
diff --git a/docs/images/ug/success_remark.png b/docs/images/ug/success_remark.png
diff --git a/docs/images/ug/success_scheduleA.png b/docs/images/ug/success_scheduleA.png
diff --git a/docs/images/ug/success_set.png b/docs/images/ug/success_set.png
diff --git a/docs/images/ug/success_sort.png b/docs/images/ug/success_sort.png
diff --git a/docs/images/ug/success_view.png b/docs/images/ug/success_view.png
diff --git a/docs/images/ug/view.png b/docs/images/ug/view.png
diff --git a/src/main/java/seedu/address/model/person/Email.java b/src/main/java/seedu/address/model/person/Email.java
@@ -23,7 +23,7 @@ public class Email implements Comparable<Email> {
             + "    - have each domain label consist of alphanumeric characters, separated only by hyphens, if any.";
     // alphanumeric and special characters
     private static final String ALPHANUMERIC_NO_UNDERSCORE = "[^\\W_]+"; // alphanumeric characters except underscore
-    private static final String LOCAL_PART_REGEX = "^" + ALPHANUMERIC_NO_UNDERSCORE + "([" + SPECIAL_CHARACTERS + "]"
+    private static final String LOCAL_PART_REGEX = "^" + ALPHANUMERIC_NO_UNDERSCORE + "([" + SPECIAL_CHARACTERS + "]+"
             + ALPHANUMERIC_NO_UNDERSCORE + ")*";
     private static final String DOMAIN_PART_REGEX = ALPHANUMERIC_NO_UNDERSCORE
             + "(-" + ALPHANUMERIC_NO_UNDERSCORE + ")*";

diff --git a/src/test/java/seedu/address/model/person/EmailTest.java b/src/test/java/seedu/address/model/person/EmailTest.java
@@ -44,7 +44,6 @@ public void isValidEmail() {
         assertFalse(Email.isValidEmail("peter@jack@example.com")); // '@' symbol in local part
         assertFalse(Email.isValidEmail("-peterjack@example.com")); // local part starts with a hyphen
         assertFalse(Email.isValidEmail("peterjack-@example.com")); // local part ends with a hyphen
-        assertFalse(Email.isValidEmail("peter..jack@example.com")); // local part has two consecutive periods
         assertFalse(Email.isValidEmail("peterjack@example@com")); // '@' symbol in domain name
         assertFalse(Email.isValidEmail("peterjack@.example.com")); // domain name starts with a period
         assertFalse(Email.isValidEmail("peterjack@example.com.")); // domain name ends with a period
@@ -57,6 +56,7 @@ public void isValidEmail() {
         assertTrue(Email.isValidEmail("PeterJack.1190@example.com")); // period in local part
         assertTrue(Email.isValidEmail("PeterJack+1190@example.com")); // '+' symbol in local part
         assertTrue(Email.isValidEmail("PeterJack-1190@example.com")); // hyphen in local part
+        assertTrue(Email.isValidEmail("peter..jack@example.com")); // local part has two consecutive periods
         assertTrue(Email.isValidEmail("a@bc")); // minimal
         assertTrue(Email.isValidEmail("test@localhost")); // alphabets only
         assertTrue(Email.isValidEmail("123@145")); // numeric local part and domain name