diff --git a/Alt4.txt b/Alt4.txt index 6507b02..9a27db1 100644 --- a/Alt4.txt +++ b/Alt4.txt @@ -1,2 +1 @@ -floating;meeting tonight;null;null;null;null;false; -deadline;report submission;null;28/10/2015;null;2359;false; +deadline;dinner;-;28/10/2015;-;2259;false;28/10/2015; diff --git a/src/test/logic/AddTest.java b/src/test/logic/AddTest.java index 1bbdf07..9b587c0 100644 --- a/src/test/logic/AddTest.java +++ b/src/test/logic/AddTest.java @@ -16,13 +16,13 @@ public class AddTest { public static final String TYPE_EVENT = "event"; public static final String TYPE_FLOATING = "floating"; - Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); - Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true); - Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false); - Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true); - Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false); - Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true); - Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); + Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); + Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true, false); + Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false, false); + Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true, false); + Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false, false); + Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true, false); + Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); Storage storage = Storage.getInstance(); Command command1 = new Add(task1, storage); Command command2 = new Add(task2, storage); diff --git a/src/test/logic/CompleteTest.java b/src/test/logic/CompleteTest.java index 700083a..b575a65 100644 --- a/src/test/logic/CompleteTest.java +++ b/src/test/logic/CompleteTest.java @@ -21,14 +21,13 @@ public class CompleteTest { public static final String TYPE_EVENT = "event"; public static final String TYPE_FLOATING = "floating"; - Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); - Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true); - Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false); - Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true); - Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false); - Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true); - Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); - Storage storage = Storage.getInstance(); + Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); + Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true, false); + Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false, false); + Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true, false); + Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false, false); + Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true, false); + Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); Storage storage = Storage.getInstance(); Command command1 = new Add(task1, storage); Command command2 = new Add(task2, storage); Command command3 = new Add(task3, storage); diff --git a/src/test/logic/DeleteTest.java b/src/test/logic/DeleteTest.java index bfc2cc7..636094d 100644 --- a/src/test/logic/DeleteTest.java +++ b/src/test/logic/DeleteTest.java @@ -20,13 +20,13 @@ public class DeleteTest { public static final String TYPE_EVENT = "event"; public static final String TYPE_FLOATING = "floating"; - Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); - Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true); - Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false); - Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true); - Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false); - Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true); - Storage storage = Storage.getInstance(); + Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); + Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true, false); + Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false, false); + Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true, false); + Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false, false); + Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true, false); + Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); Storage storage = Storage.getInstance(); Command command1 = new Add(task1, storage); Command command2 = new Add(task2, storage); Command command3 = new Add(task3, storage); diff --git a/src/test/logic/DisplayTest.java b/src/test/logic/DisplayTest.java index e0bb60d..1b54419 100644 --- a/src/test/logic/DisplayTest.java +++ b/src/test/logic/DisplayTest.java @@ -20,13 +20,13 @@ public class DisplayTest { public static final String TYPE_EVENT = "event"; public static final String TYPE_FLOATING = "floating"; - Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); - Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true); - Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false); - Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true); - Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false); - Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true); - Storage storage = Storage.getInstance(); + Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); + Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true, false); + Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false, false); + Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true, false); + Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false, false); + Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true, false); + Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); Storage storage = Storage.getInstance(); Command command1 = new Add(task1, storage); Command command2 = new Add(task2, storage); Command command3 = new Add(task3, storage); diff --git a/src/test/logic/IncompleteTest.java b/src/test/logic/IncompleteTest.java index 0d33cd5..ab3532c 100644 --- a/src/test/logic/IncompleteTest.java +++ b/src/test/logic/IncompleteTest.java @@ -22,14 +22,14 @@ public class IncompleteTest { public static final String TYPE_EVENT = "event"; public static final String TYPE_FLOATING = "floating"; - Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); - Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true); - Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false); - Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true); - Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false); - Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true); - Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); - Task task8 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true); + Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); + Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true, false); + Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false, false); + Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true, false); + Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false, false); + Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true, false); + Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); + Task task8 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true, false); Storage storage = Storage.getInstance(); Command command1 = new Add(task1, storage); diff --git a/src/test/logic/SortTest.java b/src/test/logic/SortTest.java index 98bae26..e7d08f0 100644 --- a/src/test/logic/SortTest.java +++ b/src/test/logic/SortTest.java @@ -15,13 +15,13 @@ public class SortTest { public static final String TYPE_EVENT = "event"; public static final String TYPE_FLOATING = "floating"; - Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); - Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true); - Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false); - Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true); - Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false); - Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true); - + Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); + Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true, false); + Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false, false); + Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true, false); + Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false, false); + Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true, false); + Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); ArrayList sortList = new ArrayList(); ArrayList sortResult = new ArrayList(); ArrayList expected = new ArrayList(); diff --git a/src/test/logic/UpdateTest.java b/src/test/logic/UpdateTest.java index db8afce..cfbde13 100644 --- a/src/test/logic/UpdateTest.java +++ b/src/test/logic/UpdateTest.java @@ -21,12 +21,13 @@ public class UpdateTest { public static final String TYPE_EVENT = "event"; public static final String TYPE_FLOATING = "floating"; - Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); - Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true); - Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false); - Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true); - Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false); - Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true); + Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); + Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true, false); + Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false, false); + Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true, false); + Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false, false); + Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true, false); + Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); Storage storage = Storage.getInstance(); Command command1 = new Add(task1, storage); Command command2 = new Add(task2, storage); diff --git a/src/test/resources/DataDisplayTest.java b/src/test/resources/DataDisplayTest.java index 1f2afcd..e01f490 100644 --- a/src/test/resources/DataDisplayTest.java +++ b/src/test/resources/DataDisplayTest.java @@ -16,13 +16,13 @@ public class DataDisplayTest { public static final String TYPE_FLOATING = "floating"; // initialize different task object that fits different requirement - Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false); - Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true); - Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false); - Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true); - Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false); - Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true); - + Task task1 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); + Task task2 = new Task(TYPE_DEADLINE, "wash face with cool water", null, "02/02/2015", null, "1100", true, false); + Task task3 = new Task(TYPE_EVENT, "go toilet", "01/01/2015", "01/02/2015", "0900", "1000", false, false); + Task task4 = new Task(TYPE_EVENT, "wash hand with soap", "03/02/2015", "03/02/2015", "0915", "1100", true, false); + Task task5 = new Task(TYPE_FLOATING, "meet with bob", null, null, null, null, false, false); + Task task6 = new Task(TYPE_FLOATING, "eat breakfast", null, null, null, null, true, false); + Task task7 = new Task(TYPE_DEADLINE, "wake up", null, "01/01/2015", null, "0900", false, false); // expected print format for each task String task1Print = "By 0900, 01/01/2015: wake up"; String task2Print = "By 1100, 02/02/2015: wash face with cool water";