Merge pull request #43 from AY1920S1-CS2103-T16-1/master

Team repo update 6 Nov
whneo97 · Nov 6, 2019 · e46997c · e46997c
2 parents 31e1ffd + a4c06bf
commit e46997c
Show file tree

Hide file tree

Showing 225 changed files with 949 additions and 862 deletions.
diff --git a/build.gradle b/build.gradle
@@ -158,6 +158,10 @@ task extrachecks(type: Exec) {
     commandLine 'bash', './config/travis/run-checks.sh'
 }
 
+run{
+    enableAssertions = true
+}
+
 tasks.check {
     dependsOn extrachecks
 }

diff --git a/docs/team/whneo97.adoc b/docs/team/whneo97.adoc
@@ -34,6 +34,9 @@ running of the program.
 
 ** Project management:
 *** Refined release of `v1.3.2` and `v1.3.3` on GitHub.
+*** Wrote additional tests for existing features to increase line coverage by 21%. (Pull requests
+https://github.com/AY1920S1-CS2103-T16-1/main/pull/173[#173], https://github.com/AY1920S1-CS2103-T16-1/main/pull/176[#176],
+https://github.com/AY1920S1-CS2103-T16-1/main/pull/181[#181])
 ** Enhancements to existing features:
 *** Abstracted code in MainApp to reduce code redundancies.
 (Pull request https://github.com/AY1920S1-CS2103-T16-1/main/pull/88/commits/07279dd4494f1cd3916b4ee083de1b6fca2d1d1a[#88])

diff --git a/src/main/java/seedu/sugarmummy/MainApp.java b/src/main/java/seedu/sugarmummy/MainApp.java
@@ -18,28 +18,28 @@
 import seedu.sugarmummy.logic.LogicManager;
 import seedu.sugarmummy.model.Model;
 import seedu.sugarmummy.model.ModelManager;
-import seedu.sugarmummy.model.ReadOnlyCalendar;
 import seedu.sugarmummy.model.ReadOnlyData;
-import seedu.sugarmummy.model.ReadOnlyUserList;
 import seedu.sugarmummy.model.ReadOnlyUserPrefs;
 import seedu.sugarmummy.model.UserPrefs;
-import seedu.sugarmummy.model.bio.UserList;
+import seedu.sugarmummy.model.biography.ReadOnlyUserList;
+import seedu.sugarmummy.model.biography.UserList;
 import seedu.sugarmummy.model.calendar.Calendar;
-import seedu.sugarmummy.model.record.UniqueRecordList;
+import seedu.sugarmummy.model.calendar.ReadOnlyCalendar;
+import seedu.sugarmummy.model.foodrecommendations.UniqueFoodList;
+import seedu.sugarmummy.model.records.UniqueRecordList;
 import seedu.sugarmummy.model.util.SampleCalendarDataUtil;
 import seedu.sugarmummy.model.util.SampleFoodDataUtil;
 import seedu.sugarmummy.model.util.SampleRecordDataUtil;
 import seedu.sugarmummy.model.util.SampleUserDataUtil;
-import seedu.sugarmummy.recmfood.model.UniqueFoodList;
-import seedu.sugarmummy.recmfood.storage.JsonFoodListStorage;
-import seedu.sugarmummy.storage.JsonCalendarStorage;
-import seedu.sugarmummy.storage.JsonRecordListStorage;
 import seedu.sugarmummy.storage.JsonUserPrefsStorage;
 import seedu.sugarmummy.storage.Storage;
 import seedu.sugarmummy.storage.StorageManager;
-import seedu.sugarmummy.storage.UserListStorage;
 import seedu.sugarmummy.storage.UserPrefsStorage;
-import seedu.sugarmummy.storage.bio.JsonUserListStorage;
+import seedu.sugarmummy.storage.biography.JsonUserListStorage;
+import seedu.sugarmummy.storage.biography.UserListStorage;
+import seedu.sugarmummy.storage.calendar.JsonCalendarStorage;
+import seedu.sugarmummy.storage.foodrecommendations.JsonFoodListStorage;
+import seedu.sugarmummy.storage.records.JsonRecordListStorage;
 import seedu.sugarmummy.ui.Ui;
 import seedu.sugarmummy.ui.UiManager;
 

diff --git a/src/main/java/seedu/sugarmummy/commons/core/Messages.java b/src/main/java/seedu/sugarmummy/commons/core/Messages.java
@@ -1,6 +1,6 @@
 package seedu.sugarmummy.commons.core;
 
-import seedu.sugarmummy.logic.commands.bio.BioCommand;
+import seedu.sugarmummy.logic.commands.biography.BioCommand;
 
 /**
  * Container for user visible messages.
@@ -12,21 +12,14 @@ public class Messages {
             + "command means :(";
     public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Oops! The command you've entered appears to be in "
             + "an invalid format. \n%1$s";
-    public static final String MESSAGE_INVALID_SUBARGUMENT_INDEX = "Oops! The index / indices provided in the "
-            + "sub-arguments is/are invalid. Index / indices must be integers greater than or equal to 1.";
-    public static final String MESSAGE_SUBARGUMENT_INDEX_OUT_OF_BOUNDS = "Oops! The index / indices provided in the "
-            + "sub-arguments is/are out of bounds.";
-    public static final String MESSAGE_INCONSISTENT_SUBARGUMENT_INDEX = "Oops! the use of index / indices provided in "
-            + "the sub-arguments is/are inconsistent. (i.e. some prefixes of the same type have no indices while "
-            + "others do)";
     public static final String MESSAGE_ARGUMENTS_MUST_BE_EMPTY = "Oops! This command cannot have any arguments.";
     public static final String MESSAGE_INVALID_PARAMETER = "Please enter correct input for %1$s!\n%2$s\n";
 
     //---Record---
     public static final String MESSAGE_INVALID_RECORD_DISPLAYED_INDEX = "The record index provided is invalid";
-    public static final String MESSAGE_RECORDS_LISTED_OVERVIEW = "%1$d persons listed!";
 
     //---Statistics---
+
     public static final String MESSAGE_INVALID_RECORD_TYPE = "System does not accommodate such a record type.";
     public static final String MESSAGE_INVALID_AVERAGE_TYPE = "System does not accommodate such a average type.";
     public static final String MESSAGE_POSSIBLE_RECORD_TYPE = "RECORD_TYPE is \"BLOODSUGAR\" or \"BMI\"";
@@ -42,14 +35,21 @@ public class Messages {
             + "each for the following prefixes that you keyed in: ";
     public static final String MESSAGE_ENSURE_ONLY_ONE_PREFIX_SINGULAR = "Please ensure there is at most one prefix "
             + "for this prefix that you keyed in: ";
+    public static final String MESSAGE_INVALID_SUBARGUMENT_INDEX = "Oops! The index / indices provided in the "
+            + "sub-arguments is/are invalid. Index / indices must be integers greater than or equal to 1.";
+    public static final String MESSAGE_SUBARGUMENT_INDEX_OUT_OF_BOUNDS = "Oops! The index / indices provided in the "
+            + "sub-arguments is/are out of bounds.";
+    public static final String MESSAGE_INCONSISTENT_SUBARGUMENT_INDEX = "Oops! the use of index / indices provided in "
+            + "the sub-arguments is/are inconsistent. (i.e. some prefixes of the same type have no indices while "
+            + "others do)";
 
-    //---Aesthetics---
-
+    //---Image Referencing (both Bio and Aesthetics)---
     public static final String MESSAGE_UNABLE_TO_LOAD_IMAGE = "Oops! Unfortunately, I'm unable to load or access "
             + "the image via the specified path. Please check if the file at the given destination is correct.";
     public static final String MESSAGE_UNABLE_TO_LOAD_REFERENCES = "I'm unable to load the following references and "
             + "as such have removed them so they will not cause any errors in the program:\n";
 
+    //---Aesthetics---
     public static final String MESSAGE_USE_ONLY_ONE_FONT_COLOUR_PREFIX = "Oops! You have used more than one "
             + "fontcolour prefix or types of fontcolour prefixes (eg. fontcolor). Please use at most one.";
     public static final String MESSAGE_USE_ONLY_ONE_BACKGROUND_PREFIX = "Oops! You have used more than one "
@@ -62,6 +62,7 @@ public class Messages {
     public static final String MESSAGE_INVALID_BACKGROUND_REPEAT = "Oops! The background repeat settings you entered "
             + "does not appear to match any known settings. Scroll to view usage details. \n%1$s";
 
+    //---Achievements---
     public static final String MESSAGE_ACHIEVEMENTS_ATTAINED_AND_LOST = "You have attained new achievement(s) and "
             + "lost one / some too! Key in the \'achvm\' command to view your updated list of achievements. :)";
     public static final String MESSAGE_ACHIEVEMENTS_ATTAINED = "You have attained new achievement(s)! Key in "

diff --git a/src/main/java/seedu/sugarmummy/logic/Logic.java b/src/main/java/seedu/sugarmummy/logic/Logic.java
@@ -13,16 +13,16 @@
 import seedu.sugarmummy.logic.commands.exceptions.CommandException;
 import seedu.sugarmummy.logic.parser.exceptions.ParseException;
 import seedu.sugarmummy.model.Model;
-import seedu.sugarmummy.model.ReadOnlyCalendar;
-import seedu.sugarmummy.model.ReadOnlyUserList;
 import seedu.sugarmummy.model.achievements.Achievement;
 import seedu.sugarmummy.model.aesthetics.Background;
 import seedu.sugarmummy.model.aesthetics.Colour;
-import seedu.sugarmummy.model.bio.User;
+import seedu.sugarmummy.model.biography.ReadOnlyUserList;
+import seedu.sugarmummy.model.biography.User;
 import seedu.sugarmummy.model.calendar.CalendarEntry;
-import seedu.sugarmummy.model.record.Record;
-import seedu.sugarmummy.model.record.RecordType;
-import seedu.sugarmummy.recmfood.model.Food;
+import seedu.sugarmummy.model.calendar.ReadOnlyCalendar;
+import seedu.sugarmummy.model.foodrecommendations.Food;
+import seedu.sugarmummy.model.records.Record;
+import seedu.sugarmummy.model.records.RecordType;
 import seedu.sugarmummy.ui.DisplayPaneType;
 
 /**

diff --git a/src/main/java/seedu/sugarmummy/logic/LogicManager.java b/src/main/java/seedu/sugarmummy/logic/LogicManager.java
@@ -18,16 +18,16 @@
 import seedu.sugarmummy.logic.parser.SugarMummyParser;
 import seedu.sugarmummy.logic.parser.exceptions.ParseException;
 import seedu.sugarmummy.model.Model;
-import seedu.sugarmummy.model.ReadOnlyCalendar;
-import seedu.sugarmummy.model.ReadOnlyUserList;
 import seedu.sugarmummy.model.achievements.Achievement;
 import seedu.sugarmummy.model.aesthetics.Background;
 import seedu.sugarmummy.model.aesthetics.Colour;
-import seedu.sugarmummy.model.bio.User;
+import seedu.sugarmummy.model.biography.ReadOnlyUserList;
+import seedu.sugarmummy.model.biography.User;
 import seedu.sugarmummy.model.calendar.CalendarEntry;
-import seedu.sugarmummy.model.record.Record;
-import seedu.sugarmummy.model.record.RecordType;
-import seedu.sugarmummy.recmfood.model.Food;
+import seedu.sugarmummy.model.calendar.ReadOnlyCalendar;
+import seedu.sugarmummy.model.foodrecommendations.Food;
+import seedu.sugarmummy.model.records.Record;
+import seedu.sugarmummy.model.records.RecordType;
 import seedu.sugarmummy.storage.Storage;
 import seedu.sugarmummy.ui.DisplayPaneType;
 

diff --git a/src/main/java/seedu/sugarmummy/logic/commands/Command.java b/src/main/java/seedu/sugarmummy/logic/commands/Command.java
@@ -27,6 +27,7 @@ public abstract class Command {
 
     /**
      * Returns
+     *
      * @return
      */
     public boolean isToCreateNewPane() {

diff --git a/...my/logic/commands/achvm/AchvmCommand.java → ...c/commands/achievements/AchvmCommand.java b/...my/logic/commands/achvm/AchvmCommand.java → ...c/commands/achievements/AchvmCommand.java
@@ -1,4 +1,4 @@
-package seedu.sugarmummy.logic.commands.achvm;
+package seedu.sugarmummy.logic.commands.achievements;
 
 import java.util.List;
 import java.util.Map;
@@ -7,8 +7,9 @@
 import seedu.sugarmummy.logic.commands.CommandResult;
 import seedu.sugarmummy.model.Model;
 import seedu.sugarmummy.model.achievements.Achievement;
-import seedu.sugarmummy.model.record.RecordType;
+import seedu.sugarmummy.model.records.RecordType;
 import seedu.sugarmummy.ui.DisplayPaneType;
+
 /**
  * Displays information on user's biography.
  */

diff --git a/src/main/java/seedu/sugarmummy/logic/commands/aesthetics/FontColourCommand.java b/src/main/java/seedu/sugarmummy/logic/commands/aesthetics/FontColourCommand.java
@@ -135,6 +135,7 @@ public boolean equals(Object other) {
 
                 assert this.fontColour != null;
                 assert this.backgroundCommand != null;
+
                 return this.fontColour.equals(((FontColourCommand) other).fontColour)
                         && this.backgroundCommand.equals(((FontColourCommand) other).backgroundCommand);
             } else {

diff --git a/...mmy/logic/commands/bio/AddBioCommand.java → ...gic/commands/biography/AddBioCommand.java b/...mmy/logic/commands/bio/AddBioCommand.java → ...gic/commands/biography/AddBioCommand.java
@@ -1,4 +1,4 @@
-package seedu.sugarmummy.logic.commands.bio;
+package seedu.sugarmummy.logic.commands.biography;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.sugarmummy.logic.parser.CliSyntax.PREFIX_ADDRESS;
@@ -18,7 +18,7 @@
 import seedu.sugarmummy.logic.commands.CommandResult;
 import seedu.sugarmummy.logic.commands.exceptions.CommandException;
 import seedu.sugarmummy.model.Model;
-import seedu.sugarmummy.model.bio.User;
+import seedu.sugarmummy.model.biography.User;
 import seedu.sugarmummy.ui.DisplayPaneType;
 
 /**
@@ -95,6 +95,8 @@ public CommandResult execute(Model model) throws CommandException {
             }
         });
 
+        assert !addedFields.toString().isEmpty() : "Added fields in user feedback cannot be empty.";
+
         return new CommandResult(String.format(MESSAGE_SUCCESS, addedFields.toString().trim()));
     }
 
@@ -115,8 +117,4 @@ public boolean isToCreateNewPane() {
         return true;
     }
 
-    @Override
-    public String toString() {
-        return "AddBioCommand with user: " + toAdd;
-    }
 }
diff --git a/...rmummy/logic/commands/bio/BioCommand.java → .../logic/commands/biography/BioCommand.java b/...rmummy/logic/commands/bio/BioCommand.java → .../logic/commands/biography/BioCommand.java
@@ -1,4 +1,4 @@
-package seedu.sugarmummy.logic.commands.bio;
+package seedu.sugarmummy.logic.commands.biography;
 
 import seedu.sugarmummy.logic.commands.Command;
 import seedu.sugarmummy.logic.commands.CommandResult;

diff --git a/...y/logic/commands/bio/ClearBioCommand.java → ...c/commands/biography/ClearBioCommand.java b/...y/logic/commands/bio/ClearBioCommand.java → ...c/commands/biography/ClearBioCommand.java
@@ -1,12 +1,12 @@
-package seedu.sugarmummy.logic.commands.bio;
+package seedu.sugarmummy.logic.commands.biography;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.sugarmummy.logic.commands.Command;
 import seedu.sugarmummy.logic.commands.CommandResult;
 import seedu.sugarmummy.logic.commands.exceptions.CommandException;
 import seedu.sugarmummy.model.Model;
-import seedu.sugarmummy.model.bio.UserList;
+import seedu.sugarmummy.model.biography.UserList;
 import seedu.sugarmummy.ui.DisplayPaneType;
 
 /**

diff --git a/...my/logic/commands/bio/EditBioCommand.java → ...ic/commands/biography/EditBioCommand.java b/...my/logic/commands/bio/EditBioCommand.java → ...ic/commands/biography/EditBioCommand.java
@@ -1,4 +1,4 @@
-package seedu.sugarmummy.logic.commands.bio;
+package seedu.sugarmummy.logic.commands.biography;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.sugarmummy.commons.core.Messages.MESSAGE_SUBARGUMENT_INDEX_OUT_OF_BOUNDS;
@@ -29,19 +29,19 @@
 import seedu.sugarmummy.logic.commands.CommandResult;
 import seedu.sugarmummy.logic.commands.exceptions.CommandException;
 import seedu.sugarmummy.model.Model;
-import seedu.sugarmummy.model.bio.Address;
-import seedu.sugarmummy.model.bio.DateOfBirth;
-import seedu.sugarmummy.model.bio.DisplayPicPath;
-import seedu.sugarmummy.model.bio.Gender;
-import seedu.sugarmummy.model.bio.Goal;
-import seedu.sugarmummy.model.bio.ListableField;
-import seedu.sugarmummy.model.bio.MedicalCondition;
-import seedu.sugarmummy.model.bio.Name;
-import seedu.sugarmummy.model.bio.Nric;
-import seedu.sugarmummy.model.bio.OtherBioInfo;
-import seedu.sugarmummy.model.bio.Phone;
-import seedu.sugarmummy.model.bio.ProfileDesc;
-import seedu.sugarmummy.model.bio.User;
+import seedu.sugarmummy.model.biography.Address;
+import seedu.sugarmummy.model.biography.DateOfBirth;
+import seedu.sugarmummy.model.biography.DisplayPicPath;
+import seedu.sugarmummy.model.biography.Gender;
+import seedu.sugarmummy.model.biography.Goal;
+import seedu.sugarmummy.model.biography.ListableField;
+import seedu.sugarmummy.model.biography.MedicalCondition;
+import seedu.sugarmummy.model.biography.Name;
+import seedu.sugarmummy.model.biography.Nric;
+import seedu.sugarmummy.model.biography.OtherBioInfo;
+import seedu.sugarmummy.model.biography.Phone;
+import seedu.sugarmummy.model.biography.ProfileDesc;
+import seedu.sugarmummy.model.biography.User;
 import seedu.sugarmummy.ui.DisplayPaneType;
 
 /**
@@ -202,6 +202,9 @@ public CommandResult execute(Model model) throws CommandException {
                 editedFields.append("\n");
             });
 
+            assert changedDifferences.size() == 0 || !editedFields.toString().isEmpty()
+                    : "Edited fields in user feedback cannot be empty.";
+
             return new CommandResult(changedDifferences.size() == 0
                     ? MESSAGE_NO_CHANGE
                     : String.format(MESSAGE_EDIT_USER_SUCCESS,

diff --git a/src/main/java/seedu/sugarmummy/logic/commands/calendar/CalendarCommand.java b/src/main/java/seedu/sugarmummy/logic/commands/calendar/CalendarCommand.java
@@ -7,7 +7,6 @@
 
 import java.util.Optional;
 
-import seedu.sugarmummy.logic.commands.CalendarCommandResult;
 import seedu.sugarmummy.logic.commands.Command;
 import seedu.sugarmummy.logic.commands.CommandResult;
 import seedu.sugarmummy.logic.commands.exceptions.CommandException;

diff --git a/...logic/commands/CalendarCommandResult.java → ...mands/calendar/CalendarCommandResult.java b/...logic/commands/CalendarCommandResult.java → ...mands/calendar/CalendarCommandResult.java
@@ -1,7 +1,8 @@
-package seedu.sugarmummy.logic.commands;
+package seedu.sugarmummy.logic.commands.calendar;
 
 import java.util.Optional;
 
+import seedu.sugarmummy.logic.commands.CommandResult;
 import seedu.sugarmummy.model.time.YearMonth;
 import seedu.sugarmummy.model.time.YearMonthDay;
 

diff --git a/...mmy/recmfood/commands/AddFoodCommand.java → ...s/foodrecommendations/AddFoodCommand.java b/...mmy/recmfood/commands/AddFoodCommand.java → ...s/foodrecommendations/AddFoodCommand.java
@@ -1,4 +1,4 @@
-package seedu.sugarmummy.recmfood.commands;
+package seedu.sugarmummy.logic.commands.foodrecommendations;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.sugarmummy.logic.parser.CliSyntax.PREFIX_CALORIE;
@@ -12,7 +12,7 @@
 import seedu.sugarmummy.logic.commands.CommandResult;
 import seedu.sugarmummy.logic.commands.exceptions.CommandException;
 import seedu.sugarmummy.model.Model;
-import seedu.sugarmummy.recmfood.model.Food;
+import seedu.sugarmummy.model.foodrecommendations.Food;
 import seedu.sugarmummy.ui.DisplayPaneType;
 
 /**

diff --git a/...my/recmfood/commands/RecmFoodCommand.java → .../foodrecommendations/RecmFoodCommand.java b/...my/recmfood/commands/RecmFoodCommand.java → .../foodrecommendations/RecmFoodCommand.java
@@ -1,4 +1,4 @@
-package seedu.sugarmummy.recmfood.commands;
+package seedu.sugarmummy.logic.commands.foodrecommendations;
 
 import static java.util.Objects.requireNonNull;
 
@@ -8,9 +8,9 @@
 import seedu.sugarmummy.logic.commands.CommandResult;
 import seedu.sugarmummy.logic.commands.exceptions.CommandException;
 import seedu.sugarmummy.model.Model;
-import seedu.sugarmummy.recmfood.model.Food;
-import seedu.sugarmummy.recmfood.model.FoodComparator;
-import seedu.sugarmummy.recmfood.predicates.FoodTypeIsWantedPredicate;
+import seedu.sugarmummy.model.foodrecommendations.Food;
+import seedu.sugarmummy.model.foodrecommendations.FoodComparator;
+import seedu.sugarmummy.model.foodrecommendations.predicates.FoodTypeIsWantedPredicate;
 import seedu.sugarmummy.ui.DisplayPaneType;
 
 /**

diff --git a/...cmfood/commands/RecmMixedFoodCommand.java → ...recommendations/RecmMixedFoodCommand.java b/...cmfood/commands/RecmMixedFoodCommand.java → ...recommendations/RecmMixedFoodCommand.java
@@ -1,4 +1,4 @@
-package seedu.sugarmummy.recmfood.commands;
+package seedu.sugarmummy.logic.commands.foodrecommendations;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...cmfood/commands/ResetFoodDataCommand.java → ...recommendations/ResetFoodDataCommand.java b/...cmfood/commands/ResetFoodDataCommand.java → ...recommendations/ResetFoodDataCommand.java
@@ -1,4 +1,4 @@
-package seedu.sugarmummy.recmfood.commands;
+package seedu.sugarmummy.logic.commands.foodrecommendations;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.sugarmummy.model.util.SampleFoodDataUtil.getSampleFoodList;

diff --git a/...sugarmummy/logic/commands/AddCommand.java → ...my/logic/commands/records/AddCommand.java b/...sugarmummy/logic/commands/AddCommand.java → ...my/logic/commands/records/AddCommand.java
@@ -1,4 +1,4 @@
-package seedu.sugarmummy.logic.commands;
+package seedu.sugarmummy.logic.commands.records;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.sugarmummy.logic.parser.CliSyntax.PREFIX_BLOODSUGAR_CONCENTRATION;
@@ -7,9 +7,11 @@
 import static seedu.sugarmummy.logic.parser.CliSyntax.PREFIX_DATETIME;
 import static seedu.sugarmummy.logic.parser.CliSyntax.PREFIX_RECORDTYPE;
 
+import seedu.sugarmummy.logic.commands.Command;
+import seedu.sugarmummy.logic.commands.CommandResult;
 import seedu.sugarmummy.logic.commands.exceptions.CommandException;
 import seedu.sugarmummy.model.Model;
-import seedu.sugarmummy.model.record.Record;
+import seedu.sugarmummy.model.records.Record;
 import seedu.sugarmummy.ui.DisplayPaneType;
 
 /**