Merge pull request #336 from Li-Shicheng/master

Update EditCommandTest
CS2103JUN2017-T4 · Jul 24, 2017 · 59c6dca · 59c6dca
2 parents 61a74b5 + 6fe3fc5
commit 59c6dca
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
@@ -61,7 +61,7 @@ By : `T01-T4`  &nbsp;&nbsp;&nbsp;&nbsp; Since: `Jun 2017`  &nbsp;&nbsp;&nbsp;&nb
 > **Reserved Tags**
 >
 > * Reserved tag `HIGH`, `MEDIUM`, `LOW` names  are used to denote the importance of a certain task
-> * Tagged task will be highlighted `RED`, `BLUE`, `GREEN`
+> * Tagged task will be highlighted `RED`, `BLUE`, `GREEN` respectively for `HIGH`, `MEDIUM`, `LOW`
 > * Reserved tag `OVERLAP` are used to warn you about overlapping events.
 
 > **DateTime parsing**

diff --git a/src/main/java/seedu/whatsnext/commons/core/Messages.java b/src/main/java/seedu/whatsnext/commons/core/Messages.java
@@ -11,6 +11,7 @@ public class Messages {
     public static final String MESSAGE_TASKS_LISTED_OVERVIEW = "%1$d tasks listed!";
     public static final String MESSAGE_INVALID_LIST_COMMAND = "Invalid list command!";
     public static final String MESSAGE_INVALID_FLOATING_TO_EVENT_TASK =
-            "Invalid Edit Command. Edit Command Parameters missing/invalid.";
+            "Invalid Edit Command. Edit Command Parameters missing/invalid.\n"
+            + "Check your input and make sure the start date time is before the end date time. ";
 
 }
diff --git a/src/test/java/seedu/whatsnext/logic/commands/EditCommandTest.java b/src/test/java/seedu/whatsnext/logic/commands/EditCommandTest.java
@@ -20,6 +20,7 @@
 import static seedu.whatsnext.testutil.TypicalTasks.INDEX_SECOND_TASK;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -173,6 +174,30 @@ public void execute_editEventDateTimeUnfilteredList_success() throws Exception {
         CommandTestUtil.assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
     }
 
+    @Test
+    public void execute_editEventDateTimeFilteredList_success() throws Exception {
+        showFirstTaskOnly();
+
+        final String validOverlapStartDateTime = "22 Dec 10am";
+        final String validOverlapEndDateTime = "24 Dec 12pm";
+        BasicTask editedTask = new TaskBuilder().withName(VALID_NAME_PROJECTMEETING)
+                .withStartDateTime(validOverlapStartDateTime)
+                .withEndDateTime(validOverlapEndDateTime)
+                .withTags(VALID_TAG_HIGH, VALID_TAG_OVERLAP)
+                .withDescription(VALID_DESCRIPTION_PROJECTMEETING).build();
+        EditTaskDescriptor descriptor = new EditTaskDescriptorBuilder(editedTask).withNewTags(VALID_TAG_HIGH)
+                .withRemoveTags(VALID_TAG_CS2103).build();
+        EditCommand editCommand = prepareCommand(INDEX_FIRST_TASK, descriptor);
+
+        String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_TASK_SUCCESS, editedTask);
+
+        Model expectedModel = new ModelManager(new TaskManager(model.getTaskManager()), new UserPrefs());
+        expectedModel.updateTask(model.getFilteredTaskList().get(0), editedTask);
+        showNoTask(expectedModel);
+
+        CommandTestUtil.assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
+    }
+
     //@@author A0156106M
     @Test
     public void execute_duplicateTaskUnfilteredList_failure() throws Exception {
@@ -276,4 +301,11 @@ private void showFirstTaskOnly(Model model) {
 
         assertTrue(model.getFilteredTaskList().size() == 1);
     }
+
+    private void showNoTask(Model model) {
+        model.updateFilteredTaskList(Collections.emptySet());
+
+        assert model.getFilteredTaskList().isEmpty();
+    }
+
 }