From 9f3feae6b75320664d701a66ae709e552e4f901f Mon Sep 17 00:00:00 2001 From: whitesnowx Date: Wed, 20 Mar 2024 10:37:34 +0800 Subject: [PATCH 1/2] Reorder alphabetically in .json --- .../typicalPersonsStaffBook.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/data/JsonSerializableStaffBookTest/typicalPersonsStaffBook.json b/src/test/data/JsonSerializableStaffBookTest/typicalPersonsStaffBook.json index 1512395c295..d55bd5f0ac7 100644 --- a/src/test/data/JsonSerializableStaffBookTest/typicalPersonsStaffBook.json +++ b/src/test/data/JsonSerializableStaffBookTest/typicalPersonsStaffBook.json @@ -81,15 +81,6 @@ "venue" : "pteruges avenue", "tags" : [ "classmate" ], "availabilities" : [ "FRIDAY" ] - }, { - "name" : "Natasha Harrower", - "phone" : "8019394", - "email" : "harrower@example.com", - "module": "CS2102", - "faculty" : "Computing", - "venue" : "underworld avenue", - "tags" : [ "classmate" ], - "availabilities" : [ "FRIDAY" ] }, { "name" : "Leonardo DiCaprio", "phone" : "88472234", @@ -108,5 +99,14 @@ "venue" : "YSTCM-SR9", "tags" : [ ], "availabilities" : [ ] + }, { + "name" : "Natasha Harrower", + "phone" : "8019394", + "email" : "harrower@example.com", + "module": "CS2102", + "faculty" : "Computing", + "venue" : "underworld avenue", + "tags" : [ "classmate" ], + "availabilities" : [ "FRIDAY" ] } ] } From f1b1c4bc9dcd0da2f536b21cc0474126a46215b5 Mon Sep 17 00:00:00 2001 From: whitesnowx Date: Wed, 20 Mar 2024 10:41:20 +0800 Subject: [PATCH 2/2] Reorder persons in typicalpersons.java --- .../java/staffconnect/testutil/TypicalPersons.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/test/java/staffconnect/testutil/TypicalPersons.java b/src/test/java/staffconnect/testutil/TypicalPersons.java index 5653ae48c95..f9b66e0bab5 100644 --- a/src/test/java/staffconnect/testutil/TypicalPersons.java +++ b/src/test/java/staffconnect/testutil/TypicalPersons.java @@ -65,20 +65,21 @@ public class TypicalPersons { public static final Person IDA = new PersonBuilder().withName("Ida Mueller").withPhone("8482131") .withEmail("hans@example.com").withModule("CS2103T") .withFaculty("Computing").withVenue("chicago ave").build(); + // End of manually added public static final Person KAFKA = new PersonBuilder().withName("Kafka Apache").withPhone("9452413") .withEmail("apache@example.com").withModule("CS2102").withFaculty("Business") .withVenue("pteruges avenue").withTags("classmate").withAvailabilities("FRIDAY").build(); - public static final Person NATASHA = new PersonBuilder().withName("Natasha Harrower").withPhone("8019394") - .withEmail("harrower@example.com").withModule("CS2102") - .withFaculty("Computing").withVenue("underworld avenue") - .withTags("classmate").withAvailabilities("FRIDAY").build(); public static final Person LEONARDO = new PersonBuilder().withName("Leonardo DiCaprio").withPhone("88472234") .withEmail("lcaprio@gmail.com").withModule("TS2237") .withFaculty("Arts and Social Sciences").withVenue("LT13").build(); public static final Person MICHAEL = new PersonBuilder().withName("Michael Jackson").withPhone("92347123") .withEmail("heehee@gmail.com").withModule("MUA1163") .withFaculty("Music").withVenue("YSTCM-SR9").build(); + public static final Person NATASHA = new PersonBuilder().withName("Natasha Harrower").withPhone("8019394") + .withEmail("harrower@example.com").withModule("CS2102") + .withFaculty("Computing").withVenue("underworld avenue") + .withTags("classmate").withAvailabilities("FRIDAY").build(); // Manually added - Person's details found in {@code CommandTestUtil} public static final Person AMY = new PersonBuilder().withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY) @@ -107,7 +108,7 @@ public static StaffBook getTypicalStaffBook() { } public static List getTypicalPersons() { - return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, CLARA, DANIEL, ELLE, FIONA, GEORGE, KAFKA, NATASHA, - LEONARDO, MICHAEL)); + return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, CLARA, DANIEL, ELLE, FIONA, GEORGE, KAFKA, + LEONARDO, MICHAEL, NATASHA)); } }