diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 4ff21c35c2..0ef2dcecd8 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -20,9 +20,14 @@ private String getDeadline() { return deadline.format(DateTimeFormatter.ofPattern(" MMM dd yyyy")); } + @Override + public String toString() { + return "[D][" + getStatusIcon() + + "]" + description + "(by:" + getDeadline() + ")"; + } + @Override public void printDescription() { - System.out.println("[D][" + getStatusIcon() - + "]" + description + "(by:" + getDeadline() + ")"); + System.out.println(toString()); } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 86b1ffcfc8..2346245251 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -13,9 +13,14 @@ public Event(String description, String time, boolean isDone) { this.time = time; } + @Override + public String toString() { + return "[E][" + getStatusIcon() + + "]" + description + "(at:" + time + ")"; + } + @Override public void printDescription() { - System.out.println("[E][" + getStatusIcon() - + "]" + description + "(at:" + time + ")"); + System.out.println(toString()); } } diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 00ba8ca290..eab37498c1 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -9,15 +9,15 @@ public class TaskList { this.tasks = new ArrayList<>(); } - TaskList(ArrayList tasks) { + public TaskList(ArrayList tasks) { this.tasks = tasks; } - protected int size() { + public int size() { return tasks.size(); } - protected Task get(int i) { + public Task get(int i) { return tasks.get(i); } diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index cc06a06334..430a2bb9eb 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -7,7 +7,7 @@ public class Ui { + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - protected void start() { + public void start() { System.out.println("Hello from\n" + logo); System.out.println(" ____________________________________________________________"); System.out.println(" Hello! I'm Duke\n What can I do for you?"); diff --git a/src/test/java/DeadlineTest.java b/src/test/java/DeadlineTest.java new file mode 100644 index 0000000000..43af8463da --- /dev/null +++ b/src/test/java/DeadlineTest.java @@ -0,0 +1,14 @@ +import main.java.Deadline; +import org.junit.jupiter.api.Test; + +import java.time.LocalDate; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class DeadlineTest { + @Test + public void toStringTest() { + assertEquals("[D][\u2718] read book(by: Oct 09 2020)", + new Deadline(" read book", LocalDate.of(2020, 10, 9)).toString()); + } +} diff --git a/src/test/java/EventTest.java b/src/test/java/EventTest.java new file mode 100644 index 0000000000..f2278ef9f3 --- /dev/null +++ b/src/test/java/EventTest.java @@ -0,0 +1,12 @@ +import main.java.Event; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class EventTest { + @Test + public void toStringTest() { + assertEquals("[E][\u2718] read book(at: night)", + new Event(" read book", " night").toString()); + } +} diff --git a/src/test/java/TaskListTest.java b/src/test/java/TaskListTest.java new file mode 100644 index 0000000000..ce41cc51ea --- /dev/null +++ b/src/test/java/TaskListTest.java @@ -0,0 +1,30 @@ +import main.java.Event; +import main.java.TaskList; +import main.java.Task; +import main.java.Todo; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class TaskListTest { + @Test + public void sizeTest() { + ArrayList tasks = new ArrayList<>(); + tasks.add(new Todo("read")); + tasks.add(new Event("sleep", "noon")); + TaskList taskList = new TaskList(tasks); + assertEquals(2, taskList.size()); + } + + @Test + public void getTest() { + ArrayList tasks = new ArrayList<>(); + tasks.add(new Todo("read")); + Event event = new Event("sleep", "noon"); + tasks.add(event); + TaskList taskList = new TaskList(tasks); + assertEquals(event, taskList.get(1)); + } +}