From 3023cde6c3f53127b7c9c5e041e0264ea2b7704e Mon Sep 17 00:00:00 2001 From: Xien Dong Date: Sun, 6 Nov 2016 18:17:42 +0800 Subject: [PATCH] Add test to check for ongoing events --- .../guihandles/TaskCardViewHandle.java | 19 +++++++++++++++++++ .../java/seedu/todo/testutil/TimeUtil.java | 10 ++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/test/java/guitests/guihandles/TaskCardViewHandle.java b/src/test/java/guitests/guihandles/TaskCardViewHandle.java index 3c59b242b549..ef31235858d3 100644 --- a/src/test/java/guitests/guihandles/TaskCardViewHandle.java +++ b/src/test/java/guitests/guihandles/TaskCardViewHandle.java @@ -124,6 +124,10 @@ public boolean isOverdueStyleApplied() { return UiTestUtil.containsStyleClass(rootNode, "overdue"); } + public boolean isOngoingStyleApplied() { + return UiTestUtil.containsStyleClass(rootNode, "ongoing"); + } + public boolean isTaskCardCollapsed() { return UiTestUtil.containsStyleClass(rootNode, "collapsed"); } @@ -159,6 +163,7 @@ public boolean isDisplayedCorrectly(int displayedIndex, ImmutableTask task) { assertTrue(isTypeDisplayCorrect(task)); assertTrue(isPinDisplayCorrect(task)); assertTrue(isOverdueDisplayCorrect(task)); + assertTrue(isOngoingDisplayCorrect(task)); return true; } @@ -250,6 +255,20 @@ private boolean isOverdueDisplayCorrect(ImmutableTask task) { return expected == actual; } + private boolean isOngoingDisplayCorrect(ImmutableTask task) { + java.util.Optional startTime = task.getStartTime(); + java.util.Optional endTime = task.getEndTime(); + boolean actual = isOngoingStyleApplied(); + boolean expected; + + if (startTime.isPresent() && endTime.isPresent()) { + expected = seedu.todo.testutil.TimeUtil.isOngoing(startTime.get(), endTime.get()); + } else { + expected = false; + } + return expected == actual; + } + private boolean isTypeDisplayCorrect(ImmutableTask task) { String actual = getDisplayedTypeLabel(); String expected; diff --git a/src/test/java/seedu/todo/testutil/TimeUtil.java b/src/test/java/seedu/todo/testutil/TimeUtil.java index 86f8363c7690..3d921e23faa2 100644 --- a/src/test/java/seedu/todo/testutil/TimeUtil.java +++ b/src/test/java/seedu/todo/testutil/TimeUtil.java @@ -29,6 +29,16 @@ public static boolean isOverdue(LocalDateTime dueTime) { return dueTime.isBefore(LocalDateTime.now()); } + /** + * Checks against system time if the provided time period is ongoing. + * @param startTime start time of the event + * @param endTime end time of the event + * @return Returns true if the provided time period surrounds the current time. + */ + public static boolean isOngoing(LocalDateTime startTime, LocalDateTime endTime) { + return startTime.isBefore(LocalDateTime.now()) && endTime.isAfter(LocalDateTime.now()); + } + /** * Gets the complete date time text in the following format: * 12 August 2015, 12:34 PM