Skip to content

Commit 173bc37

Browse files
authored
Merge pull request #384 from NaychiMin/374-edit-output-message-add-order-v2.1
Task 374, 376 Edit output message of add_order for better clarity.
2 parents fac41f1 + 44d728c commit 173bc37

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/main/java/seedu/cafectrl/ui/Ui.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public void showToUserWithSpaceBetweenLines(ArrayList<String> message) {
179179
}
180180

181181
public void showDishAvailability(int numberOfDishes){
182-
showToUser("Available Dishes: " + numberOfDishes);
182+
showToUser("Available quantity: " + numberOfDishes);
183183
}
184184

185185
public void showNeededRestock(String ingredientName, int currentQuantity, String unit, int neededIngredient) {
@@ -278,6 +278,7 @@ public void showOrderStatus(String orderStatus, String totalCost) {
278278

279279
public void showDishAvailabilityMessage() {
280280
showToUser(Messages.AVAILABLE_DISHES);
281+
showToUser(Messages.LINE_STRING);
281282
}
282283
public void showPreviousDay() {
283284
showToUser(Messages.PREVIOUS_DAY_COMMAND_MESSAGE);

src/test/java/seedu/cafectrl/command/AddOrderCommandTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ public void execute_addValidOrder_expectOneOrder() {
6363
+ "Total order cost: $5.00"
6464
+ Messages.LINE_STRING
6565
+ Messages.AVAILABLE_DISHES
66+
+ Messages.LINE_STRING
6667
+ "Dish: chicken rice"
67-
+ "Available Dishes: 8"
68+
+ "Available quantity: 8"
6869
+ Messages.LINE_STRING
6970
+ "Dish: chicken curry"
70-
+ "Available Dishes: 4";
71+
+ "Available quantity: 4";
7172

7273
String normalizedExpected = expectedOutput.toLowerCase().replaceAll("\\s+", "").trim();
7374
String normalizedActual = actualOutput.toLowerCase().replaceAll("\\s+", "").trim();

src/test/java/seedu/cafectrl/data/PantryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ void calculateDishAvailability_orderCompleteNoRestock_showMaxDish() {
115115
System.setOut(originalOut);
116116

117117
String expectedOutput = "Dish: Chicken Rice"
118-
+ "Available Dishes: 2"
118+
+ "Available quantity: 2"
119119
+ Messages.LINE_STRING
120120
+ "Dish: Chicken Chop"
121-
+ "Available Dishes: 2" ;
121+
+ "Available quantity: 2" ;
122122

123123
String normalizedExpected = expectedOutput.toLowerCase().replaceAll("\\s+", "").trim();
124124
String normalizedActual = actualOutput.toLowerCase().replaceAll("\\s+", "").trim();

0 commit comments

Comments
 (0)