Merge 8df3372 into 9e21f56

src/main/java/seedu/todo/controllers/HelpController.java

@@ -37,7 +37,7 @@ public void process(String input) {
         UiManager.updateConsoleMessage(MESSAGE_HELP_SUCCESS);
     }
 
-    private CommandDefinition[] getAllCommandDefinitions() {
+    public CommandDefinition[] getAllCommandDefinitions() {
         return new CommandDefinition[] { new HelpController().getCommandDefinition(),
                                          new AddController().getCommandDefinition(),
                                          new ListController().getCommandDefinition(),

src/main/resources/ui/components/HelpCommandItem.fxml

@@ -5,7 +5,7 @@
 <?import javafx.scene.text.Text?>
 
 <!-- @@author A0139812A -->
-<VBox maxHeight="Infinity" maxWidth="Infinity" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seedu.todo.ui.components.HelpCommandItem">
+<VBox fx:id="helpCommandItem" maxHeight="Infinity" maxWidth="Infinity" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seedu.todo.ui.components.HelpCommandItem">
   <children>
     <Text fx:id="commandNameText" styleClass="font-300, commandtext-name">
       <VBox.margin>

src/test/java/seedu/todo/guitests/GuiTest.java

@@ -22,6 +22,7 @@
 import seedu.todo.commons.util.DateUtil;
 import seedu.todo.guitests.guihandles.AliasViewHandle;
 import seedu.todo.guitests.guihandles.ConsoleHandle;
+import seedu.todo.guitests.guihandles.HelpViewHandle;
 import seedu.todo.guitests.guihandles.MainGuiHandle;
 import seedu.todo.guitests.guihandles.TaskListDateItemHandle;
 import seedu.todo.guitests.guihandles.TaskListEventItemHandle;
@@ -45,6 +46,7 @@ public abstract class GuiTest {
     protected ConsoleHandle console;
     protected TaskListHandle taskList;
     protected AliasViewHandle aliasView;
+    protected HelpViewHandle helpView;
 
     private Stage stage;
 
@@ -65,6 +67,7 @@ public void setup() throws Exception {
             console = mainGui.getConsole();
             taskList = mainGui.getTaskList();
             aliasView = mainGui.getAliasView();
+            helpView = mainGui.getHelpView();
             // TODO: create handles for other components
             this.stage = stage;
         });

src/test/java/seedu/todo/guitests/HelpCommandTest.java

@@ -0,0 +1,37 @@
+package seedu.todo.guitests;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import seedu.todo.controllers.CommandDefinition;
+import seedu.todo.controllers.HelpController;
+import seedu.todo.guitests.guihandles.HelpItemHandle;
+
+public class HelpCommandTest extends GuiTest {
+
+    @Test
+    public void help_show_success() {
+        console.runCommand("help");
+        assertTrue(helpView.hasLoaded());
+
+        // Make sure all command items have loaded
+        for (CommandDefinition commandDefinition : new HelpController().getAllCommandDefinitions()) {
+            HelpItemHandle helpItem = helpView.getHelpItem(commandDefinition);
+            assertNotNull(helpItem);
+        }
+    }
+
+    @Test
+    public void help_extraArguments_noDifference() {
+        console.runCommand("help me i'm drowning");
+        assertTrue(helpView.hasLoaded());
+
+        // Make sure all command items have loaded
+        for (CommandDefinition commandDefinition : new HelpController().getAllCommandDefinitions()) {
+            HelpItemHandle helpItem = helpView.getHelpItem(commandDefinition);
+            assertNotNull(helpItem);
+        }
+    }
+
+}

src/test/java/seedu/todo/guitests/guihandles/HelpItemHandle.java

@@ -0,0 +1,38 @@
+package seedu.todo.guitests.guihandles;
+
+import javafx.scene.Node;
+import javafx.stage.Stage;
+import seedu.todo.controllers.CommandDefinition;
+import seedu.todo.guitests.GuiRobot;
+
+public class HelpItemHandle extends GuiHandle {
+
+    private static final String COMMAND_NAME_TEXT_ID = "#commandNameText";
+    private static final String COMMAND_SYNTAX_TEXT_ID = "#commandSyntaxText";
+    private static final String COMMAND_DESC_TEXT_ID = "#commandDescriptionText";
+    private Node node;
+
+    public HelpItemHandle(GuiRobot guiRobot, Stage primaryStage, Node node){
+        super(guiRobot, primaryStage, null);
+        this.node = node;
+    }
+
+    public String getCommandName() {
+        return getStringFromText(COMMAND_NAME_TEXT_ID, node);
+    }
+
+    public String getCommandSyntax() {
+        return getStringFromText(COMMAND_SYNTAX_TEXT_ID, node);
+    }
+
+    public String getCommandDescription() {
+        return getStringFromText(COMMAND_DESC_TEXT_ID, node);
+    }
+
+    public boolean isEqualsTo(CommandDefinition commandDefinition) {
+        return getCommandName().equals(commandDefinition.getCommandName()) 
+                && getCommandSyntax().equals(commandDefinition.getCommandSyntax()) 
+                && getCommandDescription().equals(commandDefinition.getCommandDescription());
+    }
+
+}

src/test/java/seedu/todo/guitests/guihandles/HelpViewHandle.java

@@ -0,0 +1,38 @@
+package seedu.todo.guitests.guihandles;
+
+import java.util.Optional;
+
+import javafx.scene.Node;
+import javafx.stage.Stage;
+import seedu.todo.controllers.CommandDefinition;
+import seedu.todo.guitests.GuiRobot;
+
+//@@author A0139812A
+public class HelpViewHandle extends GuiHandle {
+
+    private static final String HELPVIEW_PLACEHOLDER_ID = "#helpCommandsPlaceholder";
+    private static final String HELP_ITEM_ID = "#helpCommandItem";
+
+    public HelpViewHandle(GuiRobot guiRobot, Stage primaryStage, String stageTitle) {
+        super(guiRobot, primaryStage, stageTitle);
+    }
+
+    /**
+     * Checks for the existence of a child element to determine if the view has loaded correctly.
+     */
+    public boolean hasLoaded() {
+        return guiRobot.lookup(HELPVIEW_PLACEHOLDER_ID).queryAll().size() > 0;
+    }
+
+    public HelpItemHandle getHelpItem(CommandDefinition commandDefinition) {
+        Optional<Node> itemNode = guiRobot.lookup(HELP_ITEM_ID).queryAll().stream()
+                .filter(node -> new HelpItemHandle(guiRobot, primaryStage, node).isEqualsTo(commandDefinition))
+                .findFirst();
+
+        if (itemNode.isPresent()) {
+            return new HelpItemHandle(guiRobot, primaryStage, itemNode.get());
+        } else {
+            return null;
+        }
+    }
+}

src/test/java/seedu/todo/guitests/guihandles/MainGuiHandle.java

@@ -19,6 +19,10 @@ public AliasViewHandle getAliasView() {
         return new AliasViewHandle(guiRobot, primaryStage, TestApp.APP_TITLE);
     }
 
+    public HelpViewHandle getHelpView() {
+        return new HelpViewHandle(guiRobot, primaryStage, TestApp.APP_TITLE);
+    }
+
     public TaskListHandle getTaskList() {
         return new TaskListHandle(guiRobot, primaryStage, TestApp.APP_TITLE);
     }