Update test case results

src/main/java/seedu/address/logic/parser/FindCommandParser.java

@@ -19,56 +19,36 @@
 public class FindCommandParser implements Parser<AbstractFindCommand> {
 
     public static final Pattern KEYWORD_EXTRACTOR =
-            Pattern.compile("^(?<tag>/[cen])");
-
+            Pattern.compile("^(?<tag>/[cen])\\s*(?<arguments>[\\S\\s]+)$");
     /**
      * Parses the given {@code String} of arguments in the context of the FindCommand
      * and returns a FindCommand object for execution.
      * @throws ParseException if the user input does not conform the expected format
      */
     public AbstractFindCommand parse(String args) throws ParseException {
-        String trimmedArgs = args.trim();
-        String[] tagAndSearchTerms = getTagAndSearchTerms(trimmedArgs);
-        String tag = tagAndSearchTerms[0];
-        String searchTerms = tagAndSearchTerms[1];
-        Matcher m = KEYWORD_EXTRACTOR.matcher(tag); // check if the correct tag exists
-
+        String trimmedArgs = args.trim(); // trim space
+        Matcher m = KEYWORD_EXTRACTOR.matcher(trimmedArgs); // find tag and search words
         // will throw exception if no args/command format not correct
-        if (args.isEmpty() || !m.matches()) {
+        if (trimmedArgs.isEmpty() || !m.matches()) {
             throw new ParseException(
                     String.format(MESSAGE_INVALID_COMMAND_FORMAT, AbstractFindCommand.MESSAGE_USAGE));
         }
-
         // extract tag and search argument
+        String tag = m.group("tag");
+        String searchTerms = m.group("arguments");
         String[] searchTermArray = searchTerms.split("\\s+");
 
-        // return appropriate FindCommand class and specific warning message to user based on the tag
+        // return approppriate FindCommand class depending on tag
+        // return appropriate FindCommand class depending on tag
         switch (tag) {
         case "/n":
-            if (searchTerms.isEmpty()) {
-                throw new ParseException(
-                        String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindByNameCommand.MESSAGE_USAGE));
-            }
             return new FindByNameCommand(
                     new NameContainsKeywordsPredicate(Arrays.asList(searchTermArray)));
         case "/e":
-            if (searchTerms.isEmpty()) {
-                throw new ParseException(
-                        String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindByEmailCommand.MESSAGE_USAGE));
-            }
             return new FindByEmailCommand(
                     new EmailContainsKeywordsPredicate(Arrays.asList(searchTermArray)));
         default:
-            throw new ParseException(
-                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, AbstractFindCommand.MESSAGE_USAGE));
+            return null; // temporary value, this should not occur due to regex
         }
     }
-    private String[] getTagAndSearchTerms(String input) {
-        int index = input.indexOf(' ');
-        String[] result = new String[2];
-        // Check if there is a whitespace character in the string
-        result[0] = index != -1 ? input.substring(0, index) : input; // Part before the first whitespace
-        result[1] = index != -1 ? input.substring(index + 1) : ""; // Part after the first whitespace
-        return result;
-    }
 }

src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json

@@ -42,5 +42,17 @@
     "email" : "[email protected]",
     "address" : "4th street",
     "tags" : [ ]
+  }, {
+    "name" : "Reg Loo",
+    "phone" : "8482424",
+    "email" : "[email protected]",
+    "address" : "little india",
+    "tags" : [ ]
+  }, {
+    "name" : "Ina Crust",
+    "phone" : "8482131",
+    "email" : "[email protected]",
+    "address" : "chicago ave",
+    "tags" : [ ]
   } ]
 }

src/test/java/seedu/address/logic/parser/AddressBookParserTest.java

@@ -80,7 +80,7 @@ public void parseCommand_exit() throws Exception {
     public void parseCommand_findByName() throws Exception {
         List<String> keywords = Arrays.asList("foo", "bar", "baz");
         FindByNameCommand command = (FindByNameCommand) parser.parseCommand(
-                FindByNameCommand.COMMAND_WORD + " /n "
+                FindByNameCommand.COMMAND_WORD + " "
                         + keywords.stream().collect(Collectors.joining(" ")));
         assertEquals(new FindByNameCommand(new NameContainsKeywordsPredicate(keywords)), command);
     }

src/test/java/seedu/address/logic/parser/FindCommandParserTest.java

@@ -8,17 +8,18 @@
 
 import org.junit.jupiter.api.Test;
 
+import seedu.address.logic.commands.AbstractFindCommand;
 import seedu.address.logic.commands.FindByNameCommand;
-import seedu.address.logic.commands.FindCommand;
 import seedu.address.model.person.NameContainsKeywordsPredicate;
 
 public class FindCommandParserTest {
 
-    private FindCommandParser parser = new FindCommandParser();
+    private final FindCommandParser parser = new FindCommandParser();
 
     @Test
     public void parse_emptyArg_throwsParseException() {
-        assertParseFailure(parser, "     ", String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+        assertParseFailure(parser, "     ",
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, AbstractFindCommand.MESSAGE_USAGE));
     }
 
     @Test