Merge pull request AY2324S1-CS2103T-T13-0#235 from xCOLOURx/branch-ad…

…d-mps-test

Add Test for ModulePlan Package

src/main/java/seedu/address/model/moduleplan/ModulePlan.java

@@ -16,11 +16,9 @@
  */
 public class ModulePlan implements ReadOnlyModulePlan {
 
-    private final ModulePlanSemesterList semesters;
 
-    {
-        semesters = new ModulePlanSemesterList();
-    }
+    private final ModulePlanSemesterList semesters = new ModulePlanSemesterList();
+
 
     /**
      * Creates a new empty ModulePlan.
@@ -54,24 +52,6 @@ public void setSemesters(List<ModulePlanSemester> semesters) {
         this.semesters.setSemesters(semesters);
     }
 
-    /**
-     * Adds a new semester to the module plan.
-     *
-     * @param semester The semester to be added.
-     */
-    public void addSemester(ModulePlanSemester semester) {
-        this.semesters.addSemester(semester);
-    }
-
-    /**
-     * Removes a semester from the module plan.
-     *
-     * @param semester The semester to be removed.
-     */
-    public void removeSemester(ModulePlanSemester semester) {
-        this.semesters.removeSemester(semester);
-    }
-
 
     //// module-level operations
 

src/main/java/seedu/address/model/moduleplan/ModulePlanSemester.java

@@ -17,18 +17,18 @@
  */
 public class ModulePlanSemester implements Comparable<ModulePlanSemester> {
 
-    private final UniqueModuleList modules;
-    private final Year year;
-    private final Semester semester;
 
-    {
-        modules = new UniqueModuleList();
-    }
+    private Year year;
+    private Semester semester;
+
+    private final UniqueModuleList modules = new UniqueModuleList();
 
     /**
      * Wraps all data at the Module Plan semester level.
      */
     public ModulePlanSemester(Year year, Semester semester) {
+        requireNonNull(year);
+        requireNonNull(semester);
         this.year = year;
         this.semester = semester;
     }
@@ -37,6 +37,7 @@ public ModulePlanSemester(Year year, Semester semester) {
      * Replaces the contents of the module list with {@code modules}.
      */
     public void setModules(List<Module> modules) {
+        requireNonNull(modules);
         this.modules.setModules(modules);
     }
 
@@ -54,13 +55,15 @@ public boolean hasModule(Module m) {
      * Adds a module to the module plan.
      */
     public void addModule(Module m) {
+        requireNonNull(m);
         modules.add(m);
     }
 
     /**
      * Removes {@code key} from this {@code ModulePlan}.
      */
     public void removeModule(Module key) {
+        requireNonNull(key);
         modules.remove(key);
     }
 
@@ -111,6 +114,8 @@ public Float totalValidMcs() {
      * @return Whether the module is among the modules in this semester or not.
      */
     public boolean checkModuleBelongToSemester(Module m) {
+        requireNonNull(m);
+
         boolean equalYear = this.year.equals(m.getYearTaken());
         boolean equalSemester = this.semester.equals(m.getSemesterTaken());
 
@@ -126,6 +131,8 @@ public boolean checkModuleBelongToSemester(Module m) {
      * Checks if the given semester is the same semesters.
      */
     public boolean checkIfSameSemester(ModulePlanSemester otherModulePlanSemester) {
+        requireNonNull(otherModulePlanSemester);
+
         boolean yearEquals = this.year.equals(otherModulePlanSemester.year);
         boolean semesterEquals = this.semester.equals(otherModulePlanSemester.semester);
 

src/main/java/seedu/address/model/moduleplan/exceptions/DuplicateSemesterException.java

@@ -5,6 +5,6 @@
  */
 public class DuplicateSemesterException extends RuntimeException {
     public DuplicateSemesterException() {
-        super("Operation would result in semesters");
+        super("Operation would result in duplicate semesters");
     }
 }

src/test/java/seedu/address/AppParametersTest.java

@@ -56,7 +56,7 @@ public void equals() {
         assertEquals(appParameters, appParameters);
 
         // null -> returns false
-        assertNotEquals(null, appParameters);
+        assertNotEquals(appParameters, null);
 
         // different types -> returns false
         assertNotEquals(appParameters, 0.5f);

src/test/java/seedu/address/logic/commands/AddCommandTest.java

@@ -100,7 +100,7 @@ public void equals() {
         assertNotEquals(1, addCommand);
 
         // null -> returns false
-        assertNotEquals(null, addCommand);
+        assertNotEquals(addCommand, null);
 
         // different module code -> returns false
         AddCommand differentCode = new AddCommand(otherModule.getModuleCode(), module.getYearTaken(),

src/test/java/seedu/address/logic/commands/CommandResultTest.java

@@ -18,7 +18,7 @@ public void equals() {
         assertEquals(commandResult, commandResult);
 
         // null -> returns false
-        assertNotEquals(null, commandResult);
+        assertNotEquals(commandResult, null);
 
         // different types -> returns false
         assertNotEquals(commandResult, 0.5f);

src/test/java/seedu/address/logic/commands/DeleteCommandTest.java

@@ -97,7 +97,7 @@ public void equals() {
         assertNotEquals(1, deleteCommand);
 
         // null -> returns false
-        assertNotEquals(null, deleteCommand);
+        assertNotEquals(deleteCommand, null);
 
         // different module -> returns false
         DeleteCommand differentDeleteCommand = prepareDeleteCommand(otherModule);

src/test/java/seedu/address/logic/commands/EditCommandTest.java

@@ -150,7 +150,7 @@ public void equals() {
         assertEquals(standardCommand, standardCommand);
 
         // null -> returns false
-        assertNotEquals(null, standardCommand);
+        assertNotEquals(standardCommand, null);
 
         // different types -> returns false
         assertNotEquals(standardCommand, new HelpCommand());

src/test/java/seedu/address/logic/commands/EditModuleDescriptorTest.java

@@ -24,7 +24,7 @@ public void equals() {
         assertEquals(DESC_CS2040S, DESC_CS2040S);
 
         // null -> returns false
-        assertNotEquals(null, DESC_CS2040S);
+        assertNotEquals(DESC_CS2040S, null);
 
         // different types -> returns false
         assertNotEquals(5, DESC_CS2040S);

src/test/java/seedu/address/logic/commands/InfoCommandTest.java

@@ -80,7 +80,7 @@ public void equals() {
         assertNotEquals(1, infoCommand);
 
         // null -> returns false
-        assertNotEquals(null, infoCommand);
+        assertNotEquals(infoCommand, null);
 
         // different module -> returns false
         InfoCommand differentInfoCommand = prepareInfoCommand(otherModule);

src/test/java/seedu/address/model/ModelManagerTest.java

@@ -186,7 +186,7 @@ public void equals() {
         assertEquals(modelManager, modelManager);
 
         // null -> returns false
-        assertNotEquals(null, modelManager);
+        assertNotEquals(modelManager, null);
 
         // different types -> returns false
         assertNotEquals(5, modelManager);

src/test/java/seedu/address/model/ModuleDataTest.java

@@ -106,7 +106,7 @@ public void equals() {
         assertEquals(moduleData, moduleData);
 
         // null -> returns false
-        assertNotEquals(null, moduleData);
+        assertNotEquals(moduleData, null);
 
         // different types -> returns false
         assertNotEquals(5, moduleData);

src/test/java/seedu/address/model/module/ModuleTest.java

@@ -48,7 +48,7 @@ public void equals() {
         assertEquals(CS2040S, CS2040S);
 
         // null -> returns false
-        assertNotEquals(null, CS2040S);
+        assertNotEquals(CS2040S, null);
 
         // different type -> returns false
         assertNotEquals(5, CS2040S);