diff --git a/src/main/java/seedu/address/logic/commands/AddPersonCommand.java b/src/main/java/seedu/address/logic/commands/AddPersonCommand.java index cdf868335bb..f77ee0cbcee 100644 --- a/src/main/java/seedu/address/logic/commands/AddPersonCommand.java +++ b/src/main/java/seedu/address/logic/commands/AddPersonCommand.java @@ -17,9 +17,12 @@ * Adds a person to the address book. */ public class AddPersonCommand extends Command { + public static final String COMMAND_WORD = "addPerson"; + public static final String SHORTENED_COMMAND_WORD = "ap"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Adds a person to the address book.\n" + "Parameters: " + PREFIX_NAME + "NAME " + PREFIX_PHONE + "PHONE " @@ -81,6 +84,3 @@ public String toString() { .toString(); } } - - - diff --git a/src/main/java/seedu/address/logic/commands/AddTaskCommand.java b/src/main/java/seedu/address/logic/commands/AddTaskCommand.java index b96c774f672..7c7fa15e7bb 100644 --- a/src/main/java/seedu/address/logic/commands/AddTaskCommand.java +++ b/src/main/java/seedu/address/logic/commands/AddTaskCommand.java @@ -15,9 +15,12 @@ * Adds a task to the address book. */ public class AddTaskCommand extends Command { + public static final String COMMAND_WORD = "addTask"; + public static final String SHORTENED_COMMAND_WORD = "at"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a task to the address book. " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Adds a task to the address book.\n" + "Parameters: " + PREFIX_TASK_TITLE + "TITLE " + PREFIX_TASK_NOTE + "NOTE " diff --git a/src/main/java/seedu/address/logic/commands/DeleteAllPersonCommand.java b/src/main/java/seedu/address/logic/commands/DeleteAllPersonCommand.java index 974162cd9fa..8150afd027c 100644 --- a/src/main/java/seedu/address/logic/commands/DeleteAllPersonCommand.java +++ b/src/main/java/seedu/address/logic/commands/DeleteAllPersonCommand.java @@ -10,6 +10,8 @@ public class DeleteAllPersonCommand extends Command { public static final String COMMAND_WORD = "deleteAllPerson"; + public static final String SHORTENED_COMMAND_WORD = "dap"; + public static final String MESSAGE_DELETE_ALL_PERSON_SUCCESS = "Deleted all persons"; @Override diff --git a/src/main/java/seedu/address/logic/commands/DeleteAllTaskCommand.java b/src/main/java/seedu/address/logic/commands/DeleteAllTaskCommand.java index e1a5f4847c3..a1fd87bbfc0 100644 --- a/src/main/java/seedu/address/logic/commands/DeleteAllTaskCommand.java +++ b/src/main/java/seedu/address/logic/commands/DeleteAllTaskCommand.java @@ -10,6 +10,8 @@ public class DeleteAllTaskCommand extends Command { public static final String COMMAND_WORD = "deleteAllTask"; + public static final String SHORTENED_COMMAND_WORD = "dat"; + public static final String MESSAGE_DELETE_ALL_TASK_SUCCESS = "Deleted all tasks"; @Override diff --git a/src/main/java/seedu/address/logic/commands/DeletePersonCommand.java b/src/main/java/seedu/address/logic/commands/DeletePersonCommand.java index 78216699f26..9cd3cf3e90c 100644 --- a/src/main/java/seedu/address/logic/commands/DeletePersonCommand.java +++ b/src/main/java/seedu/address/logic/commands/DeletePersonCommand.java @@ -17,8 +17,9 @@ public class DeletePersonCommand extends Command { public static final String COMMAND_WORD = "deletePerson"; + public static final String SHORTENED_COMMAND_WORD = "dp"; - public static final String MESSAGE_USAGE = COMMAND_WORD + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + ": Deletes the person identified by the index number used in the displayed person list.\n" + "Parameters: INDEX (must be a positive integer)\n" + "Example: " + COMMAND_WORD + " 1"; diff --git a/src/main/java/seedu/address/logic/commands/DeleteTaskCommand.java b/src/main/java/seedu/address/logic/commands/DeleteTaskCommand.java index c0e1921bff9..2c469c8e30a 100644 --- a/src/main/java/seedu/address/logic/commands/DeleteTaskCommand.java +++ b/src/main/java/seedu/address/logic/commands/DeleteTaskCommand.java @@ -17,8 +17,9 @@ public class DeleteTaskCommand extends Command { public static final String COMMAND_WORD = "deleteTask"; + public static final String SHORTENED_COMMAND_WORD = "dt"; - public static final String MESSAGE_USAGE = COMMAND_WORD + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + ": Deletes the task identified by the index number used in the displayed task list.\n" + "Parameters: INDEX (must be a positive integer)\n" + "Example: " + COMMAND_WORD + " 1"; diff --git a/src/main/java/seedu/address/logic/commands/EditPersonCommand.java b/src/main/java/seedu/address/logic/commands/EditPersonCommand.java index 3c502095999..397070c875c 100644 --- a/src/main/java/seedu/address/logic/commands/EditPersonCommand.java +++ b/src/main/java/seedu/address/logic/commands/EditPersonCommand.java @@ -34,8 +34,10 @@ public class EditPersonCommand extends Command { public static final String COMMAND_WORD = "editPerson"; + public static final String SHORTENED_COMMAND_WORD = "ep"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the person identified " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Edits the details of the person identified " + "by the index number used in the displayed person list. " + "Existing values will be overwritten by the input values.\n" + "Parameters: INDEX (must be a positive integer) " @@ -139,7 +141,8 @@ public static class EditPersonDescriptor { private Address address; private Set tags; - public EditPersonDescriptor() {} + public EditPersonDescriptor() { + } /** * Copy constructor. diff --git a/src/main/java/seedu/address/logic/commands/EditTaskCommand.java b/src/main/java/seedu/address/logic/commands/EditTaskCommand.java index ff277f94fbe..a0d1cfc5271 100644 --- a/src/main/java/seedu/address/logic/commands/EditTaskCommand.java +++ b/src/main/java/seedu/address/logic/commands/EditTaskCommand.java @@ -31,8 +31,10 @@ public class EditTaskCommand extends Command { public static final String COMMAND_WORD = "editTask"; + public static final String SHORTENED_COMMAND_WORD = "et"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the task identified " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Edits the details of the task identified " + "by the index number used in the displayed task list. " + "Existing values will be overwritten by the input values.\n" + "Parameters: INDEX (must be a positive integer) " diff --git a/src/main/java/seedu/address/logic/commands/ExitCommand.java b/src/main/java/seedu/address/logic/commands/ExitCommand.java index 3dd85a8ba90..c3d46e68039 100644 --- a/src/main/java/seedu/address/logic/commands/ExitCommand.java +++ b/src/main/java/seedu/address/logic/commands/ExitCommand.java @@ -8,6 +8,7 @@ public class ExitCommand extends Command { public static final String COMMAND_WORD = "exit"; + public static final String SHORTENED_COMMAND_WORD = "e"; public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Address Book as requested ..."; diff --git a/src/main/java/seedu/address/logic/commands/FindDoneCommand.java b/src/main/java/seedu/address/logic/commands/FindDoneCommand.java index 1bf64dcc691..d737db8a59f 100644 --- a/src/main/java/seedu/address/logic/commands/FindDoneCommand.java +++ b/src/main/java/seedu/address/logic/commands/FindDoneCommand.java @@ -13,8 +13,10 @@ public class FindDoneCommand extends Command { public static final String COMMAND_WORD = "findDone"; + public static final String SHORTENED_COMMAND_WORD = "fd"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all tasks whose status is marked as " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Finds all tasks whose status is marked as " + "done and displays them as a list with index numbers.\n" + "Example: " + COMMAND_WORD; diff --git a/src/main/java/seedu/address/logic/commands/FindNotDoneCommand.java b/src/main/java/seedu/address/logic/commands/FindNotDoneCommand.java index 90b24da92f0..b552a3bf6eb 100644 --- a/src/main/java/seedu/address/logic/commands/FindNotDoneCommand.java +++ b/src/main/java/seedu/address/logic/commands/FindNotDoneCommand.java @@ -13,8 +13,10 @@ public class FindNotDoneCommand extends Command { public static final String COMMAND_WORD = "findNotDone"; + public static final String SHORTENED_COMMAND_WORD = "fnd"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all tasks whose status is marked as " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Finds all tasks whose status is marked as " + "not done and displays them as a list with index numbers.\n" + "Example: " + COMMAND_WORD; diff --git a/src/main/java/seedu/address/logic/commands/FindPersonCommand.java b/src/main/java/seedu/address/logic/commands/FindPersonCommand.java index f804bb8d63f..4e840a37fdf 100644 --- a/src/main/java/seedu/address/logic/commands/FindPersonCommand.java +++ b/src/main/java/seedu/address/logic/commands/FindPersonCommand.java @@ -14,8 +14,10 @@ public class FindPersonCommand extends Command { public static final String COMMAND_WORD = "findPerson"; + public static final String SHORTENED_COMMAND_WORD = "fp"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons whose names contain any of " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Finds all persons whose names contain any of " + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n" + "Parameters: KEYWORD [MORE_KEYWORDS]...\n" + "Example: " + COMMAND_WORD + " alice bob charlie"; diff --git a/src/main/java/seedu/address/logic/commands/FindTagCommand.java b/src/main/java/seedu/address/logic/commands/FindTagCommand.java index f38cc346d53..492fc561d6b 100644 --- a/src/main/java/seedu/address/logic/commands/FindTagCommand.java +++ b/src/main/java/seedu/address/logic/commands/FindTagCommand.java @@ -14,8 +14,10 @@ public class FindTagCommand extends Command { public static final String COMMAND_WORD = "findTag"; + public static final String SHORTENED_COMMAND_WORD = "ftag"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons and tasks whose tag contain any of " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Finds all persons and tasks whose tag contain any of " + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n" + "Parameters: KEYWORD [MORE_KEYWORDS]...\n" + "Example: " + COMMAND_WORD + " agenda"; diff --git a/src/main/java/seedu/address/logic/commands/FindTaskCommand.java b/src/main/java/seedu/address/logic/commands/FindTaskCommand.java index 773cd3970f8..98d5d409bb4 100644 --- a/src/main/java/seedu/address/logic/commands/FindTaskCommand.java +++ b/src/main/java/seedu/address/logic/commands/FindTaskCommand.java @@ -14,8 +14,10 @@ public class FindTaskCommand extends Command { public static final String COMMAND_WORD = "findTask"; + public static final String SHORTENED_COMMAND_WORD = "ft"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all tasks whose title or note contain any of " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Finds all tasks whose title or note contain any of " + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n" + "Parameters: KEYWORD [MORE_KEYWORDS]...\n" + "Example: " + COMMAND_WORD + " agenda budget"; diff --git a/src/main/java/seedu/address/logic/commands/HelpCommand.java b/src/main/java/seedu/address/logic/commands/HelpCommand.java index bf824f91bd0..cfdc9e896ef 100644 --- a/src/main/java/seedu/address/logic/commands/HelpCommand.java +++ b/src/main/java/seedu/address/logic/commands/HelpCommand.java @@ -8,6 +8,7 @@ public class HelpCommand extends Command { public static final String COMMAND_WORD = "help"; + public static final String SHORTENED_COMMAND_WORD = "h"; public static final String MESSAGE_USAGE = COMMAND_WORD + ": Shows program usage instructions.\n" + "Example: " + COMMAND_WORD; diff --git a/src/main/java/seedu/address/logic/commands/ListPersonCommand.java b/src/main/java/seedu/address/logic/commands/ListPersonCommand.java index e94884830ca..140c0f4a3a7 100644 --- a/src/main/java/seedu/address/logic/commands/ListPersonCommand.java +++ b/src/main/java/seedu/address/logic/commands/ListPersonCommand.java @@ -11,10 +11,10 @@ public class ListPersonCommand extends Command { public static final String COMMAND_WORD = "listPerson"; + public static final String SHORTENED_COMMAND_WORD = "lp"; public static final String MESSAGE_SUCCESS = "Listed all persons"; - @Override public CommandResult execute(Model model) { requireNonNull(model); diff --git a/src/main/java/seedu/address/logic/commands/ListTagCommand.java b/src/main/java/seedu/address/logic/commands/ListTagCommand.java index c9d57d9d7a9..936519b6251 100644 --- a/src/main/java/seedu/address/logic/commands/ListTagCommand.java +++ b/src/main/java/seedu/address/logic/commands/ListTagCommand.java @@ -7,7 +7,9 @@ * Lists all tags in CoordiMate to the user. */ public class ListTagCommand extends Command { + public static final String COMMAND_WORD = "listTag"; + public static final String SHORTENED_COMMAND_WORD = "ltag"; public static final String MESSAGE_NO_TAGS_FOUND = "No tags found!"; public static final String MESSAGE_SUCCESS = "Listed all tags: \n%s\n"; diff --git a/src/main/java/seedu/address/logic/commands/ListTaskCommand.java b/src/main/java/seedu/address/logic/commands/ListTaskCommand.java index 338fb081b38..ea728dcc9f8 100644 --- a/src/main/java/seedu/address/logic/commands/ListTaskCommand.java +++ b/src/main/java/seedu/address/logic/commands/ListTaskCommand.java @@ -9,11 +9,12 @@ * Lists all tasks in CoordiMate to the user. */ public class ListTaskCommand extends Command { + public static final String COMMAND_WORD = "listTask"; + public static final String SHORTENED_COMMAND_WORD = "lt"; public static final String MESSAGE_SUCCESS = "Listed all tasks"; - @Override public CommandResult execute(Model model) { requireNonNull(model); diff --git a/src/main/java/seedu/address/logic/commands/MarkTaskCommand.java b/src/main/java/seedu/address/logic/commands/MarkTaskCommand.java index e5b05ac6019..0e6671cdfbe 100644 --- a/src/main/java/seedu/address/logic/commands/MarkTaskCommand.java +++ b/src/main/java/seedu/address/logic/commands/MarkTaskCommand.java @@ -18,8 +18,10 @@ public class MarkTaskCommand extends Command { public static final String COMMAND_WORD = "markTask"; + public static final String SHORTENED_COMMAND_WORD = "mt"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Mark status as done for the task specified " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Mark status as done for the task specified " + "by the index number used in the displayed task list.\n" + "Parameters: INDEX (must be a positive integer)\n" + "Example: " + COMMAND_WORD + " 1 "; diff --git a/src/main/java/seedu/address/logic/commands/UnmarkTaskCommand.java b/src/main/java/seedu/address/logic/commands/UnmarkTaskCommand.java index 8f33cebe4ec..1af0cfc4087 100644 --- a/src/main/java/seedu/address/logic/commands/UnmarkTaskCommand.java +++ b/src/main/java/seedu/address/logic/commands/UnmarkTaskCommand.java @@ -18,8 +18,10 @@ public class UnmarkTaskCommand extends Command { public static final String COMMAND_WORD = "unmarkTask"; + public static final String SHORTENED_COMMAND_WORD = "ut"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Mark status as not done for the task specified " + public static final String MESSAGE_USAGE = COMMAND_WORD + " (alias: " + SHORTENED_COMMAND_WORD + ")" + + ": Mark status as not done for the task specified " + "by the index number used in the displayed task list.\n" + "Parameters: INDEX (must be a positive integer)\n" + "Example: " + COMMAND_WORD + " 1 "; @@ -79,4 +81,3 @@ public String toString() { .toString(); } } - diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java index 7c863e2fc04..1c4ca7efe05 100644 --- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java +++ b/src/main/java/seedu/address/logic/parser/AddressBookParser.java @@ -66,63 +66,103 @@ public Command parseCommand(String userInput) throws ParseException { switch (commandWord) { case AddPersonCommand.COMMAND_WORD: + // Fallthrough + case AddPersonCommand.SHORTENED_COMMAND_WORD: return new AddPersonCommandParser().parse(arguments); case EditPersonCommand.COMMAND_WORD: + // Fallthrough + case EditPersonCommand.SHORTENED_COMMAND_WORD: return new EditPersonCommandParser().parse(arguments); case DeletePersonCommand.COMMAND_WORD: + // Fallthrough + case DeletePersonCommand.SHORTENED_COMMAND_WORD: return new DeletePersonCommandParser().parse(arguments); case DeleteAllPersonCommand.COMMAND_WORD: + // Fallthrough + case DeleteAllPersonCommand.SHORTENED_COMMAND_WORD: return new DeleteAllPersonCommand(); case FindPersonCommand.COMMAND_WORD: + // Fallthrough + case FindPersonCommand.SHORTENED_COMMAND_WORD: return new FindPersonCommandParser().parse(arguments); case ListPersonCommand.COMMAND_WORD: + // Fallthrough + case ListPersonCommand.SHORTENED_COMMAND_WORD: return new ListPersonCommand(); case ListTaskCommand.COMMAND_WORD: + // Fallthrough + case ListTaskCommand.SHORTENED_COMMAND_WORD: return new ListTaskCommand(); case DeleteTaskCommand.COMMAND_WORD: + // Fallthrough + case DeleteTaskCommand.SHORTENED_COMMAND_WORD: return new DeleteTaskCommandParser().parse(arguments); case MarkTaskCommand.COMMAND_WORD: + // Fallthrough + case MarkTaskCommand.SHORTENED_COMMAND_WORD: return new MarkTaskCommandParser().parse(arguments); case UnmarkTaskCommand.COMMAND_WORD: + // Fallthrough + case UnmarkTaskCommand.SHORTENED_COMMAND_WORD: return new UnmarkTaskCommandParser().parse(arguments); case AddTaskCommand.COMMAND_WORD: + // Fallthrough + case AddTaskCommand.SHORTENED_COMMAND_WORD: return new AddTaskCommandParser().parse(arguments); case EditTaskCommand.COMMAND_WORD: + // Fallthrough + case EditTaskCommand.SHORTENED_COMMAND_WORD: return new EditTaskCommandParser().parse(arguments); case FindTaskCommand.COMMAND_WORD: + // Fallthrough + case FindTaskCommand.SHORTENED_COMMAND_WORD: return new FindTaskCommandParser().parse(arguments); case FindDoneCommand.COMMAND_WORD: + // Fallthrough + case FindDoneCommand.SHORTENED_COMMAND_WORD: return new FindDoneCommand(); case FindNotDoneCommand.COMMAND_WORD: + // Fallthrough + case FindNotDoneCommand.SHORTENED_COMMAND_WORD: return new FindNotDoneCommand(); case DeleteAllTaskCommand.COMMAND_WORD: + // Fallthrough + case DeleteAllTaskCommand.SHORTENED_COMMAND_WORD: return new DeleteAllTaskCommand(); case FindTagCommand.COMMAND_WORD: + // Fallthrough + case FindTagCommand.SHORTENED_COMMAND_WORD: return new FindTagCommandParser().parse(arguments); case ListTagCommand.COMMAND_WORD: + // Fallthrough + case ListTagCommand.SHORTENED_COMMAND_WORD: return new ListTagCommand(); case ExitCommand.COMMAND_WORD: + // Fallthrough + case ExitCommand.SHORTENED_COMMAND_WORD: return new ExitCommand(); case HelpCommand.COMMAND_WORD: + // Fallthrough + case HelpCommand.SHORTENED_COMMAND_WORD: return new HelpCommand(); default: diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java index 8316ffc1a0c..6df002c277c 100644 --- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java +++ b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java @@ -59,12 +59,29 @@ public void parseCommand_addPerson() throws Exception { assertEquals(new AddPersonCommand(person), command); } + @Test + public void parseCommand_shortened_addPerson() throws Exception { + Person person = new PersonBuilder().build(); + AddPersonCommand command = (AddPersonCommand) parser + .parseCommand(PersonUtil.getShortenedAddPersonCommand(person)); + assertEquals(new AddPersonCommand(person), command); + } + @Test public void parseCommand_deleteAllPerson() throws Exception { assertTrue(parser.parseCommand(DeleteAllPersonCommand.COMMAND_WORD) instanceof DeleteAllPersonCommand); assertTrue(parser.parseCommand(DeleteAllPersonCommand.COMMAND_WORD + " 3") instanceof DeleteAllPersonCommand); } + @Test + public void parseCommand_shortened_deleteAllPerson() throws Exception { + assertTrue( + parser.parseCommand(DeleteAllPersonCommand.SHORTENED_COMMAND_WORD) instanceof DeleteAllPersonCommand); + assertTrue( + parser.parseCommand( + DeleteAllPersonCommand.SHORTENED_COMMAND_WORD + " 3") instanceof DeleteAllPersonCommand); + } + @Test public void parseCommand_deletePerson() throws Exception { DeletePersonCommand command = (DeletePersonCommand) parser.parseCommand( @@ -72,6 +89,13 @@ public void parseCommand_deletePerson() throws Exception { assertEquals(new DeletePersonCommand(INDEX_FIRST), command); } + @Test + public void parseCommand_shortened_deletePerson() throws Exception { + DeletePersonCommand command = (DeletePersonCommand) parser.parseCommand( + DeletePersonCommand.SHORTENED_COMMAND_WORD + " " + INDEX_FIRST.getOneBased()); + assertEquals(new DeletePersonCommand(INDEX_FIRST), command); + } + @Test public void parseCommand_editPerson() throws Exception { Person person = new PersonBuilder().build(); @@ -81,12 +105,28 @@ public void parseCommand_editPerson() throws Exception { assertEquals(new EditPersonCommand(INDEX_FIRST, descriptor), command); } + @Test + public void parseCommand_shortened_editPerson() throws Exception { + Person person = new PersonBuilder().build(); + EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(person).build(); + EditPersonCommand command = (EditPersonCommand) parser + .parseCommand(EditPersonCommand.SHORTENED_COMMAND_WORD + " " + + INDEX_FIRST.getOneBased() + " " + PersonUtil.getEditPersonDescriptorDetails(descriptor)); + assertEquals(new EditPersonCommand(INDEX_FIRST, descriptor), command); + } + @Test public void parseCommand_exit() throws Exception { assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD) instanceof ExitCommand); assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD + " 3") instanceof ExitCommand); } + @Test + public void parseCommand_shortened_exit() throws Exception { + assertTrue(parser.parseCommand(ExitCommand.SHORTENED_COMMAND_WORD) instanceof ExitCommand); + assertTrue(parser.parseCommand(ExitCommand.SHORTENED_COMMAND_WORD + " 3") instanceof ExitCommand); + } + @Test public void parseCommand_findPerson() throws Exception { List keywords = Arrays.asList("foo", "bar", "baz"); @@ -95,18 +135,38 @@ public void parseCommand_findPerson() throws Exception { assertEquals(new FindPersonCommand(new NameContainsKeywordsPredicate(keywords)), command); } + @Test + public void parseCommand_shortened_findPerson() throws Exception { + List keywords = Arrays.asList("foo", "bar", "baz"); + FindPersonCommand command = (FindPersonCommand) parser.parseCommand( + FindPersonCommand.SHORTENED_COMMAND_WORD + " " + String.join(" ", keywords)); + assertEquals(new FindPersonCommand(new NameContainsKeywordsPredicate(keywords)), command); + } + @Test public void parseCommand_help() throws Exception { assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD) instanceof HelpCommand); assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD + " 3") instanceof HelpCommand); } + @Test + public void parseCommand_shortened_help() throws Exception { + assertTrue(parser.parseCommand(HelpCommand.SHORTENED_COMMAND_WORD) instanceof HelpCommand); + assertTrue(parser.parseCommand(HelpCommand.SHORTENED_COMMAND_WORD + " 3") instanceof HelpCommand); + } + @Test public void parseCommand_listPerson() throws Exception { assertTrue(parser.parseCommand(ListPersonCommand.COMMAND_WORD) instanceof ListPersonCommand); assertTrue(parser.parseCommand(ListPersonCommand.COMMAND_WORD + " 3") instanceof ListPersonCommand); } + @Test + public void parseCommand_shortened_listPerson() throws Exception { + assertTrue(parser.parseCommand(ListPersonCommand.SHORTENED_COMMAND_WORD) instanceof ListPersonCommand); + assertTrue(parser.parseCommand(ListPersonCommand.SHORTENED_COMMAND_WORD + " 3") instanceof ListPersonCommand); + } + @Test public void parseCommand_addTask() throws Exception { Task task = new TaskBuilder().build(); @@ -114,12 +174,25 @@ public void parseCommand_addTask() throws Exception { assertEquals(new AddTaskCommand(task), command); } + @Test + public void parseCommand_shortened_addTask() throws Exception { + Task task = new TaskBuilder().build(); + AddTaskCommand command = (AddTaskCommand) parser.parseCommand(TaskUtil.getShortenedAddTaskCommand(task)); + assertEquals(new AddTaskCommand(task), command); + } + @Test public void parseCommand_listTask() throws Exception { assertTrue(parser.parseCommand(ListTaskCommand.COMMAND_WORD) instanceof ListTaskCommand); assertTrue(parser.parseCommand(ListTaskCommand.COMMAND_WORD + " 3") instanceof ListTaskCommand); } + @Test + public void parseCommand_shortened_listTask() throws Exception { + assertTrue(parser.parseCommand(ListTaskCommand.SHORTENED_COMMAND_WORD) instanceof ListTaskCommand); + assertTrue(parser.parseCommand(ListTaskCommand.SHORTENED_COMMAND_WORD + " 3") instanceof ListTaskCommand); + } + @Test public void parseCommand_findTask() throws Exception { List keywords = Arrays.asList("foo", "bar", "baz"); @@ -128,14 +201,33 @@ public void parseCommand_findTask() throws Exception { assertEquals(new FindTaskCommand(new TaskContainsKeywordsPredicate(keywords)), command); } + @Test + public void parseCommand_shortened_findTask() throws Exception { + List keywords = Arrays.asList("foo", "bar", "baz"); + FindTaskCommand command = (FindTaskCommand) parser.parseCommand( + FindTaskCommand.SHORTENED_COMMAND_WORD + " " + String.join(" ", keywords)); + assertEquals(new FindTaskCommand(new TaskContainsKeywordsPredicate(keywords)), command); + } + @Test public void parseCommand_findTag() throws Exception { List tagKeywords = Arrays.asList("tag1", "tag2", "tag3"); FindTagCommand command = (FindTagCommand) parser.parseCommand( FindTagCommand.COMMAND_WORD + " " + String.join(" ", tagKeywords)); assertEquals(new FindTagCommand( - new PersonContainsTagsPredicate(tagKeywords), - new TaskContainsTagsPredicate(tagKeywords)), + new PersonContainsTagsPredicate(tagKeywords), + new TaskContainsTagsPredicate(tagKeywords)), + command); + } + + @Test + public void parseCommand_shortened_findTag() throws Exception { + List tagKeywords = Arrays.asList("tag1", "tag2", "tag3"); + FindTagCommand command = (FindTagCommand) parser.parseCommand( + FindTagCommand.SHORTENED_COMMAND_WORD + " " + String.join(" ", tagKeywords)); + assertEquals(new FindTagCommand( + new PersonContainsTagsPredicate(tagKeywords), + new TaskContainsTagsPredicate(tagKeywords)), command); } @@ -145,12 +237,24 @@ public void parseCommand_findDone() throws Exception { assertTrue(parser.parseCommand(FindDoneCommand.COMMAND_WORD + " 3") instanceof FindDoneCommand); } + @Test + public void parseCommand_shortened_findDone() throws Exception { + assertTrue(parser.parseCommand(FindDoneCommand.SHORTENED_COMMAND_WORD) instanceof FindDoneCommand); + assertTrue(parser.parseCommand(FindDoneCommand.SHORTENED_COMMAND_WORD + " 3") instanceof FindDoneCommand); + } + @Test public void parseCommand_findNotDone() throws Exception { assertTrue(parser.parseCommand(FindNotDoneCommand.COMMAND_WORD) instanceof FindNotDoneCommand); assertTrue(parser.parseCommand(FindNotDoneCommand.COMMAND_WORD + " 3") instanceof FindNotDoneCommand); } + @Test + public void parseCommand_shortened_findNotDone() throws Exception { + assertTrue(parser.parseCommand(FindNotDoneCommand.SHORTENED_COMMAND_WORD) instanceof FindNotDoneCommand); + assertTrue(parser.parseCommand(FindNotDoneCommand.SHORTENED_COMMAND_WORD + " 3") instanceof FindNotDoneCommand); + } + @Test public void parseCommand_markTask() throws Exception { MarkTaskCommand command = (MarkTaskCommand) parser.parseCommand( @@ -158,6 +262,13 @@ public void parseCommand_markTask() throws Exception { assertEquals(new MarkTaskCommand(INDEX_FIRST), command); } + @Test + public void parseCommand_shortened_markTask() throws Exception { + MarkTaskCommand command = (MarkTaskCommand) parser.parseCommand( + MarkTaskCommand.SHORTENED_COMMAND_WORD + " " + INDEX_FIRST.getOneBased()); + assertEquals(new MarkTaskCommand(INDEX_FIRST), command); + } + @Test public void parseCommand_unmarkTask() throws Exception { UnmarkTaskCommand command = (UnmarkTaskCommand) parser.parseCommand( @@ -165,6 +276,13 @@ public void parseCommand_unmarkTask() throws Exception { assertEquals(new UnmarkTaskCommand(INDEX_FIRST), command); } + @Test + public void parseCommand_shortened_unmarkTask() throws Exception { + UnmarkTaskCommand command = (UnmarkTaskCommand) parser.parseCommand( + UnmarkTaskCommand.SHORTENED_COMMAND_WORD + " " + INDEX_FIRST.getOneBased()); + assertEquals(new UnmarkTaskCommand(INDEX_FIRST), command); + } + @Test public void parseCommand_editTask() throws Exception { Task task = new TaskBuilder().build(); @@ -174,28 +292,57 @@ public void parseCommand_editTask() throws Exception { assertEquals(new EditTaskCommand(INDEX_FIRST, descriptor), command); } + @Test + public void parseCommand_shortened_editTask() throws Exception { + Task task = new TaskBuilder().build(); + EditTaskDescriptor descriptor = new EditTaskDescriptorBuilder(task).build(); + EditTaskCommand command = (EditTaskCommand) parser.parseCommand(EditTaskCommand.SHORTENED_COMMAND_WORD + " " + + INDEX_FIRST.getOneBased() + " " + TaskUtil.getEditTaskDescriptorDetails(descriptor)); + assertEquals(new EditTaskCommand(INDEX_FIRST, descriptor), command); + } + public void parseCommand_deleteTask() throws Exception { DeleteTaskCommand command = (DeleteTaskCommand) parser.parseCommand( DeleteTaskCommand.COMMAND_WORD + " " + INDEX_FIRST.getOneBased()); assertEquals(new DeleteTaskCommand(INDEX_FIRST), command); } + public void parseCommand_shortened_deleteTask() throws Exception { + DeleteTaskCommand command = (DeleteTaskCommand) parser.parseCommand( + DeleteTaskCommand.SHORTENED_COMMAND_WORD + " " + INDEX_FIRST.getOneBased()); + assertEquals(new DeleteTaskCommand(INDEX_FIRST), command); + } + @Test public void parseCommand_deleteAllTask() throws Exception { assertTrue(parser.parseCommand(DeleteAllTaskCommand.COMMAND_WORD) instanceof DeleteAllTaskCommand); assertTrue(parser.parseCommand(DeleteAllTaskCommand.COMMAND_WORD + " 3") instanceof DeleteAllTaskCommand); } + @Test + public void parseCommand_shortened_deleteAllTask() throws Exception { + assertTrue(parser.parseCommand(DeleteAllTaskCommand.SHORTENED_COMMAND_WORD) instanceof DeleteAllTaskCommand); + assertTrue( + parser.parseCommand( + DeleteAllTaskCommand.SHORTENED_COMMAND_WORD + " 3") instanceof DeleteAllTaskCommand); + } + @Test public void parseCommand_listTag() throws Exception { assertTrue(parser.parseCommand(ListTagCommand.COMMAND_WORD) instanceof ListTagCommand); assertTrue(parser.parseCommand(ListTagCommand.COMMAND_WORD + " 3") instanceof ListTagCommand); } + @Test + public void parseCommand_shortened_listTag() throws Exception { + assertTrue(parser.parseCommand(ListTagCommand.SHORTENED_COMMAND_WORD) instanceof ListTagCommand); + assertTrue(parser.parseCommand(ListTagCommand.SHORTENED_COMMAND_WORD + " 3") instanceof ListTagCommand); + } + @Test public void parseCommand_unrecognisedInput_throwsParseException() { assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE), () - -> parser.parseCommand("")); + -> parser.parseCommand("")); } @Test diff --git a/src/test/java/seedu/address/testutil/PersonUtil.java b/src/test/java/seedu/address/testutil/PersonUtil.java index 6a5151a4a5f..8893ebd82d7 100644 --- a/src/test/java/seedu/address/testutil/PersonUtil.java +++ b/src/test/java/seedu/address/testutil/PersonUtil.java @@ -25,6 +25,13 @@ public static String getAddPersonCommand(Person person) { return AddPersonCommand.COMMAND_WORD + " " + getPersonDetails(person); } + /** + * Returns a shortened addPerson command string for adding the {@code person}. + */ + public static String getShortenedAddPersonCommand(Person person) { + return AddPersonCommand.SHORTENED_COMMAND_WORD + " " + getPersonDetails(person); + } + /** * Returns the part of command string for the given {@code person}'s details. */ diff --git a/src/test/java/seedu/address/testutil/TaskUtil.java b/src/test/java/seedu/address/testutil/TaskUtil.java index dc089e01294..d5f06cefaa4 100644 --- a/src/test/java/seedu/address/testutil/TaskUtil.java +++ b/src/test/java/seedu/address/testutil/TaskUtil.java @@ -23,6 +23,13 @@ public static String getAddTaskCommand(Task task) { return AddTaskCommand.COMMAND_WORD + " " + getTaskDetails(task); } + /** + * Returns a shortened addTask command string for adding the {@code task}. + */ + public static String getShortenedAddTaskCommand(Task task) { + return AddTaskCommand.SHORTENED_COMMAND_WORD + " " + getTaskDetails(task); + } + /** * Returns the part of command string for the given {@code task}'s details. */