Add JUnit Tests for Ui and Parser class

Author: yunbinmo

src/main/java/spike/Spike.java

@@ -2,13 +2,12 @@
 
 import spike.command.Command;
 import spike.command.ExitCommand;
+import spike.exception.SpikeException;
 import spike.parser.Parser;
 import spike.storage.Storage;
 import spike.task.*;
 import spike.ui.Ui;
 
-import java.util.Scanner;
-
 public class Spike {
     private Storage storage;
     private Ui ui;
@@ -25,7 +24,8 @@ public Spike(String directory, String filePath) {
         }
     }
 
-    public void run() {
+    private void run() {
+        ui.greet(tasks.getListSize());
         Command command;
         do {
             String input = ui.getCommand();

src/main/java/spike/command/ListCommand.java

@@ -1,6 +1,5 @@
 package spike.command;
 
-import spike.Spike;
 import spike.task.Task;
 import spike.task.TaskList;
 

src/main/java/spike/exception/SpikeException.java

@@ -1,4 +1,4 @@
-package spike;
+package spike.exception;
 
 /**
  * Class for all Spike specific exceptions

src/main/java/spike/parser/Parser.java

@@ -1,6 +1,6 @@
 package spike.parser;
 
-import spike.SpikeException;
+import spike.exception.SpikeException;
 import spike.command.*;
 import spike.task.*;
 
@@ -166,7 +166,7 @@ private Command parseExit() {
     /**
      * Parses date and time input by user and returns valid LocalDateTime object
      */
-    public static LocalDateTime parseDateTime(String s, DateTimeFormatter dtf) {
+    private static LocalDateTime parseDateTime(String s, DateTimeFormatter dtf) {
         try {
             LocalDateTime dateTime = LocalDateTime.parse(s, dtf);
             return dateTime;
@@ -179,7 +179,7 @@ public static LocalDateTime parseDateTime(String s, DateTimeFormatter dtf) {
      * Checks whether the input string is integer.
      * If yes, return it, else return -1.
      */
-    public static int isInt(String str) {
+    private static int isInt(String str) {
         try {
             int x = Integer.parseInt(str);
             return x; // it is an integer
@@ -193,7 +193,7 @@ public static int isInt(String str) {
      * Checks whether it is a valid command.
      * If valid, return that command enum number, else return null.
      */
-    public CommandName validateCommand(String input) {
+    private CommandName validateCommand(String input) {
         for (CommandName c : CommandName.values()) {
             if (c.getCommand().equals(input)) {
                 return c;

src/main/java/spike/storage/Storage.java

@@ -1,6 +1,6 @@
 package spike.storage;
 
-import spike.*;
+import spike.exception.SpikeException;
 import spike.task.*;
 
 import java.io.File;

src/main/java/spike/ui/Ui.java

@@ -1,5 +1,6 @@
 package spike.ui;
 
+import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.Scanner;
 
@@ -13,7 +14,17 @@ public class Ui {
     public Ui() {
         this.in = new Scanner(System.in);
         this.out = System.out;
-        greet();
+    }
+
+    /**
+     * Initializes Ui for unit testing.
+     *
+     * @param inputStream
+     * @param printStream
+     */
+    public Ui(InputStream inputStream, PrintStream printStream) {
+        this.in = new Scanner(inputStream);
+        this.out = printStream;
     }
 
     /**
@@ -36,8 +47,12 @@ public String getCommand() {
      *
      * @return
      */
-    private void greet() {
-        printMsg("Hello! I am Spike ⊂( ・ ̫・)⊃ Nice to meet you!\nWhat can I do for you?");
+    public void greet(int taskListSize) {
+        if (taskListSize > 0) {
+            printMsg("Welcome back! Enter 'list' command to see your task list.");
+        } else {
+            printMsg("Hello! I am Spike ⊂( ・ ̫・)⊃ Nice to meet you!\nWhat can I do for you?");
+        }
     }
 
     /**
@@ -51,7 +66,7 @@ private boolean isEmptyCommand(String inputLine) {
      * Shows error in loading task file.
      */
     public void showLoadingError() {
-        out.println("Sorry, I couldn't create the task list file for you.");
+        printMsg("Sorry, I couldn't create the task list file for you.");
     }
 
     /**

src/test/java/spike/SpikeTest.java

@@ -0,0 +1,13 @@
+package spike;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+
+public class SpikeTest {
+    @Test
+    public void dummyTest() {
+        assertEquals(2, 2);
+    }
+}

src/test/java/spike/parser/ParserTest.java

@@ -0,0 +1,17 @@
+package spike.parser;
+
+import org.junit.jupiter.api.Test;
+import spike.command.IncorrectCommand;
+import spike.task.TaskList;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ParserTest {
+    @Test
+    public void parseCommand_invalidCommand_incorrectCommandObject() {
+        Parser parser = new Parser();
+        Boolean isIncorrectCommand = parser.parseCommand("random text",
+                new TaskList()) instanceof IncorrectCommand;
+        assertEquals(true, isIncorrectCommand);
+    }
+}

src/test/java/spike/ui/UiTest.java

@@ -0,0 +1,101 @@
+package spike.ui;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.Random;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class UiTest {
+    // For testing system output
+    private final PrintStream standardOut = System.out;
+    private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream();
+
+
+    @BeforeEach
+    public void setUp() {
+        System.setOut(new PrintStream(outputStreamCaptor));
+    }
+
+    @AfterEach
+    public void tearDown() {
+        System.setIn(System.in);
+        System.setOut(standardOut);
+    }
+
+    @Test
+    public void getCommand_emptyCommand_getNextLine() {
+        // For simulating system input
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(" \nNext line\n".getBytes());
+        PrintStream printStream = new PrintStream(outputStreamCaptor);
+
+        Ui ui = new Ui(inputStream, printStream);
+        assertEquals("Next line", ui.getCommand());
+    }
+
+    @Test
+    public void printMsg_anyString_formattedResponse() {
+        PrintStream printStream = new PrintStream(outputStreamCaptor);
+
+        Ui ui = new Ui(System.in, printStream);
+        ui.printMsg("Any string");
+        String expected = "-------------------------------------------------\n"
+                + "Any string"
+                + "\n"
+                + "-------------------------------------------------";
+        assertEquals(expected, outputStreamCaptor.toString().trim());
+    }
+
+    @Test
+    public void getCommand_nonEmptyCommand_getCurrentLine() {
+        // For simulating system input
+        ByteArrayInputStream inputStream = new ByteArrayInputStream("Current line\n".getBytes());
+        PrintStream printStream = new PrintStream(outputStreamCaptor);
+
+        Ui ui = new Ui(inputStream, printStream);
+        assertEquals("Current line", ui.getCommand());
+    }
+
+    @Test
+    public void showLoadingError_noInput_errorMsg() {
+        PrintStream printStream = new PrintStream(outputStreamCaptor);
+
+        Ui ui = new Ui(System.in, printStream);
+        ui.showLoadingError();
+        String expected = "-------------------------------------------------\n"
+                + "Sorry, I couldn't create the task list file for you."
+                + "\n"
+                + "-------------------------------------------------";
+        assertEquals(expected, outputStreamCaptor.toString().trim());
+    }
+
+    @Test
+    public void greet_zeroListSize_greetNewUser() {
+        Ui ui = new Ui();
+        ui.greet(0);
+        String expected = "-------------------------------------------------\n"
+                + "Hello! I am Spike ⊂( ・ ̫・)⊃ Nice to meet you!\nWhat can I do for you?"
+                + "\n"
+                + "-------------------------------------------------";
+        assertEquals(expected, outputStreamCaptor.toString().trim());
+    }
+
+    @Test
+    public void greet_nonZeroListSize_greetOldUser() {
+        Random random = new Random();
+        Ui ui = new Ui();
+        ui.greet(random.nextInt(1000) + 1);
+        String expected = "-------------------------------------------------\n"
+                + "Welcome back! Enter 'list' command to see your task list."
+                + "\n"
+                + "-------------------------------------------------";
+        assertEquals(expected, outputStreamCaptor.toString().trim());
+    }
+
+
+}