Skip to content

Commit

Permalink
Merge pull request nus-cs2103-AY1617S2#163 from joelleejh/v0.5
Browse files Browse the repository at this point in the history 
Update JUnit V0.5
  • Loading branch information
@joelleejh
joelleejh authored Apr 9, 2017
2 parents ce92908 + 88b9c20 commit fd241aa
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 19 deletions.
9 changes: 5 additions & 4 deletions src/main/java/seedu/taskmanager/model/Model.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ int deleteTasksName(UnmodifiableObservableList<ReadOnlyTask> targets, String toD
*/
void updateFilteredTaskList(Set<String> keywords);

// @@author A0141102H
/**
* Updates the filter of the filtered task list to filter by the given
* keywords and uncompleted tasks
*/
void updateFilteredTaskListForListCommand(Set<String> keywords, boolean isComplete);

// @@author A0139520L
Expand All @@ -99,8 +104,4 @@ int deleteTasksName(UnmodifiableObservableList<ReadOnlyTask> targets, String toD
int isBlockedOutTime(Task task) throws DuplicateTaskException;

int isBlockedOutTime(Task t, int UpdateTaskIndex) throws DuplicateTaskException;

// int addRecurringDeadlineTask(ReadOnlyTask taskToRecur, int recurring,
// String type) throws DuplicateTaskException;

}
31 changes: 30 additions & 1 deletion src/test/java/guitests/DeleteCommandTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@

import org.junit.Test;

import seedu.taskmanager.logic.commands.DeleteCommand;
import seedu.taskmanager.testutil.TestTask;
import seedu.taskmanager.testutil.TestUtil;

public class DeleteCommandTest extends TaskManagerGuiTest {

// @@author A0141102H
@Test
public void delete() {
public void deleteByIndex() {

// delete the first in the list
TestTask[] currentList = td.getTypicalTasks();
Expand All @@ -35,6 +36,34 @@ public void delete() {

}

@Test
public void deleteByWord() {
TestTask[] expectedList = td.getTypicalTasks();
commandBox.runCommand("DELETE Eat breakfast with mom");
expectedList = TestUtil.removeTaskFromList(expectedList, 1);
assertTrue(eventTaskListPanel.isListMatching(expectedList));
assertTrue(deadlineTaskListPanel.isListMatching(expectedList));
assertTrue(floatingTaskListPanel.isListMatching(expectedList));

// No task name exists
commandBox.runCommand("DELETE aosfasoif");
assertResultMessage(DeleteCommand.MESSAGE_INVALID_TASK_NAME);
}

@Test
public void deleteByDate() {
TestTask[] expectedList = td.getTypicalTasks();
commandBox.runCommand("DELETE 04/04/17");
expectedList = TestUtil.removeTaskFromList(expectedList, 4);
assertTrue(eventTaskListPanel.isListMatching(expectedList));
assertTrue(deadlineTaskListPanel.isListMatching(expectedList));
assertTrue(floatingTaskListPanel.isListMatching(expectedList));

// No task date exists
commandBox.runCommand("DELETE 09/09/99");
assertResultMessage(DeleteCommand.MESSAGE_INVALID_TASK_DATE);
}

/**
* Runs the delete command to delete the task at specified index and
* confirms the result is correct.
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/seedu/taskmanager/testutil/TestUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ private static Task[] getSampleTaskData() {
new Task(new TaskName("Eat dinner with my only 2 friends"), new StartDate("09/03/17"),
new StartTime("1800"), new EndDate("09/03/17"), new EndTime("2000"), Boolean.TRUE,
new UniqueCategoryList()),
new Task(new TaskName("Try harder for CS2103"), new StartDate("05/04/17"), new StartTime("1500"),
new EndDate("05/05/17"), new EndTime("1600"), Boolean.FALSE,
new UniqueCategoryList("work")),
new Task(new TaskName("Try even harder for CS2103 project"), new StartDate("04/04/17"),
new Task(new TaskName("Try harder for CS2103 project"), new StartDate("04/04/17"),
new StartTime("1400"), new EndDate("05/04/17"), new EndTime("1500"), Boolean.FALSE,
new UniqueCategoryList("lepak")),
new Task(new TaskName("Try even harder for CS2103"), new StartDate("05/04/17"), new StartTime("1500"),
new EndDate("05/05/17"), new EndTime("1600"), Boolean.FALSE,
new UniqueCategoryList("work")),
new Task(new TaskName("Eat lunch at techno"), new StartDate("EMPTY_FIELD"),
new StartTime("EMPTY_FIELD"), new EndDate("04/03/17"), new EndTime("1400"), Boolean.FALSE,
new UniqueCategoryList("no", "friends")),
Expand Down
20 changes: 10 additions & 10 deletions src/test/java/seedu/taskmanager/testutil/TypicalTestTasks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ public TypicalTestTasks() {
recurTestDay = new TaskBuilder().withTaskName("I'm recurring").withStartDate("03/03/17")
.withStartTime("1000").withEndDate("03/03/17").withEndTime("1100").withCompletion(false)
.withCategories("just", "friends").build();
recurTestDayOnce = new TaskBuilder().withTaskName("I'm recurring").withStartDate("04/03/17")
.withStartTime("1000").withEndDate("04/03/17").withEndTime("1100").withCompletion(false)
recurTestDayOnce = new TaskBuilder().withTaskName("I'm recurring").withStartDate("31/03/17")
.withStartTime("1000").withEndDate("31/03/17").withEndTime("1100").withCompletion(false)
.withCategories("just", "friends").build();
recurTestDayTwice = new TaskBuilder().withTaskName("I'm recurring").withStartDate("05/03/17")
.withStartTime("1000").withEndDate("05/03/17").withEndTime("1100").withCompletion(false)
recurTestDayTwice = new TaskBuilder().withTaskName("I'm recurring").withStartDate("01/04/17")
.withStartTime("1000").withEndDate("01/04/17").withEndTime("1100").withCompletion(false)
.withCategories("just", "friends").build();
recurTestDayThrice = new TaskBuilder().withTaskName("I'm recurring").withStartDate("06/03/17")
.withStartTime("1000").withEndDate("06/03/17").withEndTime("1100").withCompletion(false)
recurTestDayThrice = new TaskBuilder().withTaskName("I'm recurring").withStartDate("02/04/17")
.withStartTime("1000").withEndDate("06/04/17").withEndTime("1100").withCompletion(false)
.withCategories("just", "friends").build();
recurTestWeek = new TaskBuilder().withTaskName("I'm recurring").withStartDate("03/03/17")
.withStartTime("1000").withEndDate("03/03/17").withEndTime("1100").withCompletion(false)
Expand All @@ -140,16 +140,16 @@ public TypicalTestTasks() {
.withStartTime("1000").withEndDate("21/03/17").withEndTime("1100").withCompletion(false)
.withCategories("just", "friends").build();
recurTestMonth = new TaskBuilder().withTaskName("I'm recurring").withStartDate("EMPTY_FIELD")
.withStartTime("EMPTY_FIELD").withEndDate("03/03/17").withEndTime("1100").withCompletion(false)
.withStartTime("EMPTY_FIELD").withEndDate("03/11/17").withEndTime("1100").withCompletion(false)
.withCategories("just", "friends").build();
recurTestMonthOnce = new TaskBuilder().withTaskName("I'm recurring").withStartDate("EMPTY_FIELD")
.withStartTime("EMPTY_FIELD").withEndDate("03/04/17").withEndTime("1100").withCompletion(false)
.withStartTime("EMPTY_FIELD").withEndDate("03/12/17").withEndTime("1100").withCompletion(false)
.withCategories("just", "friends").build();
recurTestMonthTwice = new TaskBuilder().withTaskName("I'm recurring").withStartDate("EMPTY_FIELD")
.withStartTime("EMPTY_FIELD").withEndDate("03/05/17").withEndTime("1100").withCompletion(false)
.withStartTime("EMPTY_FIELD").withEndDate("03/01/18").withEndTime("1100").withCompletion(false)
.withCategories("just", "friends").build();
recurTestMonthThrice = new TaskBuilder().withTaskName("I'm recurring").withStartDate("EMPTY_FIELD")
.withStartTime("EMPTY_FIELD").withEndDate("03/06/17").withEndTime("1100").withCompletion(false)
.withStartTime("EMPTY_FIELD").withEndDate("03/02/18").withEndTime("1100").withCompletion(false)
.withCategories("just", "friends").build();
recurTestYear = new TaskBuilder().withTaskName("I'm recurring").withStartDate("EMPTY_FIELD")
.withStartTime("EMPTY_FIELD").withEndDate("03/03/17").withEndTime("1100").withCompletion(false)
Expand Down

0 comments on commit fd241aa

Please sign in to comment.