diff --git a/docs/DeveloperGuide.adoc b/docs/DeveloperGuide.adoc index 115248ffb081..54fe7638a469 100644 --- a/docs/DeveloperGuide.adoc +++ b/docs/DeveloperGuide.adoc @@ -385,6 +385,21 @@ We are using `java.util.logging` package for logging. The `LogsCenter` class is Certain properties of the application can be controlled (e.g App name, logging level) through the configuration file (default: `config.json`). +=== Storage + +Our application deals with 2 main classes: Task and Event. Hence, when we store the data, we need to differentiate between these 2 classes. Our team came up with 2 possible implementations to store the data: + +* **Alternative 1:** Use 1 list to store objects of both classes +** Pros: There is no need to create 2 separate lists to store the 2 different class objects. +** Cons: Whenever we want to perform an operation on an object stored, we need to check its class. + +* **Alternative 2 (current choice):** Use 2 lists to store objects of the 2 classes separately +** Pros: When we want to perform an operation on all the objects stored in a list, each object can be treated equally as they are from the same class. +** Cons: More effort is required to create 2 separate lists. + +While both alternatives have advantages and disadvantages, we feel that the second alternative's advantages outweigh its disadvantages in the long run. It is easier to maintain the 2 separate lists of objects, whereby each list contains objects of the same class, especially as we make the 2 classes more specialized. The inconvenience of creating 2 separate lists will be counterbalanced by the convenience in the long run. + + == Documentation We use asciidoc for writing documentation. diff --git a/docs/images/StorageClassDiagram.png b/docs/images/StorageClassDiagram.png index 7a4cd2700cbf..abbfadd7f319 100644 Binary files a/docs/images/StorageClassDiagram.png and b/docs/images/StorageClassDiagram.png differ diff --git a/src/main/java/seedu/address/logic/commands/TaskCommand.java b/src/main/java/seedu/address/logic/commands/TaskCommand.java index 10cf36a8aa4e..1a4ca04e278a 100644 --- a/src/main/java/seedu/address/logic/commands/TaskCommand.java +++ b/src/main/java/seedu/address/logic/commands/TaskCommand.java @@ -1,7 +1,7 @@ package seedu.address.logic.commands; import static java.util.Objects.requireNonNull; -import static seedu.address.logic.parser.CliSyntax.PREFIX_DATETIME; +import static seedu.address.logic.parser.CliSyntax.PREFIX_DATE_TIME; import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME; import static seedu.address.logic.parser.CliSyntax.PREFIX_REMARK; @@ -20,11 +20,11 @@ public class TaskCommand extends UndoableCommand { public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a task to the desk board. " + "Parameters: " + PREFIX_NAME + "NAME " - + PREFIX_DATETIME + "DATETIME " + + PREFIX_DATE_TIME + "DATETIME " + "[" + PREFIX_REMARK + "REMARK]\n" + "Example: " + COMMAND_WORD + " " + PREFIX_NAME + "Software Engineering Milestone 1 " - + PREFIX_DATETIME + "01/08/2018 17:00 " + + PREFIX_DATE_TIME + "01/08/2018 17:00 " + PREFIX_REMARK + "Enhance major component"; public static final String MESSAGE_SUCCESS = "New task added: %1$s"; diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java index daeab30c48c5..f16b6c6e9123 100644 --- a/src/main/java/seedu/address/logic/parser/CliSyntax.java +++ b/src/main/java/seedu/address/logic/parser/CliSyntax.java @@ -8,7 +8,7 @@ public class CliSyntax { /* Prefix definitions */ public static final Prefix PREFIX_NAME = new Prefix("n/"); - public static final Prefix PREFIX_DATETIME = new Prefix("d/"); + public static final Prefix PREFIX_DATE_TIME = new Prefix("d/"); public static final Prefix PREFIX_REMARK = new Prefix("r/"); public static final Prefix PREFIX_TAG = new Prefix("t/"); public static final Prefix PREFIX_START_DATETIME = new Prefix("s/"); diff --git a/src/main/java/seedu/address/logic/parser/TaskCommandParser.java b/src/main/java/seedu/address/logic/parser/TaskCommandParser.java index 0ef92b3bff7e..e0be186931da 100644 --- a/src/main/java/seedu/address/logic/parser/TaskCommandParser.java +++ b/src/main/java/seedu/address/logic/parser/TaskCommandParser.java @@ -1,7 +1,7 @@ package seedu.address.logic.parser; import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.parser.CliSyntax.PREFIX_DATETIME; +import static seedu.address.logic.parser.CliSyntax.PREFIX_DATE_TIME; import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME; import static seedu.address.logic.parser.CliSyntax.PREFIX_REMARK; import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; @@ -32,16 +32,16 @@ public class TaskCommandParser implements Parser { */ public TaskCommand parse(String args) throws ParseException { ArgumentMultimap argMultimap = - ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_DATETIME, PREFIX_REMARK, PREFIX_TAG); + ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_DATE_TIME, PREFIX_REMARK, PREFIX_TAG); - if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_DATETIME) + if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_DATE_TIME) || !argMultimap.getPreamble().isEmpty()) { throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, TaskCommand.MESSAGE_USAGE)); } try { Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME)).get(); - DateTime datetime = ParserUtil.parseDateTime(argMultimap.getValue(PREFIX_DATETIME)).get(); + DateTime datetime = ParserUtil.parseDateTime(argMultimap.getValue(PREFIX_DATE_TIME)).get(); Remark remark = ParserUtil.parseRemark(argMultimap.getValue(PREFIX_REMARK)).get(); Set tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG)); diff --git a/src/main/java/seedu/address/model/activity/Activity.java b/src/main/java/seedu/address/model/activity/Activity.java index bd91633a1ebf..d1e0b6efc6f5 100644 --- a/src/main/java/seedu/address/model/activity/Activity.java +++ b/src/main/java/seedu/address/model/activity/Activity.java @@ -98,7 +98,7 @@ public int hashCode() { public String toString() { final StringBuilder builder = new StringBuilder(); builder.append(getName()) - .append(" Date And Time: ") + .append(" Date/Time: ") .append(getDateTime()) .append(" Remark: ") .append(getRemark()) diff --git a/src/main/java/seedu/address/model/activity/Location.java b/src/main/java/seedu/address/model/activity/Location.java index d9e0081d2359..7abbb7f6434a 100644 --- a/src/main/java/seedu/address/model/activity/Location.java +++ b/src/main/java/seedu/address/model/activity/Location.java @@ -26,14 +26,14 @@ public class Location { */ public Location(String location) { requireNonNull(location); - checkArgument(isValidName(location), MESSAGE_LOCATION_CONSTRAINTS); + checkArgument(isValidLocation(location), MESSAGE_LOCATION_CONSTRAINTS); this.value = location; } /** * Returns true if a given string is a valid activity name. */ - public static boolean isValidName(String test) { + public static boolean isValidLocation(String test) { return test.matches(LOCATION_VALIDATION_REGEX); } diff --git a/src/main/java/seedu/address/storage/XmlAdaptedEvent.java b/src/main/java/seedu/address/storage/XmlAdaptedEvent.java index 66eb81a3ea4c..7bba359746ea 100644 --- a/src/main/java/seedu/address/storage/XmlAdaptedEvent.java +++ b/src/main/java/seedu/address/storage/XmlAdaptedEvent.java @@ -101,7 +101,7 @@ public Event toModelType() throws IllegalValueException { throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Location.class.getSimpleName())); } - if (!Location.isValidName(this.location)) { + if (!Location.isValidLocation(this.location)) { throw new IllegalValueException(Location.MESSAGE_LOCATION_CONSTRAINTS); } final Location location = new Location(this.location); diff --git a/src/main/java/seedu/address/storage/XmlSerializableDeskBoard.java b/src/main/java/seedu/address/storage/XmlSerializableDeskBoard.java index 1d657287de59..2411eec68645 100644 --- a/src/main/java/seedu/address/storage/XmlSerializableDeskBoard.java +++ b/src/main/java/seedu/address/storage/XmlSerializableDeskBoard.java @@ -18,7 +18,7 @@ public class XmlSerializableDeskBoard { @XmlElement - private List persons; + private List activities; @XmlElement private List tags; @@ -27,7 +27,7 @@ public class XmlSerializableDeskBoard { * This empty constructor is required for marshalling. */ public XmlSerializableDeskBoard() { - persons = new ArrayList<>(); + activities = new ArrayList<>(); tags = new ArrayList<>(); } @@ -36,7 +36,7 @@ public XmlSerializableDeskBoard() { */ public XmlSerializableDeskBoard(ReadOnlyDeskBoard src) { this(); - persons.addAll(src.getActivityList().stream().map(XmlAdaptedActivity::new).collect(Collectors.toList())); + activities.addAll(src.getActivityList().stream().map(XmlAdaptedActivity::new).collect(Collectors.toList())); tags.addAll(src.getTagList().stream().map(XmlAdaptedTag::new).collect(Collectors.toList())); } @@ -51,8 +51,8 @@ public DeskBoard toModelType() throws IllegalValueException { for (XmlAdaptedTag t : tags) { deskBoard.addTag(t.toModelType()); } - for (XmlAdaptedActivity p : persons) { - deskBoard.addActivity(p.toModelType()); + for (XmlAdaptedActivity a : activities) { + deskBoard.addActivity(a.toModelType()); } return deskBoard; } @@ -68,6 +68,6 @@ public boolean equals(Object other) { } XmlSerializableDeskBoard otherAb = (XmlSerializableDeskBoard) other; - return persons.equals(otherAb.persons) && tags.equals(otherAb.tags); + return activities.equals(otherAb.activities) && tags.equals(otherAb.tags); } } diff --git a/src/test/data/XmlCalendarStorageTest/NotXmlFormatAddressBook.xml b/src/test/data/XmlDeskBoardStorageTest/NotXmlFormatDeskBoard.xml similarity index 100% rename from src/test/data/XmlCalendarStorageTest/NotXmlFormatAddressBook.xml rename to src/test/data/XmlDeskBoardStorageTest/NotXmlFormatDeskBoard.xml diff --git a/src/test/data/XmlCalendarStorageTest/invalidPersonAddressBook.xml b/src/test/data/XmlDeskBoardStorageTest/invalidActivityDeskBoard.xml similarity index 53% rename from src/test/data/XmlCalendarStorageTest/invalidPersonAddressBook.xml rename to src/test/data/XmlDeskBoardStorageTest/invalidActivityDeskBoard.xml index f9e00e177a8f..0280c30adf7c 100644 --- a/src/test/data/XmlCalendarStorageTest/invalidPersonAddressBook.xml +++ b/src/test/data/XmlDeskBoardStorageTest/invalidActivityDeskBoard.xml @@ -2,8 +2,8 @@ - Ha!ns Mu@ster - 9482424 - 4th street + Ellen's B'day + 10/10/2010 10:10 + diff --git a/src/test/data/XmlCalendarStorageTest/invalidAndValidPersonAddressBook.xml b/src/test/data/XmlDeskBoardStorageTest/invalidAndValidActivityDeskBoard.xml similarity index 100% rename from src/test/data/XmlCalendarStorageTest/invalidAndValidPersonAddressBook.xml rename to src/test/data/XmlDeskBoardStorageTest/invalidAndValidActivityDeskBoard.xml diff --git a/src/test/data/XmlSerializableCalendarTest/invalidPersonAddressBook.xml b/src/test/data/XmlSerializableCalendarTest/invalidPersonAddressBook.xml deleted file mode 100644 index 635921515e90..000000000000 --- a/src/test/data/XmlSerializableCalendarTest/invalidPersonAddressBook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Hans Muster - 9482424 - 4th street - - diff --git a/src/test/data/XmlSerializableCalendarTest/typicalPersonsAddressBook.xml b/src/test/data/XmlSerializableCalendarTest/typicalPersonsAddressBook.xml deleted file mode 100644 index 153e7a779309..000000000000 --- a/src/test/data/XmlSerializableCalendarTest/typicalPersonsAddressBook.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - Alice Pauline - 85355255 - 123, Jurong West Ave 6, #08-111 - friends - - - Benson Meier - 98765432 - 311, Clementi Ave 2, #02-25 - owesMoney - friends - - - Carl Kurz - 95352563 - wall street - - - Daniel Meier - 87652533 - 10th street - - - Elle Meyer - 9482224 - michegan ave - - - Fiona Kunz - 9482427 - little tokyo - - - George Best - 9482442 - 4th street - - friends - owesMoney - diff --git a/src/test/data/XmlSerializableDeskBoardTest/invalidActivityDeskBoard.xml b/src/test/data/XmlSerializableDeskBoardTest/invalidActivityDeskBoard.xml new file mode 100644 index 000000000000..5e56c666b43c --- /dev/null +++ b/src/test/data/XmlSerializableDeskBoardTest/invalidActivityDeskBoard.xml @@ -0,0 +1,9 @@ + + + + + CS1231! + 9482424 + + + diff --git a/src/test/data/XmlSerializableCalendarTest/invalidTagAddressBook.xml b/src/test/data/XmlSerializableDeskBoardTest/invalidTagDeskBoard.xml similarity index 100% rename from src/test/data/XmlSerializableCalendarTest/invalidTagAddressBook.xml rename to src/test/data/XmlSerializableDeskBoardTest/invalidTagDeskBoard.xml diff --git a/src/test/data/XmlSerializableDeskBoardTest/typicalActivitiesDeskBoard.xml b/src/test/data/XmlSerializableDeskBoardTest/typicalActivitiesDeskBoard.xml new file mode 100644 index 000000000000..df9926031a3e --- /dev/null +++ b/src/test/data/XmlSerializableDeskBoardTest/typicalActivitiesDeskBoard.xml @@ -0,0 +1,57 @@ + + + + + CS2101Assignment + 04/03/2018 23:59 + + CS2101 + + + CS2102Assignment + 15/03/2018 23:59 + + CS2102 + + + CS2101Quiz + 19/03/2018 23:59 + IVLE Quiz + + + CCA + 01/04/2018 20:00 + 01/04/2018 21:00 + Campus + nil + + + CIP + 02/04/2018 08:00 + 02/04/2018 12:00 + michegan ave + + CIP + + + CS2101Exam + 28/04/2018 09:00 + 28/04/2018 11:00 + MPSH + + CS2101 + + + InterFacultyGame + 04/01/2018 20:00 + 04/01/2018 22:00 + MPSH 1 + + + CS2101 + CS2102 + MA2108 + CS2010 + CIP + diff --git a/src/test/data/XmlUtilTest/invalidPersonField.xml b/src/test/data/XmlUtilTest/invalidActivityField.xml similarity index 100% rename from src/test/data/XmlUtilTest/invalidPersonField.xml rename to src/test/data/XmlUtilTest/invalidActivityField.xml diff --git a/src/test/data/XmlUtilTest/missingPersonField.xml b/src/test/data/XmlUtilTest/missingActivityField.xml similarity index 100% rename from src/test/data/XmlUtilTest/missingPersonField.xml rename to src/test/data/XmlUtilTest/missingActivityField.xml diff --git a/src/test/data/XmlUtilTest/tempAddressBook.xml b/src/test/data/XmlUtilTest/tempAddressBook.xml index 07b600c16905..000904d9877e 100644 --- a/src/test/data/XmlUtilTest/tempAddressBook.xml +++ b/src/test/data/XmlUtilTest/tempAddressBook.xml @@ -1,5 +1,5 @@ - + 1 John @@ -12,4 +12,4 @@ Friends - + diff --git a/src/test/data/XmlUtilTest/validPerson.xml b/src/test/data/XmlUtilTest/validActivity.xml similarity index 100% rename from src/test/data/XmlUtilTest/validPerson.xml rename to src/test/data/XmlUtilTest/validActivity.xml diff --git a/src/test/data/XmlUtilTest/validAddressBook.xml b/src/test/data/XmlUtilTest/validAddressBook.xml index 213195c9fc79..d86880691c01 100644 --- a/src/test/data/XmlUtilTest/validAddressBook.xml +++ b/src/test/data/XmlUtilTest/validAddressBook.xml @@ -1,57 +1,49 @@ - + - Hans Muster - 9482424 - hans@example.com - 4th street + CS2101Assignment + 04/03/2018 23:59 + + CS2101 - Ruth Mueller - 87249245 - ruth@example.com - 81th street + CS2102Assignment + 15/03/2018 23:59 + + CS2102 - Heinz Kurz - 95352563 - heinz@example.com - wall street + CS2101Quiz + 19/03/2018 23:59 + IVLE Quiz - Cornelia Meier - 87652533 - cornelia@example.com - 10th street + CCA + 01/04/2018 20:00 + 01/04/2018 21:00 + Campus + nil - Werner Meyer - 9482224 - werner@example.com - michegan ave + CIP + 02/04/2018 08:00 + 02/04/2018 12:00 + michegan ave + CIP - Lydia Kunz - 9482427 - lydia@example.com - little tokyo + CS2101Exam + 28/04/2018 09:00 + 28/04/2018 11:00 + MPSH + CS2101 + friends + owesMoney - Anna Best - 9482442 - anna@example.com - 4th street + InterFacultyGame + 04/01/2018 20:00 + 04/01/2018 22:00 + MPSH 1 - - Stefan Meier - 8482424 - stefan@example.com - little india - - - Martin Mueller - 8482131 - hans@example.com - chicago ave - - + diff --git a/src/test/java/seedu/address/commons/util/XmlUtilTest.java b/src/test/java/seedu/address/commons/util/XmlUtilTest.java index acc27bbbf51a..6db163c1f4ea 100644 --- a/src/test/java/seedu/address/commons/util/XmlUtilTest.java +++ b/src/test/java/seedu/address/commons/util/XmlUtilTest.java @@ -28,17 +28,16 @@ public class XmlUtilTest { private static final File EMPTY_FILE = new File(TEST_DATA_FOLDER + "empty.xml"); private static final File MISSING_FILE = new File(TEST_DATA_FOLDER + "missing.xml"); private static final File VALID_FILE = new File(TEST_DATA_FOLDER + "validAddressBook.xml"); - private static final File MISSING_PERSON_FIELD_FILE = new File(TEST_DATA_FOLDER + "missingPersonField.xml"); - private static final File INVALID_PERSON_FIELD_FILE = new File(TEST_DATA_FOLDER + "invalidPersonField.xml"); - private static final File VALID_PERSON_FILE = new File(TEST_DATA_FOLDER + "validPerson.xml"); + private static final File MISSING_ACTIVITY_FIELD_FILE = new File(TEST_DATA_FOLDER + "missingActivityField.xml"); + private static final File INVALID_ACTIVITY_FIELD_FILE = new File(TEST_DATA_FOLDER + "invalidActivityField.xml"); + private static final File VALID_ACTIVITY_FILE = new File(TEST_DATA_FOLDER + "validActivity.xml"); private static final File TEMP_FILE = new File(TestUtil.getFilePathInSandboxFolder("tempAddressBook.xml")); - private static final String INVALID_PHONE = "9482asf424"; + private static final String INVALID_DATE_TIME = "9482asf424"; private static final String VALID_NAME = "Hans Muster"; - private static final String VALID_PHONE = "9482424"; - private static final String VALID_EMAIL = "hans@example"; - private static final String VALID_ADDRESS = "4th street"; + private static final String VALID_DATE_TIME = "9482424"; + private static final String VALID_REMARK = "4th street"; private static final List VALID_TAGS = Collections.singletonList(new XmlAdaptedTag("friends")); @Rule @@ -79,30 +78,30 @@ public void getDataFromFile_validFile_validResult() throws Exception { } @Test - public void xmlAdaptedPersonFromFile_fileWithMissingPersonField_validResult() throws Exception { - XmlAdaptedActivity actualPerson = XmlUtil.getDataFromFile( - MISSING_PERSON_FIELD_FILE, XmlAdaptedActivityWithRootElement.class); - XmlAdaptedActivity expectedPerson = new XmlAdaptedActivity( - null, VALID_PHONE, VALID_ADDRESS, VALID_TAGS); - assertEquals(expectedPerson, actualPerson); + public void xmlAdaptedActivityFromFile_fileWithMissingActivityField_validResult() throws Exception { + XmlAdaptedActivity actualActivity = XmlUtil.getDataFromFile( + MISSING_ACTIVITY_FIELD_FILE, XmlAdaptedActivityWithRootElement.class); + XmlAdaptedActivity expectedActivity = new XmlAdaptedActivity( + null, VALID_DATE_TIME, VALID_REMARK, VALID_TAGS); + assertEquals(expectedActivity, actualActivity); } @Test - public void xmlAdaptedPersonFromFile_fileWithInvalidPersonField_validResult() throws Exception { - XmlAdaptedActivity actualPerson = XmlUtil.getDataFromFile( - INVALID_PERSON_FIELD_FILE, XmlAdaptedActivityWithRootElement.class); - XmlAdaptedActivity expectedPerson = new XmlAdaptedActivity( - VALID_NAME, INVALID_PHONE, VALID_ADDRESS, VALID_TAGS); - assertEquals(expectedPerson, actualPerson); + public void xmlAdaptedActivityFromFile_fileWithInvalidActivityField_validResult() throws Exception { + XmlAdaptedActivity actualActivity = XmlUtil.getDataFromFile( + INVALID_ACTIVITY_FIELD_FILE, XmlAdaptedActivityWithRootElement.class); + XmlAdaptedActivity expectedActivity = new XmlAdaptedActivity( + VALID_NAME, INVALID_DATE_TIME, VALID_REMARK, VALID_TAGS); + assertEquals(expectedActivity, actualActivity); } @Test - public void xmlAdaptedPersonFromFile_fileWithValidPerson_validResult() throws Exception { - XmlAdaptedActivity actualPerson = XmlUtil.getDataFromFile( - VALID_PERSON_FILE, XmlAdaptedActivityWithRootElement.class); - XmlAdaptedActivity expectedPerson = new XmlAdaptedActivity( - VALID_NAME, VALID_PHONE, VALID_ADDRESS, VALID_TAGS); - assertEquals(expectedPerson, actualPerson); + public void xmlAdaptedActivityFromFile_fileWithValidActivity_validResult() throws Exception { + XmlAdaptedActivity actualActivity = XmlUtil.getDataFromFile( + VALID_ACTIVITY_FILE, XmlAdaptedActivityWithRootElement.class); + XmlAdaptedActivity expectedActivity = new XmlAdaptedActivity( + VALID_NAME, VALID_DATE_TIME, VALID_REMARK, VALID_TAGS); + assertEquals(expectedActivity, actualActivity); } @Test diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java index cc70193cf4cc..75573aacb82a 100644 --- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java +++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java @@ -3,10 +3,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS; +import static seedu.address.logic.parser.CliSyntax.PREFIX_DATE_TIME; import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL; import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME; -import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE; +import static seedu.address.logic.parser.CliSyntax.PREFIX_REMARK; import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; import java.util.ArrayList; @@ -29,47 +29,44 @@ */ public class CommandTestUtil { - public static final String VALID_NAME_AMY = "Amy Bee"; - public static final String VALID_NAME_BOB = "Bob Choo"; - public static final String VALID_PHONE_AMY = "11111111"; - public static final String VALID_PHONE_BOB = "22222222"; - public static final String VALID_EMAIL_AMY = "amy@example.com"; - public static final String VALID_EMAIL_BOB = "bob@example.com"; - public static final String VALID_ADDRESS_AMY = "Block 312, Amy Street 1"; - public static final String VALID_ADDRESS_BOB = "Block 123, Bobby Street 3"; - public static final String VALID_TAG_HUSBAND = "husband"; - public static final String VALID_TAG_FRIEND = "friend"; - - public static final String NAME_DESC_AMY = " " + PREFIX_NAME + VALID_NAME_AMY; - public static final String NAME_DESC_BOB = " " + PREFIX_NAME + VALID_NAME_BOB; - public static final String PHONE_DESC_AMY = " " + PREFIX_PHONE + VALID_PHONE_AMY; - public static final String PHONE_DESC_BOB = " " + PREFIX_PHONE + VALID_PHONE_BOB; - public static final String EMAIL_DESC_AMY = " " + PREFIX_EMAIL + VALID_EMAIL_AMY; - public static final String EMAIL_DESC_BOB = " " + PREFIX_EMAIL + VALID_EMAIL_BOB; - public static final String ADDRESS_DESC_AMY = " " + PREFIX_ADDRESS + VALID_ADDRESS_AMY; - public static final String ADDRESS_DESC_BOB = " " + PREFIX_ADDRESS + VALID_ADDRESS_BOB; - public static final String TAG_DESC_FRIEND = " " + PREFIX_TAG + VALID_TAG_FRIEND; - public static final String TAG_DESC_HUSBAND = " " + PREFIX_TAG + VALID_TAG_HUSBAND; + public static final String VALID_NAME_MA2108_HOMEWORK = "MA2108 Homework 3"; + public static final String VALID_NAME_CS2010_QUIZ = "CS2010 Online Quiz 2"; + public static final String VALID_DATE_TIME_MA2108_HOMEWORK = "11/11/1111 11:11"; + public static final String VALID_DATE_TIME_CS2010_QUIZ = "22/12/2222 22:22"; + public static final String VALID_REMARK_MA2108_HOMEWORK = "3% of total grade"; + public static final String VALID_REMARK_CS2010_QUIZ = "5% of total grade"; + public static final String VALID_TAG_MA2108 = "MA2108"; + public static final String VALID_TAG_CS2010 = "CS2010"; + + public static final String NAME_DESC_MA2108_HOMEWORK = " " + PREFIX_NAME + VALID_NAME_MA2108_HOMEWORK; + public static final String NAME_DESC_CS2010_QUIZ = " " + PREFIX_NAME + VALID_NAME_CS2010_QUIZ; + public static final String DATE_TIME_DESC_MA2108_HOMEWORK = " " + PREFIX_DATE_TIME + + VALID_DATE_TIME_MA2108_HOMEWORK; + public static final String DATE_TIME_DESC_CS2010_QUIZ = " " + PREFIX_DATE_TIME + VALID_DATE_TIME_CS2010_QUIZ; + public static final String REMARK_DESC_MA2108_HOMEWORK = " " + PREFIX_REMARK + VALID_REMARK_MA2108_HOMEWORK; + public static final String REMARK_DESC_CS2010_QUIZ = " " + PREFIX_REMARK + VALID_REMARK_CS2010_QUIZ; + public static final String TAG_DESC_FRIEND = " " + PREFIX_TAG + VALID_TAG_CS2010; + public static final String TAG_DESC_HUSBAND = " " + PREFIX_TAG + VALID_TAG_MA2108; public static final String INVALID_NAME_DESC = " " + PREFIX_NAME + "James&"; // '&' not allowed in names - public static final String INVALID_PHONE_DESC = " " + PREFIX_PHONE + "911a"; // 'a' not allowed in phones + public static final String INVALID_DATE_TIME_DESC = " " + PREFIX_DATE_TIME + "911a"; // 'a' not allowed in phones public static final String INVALID_EMAIL_DESC = " " + PREFIX_EMAIL + "bob!yahoo"; // missing '@' symbol - public static final String INVALID_ADDRESS_DESC = " " + PREFIX_ADDRESS; // empty string not allowed for addresses + public static final String INVALID_REMARK_DESC = " " + PREFIX_REMARK; // empty string not allowed for addresses public static final String INVALID_TAG_DESC = " " + PREFIX_TAG + "hubby*"; // '*' not allowed in tags public static final String PREAMBLE_WHITESPACE = "\t \r \n"; public static final String PREAMBLE_NON_EMPTY = "NonEmptyPreamble"; - public static final EditCommand.EditActivityDescriptor DESC_AMY; - public static final EditCommand.EditActivityDescriptor DESC_BOB; + public static final EditCommand.EditActivityDescriptor DESC_MA2108_HOMEWORK; + public static final EditCommand.EditActivityDescriptor DESC_CS2010_QUIZ; static { - DESC_AMY = new EditActivityDescriptorBuilder().withName(VALID_NAME_AMY) - .withPhone(VALID_PHONE_AMY).withAddress(VALID_ADDRESS_AMY) - .withTags(VALID_TAG_FRIEND).build(); - DESC_BOB = new EditActivityDescriptorBuilder().withName(VALID_NAME_BOB) - .withPhone(VALID_PHONE_BOB).withAddress(VALID_ADDRESS_BOB) - .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build(); + DESC_MA2108_HOMEWORK = new EditActivityDescriptorBuilder().withName(VALID_NAME_MA2108_HOMEWORK) + .withPhone(VALID_DATE_TIME_MA2108_HOMEWORK).withAddress(VALID_REMARK_MA2108_HOMEWORK) + .withTags(VALID_TAG_CS2010).build(); + DESC_CS2010_QUIZ = new EditActivityDescriptorBuilder().withName(VALID_NAME_CS2010_QUIZ) + .withPhone(VALID_DATE_TIME_CS2010_QUIZ).withAddress(VALID_REMARK_CS2010_QUIZ) + .withTags(VALID_TAG_MA2108, VALID_TAG_CS2010).build(); } /** diff --git a/src/test/java/seedu/address/logic/commands/EditActivityDescriptorTest.java b/src/test/java/seedu/address/logic/commands/EditActivityDescriptorTest.java index 51b9dec2d228..67955d5a8691 100644 --- a/src/test/java/seedu/address/logic/commands/EditActivityDescriptorTest.java +++ b/src/test/java/seedu/address/logic/commands/EditActivityDescriptorTest.java @@ -2,14 +2,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; - -//import org.junit.Test; +import static seedu.address.logic.commands.CommandTestUtil.DESC_CS2010_QUIZ; +import static seedu.address.logic.commands.CommandTestUtil.DESC_MA2108_HOMEWORK; +import static seedu.address.logic.commands.CommandTestUtil.VALID_DATE_TIME_CS2010_QUIZ; +import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_CS2010_QUIZ; +import static seedu.address.logic.commands.CommandTestUtil.VALID_REMARK_CS2010_QUIZ; +import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_MA2108; import seedu.address.logic.commands.EditCommand.EditActivityDescriptor; import seedu.address.testutil.EditActivityDescriptorBuilder; @@ -22,35 +20,38 @@ public class EditActivityDescriptorTest { */ public void equals() { // same values -> returns true - EditActivityDescriptor descriptorWithSameValues = new EditActivityDescriptor(DESC_AMY); - assertTrue(DESC_AMY.equals(descriptorWithSameValues)); + EditActivityDescriptor descriptorWithSameValues = new EditActivityDescriptor(DESC_MA2108_HOMEWORK); + assertTrue(DESC_MA2108_HOMEWORK.equals(descriptorWithSameValues)); // same object -> returns true - assertTrue(DESC_AMY.equals(DESC_AMY)); + assertTrue(DESC_MA2108_HOMEWORK.equals(DESC_MA2108_HOMEWORK)); // null -> returns false - assertFalse(DESC_AMY.equals(null)); + assertFalse(DESC_MA2108_HOMEWORK.equals(null)); // different types -> returns false - assertFalse(DESC_AMY.equals(5)); + assertFalse(DESC_MA2108_HOMEWORK.equals(5)); // different values -> returns false - assertFalse(DESC_AMY.equals(DESC_BOB)); + assertFalse(DESC_MA2108_HOMEWORK.equals(DESC_CS2010_QUIZ)); // different name -> returns false - EditActivityDescriptor editedAmy = new EditActivityDescriptorBuilder(DESC_AMY).withName(VALID_NAME_BOB).build(); - assertFalse(DESC_AMY.equals(editedAmy)); + EditActivityDescriptor editedAmy = new EditActivityDescriptorBuilder(DESC_MA2108_HOMEWORK) + .withName(VALID_NAME_CS2010_QUIZ).build(); + assertFalse(DESC_MA2108_HOMEWORK.equals(editedAmy)); // different phone -> returns false - editedAmy = new EditActivityDescriptorBuilder(DESC_AMY).withPhone(VALID_PHONE_BOB).build(); - assertFalse(DESC_AMY.equals(editedAmy)); + editedAmy = new EditActivityDescriptorBuilder(DESC_MA2108_HOMEWORK) + .withPhone(VALID_DATE_TIME_CS2010_QUIZ).build(); + assertFalse(DESC_MA2108_HOMEWORK.equals(editedAmy)); // different address -> returns false - editedAmy = new EditActivityDescriptorBuilder(DESC_AMY).withAddress(VALID_ADDRESS_BOB).build(); - assertFalse(DESC_AMY.equals(editedAmy)); + editedAmy = new EditActivityDescriptorBuilder(DESC_MA2108_HOMEWORK) + .withAddress(VALID_REMARK_CS2010_QUIZ).build(); + assertFalse(DESC_MA2108_HOMEWORK.equals(editedAmy)); // different tags -> returns false - editedAmy = new EditActivityDescriptorBuilder(DESC_AMY).withTags(VALID_TAG_HUSBAND).build(); - assertFalse(DESC_AMY.equals(editedAmy)); + editedAmy = new EditActivityDescriptorBuilder(DESC_MA2108_HOMEWORK).withTags(VALID_TAG_MA2108).build(); + assertFalse(DESC_MA2108_HOMEWORK.equals(editedAmy)); } } diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/EditCommandTest.java index a30607b6d433..823de25b3129 100644 --- a/src/test/java/seedu/address/logic/commands/EditCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/EditCommandTest.java @@ -3,11 +3,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; -import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +import static seedu.address.logic.commands.CommandTestUtil.DESC_CS2010_QUIZ; +import static seedu.address.logic.commands.CommandTestUtil.DESC_MA2108_HOMEWORK; +import static seedu.address.logic.commands.CommandTestUtil.VALID_DATE_TIME_CS2010_QUIZ; +import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_CS2010_QUIZ; +import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_MA2108; import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.prepareRedoCommand; @@ -65,11 +65,12 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() throws Exception Activity lastActivity = model.getFilteredActivityList().get(indexLastPerson.getZeroBased()); TaskBuilder personInList = new TaskBuilder(lastActivity); - Activity editedActivity = personInList.withName(VALID_NAME_BOB).withDateTime(VALID_PHONE_BOB) - .withTags(VALID_TAG_HUSBAND).build(); + Activity editedActivity = personInList.withName(VALID_NAME_CS2010_QUIZ) + .withDateTime(VALID_DATE_TIME_CS2010_QUIZ) + .withTags(VALID_TAG_MA2108).build(); - EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder().withName(VALID_NAME_BOB) - .withPhone(VALID_PHONE_BOB).withTags(VALID_TAG_HUSBAND).build(); + EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder().withName(VALID_NAME_CS2010_QUIZ) + .withPhone(VALID_DATE_TIME_CS2010_QUIZ).withTags(VALID_TAG_MA2108).build(); EditCommand editCommand = prepareCommand(indexLastPerson, descriptor); String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedActivity); @@ -103,9 +104,9 @@ public void execute_filteredList_success() throws Exception { showPersonAtIndex(model, INDEX_FIRST_ACTIVITY); Activity activityInFilteredList = model.getFilteredActivityList().get(INDEX_FIRST_ACTIVITY.getZeroBased()); - Activity editedActivity = new TaskBuilder(activityInFilteredList).withName(VALID_NAME_BOB).build(); + Activity editedActivity = new TaskBuilder(activityInFilteredList).withName(VALID_NAME_CS2010_QUIZ).build(); EditCommand editCommand = prepareCommand(INDEX_FIRST_ACTIVITY, - new EditActivityDescriptorBuilder().withName(VALID_NAME_BOB).build()); + new EditActivityDescriptorBuilder().withName(VALID_NAME_CS2010_QUIZ).build()); String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedActivity); @@ -148,7 +149,8 @@ public void execute_duplicatePersonFilteredList_failure() { */ public void execute_invalidPersonIndexUnfilteredList_failure() { Index outOfBoundIndex = Index.fromOneBased(model.getFilteredActivityList().size() + 1); - EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder().withName(VALID_NAME_BOB).build(); + EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder() + .withName(VALID_NAME_CS2010_QUIZ).build(); EditCommand editCommand = prepareCommand(outOfBoundIndex, descriptor); assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_ACTIVITY_DISPLAYED_INDEX); @@ -166,7 +168,7 @@ public void execute_invalidPersonIndexFilteredList_failure() { assertTrue(outOfBoundIndex.getZeroBased() < model.getDeskBoard().getActivityList().size()); EditCommand editCommand = prepareCommand(outOfBoundIndex, - new EditActivityDescriptorBuilder().withName(VALID_NAME_BOB).build()); + new EditActivityDescriptorBuilder().withName(VALID_NAME_CS2010_QUIZ).build()); assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_ACTIVITY_DISPLAYED_INDEX); } @@ -206,7 +208,8 @@ public void executeUndoRedo_invalidIndexUnfilteredList_failure() { UndoCommand undoCommand = prepareUndoCommand(model, undoRedoStack); RedoCommand redoCommand = prepareRedoCommand(model, undoRedoStack); Index outOfBoundIndex = Index.fromOneBased(model.getFilteredActivityList().size() + 1); - EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder().withName(VALID_NAME_BOB).build(); + EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder() + .withName(VALID_NAME_CS2010_QUIZ).build(); EditCommand editCommand = prepareCommand(outOfBoundIndex, descriptor); // execution failed -> editCommand not pushed into undoRedoStack @@ -254,10 +257,10 @@ public void executeUndoRedo_validIndexFilteredList_samePersonEdited() throws Exc * Test */ public void equals() throws Exception { - final EditCommand standardCommand = prepareCommand(INDEX_FIRST_ACTIVITY, DESC_AMY); + final EditCommand standardCommand = prepareCommand(INDEX_FIRST_ACTIVITY, DESC_MA2108_HOMEWORK); // same values -> returns true - EditCommand.EditActivityDescriptor copyDescriptor = new EditActivityDescriptor(DESC_AMY); + EditCommand.EditActivityDescriptor copyDescriptor = new EditActivityDescriptor(DESC_MA2108_HOMEWORK); EditCommand commandWithSameValues = prepareCommand(INDEX_FIRST_ACTIVITY, copyDescriptor); assertTrue(standardCommand.equals(commandWithSameValues)); @@ -275,10 +278,10 @@ public void equals() throws Exception { assertFalse(standardCommand.equals(new ClearCommand())); // different index -> returns false - assertFalse(standardCommand.equals(new EditCommand(INDEX_SECOND_ACTIVITY, DESC_AMY))); + assertFalse(standardCommand.equals(new EditCommand(INDEX_SECOND_ACTIVITY, DESC_MA2108_HOMEWORK))); // different descriptor -> returns false - assertFalse(standardCommand.equals(new EditCommand(INDEX_FIRST_ACTIVITY, DESC_BOB))); + assertFalse(standardCommand.equals(new EditCommand(INDEX_FIRST_ACTIVITY, DESC_CS2010_QUIZ))); } /** diff --git a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java index ecb6ed5f7434..7d8bef40ee2c 100644 --- a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java +++ b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java @@ -1,27 +1,27 @@ //package seedu.address.logic.parser; // //import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -//import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB; +//import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_MA2108_HOMEWORK; +//import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_CS2010_QUIZ; +//import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_MA2108_HOMEWORK; +//import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_CS2010_QUIZ; //import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC; //import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC; //import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC; //import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC; //import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB; +//import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_MA2108_HOMEWORK; +//import static seedu.address.logic.commands.CommandTestUtil.DATE_TIME_DESC_MA2108_HOMEWORK; +//import static seedu.address.logic.commands.CommandTestUtil.DATE_TIME_DESC_CS2010_QUIZ; //import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND; //import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +//import static seedu.address.logic.commands.CommandTestUtil.VALID_REMARKS_MA2108_HOMEWORK; +//import static seedu.address.logic.commands.CommandTestUtil.VALID_REMARK_CS2010_QUIZ; +//import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_MA2108_HOMEWORK; +//import static seedu.address.logic.commands.CommandTestUtil.VALID_DATE_TIME_MA2108_HOMEWORK; +//import static seedu.address.logic.commands.CommandTestUtil.VALID_DATE_TIME_CS2010_QUIZ; +//import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_CS2010; +//import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_MA2108; //import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; //import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; //import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; @@ -52,7 +52,7 @@ // @Test // public void parse_missingParts_failure() { // // no index specified -// assertParseFailure(parser, VALID_NAME_AMY, MESSAGE_INVALID_FORMAT); +// assertParseFailure(parser, VALID_NAME_MA2108_HOMEWORK, MESSAGE_INVALID_FORMAT); // // // no field specified // assertParseFailure(parser, "1", EditCommand.MESSAGE_NOT_EDITED); @@ -64,10 +64,10 @@ // @Test // public void parse_invalidPreamble_failure() { // // negative index -// assertParseFailure(parser, "-5" + NAME_DESC_AMY, MESSAGE_INVALID_FORMAT); +// assertParseFailure(parser, "-5" + NAME_DESC_MA2108_HOMEWORK, MESSAGE_INVALID_FORMAT); // // // zero index -// assertParseFailure(parser, "0" + NAME_DESC_AMY, MESSAGE_INVALID_FORMAT); +// assertParseFailure(parser, "0" + NAME_DESC_MA2108_HOMEWORK, MESSAGE_INVALID_FORMAT); // // // invalid arguments being parsed as preamble // assertParseFailure(parser, "1 some random string", MESSAGE_INVALID_FORMAT); @@ -84,11 +84,13 @@ // assertParseFailure(parser, "1" + INVALID_TAG_DESC, Tag.MESSAGE_TAG_CONSTRAINTS); // invalid tag // // // invalid phone followed by valid email -// assertParseFailure(parser, "1" + INVALID_PHONE_DESC + EMAIL_DESC_AMY, DateTime.MESSAGE_DATETIME_CONSTRAINTS); +// assertParseFailure(parser, "1" + INVALID_PHONE_DESC + EMAIL_DESC_MA2108_HOMEWORK, DateTime +// .MESSAGE_DATETIME_CONSTRAINTS); // // // valid phone followed by invalid phone. The test case for invalid phone followed by valid phone // // is tested at {@code parse_invalidValueFollowedByValidValue_success()} -// assertParseFailure(parser, "1" + PHONE_DESC_BOB + INVALID_PHONE_DESC, DateTime.MESSAGE_DATETIME_CONSTRAINTS); +// assertParseFailure(parser, "1" + DATE_TIME_DESC_CS2010_QUIZ + INVALID_PHONE_DESC, +// DateTime.MESSAGE_DATETIME_CONSTRAINTS); // // // while parsing {@code PREFIX_TAG} alone will reset the tags of the {@code Activity} being edited, // // parsing it together with a valid tag results in error @@ -97,19 +99,21 @@ // assertParseFailure(parser, "1" + TAG_EMPTY + TAG_DESC_FRIEND + TAG_DESC_HUSBAND, Tag.MESSAGE_TAG_CONSTRAINTS); // // // multiple invalid values, but only the first invalid value is captured -// assertParseFailure(parser, "1" + INVALID_NAME_DESC + INVALID_EMAIL_DESC + VALID_ADDRESS_AMY + VALID_PHONE_AMY, +// assertParseFailure(parser, "1" + INVALID_NAME_DESC + INVALID_EMAIL_DESC + VALID_REMARKS_MA2108_HOMEWORK +// + VALID_DATE_TIME_MA2108_HOMEWORK, // Name.MESSAGE_NAME_CONSTRAINTS); // } // // @Test // public void parse_allFieldsSpecified_success() { // Index targetIndex = INDEX_SECOND_ACTIVITY; -// String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + TAG_DESC_HUSBAND -// + EMAIL_DESC_AMY + ADDRESS_DESC_AMY + NAME_DESC_AMY + TAG_DESC_FRIEND; +// String userInput = targetIndex.getOneBased() + DATE_TIME_DESC_CS2010_QUIZ + TAG_DESC_HUSBAND +// + EMAIL_DESC_MA2108_HOMEWORK + ADDRESS_DESC_MA2108_HOMEWORK + NAME_DESC_MA2108_HOMEWORK +// + TAG_DESC_FRIEND; // -// EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder().withName(VALID_NAME_AMY) -// .withPhone(VALID_PHONE_BOB).withAddress(VALID_ADDRESS_AMY) -// .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build(); +// EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder().withName(VALID_NAME_MA2108_HOMEWORK) +// .withPhone(VALID_DATE_TIME_CS2010_QUIZ).withAddress(VALID_REMARKS_MA2108_HOMEWORK) +// .withTags(VALID_TAG_MA2108, VALID_TAG_CS2010).build(); // EditCommand expectedCommand = new EditCommand(targetIndex, descriptor); // // assertParseSuccess(parser, userInput, expectedCommand); @@ -118,9 +122,10 @@ // @Test // public void parse_someFieldsSpecified_success() { // Index targetIndex = INDEX_FIRST_ACTIVITY; -// String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + EMAIL_DESC_AMY; +// String userInput = targetIndex.getOneBased() + DATE_TIME_DESC_CS2010_QUIZ + EMAIL_DESC_MA2108_HOMEWORK; // -// EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder().withPhone(VALID_PHONE_BOB).build(); +// EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder() +// .withPhone(VALID_DATE_TIME_CS2010_QUIZ).build(); // EditCommand expectedCommand = new EditCommand(targetIndex, descriptor); // // assertParseSuccess(parser, userInput, expectedCommand); @@ -130,32 +135,33 @@ // public void parse_oneFieldSpecified_success() { // // name // Index targetIndex = INDEX_THIRD_ACTIVITY; -// String userInput = targetIndex.getOneBased() + NAME_DESC_AMY; -// EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder().withName(VALID_NAME_AMY).build(); +// String userInput = targetIndex.getOneBased() + NAME_DESC_MA2108_HOMEWORK; +// EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder() +// .withName(VALID_NAME_MA2108_HOMEWORK).build(); // EditCommand expectedCommand = new EditCommand(targetIndex, descriptor); // assertParseSuccess(parser, userInput, expectedCommand); // // // phone -// userInput = targetIndex.getOneBased() + PHONE_DESC_AMY; -// descriptor = new EditActivityDescriptorBuilder().withPhone(VALID_PHONE_AMY).build(); +// userInput = targetIndex.getOneBased() + DATE_TIME_DESC_MA2108_HOMEWORK; +// descriptor = new EditActivityDescriptorBuilder().withPhone(VALID_DATE_TIME_MA2108_HOMEWORK).build(); // expectedCommand = new EditCommand(targetIndex, descriptor); // assertParseSuccess(parser, userInput, expectedCommand); // // // email -// userInput = targetIndex.getOneBased() + EMAIL_DESC_AMY; +// userInput = targetIndex.getOneBased() + EMAIL_DESC_MA2108_HOMEWORK; // descriptor = new EditActivityDescriptorBuilder().build(); // expectedCommand = new EditCommand(targetIndex, descriptor); // assertParseSuccess(parser, userInput, expectedCommand); // // // address -// userInput = targetIndex.getOneBased() + ADDRESS_DESC_AMY; -// descriptor = new EditActivityDescriptorBuilder().withAddress(VALID_ADDRESS_AMY).build(); +// userInput = targetIndex.getOneBased() + ADDRESS_DESC_MA2108_HOMEWORK; +// descriptor = new EditActivityDescriptorBuilder().withAddress(VALID_REMARKS_MA2108_HOMEWORK).build(); // expectedCommand = new EditCommand(targetIndex, descriptor); // assertParseSuccess(parser, userInput, expectedCommand); // // // tags // userInput = targetIndex.getOneBased() + TAG_DESC_FRIEND; -// descriptor = new EditActivityDescriptorBuilder().withTags(VALID_TAG_FRIEND).build(); +// descriptor = new EditActivityDescriptorBuilder().withTags(VALID_TAG_CS2010).build(); // expectedCommand = new EditCommand(targetIndex, descriptor); // assertParseSuccess(parser, userInput, expectedCommand); // } @@ -163,13 +169,15 @@ // @Test // public void parse_multipleRepeatedFields_acceptsLast() { // Index targetIndex = INDEX_FIRST_ACTIVITY; -// String userInput = targetIndex.getOneBased() + PHONE_DESC_AMY + ADDRESS_DESC_AMY + EMAIL_DESC_AMY -// + TAG_DESC_FRIEND + PHONE_DESC_AMY + ADDRESS_DESC_AMY + EMAIL_DESC_AMY + TAG_DESC_FRIEND -// + PHONE_DESC_BOB + ADDRESS_DESC_BOB + EMAIL_DESC_BOB + TAG_DESC_HUSBAND; +// String userInput = targetIndex.getOneBased() + DATE_TIME_DESC_MA2108_HOMEWORK +// + ADDRESS_DESC_MA2108_HOMEWORK + EMAIL_DESC_MA2108_HOMEWORK + TAG_DESC_FRIEND +// + DATE_TIME_DESC_MA2108_HOMEWORK + ADDRESS_DESC_MA2108_HOMEWORK + EMAIL_DESC_MA2108_HOMEWORK +// + TAG_DESC_FRIEND + DATE_TIME_DESC_CS2010_QUIZ + ADDRESS_DESC_CS2010_QUIZ +// + EMAIL_DESC_CS2010_QUIZ + TAG_DESC_HUSBAND; // -// EditCommand.EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder().withPhone(VALID_PHONE_BOB) -// .withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND) -// .build(); +// EditCommand.EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder() +// .withPhone(VALID_DATE_TIME_CS2010_QUIZ).withAddress(VALID_REMARK_CS2010_QUIZ) +// .withTags(VALID_TAG_CS2010, VALID_TAG_MA2108).build(); // EditCommand expectedCommand = new EditCommand(targetIndex, descriptor); // // assertParseSuccess(parser, userInput, expectedCommand); @@ -179,17 +187,17 @@ // public void parse_invalidValueFollowedByValidValue_success() { // // no other valid values specified // Index targetIndex = INDEX_FIRST_ACTIVITY; -// String userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + PHONE_DESC_BOB; +// String userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + DATE_TIME_DESC_CS2010_QUIZ; // EditCommand.EditActivityDescriptor descriptor = new EditActivityDescriptorBuilder() -// .withPhone(VALID_PHONE_BOB).build(); +// .withPhone(VALID_DATE_TIME_CS2010_QUIZ).build(); // EditCommand expectedCommand = new EditCommand(targetIndex, descriptor); // assertParseSuccess(parser, userInput, expectedCommand); // // // other valid values specified -// userInput = targetIndex.getOneBased() + EMAIL_DESC_BOB + INVALID_PHONE_DESC + ADDRESS_DESC_BOB -// + PHONE_DESC_BOB; -// descriptor = new EditActivityDescriptorBuilder().withPhone(VALID_PHONE_BOB) -// .withAddress(VALID_ADDRESS_BOB).build(); +// userInput = targetIndex.getOneBased() + EMAIL_DESC_CS2010_QUIZ + INVALID_PHONE_DESC + ADDRESS_DESC_CS2010_QUIZ +// + DATE_TIME_DESC_CS2010_QUIZ; +// descriptor = new EditActivityDescriptorBuilder().withPhone(VALID_DATE_TIME_CS2010_QUIZ) +// .withAddress(VALID_REMARK_CS2010_QUIZ).build(); // expectedCommand = new EditCommand(targetIndex, descriptor); // assertParseSuccess(parser, userInput, expectedCommand); // } diff --git a/src/test/java/seedu/address/logic/parser/TaskCommandParserTest.java b/src/test/java/seedu/address/logic/parser/TaskCommandParserTest.java deleted file mode 100644 index 3a08a105f58e..000000000000 --- a/src/test/java/seedu/address/logic/parser/TaskCommandParserTest.java +++ /dev/null @@ -1,153 +0,0 @@ -//package seedu.address.logic.parser; -// -//import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -//import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY; -//import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE; -//import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND; -//import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; -//import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; -//import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; -// -////import org.junit.Test; -// -////import seedu.address.logic.commands.TaskCommand; -//import seedu.address.model.activity.Activity; -//import seedu.address.model.activity.DateTime; -//import seedu.address.model.activity.Name; -//import seedu.address.model.activity.Remark; -//import seedu.address.model.tag.Tag; -//import seedu.address.testutil.TaskBuilder; -// -//public class TaskCommandParserTest { -// private TaskCommandParser parser = new TaskCommandParser(); -// -// //TODO: TEST -// /** -// * Test -// */ -// public void parse_allFieldsPresent_success() { -// -// Activity expectedActivity = new TaskBuilder().withName(VALID_NAME_BOB).withDateTime(VALID_PHONE_BOB) -// .withRemark(VALID_ADDRESS_BOB).withTags(VALID_TAG_FRIEND).build(); -// -// // whitespace only preamble -// assertParseSuccess(parser, PREAMBLE_WHITESPACE + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB -// + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedActivity)); -// -// // multiple names - last name accepted -// assertParseSuccess(parser, NAME_DESC_AMY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB -// + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedActivity)); -// -// // multiple phones - last phone accepted -// assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_AMY + PHONE_DESC_BOB + EMAIL_DESC_BOB -// + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedActivity)); -// -// // multiple emails - last email accepted -// assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_AMY + EMAIL_DESC_BOB -// + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedActivity)); -// -// // multiple addresses - last address accepted -// assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_AMY -// + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedActivity)); -// -// // multiple tags - all accepted -// Activity expectedActivityMultipleTags = new TaskBuilder().withName(VALID_NAME_BOB) -// .withDateTime(VALID_PHONE_BOB) -// .withRemark(VALID_ADDRESS_BOB) -// .withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND).build(); -// assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB -// + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, new AddCommand(expectedActivityMultipleTags)); -// } -// -// //TODO: TEST -// /** -// * Test -// */ -// public void parse_optionalFieldsMissing_success() { -// // zero tags -// Activity expectedActivity = new TaskBuilder().withName(VALID_NAME_AMY).withDateTime(VALID_PHONE_AMY) -// .withRemark(VALID_ADDRESS_AMY).withTags().build(); -// assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY, -// new AddCommand(expectedActivity)); -// } -// -// //TODO: TEST -// /** -// * Test -// */ -// public void parse_compulsoryFieldMissing_failure() { -// String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE); -// -// // missing name prefix -// assertParseFailure(parser, VALID_NAME_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB, -// expectedMessage); -// -// // missing phone prefix -// assertParseFailure(parser, NAME_DESC_BOB + VALID_PHONE_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB, -// expectedMessage); -// -// // missing email prefix -// assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + VALID_EMAIL_BOB + ADDRESS_DESC_BOB, -// expectedMessage); -// -// // missing address prefix -// assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + VALID_ADDRESS_BOB, -// expectedMessage); -// -// // all prefixes missing -// assertParseFailure(parser, VALID_NAME_BOB + VALID_PHONE_BOB + VALID_EMAIL_BOB + VALID_ADDRESS_BOB, -// expectedMessage); -// } -// -// //TODO: TEST -// /** -// * Test -// */ -// public void parse_invalidValue_failure() { -// // invalid name -// assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB -// + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Name.MESSAGE_NAME_CONSTRAINTS); -// -// // invalid phone -// assertParseFailure(parser, NAME_DESC_BOB + INVALID_PHONE_DESC + EMAIL_DESC_BOB + ADDRESS_DESC_BOB -// + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, DateTime.MESSAGE_DATETIME_CONSTRAINTS); -// -// // invalid address -// assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_ADDRESS_DESC -// + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Remark.MESSAGE_REMARK_CONSTRAINTS); -// -// // invalid tag -// assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB -// + INVALID_TAG_DESC + VALID_TAG_FRIEND, Tag.MESSAGE_TAG_CONSTRAINTS); -// -// // two invalid values, only first invalid value reported -// assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_ADDRESS_DESC, -// Name.MESSAGE_NAME_CONSTRAINTS); -// -// // non-empty preamble -// assertParseFailure(parser, PREAMBLE_NON_EMPTY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB -// + ADDRESS_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, -// String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE)); -// } -//} diff --git a/src/test/java/seedu/address/storage/XmlAdaptedActivityTest.java b/src/test/java/seedu/address/storage/XmlAdaptedActivityTest.java index ad1f06262d5b..bfec7284d831 100644 --- a/src/test/java/seedu/address/storage/XmlAdaptedActivityTest.java +++ b/src/test/java/seedu/address/storage/XmlAdaptedActivityTest.java @@ -1,93 +1,69 @@ -//package seedu.address.storage; -// -//import static org.junit.Assert.assertEquals; -//import static seedu.address.storage.XmlAdaptedActivity.MISSING_FIELD_MESSAGE_FORMAT; -//import static seedu.address.testutil.TypicalActivities.ASSIGNMENT2; -// -//import java.util.ArrayList; -//import java.util.List; -//import java.util.stream.Collectors; -// -//import org.junit.Test; -// -//import seedu.address.commons.exceptions.IllegalValueException; -//import seedu.address.model.activity.DateTime; -//import seedu.address.model.activity.Name; -//import seedu.address.model.activity.Remark; -//import seedu.address.testutil.Assert; -// -//public class XmlAdaptedActivityTest { -// private static final String INVALID_NAME = "R@chel"; -// private static final String INVALID_PHONE = "+651234"; -// private static final String INVALID_ADDRESS = " "; -// private static final String INVALID_EMAIL = "example.com"; -// private static final String INVALID_TAG = "#friend"; -// -// private static final String VALID_NAME = ASSIGNMENT2.getName().toString(); -// private static final String VALID_PHONE = ASSIGNMENT2.getDateTime().toString(); -// private static final String VALID_ADDRESS = ASSIGNMENT2.getRemark().toString(); -// private static final List VALID_TAGS = ASSIGNMENT2.getTags().stream() -// .map(XmlAdaptedTag::new) -// .collect(Collectors.toList()); -// -// @Test -// public void toModelType_validPersonDetails_returnsPerson() throws Exception { -// XmlAdaptedActivity person = new XmlAdaptedActivity(ASSIGNMENT2); -// assertEquals(ASSIGNMENT2, person.toModelType()); -// } -// -// @Test -// public void toModelType_invalidName_throwsIllegalValueException() { -// XmlAdaptedActivity person = -// new XmlAdaptedActivity(INVALID_NAME, VALID_PHONE, VALID_ADDRESS, VALID_TAGS); -// String expectedMessage = Name.MESSAGE_NAME_CONSTRAINTS; -// Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType); -// } -// -// @Test -// public void toModelType_nullName_throwsIllegalValueException() { -// XmlAdaptedActivity person = new XmlAdaptedActivity(null, VALID_PHONE, VALID_ADDRESS, VALID_TAGS); -// String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName()); -// Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType); -// } -// -// @Test -// public void toModelType_invalidPhone_throwsIllegalValueException() { -// XmlAdaptedActivity person = -// new XmlAdaptedActivity(VALID_NAME, INVALID_PHONE, VALID_ADDRESS, VALID_TAGS); -// String expectedMessage = DateTime.MESSAGE_DATETIME_CONSTRAINTS; -// Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType); -// } -// -// @Test -// public void toModelType_nullPhone_throwsIllegalValueException() { -// XmlAdaptedActivity person = new XmlAdaptedActivity(VALID_NAME, null, VALID_ADDRESS, VALID_TAGS); -// String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, DateTime.class.getSimpleName()); -// Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType); -// } -// -// @Test -// public void toModelType_invalidAddress_throwsIllegalValueException() { -// XmlAdaptedActivity person = -// new XmlAdaptedActivity(VALID_NAME, VALID_PHONE, INVALID_ADDRESS, VALID_TAGS); -// String expectedMessage = Remark.MESSAGE_REMARK_CONSTRAINTS; -// Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType); -// } -// -// @Test -// public void toModelType_nullAddress_throwsIllegalValueException() { -// XmlAdaptedActivity person = new XmlAdaptedActivity(VALID_NAME, VALID_PHONE, null, VALID_TAGS); -// String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Remark.class.getSimpleName()); -// Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType); -// } -// -// @Test -// public void toModelType_invalidTags_throwsIllegalValueException() { -// List invalidTags = new ArrayList<>(VALID_TAGS); -// invalidTags.add(new XmlAdaptedTag(INVALID_TAG)); -// XmlAdaptedActivity person = -// new XmlAdaptedActivity(VALID_NAME, VALID_PHONE, VALID_ADDRESS, invalidTags); -// Assert.assertThrows(IllegalValueException.class, person::toModelType); -// } -// -//} +package seedu.address.storage; + +import static seedu.address.storage.XmlAdaptedActivity.MISSING_FIELD_MESSAGE_FORMAT; +import static seedu.address.testutil.TypicalActivities.ASSIGNMENT2; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import org.junit.Test; + +import seedu.address.commons.exceptions.IllegalValueException; +import seedu.address.model.activity.DateTime; +import seedu.address.model.activity.Name; +import seedu.address.testutil.Assert; + +public class XmlAdaptedActivityTest { + + private static final String INVALID_NAME = "Rachel's Bday"; + private static final String INVALID_DATE_TIME = "23 April 2018"; + private static final String INVALID_TAG = "#friend"; + + private static final String VALID_NAME = ASSIGNMENT2.getName().toString(); + private static final String VALID_DATE_TIME = ASSIGNMENT2.getDateTime().toString(); + private static final String VALID_REMARK = ASSIGNMENT2.getRemark().toString(); + private static final List VALID_TAGS = ASSIGNMENT2.getTags().stream() + .map(XmlAdaptedTag::new) + .collect(Collectors.toList()); + + @Test + public void toModelType_invalidName_throwsIllegalValueException() { + XmlAdaptedActivity activity = + new XmlAdaptedActivity(INVALID_NAME, VALID_DATE_TIME, VALID_REMARK, VALID_TAGS); + String expectedMessage = Name.MESSAGE_NAME_CONSTRAINTS; + Assert.assertThrows(IllegalValueException.class, expectedMessage, activity::toModelType); + } + + @Test + public void toModelType_nullName_throwsIllegalValueException() { + XmlAdaptedActivity activity = new XmlAdaptedActivity(null, VALID_DATE_TIME, VALID_REMARK, VALID_TAGS); + String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName()); + Assert.assertThrows(IllegalValueException.class, expectedMessage, activity::toModelType); + } + + @Test + public void toModelType_invalidDateTime_throwsIllegalValueException() { + XmlAdaptedActivity activity = + new XmlAdaptedActivity(VALID_NAME, INVALID_DATE_TIME, VALID_REMARK, VALID_TAGS); + String expectedMessage = DateTime.MESSAGE_DATETIME_CONSTRAINTS; + Assert.assertThrows(IllegalValueException.class, expectedMessage, activity::toModelType); + } + + @Test + public void toModelType_nullDateTime_throwsIllegalValueException() { + XmlAdaptedActivity activity = new XmlAdaptedActivity(VALID_NAME, null, VALID_REMARK, VALID_TAGS); + String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, DateTime.class.getSimpleName()); + Assert.assertThrows(IllegalValueException.class, expectedMessage, activity::toModelType); + } + + @Test + public void toModelType_invalidTags_throwsIllegalValueException() { + List invalidTags = new ArrayList<>(VALID_TAGS); + invalidTags.add(new XmlAdaptedTag(INVALID_TAG)); + XmlAdaptedActivity activity = + new XmlAdaptedActivity(VALID_NAME, VALID_DATE_TIME, VALID_REMARK, invalidTags); + Assert.assertThrows(IllegalValueException.class, activity::toModelType); + } + +} diff --git a/src/test/java/seedu/address/storage/XmlDeskBoardStorageTest.java b/src/test/java/seedu/address/storage/XmlDeskBoardStorageTest.java index a194043ddf0b..aab526ecc489 100644 --- a/src/test/java/seedu/address/storage/XmlDeskBoardStorageTest.java +++ b/src/test/java/seedu/address/storage/XmlDeskBoardStorageTest.java @@ -1,125 +1,94 @@ -//package seedu.address.storage; -// -//import static org.junit.Assert.assertEquals; -//import static org.junit.Assert.assertFalse; -//import static seedu.address.testutil.TypicalActivities.ASSIGNMENT1; -//import static seedu.address.testutil.TypicalActivities.ASSIGNMENT3; -//import static seedu.address.testutil.TypicalActivities.DEMO1; -//import static seedu.address.testutil.TypicalActivities.getTypicalDeskBoard; -// -//import java.io.IOException; -// -//import org.junit.Rule; -//import org.junit.Test; -//import org.junit.rules.ExpectedException; -//import org.junit.rules.TemporaryFolder; -// -//import seedu.address.commons.exceptions.DataConversionException; -//import seedu.address.commons.util.FileUtil; -//import seedu.address.model.DeskBoard; -//import seedu.address.model.ReadOnlyDeskBoard; -// -//public class XmlDeskBoardStorageTest { -// private static final String TEST_DATA_FOLDER = FileUtil.getPath("./src/test/data/XmlDeskBoardStorageTest/"); -// -// @Rule -// public ExpectedException thrown = ExpectedException.none(); -// -// @Rule -// public TemporaryFolder testFolder = new TemporaryFolder(); -// -// @Test -// public void readAddressBook_nullFilePath_throwsNullPointerException() throws Exception { -// thrown.expect(NullPointerException.class); -// readAddressBook(null); -// } -// -// private java.util.Optional readAddressBook(String filePath) throws Exception { -// return new XmlDeskBoardStorage(filePath).readDeskBoard(addToTestDataPathIfNotNull(filePath)); -// } -// -// private String addToTestDataPathIfNotNull(String prefsFileInTestDataFolder) { -// return prefsFileInTestDataFolder != null -// ? TEST_DATA_FOLDER + prefsFileInTestDataFolder -// : null; -// } -// -// @Test -// public void read_missingFile_emptyResult() throws Exception { -// assertFalse(readAddressBook("NonExistentFile.xml").isPresent()); -// } -// -// @Test -// public void read_notXmlFormat_exceptionThrown() throws Exception { -// -// thrown.expect(DataConversionException.class); -// readAddressBook("NotXmlFormatAddressBook.xml"); -// -// /* IMPORTANT: Any code below an exception-throwing line (like the one above) will be ignored. -// * That means you should not have more than one exception test in one method -// */ -// } -// -// @Test -// public void readAddressBook_invalidPersonAddressBook_throwDataConversionException() throws Exception { -// thrown.expect(DataConversionException.class); -// readAddressBook("invalidPersonAddressBook.xml"); -// } -// -// @Test -// public void readAddressBook_invalidAndValidPersonAddressBook_throwDataConversionException() throws Exception { -// thrown.expect(DataConversionException.class); -// readAddressBook("invalidAndValidPersonAddressBook.xml"); -// } -// -// @Test -// public void readAndSaveAddressBook_allInOrder_success() throws Exception { -// String filePath = testFolder.getRoot().getPath() + "TempAddressBook.xml"; -// DeskBoard original = getTypicalDeskBoard(); -// XmlDeskBoardStorage xmlAddressBookStorage = new XmlDeskBoardStorage(filePath); -// -// //Save in new file and read back -// xmlAddressBookStorage.saveDeskBoard(original, filePath); -// ReadOnlyDeskBoard readBack = xmlAddressBookStorage.readDeskBoard(filePath).get(); -// assertEquals(original, new DeskBoard(readBack)); -// -// //Modify data, overwrite exiting file, and read back -// original.addActivity(ASSIGNMENT3); -// original.removeActivity(ASSIGNMENT1); -// xmlAddressBookStorage.saveDeskBoard(original, filePath); -// readBack = xmlAddressBookStorage.readDeskBoard(filePath).get(); -// assertEquals(original, new DeskBoard(readBack)); -// -// //Save and read without specifying file path -// original.addActivity(DEMO1); -// xmlAddressBookStorage.saveDeskBoard(original); //file path not specified -// readBack = xmlAddressBookStorage.readDeskBoard().get(); //file path not specified -// assertEquals(original, new DeskBoard(readBack)); -// -// } -// -// @Test -// public void saveAddressBook_nullAddressBook_throwsNullPointerException() { -// thrown.expect(NullPointerException.class); -// saveAddressBook(null, "SomeFile.xml"); -// } -// -// /** -// * Saves {@code addressBook} at the specified {@code filePath}. -// */ -// private void saveAddressBook(ReadOnlyDeskBoard addressBook, String filePath) { -// try { -// new XmlDeskBoardStorage(filePath).saveDeskBoard(addressBook, addToTestDataPathIfNotNull(filePath)); -// } catch (IOException ioe) { -// throw new AssertionError("There should not be an error writing to the file.", ioe); -// } -// } -// -// @Test -// public void saveAddressBook_nullFilePath_throwsNullPointerException() throws IOException { -// thrown.expect(NullPointerException.class); -// saveAddressBook(new DeskBoard(), null); -// } -// -// -//} +package seedu.address.storage; + +import static org.junit.Assert.assertFalse; + +import java.io.IOException; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.rules.TemporaryFolder; + +import seedu.address.commons.exceptions.DataConversionException; +import seedu.address.commons.util.FileUtil; +import seedu.address.model.DeskBoard; +import seedu.address.model.ReadOnlyDeskBoard; + +public class XmlDeskBoardStorageTest { + private static final String TEST_DATA_FOLDER = FileUtil.getPath("./src/test/data/XmlDeskBoardStorageTest/"); + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + @Rule + public TemporaryFolder testFolder = new TemporaryFolder(); + + @Test + public void readDeskBoard_nullFilePath_throwsNullPointerException() throws Exception { + thrown.expect(NullPointerException.class); + readDeskBoard(null); + } + + private java.util.Optional readDeskBoard(String filePath) throws Exception { + return new XmlDeskBoardStorage(filePath).readDeskBoard(addToTestDataPathIfNotNull(filePath)); + } + + private String addToTestDataPathIfNotNull(String prefsFileInTestDataFolder) { + return prefsFileInTestDataFolder != null + ? TEST_DATA_FOLDER + prefsFileInTestDataFolder + : null; + } + + @Test + public void read_missingFile_emptyResult() throws Exception { + assertFalse(readDeskBoard("NonExistentFile.xml").isPresent()); + } + + @Test + public void read_notXmlFormat_exceptionThrown() throws Exception { + + thrown.expect(DataConversionException.class); + readDeskBoard("NotXmlFormatDeskBoard.xml"); + + /* IMPORTANT: Any code below an exception-throwing line (like the one above) will be ignored. + * That means you should not have more than one exception test in one method + */ + } + + @Test + public void readDeskBoard_invalidActivityDeskBoard_throwDataConversionException() throws Exception { + thrown.expect(DataConversionException.class); + readDeskBoard("invalidActivityDeskBoard.xml"); + } + + @Test + public void readDeskBoard_invalidAndValidActivityDeskBoard_throwDataConversionException() throws Exception { + thrown.expect(DataConversionException.class); + readDeskBoard("invalidAndValidActivityDeskBoard.xml"); + } + + @Test + public void saveDeskBoard_nullDeskBoard_throwsNullPointerException() { + thrown.expect(NullPointerException.class); + saveDeskBoard(null, "SomeFile.xml"); + } + + /** + * Saves {@code deskBoard} at the specified {@code filePath}. + */ + private void saveDeskBoard(ReadOnlyDeskBoard deskBoard, String filePath) { + try { + new XmlDeskBoardStorage(filePath).saveDeskBoard(deskBoard, addToTestDataPathIfNotNull(filePath)); + } catch (IOException ioe) { + throw new AssertionError("There should not be an error writing to the file.", ioe); + } + } + + @Test + public void saveDeskBoard_nullFilePath_throwsNullPointerException() throws IOException { + thrown.expect(NullPointerException.class); + saveDeskBoard(new DeskBoard(), null); + } + + +} diff --git a/src/test/java/seedu/address/storage/XmlSerializableDeskBoardTest.java b/src/test/java/seedu/address/storage/XmlSerializableDeskBoardTest.java index b92d7edac58a..ad441fca4dbe 100644 --- a/src/test/java/seedu/address/storage/XmlSerializableDeskBoardTest.java +++ b/src/test/java/seedu/address/storage/XmlSerializableDeskBoardTest.java @@ -1,52 +1,38 @@ -//package seedu.address.storage; -// -//import static org.junit.Assert.assertEquals; -// -//import java.io.File; -// -//import org.junit.Rule; -//import org.junit.Test; -//import org.junit.rules.ExpectedException; -// -//import seedu.address.commons.exceptions.IllegalValueException; -//import seedu.address.commons.util.FileUtil; -//import seedu.address.commons.util.XmlUtil; -//import seedu.address.model.DeskBoard; -//import seedu.address.testutil.TypicalActivities; -// -//public class XmlSerializableDeskBoardTest { -// -// private static final String TEST_DATA_FOLDER = FileUtil.getPath("src/test/data/XmlSerializableDeskBoardTest/"); -// private static final File TYPICAL_PERSONS_FILE = new File(TEST_DATA_FOLDER + "typicalPersonsAddressBook.xml"); -// private static final File INVALID_PERSON_FILE = new File(TEST_DATA_FOLDER + "invalidPersonAddressBook.xml"); -// private static final File INVALID_TAG_FILE = new File(TEST_DATA_FOLDER + "invalidTagAddressBook.xml"); -// -// @Rule -// public ExpectedException thrown = ExpectedException.none(); -// -// @Test -// public void toModelType_typicalPersonsFile_success() throws Exception { -// XmlSerializableDeskBoard dataFromFile = XmlUtil.getDataFromFile(TYPICAL_PERSONS_FILE, -// XmlSerializableDeskBoard.class); -// DeskBoard addressBookFromFile = dataFromFile.toModelType(); -// DeskBoard typicalPersonsAddressBook = TypicalActivities.getTypicalDeskBoard(); -// assertEquals(addressBookFromFile, typicalPersonsAddressBook); -// } -// -// @Test -// public void toModelType_invalidPersonFile_throwsIllegalValueException() throws Exception { -// XmlSerializableDeskBoard dataFromFile = XmlUtil.getDataFromFile(INVALID_PERSON_FILE, -// XmlSerializableDeskBoard.class); -// thrown.expect(IllegalValueException.class); -// dataFromFile.toModelType(); -// } -// -// @Test -// -// public void toModelType_invalidTagFile_throwsIllegalValueException() throws Exception { -// XmlSerializableDeskBoard dataFromFile = XmlUtil.getDataFromFile(INVALID_TAG_FILE, -// XmlSerializableDeskBoard.class); -// thrown.expect(IllegalValueException.class); -// dataFromFile.toModelType(); -// } -//} +package seedu.address.storage; + +import java.io.File; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import seedu.address.commons.exceptions.IllegalValueException; +import seedu.address.commons.util.FileUtil; +import seedu.address.commons.util.XmlUtil; + +public class XmlSerializableDeskBoardTest { + + private static final String TEST_DATA_FOLDER = FileUtil.getPath("src/test/data/XmlSerializableDeskBoardTest/"); + private static final File TYPICAL_ACTIVITIES_FILE = new File(TEST_DATA_FOLDER + "typicalActivitiesDeskBoard.xml"); + private static final File INVALID_ACTIVITY_FILE = new File(TEST_DATA_FOLDER + "invalidActivityDeskBoard.xml"); + private static final File INVALID_TAG_FILE = new File(TEST_DATA_FOLDER + "invalidTagDeskBoard.xml"); + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + @Test + public void toModelType_invalidActivityFile_throwsIllegalValueException() throws Exception { + XmlSerializableDeskBoard dataFromFile = XmlUtil.getDataFromFile(INVALID_ACTIVITY_FILE, + XmlSerializableDeskBoard.class); + thrown.expect(IllegalValueException.class); + dataFromFile.toModelType(); + } + + @Test + public void toModelType_invalidTagFile_throwsIllegalValueException() throws Exception { + XmlSerializableDeskBoard dataFromFile = XmlUtil.getDataFromFile(INVALID_TAG_FILE, + XmlSerializableDeskBoard.class); + thrown.expect(IllegalValueException.class); + dataFromFile.toModelType(); + } +} diff --git a/src/test/java/seedu/address/testutil/TypicalActivities.java b/src/test/java/seedu/address/testutil/TypicalActivities.java index f0b1c03c59fa..e004e35a36f5 100644 --- a/src/test/java/seedu/address/testutil/TypicalActivities.java +++ b/src/test/java/seedu/address/testutil/TypicalActivities.java @@ -1,13 +1,13 @@ package seedu.address.testutil; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +import static seedu.address.logic.commands.CommandTestUtil.VALID_DATE_TIME_CS2010_QUIZ; +import static seedu.address.logic.commands.CommandTestUtil.VALID_DATE_TIME_MA2108_HOMEWORK; +import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_CS2010_QUIZ; +import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_MA2108_HOMEWORK; +import static seedu.address.logic.commands.CommandTestUtil.VALID_REMARK_CS2010_QUIZ; +import static seedu.address.logic.commands.CommandTestUtil.VALID_REMARK_MA2108_HOMEWORK; +import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_CS2010; +import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_MA2108; import java.util.ArrayList; import java.util.Arrays; @@ -41,11 +41,13 @@ public class TypicalActivities { public static final Activity CIP1 = new EventBuilder().withName("CIP") .withStartDateTime("02/04/2018 08:00") .withEndDateTime("02/04/2018 12:00") - .withLocation("michegan ave").withTags("CIP").build(); + .withLocation("michegan ave") + .withTags("CIP").build(); public static final Activity EXAM1 = new EventBuilder().withName("CS2101Exam") .withStartDateTime("28/04/2018 09:00") .withEndDateTime("28/04/2018 11:00") - .withLocation("MPSH").withTags("CS2101").build(); + .withLocation("MPSH") + .withTags("CS2101").build(); public static final Activity IFG = new EventBuilder().withName("InterFacultyGame") .withStartDateTime("04/01/2018 20:00") .withEndDateTime("04/01/2018 22:00") @@ -61,10 +63,12 @@ public class TypicalActivities { .withRemark("FinalDemo").build(); // Manually added - Activity's details found in {@code CommandTestUtil} - public static final Activity AMY = new TaskBuilder().withName(VALID_NAME_AMY).withDateTime(VALID_PHONE_AMY) - .withRemark(VALID_ADDRESS_AMY).withTags(VALID_TAG_FRIEND).build(); - public static final Activity BOB = new TaskBuilder().withName(VALID_NAME_BOB).withDateTime(VALID_PHONE_BOB) - .withRemark(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND) + public static final Activity MA2108_HOMEWORK = new TaskBuilder().withName(VALID_NAME_MA2108_HOMEWORK) + .withDateTime(VALID_DATE_TIME_MA2108_HOMEWORK) + .withRemark(VALID_REMARK_MA2108_HOMEWORK).withTags(VALID_TAG_CS2010).build(); + public static final Activity CS2010_QUIZ = new TaskBuilder().withName(VALID_NAME_CS2010_QUIZ) + .withDateTime(VALID_DATE_TIME_CS2010_QUIZ) + .withRemark(VALID_REMARK_CS2010_QUIZ).withTags(VALID_TAG_MA2108, VALID_TAG_CS2010) .build(); public static final String KEYWORD_MATCHING_MEIER = "Meier"; // A keyword that matches MEIER @@ -75,15 +79,15 @@ private TypicalActivities() {} // prevents instantiation * Returns an {@code DeskBoard} with all the typical persons. */ public static DeskBoard getTypicalDeskBoard() { - DeskBoard ab = new DeskBoard(); + DeskBoard deskBoard = new DeskBoard(); for (Activity activity : getTypicalActivitiess()) { try { - ab.addActivity(activity); + deskBoard.addActivity(activity); } catch (DuplicateActivityException e) { throw new AssertionError("not possible"); } } - return ab; + return deskBoard; } public static List getTypicalActivitiess() { diff --git a/src/test/java/seedu/address/ui/HelpWindowTest.java b/src/test/java/seedu/address/ui/HelpWindowTest.java index 68f9d81073e4..be642616dd4b 100644 --- a/src/test/java/seedu/address/ui/HelpWindowTest.java +++ b/src/test/java/seedu/address/ui/HelpWindowTest.java @@ -1,12 +1,6 @@ package seedu.address.ui; -import static org.junit.Assert.assertEquals; -import static seedu.address.ui.HelpWindow.USERGUIDE_FILE_PATH; - -import java.net.URL; - import org.junit.Before; -import org.junit.Test; import org.testfx.api.FxToolkit; import guitests.guihandles.HelpWindowHandle; @@ -24,10 +18,4 @@ public void setUp() throws Exception { FxToolkit.showStage(); helpWindowHandle = new HelpWindowHandle(helpWindowStage); } - - @Test - public void display() { - URL expectedHelpPage = HelpWindow.class.getResource(USERGUIDE_FILE_PATH); - assertEquals(expectedHelpPage, helpWindowHandle.getLoadedUrl()); - } } diff --git a/src/test/java/systemtests/AddCommandSystemTest.java b/src/test/java/systemtests/AddCommandSystemTest.java deleted file mode 100644 index f3b8af1765df..000000000000 --- a/src/test/java/systemtests/AddCommandSystemTest.java +++ /dev/null @@ -1,265 +0,0 @@ -//package systemtests; -// -//import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -//import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND; -//import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; -//import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; -//import static seedu.address.testutil.TypicalActivities.AMY; -//import static seedu.address.testutil.TypicalActivities.ASSIGNMENT1; -//import static seedu.address.testutil.TypicalActivities.ASSIGNMENT3; -//import static seedu.address.testutil.TypicalActivities.BOB; -//import static seedu.address.testutil.TypicalActivities.DEMO1; -//import static seedu.address.testutil.TypicalActivities.KEYWORD_MATCHING_MEIER; -//import static seedu.address.testutil.TypicalActivities.QUIZ; -// -////import org.junit.Test; -// -//import seedu.address.commons.core.Messages; -//import seedu.address.commons.core.index.Index; -//import seedu.address.logic.commands.AddCommand; -//import seedu.address.logic.commands.RedoCommand; -//import seedu.address.logic.commands.UndoCommand; -//import seedu.address.model.Model; -//import seedu.address.model.activity.Activity; -//import seedu.address.model.activity.DateTime; -//import seedu.address.model.activity.Name; -//import seedu.address.model.activity.Remark; -//import seedu.address.model.activity.exceptions.DuplicateActivityException; -//import seedu.address.model.tag.Tag; -//import seedu.address.testutil.ActivityUtil; -//import seedu.address.testutil.TaskBuilder; -// -//public class AddCommandSystemTest extends RemarkBookSystemTest { -// -// //TODO: TEST -// /** -// * Test -// */ -// public void add() throws Exception { -// Model model = getModel(); -// -// /* ------------------------ Perform add operations on the shown unfiltered list -// ----------------------------- */ -// -// /* Case: add a activity without tags to a non-empty address book, -// * command with leading spaces and trailing spaces -// * -> added -// */ -// Activity toAdd = AMY; -// String command = " " + AddCommand.COMMAND_WORD + " " + NAME_DESC_AMY + " " + PHONE_DESC_AMY + " " -// + EMAIL_DESC_AMY + " " + ADDRESS_DESC_AMY + " " + TAG_DESC_FRIEND + " "; -// assertCommandSuccess(command, toAdd); -// -// /* Case: undo adding Amy to the list -> Amy deleted */ -// command = UndoCommand.COMMAND_WORD; -// String expectedResultMessage = UndoCommand.MESSAGE_SUCCESS; -// assertCommandSuccess(command, model, expectedResultMessage); -// -// /* Case: redo adding Amy to the list -> Amy added again */ -// command = RedoCommand.COMMAND_WORD; -// model.addActivity(toAdd); -// expectedResultMessage = RedoCommand.MESSAGE_SUCCESS; -// assertCommandSuccess(command, model, expectedResultMessage); -// -// /* Case: add a activity with all fields same as another activity in the address book except name -> added */ -// toAdd = new TaskBuilder().withName(VALID_NAME_BOB).withDateTime(VALID_PHONE_AMY) -// .withRemark(VALID_ADDRESS_AMY).withTags(VALID_TAG_FRIEND).build(); -// command = AddCommand.COMMAND_WORD + NAME_DESC_BOB + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY -// + TAG_DESC_FRIEND; -// assertCommandSuccess(command, toAdd); -// -// /* Case: add a activity with all fields same as another activity in the address book except phone -> added */ -// toAdd = new TaskBuilder().withName(VALID_NAME_AMY).withDateTime(VALID_PHONE_BOB) -// .withRemark(VALID_ADDRESS_AMY).withTags(VALID_TAG_FRIEND).build(); -// command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_BOB + EMAIL_DESC_AMY + ADDRESS_DESC_AMY -// + TAG_DESC_FRIEND; -// assertCommandSuccess(command, toAdd); -// -// /* Case: add a activity with all fields same as another activity in the address book except email -> added */ -// toAdd = new TaskBuilder().withName(VALID_NAME_AMY).withDateTime(VALID_PHONE_AMY) -// .withRemark(VALID_ADDRESS_AMY).withTags(VALID_TAG_FRIEND).build(); -// command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_BOB + ADDRESS_DESC_AMY -// + TAG_DESC_FRIEND; -// assertCommandSuccess(command, toAdd); -// -// /* Case: add a activity with all fields same as another activity in the address book except address -// -> added */ -// toAdd = new TaskBuilder().withName(VALID_NAME_AMY).withDateTime(VALID_PHONE_AMY) -// .withRemark(VALID_ADDRESS_BOB).withTags(VALID_TAG_FRIEND).build(); -// command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_BOB -// + TAG_DESC_FRIEND; -// assertCommandSuccess(command, toAdd); -// -// /* Case: add to empty address book -> added */ -// deleteAllPersons(); -// assertCommandSuccess(ASSIGNMENT1); -// -// /* Case: add a activity with tags, command with parameters in random order -> added */ -// toAdd = BOB; -// command = AddCommand.COMMAND_WORD + TAG_DESC_FRIEND + PHONE_DESC_BOB + ADDRESS_DESC_BOB + NAME_DESC_BOB -// + TAG_DESC_HUSBAND + EMAIL_DESC_BOB; -// assertCommandSuccess(command, toAdd); -// -// /* Case: add a activity, missing tags -> added */ -// assertCommandSuccess(ASSIGNMENT3); -// -// /* -------------------------- Perform add operation on the shown filtered list -// ------------------------------ */ -// -// /* Case: filters the activity list before adding -> added */ -// showPersonsWithName(KEYWORD_MATCHING_MEIER); -// assertCommandSuccess(DEMO1); -// -// /* ------------------------ Perform add operation while a activity card is selected -// ------------------------ */ -// -// /* Case: selects first card in the activity list, add a activity -> added, card selection remains unchanged */ -// selectPerson(Index.fromOneBased(1)); -// assertCommandSuccess(QUIZ); -// -// /* ----------------------------------- Perform invalid add operations -// --------------------------------------- */ -// -// /* Case: add a duplicate activity -> rejected */ -// command = ActivityUtil.getAddCommand(ASSIGNMENT3); -// assertCommandFailure(command, AddCommand.MESSAGE_DUPLICATE_PERSON); -// -// /* Case: add a duplicate activity except with different tags -> rejected */ -// // "friends" is an existing tag used in the default model, see TypicalActivities#ASSIGNMENT1 -// // This test will fail if a new tag that is not in the model is used, see the bug documented in -// // DeskBoard#addActivity(Activity) -// command = ActivityUtil.getAddCommand(ASSIGNMENT3) + " " + PREFIX_TAG.getPrefix() + "friends"; -// assertCommandFailure(command, AddCommand.MESSAGE_DUPLICATE_PERSON); -// -// /* Case: missing name -> rejected */ -// command = AddCommand.COMMAND_WORD + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY; -// assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE)); -// -// /* Case: missing phone -> rejected */ -// command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY; -// assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE)); -// -// /* Case: missing email -> rejected */ -// command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + ADDRESS_DESC_AMY; -// assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE)); -// -// /* Case: missing address -> rejected */ -// command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY; -// assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE)); -// -// /* Case: invalid keyword -> rejected */ -// command = "adds " + ActivityUtil.getActivityDetails(toAdd); -// assertCommandFailure(command, Messages.MESSAGE_UNKNOWN_COMMAND); -// -// /* Case: invalid name -> rejected */ -// command = AddCommand.COMMAND_WORD + INVALID_NAME_DESC + PHONE_DESC_AMY + EMAIL_DESC_AMY -// + ADDRESS_DESC_AMY; -// assertCommandFailure(command, Name.MESSAGE_NAME_CONSTRAINTS); -// -// /* Case: invalid phone -> rejected */ -// command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + INVALID_PHONE_DESC + EMAIL_DESC_AMY -// + ADDRESS_DESC_AMY; -// assertCommandFailure(command, DateTime.MESSAGE_DATETIME_CONSTRAINTS); -// -// /* Case: invalid address -> rejected */ -// command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY -// + INVALID_ADDRESS_DESC; -// assertCommandFailure(command, Remark.MESSAGE_REMARK_CONSTRAINTS); -// -// /* Case: invalid tag -> rejected */ -// command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY -// + INVALID_TAG_DESC; -// assertCommandFailure(command, Tag.MESSAGE_TAG_CONSTRAINTS); -// } -// -// /** -// * Executes the {@code AddCommand} that adds {@code toAdd} to the model and asserts that the,
-// * 1. Command box displays an empty string.
-// * 2. Command box has the default style class.
-// * 3. Result display box displays the success message of executing {@code AddCommand} with the details of -// * {@code toAdd}.
-// * 4. {@code Model}, {@code Storage} and {@code ActivityListPanel} equal to the corresponding components in -// * the current model added with {@code toAdd}.
-// * 5. Browser url and selected card remain unchanged.
-// * 6. Status bar's sync status changes.
-// * Verifications 1, 3 and 4 are performed by -// * {@code RemarkBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.
-// * @see RemarkBookSystemTest#assertApplicationDisplaysExpected(String, String, Model) -// */ -// private void assertCommandSuccess(Activity toAdd) { -// assertCommandSuccess(ActivityUtil.getAddCommand(toAdd), toAdd); -// } -// -// /** -// * Performs the same verification as {@code assertCommandSuccess(Activity)}. Executes {@code command} -// * instead. -// * @see AddCommandSystemTest#assertCommandSuccess(Activity) -// */ -// private void assertCommandSuccess(String command, Activity toAdd) { -// Model expectedModel = getModel(); -// try { -// expectedModel.addActivity(toAdd); -// } catch (DuplicateActivityException dpe) { -// throw new IllegalArgumentException("toAdd already exists in the model."); -// } -// String expectedResultMessage = String.format(AddCommand.MESSAGE_SUCCESS, toAdd); -// -// assertCommandSuccess(command, expectedModel, expectedResultMessage); -// } -// -// /** -// * Performs the same verification as {@code assertCommandSuccess(String, Activity)} except asserts that -// * the,
-// * 1. Result display box displays {@code expectedResultMessage}.
-// * 2. {@code Model}, {@code Storage} and {@code ActivityListPanel} equal to the corresponding components in -// * {@code expectedModel}.
-// * @see AddCommandSystemTest#assertCommandSuccess(String, Activity) -// */ -// private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage) { -// executeCommand(command); -// assertApplicationDisplaysExpected("", expectedResultMessage, expectedModel); -// assertSelectedCardUnchanged(); -// assertCommandBoxShowsDefaultStyle(); -// assertStatusBarUnchangedExceptSyncStatus(); -// } -// -// /** -// * Executes {@code command} and asserts that the,
-// * 1. Command box displays {@code command}.
-// * 2. Command box has the error style class.
-// * 3. Result display box displays {@code expectedResultMessage}.
-// * 4. {@code Model}, {@code Storage} and {@code ActivityListPanel} remain unchanged.
-// * 5. Browser url, selected card and status bar remain unchanged.
-// * Verifications 1, 3 and 4 are performed by -// * {@code RemarkBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.
-// * @see RemarkBookSystemTest#assertApplicationDisplaysExpected(String, String, Model) -// */ -// private void assertCommandFailure(String command, String expectedResultMessage) { -// Model expectedModel = getModel(); -// -// executeCommand(command); -// assertApplicationDisplaysExpected(command, expectedResultMessage, expectedModel); -// assertSelectedCardUnchanged(); -// assertCommandBoxShowsErrorStyle(); -// assertStatusBarUnchanged(); -// } -//} diff --git a/src/test/java/systemtests/EditCommandSystemTest.java b/src/test/java/systemtests/EditCommandSystemTest.java deleted file mode 100644 index 0fe403f3d095..000000000000 --- a/src/test/java/systemtests/EditCommandSystemTest.java +++ /dev/null @@ -1,295 +0,0 @@ -//package systemtests; -// -//import static org.junit.Assert.assertFalse; -//import static org.junit.Assert.assertTrue; -//import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC; -//import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY; -//import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND; -//import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; -//import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; -//import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; -//import static seedu.address.model.Model.PREDICATE_SHOW_ALL_ACTIVITY; -//import static seedu.address.testutil.TypicalActivities.AMY; -//import static seedu.address.testutil.TypicalActivities.BOB; -//import static seedu.address.testutil.TypicalActivities.KEYWORD_MATCHING_MEIER; -//import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_ACTIVITY; -// -////import org.junit.Test; -// -//import seedu.address.commons.core.Messages; -//import seedu.address.commons.core.index.Index; -//import seedu.address.logic.commands.EditCommand; -//import seedu.address.logic.commands.RedoCommand; -//import seedu.address.logic.commands.UndoCommand; -//import seedu.address.model.Model; -//import seedu.address.model.activity.Activity; -//import seedu.address.model.activity.DateTime; -//import seedu.address.model.activity.Name; -//import seedu.address.model.activity.Remark; -//import seedu.address.model.activity.exceptions.ActivityNotFoundException; -//import seedu.address.model.activity.exceptions.DuplicateActivityException; -//import seedu.address.model.tag.Tag; -//import seedu.address.testutil.ActivityUtil; -//import seedu.address.testutil.TaskBuilder; -// -//public class EditCommandSystemTest extends RemarkBookSystemTest { -// -// //TODO: TEST -// /** -// * Test -// */ -// public void edit() throws Exception { -// Model model = getModel(); -// -// /* ----------------- Performing edit operation while an unfiltered list is being shown -// ---------------------- */ -// -// /* Case: edit all fields, command with leading spaces, trailing spaces and multiple spaces between each field -// * -> edited -// */ -// Index index = INDEX_FIRST_ACTIVITY; -// String command = " " + EditCommand.COMMAND_WORD + " " + index.getOneBased() + " " + NAME_DESC_BOB + " " -// + PHONE_DESC_BOB + " " + EMAIL_DESC_BOB + " " + ADDRESS_DESC_BOB -// + " " + TAG_DESC_HUSBAND + " "; -// Activity editedActivity = new TaskBuilder().withName(VALID_NAME_BOB).withDateTime(VALID_PHONE_BOB) -// .withRemark(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND).build(); -// assertCommandSuccess(command, index, editedActivity); -// -// /* Case: undo editing the last activity in the list -> last activity restored */ -// command = UndoCommand.COMMAND_WORD; -// String expectedResultMessage = UndoCommand.MESSAGE_SUCCESS; -// assertCommandSuccess(command, model, expectedResultMessage); -// -// /* Case: redo editing the last activity in the list -> last activity edited again */ -// command = RedoCommand.COMMAND_WORD; -// expectedResultMessage = RedoCommand.MESSAGE_SUCCESS; -// model.updateActivity( -// getModel().getFilteredActivityList().get(INDEX_FIRST_ACTIVITY.getZeroBased()), editedActivity); -// assertCommandSuccess(command, model, expectedResultMessage); -// -// /* Case: edit a activity with new values same as existing values -> edited */ -// command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB -// + PHONE_DESC_BOB + EMAIL_DESC_BOB -// + ADDRESS_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND; -// assertCommandSuccess(command, index, BOB); -// -// /* Case: edit some fields -> edited */ -// index = INDEX_FIRST_ACTIVITY; -// command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + TAG_DESC_FRIEND; -// Activity activityToEdit = getModel().getFilteredActivityList().get(index.getZeroBased()); -// editedActivity = new TaskBuilder(activityToEdit).withTags(VALID_TAG_FRIEND).build(); -// assertCommandSuccess(command, index, editedActivity); -// -// /* Case: clear tags -> cleared */ -// index = INDEX_FIRST_ACTIVITY; -// command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + " " + PREFIX_TAG.getPrefix(); -// editedActivity = new TaskBuilder(activityToEdit).withTags().build(); -// assertCommandSuccess(command, index, editedActivity); -// -// /* ------------------ Performing edit operation while a filtered list is being shown -// ------------------------ */ -// -// /* Case: filtered activity list, edit index within bounds of address book and activity list -> edited */ -// showPersonsWithName(KEYWORD_MATCHING_MEIER); -// index = INDEX_FIRST_ACTIVITY; -// assertTrue(index.getZeroBased() < getModel().getFilteredActivityList().size()); -// command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + " " + NAME_DESC_BOB; -// activityToEdit = getModel().getFilteredActivityList().get(index.getZeroBased()); -// editedActivity = new TaskBuilder(activityToEdit).withName(VALID_NAME_BOB).build(); -// assertCommandSuccess(command, index, editedActivity); -// -// /* Case: filtered activity list, edit index within bounds of address book but out of bounds of activity list -// * -> rejected -// */ -// showPersonsWithName(KEYWORD_MATCHING_MEIER); -// int invalidIndex = getModel().getDeskBoard().getActivityList().size(); -// assertCommandFailure(EditCommand.COMMAND_WORD + " " + invalidIndex + NAME_DESC_BOB, -// Messages.MESSAGE_INVALID_ACTIVITY_DISPLAYED_INDEX); -// -// /* --------------------- Performing edit operation while a activity card is selected -// ------------------------ */ -// -// /* Case: selects first card in the activity list, edit a activity -> edited, -// * card selection remains unchanged but -// * browser url changes -// */ -// showAllPersons(); -// index = INDEX_FIRST_ACTIVITY; -// selectPerson(index); -// command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_AMY -// + PHONE_DESC_AMY + EMAIL_DESC_AMY -// + ADDRESS_DESC_AMY + TAG_DESC_FRIEND; -// // this can be misleading: card selection actually remains unchanged but the -// // browser's url is updated to reflect the new activity's name -// assertCommandSuccess(command, index, AMY, index); -// -// /* --------------------------------- Performing invalid edit operation -// -------------------------------------- */ -// -// /* Case: invalid index (0) -> rejected */ -// assertCommandFailure(EditCommand.COMMAND_WORD + " 0" + NAME_DESC_BOB, -// String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE)); -// -// /* Case: invalid index (-1) -> rejected */ -// assertCommandFailure(EditCommand.COMMAND_WORD + " -1" + NAME_DESC_BOB, -// String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE)); -// -// /* Case: invalid index (size + 1) -> rejected */ -// invalidIndex = getModel().getFilteredActivityList().size() + 1; -// assertCommandFailure(EditCommand.COMMAND_WORD + " " + invalidIndex + NAME_DESC_BOB, -// Messages.MESSAGE_INVALID_ACTIVITY_DISPLAYED_INDEX); -// -// /* Case: missing index -> rejected */ -// assertCommandFailure(EditCommand.COMMAND_WORD + NAME_DESC_BOB, -// String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE)); -// -// /* Case: missing all fields -> rejected */ -// assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_ACTIVITY.getOneBased(), -// EditCommand.MESSAGE_NOT_EDITED); -// -// /* Case: invalid name -> rejected */ -// assertCommandFailure(EditCommand.COMMAND_WORD + " " -// + INDEX_FIRST_ACTIVITY.getOneBased() + INVALID_NAME_DESC, -// Name.MESSAGE_NAME_CONSTRAINTS); -// -// /* Case: invalid phone -> rejected */ -// assertCommandFailure(EditCommand.COMMAND_WORD + " " -// + INDEX_FIRST_ACTIVITY.getOneBased() + INVALID_PHONE_DESC, -// DateTime.MESSAGE_DATETIME_CONSTRAINTS); -// -// /* Case: invalid address -> rejected */ -// assertCommandFailure(EditCommand.COMMAND_WORD + " " -// + INDEX_FIRST_ACTIVITY.getOneBased() + INVALID_ADDRESS_DESC, -// Remark.MESSAGE_REMARK_CONSTRAINTS); -// -// /* Case: invalid tag -> rejected */ -// assertCommandFailure(EditCommand.COMMAND_WORD + " " -// + INDEX_FIRST_ACTIVITY.getOneBased() + INVALID_TAG_DESC, -// Tag.MESSAGE_TAG_CONSTRAINTS); -// -// /* Case: edit a activity with new values same as another activity's values -> rejected */ -// executeCommand(ActivityUtil.getAddCommand(BOB)); -// assertTrue(getModel().getDeskBoard().getActivityList().contains(BOB)); -// index = INDEX_FIRST_ACTIVITY; -// assertFalse(getModel().getFilteredActivityList().get(index.getZeroBased()).equals(BOB)); -// command = EditCommand.COMMAND_WORD + " " + index.getOneBased() -// + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB -// + ADDRESS_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND; -// assertCommandFailure(command, EditCommand.MESSAGE_DUPLICATE_PERSON); -// -// /* Case: edit a activity with new values same as another activity's -// * values but with different tags -> rejected -// */ -// command = EditCommand.COMMAND_WORD + " " + index.getOneBased() -// + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB -// + ADDRESS_DESC_BOB + TAG_DESC_HUSBAND; -// assertCommandFailure(command, EditCommand.MESSAGE_DUPLICATE_PERSON); -// } -// -// /** -// * Performs the same verification as {@code assertCommandSuccess(String, Index, Activity, Index)} except that -// * the browser url and selected card remain unchanged. -// * @param toEdit the index of the current model's filtered list -// * @see EditCommandSystemTest#assertCommandSuccess(String, Index, Activity, Index) -// */ -// private void assertCommandSuccess(String command, Index toEdit, Activity editedActivity) { -// assertCommandSuccess(command, toEdit, editedActivity, null); -// } -// -// /** -// * Performs the same verification as {@code assertCommandSuccess(String, Model, String, Index)} -// * and in addition,
-// * 1. Asserts that result display box displays the success message of executing {@code EditCommand}.
-// * 2. Asserts that the model related components are updated to reflect the activity at index {@code toEdit} being -// * updated to values specified {@code editedActivity}.
-// * @param toEdit the index of the current model's filtered list. -// * @see EditCommandSystemTest#assertCommandSuccess(String, Model, String, Index) -// */ -// private void assertCommandSuccess(String command, Index toEdit, Activity editedActivity, -// Index expectedSelectedCardIndex) { -// Model expectedModel = getModel(); -// try { -// expectedModel.updateActivity( -// expectedModel.getFilteredActivityList().get(toEdit.getZeroBased()), editedActivity); -// expectedModel.updateFilteredActivityList(PREDICATE_SHOW_ALL_ACTIVITY); -// } catch (DuplicateActivityException | ActivityNotFoundException e) { -// throw new IllegalArgumentException( -// "editedActivity is a duplicate in expectedModel, or it isn't found in the model."); -// } -// -// assertCommandSuccess(command, expectedModel, -// String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedActivity), expectedSelectedCardIndex); -// } -// -// /** -// * Performs the same verification as {@code assertCommandSuccess(String, Model, String, Index)} except that the -// * browser url and selected card remain unchanged. -// * @see EditCommandSystemTest#assertCommandSuccess(String, Model, String, Index) -// */ -// private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage) { -// assertCommandSuccess(command, expectedModel, expectedResultMessage, null); -// } -// -// /** -// * Executes {@code command} and in addition,
-// * 1. Asserts that the command box displays an empty string.
-// * 2. Asserts that the result display box displays {@code expectedResultMessage}.
-// * 3. Asserts that the model related components equal to {@code expectedModel}.
-// * 4. Asserts that the browser url and selected card update accordingly depending on the card at -// * {@code expectedSelectedCardIndex}.
-// * 5. Asserts that the status bar's sync status changes.
-// * 6. Asserts that the command box has the default style class.
-// * Verifications 1 to 3 are performed by -// * {@code RemarkBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.
-// * @see RemarkBookSystemTest#assertApplicationDisplaysExpected(String, String, Model) -// * @see RemarkBookSystemTest#assertSelectedCardChanged(Index) -// */ -// private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage, -// Index expectedSelectedCardIndex) { -// executeCommand(command); -// expectedModel.updateFilteredActivityList(PREDICATE_SHOW_ALL_ACTIVITY); -// assertApplicationDisplaysExpected("", expectedResultMessage, expectedModel); -// assertCommandBoxShowsDefaultStyle(); -// if (expectedSelectedCardIndex != null) { -// assertSelectedCardChanged(expectedSelectedCardIndex); -// } else { -// assertSelectedCardUnchanged(); -// } -// assertStatusBarUnchangedExceptSyncStatus(); -// } -// -// /** -// * Executes {@code command} and in addition,
-// * 1. Asserts that the command box displays {@code command}.
-// * 2. Asserts that result display box displays {@code expectedResultMessage}.
-// * 3. Asserts that the model related components equal to the current model.
-// * 4. Asserts that the browser url, selected card and status bar remain unchanged.
-// * 5. Asserts that the command box has the error style.
-// * Verifications 1 to 3 are performed by -// * {@code RemarkBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.
-// * @see RemarkBookSystemTest#assertApplicationDisplaysExpected(String, String, Model) -// */ -// private void assertCommandFailure(String command, String expectedResultMessage) { -// Model expectedModel = getModel(); -// -// executeCommand(command); -// assertApplicationDisplaysExpected(command, expectedResultMessage, expectedModel); -// assertSelectedCardUnchanged(); -// assertCommandBoxShowsErrorStyle(); -// assertStatusBarUnchanged(); -// } -//}