Skip to content

Commit

Permalink
Merge pull request #115 from whitesnowx/reformatPersonsAlphabetical
Browse files Browse the repository at this point in the history
Reformat persons alphabetical
  • Loading branch information
iynixil authored Mar 20, 2024
2 parents 074e022 + f1b1c4b commit 4eacb41
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,6 @@
"venue" : "pteruges avenue",
"tags" : [ "classmate" ],
"availabilities" : [ "FRIDAY" ]
}, {
"name" : "Natasha Harrower",
"phone" : "8019394",
"email" : "[email protected]",
"module": "CS2102",
"faculty" : "Computing",
"venue" : "underworld avenue",
"tags" : [ "classmate" ],
"availabilities" : [ "FRIDAY" ]
}, {
"name" : "Leonardo DiCaprio",
"phone" : "88472234",
Expand All @@ -108,5 +99,14 @@
"venue" : "YSTCM-SR9",
"tags" : [ ],
"availabilities" : [ ]
}, {
"name" : "Natasha Harrower",
"phone" : "8019394",
"email" : "[email protected]",
"module": "CS2102",
"faculty" : "Computing",
"venue" : "underworld avenue",
"tags" : [ "classmate" ],
"availabilities" : [ "FRIDAY" ]
} ]
}
13 changes: 7 additions & 6 deletions src/test/java/staffconnect/testutil/TypicalPersons.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,21 @@ public class TypicalPersons {
public static final Person IDA = new PersonBuilder().withName("Ida Mueller").withPhone("8482131")
.withEmail("[email protected]").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("[email protected]").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("[email protected]").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("[email protected]").withModule("TS2237")
.withFaculty("Arts and Social Sciences").withVenue("LT13").build();
public static final Person MICHAEL = new PersonBuilder().withName("Michael Jackson").withPhone("92347123")
.withEmail("[email protected]").withModule("MUA1163")
.withFaculty("Music").withVenue("YSTCM-SR9").build();
public static final Person NATASHA = new PersonBuilder().withName("Natasha Harrower").withPhone("8019394")
.withEmail("[email protected]").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)
Expand Down Expand Up @@ -107,7 +108,7 @@ public static StaffBook getTypicalStaffBook() {
}

public static List<Person> 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));
}
}

0 comments on commit 4eacb41

Please sign in to comment.