Merge branch 'master' into master

AY1920S1-CS2103-T16-4 · Nov 8, 2019 · ce7667b · ce7667b
2 parents e8ba6ff + 5cb9715
commit ce7667b
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 58 deletions.
diff --git a/src/main/java/seedu/guilttrip/logic/commands/GuiltTripCommandSuggester.java b/src/main/java/seedu/guilttrip/logic/commands/GuiltTripCommandSuggester.java
@@ -37,6 +37,11 @@ public final class GuiltTripCommandSuggester {
      */
     public static String getSuggestionString(String textInput) {
         try {
+            // Easter egg!!
+            if (textInput.equalsIgnoreCase("uwu")) {
+                return "uwu";
+            }
+
             String commandWord = getCommandWord(textInput);
 
             if (commandWord.isEmpty()) {

diff --git a/src/main/java/seedu/guilttrip/logic/commands/editcommands/EditBudgetCommand.java b/src/main/java/seedu/guilttrip/logic/commands/editcommands/EditBudgetCommand.java
@@ -85,7 +85,7 @@ public CommandResult execute(Model model, CommandHistory history) throws Command
             throw new CommandException(MESSAGE_INVALID_CATEGORY);
         }
 
-        if (entryToEdit.isSameEntry(editedEntry) && model.hasBudget(editedEntry)) {
+        if (entryToEdit.isSameBudget(editedEntry) && model.hasBudget(editedEntry)) {
             throw new CommandException(MESSAGE_DUPLICATE_ENTRY);
         }
 

diff --git a/src/main/java/seedu/guilttrip/logic/parser/addcommandparsers/AddBudgetCommandParser.java b/src/main/java/seedu/guilttrip/logic/parser/addcommandparsers/AddBudgetCommandParser.java
@@ -1,6 +1,5 @@
 package seedu.guilttrip.logic.parser.addcommandparsers;
 
-import static seedu.guilttrip.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_AMOUNT;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_CATEGORY;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_DATE;
@@ -35,17 +34,16 @@ public class AddBudgetCommandParser implements Parser<AddBudgetCommand> {
     /**
      * Parses the given {@code String} of arguments in the context of the AddCommand
      * and returns an AddCommand object for execution.
+     *
      * @throws ParseException if the user input does not conform the expected format
      */
     public AddBudgetCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE,
                         PREFIX_PERIOD, PREFIX_TAG);
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE, PREFIX_PERIOD)
-                || !argMultimap.getPreamble().isEmpty()) {
-            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddBudgetCommand.MESSAGE_USAGE));
-        }
+        ParserUtil.errorIfCompulsoryPrefixMissing(AddBudgetCommand.MESSAGE_USAGE, argMultimap, false,
+                PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE, PREFIX_PERIOD);
 
         String categoryName = argMultimap.getValue(PREFIX_CATEGORY).get();
         Description desc = ParserUtil.parseDescription(argMultimap.getValue(PREFIX_DESC).get());

diff --git a/src/main/java/seedu/guilttrip/logic/parser/addcommandparsers/AddCategoryCommandParser.java b/src/main/java/seedu/guilttrip/logic/parser/addcommandparsers/AddCategoryCommandParser.java
@@ -1,6 +1,5 @@
 package seedu.guilttrip.logic.parser.addcommandparsers;
 
-import static seedu.guilttrip.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_CATEGORY;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_DESC;
 
@@ -10,6 +9,7 @@
 import seedu.guilttrip.logic.parser.ArgumentMultimap;
 import seedu.guilttrip.logic.parser.ArgumentTokenizer;
 import seedu.guilttrip.logic.parser.Parser;
+import seedu.guilttrip.logic.parser.ParserUtil;
 import seedu.guilttrip.logic.parser.Prefix;
 import seedu.guilttrip.logic.parser.exceptions.ParseException;
 import seedu.guilttrip.model.entry.Category;
@@ -28,10 +28,8 @@ public AddCategoryCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_CATEGORY, PREFIX_DESC);
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_CATEGORY, PREFIX_DESC)
-                || !argMultimap.getPreamble().isEmpty()) {
-            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCategoryCommand.MESSAGE_USAGE));
-        }
+        ParserUtil.errorIfCompulsoryPrefixMissing(AddCategoryCommand.MESSAGE_USAGE, argMultimap, false,
+                PREFIX_CATEGORY, PREFIX_DESC);
 
         String categoryType = argMultimap.getValue(PREFIX_CATEGORY).get().toLowerCase();
         String categoryName = argMultimap.getValue(PREFIX_DESC).get().toLowerCase();

