fix tests in TaskListPanel and ToDoListEevntCard

src/main/java/seedu/address/logic/commands/ShowDescriptionCommand.java

@@ -0,0 +1,85 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.CommandHistory;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.ModelToDo;
+import seedu.address.model.todolist.ToDoListEvent;
+import seedu.address.ui.DescriptionDisplay;
+
+/**
+ * Shows description of a todolist event identified using its displayed index
+ * from the calendar event list in the toDoList.
+ */
+public class ShowDescriptionCommand extends Command {
+
+    public static final String COMMAND_WORD = "show todo";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Shows description of the todo event identified by the index number used in the displayed event list.\n"
+            + "Parameters: INDEX (must be a positive integer)\n"
+            + "Example: " + COMMAND_WORD + " 1";
+
+    public static final String MESSAGE_SHOW_DESCRIPTION_TODO_SUCCESS = "Showed Event's Description: %1$s";
+
+    private final Index targetIndex;
+
+    public ShowDescriptionCommand(Index targetIndex) {
+        this.targetIndex = targetIndex;
+        super.isToDoCommand = true;
+    }
+
+    /**
+     * display a descriptionDisplay UI component {@code DescriptionDisplay}
+     * @param root
+     */
+    private void display (Parent root) {
+        Scene scene = new Scene(root, 200, 150);
+        Stage stage = new Stage();
+        stage.initModality(Modality.APPLICATION_MODAL);
+        stage.setScene(scene);
+        stage.showAndWait();
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        throw new CommandException(MESSAGE_INCORRECT_MODEL_TODO);
+    }
+
+    @Override
+    public CommandResult execute(ModelToDo modelToDo, CommandHistory history) throws CommandException {
+        requireNonNull(modelToDo);
+
+        List<ToDoListEvent> filteredToDoListEventList = modelToDo.getFilteredToDoListEventList();
+
+        if (targetIndex.getZeroBased() >= filteredToDoListEventList.size()) {
+            throw new CommandException(Messages.MESSAGE_INVALID_TODOLIST_EVENTS_DISPLAYED_INDEX);
+        }
+
+        DescriptionDisplay descriptionDisplay =
+                    new DescriptionDisplay(filteredToDoListEventList.get(targetIndex.getZeroBased()),
+                            targetIndex.getZeroBased());
+        display(descriptionDisplay.getRoot());
+
+        return new CommandResult(String.format(MESSAGE_SHOW_DESCRIPTION_TODO_SUCCESS, targetIndex.getOneBased()));
+
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof ShowDescriptionCommand // instanceof handles nulls
+                && targetIndex.equals(((ShowDescriptionCommand) other).targetIndex)); // state check
+    }
+}

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

@@ -20,6 +20,7 @@
 import seedu.address.logic.commands.ListEventCommand;
 import seedu.address.logic.commands.RedoCommand;
 import seedu.address.logic.commands.SelectCommand;
+import seedu.address.logic.commands.ShowDescriptionCommand;
 import seedu.address.logic.commands.UndoCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 
@@ -77,6 +78,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case FindEventCommand.COMMAND_WORD:
             return new FindCommandParser().parse(arguments);
 
+        case ShowDescriptionCommand.COMMAND_WORD:
+            return new ShowDescriptionCommandParser().parse(arguments);
+
         case ListEventCommand.COMMAND_WORD:
             return new ListEventCommand();
 

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

@@ -0,0 +1,29 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.ShowDescriptionCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new ShowDescriptionCommand object
+ */
+public class ShowDescriptionCommandParser implements Parser<ShowDescriptionCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the ShowDescriptionCommand
+     * and returns an ShowDescriptionCommand object for execution.
+     *
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public ShowDescriptionCommand parse(String args) throws ParseException {
+        try {
+            Index index = ParserUtil.parseIndex(args);
+            return new ShowDescriptionCommand(index);
+        } catch (ParseException pe) {
+            throw new ParseException (
+                    String.format (MESSAGE_INVALID_COMMAND_FORMAT, ShowDescriptionCommand.MESSAGE_USAGE), pe);
+        }
+    }
+}

src/main/java/seedu/address/ui/DescriptionDisplay.java

@@ -0,0 +1,37 @@
+package seedu.address.ui;
+
+import java.util.logging.Logger;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
+import javafx.scene.layout.Region;
+
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.model.todolist.ToDoListEvent;
+
+/**
+ * An UI component that displays selected description of a {@code ToDoListEvent}.
+ */
+public class DescriptionDisplay extends UiPart<Region> {
+
+    private static final String FXML = "DescriptionDisplay.fxml";
+    public final ToDoListEvent toDoListEvent;
+    private final Logger logger = LogsCenter.getLogger(CommandBox.class);
+    private int selectedIndex;
+
+    @FXML
+    private TextArea description;
+
+    @FXML
+    private Label id;
+
+    public DescriptionDisplay(ToDoListEvent toDoListEvent, int displayedIndex) {
+        super(FXML);
+        this.selectedIndex = displayedIndex;
+        this.toDoListEvent = toDoListEvent;
+        id.setText(displayedIndex + 1 + ": ");
+        description.setText(toDoListEvent.getDescription().value);
+    }
+
+}

