Merge branch-testing

src/main/java/sparrow/Sparrow.java

@@ -3,6 +3,7 @@
 import java.util.Scanner;
 
 import sparrow.commands.Command;
+import sparrow.data.exceptions.IncorrectCommandException;
 import sparrow.data.task.TaskList;
 import sparrow.data.trivia.VocabList;
 import sparrow.parser.Parser;
@@ -54,11 +55,15 @@ public void run() {
         Parser parser = new Parser();
         boolean isExit = false;
         while (!isExit) {
-            String command = sc.nextLine();
-            Command c = parser.parseCommand(command);
-            String result = c.execute(tasks, vocabList, ui, storage);
-            ui.replyToUser(result);
-            isExit = c.getIsExit();
+            try {
+                String command = sc.nextLine();
+                Command c = parser.parseCommand(command);
+                String result = c.execute(tasks, vocabList, ui, storage);
+                ui.replyToUser(result);
+                isExit = c.getIsExit();
+            } catch (IncorrectCommandException ice) {
+                ui.replyToUser(ice.getMessage());
+            }
         }
     }
 
@@ -68,9 +73,13 @@ public void run() {
      * @return Reply to user.
      */
     public String getResponse(String userInput) {
-        Parser parser = new Parser();
-        Command c = parser.parseCommand(userInput);
-        return c.execute(tasks, vocabList, ui, storage);
+        try {
+            Parser parser = new Parser();
+            Command c = parser.parseCommand(userInput);
+            return c.execute(tasks, vocabList, ui, storage);
+        } catch (IncorrectCommandException ice) {
+            return ice.getMessage();
+        }
     }
 
     /**

src/main/java/sparrow/commands/AddTaskCommand.java

@@ -33,4 +33,11 @@ public String execute(TaskList tasks, VocabList vocabList, Ui ui, Storage storag
             return fee.getMessage();
         }
     }
+
+    @Override
+    public boolean equals(Object other) {
+        return this == other
+                || (other instanceof AddTaskCommand
+                && toAdd.equals(((AddTaskCommand) other).toAdd));
+    }
 }

src/main/java/sparrow/commands/DeleteCommand.java

@@ -1,6 +1,7 @@
 package sparrow.commands;
 
 import sparrow.data.exceptions.FileErrorException;
+import sparrow.data.exceptions.SparrowException;
 import sparrow.data.task.Task;
 import sparrow.data.task.TaskList;
 import sparrow.data.trivia.VocabList;
@@ -25,7 +26,8 @@ public String execute(TaskList tasks, VocabList vocabList, Ui ui, Storage storag
             storage.saveTaskListToFile(tasks);
             return String.format(MESSAGE_DELETE_TASK_SUCCESS, deletedTask);
         } catch (IndexOutOfBoundsException e) {
-            return "INDEX OUT OF BOUNDS";
+            return String.format(SparrowException.STANDARD_EXCEPTION_MESSAGE,
+                    "No task found at index specified.");
         } catch (FileErrorException fee) {
             return fee.getMessage();
         }

src/main/java/sparrow/commands/FilterCommand.java

@@ -30,7 +30,7 @@ public FilterCommand(LocalDate date) {
 
     @Override
     public String execute(TaskList tasks, VocabList vocabList, Ui ui, Storage storage) {
-        ArrayList<Task> matchingTasks = tasks.filterList(date);
+        ArrayList<Task> matchingTasks = tasks.filterTasks(date);
         if (matchingTasks.size() == 0) {
             return MESSAGE_FIND_FAILURE;
         } else {

src/main/java/sparrow/commands/IncorrectCommand.java

@@ -18,4 +18,10 @@ public String execute(TaskList tasks, VocabList vocabList, Ui ui, Storage storag
         return feedbackToUser;
     }
 
+    @Override
+    public boolean equals(Object other) {
+        return this == other
+                || (other instanceof IncorrectCommand
+                && feedbackToUser.equals(((IncorrectCommand) other).feedbackToUser));
+    }
 }

src/main/java/sparrow/commands/ListCommand.java

@@ -1,5 +1,6 @@
 package sparrow.commands;
 
+import sparrow.data.exceptions.IncorrectCommandException;
 import sparrow.data.task.TaskList;
 import sparrow.data.trivia.VocabList;
 import sparrow.storage.Storage;
@@ -10,6 +11,7 @@ public class ListCommand extends Command {
     public static final String COMMAND_WORD = "list";
     public static final String TASK_MESSAGE_SUCCESS = "Here are the tasks in your list: \n%s";
     public static final String VOCAB_MESSAGE_SUCCESS = "Here are the words in your list: \n%s";
+    public static final String HELP_MESSAGE = "Ye ought to specify either 'tasks' or 'vocab' after the 'list' command.";
 
     private final String data;
 
@@ -26,7 +28,7 @@ public String execute(TaskList tasks, VocabList vocabList, Ui ui, Storage storag
             String vocabsAsString = ui.vocabListToString(vocabList.getVocabList());
             return String.format(VOCAB_MESSAGE_SUCCESS, vocabsAsString);
         } else {
-            return "No matching data found";
+            return HELP_MESSAGE;
         }
     }
 }

src/main/java/sparrow/commands/VocabCommand.java

@@ -25,12 +25,19 @@ public VocabCommand(String newWord, String definition) {
     @Override
     public String execute(TaskList tasks, VocabList vocabList, Ui ui, Storage storage) {
         try {
-            vocabList.getVocabList().add(newVocab);
+            vocabList.addVocab(newVocab);
             storage.saveTaskListToFile(tasks);
             storage.saveVocabListToFile(vocabList);
             return newVocab.getWord() + ADD_VOCAB_SUCCESS;
         } catch (FileErrorException fee) {
             return fee.getMessage();
         }
     }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this
+                || (other instanceof VocabCommand
+                && newVocab.equals((Vocabulary) other));
+    }
 }

src/main/java/sparrow/data/exceptions/IncorrectCommandException.java

@@ -0,0 +1,8 @@
+package sparrow.data.exceptions;
+
+public class IncorrectCommandException extends SparrowException {
+
+    public IncorrectCommandException(String message) {
+        super(message);
+    }
+}

src/main/java/sparrow/data/exceptions/SparrowException.java

@@ -3,9 +3,13 @@
 public class SparrowException extends Exception {
 
     /** Emoji to be pre-pended to an exception message.*/
-    public static final String STANDARD_EXCEPTION_MESSAGE = "ARR!\uD83C\uDFF4\u200D\u2620\uFE0F️ ";
+    public static final String STANDARD_EXCEPTION_MESSAGE = "ARR!\uD83C\uDFF4\u200D\u2620\uFE0F️ %s";
 
     public SparrowException(String message, Throwable cause) {
         super(message, cause);
     }
+
+    public SparrowException(String message) {
+        super(message);
+    }
 }

