From d45b66bdf4c3a40ef4e6c3734fd3682d1cc97ede Mon Sep 17 00:00:00 2001 From: Yi Rui Goh Date: Wed, 8 Mar 2017 22:00:54 +0800 Subject: [PATCH 1/9] Update testutil test examples --- src/test/java/guitests/EditCommandTest.java | 4 +-- .../seedu/geekeep/testutil/PersonBuilder.java | 6 ++-- .../seedu/geekeep/testutil/TestPerson.java | 6 ++-- .../geekeep/testutil/TypicalTestPersons.java | 36 +++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/test/java/guitests/EditCommandTest.java b/src/test/java/guitests/EditCommandTest.java index 32f21ea72d7f..9a1f93990e55 100644 --- a/src/test/java/guitests/EditCommandTest.java +++ b/src/test/java/guitests/EditCommandTest.java @@ -28,8 +28,8 @@ public void edit_allFieldsSpecified_success() throws Exception { String detailsToEdit = "Bobby p/91234567 e/bobby@gmail.com a/Block 123, Bobby Street 3 t/husband"; int addressBookIndex = 1; - TestPerson editedPerson = new PersonBuilder().withName("Bobby").withPhone("91234567") - .withEmail("bobby@gmail.com").withAddress("Block 123, Bobby Street 3").withTags("husband").build(); + TestPerson editedPerson = new PersonBuilder().withName("Bobby").withEndDateTime("91234567") + .withStartDateTime("bobby@gmail.com").withLocation("Block 123, Bobby Street 3").withTags("husband").build(); assertEditSuccess(addressBookIndex, addressBookIndex, detailsToEdit, editedPerson); } diff --git a/src/test/java/seedu/geekeep/testutil/PersonBuilder.java b/src/test/java/seedu/geekeep/testutil/PersonBuilder.java index 5a609e41d8c7..f3ab3982bcfa 100644 --- a/src/test/java/seedu/geekeep/testutil/PersonBuilder.java +++ b/src/test/java/seedu/geekeep/testutil/PersonBuilder.java @@ -39,17 +39,17 @@ public PersonBuilder withTags(String ... tags) throws IllegalValueException { return this; } - public PersonBuilder withAddress(String address) throws IllegalValueException { + public PersonBuilder withLocation(String address) throws IllegalValueException { this.person.setLocation(new Location(address)); return this; } - public PersonBuilder withPhone(String phone) throws IllegalValueException { + public PersonBuilder withEndDateTime(String phone) throws IllegalValueException { this.person.setEndDateTime(new EndDateTime(phone)); return this; } - public PersonBuilder withEmail(String email) throws IllegalValueException { + public PersonBuilder withStartDateTime(String email) throws IllegalValueException { this.person.setStartDateTime(new StartDateTime(email)); return this; } diff --git a/src/test/java/seedu/geekeep/testutil/TestPerson.java b/src/test/java/seedu/geekeep/testutil/TestPerson.java index 21835ca33fa4..ac88a469c588 100644 --- a/src/test/java/seedu/geekeep/testutil/TestPerson.java +++ b/src/test/java/seedu/geekeep/testutil/TestPerson.java @@ -86,9 +86,9 @@ public String toString() { public String getAddCommand() { StringBuilder sb = new StringBuilder(); sb.append("add " + this.getTitle().fullTitle + " "); - sb.append("a/" + this.getLocation().value + " "); - sb.append("p/" + this.getEndDateTime().value + " "); - sb.append("e/" + this.getStartDateTime().value + " "); + sb.append("l/" + this.getLocation().value + " "); + sb.append("e/" + this.getEndDateTime().value + " "); + sb.append("s/" + this.getStartDateTime().value + " "); this.getTags().asObservableList().stream().forEach(s -> sb.append("t/" + s.tagName + " ")); return sb.toString(); } diff --git a/src/test/java/seedu/geekeep/testutil/TypicalTestPersons.java b/src/test/java/seedu/geekeep/testutil/TypicalTestPersons.java index 7d30f9c0049c..91250354cc8f 100644 --- a/src/test/java/seedu/geekeep/testutil/TypicalTestPersons.java +++ b/src/test/java/seedu/geekeep/testutil/TypicalTestPersons.java @@ -15,28 +15,28 @@ public class TypicalTestPersons { public TypicalTestPersons() { try { alice = new PersonBuilder().withName("Alice Pauline") - .withAddress("123, Jurong West Ave 6, #08-111").withEmail("alice@gmail.com") - .withPhone("85355255") + .withLocation("123, Jurong West Ave 6, #08-111").withStartDateTime("2017-04-01T10:16:30") + .withEndDateTime("2017-04-01T10:16:30") .withTags("friends").build(); - benson = new PersonBuilder().withName("Benson Meier").withAddress("311, Clementi Ave 2, #02-25") - .withEmail("johnd@gmail.com").withPhone("98765432") + benson = new PersonBuilder().withName("Benson Meier").withLocation("311, Clementi Ave 2, #02-25") + .withStartDateTime("2017-04-01T10:16:30").withEndDateTime("2017-04-01T10:16:30") .withTags("owesMoney", "friends").build(); - carl = new PersonBuilder().withName("Carl Kurz").withPhone("95352563") - .withEmail("heinz@yahoo.com").withAddress("wall street").build(); - daniel = new PersonBuilder().withName("Daniel Meier").withPhone("87652533") - .withEmail("cornelia@google.com").withAddress("10th street").build(); - elle = new PersonBuilder().withName("Elle Meyer").withPhone("9482224") - .withEmail("werner@gmail.com").withAddress("michegan ave").build(); - fiona = new PersonBuilder().withName("Fiona Kunz").withPhone("9482427") - .withEmail("lydia@gmail.com").withAddress("little tokyo").build(); - george = new PersonBuilder().withName("George Best").withPhone("9482442") - .withEmail("anna@google.com").withAddress("4th street").build(); + carl = new PersonBuilder().withName("Carl Kurz").withEndDateTime("2017-04-01T10:16:30") + .withStartDateTime("2017-04-01T10:16:30").withLocation("wall street").build(); + daniel = new PersonBuilder().withName("Daniel Meier").withEndDateTime("2017-04-01T10:16:30") + .withStartDateTime("2017-04-01T10:16:30").withLocation("10th street").build(); + elle = new PersonBuilder().withName("Elle Meyer").withEndDateTime("2017-04-01T10:16:30") + .withStartDateTime("2017-04-01T10:16:30").withLocation("michegan ave").build(); + fiona = new PersonBuilder().withName("Fiona Kunz").withEndDateTime("2017-04-01T10:16:30") + .withStartDateTime("2017-04-01T10:16:30").withLocation("little tokyo").build(); + george = new PersonBuilder().withName("George Best").withEndDateTime("2017-04-01T10:16:30") + .withStartDateTime("2017-04-01T10:16:30").withLocation("4th street").build(); // Manually added - hoon = new PersonBuilder().withName("Hoon Meier").withPhone("8482424") - .withEmail("stefan@mail.com").withAddress("little india").build(); - ida = new PersonBuilder().withName("Ida Mueller").withPhone("8482131") - .withEmail("hans@google.com").withAddress("chicago ave").build(); + hoon = new PersonBuilder().withName("Hoon Meier").withEndDateTime("2017-04-01T10:16:30") + .withStartDateTime("2017-04-01T10:16:30").withLocation("little india").build(); + ida = new PersonBuilder().withName("Ida Mueller").withEndDateTime("2017-04-01T10:16:30") + .withStartDateTime("2017-04-01T10:16:30").withLocation("chicago ave").build(); } catch (IllegalValueException e) { e.printStackTrace(); assert false : "not possible"; From 39edaa85b2e6b498a6d061b4bf45b6f0b35e1363 Mon Sep 17 00:00:00 2001 From: Yi Rui Goh Date: Wed, 8 Mar 2017 22:12:55 +0800 Subject: [PATCH 2/9] Update model task junit tests --- .../seedu/geekeep/model/person/EmailTest.java | 42 ------------------- .../geekeep/model/person/EndDateTimeTest.java | 21 ++++++++++ .../{AddressTest.java => LocationTest.java} | 8 ++-- .../seedu/geekeep/model/person/PhoneTest.java | 26 ------------ .../model/person/StartDateTimeTest.java | 21 ++++++++++ .../person/{NameTest.java => TitleTest.java} | 2 +- .../java/seedu/geekeep/testutil/TestUtil.java | 18 ++++---- 7 files changed, 56 insertions(+), 82 deletions(-) delete mode 100644 src/test/java/seedu/geekeep/model/person/EmailTest.java create mode 100644 src/test/java/seedu/geekeep/model/person/EndDateTimeTest.java rename src/test/java/seedu/geekeep/model/person/{AddressTest.java => LocationTest.java} (83%) delete mode 100644 src/test/java/seedu/geekeep/model/person/PhoneTest.java create mode 100644 src/test/java/seedu/geekeep/model/person/StartDateTimeTest.java rename src/test/java/seedu/geekeep/model/person/{NameTest.java => TitleTest.java} (97%) diff --git a/src/test/java/seedu/geekeep/model/person/EmailTest.java b/src/test/java/seedu/geekeep/model/person/EmailTest.java deleted file mode 100644 index a5c30c21a87b..000000000000 --- a/src/test/java/seedu/geekeep/model/person/EmailTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package seedu.geekeep.model.person; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -import seedu.geekeep.model.task.StartDateTime; - -public class EmailTest { - - @Test - public void isValidEmail() { - // blank email - assertFalse(StartDateTime.isValidDateTime("")); // empty string - assertFalse(StartDateTime.isValidDateTime(" ")); // spaces only - - // missing parts - assertFalse(StartDateTime.isValidDateTime("@webmail.com")); // missing local part - assertFalse(StartDateTime.isValidDateTime("peterjackwebmail.com")); // missing '@' symbol - assertFalse(StartDateTime.isValidDateTime("peterjack@")); // missing domain name - - // invalid parts - assertFalse(StartDateTime.isValidDateTime("-@webmail.com")); // invalid local part - assertFalse(StartDateTime.isValidDateTime("peterjack@-")); // invalid domain name - assertFalse(StartDateTime.isValidDateTime("peter jack@webmail.com")); // spaces in local part - assertFalse(StartDateTime.isValidDateTime("peterjack@web mail.com")); // spaces in domain name - assertFalse(StartDateTime.isValidDateTime("peterjack@@webmail.com")); // double '@' symbol - assertFalse(StartDateTime.isValidDateTime("peter@jack@webmail.com")); // '@' symbol in local part - assertFalse(StartDateTime.isValidDateTime("peterjack@webmail@com")); // '@' symbol in domain name - - // valid email - assertTrue(StartDateTime.isValidDateTime("PeterJack_1190@WEB.Mail.com")); - assertTrue(StartDateTime.isValidDateTime("a@b")); // minimal - assertTrue(StartDateTime.isValidDateTime("test@localhost")); // alphabets only - assertTrue(StartDateTime.isValidDateTime("123@145")); // numeric local part and domain name - assertTrue(StartDateTime.isValidDateTime("a1@sg50.org")); // mixture of alphanumeric and dot characters - assertTrue(StartDateTime.isValidDateTime("_user_@_do_main_.com_")); // underscores - assertTrue(StartDateTime.isValidDateTime("peter_jack@a_very_long_domain_AVLD.com")); // long domain name - assertTrue(StartDateTime.isValidDateTime("if.you.dream.it_you.can.do.it@youth_email.com")); // long local part - } -} diff --git a/src/test/java/seedu/geekeep/model/person/EndDateTimeTest.java b/src/test/java/seedu/geekeep/model/person/EndDateTimeTest.java new file mode 100644 index 000000000000..475d75f1bfd2 --- /dev/null +++ b/src/test/java/seedu/geekeep/model/person/EndDateTimeTest.java @@ -0,0 +1,21 @@ +package seedu.geekeep.model.person; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +import seedu.geekeep.model.task.EndDateTime; + +public class EndDateTimeTest { + + @Test + public void isValidEndDateTime() { + // invalid end date time + assertFalse(EndDateTime.isValidDateTime("")); // empty string + assertFalse(EndDateTime.isValidDateTime(" ")); // spaces only + + // valid end date time + assertTrue(EndDateTime.isValidDateTime("2017-04-01T10:16:30")); + } +} diff --git a/src/test/java/seedu/geekeep/model/person/AddressTest.java b/src/test/java/seedu/geekeep/model/person/LocationTest.java similarity index 83% rename from src/test/java/seedu/geekeep/model/person/AddressTest.java rename to src/test/java/seedu/geekeep/model/person/LocationTest.java index afc0e4fad44c..30ef3cca671a 100644 --- a/src/test/java/seedu/geekeep/model/person/AddressTest.java +++ b/src/test/java/seedu/geekeep/model/person/LocationTest.java @@ -7,15 +7,15 @@ import seedu.geekeep.model.task.Location; -public class AddressTest { +public class LocationTest { @Test - public void isValidAddress() { - // invalid addresses + public void isValidLocation() { + // invalid locations assertFalse(Location.isValidLocation("")); // empty string assertFalse(Location.isValidLocation(" ")); // spaces only - // valid addresses + // valid locations assertTrue(Location.isValidLocation("Blk 456, Den Road, #01-355")); assertTrue(Location.isValidLocation("-")); // one character assertTrue(Location.isValidLocation("Leng Inc; 1234 Market St; San Francisco CA 2349879; USA")); // long address diff --git a/src/test/java/seedu/geekeep/model/person/PhoneTest.java b/src/test/java/seedu/geekeep/model/person/PhoneTest.java deleted file mode 100644 index 264cc805b3d2..000000000000 --- a/src/test/java/seedu/geekeep/model/person/PhoneTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package seedu.geekeep.model.person; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -import seedu.geekeep.model.task.EndDateTime; - -public class PhoneTest { - - @Test - public void isValidPhone() { - // invalid phone numbers - assertFalse(EndDateTime.isValidDateTime("")); // empty string - assertFalse(EndDateTime.isValidDateTime(" ")); // spaces only - assertFalse(EndDateTime.isValidDateTime("phone")); // non-numeric - assertFalse(EndDateTime.isValidDateTime("9011p041")); // alphabets within digits - assertFalse(EndDateTime.isValidDateTime("9312 1534")); // spaces within digits - - // valid phone numbers - assertTrue(EndDateTime.isValidDateTime("93121534")); - assertTrue(EndDateTime.isValidDateTime("4")); // short phone numbers - assertTrue(EndDateTime.isValidDateTime("124293842033123")); // long phone numbers - } -} diff --git a/src/test/java/seedu/geekeep/model/person/StartDateTimeTest.java b/src/test/java/seedu/geekeep/model/person/StartDateTimeTest.java new file mode 100644 index 000000000000..45dc3773e817 --- /dev/null +++ b/src/test/java/seedu/geekeep/model/person/StartDateTimeTest.java @@ -0,0 +1,21 @@ +package seedu.geekeep.model.person; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +import seedu.geekeep.model.task.StartDateTime; + +public class StartDateTimeTest { + + @Test + public void isValidStartDateTime() { + // invalid start date time + assertFalse(StartDateTime.isValidDateTime("")); // empty string + assertFalse(StartDateTime.isValidDateTime(" ")); // spaces only + + // valid start date time + assertTrue(StartDateTime.isValidDateTime("2017-04-01T10:16:30")); + } +} diff --git a/src/test/java/seedu/geekeep/model/person/NameTest.java b/src/test/java/seedu/geekeep/model/person/TitleTest.java similarity index 97% rename from src/test/java/seedu/geekeep/model/person/NameTest.java rename to src/test/java/seedu/geekeep/model/person/TitleTest.java index 555b67a83a7e..02f6cc9569cb 100644 --- a/src/test/java/seedu/geekeep/model/person/NameTest.java +++ b/src/test/java/seedu/geekeep/model/person/TitleTest.java @@ -7,7 +7,7 @@ import seedu.geekeep.model.task.Title; -public class NameTest { +public class TitleTest { @Test public void isValidName() { diff --git a/src/test/java/seedu/geekeep/testutil/TestUtil.java b/src/test/java/seedu/geekeep/testutil/TestUtil.java index 2e9219cc95e0..321522ec0e29 100644 --- a/src/test/java/seedu/geekeep/testutil/TestUtil.java +++ b/src/test/java/seedu/geekeep/testutil/TestUtil.java @@ -75,15 +75,15 @@ private static Task[] getSampleTaskData() { try { //CHECKSTYLE.OFF: LineLength return new Task[]{ - new Task(new Title("Ali Muster"), new StartDateTime("hans@google.com"), new EndDateTime("9482424"), new Location("4th street"), new UniqueTagList()), - new Task(new Title("Boris Mueller"), new StartDateTime("ruth@google.com"), new EndDateTime("87249245"), new Location("81th street"), new UniqueTagList()), - new Task(new Title("Carl Kurz"), new StartDateTime("heinz@yahoo.com"), new EndDateTime("95352563"), new Location("wall street"), new UniqueTagList()), - new Task(new Title("Daniel Meier"), new StartDateTime("cornelia@google.com"), new EndDateTime("87652533"), new Location("10th street"), new UniqueTagList()), - new Task(new Title("Elle Meyer"), new StartDateTime("werner@gmail.com"), new EndDateTime("9482224"), new Location("michegan ave"), new UniqueTagList()), - new Task(new Title("Fiona Kunz"), new StartDateTime("lydia@gmail.com"), new EndDateTime("9482427"), new Location("little tokyo"), new UniqueTagList()), - new Task(new Title("George Best"), new StartDateTime("anna@google.com"), new EndDateTime("9482442"), new Location("4th street"), new UniqueTagList()), - new Task(new Title("Hoon Meier"), new StartDateTime("stefan@mail.com"), new EndDateTime("8482424"), new Location("little india"), new UniqueTagList()), - new Task(new Title("Ida Mueller"), new StartDateTime("hans@google.com"), new EndDateTime("8482131"), new Location("chicago ave"), new UniqueTagList()) + new Task(new Title("Ali Muster"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("4th street"), new UniqueTagList()), + new Task(new Title("Boris Mueller"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("81th street"), new UniqueTagList()), + new Task(new Title("Carl Kurz"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("wall street"), new UniqueTagList()), + new Task(new Title("Daniel Meier"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("10th street"), new UniqueTagList()), + new Task(new Title("Elle Meyer"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("michegan ave"), new UniqueTagList()), + new Task(new Title("Fiona Kunz"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("little tokyo"), new UniqueTagList()), + new Task(new Title("George Best"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("4th street"), new UniqueTagList()), + new Task(new Title("Hoon Meier"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("little india"), new UniqueTagList()), + new Task(new Title("Ida Mueller"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("chicago ave"), new UniqueTagList()) }; //CHECKSTYLE.ON: LineLength } catch (IllegalValueException e) { From 329d5e7b4aa058b6abbea7bd4cce9ecb144b8f60 Mon Sep 17 00:00:00 2001 From: Yi Rui Goh Date: Wed, 8 Mar 2017 23:34:44 +0800 Subject: [PATCH 3/9] Update Edit and SampleData test input --- .../seedu/geekeep/model/task/EndDateTime.java | 2 +- .../geekeep/model/task/StartDateTime.java | 2 +- .../geekeep/model/util/SampleDataUtil.java | 50 +++++++++---------- src/test/java/guitests/EditCommandTest.java | 16 +++--- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/main/java/seedu/geekeep/model/task/EndDateTime.java b/src/main/java/seedu/geekeep/model/task/EndDateTime.java index d52beeb06fd6..a8e531610888 100644 --- a/src/main/java/seedu/geekeep/model/task/EndDateTime.java +++ b/src/main/java/seedu/geekeep/model/task/EndDateTime.java @@ -46,7 +46,7 @@ public int hashCode() { @Override public String toString() { - return dateTime.toString(); + return value; } } diff --git a/src/main/java/seedu/geekeep/model/task/StartDateTime.java b/src/main/java/seedu/geekeep/model/task/StartDateTime.java index 7fa1b1734fd7..8c5180873e61 100644 --- a/src/main/java/seedu/geekeep/model/task/StartDateTime.java +++ b/src/main/java/seedu/geekeep/model/task/StartDateTime.java @@ -46,7 +46,7 @@ public int hashCode() { @Override public String toString() { - return dateTime.toString(); + return value; } } diff --git a/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java b/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java index ef9f1321169f..fd781ac1bd33 100644 --- a/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java +++ b/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java @@ -15,31 +15,31 @@ public class SampleDataUtil { public static Task[] getSampleTasks() { try { return new Task[] { - new Task(new Title("Meeting 1"), new StartDateTime("2017-04-01T10:15:30"), - new EndDateTime("2017-04-01T10:16:30"), - new Location("Blk 30 Geylang Street 29, #06-40"), - new UniqueTagList("friends")), - new Task(new Title("Meeting 2"), new StartDateTime("2017-04-02T10:15:30"), - new EndDateTime("2017-04-02T10:16:30"), - new Location("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), - new UniqueTagList("colleagues", "friends")), - new Task(new Title("Meeting 3"), new StartDateTime("2017-04-03T10:15:30"), - new EndDateTime("2017-04-03T10:16:30"), - new Location("Blk 11 Ang Mo Kio Street 74, #11-04"), - new UniqueTagList("neighbours")), - new Task(new Title("Meeting 4"), new StartDateTime("2017-04-04T10:15:30"), - new EndDateTime("2017-04-04T10:16:30"), - new Location("Blk 436 Serangoon Gardens Street 26, #16-43"), - new UniqueTagList("family")), - new Task(new Title("Meeting 5"), new StartDateTime("2017-04-05T10:15:30"), - new EndDateTime("2017-04-05T10:16:30"), - new Location("Blk 47 Tampines Street 20, #17-35"), - new UniqueTagList("classmates")), - new Task(new Title("Meeting 6"), new StartDateTime("2017-04-06T10:15:30"), - new EndDateTime("2017-04-06T10:16:30"), - new Location("Blk 45 Aljunied Street 85, #11-31"), - new UniqueTagList("colleagues")) - }; + new Task(new Title("Alex Yeoh"), new StartDateTime("2017-04-01T10:16:30"), + new EndDateTime("2017-04-01T10:16:30"), + new Location("Blk 30 Geylang Street 29, #06-40"), + new UniqueTagList("friends")), + new Task(new Title("Bernice Yu"), new StartDateTime("2017-04-01T10:16:30"), + new EndDateTime("2017-04-02T10:16:30"), + new Location("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), + new UniqueTagList("colleagues", "friends")), + new Task(new Title("Charlotte Oliveiro"), new StartDateTime("2017-04-01T10:16:30"), + new EndDateTime("2017-04-01T10:16:30"), + new Location("Blk 11 Ang Mo Kio Street 74, #11-04"), + new UniqueTagList("neighbours")), + new Task(new Title("David Li"), new StartDateTime("2017-04-01T10:16:30"), + new EndDateTime("2017-04-01T10:16:30"), + new Location("Blk 436 Serangoon Gardens Street 26, #16-43"), + new UniqueTagList("family")), + new Task(new Title("Irfan Ibrahim"), new StartDateTime("2017-04-01T10:16:30"), + new EndDateTime("2017-04-01T10:16:30"), + new Location("Blk 47 Tampines Street 20, #17-35"), + new UniqueTagList("classmates")), + new Task(new Title("Roy Balakrishnan"), new StartDateTime("2017-04-01T10:16:30"), + new EndDateTime("2017-04-01T10:16:30"), + new Location("Blk 45 Aljunied Street 85, #11-31"), + new UniqueTagList("colleagues")) + }; } catch (IllegalValueException e) { throw new AssertionError("sample data cannot be invalid", e); } diff --git a/src/test/java/guitests/EditCommandTest.java b/src/test/java/guitests/EditCommandTest.java index 9a1f93990e55..8f84a7af589e 100644 --- a/src/test/java/guitests/EditCommandTest.java +++ b/src/test/java/guitests/EditCommandTest.java @@ -25,11 +25,11 @@ public class EditCommandTest extends AddressBookGuiTest { @Test public void edit_allFieldsSpecified_success() throws Exception { - String detailsToEdit = "Bobby p/91234567 e/bobby@gmail.com a/Block 123, Bobby Street 3 t/husband"; + String detailsToEdit = "Bobby s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 a/Block 123, Bobby Street 3 t/husband"; int addressBookIndex = 1; - TestPerson editedPerson = new PersonBuilder().withName("Bobby").withEndDateTime("91234567") - .withStartDateTime("bobby@gmail.com").withLocation("Block 123, Bobby Street 3").withTags("husband").build(); + TestPerson editedPerson = new PersonBuilder().withName("Bobby").withEndDateTime("2017-04-01T10:16:30") + .withStartDateTime("2017-04-01T10:16:30").withLocation("Block 123, Bobby Street 3").withTags("husband").build(); assertEditSuccess(addressBookIndex, addressBookIndex, detailsToEdit, editedPerson); } @@ -93,13 +93,13 @@ public void edit_invalidValues_failure() { commandBox.runCommand("edit 1 *&"); assertResultMessage(Title.MESSAGE_TITLE_CONSTRAINTS); - commandBox.runCommand("edit 1 p/abcd"); + commandBox.runCommand("edit 1 e/abcd"); assertResultMessage(EndDateTime.MESSAGE_DATETIME_CONSTRAINTS); - commandBox.runCommand("edit 1 e/yahoo!!!"); + commandBox.runCommand("edit 1 s/yahoo!!!"); assertResultMessage(StartDateTime.MESSAGE_DATETIME_CONSTRAINTS); - commandBox.runCommand("edit 1 a/"); + commandBox.runCommand("edit 1 l/"); assertResultMessage(Location.MESSAGE_LOCATION_CONSTRAINTS); commandBox.runCommand("edit 1 t/*&"); @@ -108,8 +108,8 @@ public void edit_invalidValues_failure() { @Test public void edit_duplicatePerson_failure() { - commandBox.runCommand("edit 3 Alice Pauline p/85355255 e/alice@gmail.com " - + "a/123, Jurong West Ave 6, #08-111 t/friends"); + commandBox.runCommand("edit 3 Alice Pauline s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 " + + "l/123, Jurong West Ave 6, #08-111 t/friends"); assertResultMessage(EditCommand.MESSAGE_DUPLICATE_PERSON); } From db921469767ff8dd97b15b8eff7954cd252a64a5 Mon Sep 17 00:00:00 2001 From: Yi Rui Goh Date: Wed, 8 Mar 2017 23:49:08 +0800 Subject: [PATCH 4/9] Update EditCommandTest test input again --- src/test/java/guitests/EditCommandTest.java | 2 +- src/test/java/guitests/guihandles/PersonCardHandle.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/guitests/EditCommandTest.java b/src/test/java/guitests/EditCommandTest.java index 8f84a7af589e..e4ca8372fd82 100644 --- a/src/test/java/guitests/EditCommandTest.java +++ b/src/test/java/guitests/EditCommandTest.java @@ -25,7 +25,7 @@ public class EditCommandTest extends AddressBookGuiTest { @Test public void edit_allFieldsSpecified_success() throws Exception { - String detailsToEdit = "Bobby s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 a/Block 123, Bobby Street 3 t/husband"; + String detailsToEdit = "Bobby s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/Block 123, Bobby Street 3 t/husband"; int addressBookIndex = 1; TestPerson editedPerson = new PersonBuilder().withName("Bobby").withEndDateTime("2017-04-01T10:16:30") diff --git a/src/test/java/guitests/guihandles/PersonCardHandle.java b/src/test/java/guitests/guihandles/PersonCardHandle.java index b51e27280aa7..92acfbd77b05 100644 --- a/src/test/java/guitests/guihandles/PersonCardHandle.java +++ b/src/test/java/guitests/guihandles/PersonCardHandle.java @@ -74,8 +74,8 @@ private Region getTagsContainer() { public boolean isSamePerson(ReadOnlyTask person) { return getFullName().equals(person.getTitle().fullTitle) - && getPhone().equals(person.getEndDateTime().value) - && getEmail().equals(person.getStartDateTime().value) + && getPhone().equals(person.getStartDateTime().value) + && getEmail().equals(person.getEndDateTime().value) && getAddress().equals(person.getLocation().value) && getTags().equals(getTags(person.getTags())); } From fdefccfd308585922acb3fbe3ff6d7bec322f578 Mon Sep 17 00:00:00 2001 From: Yi Rui Goh Date: Thu, 9 Mar 2017 00:32:02 +0800 Subject: [PATCH 5/9] Update LogicManagerTest and DateTime equals method --- .../seedu/geekeep/model/task/EndDateTime.java | 4 +-- .../geekeep/model/task/StartDateTime.java | 2 +- .../seedu/geekeep/logic/LogicManagerTest.java | 32 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/seedu/geekeep/model/task/EndDateTime.java b/src/main/java/seedu/geekeep/model/task/EndDateTime.java index a8e531610888..cf3cffb73f53 100644 --- a/src/main/java/seedu/geekeep/model/task/EndDateTime.java +++ b/src/main/java/seedu/geekeep/model/task/EndDateTime.java @@ -35,8 +35,8 @@ public EndDateTime(String dateTimeString) throws IllegalValueException { @Override public boolean equals(Object other) { return other == this // short circuit if same object - || (other instanceof StartDateTime // instanceof handles nulls - && this.dateTime.equals(((StartDateTime) other).dateTime)); // state check + || (other instanceof EndDateTime // instanceof handles nulls + && this.value.equals(((EndDateTime) other).value)); // state check } @Override diff --git a/src/main/java/seedu/geekeep/model/task/StartDateTime.java b/src/main/java/seedu/geekeep/model/task/StartDateTime.java index 8c5180873e61..d3f863a2d9fe 100644 --- a/src/main/java/seedu/geekeep/model/task/StartDateTime.java +++ b/src/main/java/seedu/geekeep/model/task/StartDateTime.java @@ -36,7 +36,7 @@ public StartDateTime(String dateTimeString) throws IllegalValueException { public boolean equals(Object other) { return other == this // short circuit if same object || (other instanceof StartDateTime // instanceof handles nulls - && this.dateTime.equals(((StartDateTime) other).dateTime)); // state check + && this.value.equals(((StartDateTime) other).value)); // state check } @Override diff --git a/src/test/java/seedu/geekeep/logic/LogicManagerTest.java b/src/test/java/seedu/geekeep/logic/LogicManagerTest.java index 1ce52693cc36..61896ad8b41b 100644 --- a/src/test/java/seedu/geekeep/logic/LogicManagerTest.java +++ b/src/test/java/seedu/geekeep/logic/LogicManagerTest.java @@ -189,20 +189,20 @@ public void execute_clear() throws Exception { public void execute_add_invalidArgsFormat() { String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE); assertCommandFailure("add wrong args wrong args", expectedMessage); - assertCommandFailure("add Valid Name 12345 e/valid@email.butNoPhonePrefix a/valid,address", expectedMessage); - assertCommandFailure("add Valid Name p/12345 valid@email.butNoPrefix a/valid, address", expectedMessage); - assertCommandFailure("add Valid Name p/12345 e/valid@email.butNoAddressPrefix valid, address", expectedMessage); + assertCommandFailure("add Valid Name 2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/valid,address", expectedMessage); + assertCommandFailure("add Valid Name s/2017-04-01T10:16:30 2017-04-01T10:16:30 l/valid, address", expectedMessage); + assertCommandFailure("add Valid Name s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 valid, address", expectedMessage); } @Test public void execute_add_invalidPersonData() { - assertCommandFailure("add []\\[;] p/12345 e/valid@e.mail a/valid, address", + assertCommandFailure("add []\\[;] s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/valid, address", Title.MESSAGE_TITLE_CONSTRAINTS); - assertCommandFailure("add Valid Name p/not_numbers e/valid@e.mail a/valid, address", + assertCommandFailure("add Valid Name s/not_numbers e/2017-04-01T10:16:30 l/valid, address", EndDateTime.MESSAGE_DATETIME_CONSTRAINTS); - assertCommandFailure("add Valid Name p/12345 e/notAnEmail a/valid, address", + assertCommandFailure("add Valid Name s/2017-04-01T10:16:30 e/notAnEmail l/valid, address", StartDateTime.MESSAGE_DATETIME_CONSTRAINTS); - assertCommandFailure("add Valid Name p/12345 e/valid@e.mail a/valid, address t/invalid_-[.tag", + assertCommandFailure("add Valid Name s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/valid, address t/invalid_-[.tag", Tag.MESSAGE_TAG_CONSTRAINTS); } @@ -416,8 +416,8 @@ class TestDataHelper { Task adam() throws Exception { Title title = new Title("Adam Brown"); - EndDateTime privateEndDateTime = new EndDateTime("111111"); - StartDateTime startDateTime = new StartDateTime("adam@gmail.com"); + EndDateTime privateEndDateTime = new EndDateTime("2017-04-01T10:16:30"); + StartDateTime startDateTime = new StartDateTime("2017-04-01T10:16:30"); Location privateLocation = new Location("111, alpha street"); Tag tag1 = new Tag("tag1"); Tag tag2 = new Tag("longertag2"); @@ -435,8 +435,8 @@ Task adam() throws Exception { Task generateTask(int seed) throws Exception { return new Task( new Title("Person " + seed), - new StartDateTime(seed + "@email"), - new EndDateTime("" + Math.abs(seed)), + new StartDateTime("2017-04-01T10:16:30"), + new EndDateTime("2017-04-01T10:16:30"), new Location("House of " + seed), new UniqueTagList(new Tag("tag" + Math.abs(seed)), new Tag("tag" + Math.abs(seed + 1))) ); @@ -449,9 +449,9 @@ String generateAddCommand(Task p) { cmd.append("add "); cmd.append(p.getTitle().toString()); - cmd.append(" e/").append(p.getStartDateTime()); - cmd.append(" p/").append(p.getEndDateTime()); - cmd.append(" a/").append(p.getLocation()); + cmd.append(" s/").append(p.getStartDateTime()); + cmd.append(" e/").append(p.getEndDateTime()); + cmd.append(" l/").append(p.getLocation()); UniqueTagList tags = p.getTags(); for (Tag t: tags) { @@ -534,8 +534,8 @@ List generateTaskList(Task... persons) { Task generateTaskWithName(String name) throws Exception { return new Task( new Title(name), - new StartDateTime("1@email"), - new EndDateTime("1"), + new StartDateTime("2017-04-01T10:16:30"), + new EndDateTime("2017-04-01T10:16:30"), new Location("House of 1"), new UniqueTagList(new Tag("tag")) ); From 4e275e7ba69165c7f2c1e2b2438a96f676ebfa69 Mon Sep 17 00:00:00 2001 From: Yi Rui Goh Date: Thu, 9 Mar 2017 00:46:50 +0800 Subject: [PATCH 6/9] Fix SampleDataUtil checkstyle --- .../seedu/geekeep/model/util/SampleDataUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java b/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java index fd781ac1bd33..ffc4647b73b5 100644 --- a/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java +++ b/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java @@ -15,27 +15,27 @@ public class SampleDataUtil { public static Task[] getSampleTasks() { try { return new Task[] { - new Task(new Title("Alex Yeoh"), new StartDateTime("2017-04-01T10:16:30"), + new Task(new Title("Alex Yeoh"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("Blk 30 Geylang Street 29, #06-40"), new UniqueTagList("friends")), - new Task(new Title("Bernice Yu"), new StartDateTime("2017-04-01T10:16:30"), + new Task(new Title("Bernice Yu"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-02T10:16:30"), new Location("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), new UniqueTagList("colleagues", "friends")), - new Task(new Title("Charlotte Oliveiro"), new StartDateTime("2017-04-01T10:16:30"), + new Task(new Title("Charlotte Oliveiro"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("Blk 11 Ang Mo Kio Street 74, #11-04"), new UniqueTagList("neighbours")), - new Task(new Title("David Li"), new StartDateTime("2017-04-01T10:16:30"), + new Task(new Title("David Li"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("Blk 436 Serangoon Gardens Street 26, #16-43"), new UniqueTagList("family")), - new Task(new Title("Irfan Ibrahim"), new StartDateTime("2017-04-01T10:16:30"), + new Task(new Title("Irfan Ibrahim"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("Blk 47 Tampines Street 20, #17-35"), new UniqueTagList("classmates")), - new Task(new Title("Roy Balakrishnan"), new StartDateTime("2017-04-01T10:16:30"), + new Task(new Title("Roy Balakrishnan"), new StartDateTime("2017-04-01T10:16:30"), new EndDateTime("2017-04-01T10:16:30"), new Location("Blk 45 Aljunied Street 85, #11-31"), new UniqueTagList("colleagues")) From 19f3ebf5325a214215b51cfdcc83af098af87324 Mon Sep 17 00:00:00 2001 From: Yi Rui Goh Date: Thu, 9 Mar 2017 01:04:52 +0800 Subject: [PATCH 7/9] Update checkstyle linelength --- src/test/java/guitests/EditCommandTest.java | 14 +++++++++----- .../seedu/geekeep/logic/LogicManagerTest.java | 15 ++++++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/test/java/guitests/EditCommandTest.java b/src/test/java/guitests/EditCommandTest.java index e4ca8372fd82..981b656254e2 100644 --- a/src/test/java/guitests/EditCommandTest.java +++ b/src/test/java/guitests/EditCommandTest.java @@ -25,11 +25,15 @@ public class EditCommandTest extends AddressBookGuiTest { @Test public void edit_allFieldsSpecified_success() throws Exception { - String detailsToEdit = "Bobby s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/Block 123, Bobby Street 3 t/husband"; - int addressBookIndex = 1; - - TestPerson editedPerson = new PersonBuilder().withName("Bobby").withEndDateTime("2017-04-01T10:16:30") - .withStartDateTime("2017-04-01T10:16:30").withLocation("Block 123, Bobby Street 3").withTags("husband").build(); + String detailsToEdit + = "Bobby s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/Block 123, Bobby Street 3 t/husband"; + int addressBookIndex= 1; + + TestPerson editedPerson = new PersonBuilder().withName("Bobby") + .withEndDateTime("2017-04-01T10:16:30") + .withStartDateTime("2017-04-01T10:16:30") + .withLocation("Block 123, Bobby Street 3") + .withTags("husband").build(); assertEditSuccess(addressBookIndex, addressBookIndex, detailsToEdit, editedPerson); } diff --git a/src/test/java/seedu/geekeep/logic/LogicManagerTest.java b/src/test/java/seedu/geekeep/logic/LogicManagerTest.java index 61896ad8b41b..ef16f2ec93bc 100644 --- a/src/test/java/seedu/geekeep/logic/LogicManagerTest.java +++ b/src/test/java/seedu/geekeep/logic/LogicManagerTest.java @@ -188,10 +188,14 @@ public void execute_clear() throws Exception { @Test public void execute_add_invalidArgsFormat() { String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE); - assertCommandFailure("add wrong args wrong args", expectedMessage); - assertCommandFailure("add Valid Name 2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/valid,address", expectedMessage); - assertCommandFailure("add Valid Name s/2017-04-01T10:16:30 2017-04-01T10:16:30 l/valid, address", expectedMessage); - assertCommandFailure("add Valid Name s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 valid, address", expectedMessage); + assertCommandFailure("add wrong args wrong args", + expectedMessage); + assertCommandFailure("add Valid Name 2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/valid,address", + expectedMessage); + assertCommandFailure("add Valid Name s/2017-04-01T10:16:30 2017-04-01T10:16:30 l/valid, address", + expectedMessage); + assertCommandFailure("add Valid Name s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 valid, address", + expectedMessage); } @Test @@ -202,7 +206,8 @@ public void execute_add_invalidPersonData() { EndDateTime.MESSAGE_DATETIME_CONSTRAINTS); assertCommandFailure("add Valid Name s/2017-04-01T10:16:30 e/notAnEmail l/valid, address", StartDateTime.MESSAGE_DATETIME_CONSTRAINTS); - assertCommandFailure("add Valid Name s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/valid, address t/invalid_-[.tag", + assertCommandFailure( + "add Valid Name s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/valid, address t/invalid_-[.tag", Tag.MESSAGE_TAG_CONSTRAINTS); } From 5596381d1d4db2a27783a07199c855a83ddbc61a Mon Sep 17 00:00:00 2001 From: Yi Rui Goh Date: Thu, 9 Mar 2017 01:08:49 +0800 Subject: [PATCH 8/9] Fix more Checkstyle --- src/test/java/guitests/EditCommandTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/guitests/EditCommandTest.java b/src/test/java/guitests/EditCommandTest.java index 981b656254e2..a88459a9e260 100644 --- a/src/test/java/guitests/EditCommandTest.java +++ b/src/test/java/guitests/EditCommandTest.java @@ -26,8 +26,8 @@ public class EditCommandTest extends AddressBookGuiTest { @Test public void edit_allFieldsSpecified_success() throws Exception { String detailsToEdit - = "Bobby s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/Block 123, Bobby Street 3 t/husband"; - int addressBookIndex= 1; + = "Bobby s/2017-04-01T10:16:30 e/2017-04-01T10:16:30 l/Block 123, Bobby Street 3 t/husband"; + int addressBookIndex = 1; TestPerson editedPerson = new PersonBuilder().withName("Bobby") .withEndDateTime("2017-04-01T10:16:30") From 94f823e56f2399c565ca3cf84457d01f5c675b48 Mon Sep 17 00:00:00 2001 From: Yi Rui Goh Date: Thu, 9 Mar 2017 02:41:04 +0800 Subject: [PATCH 9/9] Update SampleDataUtil sample data --- src/main/java/seedu/geekeep/model/util/SampleDataUtil.java | 2 +- src/test/java/guitests/guihandles/PersonCardHandle.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java b/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java index ffc4647b73b5..76184d8884c5 100644 --- a/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java +++ b/src/main/java/seedu/geekeep/model/util/SampleDataUtil.java @@ -20,7 +20,7 @@ public static Task[] getSampleTasks() { new Location("Blk 30 Geylang Street 29, #06-40"), new UniqueTagList("friends")), new Task(new Title("Bernice Yu"), new StartDateTime("2017-04-01T10:16:30"), - new EndDateTime("2017-04-02T10:16:30"), + new EndDateTime("2017-04-01T10:16:30"), new Location("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), new UniqueTagList("colleagues", "friends")), new Task(new Title("Charlotte Oliveiro"), new StartDateTime("2017-04-01T10:16:30"), diff --git a/src/test/java/guitests/guihandles/PersonCardHandle.java b/src/test/java/guitests/guihandles/PersonCardHandle.java index 92acfbd77b05..b51e27280aa7 100644 --- a/src/test/java/guitests/guihandles/PersonCardHandle.java +++ b/src/test/java/guitests/guihandles/PersonCardHandle.java @@ -74,8 +74,8 @@ private Region getTagsContainer() { public boolean isSamePerson(ReadOnlyTask person) { return getFullName().equals(person.getTitle().fullTitle) - && getPhone().equals(person.getStartDateTime().value) - && getEmail().equals(person.getEndDateTime().value) + && getPhone().equals(person.getEndDateTime().value) + && getEmail().equals(person.getStartDateTime().value) && getAddress().equals(person.getLocation().value) && getTags().equals(getTags(person.getTags())); }