Fix OrderTest imports

bertrandong · Mar 19, 2024 · b0e5483 · b0e5483
1 parent 5530427
commit b0e5483
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 76 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/EditOrderCommand.java b/src/main/java/seedu/address/logic/commands/EditOrderCommand.java
@@ -1,7 +1,7 @@
 package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ORDER;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ORDER_ID;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PRODUCT_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PRODUCT_QUANTITY;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_ORDERS;
@@ -29,10 +29,10 @@ public class EditOrderCommand extends EditCommand {
             + ": Edits the details of the order identified "
             + "by the index number used in the displayed person list. "
             + "Existing values will be overwritten by the input values.\n"
-            + "Parameters: [" + PREFIX_ORDER + "INDEX (must be a positive integer)] "
+            + "Parameters: [" + PREFIX_ORDER_ID + "INDEX (must be a positive integer)] "
             + "[" + PREFIX_PRODUCT_NAME + "PRODUCT_NAME] "
             + "[" + PREFIX_PRODUCT_QUANTITY + "PRODUCT_QUANTITY] "
-            + "Example: " + COMMAND_WORD + " " + PREFIX_ORDER + "1 "
+            + "Example: " + COMMAND_WORD + " " + PREFIX_ORDER_ID + "1 "
             + PREFIX_PRODUCT_NAME + "cupcake "
             + PREFIX_PRODUCT_QUANTITY + "2";
 

diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -11,7 +11,7 @@ public class CliSyntax {
     public static final Prefix PREFIX_EMAIL = new Prefix("e/");
     public static final Prefix PREFIX_ADDRESS = new Prefix("a/");
     public static final Prefix PREFIX_TAG = new Prefix("t/");
-    public static final Prefix PREFIX_ORDER = new Prefix("o/");
+    public static final Prefix PREFIX_ORDER_ID = new Prefix("o/");
     public static final Prefix PREFIX_CUSTOMER_ID = new Prefix("c/");
     public static final Prefix PREFIX_PRODUCT_NAME = new Prefix("pn/");
     public static final Prefix PREFIX_PRODUCT_QUANTITY = new Prefix("pq");

diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
@@ -2,7 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_CUSTOMER_ID;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ORDER;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ORDER_ID;
 
 import seedu.address.logic.commands.EditCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
@@ -21,9 +21,9 @@ public EditCommand parse(String args) throws ParseException {
         requireNonNull(args);
 
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_CUSTOMER_ID, PREFIX_ORDER);
+                ArgumentTokenizer.tokenize(args, PREFIX_CUSTOMER_ID, PREFIX_ORDER_ID);
 
-        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_CUSTOMER_ID, PREFIX_ORDER);
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_CUSTOMER_ID, PREFIX_ORDER_ID);
 
         if (ParserUtil.isCustomer(args)) {
             EditCustomerCommandParser editCustomerCommandParser = new EditCustomerCommandParser();

diff --git a/src/main/java/seedu/address/logic/parser/EditOrderCommandParser.java b/src/main/java/seedu/address/logic/parser/EditOrderCommandParser.java
@@ -2,7 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ORDER;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ORDER_ID;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PRODUCT_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PRODUCT_QUANTITY;
 
@@ -22,13 +22,13 @@ public EditOrderCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args,
-                        PREFIX_ORDER, PREFIX_PRODUCT_NAME, PREFIX_PRODUCT_QUANTITY);
+                        PREFIX_ORDER_ID, PREFIX_PRODUCT_NAME, PREFIX_PRODUCT_QUANTITY);
 
         Index index;
 
         try {
             index = ParserUtil.parseIndex(
-                    argMultimap.getValue(PREFIX_ORDER)
+                    argMultimap.getValue(PREFIX_ORDER_ID)
                             .orElseThrow(() -> new ParseException("")));
         } catch (ParseException pe) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,

diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -2,7 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_CUSTOMER_ID;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ORDER;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ORDER_ID;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -166,12 +166,12 @@ public static Quantity parseQuantity(String quantity) throws ParseException {
      */
     public static boolean isCustomer(String args) throws ParseException {
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_CUSTOMER_ID, PREFIX_ORDER);
+                ArgumentTokenizer.tokenize(args, PREFIX_CUSTOMER_ID, PREFIX_ORDER_ID);
 
-        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_CUSTOMER_ID, PREFIX_ORDER);
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_CUSTOMER_ID, PREFIX_ORDER_ID);
 
         boolean hasCustomer = argMultimap.getValue(PREFIX_CUSTOMER_ID).isPresent();