src/main/java/sparrow/data/task/Deadline.java

@@ -28,4 +28,12 @@ public String toString() {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd MMM yyyy");
         return String.format("[D]%s (by: %s)", super.toString(), this.dueDate.format(formatter));
     }
+
+    @Override
+    public boolean equals(Object other) {
+        return this == other
+                || (other instanceof Deadline
+                && description.equals(((Deadline) other).description)
+                && dueDate.equals(((Deadline) other).dueDate));
+    }
 }

src/main/java/sparrow/data/task/Event.java

@@ -28,4 +28,12 @@ public String toString() {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd MMM yyyy");
         return String.format("[E]%s (at: %s)", super.toString(), this.date.format(formatter));
     }
+
+    @Override
+    public boolean equals(Object other) {
+        return this == other
+                || (other instanceof Event
+                && description.equals(((Event) other).description)
+                && date.equals(((Event) other).date));
+    }
 }

src/main/java/sparrow/data/task/Task.java

@@ -36,4 +36,11 @@ public void markAsDone() {
     public String toString() {
         return String.format("[%s] %s", getStatusIcon(), this.description);
     }
+
+    @Override
+    public boolean equals(Object other) {
+        return this == other
+                || (other instanceof Task
+                && description.equals(((Task) other).description));
+    }
 }

src/main/java/sparrow/data/task/TaskList.java

@@ -1,7 +1,6 @@
 package sparrow.data.task;
 
 import java.time.LocalDate;
