Merge pull request #178 from aliciamichellew/alicia/add-test

Add tests for Note model package

build.gradle

@@ -41,6 +41,7 @@ task coverage(type: JacocoReport) {
 }
 
 dependencies {
+    testImplementation 'junit:junit:4.13.1'
     String jUnitVersion = '5.4.0'
     String javaFxVersion = '17.0.7'
 

src/main/java/seedu/address/logic/Messages.java

@@ -8,7 +8,7 @@
 import seedu.address.logic.parser.Prefix;
 import seedu.address.model.localcourse.LocalCourse;
 import seedu.address.model.mapping.Mapping;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 import seedu.address.model.partnercourse.PartnerCourse;
 import seedu.address.model.person.Person;
 import seedu.address.model.university.University;

src/main/java/seedu/address/logic/SeplendidLogic.java

@@ -14,7 +14,7 @@
 import seedu.address.model.SeplendidModel;
 import seedu.address.model.localcourse.LocalCourse;
 import seedu.address.model.mapping.Mapping;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 import seedu.address.model.partnercourse.PartnerCourse;
 import seedu.address.model.university.University;
 import seedu.address.seplendidui.Ui;

src/main/java/seedu/address/logic/SeplendidLogicManager.java

@@ -20,7 +20,7 @@
 import seedu.address.model.SeplendidModel;
 import seedu.address.model.localcourse.LocalCourse;
 import seedu.address.model.mapping.Mapping;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 import seedu.address.model.partnercourse.PartnerCourse;
 import seedu.address.model.university.University;
 import seedu.address.seplendidui.Ui;

src/main/java/seedu/address/logic/commands/NoteClearTagCommand.java

@@ -8,7 +8,7 @@
 import seedu.address.logic.commands.note.NoteCommand;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 import seedu.address.seplendidui.UiUtil;
 
 /**

src/main/java/seedu/address/logic/commands/note/NoteAddCommand.java

@@ -8,7 +8,7 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 import seedu.address.seplendidui.UiUtil;
 
 /**

src/main/java/seedu/address/logic/commands/note/NoteDeleteCommand.java

@@ -8,7 +8,7 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 import seedu.address.seplendidui.UiUtil;
 
 /**

src/main/java/seedu/address/logic/commands/note/NoteSearchCommand.java

@@ -8,7 +8,7 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;
-import seedu.address.model.notes.NoteTagContainsKeywordsPredicate;
+import seedu.address.model.note.NoteTagContainsKeywordsPredicate;
 import seedu.address.seplendidui.UiUtil;
 
 /**

src/main/java/seedu/address/logic/commands/note/NoteTagCommand.java

@@ -8,7 +8,7 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 import seedu.address.model.tag.Tag;
 import seedu.address.seplendidui.UiUtil;
 

src/main/java/seedu/address/logic/commands/note/NoteUpdateCommand.java

@@ -8,8 +8,8 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;
-import seedu.address.model.notes.Content;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Content;
+import seedu.address.model.note.Note;
 import seedu.address.seplendidui.UiUtil;
 
 /**

src/main/java/seedu/address/logic/parser/ParserUtil.java

@@ -18,7 +18,7 @@
 import seedu.address.model.localcourse.LocalUnit;
 import seedu.address.model.mapping.MappingAttributeEnum;
 import seedu.address.model.mapping.MappingMiscInformation;
-import seedu.address.model.notes.Content;
+import seedu.address.model.note.Content;
 import seedu.address.model.partnercourse.PartnerCode;
 import seedu.address.model.partnercourse.PartnerCourseAttribute;
 import seedu.address.model.partnercourse.PartnerDescription;

src/main/java/seedu/address/logic/parser/SeplendidParser.java

@@ -53,7 +53,10 @@
 import seedu.address.logic.parser.mapping.MappingSearchCommandParser;
 import seedu.address.logic.parser.mapping.MappingSortCommandParser;
 import seedu.address.logic.parser.note.NoteAddCommandParser;
+import seedu.address.logic.parser.note.NoteDeleteCommandParser;
 import seedu.address.logic.parser.note.NoteSearchCommandParser;
+import seedu.address.logic.parser.note.NoteTagCommandParser;
+import seedu.address.logic.parser.note.NoteUpdateCommandParser;
 import seedu.address.logic.parser.partnercourse.PartnerCourseAddCommandParser;
 import seedu.address.logic.parser.partnercourse.PartnerCourseDeleteCommandParser;
 import seedu.address.logic.parser.partnercourse.PartnerCourseSearchCommandParser;

src/main/java/seedu/address/logic/parser/note/NoteAddCommandParser.java

@@ -11,8 +11,8 @@
 import seedu.address.logic.parser.SeplendidArgumentMap;
 import seedu.address.logic.parser.SeplendidArgumentTokenizer;
 import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.notes.Content;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Content;
+import seedu.address.model.note.Note;
 import seedu.address.model.tag.Tag;
 
 /**

src/main/java/seedu/address/logic/parser/NoteDeleteCommandParser.java → src/main/java/seedu/address/logic/parser/note/NoteDeleteCommandParser.java

@@ -1,10 +1,14 @@
-package seedu.address.logic.parser;
+package seedu.address.logic.parser.note;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.parser.CliSyntax.PARAMETER_INDEX;
 import static seedu.address.logic.parser.ParserUtil.areValuesEnclosedAndNonEmpty;
 
 import seedu.address.logic.commands.note.NoteDeleteCommand;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.SeplendidArgumentMap;
+import seedu.address.logic.parser.SeplendidArgumentTokenizer;
 import seedu.address.logic.parser.exceptions.ParseException;
 
 

src/main/java/seedu/address/logic/parser/note/NoteSearchCommandParser.java

@@ -9,7 +9,7 @@
 import seedu.address.logic.parser.SeplendidArgumentMap;
 import seedu.address.logic.parser.SeplendidArgumentTokenizer;
 import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.notes.NoteTagContainsKeywordsPredicate;
+import seedu.address.model.note.NoteTagContainsKeywordsPredicate;
 import seedu.address.model.tag.Tag;
 
 /**

src/main/java/seedu/address/logic/parser/NoteTagCommandParser.java → src/main/java/seedu/address/logic/parser/note/NoteTagCommandParser.java

@@ -1,11 +1,15 @@
-package seedu.address.logic.parser;
+package seedu.address.logic.parser.note;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.parser.CliSyntax.PARAMETER_INDEX;
 import static seedu.address.logic.parser.CliSyntax.PARAMETER_TAGS;
 import static seedu.address.logic.parser.ParserUtil.areValuesEnclosedAndNonEmpty;
 
 import seedu.address.logic.commands.note.NoteTagCommand;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.SeplendidArgumentMap;
+import seedu.address.logic.parser.SeplendidArgumentTokenizer;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.tag.Tag;
 

src/main/java/seedu/address/logic/parser/NoteUpdateCommandParser.java → src/main/java/seedu/address/logic/parser/note/NoteUpdateCommandParser.java

@@ -1,4 +1,4 @@
-package seedu.address.logic.parser;
+package seedu.address.logic.parser.note;
 
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
@@ -7,8 +7,12 @@
 import static seedu.address.logic.parser.ParserUtil.areValuesEnclosedAndNonEmpty;
 
 import seedu.address.logic.commands.note.NoteUpdateCommand;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.SeplendidArgumentMap;
+import seedu.address.logic.parser.SeplendidArgumentTokenizer;
 import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.notes.Content;
+import seedu.address.model.note.Content;
 
 /**
  * Parses the given {@code String} of arguments in the context of the UpdateCommand

src/main/java/seedu/address/model/NoteCatalogue.java

@@ -6,8 +6,8 @@
 
 import javafx.collections.ObservableList;
 import seedu.address.commons.util.ToStringBuilder;
-import seedu.address.model.notes.Note;
-import seedu.address.model.notes.UniqueNoteList;
+import seedu.address.model.note.Note;
+import seedu.address.model.note.UniqueNoteList;
 
 /**
  * Wraps note data at the catalogue level

src/main/java/seedu/address/model/ReadOnlyNoteCatalogue.java

@@ -1,7 +1,7 @@
 package seedu.address.model;
 
 import javafx.collections.ObservableList;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 
 /**
  * Unmodifiable view of note catalogue.

src/main/java/seedu/address/model/SeplendidModel.java

@@ -13,8 +13,8 @@
 import seedu.address.model.localcourse.LocalCourseAttribute;
 import seedu.address.model.localcourse.LocalCourseContainsKeywordsPredicate;
 import seedu.address.model.mapping.Mapping;
-import seedu.address.model.notes.Note;
-import seedu.address.model.notes.NoteTagContainsKeywordsPredicate;
+import seedu.address.model.note.Note;
+import seedu.address.model.note.NoteTagContainsKeywordsPredicate;
 import seedu.address.model.partnercourse.PartnerCode;
 import seedu.address.model.partnercourse.PartnerCourse;
 import seedu.address.model.partnercourse.PartnerCourseAttribute;

src/main/java/seedu/address/model/SeplendidModelManager.java

@@ -22,8 +22,8 @@
 import seedu.address.model.localcourse.LocalCourseAttribute;
 import seedu.address.model.localcourse.LocalCourseContainsKeywordsPredicate;
 import seedu.address.model.mapping.Mapping;
-import seedu.address.model.notes.Note;
-import seedu.address.model.notes.NoteTagContainsKeywordsPredicate;
+import seedu.address.model.note.Note;
+import seedu.address.model.note.NoteTagContainsKeywordsPredicate;
 import seedu.address.model.partnercourse.PartnerCode;
 import seedu.address.model.partnercourse.PartnerCourse;
 import seedu.address.model.partnercourse.PartnerCourseAttribute;

src/main/java/seedu/address/model/notes/Content.java → src/main/java/seedu/address/model/note/Content.java

@@ -1,4 +1,4 @@
-package seedu.address.model.notes;
+package seedu.address.model.note;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.util.AppUtil.checkArgument;
@@ -14,7 +14,7 @@ public class Content {
      * The first character of the address must not be a whitespace,
      * otherwise " " (a blank string) becomes a valid input.
      */
-    public static final String VALIDATION_REGEX = "^[\\p{Alnum} .,!?\"'():\\-–]+";
+    public static final String VALIDATION_REGEX = "[^\\s].*[^\\s]";
 
     public final String content;
 

src/main/java/seedu/address/model/notes/Note.java → src/main/java/seedu/address/model/note/Note.java

@@ -1,4 +1,4 @@
-package seedu.address.model.notes;
+package seedu.address.model.note;
 
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
 
@@ -93,8 +93,7 @@ public boolean isSameNote(Note otherNote) {
         }
 
         return otherNote != null
-                && otherNote.getContent().equals(getContent())
-                && otherNote.getIndex().equals(getIndex());
+                && otherNote.getContent().equals(getContent());
     }
 
     /**

src/main/java/seedu/address/model/notes/NoteTagContainsKeywordsPredicate.java → src/main/java/seedu/address/model/note/NoteTagContainsKeywordsPredicate.java

@@ -1,4 +1,4 @@
-package seedu.address.model.notes;
+package seedu.address.model.note;
 
 import java.util.function.Predicate;
 
@@ -26,7 +26,7 @@ public boolean equals(Object other) {
         }
 
         // instanceof handles nulls
-        if (!(other instanceof seedu.address.model.notes.NoteTagContainsKeywordsPredicate)) {
+        if (!(other instanceof seedu.address.model.note.NoteTagContainsKeywordsPredicate)) {
             return false;
         }
 

src/main/java/seedu/address/model/notes/UniqueNoteList.java → src/main/java/seedu/address/model/note/UniqueNoteList.java

@@ -1,4 +1,4 @@
-package seedu.address.model.notes;
+package seedu.address.model.note;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
@@ -8,8 +8,8 @@
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import seedu.address.model.notes.exceptions.DuplicateNoteException;
-import seedu.address.model.notes.exceptions.NoteNotFoundException;
+import seedu.address.model.note.exceptions.DuplicateNoteException;
+import seedu.address.model.note.exceptions.NoteNotFoundException;
 
 
 /**
@@ -65,7 +65,7 @@ public void setNote(Note target, Note editedNote) {
      * Removes the equivalent note from the list.
      * The note must exist in the list.
      */