-        boolean hasOrder = argMultimap.getValue(PREFIX_ORDER).isPresent();
+        boolean hasOrder = argMultimap.getValue(PREFIX_ORDER_ID).isPresent();
         if (hasCustomer && !hasOrder) {
             return true;
         } else if (!hasCustomer && hasOrder) {

diff --git a/src/main/java/seedu/address/model/order/Quantity.java b/src/main/java/seedu/address/model/order/Quantity.java
@@ -13,7 +13,7 @@ public class Quantity {
             "Product quantity should only be a number.";
 
     /** Accept only non-negative integers*/
-    public static final String VALIDATION_REGEX = "^\\d+$";
+    public static final String VALIDATION_REGEX = "^\\d*$";
 
     private int value;
 

diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
@@ -24,8 +24,6 @@
 import seedu.address.model.ReadOnlyAddressBook;
 import seedu.address.model.ReadOnlyUserPrefs;
 import seedu.address.model.order.Order;
-import seedu.address.model.order.Product;
-import seedu.address.model.order.Quantity;
 import seedu.address.model.person.Person;
 import seedu.address.testutil.PersonBuilder;
 
@@ -152,11 +150,6 @@ public void addOrder(Order newOrder, Person person) {
             throw new AssertionError("This method should not be called.");
         }
 
-        @Override
-        public Order setOrder(Order order, Product product, Quantity quantity) {
-            throw new AssertionError("This method should not be called.");
-        }
-
         @Override
         public void deleteOrder(int id) {
             throw new AssertionError("This method should not be called.");

diff --git a/src/test/java/seedu/address/logic/commands/EditCustomerCommandTest.java b/src/test/java/seedu/address/logic/commands/EditCustomerCommandTest.java
@@ -41,8 +41,7 @@ public void execute_allFieldsSpecifiedUnfilteredList_success() {
         EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(editedPerson).build();
         EditCustomerCommand editCustomerCommand = new EditCustomerCommand(INDEX_FIRST_PERSON, descriptor);
 
-        String expectedMessage = String.format(EditCustomerCommand.MESSAGE_EDIT_PERSON_SUCCESS,
-                Messages.format(editedPerson));
+        String expectedMessage = String.format(EditCustomerCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson));
 
         Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
         expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
@@ -63,8 +62,7 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() {
                 .withPhone(VALID_PHONE_BOB).withTags(VALID_TAG_HUSBAND).build();
         EditCustomerCommand editCustomerCommand = new EditCustomerCommand(indexLastPerson, descriptor);
 
-        String expectedMessage = String.format(EditCustomerCommand.MESSAGE_EDIT_PERSON_SUCCESS,
-                Messages.format(editedPerson));
+        String expectedMessage = String.format(EditCustomerCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson));
 
         Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
         expectedModel.setPerson(lastPerson, editedPerson);
@@ -74,12 +72,10 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() {
 
     @Test
     public void execute_noFieldSpecifiedUnfilteredList_success() {
-        EditCustomerCommand editCustomerCommand = new EditCustomerCommand(INDEX_FIRST_PERSON,
-                new EditPersonDescriptor());
+        EditCustomerCommand editCustomerCommand = new EditCustomerCommand(INDEX_FIRST_PERSON, new EditPersonDescriptor());
         Person editedPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
 
-        String expectedMessage = String.format(EditCustomerCommand.MESSAGE_EDIT_PERSON_SUCCESS,
-                Messages.format(editedPerson));
+        String expectedMessage = String.format(EditCustomerCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson));
 
         Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
 
@@ -95,8 +91,7 @@ public void execute_filteredList_success() {
         EditCustomerCommand editCustomerCommand = new EditCustomerCommand(INDEX_FIRST_PERSON,
                 new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
 
-        String expectedMessage = String.format(EditCustomerCommand.MESSAGE_EDIT_PERSON_SUCCESS,
-                Messages.format(editedPerson));
+        String expectedMessage = String.format(EditCustomerCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson));
 
         Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
         expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
@@ -181,8 +176,8 @@ public void toStringMethod() {
         Index index = Index.fromOneBased(1);
         EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
         EditCustomerCommand editCustomerCommand = new EditCustomerCommand(index, editPersonDescriptor);
-        String expected = EditCustomerCommand.class.getCanonicalName() + "{index=" + index
-                + ", editPersonDescriptor=" + editPersonDescriptor + "}";
+        String expected = EditCustomerCommand.class.getCanonicalName() + "{index=" + index + ", editPersonDescriptor="
+                + editPersonDescriptor + "}";
         assertEquals(expected, editCustomerCommand.toString());
     }
 

diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
@@ -4,7 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_CUSTOMER_ID;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
 
@@ -58,7 +57,6 @@ public void parseCommand_edit() throws Exception {
         Person person = new PersonBuilder().build();
         EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(person).build();
         EditCustomerCommand command = (EditCustomerCommand) parser.parseCommand(EditCustomerCommand.COMMAND_WORD + " "
-                + PREFIX_CUSTOMER_ID
                 + INDEX_FIRST_PERSON.getOneBased() + " " + PersonUtil.getEditPersonDescriptorDetails(descriptor));
         assertEquals(new EditCustomerCommand(INDEX_FIRST_PERSON, descriptor), command);
     }