-import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,13 +32,13 @@ public List<Task> getTasks() {
     public void addTask(Task toAdd) {
         tasks.add(toAdd);
     }
+
     /**
      * Returns a task list matching the inputted date filter.
-     * @param dateFilter User's command and date to filter by.
+     * @param dateFilter User's date to filter by.
      * @return Filtered list based on input.
-     * @throws DateTimeParseException if date passed cannot be converted to a LocalDate object.
      */
-    public ArrayList<Task> filterList(LocalDate dateFilter) throws DateTimeParseException {
+    public ArrayList<Task> filterTasks(LocalDate dateFilter) {
         ArrayList<Task> filteredList = new ArrayList<>();
 
         for (Task task : tasks) {

src/main/java/sparrow/data/trivia/VocabList.java

@@ -17,4 +17,8 @@ public VocabList(List<Vocabulary> vocabList) {
     public List<Vocabulary> getVocabList() {
         return vocabList;
     }
+
+    public void addVocab(Vocabulary toAdd) {
+        this.vocabList.add(toAdd);
+    }
 }

src/main/java/sparrow/data/trivia/Vocabulary.java

@@ -46,4 +46,12 @@ public String define() {
     public String toString() {
         return String.format("%s: %s", word, define());
     }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this
+                || (other instanceof Vocabulary
+                && word.equals(((Vocabulary) other).word)
+                && define().equals(((Vocabulary) other).define()));
+    }
 }

src/main/java/sparrow/parser/Parser.java

@@ -19,6 +19,7 @@
 import sparrow.commands.IncorrectCommand;
 import sparrow.commands.ListCommand;
 import sparrow.commands.VocabCommand;
+import sparrow.data.exceptions.IncorrectCommandException;
 import sparrow.data.task.Deadline;
 import sparrow.data.task.Event;
 import sparrow.data.task.Todo;
@@ -55,15 +56,13 @@ public class Parser {
      * @param userInput Text entered by user.
      * @return Command to be executed.
      */
-    public Command parseCommand(String userInput) {
-        assert !userInput.isBlank() : "No input entered"; // do I need this assertion?
+    public Command parseCommand(String userInput) throws IncorrectCommandException {
         //@@author jonfoocy-reused
         //Reused from https://github.com/se-edu/addressbook-level2 with modifications,
         //including idea of preparing Commands.
         final Matcher matcher = BASIC_COMMAND_FORMAT.matcher(userInput.trim());
         if (!matcher.matches()) {
-            // doesn't seem to enter this block
-            return new IncorrectCommand("Unknown Command");
+            throw new IncorrectCommandException("Command cannot be empty");
         }
 
         final String commandWord = matcher.group("commandWord");
@@ -105,14 +104,12 @@ public Command parseCommand(String userInput) {
             return new ExitCommand();
 
         default:
-            //todo
             return new HelpCommand();
         }
         //@@author
     }
 
     private Command prepareAddTodo(String args) {
-        assert !args.isEmpty();
         final Matcher matcher = TODO_FORMAT.matcher(args.trim());
         if (!matcher.matches()) {
             return new IncorrectCommand("Description of a Todo can't be empty.");
@@ -123,7 +120,6 @@ private Command prepareAddTodo(String args) {
 
     // TODO: trim whitespace from end of deadline description
     private Command prepareAddDeadline(String args) {
-        assert !args.isEmpty();
         final Matcher matcher = DEADLINE_FORMAT.matcher((args.trim()));
         if (!matcher.matches()) {
             return new IncorrectCommand("Wrong deadline format.");
@@ -139,7 +135,6 @@ private Command prepareAddDeadline(String args) {
 
     // TODO: trim whitespace from end of event description
     private Command prepareAddEvent(String args) {
-        assert !args.isEmpty();
         final Matcher matcher = EVENT_FORMAT.matcher((args.trim()));
         if (!matcher.matches()) {
             return new IncorrectCommand("Wrong event format.");
@@ -154,7 +149,6 @@ private Command prepareAddEvent(String args) {
     }
 
     private Command prepareDelete(String args) {
-        assert !args.isEmpty();
         try {
             int targetIndex = Integer.parseInt(args.trim());
             return new DeleteCommand(targetIndex);
@@ -164,7 +158,6 @@ private Command prepareDelete(String args) {
     }
 
     private Command prepareDone(String args) {
-        assert !args.isEmpty();
         try {
             int targetIndex = Integer.parseInt(args.trim());
             return new DoneCommand(targetIndex);
@@ -175,7 +168,6 @@ private Command prepareDone(String args) {
 
     // TODO: add functionality to search by >1 keyword
     private Command prepareFind(String args) {
-        assert !args.isEmpty();
         final Matcher matcher = KEYWORDS_ARGS_FORMAT.matcher(args.trim());
         if (!matcher.matches()) {
             return new IncorrectCommand("Please pass a keyword to search for.");
@@ -184,10 +176,8 @@ private Command prepareFind(String args) {
     }
 
     private Command prepareFilter(String args) {
-        assert !args.isEmpty();
         final Matcher matcher = FILTER_ARGS_FORMAT.matcher(args.trim());
         if (!matcher.matches()) {
-            System.out.println("Wrong filter format");
             return new IncorrectCommand("Please pass a proper date to filter by.");
         }
         try {
@@ -213,10 +203,8 @@ private Command prepareVocab(String args) {
         }
 
         if (matcher.group("definition") == null) {
-            System.out.println("no definition provided");
             return new VocabCommand(matcher.group("word"));
         } else {
-            System.out.println("definition provided");
             return new VocabCommand(matcher.group("word"), matcher.group("definition"));
         }
     }

src/main/java/sparrow/storage/Storage.java

@@ -29,8 +29,8 @@ public class Storage {
 
     private final Path path;
 
-    public Storage() throws Exception {
-        this(DEFAULT_FILE_PATH);
+    public Storage() {
+        path = Path.of(DEFAULT_FILE_PATH);
     }
 
     /**

src/test/java/sparrow/SparrowTest.java

@@ -9,9 +9,5 @@
 
 public class SparrowTest {
 
-    @Test
-    public void exceptionMessage() {
-        assertEquals("ARR!\uD83C\uDFF4\u200D\u2620\uFE0F️ ", SparrowException.STANDARD_EXCEPTION_MESSAGE);
-    }
 
 }