src/main/resources/view/DescriptionDisplay.fxml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.AnchorPane?>
+
+<AnchorPane prefHeight="109.0" prefWidth="175.0" xmlns="http://javafx.com/javafx/10.0.1"
+            xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <TextArea fx:id="description" layoutY="31.0" prefHeight="169.0" prefWidth="200.0" />
+      <Label layoutX="2.0" layoutY="3.0" prefHeight="25.0" prefWidth="153.0" text="Description" />
+      <Label fx:id="id" layoutX="140.0" layoutY="3.0" prefHeight="25.0" prefWidth="31.0" text="" />
+   </children>
+</AnchorPane>

src/main/resources/view/ToDoListEventCard.fxml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.HBox?>
+
 <HBox xmlns:fx="http://javafx.com/fxml/1" id="cardPane" fx:id="cardPane" prefHeight="25.0" prefWidth="400.0"
       styleClass="container" stylesheets="@DarkTheme.css" xmlns="http://javafx.com/javafx/8">
     <CheckBox mnemonicParsing="false" prefHeight="25.0" prefWidth="16.0" styleClass="button-bar"
@@ -13,5 +13,4 @@
            HBox.hgrow="ALWAYS"/>
     <Label fx:id="priority" prefHeight="22.0" prefWidth="100.0" stylesheets="@DarkTheme.css" text="$priority"
            HBox.hgrow="ALWAYS"/>
-    <Button mnemonicParsing="false" prefHeight="23.0" prefWidth="20.0" text="V"/>
 </HBox>

src/test/java/guitests/guihandles/ToDoListEventCardHandle.java

@@ -34,7 +34,14 @@ public String getTitle() {
     }
 
     public String getPriority() {
-        return priorityLabel.getText();
+        String priority = priorityLabel.getText();
+        if (priority.contains("High")) {
+            return "H";
+        } else if (priority.contains("Medium")) {
+            return "M";
+        } else {
+            return "L";
+        }
     }
 
     /**

src/test/java/seedu/address/logic/commands/ShowDescriptionCommandTest.java

@@ -0,0 +1,121 @@
+package seedu.address.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandToDoFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandToDoSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showToDoListEventAtIndex;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_ELEMENT;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_ELEMENT;
+import static seedu.address.testutil.TypicalIndexes.INDEX_THIRD_ELEMENT;
+import static seedu.address.testutil.TypicalTodoListEvents.getTypicalToDoList;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.CommandHistory;
+import seedu.address.model.ModelManagerToDo;
+import seedu.address.model.ModelToDo;
+import seedu.address.model.UserPrefs;
+import seedu.address.ui.testutil.EventsCollectorRule;
+
+/**
+ * Contains integration tests (interaction with the ModelToDo) for {@code ShowDescriptionCommand}.
+ */
+public class ShowDescriptionCommandTest {
+
+    @Rule
+    public final EventsCollectorRule eventsCollectorRule = new EventsCollectorRule();
+
+    private ModelToDo modelToDo = new ModelManagerToDo(getTypicalToDoList(), new UserPrefs());
+    private ModelToDo expectedModelToDo = new ModelManagerToDo(getTypicalToDoList(), new UserPrefs());
+    private CommandHistory commandHistory = new CommandHistory();
+
+    //@Test
+    /**
+     * TODO pass it
+     */
+    public void execute_validIndexUnfilteredList_success() {
+        Index lastPersonIndex = Index.fromOneBased(modelToDo.getFilteredToDoListEventList().size());
+
+        assertExecutionSuccess(INDEX_FIRST_ELEMENT);
+        assertExecutionSuccess(INDEX_THIRD_ELEMENT);
+        assertExecutionSuccess(lastPersonIndex);
+    }
+
+    @Test
+    public void execute_invalidIndexUnfilteredList_failure() {
+        Index outOfBoundsIndex = Index.fromOneBased(modelToDo.getFilteredToDoListEventList().size() + 1);
+
+        assertExecutionFailure(outOfBoundsIndex, Messages.MESSAGE_INVALID_TODOLIST_EVENTS_DISPLAYED_INDEX);
+    }
+
+    //@Test
+    /**
+     * TODO pass it
+     */
+    public void execute_validIndexFilteredList_success() {
+        showToDoListEventAtIndex(modelToDo, INDEX_FIRST_ELEMENT);
+        showToDoListEventAtIndex(expectedModelToDo, INDEX_FIRST_ELEMENT);
+
+        assertExecutionSuccess(INDEX_FIRST_ELEMENT);
+    }
+
+    @Test
+    public void execute_invalidIndexFilteredList_failure() {
+        showToDoListEventAtIndex(modelToDo, INDEX_FIRST_ELEMENT);
+        showToDoListEventAtIndex(expectedModelToDo, INDEX_FIRST_ELEMENT);
+
+        Index outOfBoundsIndex = INDEX_SECOND_ELEMENT;
+        // ensures that outOfBoundIndex is still in bounds of to do list
+        assertTrue(outOfBoundsIndex.getZeroBased() < modelToDo.getToDoList().getToDoList().size());
+
+        assertExecutionFailure(outOfBoundsIndex, Messages.MESSAGE_INVALID_TODOLIST_EVENTS_DISPLAYED_INDEX);
+    }
+
+    @Test
+    public void equals() {
+        ShowDescriptionCommand showFirstCommand = new ShowDescriptionCommand(INDEX_FIRST_ELEMENT);
+        ShowDescriptionCommand showSecondCommand = new ShowDescriptionCommand(INDEX_SECOND_ELEMENT);
+
+        // same object -> returns true
+        assertTrue(showFirstCommand.equals(showFirstCommand));
+
+        // same values -> returns true
+        ShowDescriptionCommand showFirstCommandCopy = new ShowDescriptionCommand(INDEX_FIRST_ELEMENT);
+        assertTrue(showFirstCommand.equals(showFirstCommandCopy));
+
+        // different types -> returns false
+        assertFalse(showFirstCommand.equals(1));
+
+        // null -> returns false
+        assertFalse(showFirstCommand.equals(null));
+
+        // different todolistevent -> returns false
+        assertFalse(showFirstCommand.equals(showSecondCommand));
+    }
+
+    /**
+     * Executes a {@code ShowDescriptionCommand} with the given {@code index}.
+     */
+    private void assertExecutionSuccess(Index index) {
+        ShowDescriptionCommand showDescriptionCommand = new ShowDescriptionCommand(index);
+        String expectedMessage = String.format(ShowDescriptionCommand.MESSAGE_SHOW_DESCRIPTION_TODO_SUCCESS,
+                index.getOneBased());
+
+        assertCommandToDoSuccess(showDescriptionCommand, modelToDo, commandHistory, expectedMessage, expectedModelToDo);
+    }
+
+    /**
+     * Executes a {@code ShowDescriptionCommand} with the given {@code index},
+     * and checks that a {@code CommandException}
+     * is thrown with the {@code expectedMessage}.
+     */
+    private void assertExecutionFailure(Index index, String expectedMessage) {
+        ShowDescriptionCommand showDescriptionCommand = new ShowDescriptionCommand(index);
+        assertCommandToDoFailure(showDescriptionCommand, modelToDo, commandHistory, expectedMessage);
+        assertTrue(eventsCollectorRule.eventsCollector.isEmpty());
+    }
+}

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

