diff --git a/src/test/java/housekeeping/hub/model/person/LeadsFilterPredicateTest.java b/src/test/java/housekeeping/hub/model/person/LeadsFilterPredicateTest.java index 879ab1aff1b..88e74a50a46 100644 --- a/src/test/java/housekeeping/hub/model/person/LeadsFilterPredicateTest.java +++ b/src/test/java/housekeeping/hub/model/person/LeadsFilterPredicateTest.java @@ -32,7 +32,7 @@ void client_no_booking_date() { ClientBuilder clientBuilder = new ClientBuilder().withDetails(housekeepingDetails); Client client = clientBuilder.build(); - assertFalse(predicate.test(client)); + assertTrue(predicate.test(client)); } @Test diff --git a/src/test/java/housekeeping/hub/testutil/EditPersonDescriptorBuilder.java b/src/test/java/housekeeping/hub/testutil/EditPersonDescriptorBuilder.java index a665a59bebb..d729b521c4c 100644 --- a/src/test/java/housekeeping/hub/testutil/EditPersonDescriptorBuilder.java +++ b/src/test/java/housekeeping/hub/testutil/EditPersonDescriptorBuilder.java @@ -48,7 +48,6 @@ public EditPersonDescriptorBuilder(Person person) { descriptor.setDetails(client.getDetails()); } else { Housekeeper housekeeper = (Housekeeper) person; - descriptor.setBookingList(housekeeper.getBookingList()); } } diff --git a/src/test/java/housekeeping/hub/testutil/PersonUtil.java b/src/test/java/housekeeping/hub/testutil/PersonUtil.java index b379c8385df..dca802539d6 100644 --- a/src/test/java/housekeeping/hub/testutil/PersonUtil.java +++ b/src/test/java/housekeeping/hub/testutil/PersonUtil.java @@ -15,6 +15,7 @@ import housekeeping.hub.logic.commands.EditCommand.EditPersonDescriptor; import housekeeping.hub.model.person.Client; import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.HousekeepingDetails; import housekeeping.hub.model.tag.Tag; /** @@ -22,7 +23,7 @@ */ public class PersonUtil { public static String getAddClientCommand(Client client) { - return AddClientCommand.COMMAND_WORD + " " + getClientDetails(client); + return AddClientCommand.COMMAND_WORD + " client " + getClientDetails(client); } public static String getAddHousekeeperCommand(Housekeeper housekeeper) { @@ -42,7 +43,10 @@ public static String getClientDetails(Client client) { client.getTags().stream().forEach( s -> sb.append(PREFIX_TAG + s.tagName + " ") ); - sb.append(PREFIX_DETAILS + client.getDetails().toString()); + String[] hD = HousekeepingDetails.makeStoredDetailsReadable(client.getDetails().toString()).split("\n"); + String lHD = hD[0].split(" ")[2]; + String pI = hD[1].split(" ")[2] + " " + hD[1].split(" ")[3]; + sb.append(PREFIX_DETAILS + lHD + " " + pI); return sb.toString(); } @@ -83,7 +87,7 @@ public static String getEditPersonDescriptorDetails(EditPersonDescriptor descrip tags.forEach(s -> sb.append(PREFIX_TAG).append(s.tagName).append(" ")); } } - descriptor.getDetails().ifPresent(details -> sb.append(PREFIX_DETAILS).append(details.toString())); return sb.toString(); } + }