Merge pull request #137 from CS2103AUG2016-W10-C2/gui-tests

Gui tests
CS2103AUG2016-W10-C2 · Nov 1, 2016 · 72bc2f4 · 72bc2f4
2 parents f30c16f + 137ad05
commit 72bc2f4
Show file tree

Hide file tree

Showing 26 changed files with 522 additions and 311 deletions.
diff --git a/src/main/java/seedu/address/commons/events/ui/JumpToListRequestEvent.java b/src/main/java/seedu/address/commons/events/ui/JumpToListRequestEvent.java
diff --git a/src/main/java/seedu/address/model/task/Entry.java b/src/main/java/seedu/address/model/task/Entry.java
@@ -157,7 +157,7 @@ public final String markString() {
 
     //@@author A0116603R
     /**
-     * Formats the Entry as text, showing all contact details.
+     * Formats the Entry as text, showing all task details.
      */
     public String getAsText() {
         final StringBuilder builder = new StringBuilder();

diff --git a/src/main/java/seedu/address/ui/util/GuiUtil.java b/src/main/java/seedu/address/ui/util/GuiUtil.java
@@ -1,5 +1,6 @@
 package seedu.address.ui.util;
 
+import com.google.common.annotations.VisibleForTesting;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import seedu.address.commons.core.EventsCenter;
@@ -29,9 +30,10 @@ public class GuiUtil {
 
     public static final String EVENT_DESCRIPTION_STYLE_CLASS = "event";
 
-    private static String PAST_STYLE_CLASS = "past";
-    private static String ACTIVE_STYLE_CLASS = "present";
-    private static String OVERDUE_STYLE_CLASS = "overdue";
+    @VisibleForTesting
+    public static String PAST_STYLE_CLASS = "past";
+    public static String ACTIVE_STYLE_CLASS = "present";
+    public static String OVERDUE_STYLE_CLASS = "overdue";
 
     public static ChangeListener<Boolean> getCheckBoxEventListener(int idx) {
         return (ov, old_val, new_val) -> EventsCenter.getInstance().post(new MarkTaskEvent(idx, new_val));

diff --git a/src/test/java/guitests/AddCommandTest.java b/src/test/java/guitests/AddCommandTest.java
@@ -8,49 +8,53 @@
 import seedu.address.model.task.Entry;
 import seedu.address.model.task.EntryViewComparator;
 import seedu.address.commons.core.Messages;
+import seedu.address.logic.commands.ClearCommand;
 import seedu.address.testutil.TestEntry;
 import seedu.address.testutil.TestUtil;
 
 import static org.junit.Assert.assertTrue;
 
-public class AddCommandTest extends AddressBookGuiTest {
+public class AddCommandTest extends TaskManagerGuiTest {
 
+    //@@author A0116603R-reused
     @Test
     public void add() {
-        //add one task
-        TestEntry[] currentList = td.getTypicalSortedPersons();
-        TestEntry testEntry = td.homework;
-        assertAddSuccess(testEntry, currentList);
-        currentList = TestUtil.addPersonsToSortedList(currentList, testEntry);
+        TestEntry[] currentList = td.getTypicalSortedPersons(); // sample entries already present
+        TestEntry testEntry;
 
-        //add another task
-        testEntry = td.movie;
-        assertAddSuccess(testEntry, currentList);
-        currentList = TestUtil.addPersonsToSortedList(currentList, testEntry);
+        //add new entries
+        for (TestEntry entry : td.getNonSampleEntries()) {
+            testEntry = entry;
+            assertAddSuccess(testEntry, currentList);
+            currentList = TestUtil.addPersonsToList(currentList, testEntry);
+        }
+
+        assertTrue(currentList.length > 0);
 
         //add duplicate task
-        commandBox.runCommand(td.homework.getAddCommand());
+        commandBox.runCommand(currentList[0].getAddCommand());
         assertResultMessage(AddCommand.MESSAGE_DUPLICATE_ENTRY);
         assertTrue(taskList.isListMatching(currentList));
 
         //add to empty list
-        commandBox.runCommand("clear");
-        assertAddSuccess(td.apple);
+        commandBox.runCommand(ClearCommand.COMMAND_WORD);
+        assertAddSuccess(currentList[0]);
 
         //invalid command
         commandBox.runCommand("adds Johnny");
         assertResultMessage(Messages.MESSAGE_UNKNOWN_COMMAND);
 
     }
 
+    //@@author
     private void assertAddSuccess(TestEntry testEntry, TestEntry... currentList) {
         commandBox.runCommand(testEntry.getAddCommand());
 
         //confirm the new card contains the right data
-        TaskCardHandle addedCard = taskList.navigateToPerson(testEntry.getTitle().fullTitle);
+        TaskCardHandle addedCard = taskList.navigateToEntry(testEntry.getTitle().fullTitle);
         assertMatching(testEntry, addedCard);
 
-        Entry entry = taskList.getPerson(taskList.getPersonIndex(testEntry));
+        Entry entry = taskList.getEntry(taskList.getTaskIndex(testEntry));
         testEntry.setLastModifiedTime(entry.getLastModifiedTime());
 
         //confirm the list now contains all previous persons plus the new task

diff --git a/src/test/java/guitests/ClearCommandTest.java b/src/test/java/guitests/ClearCommandTest.java
@@ -1,31 +1,35 @@
 package guitests;
 
 import org.junit.Test;
+import seedu.address.logic.commands.ClearCommand;
+import seedu.address.logic.commands.DeleteCommand;
+import seedu.address.testutil.TestEntry;
+import seedu.address.testutil.TypicalTestTasks;
 
 import static org.junit.Assert.assertTrue;
 
-public class ClearCommandTest extends AddressBookGuiTest {
+public class ClearCommandTest extends TaskManagerGuiTest {
 
     @Test
     public void clear() {
-
         //verify a non-empty list can be cleared
         assertTrue(taskList.isListMatching(td.getTypicalSortedPersons()));
         assertClearCommandSuccess();
 
         //verify other commands can work after a clear command
-        commandBox.runCommand(td.homework.getAddCommand());
-        assertTrue(taskList.isListMatching(td.homework));
-        commandBox.runCommand("delete 1");
+        TestEntry testEntry = td.getTestEntry(TypicalTestTasks.BuyTasks.TASK_1);
+        commandBox.runCommand(testEntry.getAddCommand());
+        assertTrue(taskList.isListMatching(testEntry));
+        commandBox.runCommand(DeleteCommand.COMMAND_WORD + " 1");
         assertListSize(0);
 
         //verify clear command works when the list is empty
         assertClearCommandSuccess();
     }
 
     private void assertClearCommandSuccess() {
-        commandBox.runCommand("clear");
+        commandBox.runCommand(ClearCommand.COMMAND_WORD);
         assertListSize(0);
-        assertResultMessage("Todo list has been cleared!");
+        assertResultMessage(ClearCommand.MESSAGE_SUCCESS);
     }
 }
diff --git a/src/test/java/guitests/CommandBoxTest.java b/src/test/java/guitests/CommandBoxTest.java
@@ -1,15 +1,18 @@
 package guitests;
 
 import org.junit.Test;
+import seedu.address.testutil.TestEntry;
+import seedu.address.testutil.TypicalTestTasks;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class CommandBoxTest extends AddressBookGuiTest {
+public class CommandBoxTest extends TaskManagerGuiTest {
 
     @Test
     public void commandBox_commandSucceeds_textCleared() {
-        commandBox.runCommand(td.banana.getAddCommand());
+        TestEntry testEntry = td.getTestEntry(TypicalTestTasks.BuyTasks.TASK_1);
+        commandBox.runCommand(testEntry.getAddCommand());
         assertEquals(commandBox.getCommandInput(), "");
     }
 
@@ -19,9 +22,10 @@ public void commandBox_commandFails_textStays(){
         assertEquals(commandBox.getCommandInput(), "invalid command text remains");
     }
 
+    //@@author A0116603R
     @Test
     public void commandBox_commandFails_redBorder() {
-        commandBox.runCommand("invalid command produces red glow");
+        commandBox.runCommand("invalid command produces error styling");
         assertTrue(commandBox.hasErrorClass());
     }
 

diff --git a/src/test/java/guitests/DeleteCommandTest.java b/src/test/java/guitests/DeleteCommandTest.java
@@ -8,7 +8,7 @@
 import static org.junit.Assert.assertTrue;
 import static seedu.address.logic.commands.DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS;
 
-public class DeleteCommandTest extends AddressBookGuiTest {
+public class DeleteCommandTest extends TaskManagerGuiTest {
 
     @Test
     public void delete() {

diff --git a/src/test/java/guitests/GuiUtilTest.java b/src/test/java/guitests/GuiUtilTest.java
@@ -0,0 +1,46 @@
+package guitests;
+
+import org.junit.Test;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+import static org.junit.Assert.assertEquals;
+import static seedu.address.ui.util.GuiUtil.*;
+
+//@@author A0116603R
+public class GuiUtilTest {
+
+    private LocalDateTime now = LocalDateTime.now();
+    private LocalDateTime midnight = LocalDateTime.of(now.toLocalDate().plusDays(1), LocalTime.MIDNIGHT);
+
+    @Test
+    public void taskStyling() {
+        assertEquals("Unmarked floating tasks have no styling", "", getTaskStyling(false));
+        assertEquals("Marked floating tasks have ." + PAST_STYLE_CLASS + " style class", PAST_STYLE_CLASS, getTaskStyling(true));
+    }
+
+    @Test
+    public void deadlineStyling_marked_havePastStyleRegardlessOfDeadline() {
+        String styleClass = getDeadlineStyling(true, now.minusWeeks(1));
+        assertEquals(PAST_STYLE_CLASS, styleClass);
+
+        styleClass = getDeadlineStyling(true, now.plusWeeks(1));
+        assertEquals(PAST_STYLE_CLASS, styleClass);
+    }
+
+    @Test
+    public void deadlineStyling_unmarked() {
+        assertEquals(OVERDUE_STYLE_CLASS, getDeadlineStyling(false, now.minusWeeks(1)));
+        assertEquals(ACTIVE_STYLE_CLASS, getDeadlineStyling(false, midnight.minusMinutes(1)));
+        assertEquals("", getDeadlineStyling(false, now.plusWeeks(1)));
+    }
+
+    @Test
+    public void eventStyling_past() {
+        assertEquals(PAST_STYLE_CLASS, getEventStyling(now.minusDays(5), now.minusDays(4)));
+        assertEquals(ACTIVE_STYLE_CLASS, getEventStyling(now.minusSeconds(1), now.plusHours(1)));
+        assertEquals("", getEventStyling(now.plusDays(1), now.plusDays(2)));
+    }
+
+}
diff --git a/src/test/java/guitests/HelpWindowTest.java b/src/test/java/guitests/HelpWindowTest.java
@@ -5,18 +5,25 @@
 
 import static org.junit.Assert.assertTrue;
 
-public class HelpWindowTest extends AddressBookGuiTest {
+public class HelpWindowTest extends TaskManagerGuiTest {
 
+    //@@author A0116603R
     @Test
-    public void openHelpWindow() {
-
+    public void openAndCloseHelpWindow() {
         HelpWindowHandle helpWindowHandle = commandBox.runHelpCommand();
         assertHelpWindowOpen(helpWindowHandle);
 
         helpWindowHandle.pressEscape();
+        assertHelpWindowClosed();
+    }
+
+    private void assertHelpWindowClosed() {
+        assertTrue(taskList.isVisible());
     }
 
+    // @@author
     private void assertHelpWindowOpen(HelpWindowHandle helpWindowHandle) {
-        assertTrue(helpWindowHandle.isWindowOpen());
+        assertTrue(helpWindowHandle.isVisible());
     }
+
 }
diff --git a/src/test/java/guitests/ListCommandTest.java b/src/test/java/guitests/ListCommandTest.java
@@ -4,28 +4,41 @@
 import java.util.Arrays;
 
 import seedu.address.commons.core.Messages;
+import seedu.address.logic.commands.ClearCommand;
+import seedu.address.logic.commands.DeleteCommand;
+import seedu.address.logic.commands.ListCommand;
 import seedu.address.model.task.EntryViewComparator;
 import seedu.address.testutil.TestEntry;
+import seedu.address.testutil.TestTasks;
+import seedu.address.testutil.TypicalTestTasks;
+
+import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
-public class ListCommandTest extends AddressBookGuiTest {
+public class ListCommandTest extends TaskManagerGuiTest {
 
+    //@@author A0116603R-reused
     @Test
     public void list_nonEmptyList() {
-        //TODO: Write better, less fragile tests
-        assertListResult("list nodoge"); //no results
-        assertListResult("list Buy", td.apple, td.banana, td.eggplant); //multiple results
+        // search miss
+        assertListResult(ListCommand.COMMAND_WORD + " 404 doge not found");
+
+        // search hits for BuyTasks
+        TestTasks generator = new TypicalTestTasks.BuyTasks();
+        assertListResult(ListCommand.COMMAND_WORD + " " + TypicalTestTasks.BuyTasks.VERB, generator.getSampleEntries());
 
-        //find after deleting one result
-        commandBox.runCommand("delete 1");
-        assertListResult("list doge",td.doge);
+        // search after deleting one result
+        commandBox.runCommand(DeleteCommand.COMMAND_WORD + " 1");
+        generator = new TypicalTestTasks.WatchTasks();
+        assertListResult(ListCommand.COMMAND_WORD + " " + TypicalTestTasks.WatchTasks.VERB, generator.getSampleEntries());
     }
 
     @Test
     public void list_emptyList(){
-        commandBox.runCommand("clear");
-        assertListResult("list doge"); //no results
+        // clear the list and assert search miss
+        commandBox.runCommand(ClearCommand.COMMAND_WORD);
+        assertListResult(ListCommand.COMMAND_WORD + " " + TypicalTestTasks.BuyTasks.VERB);
     }
 
     @Test
@@ -41,4 +54,10 @@ private void assertListResult(String command, TestEntry... expectedHits ) {
         assertResultMessage(expectedHits.length + " entries listed!");
         assertTrue(taskList.isListMatching(expectedHits));
     }
+
+    private void assertListResult(String command, List<TestEntry> expectedHits) {
+        TestEntry[] array = new TestEntry[expectedHits.size()];
+        expectedHits.toArray(array);
+        assertListResult(command, array);
+    }
 }