diff --git a/src/main/java/seedu/address/logic/Messages.java b/src/main/java/seedu/address/logic/Messages.java index 8943954e870..7f92c09feda 100644 --- a/src/main/java/seedu/address/logic/Messages.java +++ b/src/main/java/seedu/address/logic/Messages.java @@ -16,6 +16,7 @@ public class Messages { public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command"; public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s"; public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid"; + public static final String MESSAGE_INVALID_TASK_DISPLAYED_INDEX = "The task index provided is invalid"; public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!"; public static final String MESSAGE_TASKS_LISTED_OVERVIEW = "%1$d tasks listed!"; public static final String MESSAGE_DUPLICATE_FIELDS = @@ -57,7 +58,9 @@ public static String format(Task task) { final StringBuilder builder = new StringBuilder(); builder.append(task.getTitle()) .append("; Note: ") - .append(task.getNote()); + .append(task.getNote()) + .append("; Status: ") + .append(task.getStatus()); return builder.toString(); } diff --git a/src/main/java/seedu/address/logic/commands/MarkTaskCommand.java b/src/main/java/seedu/address/logic/commands/MarkTaskCommand.java new file mode 100644 index 00000000000..e5b05ac6019 --- /dev/null +++ b/src/main/java/seedu/address/logic/commands/MarkTaskCommand.java @@ -0,0 +1,83 @@ +package seedu.address.logic.commands; + +import static java.util.Objects.requireNonNull; +import static seedu.address.model.task.Status.STATUS_DONE; + +import java.util.List; + +import seedu.address.commons.core.index.Index; +import seedu.address.commons.util.ToStringBuilder; +import seedu.address.logic.Messages; +import seedu.address.logic.commands.exceptions.CommandException; +import seedu.address.model.Model; +import seedu.address.model.task.Task; + +/** + * Marks the status of an existing task in the task list as done. + */ +public class MarkTaskCommand extends Command { + + public static final String COMMAND_WORD = "markTask"; + + public static final String MESSAGE_USAGE = 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 "; + + public static final String MESSAGE_MARK_TASK_SUCCESS = "Marked as Done: %1$s"; + public static final String MESSAGE_HAS_BEEN_MARKED = "This task is already marked as done in the task list."; + + private final Index index; + + /** + * Constructs a MarkTaskCommand. + * @param index of the task in the filtered task list to mark as done + */ + public MarkTaskCommand(Index index) { + requireNonNull(index); + + this.index = index; + } + + @Override + public CommandResult execute(Model model) throws CommandException { + requireNonNull(model); + List lastShownList = model.getFilteredTaskList(); + + if (index.getZeroBased() >= lastShownList.size()) { + throw new CommandException(Messages.MESSAGE_INVALID_TASK_DISPLAYED_INDEX); + } + + Task taskToMark = lastShownList.get(index.getZeroBased()); + + if (taskToMark.getStatus().equals(STATUS_DONE)) { + throw new CommandException(MESSAGE_HAS_BEEN_MARKED); + } + + Task markedTask = model.markTask(taskToMark); + return new CommandResult(String.format(MESSAGE_MARK_TASK_SUCCESS, Messages.format(markedTask))); + } + + @Override + public boolean equals(Object other) { + if (other == this) { + return true; + } + + // instanceof handles nulls + if (!(other instanceof MarkTaskCommand)) { + return false; + } + + MarkTaskCommand otherMarkTaskCommand = (MarkTaskCommand) other; + return index.equals(otherMarkTaskCommand.index); + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .add("targetIndex", index) + .toString(); + } +} + diff --git a/src/main/java/seedu/address/logic/commands/UnmarkTaskCommand.java b/src/main/java/seedu/address/logic/commands/UnmarkTaskCommand.java new file mode 100644 index 00000000000..8f33cebe4ec --- /dev/null +++ b/src/main/java/seedu/address/logic/commands/UnmarkTaskCommand.java @@ -0,0 +1,82 @@ +package seedu.address.logic.commands; + +import static java.util.Objects.requireNonNull; +import static seedu.address.model.task.Status.STATUS_NOT_DONE; + +import java.util.List; + +import seedu.address.commons.core.index.Index; +import seedu.address.commons.util.ToStringBuilder; +import seedu.address.logic.Messages; +import seedu.address.logic.commands.exceptions.CommandException; +import seedu.address.model.Model; +import seedu.address.model.task.Task; + +/** + * Marks the status of an existing task in the task list as not done. + */ +public class UnmarkTaskCommand extends Command { + + public static final String COMMAND_WORD = "unmarkTask"; + + public static final String MESSAGE_USAGE = 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 "; + + public static final String MESSAGE_UNMARK_TASK_SUCCESS = "Marked as Not Done: %1$s"; + public static final String MESSAGE_HAS_BEEN_MARKED = "This task is already marked as not done in the task list."; + + private final Index index; + + /** + * @param index of the task in the filtered task list to mark as not done + */ + public UnmarkTaskCommand(Index index) { + requireNonNull(index); + + this.index = index; + } + + @Override + public CommandResult execute(Model model) throws CommandException { + requireNonNull(model); + List lastShownList = model.getFilteredTaskList(); + + if (index.getZeroBased() >= lastShownList.size()) { + throw new CommandException(Messages.MESSAGE_INVALID_TASK_DISPLAYED_INDEX); + } + + Task taskToMark = lastShownList.get(index.getZeroBased()); + + if (taskToMark.getStatus().equals(STATUS_NOT_DONE)) { + throw new CommandException(MESSAGE_HAS_BEEN_MARKED); + } + + Task unmarkedTask = model.unmarkTask(taskToMark); + return new CommandResult(String.format(MESSAGE_UNMARK_TASK_SUCCESS, Messages.format(unmarkedTask))); + } + + @Override + public boolean equals(Object other) { + if (other == this) { + return true; + } + + // instanceof handles nulls + if (!(other instanceof UnmarkTaskCommand)) { + return false; + } + + UnmarkTaskCommand otherUnmarkTaskCommand = (UnmarkTaskCommand) other; + return index.equals(otherUnmarkTaskCommand.index); + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .add("targetIndex", index) + .toString(); + } +} + diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java index f81445d59e3..c968961c856 100644 --- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java +++ b/src/main/java/seedu/address/logic/parser/AddressBookParser.java @@ -19,6 +19,8 @@ import seedu.address.logic.commands.FindTaskCommand; import seedu.address.logic.commands.HelpCommand; import seedu.address.logic.commands.ListPersonCommand; +import seedu.address.logic.commands.MarkTaskCommand; +import seedu.address.logic.commands.UnmarkTaskCommand; import seedu.address.logic.parser.exceptions.ParseException; /** @@ -73,6 +75,12 @@ public Command parseCommand(String userInput) throws ParseException { case ListPersonCommand.COMMAND_WORD: return new ListPersonCommand(); + case MarkTaskCommand.COMMAND_WORD: + return new MarkTaskCommandParser().parse(arguments); + + case UnmarkTaskCommand.COMMAND_WORD: + return new UnmarkTaskCommandParser().parse(arguments); + case AddTaskCommand.COMMAND_WORD: return new AddTaskCommandParser().parse(arguments); diff --git a/src/main/java/seedu/address/logic/parser/MarkTaskCommandParser.java b/src/main/java/seedu/address/logic/parser/MarkTaskCommandParser.java new file mode 100644 index 00000000000..0cca7343beb --- /dev/null +++ b/src/main/java/seedu/address/logic/parser/MarkTaskCommandParser.java @@ -0,0 +1,29 @@ +package seedu.address.logic.parser; + +import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; + +import seedu.address.commons.core.index.Index; +import seedu.address.logic.commands.MarkTaskCommand; +import seedu.address.logic.parser.exceptions.ParseException; + +/** + * Parses input arguments and creates a new MarkTaskCommand object + */ +public class MarkTaskCommandParser implements Parser { + + /** + * Parses the given {@code String} of arguments in the context of the MarkTaskCommand + * and returns a MarkTaskCommand object for execution. + * @throws ParseException if the user input does not conform the expected format + */ + public MarkTaskCommand parse(String args) throws ParseException { + try { + Index index = ParserUtil.parseIndex(args); + return new MarkTaskCommand(index); + } catch (ParseException pe) { + throw new ParseException( + String.format(MESSAGE_INVALID_COMMAND_FORMAT, MarkTaskCommand.MESSAGE_USAGE), pe); + } + } + +} diff --git a/src/main/java/seedu/address/logic/parser/UnmarkTaskCommandParser.java b/src/main/java/seedu/address/logic/parser/UnmarkTaskCommandParser.java new file mode 100644 index 00000000000..433406578f4 --- /dev/null +++ b/src/main/java/seedu/address/logic/parser/UnmarkTaskCommandParser.java @@ -0,0 +1,29 @@ +package seedu.address.logic.parser; + +import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; + +import seedu.address.commons.core.index.Index; +import seedu.address.logic.commands.UnmarkTaskCommand; +import seedu.address.logic.parser.exceptions.ParseException; + +/** + * Parses input arguments and creates a new UnmarkTaskCommand object + */ +public class UnmarkTaskCommandParser implements Parser { + + /** + * Parses the given {@code String} of arguments in the context of the UnmarkTaskCommand + * and returns a UnmarkTaskCommand object for execution. + * @throws ParseException if the user input does not conform the expected format + */ + public UnmarkTaskCommand parse(String args) throws ParseException { + try { + Index index = ParserUtil.parseIndex(args); + return new UnmarkTaskCommand(index); + } catch (ParseException pe) { + throw new ParseException( + String.format(MESSAGE_INVALID_COMMAND_FORMAT, UnmarkTaskCommand.MESSAGE_USAGE), pe); + } + } + +} diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java index b437c08b7b1..41571992d1f 100644 --- a/src/main/java/seedu/address/model/AddressBook.java +++ b/src/main/java/seedu/address/model/AddressBook.java @@ -133,6 +133,17 @@ public void addTask(Task t) { tasks.add(t); } + /** + * Replaces the given task {@code target} in the list with {@code editedTask}. + * {@code target} must exist in the address book. + * The task information of {@code editedTask} must not be the same as another existing task in the address book. + */ + public void setTask(Task target, Task editedTask) { + requireNonNull(editedTask); + + tasks.setTask(target, editedTask); + } + //// util methods @Override diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java index 90c1416c4f8..303ee6204a7 100644 --- a/src/main/java/seedu/address/model/Model.java +++ b/src/main/java/seedu/address/model/Model.java @@ -105,16 +105,24 @@ public interface Model { //=========== Task-Level operations ====================================================================== /** - * Returns true if a task with the same title and note as {@code task} exists in the address book. + * Returns true if a task with the same title and note as {@code task} exists in + * the task list. */ boolean hasTask(Task task); /** - * Adds the given task. - * {@code task} must not already exist in the address book. + * Adds the given task to the task list. + * {@code task} must not already exist in the task list. */ void addTask(Task task); + /** + * Replaces the given task {@code target} with {@code editedTask}. + * {@code target} must exist in the task list. + * The task information of {@code editedTask} must not be the same as another existing task in the task list. + */ + void setTask(Task target, Task editedTask); + /** * Returns an unmodifiable view of the filtered task list */ @@ -126,4 +134,19 @@ public interface Model { * @throws NullPointerException if {@code predicate} is null. */ void updateFilteredTaskList(Predicate predicate); + + /** + * Updates the task of the filtered task list to mark it as done. + * + * @param task The specific task to mark in the filtered task list. + */ + Task markTask(Task task); + + /** + * Updates the task of the filtered task list to mark it as not done. + * + * @param task The specific task to mark in the filtered task list. + */ + Task unmarkTask(Task task); + } diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java index 1780cd78cbf..c15de9cbbbc 100644 --- a/src/main/java/seedu/address/model/ModelManager.java +++ b/src/main/java/seedu/address/model/ModelManager.java @@ -152,7 +152,26 @@ public void addTask(Task task) { updateFilteredTaskList(PREDICATE_SHOW_ALL_TASKS); } - //=========== Filtered Task List Accessors =============================================================== + @Override + public void setTask(Task target, Task editedTask) { + requireAllNonNull(target, editedTask); + + addressBook.setTask(target, editedTask); + } + + @Override + public Task markTask(Task task) { + setTask(task, task.markDone()); + return task.markDone(); + } + + @Override + public Task unmarkTask(Task task) { + setTask(task, task.unmarkDone()); + return task.unmarkDone(); + } + + //=========== Filtered Task List Accessors ============================================================= /** * Returns an unmodifiable view of the list of {@code Task} backed by the diff --git a/src/main/java/seedu/address/model/task/Status.java b/src/main/java/seedu/address/model/task/Status.java new file mode 100644 index 00000000000..dbf7b859828 --- /dev/null +++ b/src/main/java/seedu/address/model/task/Status.java @@ -0,0 +1,73 @@ +package seedu.address.model.task; + +import static java.util.Objects.requireNonNull; + +import java.util.Objects; + +/** + * Represents a Task's status in the task list. + * Guarantees: immutable; Status can be either {@link TaskStatus#DONE} or {@link TaskStatus#NOT_DONE}. + */ +public class Status { + public static final Status STATUS_DONE = new Status(TaskStatus.DONE); + public static final Status STATUS_NOT_DONE = new Status(TaskStatus.NOT_DONE); + public final TaskStatus taskStatus; + + /** + * Represents the status of a task in the task list. + * Each enum constant corresponds to a specific status: {@code DONE} for completed tasks and + * {@code NOT_DONE} for pending tasks. + */ + public enum TaskStatus { + /** + * Represents a completed task status. + */ + DONE("Done"), + /** + * Represents a pending task status. + */ + NOT_DONE("Not Done"); + + private final String value; + + TaskStatus(String value) { + this.value = value; + } + } + + /** + * Constructs a {@code Status}. + * + * @param status A valid status for a task (DONE or NOT_DONE). + */ + public Status(TaskStatus status) { + requireNonNull(status); + this.taskStatus = status; + } + + @Override + public String toString() { + return taskStatus.value; + } + + @Override + public boolean equals(Object other) { + if (other == this) { + return true; + } + + // instanceof handles nulls + if (!(other instanceof Status)) { + return false; + } + + Status otherStatus = (Status) other; + return taskStatus.equals(otherStatus.taskStatus); + } + + @Override + public int hashCode() { + return Objects.hash(taskStatus); + } + +} diff --git a/src/main/java/seedu/address/model/task/Task.java b/src/main/java/seedu/address/model/task/Task.java index 33291fc71b7..9805547187b 100644 --- a/src/main/java/seedu/address/model/task/Task.java +++ b/src/main/java/seedu/address/model/task/Task.java @@ -15,15 +15,32 @@ public class Task { // Identity fields private final Title title; private final Note note; + private Status status; /** * A Task consists of a title and a note. * Both fields must be present and not null. + * Tasks will be default not done when created. */ public Task(Title title, Note note) { requireAllNonNull(title, note); this.title = title; this.note = note; + this.status = new Status(Status.TaskStatus.NOT_DONE); + } + + /** + * Creates a new task with the given title, note, and status. + * + * @param title The title of the task. Must not be null. + * @param note The note associated with the task. Must not be null. + * @param status The status of the task. Must not be null. + */ + public Task(Title title, Note note, Status status) { + requireAllNonNull(title, note); + this.title = title; + this.note = note; + this.status = status; } public Title getTitle() { @@ -34,15 +51,40 @@ public Note getNote() { return note; } + public Status getStatus() { + return status; + } + + /** + * Updates the Status of the Task as Done. + */ + public Task markDone() { + return new Task(title, note, new Status(Status.TaskStatus.DONE)); + } + + /** + * Updates the Status of the Task as not Done. + */ + public Task unmarkDone() { + return new Task(title, note, new Status(Status.TaskStatus.NOT_DONE)); + } + /** * Returns true if both tasks have the same title and note. + * This defines a weaker notion of equality between two tasks. */ public boolean isSameTask(Task otherTask) { - return this.equals(otherTask); + if (otherTask == this) { + return true; + } + + return otherTask != null + && otherTask.getTitle().equals(getTitle()) + && otherTask.getNote().equals(getNote()); } /** - * Returns true if both tasks have the same title and note. + * Returns true if both tasks have the same title, note and status. */ @Override public boolean equals(Object other) { @@ -57,13 +99,14 @@ public boolean equals(Object other) { Task otherTask = (Task) other; return title.equals(otherTask.title) - && note.equals(otherTask.note); + && note.equals(otherTask.note) + && status.equals(otherTask.status); } @Override public int hashCode() { // use this method for custom fields hashing instead of implementing your own - return Objects.hash(title, note); + return Objects.hash(title, note, status); } @Override @@ -71,6 +114,7 @@ public String toString() { return new ToStringBuilder(this) .add("title", title) .add("note", note) + .add("status", status) .toString(); } diff --git a/src/test/java/seedu/address/logic/MessagesTest.java b/src/test/java/seedu/address/logic/MessagesTest.java index c9594dc6de1..3604960c86f 100644 --- a/src/test/java/seedu/address/logic/MessagesTest.java +++ b/src/test/java/seedu/address/logic/MessagesTest.java @@ -26,13 +26,13 @@ public void format_person_benson() { @Test public void format_task_agenda() { - String expected = "Prepare Agenda; Note: To book venue"; + String expected = "Prepare Agenda; Note: To book venue; Status: Not Done"; assertEquals(expected, Messages.format(AGENDA)); } @Test public void format_task_budget() { - String expected = "Prepare Budget; Note: For CS2102"; + String expected = "Prepare Budget; Note: For CS2102; Status: Done"; assertEquals(expected, Messages.format(BUDGET)); } diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java index 06bc92ea595..9ca0618e916 100644 --- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java +++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java @@ -21,6 +21,8 @@ import seedu.address.model.Model; import seedu.address.model.person.NameContainsKeywordsPredicate; import seedu.address.model.person.Person; +import seedu.address.model.task.Task; +import seedu.address.model.task.TitleContainsKeywordsPredicate; import seedu.address.testutil.EditPersonDescriptorBuilder; /** @@ -139,4 +141,18 @@ public static void showPersonAtIndex(Model model, Index targetIndex) { assertEquals(1, model.getFilteredPersonList().size()); } + /** + * Updates {@code model}'s filtered list to show only the tasks at the given {@code targetIndex} in the + * {@code model}'s address book. + */ + public static void showTaskAtIndex(Model model, Index targetIndex) { + assertTrue(targetIndex.getZeroBased() < model.getFilteredTaskList().size()); + + Task task = model.getFilteredTaskList().get(targetIndex.getZeroBased()); + final String[] splitName = task.getTitle().value.split("\\s+"); + model.updateFilteredTaskList(new TitleContainsKeywordsPredicate(Arrays.asList(splitName[1]))); + + assertEquals(1, model.getFilteredTaskList().size()); + } + } diff --git a/src/test/java/seedu/address/logic/commands/DeletePersonCommandTest.java b/src/test/java/seedu/address/logic/commands/DeletePersonCommandTest.java index 86698c56fa8..ed90bc53b91 100644 --- a/src/test/java/seedu/address/logic/commands/DeletePersonCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/DeletePersonCommandTest.java @@ -6,8 +6,8 @@ import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; -import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; +import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND; import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; import org.junit.jupiter.api.Test; @@ -29,8 +29,8 @@ public class DeletePersonCommandTest { @Test public void execute_validIndexUnfilteredList_success() { - Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased()); - DeletePersonCommand deletePersonCommand = new DeletePersonCommand(INDEX_FIRST_PERSON); + Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST.getZeroBased()); + DeletePersonCommand deletePersonCommand = new DeletePersonCommand(INDEX_FIRST); String expectedMessage = String.format(DeletePersonCommand.MESSAGE_DELETE_PERSON_SUCCESS, Messages.format(personToDelete)); @@ -51,10 +51,10 @@ public void execute_invalidIndexUnfilteredList_throwsCommandException() { @Test public void execute_validIndexFilteredList_success() { - showPersonAtIndex(model, INDEX_FIRST_PERSON); + showPersonAtIndex(model, INDEX_FIRST); - Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased()); - DeletePersonCommand deletePersonCommand = new DeletePersonCommand(INDEX_FIRST_PERSON); + Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST.getZeroBased()); + DeletePersonCommand deletePersonCommand = new DeletePersonCommand(INDEX_FIRST); String expectedMessage = String.format(DeletePersonCommand.MESSAGE_DELETE_PERSON_SUCCESS, Messages.format(personToDelete)); @@ -68,9 +68,9 @@ public void execute_validIndexFilteredList_success() { @Test public void execute_invalidIndexFilteredList_throwsCommandException() { - showPersonAtIndex(model, INDEX_FIRST_PERSON); + showPersonAtIndex(model, INDEX_FIRST); - Index outOfBoundIndex = INDEX_SECOND_PERSON; + Index outOfBoundIndex = INDEX_SECOND; // ensures that outOfBoundIndex is still in bounds of address book list assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size()); @@ -81,14 +81,14 @@ public void execute_invalidIndexFilteredList_throwsCommandException() { @Test public void equals() { - DeletePersonCommand deletePersonFirstCommand = new DeletePersonCommand(INDEX_FIRST_PERSON); - DeletePersonCommand deletePersonSecondCommand = new DeletePersonCommand(INDEX_SECOND_PERSON); + DeletePersonCommand deletePersonFirstCommand = new DeletePersonCommand(INDEX_FIRST); + DeletePersonCommand deletePersonSecondCommand = new DeletePersonCommand(INDEX_SECOND); // same object -> returns true assertTrue(deletePersonFirstCommand.equals(deletePersonFirstCommand)); // same values -> returns true - DeletePersonCommand deletePersonFirstCommandCopy = new DeletePersonCommand(INDEX_FIRST_PERSON); + DeletePersonCommand deletePersonFirstCommandCopy = new DeletePersonCommand(INDEX_FIRST); assertTrue(deletePersonFirstCommand.equals(deletePersonFirstCommandCopy)); // different types -> returns false diff --git a/src/test/java/seedu/address/logic/commands/EditPersonCommandTest.java b/src/test/java/seedu/address/logic/commands/EditPersonCommandTest.java index 52cc5dcd171..b3d754ab1a1 100644 --- a/src/test/java/seedu/address/logic/commands/EditPersonCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/EditPersonCommandTest.java @@ -11,8 +11,8 @@ import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; -import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; +import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND; import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; import org.junit.jupiter.api.Test; @@ -39,7 +39,7 @@ public class EditPersonCommandTest { public void execute_allFieldsSpecifiedUnfilteredList_success() { Person editedPerson = new PersonBuilder().build(); EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(editedPerson).build(); - EditPersonCommand editPersonCommand = new EditPersonCommand(INDEX_FIRST_PERSON, descriptor); + EditPersonCommand editPersonCommand = new EditPersonCommand(INDEX_FIRST, descriptor); String expectedMessage = String.format(EditPersonCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson)); @@ -74,8 +74,8 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() { @Test public void execute_noFieldSpecifiedUnfilteredList_success() { - EditPersonCommand editPersonCommand = new EditPersonCommand(INDEX_FIRST_PERSON, new EditPersonDescriptor()); - Person editedPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased()); + EditPersonCommand editPersonCommand = new EditPersonCommand(INDEX_FIRST, new EditPersonDescriptor()); + Person editedPerson = model.getFilteredPersonList().get(INDEX_FIRST.getZeroBased()); String expectedMessage = String.format(EditPersonCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson)); @@ -87,11 +87,11 @@ public void execute_noFieldSpecifiedUnfilteredList_success() { @Test public void execute_filteredList_success() { - showPersonAtIndex(model, INDEX_FIRST_PERSON); + showPersonAtIndex(model, INDEX_FIRST); - Person personInFilteredList = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased()); + Person personInFilteredList = model.getFilteredPersonList().get(INDEX_FIRST.getZeroBased()); Person editedPerson = new PersonBuilder(personInFilteredList).withName(VALID_NAME_BOB).build(); - EditPersonCommand editPersonCommand = new EditPersonCommand(INDEX_FIRST_PERSON, + EditPersonCommand editPersonCommand = new EditPersonCommand(INDEX_FIRST, new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build()); String expectedMessage = String.format(EditPersonCommand.MESSAGE_EDIT_PERSON_SUCCESS, @@ -105,20 +105,20 @@ public void execute_filteredList_success() { @Test public void execute_duplicatePersonUnfilteredList_failure() { - Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased()); + Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST.getZeroBased()); EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(firstPerson).build(); - EditPersonCommand editPersonCommand = new EditPersonCommand(INDEX_SECOND_PERSON, descriptor); + EditPersonCommand editPersonCommand = new EditPersonCommand(INDEX_SECOND, descriptor); assertCommandFailure(editPersonCommand, model, EditPersonCommand.MESSAGE_DUPLICATE_PERSON); } @Test public void execute_duplicatePersonFilteredList_failure() { - showPersonAtIndex(model, INDEX_FIRST_PERSON); + showPersonAtIndex(model, INDEX_FIRST); // edit person in filtered list into a duplicate in address book - Person personInList = model.getAddressBook().getPersonList().get(INDEX_SECOND_PERSON.getZeroBased()); - EditPersonCommand editPersonCommand = new EditPersonCommand(INDEX_FIRST_PERSON, + Person personInList = model.getAddressBook().getPersonList().get(INDEX_SECOND.getZeroBased()); + EditPersonCommand editPersonCommand = new EditPersonCommand(INDEX_FIRST, new EditPersonDescriptorBuilder(personInList).build()); assertCommandFailure(editPersonCommand, model, EditPersonCommand.MESSAGE_DUPLICATE_PERSON); @@ -139,8 +139,8 @@ public void execute_invalidPersonIndexUnfilteredList_failure() { */ @Test public void execute_invalidPersonIndexFilteredList_failure() { - showPersonAtIndex(model, INDEX_FIRST_PERSON); - Index outOfBoundIndex = INDEX_SECOND_PERSON; + showPersonAtIndex(model, INDEX_FIRST); + Index outOfBoundIndex = INDEX_SECOND; // ensures that outOfBoundIndex is still in bounds of address book list assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size()); @@ -152,11 +152,11 @@ public void execute_invalidPersonIndexFilteredList_failure() { @Test public void equals() { - final EditPersonCommand standardCommand = new EditPersonCommand(INDEX_FIRST_PERSON, DESC_AMY); + final EditPersonCommand standardCommand = new EditPersonCommand(INDEX_FIRST, DESC_AMY); // same values -> returns true EditPersonDescriptor copyDescriptor = new EditPersonDescriptor(DESC_AMY); - EditPersonCommand commandWithSameValues = new EditPersonCommand(INDEX_FIRST_PERSON, copyDescriptor); + EditPersonCommand commandWithSameValues = new EditPersonCommand(INDEX_FIRST, copyDescriptor); assertTrue(standardCommand.equals(commandWithSameValues)); // same object -> returns true @@ -169,10 +169,10 @@ public void equals() { assertFalse(standardCommand.equals(new DeleteAllPersonCommand())); // different index -> returns false - assertFalse(standardCommand.equals(new EditPersonCommand(INDEX_SECOND_PERSON, DESC_AMY))); + assertFalse(standardCommand.equals(new EditPersonCommand(INDEX_SECOND, DESC_AMY))); // different descriptor -> returns false - assertFalse(standardCommand.equals(new EditPersonCommand(INDEX_FIRST_PERSON, DESC_BOB))); + assertFalse(standardCommand.equals(new EditPersonCommand(INDEX_FIRST, DESC_BOB))); } @Test diff --git a/src/test/java/seedu/address/logic/commands/ListPersonCommandTest.java b/src/test/java/seedu/address/logic/commands/ListPersonCommandTest.java index e025d4abd8b..ea81755b281 100644 --- a/src/test/java/seedu/address/logic/commands/ListPersonCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/ListPersonCommandTest.java @@ -2,7 +2,7 @@ import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; import org.junit.jupiter.api.BeforeEach; @@ -33,7 +33,7 @@ public void execute_listIsNotFiltered_showsSameList() { @Test public void execute_listIsFiltered_showsEverything() { - showPersonAtIndex(model, INDEX_FIRST_PERSON); + showPersonAtIndex(model, INDEX_FIRST); assertCommandSuccess(new ListPersonCommand(), model, ListPersonCommand.MESSAGE_SUCCESS, expectedModel); } } diff --git a/src/test/java/seedu/address/logic/commands/MarkTaskCommandTest.java b/src/test/java/seedu/address/logic/commands/MarkTaskCommandTest.java new file mode 100644 index 00000000000..f1f2c62f63e --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/MarkTaskCommandTest.java @@ -0,0 +1,119 @@ +package seedu.address.logic.commands; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; +import static seedu.address.logic.commands.CommandTestUtil.showTaskAtIndex; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; +import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND; +import static seedu.address.testutil.TypicalTasks.getTypicalAddressBook; + +import org.junit.jupiter.api.Test; + +import seedu.address.commons.core.index.Index; +import seedu.address.logic.Messages; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.task.Task; + +/** + * Contains integration tests (interaction with the Model) and unit tests for + * {@code MarkTaskCommand}. + */ +public class MarkTaskCommandTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void execute_validIndexUnfilteredList_success() { + Task taskToMark = model.getFilteredTaskList().get(INDEX_FIRST.getZeroBased()); + MarkTaskCommand markTaskCommand = new MarkTaskCommand(INDEX_FIRST); + + ModelManager expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs()); + Task markedTask = expectedModel.markTask(taskToMark); + + String expectedMessage = String.format(MarkTaskCommand.MESSAGE_MARK_TASK_SUCCESS, + Messages.format(markedTask)); + + assertCommandSuccess(markTaskCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_invalidIndexUnfilteredList_throwsCommandException() { + Index outOfBoundIndex = Index.fromOneBased(model.getFilteredTaskList().size() + 1); + MarkTaskCommand markTaskCommand = new MarkTaskCommand(outOfBoundIndex); + + assertCommandFailure(markTaskCommand, model, Messages.MESSAGE_INVALID_TASK_DISPLAYED_INDEX); + } + + @Test + public void execute_markAlreadyMarkedTask_throwsCommandException() { + Task taskToMark = model.getFilteredTaskList().get(INDEX_FIRST.getZeroBased()); + model.markTask(taskToMark); + MarkTaskCommand markTaskCommand = new MarkTaskCommand(INDEX_FIRST); + + assertCommandFailure(markTaskCommand, model, MarkTaskCommand.MESSAGE_HAS_BEEN_MARKED); + } + + @Test + public void execute_validIndexFilteredList_success() { + showTaskAtIndex(model, INDEX_FIRST); + + Task taskToMark = model.getFilteredTaskList().get(INDEX_FIRST.getZeroBased()); + MarkTaskCommand markTaskCommand = new MarkTaskCommand(INDEX_FIRST); + + Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs()); + showTaskAtIndex(expectedModel, INDEX_FIRST); + Task markedTask = expectedModel.markTask(taskToMark); + + String expectedMessage = String.format(MarkTaskCommand.MESSAGE_MARK_TASK_SUCCESS, + Messages.format(markedTask)); + + assertCommandSuccess(markTaskCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_invalidIndexFilteredList_throwsCommandException() { + showTaskAtIndex(model, INDEX_FIRST); + + Index outOfBoundIndex = INDEX_SECOND; + // ensures that outOfBoundIndex is still in bounds of address book list + assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getTaskList().size()); + + MarkTaskCommand markTaskCommand = new MarkTaskCommand(outOfBoundIndex); + + assertCommandFailure(markTaskCommand, model, Messages.MESSAGE_INVALID_TASK_DISPLAYED_INDEX); + } + + @Test + public void equals() { + MarkTaskCommand markTaskFirstCommand = new MarkTaskCommand(INDEX_FIRST); + MarkTaskCommand markTaskSecondCommand = new MarkTaskCommand(INDEX_SECOND); + + // same object -> returns true + assertTrue(markTaskFirstCommand.equals(markTaskFirstCommand)); + + // same values -> returns true + MarkTaskCommand markTaskFirstCommandCopy = new MarkTaskCommand(INDEX_FIRST); + assertTrue(markTaskFirstCommand.equals(markTaskFirstCommandCopy)); + + // different types -> returns false + assertFalse(markTaskFirstCommand.equals(1)); + + // null -> returns false + assertFalse(markTaskFirstCommand.equals(null)); + + // different index -> returns false + assertFalse(markTaskFirstCommand.equals(markTaskSecondCommand)); + } + @Test + public void toStringMethod() { + Index targetIndex = Index.fromOneBased(1); + MarkTaskCommand markTaskCommand = new MarkTaskCommand(targetIndex); + String expected = MarkTaskCommand.class.getCanonicalName() + "{targetIndex=" + targetIndex + "}"; + assertEquals(expected, markTaskCommand.toString()); + } +} diff --git a/src/test/java/seedu/address/logic/commands/UnmarkTaskCommandTest.java b/src/test/java/seedu/address/logic/commands/UnmarkTaskCommandTest.java new file mode 100644 index 00000000000..2f3deb7c5f8 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/UnmarkTaskCommandTest.java @@ -0,0 +1,121 @@ +package seedu.address.logic.commands; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; +import static seedu.address.logic.commands.CommandTestUtil.showTaskAtIndex; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; +import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND; +import static seedu.address.testutil.TypicalTasks.getTypicalAddressBook; + +import org.junit.jupiter.api.Test; + +import seedu.address.commons.core.index.Index; +import seedu.address.logic.Messages; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.task.Task; + +/** + * Contains integration tests (interaction with the Model) and unit tests for + * {@code UnmarkTaskCommand}. + */ +public class UnmarkTaskCommandTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void execute_validIndexUnfilteredList_success() { + Task taskToMark = model.getFilteredTaskList().get(INDEX_FIRST.getZeroBased()); + Task taskToUnmark = model.markTask(taskToMark); + UnmarkTaskCommand unmarkTaskCommand = new UnmarkTaskCommand(INDEX_FIRST); + + ModelManager expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs()); + Task markedTask = expectedModel.unmarkTask(taskToUnmark); + Task unmarkedTask = expectedModel.unmarkTask(markedTask); + + String expectedMessage = String.format(UnmarkTaskCommand.MESSAGE_UNMARK_TASK_SUCCESS, + Messages.format(unmarkedTask)); + + assertCommandSuccess(unmarkTaskCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_invalidIndexUnfilteredList_throwsCommandException() { + Index outOfBoundIndex = Index.fromOneBased(model.getFilteredTaskList().size() + 1); + UnmarkTaskCommand unmarkTaskCommand = new UnmarkTaskCommand(outOfBoundIndex); + + assertCommandFailure(unmarkTaskCommand, model, Messages.MESSAGE_INVALID_TASK_DISPLAYED_INDEX); + } + + @Test + public void execute_unmarkAlreadyUnmarkedTask_throwsCommandException() { + UnmarkTaskCommand unmarkTaskCommand = new UnmarkTaskCommand(INDEX_FIRST); + + assertCommandFailure(unmarkTaskCommand, model, UnmarkTaskCommand.MESSAGE_HAS_BEEN_MARKED); + } + + @Test + public void execute_validIndexFilteredList_success() { + showTaskAtIndex(model, INDEX_FIRST); + + Task taskToMark = model.getFilteredTaskList().get(INDEX_FIRST.getZeroBased()); + Task taskToUnmark = model.markTask(taskToMark); + UnmarkTaskCommand unmarkTaskCommand = new UnmarkTaskCommand(INDEX_FIRST); + + Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs()); + showTaskAtIndex(expectedModel, INDEX_FIRST); + Task markedTask = expectedModel.unmarkTask(taskToUnmark); + Task unmarkedTask = expectedModel.unmarkTask(markedTask); + + String expectedMessage = String.format(UnmarkTaskCommand.MESSAGE_UNMARK_TASK_SUCCESS, + Messages.format(unmarkedTask)); + + assertCommandSuccess(unmarkTaskCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_invalidIndexFilteredList_throwsCommandException() { + showTaskAtIndex(model, INDEX_FIRST); + + Index outOfBoundIndex = INDEX_SECOND; + // ensures that outOfBoundIndex is still in bounds of address book list + assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getTaskList().size()); + + UnmarkTaskCommand unmarkTaskCommand = new UnmarkTaskCommand(outOfBoundIndex); + + assertCommandFailure(unmarkTaskCommand, model, Messages.MESSAGE_INVALID_TASK_DISPLAYED_INDEX); + } + + @Test + public void equals() { + UnmarkTaskCommand unmarkTaskFirstCommand = new UnmarkTaskCommand(INDEX_FIRST); + UnmarkTaskCommand unmarkTaskSecondCommand = new UnmarkTaskCommand(INDEX_SECOND); + + // same object -> returns true + assertTrue(unmarkTaskFirstCommand.equals(unmarkTaskFirstCommand)); + + // same values -> returns true + UnmarkTaskCommand unmarkTaskFirstCommandCopy = new UnmarkTaskCommand(INDEX_FIRST); + assertTrue(unmarkTaskFirstCommand.equals(unmarkTaskFirstCommandCopy)); + + // different types -> returns false + assertFalse(unmarkTaskFirstCommand.equals(1)); + + // null -> returns false + assertFalse(unmarkTaskFirstCommand.equals(null)); + + // different index -> returns false + assertFalse(unmarkTaskFirstCommand.equals(unmarkTaskSecondCommand)); + } + @Test + public void toStringMethod() { + Index targetIndex = Index.fromOneBased(1); + UnmarkTaskCommand unmarkTaskCommand = new UnmarkTaskCommand(targetIndex); + String expected = UnmarkTaskCommand.class.getCanonicalName() + "{targetIndex=" + targetIndex + "}"; + assertEquals(expected, unmarkTaskCommand.toString()); + } +} diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java index c3983d48185..e7fd27e714c 100644 --- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java +++ b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java @@ -5,7 +5,7 @@ import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; import static seedu.address.logic.Messages.MESSAGE_UNKNOWN_COMMAND; import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; import java.util.Arrays; import java.util.List; @@ -23,6 +23,8 @@ import seedu.address.logic.commands.FindTaskCommand; import seedu.address.logic.commands.HelpCommand; import seedu.address.logic.commands.ListPersonCommand; +import seedu.address.logic.commands.MarkTaskCommand; +import seedu.address.logic.commands.UnmarkTaskCommand; import seedu.address.logic.parser.exceptions.ParseException; import seedu.address.model.person.NameContainsKeywordsPredicate; import seedu.address.model.person.Person; @@ -54,8 +56,8 @@ public void parseCommand_deleteAllPerson() throws Exception { @Test public void parseCommand_deletePerson() throws Exception { DeletePersonCommand command = (DeletePersonCommand) parser.parseCommand( - DeletePersonCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased()); - assertEquals(new DeletePersonCommand(INDEX_FIRST_PERSON), command); + DeletePersonCommand.COMMAND_WORD + " " + INDEX_FIRST.getOneBased()); + assertEquals(new DeletePersonCommand(INDEX_FIRST), command); } @Test @@ -63,8 +65,8 @@ public void parseCommand_editPerson() throws Exception { Person person = new PersonBuilder().build(); EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(person).build(); EditPersonCommand command = (EditPersonCommand) parser.parseCommand(EditPersonCommand.COMMAND_WORD + " " - + INDEX_FIRST_PERSON.getOneBased() + " " + PersonUtil.getEditPersonDescriptorDetails(descriptor)); - assertEquals(new EditPersonCommand(INDEX_FIRST_PERSON, descriptor), command); + + INDEX_FIRST.getOneBased() + " " + PersonUtil.getEditPersonDescriptorDetails(descriptor)); + assertEquals(new EditPersonCommand(INDEX_FIRST, descriptor), command); } @Test @@ -108,6 +110,20 @@ public void parseCommand_findTask() throws Exception { assertEquals(new FindTaskCommand(new TaskContainsKeywordsPredicate(keywords)), command); } + @Test + public void parseCommand_markTask() throws Exception { + MarkTaskCommand command = (MarkTaskCommand) parser.parseCommand( + MarkTaskCommand.COMMAND_WORD + " " + INDEX_FIRST.getOneBased()); + assertEquals(new MarkTaskCommand(INDEX_FIRST), command); + } + + @Test + public void parseCommand_unmarkTask() throws Exception { + UnmarkTaskCommand command = (UnmarkTaskCommand) parser.parseCommand( + UnmarkTaskCommand.COMMAND_WORD + " " + INDEX_FIRST.getOneBased()); + assertEquals(new UnmarkTaskCommand(INDEX_FIRST), command); + } + @Test public void parseCommand_unrecognisedInput_throwsParseException() { assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE), () diff --git a/src/test/java/seedu/address/logic/parser/DeletePersonCommandParserTest.java b/src/test/java/seedu/address/logic/parser/DeletePersonCommandParserTest.java index 122a7e296f5..41bc6f07152 100644 --- a/src/test/java/seedu/address/logic/parser/DeletePersonCommandParserTest.java +++ b/src/test/java/seedu/address/logic/parser/DeletePersonCommandParserTest.java @@ -3,7 +3,7 @@ import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ public class DeletePersonCommandParserTest { @Test public void parse_validArgs_returnsDeletePersonCommand() { - assertParseSuccess(parser, "1", new DeletePersonCommand(INDEX_FIRST_PERSON)); + assertParseSuccess(parser, "1", new DeletePersonCommand(INDEX_FIRST)); } @Test diff --git a/src/test/java/seedu/address/logic/parser/EditPersonCommandParserTest.java b/src/test/java/seedu/address/logic/parser/EditPersonCommandParserTest.java index 9bcdedf7bbb..4629a805d60 100644 --- a/src/test/java/seedu/address/logic/parser/EditPersonCommandParserTest.java +++ b/src/test/java/seedu/address/logic/parser/EditPersonCommandParserTest.java @@ -28,9 +28,9 @@ import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; -import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON; -import static seedu.address.testutil.TypicalIndexes.INDEX_THIRD_PERSON; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; +import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND; +import static seedu.address.testutil.TypicalIndexes.INDEX_THIRD; import org.junit.jupiter.api.Test; @@ -105,7 +105,7 @@ public void parse_invalidValue_failure() { @Test public void parse_allFieldsSpecified_success() { - Index targetIndex = INDEX_SECOND_PERSON; + Index targetIndex = INDEX_SECOND; String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + TAG_DESC_HUSBAND + EMAIL_DESC_AMY + ADDRESS_DESC_AMY + NAME_DESC_AMY + TAG_DESC_FRIEND; @@ -119,7 +119,7 @@ public void parse_allFieldsSpecified_success() { @Test public void parse_someFieldsSpecified_success() { - Index targetIndex = INDEX_FIRST_PERSON; + Index targetIndex = INDEX_FIRST; String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + EMAIL_DESC_AMY; EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB) @@ -132,7 +132,7 @@ public void parse_someFieldsSpecified_success() { @Test public void parse_oneFieldSpecified_success() { // name - Index targetIndex = INDEX_THIRD_PERSON; + Index targetIndex = INDEX_THIRD; String userInput = targetIndex.getOneBased() + NAME_DESC_AMY; EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY).build(); EditPersonCommand expectedCommand = new EditPersonCommand(targetIndex, descriptor); @@ -169,7 +169,7 @@ public void parse_multipleRepeatedFields_failure() { // AddPersonCommandParserTest#parse_repeatedNonTagValue_failure() // valid followed by invalid - Index targetIndex = INDEX_FIRST_PERSON; + Index targetIndex = INDEX_FIRST; String userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + PHONE_DESC_BOB; assertParseFailure(parser, userInput, Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE)); @@ -197,7 +197,7 @@ public void parse_multipleRepeatedFields_failure() { @Test public void parse_resetTags_success() { - Index targetIndex = INDEX_THIRD_PERSON; + Index targetIndex = INDEX_THIRD; String userInput = targetIndex.getOneBased() + TAG_EMPTY; EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withTags().build(); diff --git a/src/test/java/seedu/address/logic/parser/MarkTaskCommandParserTest.java b/src/test/java/seedu/address/logic/parser/MarkTaskCommandParserTest.java new file mode 100644 index 00000000000..447eea9ff24 --- /dev/null +++ b/src/test/java/seedu/address/logic/parser/MarkTaskCommandParserTest.java @@ -0,0 +1,33 @@ +package seedu.address.logic.parser; + +import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; +import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.commands.MarkTaskCommand; + +/** + * As we are only doing white-box testing, our test cases do not cover path variations + * outside of the MarkTaskCommand code. For example, inputs "1" and "1 abc" take the + * same path through the MarkTaskCommand, and therefore we test only one of them. + * The path variation for those two cases occur inside the ParserUtil, and + * therefore should be covered by the ParserUtilTest. + */ +public class MarkTaskCommandParserTest { + + private MarkTaskCommandParser parser = new MarkTaskCommandParser(); + + @Test + public void parse_validArgs_returnsUnmarkTaskCommand() { + assertParseSuccess(parser, "1", new MarkTaskCommand(INDEX_FIRST)); + } + + @Test + public void parse_invalidArgs_throwsParseException() { + assertParseFailure(parser, "a", String.format(MESSAGE_INVALID_COMMAND_FORMAT, + MarkTaskCommand.MESSAGE_USAGE)); + } +} diff --git a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java b/src/test/java/seedu/address/logic/parser/ParserUtilTest.java index 4256788b1a7..76d25ba0b1b 100644 --- a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java +++ b/src/test/java/seedu/address/logic/parser/ParserUtilTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static seedu.address.logic.parser.ParserUtil.MESSAGE_INVALID_INDEX; import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; import java.util.Arrays; import java.util.Collections; @@ -50,10 +50,10 @@ public void parseIndex_outOfRangeInput_throwsParseException() { @Test public void parseIndex_validInput_success() throws Exception { // No whitespaces - assertEquals(INDEX_FIRST_PERSON, ParserUtil.parseIndex("1")); + assertEquals(INDEX_FIRST, ParserUtil.parseIndex("1")); // Leading and trailing whitespaces - assertEquals(INDEX_FIRST_PERSON, ParserUtil.parseIndex(" 1 ")); + assertEquals(INDEX_FIRST, ParserUtil.parseIndex(" 1 ")); } @Test diff --git a/src/test/java/seedu/address/logic/parser/UnmarkTaskCommandParserTest.java b/src/test/java/seedu/address/logic/parser/UnmarkTaskCommandParserTest.java new file mode 100644 index 00000000000..9c4e18979dd --- /dev/null +++ b/src/test/java/seedu/address/logic/parser/UnmarkTaskCommandParserTest.java @@ -0,0 +1,33 @@ +package seedu.address.logic.parser; + +import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; +import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.commands.UnmarkTaskCommand; + +/** + * As we are only doing white-box testing, our test cases do not cover path variations + * outside of the UnmarkTaskCommand code. For example, inputs "1" and "1 abc" take the + * same path through the UnmarkTaskCommand, and therefore we test only one of them. + * The path variation for those two cases occur inside the ParserUtil, and + * therefore should be covered by the ParserUtilTest. + */ +public class UnmarkTaskCommandParserTest { + + private UnmarkTaskCommandParser parser = new UnmarkTaskCommandParser(); + + @Test + public void parse_validArgs_returnsUnmarkTaskCommand() { + assertParseSuccess(parser, "1", new UnmarkTaskCommand(INDEX_FIRST)); + } + + @Test + public void parse_invalidArgs_throwsParseException() { + assertParseFailure(parser, "a", String.format(MESSAGE_INVALID_COMMAND_FORMAT, + UnmarkTaskCommand.MESSAGE_USAGE)); + } +} diff --git a/src/test/java/seedu/address/model/ModelManagerTest.java b/src/test/java/seedu/address/model/ModelManagerTest.java index eec5d3ccf98..cb6e3e336a8 100644 --- a/src/test/java/seedu/address/model/ModelManagerTest.java +++ b/src/test/java/seedu/address/model/ModelManagerTest.java @@ -17,6 +17,9 @@ import seedu.address.commons.core.GuiSettings; import seedu.address.model.person.NameContainsKeywordsPredicate; +import seedu.address.model.task.Status; +import seedu.address.model.task.Status.TaskStatus; +import seedu.address.model.task.Task; import seedu.address.testutil.AddressBookBuilder; public class ModelManagerTest { @@ -110,6 +113,28 @@ public void hasTask_taskInAddressBook_returnsTrue() { assertTrue(modelManager.hasTask(AGENDA)); } + @Test + public void markTask_validTask_success() { + modelManager.addTask(AGENDA); + Task markedTask = modelManager.markTask(AGENDA); + + assertTrue(markedTask.getStatus().equals(new Status(TaskStatus.DONE))); + + assertTrue(modelManager.getFilteredTaskList().get(0).getStatus().equals(new Status(TaskStatus.DONE))); + } + + @Test + public void unmarkTask_validTask_success() { + modelManager.addTask(AGENDA); + Task markedTask = modelManager.markTask(AGENDA); + Task unmarkedTask = modelManager.unmarkTask(markedTask); + + assertTrue(unmarkedTask.getStatus().equals(new Status(TaskStatus.NOT_DONE))); + + assertTrue(modelManager.getFilteredTaskList().get(0).getStatus().equals( + new Status(TaskStatus.NOT_DONE))); + } + @Test public void getFilteredTaskList_modifyList_throwsUnsupportedOperationException() { assertThrows(UnsupportedOperationException.class, () -> modelManager.getFilteredTaskList().remove(0)); diff --git a/src/test/java/seedu/address/model/ModelStub.java b/src/test/java/seedu/address/model/ModelStub.java index e2ed1e1d43a..94e35d157f7 100644 --- a/src/test/java/seedu/address/model/ModelStub.java +++ b/src/test/java/seedu/address/model/ModelStub.java @@ -87,6 +87,11 @@ public void addTask(Task task) { throw new AssertionError("This method should not be called."); } + @Override + public void setTask(Task target, Task editedTask) { + throw new AssertionError("This method should not be called."); + } + @Override public ObservableList getFilteredPersonList() { throw new AssertionError("This method should not be called."); @@ -106,4 +111,15 @@ public void updateFilteredPersonList(Predicate predicate) { public void updateFilteredTaskList(Predicate predicate) { throw new AssertionError("This method should not be called."); } + + @Override + public Task markTask(Task task) { + throw new AssertionError("This method should not be called."); + } + + @Override + public Task unmarkTask(Task task) { + throw new AssertionError("This method should not be called."); + } + } diff --git a/src/test/java/seedu/address/model/task/StatusTest.java b/src/test/java/seedu/address/model/task/StatusTest.java new file mode 100644 index 00000000000..b1870e27f63 --- /dev/null +++ b/src/test/java/seedu/address/model/task/StatusTest.java @@ -0,0 +1,59 @@ +package seedu.address.model.task; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static seedu.address.testutil.Assert.assertThrows; + +import org.junit.jupiter.api.Test; + +public class StatusTest { + + @Test + public void constructor_null_throwsNullPointerException() { + assertThrows(NullPointerException.class, () -> new Status(null)); + } + + @Test + public void equals() { + Status status = new Status(Status.TaskStatus.DONE); + + // same values -> returns true + assertEquals(status, new Status(Status.TaskStatus.DONE)); + + // same object -> returns true + assertEquals(status, status); + + // null -> returns false + // assertNotEquals calls the 1st argument's equals method + assertNotEquals(status, null); + + // different types -> returns false + assertNotEquals(status, 5.0f); + + // different values -> returns false + assertNotEquals(status, new Status(Status.TaskStatus.NOT_DONE)); + } + + @Test + public void toStringMethod() { + Status doneStatus = new Status(Status.TaskStatus.DONE); + assertEquals("Done", doneStatus.toString()); + + Status notDoneStatus = new Status(Status.TaskStatus.NOT_DONE); + assertEquals("Not Done", notDoneStatus.toString()); + } + + @Test + public void hashCodeTest() { + Status status = new Status(Status.TaskStatus.DONE); + + // same value -> same hashcode + assertEquals(status.hashCode(), new Status(Status.TaskStatus.DONE).hashCode()); + + // different value -> different hashcode + assertNotEquals(status.hashCode(), new Status(Status.TaskStatus.NOT_DONE).hashCode()); + + // different types -> returns false + assertNotEquals(status.hashCode(), "Done".hashCode()); + } +} diff --git a/src/test/java/seedu/address/model/task/TaskTest.java b/src/test/java/seedu/address/model/task/TaskTest.java index 0dd64cf89c6..4b123cd619b 100644 --- a/src/test/java/seedu/address/model/task/TaskTest.java +++ b/src/test/java/seedu/address/model/task/TaskTest.java @@ -65,7 +65,8 @@ public void equals() { @Test public void toStringMethod() { String expected = Task.class.getCanonicalName() + "{title=" + TEST_TASK_1_1.getTitle() - + ", note=" + TEST_TASK_1_1.getNote() + "}"; + + ", note=" + TEST_TASK_1_1.getNote() + ", status=" + TEST_TASK_1_1.getStatus() + + "}"; assertEquals(expected, TEST_TASK_1_1.toString()); } diff --git a/src/test/java/seedu/address/model/task/UniqueTaskListTest.java b/src/test/java/seedu/address/model/task/UniqueTaskListTest.java index 2a5c2c50ab6..781c28eda84 100644 --- a/src/test/java/seedu/address/model/task/UniqueTaskListTest.java +++ b/src/test/java/seedu/address/model/task/UniqueTaskListTest.java @@ -35,9 +35,11 @@ public void contains_taskWithSameFieldsInList_returnsTrue() { uniqueTaskList.add(AGENDA); String agendaTaskTitleString = AGENDA.getTitle().toString(); String agendaTaskNoteString = AGENDA.getNote().toString(); + Status agendaTaskStatus = AGENDA.getStatus(); Task agendaCopy = new TaskBuilder() .withTitle(agendaTaskTitleString) .withNote(agendaTaskNoteString) + .withStatus(agendaTaskStatus) .build(); assertTrue(uniqueTaskList.contains(agendaCopy)); } diff --git a/src/test/java/seedu/address/testutil/TaskBuilder.java b/src/test/java/seedu/address/testutil/TaskBuilder.java index a72d8840924..5feead8331e 100644 --- a/src/test/java/seedu/address/testutil/TaskBuilder.java +++ b/src/test/java/seedu/address/testutil/TaskBuilder.java @@ -1,6 +1,8 @@ package seedu.address.testutil; import seedu.address.model.task.Note; +import seedu.address.model.task.Status; +import seedu.address.model.task.Status.TaskStatus; import seedu.address.model.task.Task; import seedu.address.model.task.Title; @@ -14,6 +16,7 @@ public class TaskBuilder { private Title title; private Note note; + private Status status; /** * Creates a {@code TaskBuilder} with the default details. @@ -21,6 +24,7 @@ public class TaskBuilder { public TaskBuilder() { title = new Title(DEFAULT_TITLE); note = new Note(DEFAULT_NOTE); + status = new Status(TaskStatus.NOT_DONE); } /** @@ -29,6 +33,7 @@ public TaskBuilder() { public TaskBuilder(Task taskToCopy) { title = taskToCopy.getTitle(); note = taskToCopy.getNote(); + status = taskToCopy.getStatus(); } /** @@ -47,7 +52,18 @@ public TaskBuilder withNote(String note) { return this; } + /** + * Sets the {@code Status} of the {@code Task} that we are building. + */ + public TaskBuilder withStatus(Status status) { + this.status = status; + return this; + } + + /** + * Builds the {@code Task} with the relevant information. + */ public Task build() { - return new Task(title, note); + return new Task(title, note, status); } } diff --git a/src/test/java/seedu/address/testutil/TypicalIndexes.java b/src/test/java/seedu/address/testutil/TypicalIndexes.java index 1e613937657..134e60a4c20 100644 --- a/src/test/java/seedu/address/testutil/TypicalIndexes.java +++ b/src/test/java/seedu/address/testutil/TypicalIndexes.java @@ -6,7 +6,7 @@ * A utility class containing a list of {@code Index} objects to be used in tests. */ public class TypicalIndexes { - public static final Index INDEX_FIRST_PERSON = Index.fromOneBased(1); - public static final Index INDEX_SECOND_PERSON = Index.fromOneBased(2); - public static final Index INDEX_THIRD_PERSON = Index.fromOneBased(3); + public static final Index INDEX_FIRST = Index.fromOneBased(1); + public static final Index INDEX_SECOND = Index.fromOneBased(2); + public static final Index INDEX_THIRD = Index.fromOneBased(3); } diff --git a/src/test/java/seedu/address/testutil/TypicalTasks.java b/src/test/java/seedu/address/testutil/TypicalTasks.java index 273f1d176fd..72dbfec7475 100644 --- a/src/test/java/seedu/address/testutil/TypicalTasks.java +++ b/src/test/java/seedu/address/testutil/TypicalTasks.java @@ -5,6 +5,8 @@ import java.util.List; import seedu.address.model.AddressBook; +import seedu.address.model.task.Status; +import seedu.address.model.task.Status.TaskStatus; import seedu.address.model.task.Task; /** @@ -20,6 +22,7 @@ public class TypicalTasks { public static final Task BUDGET = new TaskBuilder() .withTitle("Prepare Budget") .withNote("For CS2102") + .withStatus(new Status(TaskStatus.DONE)) .build(); public static final Task CATERING = new TaskBuilder()