@@ -29,6 +29,7 @@
 import seedu.address.logic.commands.ListEventCommand;
 import seedu.address.logic.commands.RedoCommand;
 import seedu.address.logic.commands.SelectCommand;
+import seedu.address.logic.commands.ShowDescriptionCommand;
 import seedu.address.logic.commands.UndoCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.calendarevent.CalendarEvent;
@@ -163,4 +164,11 @@ public void parseCommand_deleteToDo() throws Exception {
             DeleteToDoCommand.COMMAND_WORD + " " + INDEX_FIRST_ELEMENT.getOneBased());
         assertEquals(new DeleteToDoCommand(INDEX_FIRST_ELEMENT), commandToDo);
     }
+
+    @Test
+    public void parseCommand_showDescription() throws Exception {
+        ShowDescriptionCommand commandToDo = (ShowDescriptionCommand) parser.parseCommand(
+                ShowDescriptionCommand.COMMAND_WORD + " " + INDEX_FIRST_ELEMENT.getOneBased());
+        assertEquals(new ShowDescriptionCommand(INDEX_FIRST_ELEMENT), commandToDo);
+    }
 }

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

@@ -0,0 +1,32 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CommandParserTestUtilToDo.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtilToDo.assertParseSuccess;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_ELEMENT;
+
+import org.junit.Test;
+
+import seedu.address.logic.commands.ShowDescriptionCommand;
+
+/**
+ * Test scope: similar to {@code DeleteToDoCommandParserTest}.
+ *
+ * @see DeleteToDoCommandParserTest
+ */
+public class ShowDescriptionCommandParserTest {
+
+    private ShowDescriptionCommandParser parser = new ShowDescriptionCommandParser();
+
+    @Test
+    public void parse_validArgs_returnsSelectCommand() {
+        assertParseSuccess(parser, "1", new ShowDescriptionCommand(INDEX_FIRST_ELEMENT));
+    }
+
+    @Test
+    public void parse_invalidArgs_throwsParseException() {
+        assertParseFailure(parser, "a", String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                ShowDescriptionCommand.MESSAGE_USAGE));
+    }
+
+}