add more test cases to refresh command test

CS2103AUG2016-F10-C4 · Nov 6, 2016 · 7a7130f · 7a7130f
1 parent d0c4658
commit 7a7130f
Show file tree

Hide file tree

Showing 4 changed files with 151 additions and 78 deletions.
diff --git a/src/main/java/seedu/address/model/task/Task.java b/src/main/java/seedu/address/model/task/Task.java
@@ -32,9 +32,9 @@
 
 public class Task implements ReadOnlyTask {
 
-    private static final int DAYS_OF_MONTH = 28;
-    private static final int DAYS_OF_WEEK = 7;
-    private static final int RECURRING_UPDATE_THRESHOLD = 1;
+    public static final int DAYS_OF_MONTH = 28;
+    public static final int DAYS_OF_WEEK = 7;
+    public static final int RECURRING_UPDATE_THRESHOLD = 1;
     private Name name;
     private Date date;
     private Recurring recurring;

diff --git a/src/test/java/guitests/RefreshCommandTest.java b/src/test/java/guitests/RefreshCommandTest.java
@@ -17,38 +17,63 @@
  */
 public class RefreshCommandTest extends TaskManagerGuiTest {
 
-    //-------------------------------------valid cases----------------------------------------
-
-    //test for valid cases
-
+    // -------------------------------------valid
+    // cases----------------------------------------
+
+    // test for valid cases
     @Test
     public void refreshAllTasksAndEvents_successful() {
-        
+
         TestTask[] currentList = td.getTypicalTasks();
         // refresh all non-recurring tasks
         assertRefreshResult("refresh", td.friend, td.friendEvent, td.lunch, td.book, td.work, td.movie, td.meeting,
                 td.travel);
         assertResultMessage(String.format(RefreshCommand.MESSAGE_SUCCESS));
 
-        // refresh all tasks including one recurring tasks
+    }
+
+    // refresh all tasks including one recurring event (recurring weekly)
+    @Test
+    public void refresh_RecurringDeadlineTaskWeekly_successful() {
         TestTask taskToAdd = td.lecture;
         commandBox.runCommand(taskToAdd.getAddCommand());
 
         assertRefreshResult("refresh", td.friend, td.friendEvent, td.lunch, td.book, td.work, td.movie, td.meeting,
                 td.travel, td.lectureVerifier);
         assertResultMessage(String.format(RefreshCommand.MESSAGE_SUCCESS));
+    }
+
+    // refresh all tasks including one recurring deadlineTask (recurring daily)
+    @Test
+    public void refresh_RecurringEventDaily_successful() {
+        TestTask taskToAdd = td.swimming;
+        commandBox.runCommand(taskToAdd.getAddCommand());
+
+        assertRefreshResult("refresh", td.friend, td.friendEvent, td.lunch, td.book, td.work, td.movie, td.meeting,
+                td.travel, td.swimmingVerifier);
+        assertResultMessage(String.format(RefreshCommand.MESSAGE_SUCCESS));
+    }
+
+    // refresh all tasks including one recurring deadlineTask (recurring monthly)
+    @Test
+    public void refresh_RecurringDeadlineTaskMonthly_successful() {
+        TestTask taskToAdd = td.teaching;
+        commandBox.runCommand(taskToAdd.getAddCommand());
 
+        assertRefreshResult("refresh", td.friend, td.friendEvent, td.lunch, td.book, td.work, td.movie, td.meeting,
+                td.travel, td.teachingVerifier);
+        assertResultMessage(String.format(RefreshCommand.MESSAGE_SUCCESS));
     }
-    
-    //-----------------------------------invalid cases-------------------------------------
-    
-    //test for invalid command
-    
+
+    // -------------------------------invalid cases----------------------------------
+
+    // test for invalid command
+
     @Test
-    public void refreshInvalidCommand_fail(){
+    public void refreshInvalidCommand_fail() {
         commandBox.runCommand("refreshes");
         assertResultMessage(Messages.MESSAGE_UNKNOWN_COMMAND);
-        
+
     }
 
     private void assertRefreshResult(String command, TestTask... expectedHits) {