diff --git a/src/main/java/seedu/guilttrip/logic/parser/addcommandparsers/AddExpenseCommandParser.java b/src/main/java/seedu/guilttrip/logic/parser/addcommandparsers/AddExpenseCommandParser.java
@@ -1,6 +1,5 @@
 package seedu.guilttrip.logic.parser.addcommandparsers;
 
-import static seedu.guilttrip.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_AMOUNT;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_CATEGORY;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_DATE;
@@ -10,6 +9,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+import seedu.guilttrip.logic.commands.addcommands.AddBudgetCommand;
 import seedu.guilttrip.logic.commands.addcommands.AddExpenseCommand;
 import seedu.guilttrip.logic.parser.ArgumentMultimap;
 import seedu.guilttrip.logic.parser.ArgumentTokenizer;
@@ -40,10 +40,8 @@ public AddExpenseCommand parse(String args) throws ParseException {
                 ArgumentTokenizer.tokenize(args, PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE,
                         PREFIX_TAG);
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE)
-                || !argMultimap.getPreamble().isEmpty()) {
-            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddExpenseCommand.MESSAGE_USAGE));
-        }
+        ParserUtil.errorIfCompulsoryPrefixMissing(AddBudgetCommand.MESSAGE_USAGE, argMultimap, false,
+                PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE);
 
         String categoryName = argMultimap.getValue(PREFIX_CATEGORY).get();
         Description desc = ParserUtil.parseDescription(argMultimap.getValue(PREFIX_DESC).get());

diff --git a/src/main/java/seedu/guilttrip/logic/parser/addcommandparsers/AddIncomeCommandParser.java b/src/main/java/seedu/guilttrip/logic/parser/addcommandparsers/AddIncomeCommandParser.java
@@ -1,6 +1,5 @@
 package seedu.guilttrip.logic.parser.addcommandparsers;
 
-import static seedu.guilttrip.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_AMOUNT;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_CATEGORY;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_DATE;
@@ -40,10 +39,8 @@ public AddIncomeCommand parse(String args) throws ParseException {
                 ArgumentTokenizer.tokenize(args, PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE,
                         PREFIX_TAG);
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE)
-                || !argMultimap.getPreamble().isEmpty()) {
-            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddIncomeCommand.MESSAGE_USAGE));
-        }
+        ParserUtil.errorIfCompulsoryPrefixMissing(AddIncomeCommand.MESSAGE_USAGE, argMultimap, false,
+                PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE);
 
         String categoryName = argMultimap.getValue(PREFIX_CATEGORY).get();
         Description desc = ParserUtil.parseDescription(argMultimap.getValue(PREFIX_DESC).get());

diff --git a/src/main/java/seedu/guilttrip/logic/parser/addcommandparsers/AddWishCommandParser.java b/src/main/java/seedu/guilttrip/logic/parser/addcommandparsers/AddWishCommandParser.java
@@ -1,6 +1,5 @@
 package seedu.guilttrip.logic.parser.addcommandparsers;
 
-import static seedu.guilttrip.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_AMOUNT;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_CATEGORY;
 import static seedu.guilttrip.logic.parser.CliSyntax.PREFIX_DATE;
@@ -40,10 +39,8 @@ public AddWishCommand parse(String args) throws ParseException {
                 ArgumentTokenizer.tokenize(args, PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE,
                         PREFIX_TAG);
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE)
-                || !argMultimap.getPreamble().isEmpty()) {
-            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddWishCommand.MESSAGE_USAGE));
-        }
+        ParserUtil.errorIfCompulsoryPrefixMissing(AddWishCommand.MESSAGE_USAGE, argMultimap, false,
+                PREFIX_CATEGORY, PREFIX_DESC, PREFIX_AMOUNT, PREFIX_DATE);
 
         String categoryName = argMultimap.getValue(PREFIX_CATEGORY).get();
         Description desc = ParserUtil.parseDescription(argMultimap.getValue(PREFIX_DESC).get());

