Merge pull request #92 from vijay-shankaranand/add-event-testcases

Add Event Command test cases

Author: vijay-shankaranand

build.gradle

@@ -70,7 +70,7 @@ run {
 }
 
 shadowJar {
-    archiveFileName = 'addressbook.jar'
+    archiveFileName = 'jobfestgo.jar'
 }
 
 defaultTasks 'clean', 'test'

docs/tutorials/RemovingFields.md

@@ -31,7 +31,7 @@ IntelliJ IDEA provides a refactoring tool that can identify *most* parts of a re
 
 ### Assisted refactoring
 
-The `address` field in `Person` is actually an instance of the `seedu.address.model.person.Address` class. Since removing the `Address` class will break the application, we start by identifying `Address`'s usages. This allows us to see code that depends on `Address` to function properly and edit them on a case-by-case basis. Right-click the `Address` class and select `Refactor` \> `Safe Delete` through the menu.
+The `address` field in `Person` is actually an instance of the `seedu.address.model.address.Address` class. Since removing the `Address` class will break the application, we start by identifying `Address`'s usages. This allows us to see code that depends on `Address` to function properly and edit them on a case-by-case basis. Right-click the `Address` class and select `Refactor` \> `Safe Delete` through the menu.
 * :bulb: To make things simpler, you can unselect the options `Search in comments and strings` and `Search for text occurrences`
 
 ![Usages detected](../images/remove/UnsafeDelete.png)

src/main/java/seedu/address/logic/commands/event/LinkCommand.java

@@ -12,9 +12,8 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.event.Event;
-import seedu.address.model.event.EventName;
 import seedu.address.model.event.exceptions.EventNotFoundException;
-import seedu.address.model.person.Name;
+import seedu.address.model.name.Name;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.exceptions.PersonNotFoundException;
 