-    public Note remove(int toRemove) {
+    public Note remove(Integer toRemove) {
         requireNonNull(toRemove);
 
         for (int i = toRemove; i < internalList.size(); i++) {

src/main/java/seedu/address/model/notes/exceptions/DuplicateNoteException.java → src/main/java/seedu/address/model/note/exceptions/DuplicateNoteException.java

@@ -1,4 +1,4 @@
-package seedu.address.model.notes.exceptions;
+package seedu.address.model.note.exceptions;
 
 /**
  * Signals that the operation will result in duplicate Notes (Notes are considered duplicates if they have the same

src/main/java/seedu/address/model/notes/exceptions/NoteNotFoundException.java → src/main/java/seedu/address/model/note/exceptions/NoteNotFoundException.java

@@ -1,4 +1,4 @@
-package seedu.address.model.notes.exceptions;
+package seedu.address.model.note.exceptions;
 
 /**
  * Signals that the operation is unable to find the specified note.

src/main/java/seedu/address/model/sampledata/SampleNotes.java

@@ -2,8 +2,8 @@
 
 import java.util.Arrays;
 
-import seedu.address.model.notes.Content;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Content;
+import seedu.address.model.note.Note;
 import seedu.address.model.tag.Tag;
 
 /**

src/main/java/seedu/address/model/util/SampleDataUtil.java

@@ -14,7 +14,7 @@
 import seedu.address.model.UniversityCatalogue;
 import seedu.address.model.localcourse.LocalCourse;
 import seedu.address.model.mapping.Mapping;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 import seedu.address.model.partnercourse.PartnerCourse;
 import seedu.address.model.person.Person;
 import seedu.address.model.sampledata.SampleLocalCourses;

src/main/java/seedu/address/seplendidui/ItemDetailPanel.java

@@ -12,7 +12,7 @@
 import seedu.address.model.PartnerCourseCatalogue;
 import seedu.address.model.localcourse.LocalCourse;
 import seedu.address.model.mapping.Mapping;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 import seedu.address.model.partnercourse.PartnerCourse;
 import seedu.address.model.university.University;
 

src/main/java/seedu/address/seplendidui/ItemListPanel.java

@@ -11,7 +11,7 @@
 import seedu.address.model.SeplendidDataType;
 import seedu.address.model.localcourse.LocalCourse;
 import seedu.address.model.mapping.Mapping;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 import seedu.address.model.partnercourse.PartnerCourse;
 import seedu.address.model.university.University;
 

src/main/java/seedu/address/seplendidui/NoteDetail.java

@@ -6,7 +6,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 
 /**
  * A UI component that displays information of a {@code note}.

src/main/java/seedu/address/seplendidui/NoteItem.java

@@ -4,7 +4,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 
 /**
  * An UI component that displays information of a {@code Note}.

src/main/java/seedu/address/storage/JsonAdaptedNote.java

@@ -10,8 +10,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.notes.Content;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Content;
+import seedu.address.model.note.Note;
 import seedu.address.model.tag.Tag;
 
 /**

src/main/java/seedu/address/storage/JsonSerializableNoteCatalogue.java

@@ -11,7 +11,7 @@
 import seedu.address.commons.exceptions.IllegalValueException;
 import seedu.address.model.NoteCatalogue;
 import seedu.address.model.ReadOnlyNoteCatalogue;
-import seedu.address.model.notes.Note;
+import seedu.address.model.note.Note;
 
 /**
  * An Immutable NoteCatalogue that is serializable to JSON format.

src/test/java/seedu/address/logic/commands/LocalCourseAddCommandIntegrationTest.java → src/test/java/seedu/address/logic/commands/localcourse/LocalCourseAddCommandIntegrationTest.java

@@ -1,4 +1,4 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.localcourse;
 
 import static seedu.address.logic.commands.CommandTestUtil.assertSeplendidCommandFailure;
 import static seedu.address.logic.commands.CommandTestUtil.assertSeplendidCommandSuccess;
@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.Test;
 
 import seedu.address.logic.Messages;
-import seedu.address.logic.commands.localcourse.LocalCourseAddCommand;
 import seedu.address.model.SeplendidModel;
 import seedu.address.model.SeplendidModelManager;
 import seedu.address.model.UserPrefs;