From ecc95a9b5bfc3576a7b91fee2536fb7bd21fe18f Mon Sep 17 00:00:00 2001 From: AjeyAshok Date: Thu, 7 Nov 2019 19:33:45 +0800 Subject: [PATCH] Fixed checkstyle issues with test files --- gradle/wrapper/gradle-wrapper.jar | Bin 55190 -> 55616 bytes gradle/wrapper/gradle-wrapper.properties | 5 +- gradlew | 18 +++- gradlew.bat | 18 +++- savedWallet.txt | 4 +- .../java/CommandGetSpendingByMonthTest.java | 77 +++++++++--------- .../java/CommandGetSpendingByYearTest.java | 20 +++-- src/test/java/ui/MainGuiTest.java | 5 ++ 8 files changed, 93 insertions(+), 54 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738cbd051603d91cc39de6cb000dd98fe6b02..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644 GIT binary patch delta 3320 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 /year ", ans4); CommandGetSpendingByMonth c5 = new CommandGetSpendingByMonth("expendedmonth november /yea 2019"); c5.execute(storageManager); String ans5 = c5.getInfoCapsule().getOutputStr(); + assertEquals("Wrong format! FORMAT : expendedmonth /year ", ans5); CommandGetSpendingByMonth c6 = new CommandGetSpendingByMonth("expendedmonth november /year 1750"); c6.execute(storageManager); String ans6 = c6.getInfoCapsule().getOutputStr(); + assertEquals("Year is too far back into the past", ans6); CommandGetSpendingByMonth c7 = new CommandGetSpendingByMonth("expendedmonth november /year 2750"); c7.execute(storageManager); String ans7 = c7.getInfoCapsule().getOutputStr(); + assertEquals("Future year entered is invalid!", ans7); CommandGetSpendingByMonth c8 = new CommandGetSpendingByMonth("expendedmonth november /year"); c8.execute(storageManager); String ans8 = c8.getInfoCapsule().getOutputStr(); + assertEquals("No year input detected. FORMAT : expendedmonth /year ", ans8); CommandGetSpendingByMonth c9 = new CommandGetSpendingByMonth("expendedmonth /year 2019"); c9.execute(storageManager); String ans9 = c9.getInfoCapsule().getOutputStr(); - - assertEquals("The total amount of money spent in october 2019 : $5.0\n", ans1); - assertEquals("The total amount of money spent in november 2019 : $5.0\n", ans2); - assertEquals("Wrong month input. Check Spelling", ans3); - assertEquals("Year input contains lesser/extra number of variables. " - + "\nFORMAT : expendedmonth /year ", ans4); - assertEquals("Wrong format! FORMAT : expendedmonth /year ", ans5); - assertEquals("Year is too far back into the past", ans6); - assertEquals("Future year entered is invalid!", ans7); - assertEquals("No year input detected. FORMAT : expendedmonth /year ", ans8); - assertEquals("No month input detected. FORMAT : expendedmonth /year ", ans9); + assertEquals("No month input detected. FORMAT : expendedmonth /year ", ans9); } - } diff --git a/src/test/java/CommandGetSpendingByYearTest.java b/src/test/java/CommandGetSpendingByYearTest.java index 5a0a29d77f..857aa78b2f 100644 --- a/src/test/java/CommandGetSpendingByYearTest.java +++ b/src/test/java/CommandGetSpendingByYearTest.java @@ -27,34 +27,40 @@ void execute() { CommandGetSpendingByYear c1 = new CommandGetSpendingByYear("expendedyear 2019"); c1.execute(storageManager); String ans1 = c1.getInfoCapsule().getOutputStr(); + assertEquals("The total amount of money spent in 2019 : $10.0\n", ans1); CommandGetSpendingByYear c2 = new CommandGetSpendingByYear("expendedyear"); c2.execute(storageManager); String ans2 = c2.getInfoCapsule().getOutputStr(); + assertEquals("No year input detected.\nFORMAT : expendedyear 2019\n", ans2); CommandGetSpendingByYear c3 = new CommandGetSpendingByYear("expendedyear 201"); c3.execute(storageManager); String ans3 = c3.getInfoCapsule().getOutputStr(); + assertEquals("Year input contains lesser/extra number of variables.\n" + + " FORMAT : expendedyear 2019\n", ans3); CommandGetSpendingByYear c4 = new CommandGetSpendingByYear("expendedyear 2091"); c4.execute(storageManager); String ans4 = c4.getInfoCapsule().getOutputStr(); + assertEquals("Future year entered is invalid!" + "\n", ans4); CommandGetSpendingByYear c5 = new CommandGetSpendingByYear("expendedyear 1750"); c5.execute(storageManager); String ans5 = c5.getInfoCapsule().getOutputStr(); + assertEquals("Year is too far back into the past" + "\n", ans5); CommandGetSpendingByYear c6 = new CommandGetSpendingByYear("expendedyear abcd"); c6.execute(storageManager); String ans6 = c6.getInfoCapsule().getOutputStr(); - - assertEquals("The total amount of money spent in 2019 : $10.0\n", ans1); - assertEquals("No year input detected.\nFORMAT : expendedyear 2019\n", ans2); - assertEquals("Year input contains lesser/extra number of variables.\n" - + " FORMAT : expendedyear 2019\n", ans3); - assertEquals("Future year entered is invalid!" + "\n", ans4); - assertEquals("Year is too far back into the past" + "\n", ans5); assertEquals("Year input is either a double or contains String values.\n" + "FORMAT : expendedyear 2019\n", ans6); + + + + + + + } } diff --git a/src/test/java/ui/MainGuiTest.java b/src/test/java/ui/MainGuiTest.java index bcd55b0018..71a08d30fa 100644 --- a/src/test/java/ui/MainGuiTest.java +++ b/src/test/java/ui/MainGuiTest.java @@ -9,6 +9,11 @@ public class MainGuiTest extends MainGui { private String walletPath = "savedWallet.txt"; private MainWindow mainWindowController; + /** + * Tests the working of the GUI. + * @param taskPath is the path the leads to the task content + * @param walletPath is the path that leads to the wallet contents + */ public void initialize(String taskPath, String walletPath) { String[] args = {}; this.taskPath = taskPath;