@@ -39,13 +38,13 @@ public class LinkCommand extends Command {
             + "Please add it in first.";
     public static final String MESSAGE_LINKED_CONTACT = "The contact: %1$s is already linked to the event: %2$s";
 
-    private final EventName eventNameToLink;
+    private final Name eventNameToLink;
     private final Set<Name> contactNameListToLink;
 
     /**
      * Creates a LinkCommand to link the person specified by the name to the event specified by the name.
      */
-    public LinkCommand(EventName eventNameToLink, Set<Name> contactNameListToLink) {
+    public LinkCommand(Name eventNameToLink, Set<Name> contactNameListToLink) {
         this.eventNameToLink = eventNameToLink;
         this.contactNameListToLink = contactNameListToLink;
     }

src/main/java/seedu/address/logic/commands/person/EditCommand.java

@@ -23,9 +23,9 @@
 import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
-import seedu.address.model.person.Address;
+import seedu.address.model.address.Address;
+import seedu.address.model.name.Name;
 import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
 import seedu.address.model.tag.Tag;

src/main/java/seedu/address/logic/commands/person/FindCommand.java

@@ -7,7 +7,7 @@
 import seedu.address.logic.commands.Command;
 import seedu.address.logic.commands.CommandResult;
 import seedu.address.model.Model;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
+import seedu.address.model.name.NameContainsKeywordsPredicate;
 
 /**
  * Finds and lists all persons in address book whose name contains any of the argument keywords.

src/main/java/seedu/address/logic/commands/task/AddTaskCommand.java

@@ -14,8 +14,8 @@
 import seedu.address.model.Model;
 import seedu.address.model.date.Date;
 import seedu.address.model.event.Event;
-import seedu.address.model.event.EventName;
 import seedu.address.model.event.exceptions.EventNotFoundException;
+import seedu.address.model.name.Name;
 import seedu.address.model.task.Task;
 import seedu.address.model.task.TaskDescription;
 
@@ -39,13 +39,13 @@ public class AddTaskCommand extends Command {
     public static final String MESSAGE_DUPLICATE_TASK = "This task already exists in the event";
     private final TaskDescription taskDescription;
     private final Date taskDeadline;
-    private final EventName associatedEventName;
+    private final Name associatedEventName;
     private Task taskToAdd;
 
     /**
      * Creates an AddTaskCommand to add the specified {@code Task}
      */
-    public AddTaskCommand(TaskDescription taskDescription, Date taskDeadline, EventName associatedEvent) {
+    public AddTaskCommand(TaskDescription taskDescription, Date taskDeadline, Name associatedEvent) {
         requireAllNonNull(taskDescription, taskDeadline, associatedEvent);
         this.taskDescription = taskDescription;
         this.taskDeadline = taskDeadline;

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

@@ -9,12 +9,10 @@
 import seedu.address.commons.core.index.Index;
 import seedu.address.commons.util.StringUtil;
 import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.address.Address;
 import seedu.address.model.date.Date;
-import seedu.address.model.event.EventAddress;
-import seedu.address.model.event.EventName;
-import seedu.address.model.person.Address;
+import seedu.address.model.name.Name;
 import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
 import seedu.address.model.tag.Tag;
 import seedu.address.model.task.TaskDescription;
@@ -127,25 +125,10 @@ public static Set<Tag> parseTags(Collection<String> tags) throws ParseException
     }
 
     /**
-     * Parses a {@code String eventName} into an {@code EventName}.
+     * Parses a {@code String Date} into an {@code Date}.
      * Leading and trailing whitespaces will be trimmed.
      *
-     * @throws ParseException if the given {@code eventName} is invalid.
-     */
-    public static EventName parseEventName(String eventName) throws ParseException {
-        requireNonNull(eventName);
-        String trimmedEventName = eventName.trim();
-        if (!EventName.isValidName(trimmedEventName)) {
-            throw new ParseException(EventName.MESSAGE_CONSTRAINTS);
-        }
-        return new EventName(trimmedEventName);
-    }
-
-    /**
-     * Parses a {@code String eventDate} into an {@code EventDate}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code eventDate} is invalid.
+     * @throws ParseException if the given {@code Date} is invalid.
      */
     public static Date parseDate(String eventDate) throws ParseException {
         requireNonNull(eventDate);
@@ -156,20 +139,6 @@ public static Date parseDate(String eventDate) throws ParseException {
         return new Date(trimmedEventDate);
     }
 
-    /**
-     * Parses a {@code String eventAddress} into an {@code EventAddress}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code eventAddress} is invalid.
-     */
-    public static EventAddress parseEventAddress(String eventAddress) throws ParseException {
-        requireNonNull(eventAddress);
-        String trimmedEventAddress = eventAddress.trim();
-        if (!EventAddress.isValidAddress(trimmedEventAddress)) {
-            throw new ParseException(EventAddress.MESSAGE_CONSTRAINTS);
-        }
-        return new EventAddress(trimmedEventAddress);
-    }
 
     /**
      * Parses {@code Collection<String> contactNames} into a {@code Set<Name>}.
@@ -198,5 +167,4 @@ public static TaskDescription parseTaskDescription(String taskDescription) throw
         return new TaskDescription(trimmedTaskDescription);
     }
 
-
 }

src/main/java/seedu/address/logic/parser/event/AddEventCommandParser.java

@@ -16,10 +16,10 @@
 import seedu.address.logic.parser.ParserUtil;
 import seedu.address.logic.parser.Prefix;
 import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.address.Address;
 import seedu.address.model.date.Date;
 import seedu.address.model.event.Event;
-import seedu.address.model.event.EventAddress;
-import seedu.address.model.event.EventName;
+import seedu.address.model.name.Name;
 import seedu.address.model.person.Person;
 import seedu.address.model.task.Task;
 
@@ -42,9 +42,11 @@ public AddEventCommand parse(String args) throws ParseException {
         }
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_DATE, PREFIX_ADDRESS);
-        EventName name = ParserUtil.parseEventName(argMultimap.getValue(PREFIX_NAME).get());
+
+        Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
         Date date = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE).get());
-        EventAddress address = ParserUtil.parseEventAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
+        Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
+
         Set<Person> contacts = new HashSet<>();
         Set<Task> tasks = new HashSet<>();
 

src/main/java/seedu/address/logic/parser/event/LinkCommandParser.java

@@ -14,8 +14,7 @@
 import seedu.address.logic.parser.ParserUtil;
 import seedu.address.logic.parser.Prefix;
 import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.event.EventName;
-import seedu.address.model.person.Name;
+import seedu.address.model.name.Name;
 
 /**
  * Parses input arguments and creates a new LinkCommand object
@@ -37,10 +36,10 @@ public LinkCommand parse(String args) throws ParseException {
         }
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_EVENT);
-        EventName eventName = ParserUtil.parseEventName(argMultimap.getValue(PREFIX_EVENT).get());
+        Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_EVENT).get());
         Set<Name> contactNameList = ParserUtil.parseContactNames(argMultimap.getAllValues(PREFIX_CONTACT));
 
-        return new LinkCommand(eventName, contactNameList);
+        return new LinkCommand(name, contactNameList);
     }
 
     /**

src/main/java/seedu/address/logic/parser/person/AddCommandParser.java

@@ -17,9 +17,9 @@
 import seedu.address.logic.parser.ParserUtil;
 import seedu.address.logic.parser.Prefix;
 import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.Address;
+import seedu.address.model.address.Address;
+import seedu.address.model.name.Name;
 import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
 import seedu.address.model.tag.Tag;