add Junit

Written tests that covers 80% of methods
LimZiJia · Feb 2, 2024 · afa7deb · afa7deb
1 parent 84e9160
commit afa7deb
Show file tree

Hide file tree

Showing 10 changed files with 429 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,6 +11,8 @@ repositories {
 dependencies {
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
+    testImplementation "org.mockito:mockito-inline:3.+"
+    testImplementation "org.mockito:mockito-junit-jupiter:3.+"
 }
 
 test {
@@ -40,3 +42,11 @@ shadowJar {
 run{
     standardInput = System.in
 }
+
+sourceSets {
+    test {
+        java {
+            srcDirs = ['src/test']
+        }
+    }
+}
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
@@ -63,7 +63,7 @@ else if (in.startsWith("delete ")) {
 
     public TaskList addTask(String s, TaskList tasks) {
         // Todo_
-        if (s.startsWith("todo")) {
+        if (s.startsWith("todo ")) {
             // Get name and if it is empty, throw exception
             String n = s.substring(5);
             if (n.isEmpty()) {
@@ -73,41 +73,41 @@ public TaskList addTask(String s, TaskList tasks) {
             tasks.add(new Todo(n));
 
             // tasks.Deadline
-        } else if (s.startsWith("deadline")) {
+        } else if (s.startsWith("deadline ")) {
             // Try to get the index of the first '/', if it does not exist, the statement is invalid.
             // Also, it should adhere to "/by"
             int first = s.indexOf('/');
-            if (first == -1 || s.length() < first + 14) {
+            if (first == -1) {
                 throw new DukeErroneousArgumentException();
-            } else if (!s.startsWith("/by", first)) {
+            } else if (!s.startsWith("/by ", first)) {
                 throw new DukeErroneousArgumentException();
             }
 
             // Get name and time. If empty, throw exception
-            String n = s.substring(9, first);
-            String t = s.substring(first + 4, first + 14);
+            String n = s.substring(9, Math.max(first - 1, 9));
+            String t = s.substring(first + 4);
             if (n.isEmpty() || t.isEmpty()) {
                 throw new DukeEmptyArgumentException();
             }
 
             tasks.add(new Deadline(n, t));
 
             // tasks.Event
-        } else if (s.startsWith("event")) {
+        } else if (s.startsWith("event ")) {
             // Try to get the index of the first  and second '/', if it does not exist, the statement is invalid.
             // Also, the format should adhere to "/from" and "/to"
             int first = s.indexOf('/');
             int second = s.indexOf('/', first + 1);
-            if (first == -1 || second != first + 17 || s.length() < second + 14) {
+            if (first == -1) {
                 throw new DukeErroneousArgumentException();
-            } else if (!s.startsWith("/from", first)
-                    || !s.startsWith("/to", second)) {
+            } else if (!s.startsWith("/from ", first)
+                    || !s.startsWith("/to ", second)) {
                 throw new DukeErroneousArgumentException();
             }
 
-            String n = s.substring(6, first - 1);
-            String f = s.substring(first + 6,  second - 1);
-            String t = s.substring(second + 4, second + 14);
+            String n = s.substring(6, Math.max(first - 1, 6));
+            String f = s.substring(first + 6,  Math.max(second - 1, first + 6));
+            String t = s.substring(second + 4);
             if (n.isEmpty() || f.isEmpty() || t.isEmpty()) {
                 throw new DukeEmptyArgumentException();
             }

diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
@@ -15,6 +15,8 @@ public class Storage {
     private static Path PATH_DIR;
     private static Path PATH_FILE;
 
+    public Storage() {}
+
     public Storage(String dir, String name) {
         String userDir = System.getProperty("user.dir");
         PATH_DIR = Paths.get(userDir + dir);

diff --git a/src/main/java/tasks/Deadline.java b/src/main/java/tasks/Deadline.java
@@ -25,10 +25,27 @@ public String toSavedString() {
                 , this.time.format(DateTimeFormatter.ISO_LOCAL_DATE));
     }
 
+    @Override
     public String toString() {
         return String.format("[D][%s] %s (by: %s)\n"
                 , this.done ? "X" : " "
                 , this.name
                 , this.time.format(DateTimeFormatter.ofPattern("MMM dd yyyy")));
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+
+        if (obj.getClass() != this.getClass()) {
+            return false;
+        }
+
+        Deadline deadline = (Deadline) obj;
+        return this.name.equals(deadline.name)
+                && this.done == deadline.done
+                && this.time.equals(deadline.time);
+    }
 }
diff --git a/src/main/java/tasks/Event.java b/src/main/java/tasks/Event.java
@@ -31,11 +31,29 @@ public String toSavedString() {
                 , this.to.format(DateTimeFormatter.ISO_LOCAL_DATE));
     }
 
+    @Override
     public String toString() {
         return String.format("[E][%s] %s (from: %s to: %s)\n"
                 , this.done ? "X" : " "
                 , this.name
                 , this.from.format(DateTimeFormatter.ofPattern("MMM dd yyyy"))
                 , this.to.format(DateTimeFormatter.ofPattern("MMM dd yyyy")));
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+
+        if (obj.getClass() != this.getClass()) {
+            return false;
+        }
+
+        Event event = (Event) obj;
+        return this.name.equals(event.name)
+                && this.done == event.done
+                && this.from.equals(event.from)
+                && this.to.equals(event.to);
+    }
 }
diff --git a/src/main/java/tasks/TaskList.java b/src/main/java/tasks/TaskList.java
@@ -89,4 +89,21 @@ public List<String> taskToSavedString() {
                 .map(Task::toSavedString)
                 .collect(Collectors.toList());
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+
+        if (obj.getClass() != this.getClass()) {
+            return false;
+        }
+
+        TaskList tl = (TaskList) obj;
+
+        return this.list.equals(tl.list);
+    }
+
+
 }
diff --git a/src/main/java/tasks/Todo.java b/src/main/java/tasks/Todo.java
@@ -15,7 +15,22 @@ public String toSavedString() {
                 , this.name);
     }
 
+    @Override
     public String toString() {
         return String.format("[T][%s] %s\n", this.done ? "X" : " ", this.name);
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+
+        if (obj.getClass() != this.getClass()) {
+            return false;
+        }
+
+        Todo todo = (Todo) obj;
+        return this.name.equals(todo.name) && this.done == todo.done;
+    }
 }