From 4f6d3c6cfc0e5e582e82dc0d2a0ee9fadf4f602e Mon Sep 17 00:00:00 2001 From: jianrong7 Date: Thu, 26 Oct 2023 10:04:01 +0800 Subject: [PATCH] Fix editprop tests errors --- .../address/logic/commands/DeleteCustomerCommandTest.java | 5 ++--- .../seedu/address/logic/commands/EditCommandTest.java | 8 ++++---- .../address/logic/commands/EditPropertyCommandTest.java | 8 ++++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/test/java/seedu/address/logic/commands/DeleteCustomerCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteCustomerCommandTest.java index 10b1306b559..c0c04eb6aca 100644 --- a/src/test/java/seedu/address/logic/commands/DeleteCustomerCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/DeleteCustomerCommandTest.java @@ -17,7 +17,6 @@ import seedu.address.logic.Messages; import seedu.address.model.Model; import seedu.address.model.ModelManager; -import seedu.address.model.PropertyBook; import seedu.address.model.UserPrefs; import seedu.address.model.customer.Customer; /** @@ -36,7 +35,7 @@ public void execute_validIndexUnfilteredList_success() { String expectedMessage = String.format(DeleteCustomerCommand.MESSAGE_DELETE_CUSTOMER_SUCCESS, Messages.format(customerToDelete)); - ModelManager expectedModel = new ModelManager(model.getAddressBook(), new PropertyBook(), new UserPrefs()); + ModelManager expectedModel = new ModelManager(model.getAddressBook(), model.getPropertyBook(), new UserPrefs()); expectedModel.deleteCustomer(customerToDelete); assertCommandSuccess(delcustCommand, model, expectedMessage, expectedModel); @@ -60,7 +59,7 @@ public void execute_validIndexFilteredList_success() { String expectedMessage = String.format(DeleteCustomerCommand.MESSAGE_DELETE_CUSTOMER_SUCCESS, Messages.format(customerToDelete)); - Model expectedModel = new ModelManager(model.getAddressBook(), new PropertyBook(), new UserPrefs()); + Model expectedModel = new ModelManager(model.getAddressBook(), model.getPropertyBook(), new UserPrefs()); expectedModel.deleteCustomer(customerToDelete); showNoCustomer(expectedModel); diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/EditCommandTest.java index 339637ad2e8..db984943783 100644 --- a/src/test/java/seedu/address/logic/commands/EditCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/EditCommandTest.java @@ -47,7 +47,7 @@ public void execute_allFieldsSpecifiedUnfilteredList_success() { Messages.format(editedCustomer)); Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), - new PropertyBook(), new UserPrefs()); + model.getPropertyBook(), new UserPrefs()); expectedModel.setCustomer(model.getFilteredCustomerList().get(0), editedCustomer); assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); @@ -70,7 +70,7 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() { Messages.format(editedCustomer)); Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), - new PropertyBook(), new UserPrefs()); + new PropertyBook(model.getPropertyBook()), new UserPrefs()); expectedModel.setCustomer(lastCustomer, editedCustomer); assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); @@ -85,7 +85,7 @@ public void execute_noFieldSpecifiedUnfilteredList_success() { Messages.format(editedCustomer)); Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), - new PropertyBook(), new UserPrefs()); + new PropertyBook(model.getPropertyBook()), new UserPrefs()); assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); } @@ -103,7 +103,7 @@ public void execute_filteredList_success() { Messages.format(editedCustomer)); Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), - new PropertyBook(), new UserPrefs()); + new PropertyBook(model.getPropertyBook()), new UserPrefs()); expectedModel.setCustomer(model.getFilteredCustomerList().get(0), editedCustomer); assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); diff --git a/src/test/java/seedu/address/logic/commands/EditPropertyCommandTest.java b/src/test/java/seedu/address/logic/commands/EditPropertyCommandTest.java index ddf5ac12628..3597fa3330f 100644 --- a/src/test/java/seedu/address/logic/commands/EditPropertyCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/EditPropertyCommandTest.java @@ -48,7 +48,7 @@ public void execute_allFieldsSpecifiedUnfilteredList_success() { Messages.format(editedProperty)); Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), - new PropertyBook(), new UserPrefs()); + new PropertyBook(model.getPropertyBook()), new UserPrefs()); expectedModel.setProperty(model.getFilteredPropertyList().get(0), editedProperty); assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); @@ -71,7 +71,7 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() { Messages.format(editedProperty)); Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), - new PropertyBook(), new UserPrefs()); + new PropertyBook(model.getPropertyBook()), new UserPrefs()); expectedModel.setProperty(lastProperty, editedProperty); assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); @@ -86,7 +86,7 @@ public void execute_noFieldSpecifiedUnfilteredList_success() { Messages.format(editedProperty)); Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), - new PropertyBook(), new UserPrefs()); + new PropertyBook(model.getPropertyBook()), new UserPrefs()); assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); } @@ -104,7 +104,7 @@ public void execute_filteredList_success() { Messages.format(editedProperty)); Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), - new PropertyBook(), new UserPrefs()); + new PropertyBook(model.getPropertyBook()), new UserPrefs()); expectedModel.setProperty(model.getFilteredPropertyList().get(0), editedProperty); assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);