diff --git a/src/main/java/seedu/guilttrip/model/entry/Budget.java b/src/main/java/seedu/guilttrip/model/entry/Budget.java
@@ -69,7 +69,7 @@ public void setSpentAmount(Amount amount) {
     }
 
     public void setSpent(FilteredList<Expense> filteredExpenses) {
-        this.filteredExpenses = filteredExpenses;
+        this.filteredExpenses = new FilteredList<>(filteredExpenses);
         expenseMatchesBudgetPredicate = new ExpenseMatchesBudgetPredicate(getCategory(), startDate, endDate);
         this.filteredExpenses.setPredicate(expenseMatchesBudgetPredicate);
     }
@@ -96,6 +96,24 @@ public Budget modifiedBudget(String newName) {
                 this.getAmount(), super.getTags(), this.spent);
     }
 
+    /**
+     * Returns true if both entries of the same name have at least one other identity field that is the same.
+     * This defines a weaker notion of equality between two entries.
+     */
+    public boolean isSameBudget(Budget otherEntry) {
+        if (otherEntry == this) {
+            return true;
+        }
+
+        return otherEntry != null
+                && otherEntry.getCategory().equals(getCategory())
+                && otherEntry.getDesc().equals(getDesc())
+                && otherEntry.getAmount().equals(getAmount())
+                && otherEntry.getTags().equals(getTags())
+                && otherEntry.getDate().equals(getDate())
+                && otherEntry.getPeriod().equals(getPeriod());
+    }
+
     /**
      * Returns true if both budgets have the same data fields.
      * This defines a stronger notion of equality between two entries.

diff --git a/src/main/java/seedu/guilttrip/model/entry/Date.java b/src/main/java/seedu/guilttrip/model/entry/Date.java
@@ -45,7 +45,13 @@ public class Date {
             .appendOptional(DateTimeFormatter.ofPattern("d-MM-uuuu"))
             .appendOptional(DateTimeFormatter.ofPattern("dd-MM-uuuu"))
             .appendOptional(DateTimeFormatter.ofPattern("dd.MM.uuuu"))
-            .appendOptional(DateTimeFormatter.ofPattern("d.MM.uuuu")).toFormatter();
+            .appendOptional(DateTimeFormatter.ofPattern("d.MM.uuuu"))
+            .appendOptional(DateTimeFormatter.ofPattern("d/M"))
+            .appendOptional(DateTimeFormatter.ofPattern("dd/M"))
+            .appendOptional(DateTimeFormatter.ofPattern("d/MM"))
+            .appendOptional(DateTimeFormatter.ofPattern("dd/MM"))
+            .parseDefaulting(ChronoField.YEAR, LocalDate.now().getYear())
+            .toFormatter();
 
     private static final DateTimeFormatter INPUTFORMATTERWITHRESOLVER = INPUTFORMATTER
             .withResolverStyle(ResolverStyle.STRICT);

diff --git a/src/main/java/seedu/guilttrip/ui/MainWindow.java b/src/main/java/seedu/guilttrip/ui/MainWindow.java
@@ -68,6 +68,7 @@ public class MainWindow extends UiPart<Stage> {
     private StatisticsWindow statsListPanel;
     private StatisticsPieChartHolder statsGraphics;
     private StatisticsBarChart statsBar;
+    private BudgetPanel budgetsPanel;
 
     private boolean isStatsWindow;
     private boolean isStatsGraphicsWindow;

diff --git a/src/main/java/seedu/guilttrip/ui/budget/BudgetCard.java b/src/main/java/seedu/guilttrip/ui/budget/BudgetCard.java
@@ -37,7 +37,7 @@ public class BudgetCard extends UiPart<Region> {
     @FXML
     private Label date;
     @FXML
-    private Label left;
+    private Label spent;
     @FXML
     private ProgressBar progressBar;
     @FXML
@@ -55,13 +55,17 @@ public BudgetCard(Budget budget, int displayedIndex) {
         String fullDesc = budget.getDesc().fullDesc;
         desc.setText(fullDesc);
         date.setText(budget.getDate().toString() + " - " + budget.getEndDate().toString());
-        double leftAmount = budget.getAmount().value - budget.getSpent().value;
+        double spentAmount = budget.getSpent().value;
         double totalAmount = budget.getAmount().value;
-        //left.setText("left: $" + leftAmount + " out of: $" + budget.getAmount().value);
-        left.setText("$" + leftAmount);
+        spent.setText("$" + spentAmount);
         total.setText("$" + totalAmount);
 
-        progressBar.setProgress(leftAmount / totalAmount);
+        progressBar.setProgress(spentAmount / totalAmount);
+        if (spentAmount / totalAmount >= 1) {
+            progressBar.setStyle("-fx-accent: IndianRed;");
+        } else {
+            progressBar.setStyle("-fx-accent: SteelBlue;");
+        }
 
         category.setText(budget.getCategory().toString());
 

diff --git a/src/main/resources/view/budget/BudgetListCard.fxml b/src/main/resources/view/budget/BudgetListCard.fxml
@@ -40,7 +40,7 @@
       </HBox>
 
     <HBox GridPane.columnIndex="1" spacing="5">
-      <Label fx:id="left" styleClass="cell_big_label_amt" text="\$left" />
+      <Label fx:id="spent" styleClass="cell_big_label_amt" text="\$spent" />
       <ProgressBar fx:id="progressBar" />
       <Label fx:id="total" styleClass="cell_big_label_amt" text="\$total"/>
     </HBox>

diff --git a/src/test/java/seedu/guilttrip/logic/parser/AddCategoryCommandParserTest.java b/src/test/java/seedu/guilttrip/logic/parser/AddCategoryCommandParserTest.java
@@ -39,17 +39,16 @@ public void parse_allFieldsPresent_success() {
 
     @Test
     public void parse_compulsoryFieldMissing_failure() {
-        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT , AddCategoryCommand.MESSAGE_USAGE);
+        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCategoryCommand.MESSAGE_USAGE);
 
         // missing category prefix
-        assertParseFailure(parser, VALID_CATEGORY_TYPE_EXPENSE + CATEGORY_NAME_EXPENSE, expectedMessage);
+        assertParseFailure(parser, VALID_CATEGORY_TYPE_EXPENSE + CATEGORY_NAME_EXPENSE);
 
         // missing Category name prefix
-        assertParseFailure(parser, CATEGORY_TYPE_EXPENSE + VALID_CATEGORY_NAME_EXPENSE_FOOD, expectedMessage);
+        assertParseFailure(parser, CATEGORY_TYPE_EXPENSE + VALID_CATEGORY_NAME_EXPENSE_FOOD);
 
         // all prefixes missing
-        assertParseFailure(parser, VALID_CATEGORY_TYPE_EXPENSE + VALID_CATEGORY_NAME_EXPENSE_FOOD,
-                expectedMessage);
+        assertParseFailure(parser, VALID_CATEGORY_TYPE_EXPENSE + VALID_CATEGORY_NAME_EXPENSE_FOOD);
     }
 
     @Test
@@ -59,7 +58,6 @@ public void parse_invalidValue_failure() {
                 Category.MESSAGE_CONSTRAINTS_TYPE);
 
         // non-empty preamble
-        assertParseFailure(parser, PREAMBLE_NON_EMPTY + CATEGORY_TYPE_INCOME + CATEGORY_NAME_INCOME,
-                String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCategoryCommand.MESSAGE_USAGE));
+        assertParseFailure(parser, PREAMBLE_NON_EMPTY + CATEGORY_TYPE_INCOME + CATEGORY_NAME_INCOME);
     }
 }
diff --git a/src/test/java/seedu/guilttrip/logic/parser/AddExpenseCommandParserTest.java b/src/test/java/seedu/guilttrip/logic/parser/AddExpenseCommandParserTest.java
@@ -1,6 +1,5 @@
 package seedu.guilttrip.logic.parser;
 
-import static seedu.guilttrip.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.guilttrip.logic.commands.CommandTestUtil.AMOUNT_CLOTHING_EXPENSE;
 import static seedu.guilttrip.logic.commands.CommandTestUtil.AMOUNT_FOOD_EXPENSE;
 import static seedu.guilttrip.logic.commands.CommandTestUtil.CATEGORY_CLOTHING_EXPENSE;
@@ -49,7 +48,7 @@ public void parse_allFieldsPresent_success() {
 
         // whitespace only preamble
         assertParseSuccess(parser, PREAMBLE_WHITESPACE + NAME_DESC_FOOD_EXPENSE + AMOUNT_FOOD_EXPENSE
-                + CATEGORY_FOOD_EXPENSE + DATE_FOOD_EXPENSE + TAG_DESC_FOOD,
+                        + CATEGORY_FOOD_EXPENSE + DATE_FOOD_EXPENSE + TAG_DESC_FOOD,
                 new AddExpenseCommand(expectedExpense));
 
         // multiple tags - all accepted
@@ -73,39 +72,32 @@ public void parse_optionalFieldsMissing_success() {
 
     @Test
     public void parse_compulsoryFieldMissing_failure() {
-        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT , AddExpenseCommand.MESSAGE_USAGE);
-
         // missing name prefix
         assertParseFailure(parser, VALID_DESC_CLOTHING_EXPENSE + AMOUNT_CLOTHING_EXPENSE
-                        + CATEGORY_CLOTHING_EXPENSE + DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT,
-                expectedMessage);
+                + CATEGORY_CLOTHING_EXPENSE + DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT);
 
         // missing amount prefix
         assertParseFailure(parser, NAME_DESC_CLOTHING_EXPENSE + VALID_AMOUNT_CLOTHING_EXPENSE
-                        + CATEGORY_CLOTHING_EXPENSE + DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT,
-                expectedMessage);
+                + CATEGORY_CLOTHING_EXPENSE + DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT);
 
         // missing category prefix
         assertParseFailure(parser, NAME_DESC_CLOTHING_EXPENSE + AMOUNT_CLOTHING_EXPENSE
-                        + VALID_CATEGORY_CLOTHING_EXPENSE + DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT,
-                expectedMessage);
+                + VALID_CATEGORY_CLOTHING_EXPENSE + DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT);
 
         // missing guilttrip prefix
         assertParseFailure(parser, NAME_DESC_CLOTHING_EXPENSE + AMOUNT_CLOTHING_EXPENSE
-                        + CATEGORY_CLOTHING_EXPENSE + VALID_DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT,
-                expectedMessage);
+                + CATEGORY_CLOTHING_EXPENSE + VALID_DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT);
 
         // all prefixes missing
         assertParseFailure(parser, NAME_DESC_CLOTHING_EXPENSE + VALID_AMOUNT_CLOTHING_EXPENSE
-                        + VALID_CATEGORY_CLOTHING_EXPENSE + VALID_DATE_CLOTHING_EXPENSE + VALID_TAG_CLOTHING_CLOTHES,
-                expectedMessage);
+                + VALID_CATEGORY_CLOTHING_EXPENSE + VALID_DATE_CLOTHING_EXPENSE + VALID_TAG_CLOTHING_CLOTHES);
     }
 
     @Test
     public void parse_invalidValue_failure() {
         // invalid name
         assertParseFailure(parser, INVALID_NAME_DESC + AMOUNT_CLOTHING_EXPENSE
-                + CATEGORY_CLOTHING_EXPENSE + DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT,
+                        + CATEGORY_CLOTHING_EXPENSE + DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT,
                 Description.MESSAGE_CONSTRAINTS);
 
         // invalid amount
@@ -130,8 +122,7 @@ public void parse_invalidValue_failure() {
 
         // non-empty preamble
         assertParseFailure(parser, PREAMBLE_NON_EMPTY + NAME_DESC_CLOTHING_EXPENSE + AMOUNT_CLOTHING_EXPENSE
-                        + CATEGORY_CLOTHING_EXPENSE + DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT,
-                String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddExpenseCommand.MESSAGE_USAGE));
+                + CATEGORY_CLOTHING_EXPENSE + DATE_CLOTHING_EXPENSE + TAG_DESC_CLOTHING + TAG_DESC_WANT);
     }
 
 }
diff --git a/src/test/java/seedu/guilttrip/logic/parser/CommandParserTestUtil.java b/src/test/java/seedu/guilttrip/logic/parser/CommandParserTestUtil.java
@@ -38,4 +38,17 @@ public static void assertParseFailure(Parser parser, String userInput, String ex
             assertEquals(expectedMessage, ie.getMessage());
         }
     }
+
+    /**
+     * Asserts that the parsing of {@code userInput} by {@code parser} is unsuccessful and the error message
+     * equals to {@code expectedMessage}.
+     */
+    public static void assertParseFailure(Parser parser, String userInput) {
+        try {
+            parser.parse(userInput);
+            throw new AssertionError("The expected ParseException was not thrown.");
+        } catch (Exception e) {
+            return;
+        }
+    }
 }