remove declaration of method already implemented with different name

close #17
FrancescoScandiffio · Jan 23, 2022 · f1188fa · f1188fa
1 parent 313c3ba
commit f1188fa
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/...o.shop-totem/src/main/java/com/github/raffaelliscandiffio/controller/TotemController.java b/...o.shop-totem/src/main/java/com/github/raffaelliscandiffio/controller/TotemController.java
@@ -104,7 +104,7 @@ public void cancelShopping() {
 		List<OrderItem> items = order.getItems();
 		if (!items.isEmpty()) {
 			order.clear();
-			totemView.clearOrderList();
+			totemView.allItemsRemoved();
 			for (OrderItem item : items) {
 				broker.returnProduct(item.getProduct().getId(), item.getQuantity());
 			}
@@ -120,7 +120,7 @@ public void confirmOrder() {
 
 		orderRepository.save(order);
 		totemView.showGoodbye();
-		totemView.clearOrderList();
+		totemView.allItemsRemoved();
 		order = null;
 	}
 

diff --git a/...lliscandiffio.shop-totem/src/main/java/com/github/raffaelliscandiffio/view/TotemView.java b/...lliscandiffio.shop-totem/src/main/java/com/github/raffaelliscandiffio/view/TotemView.java
@@ -11,8 +11,6 @@ public interface TotemView {
 
 	void showAllProducts(List<Product> allProducts);
 
-	void allItemsRemoved();
-
 	void showWelcome();
 
 	void itemAdded(OrderItem item);
@@ -31,7 +29,7 @@ public interface TotemView {
 
 	void showErrorMessage(String msg);
 
-	void clearOrderList();
+	void allItemsRemoved();
 
 	void showGoodbye();
 

diff --git a/...io.shop-totem/src/main/java/com/github/raffaelliscandiffio/view/swing/TotemSwingView.java b/...io.shop-totem/src/main/java/com/github/raffaelliscandiffio/view/swing/TotemSwingView.java
@@ -174,15 +174,9 @@ public void itemAdded(OrderItem newItem) {
 		getCartPane().getListOrderItemsModel().addElement(newItem);
 	}
 
-	@Override
-	public void clearOrderList() {
-		getCartPane().getListOrderItemsModel().clear();
-	}
-
 	@Override
 	public void allItemsRemoved() {
-		// TODO Auto-generated method stub
-
+		getCartPane().getListOrderItemsModel().clear();
 	}
 
 	@Override

diff --git a/...op-totem/src/test/java/com/github/raffaelliscandiffio/controller/TotemControllerTest.java b/...op-totem/src/test/java/com/github/raffaelliscandiffio/controller/TotemControllerTest.java
@@ -318,7 +318,7 @@ void testCancelShoppingWhenOneItemIsPresent() {
 			totemController.cancelShopping();
 			verify(order).clear();
 			verify(broker).returnProduct(product.getId(), QUANTITY);
-			verify(totemView).clearOrderList();
+			verify(totemView).allItemsRemoved();
 			verify(totemView).showWelcome();
 
 		}
@@ -337,7 +337,7 @@ void testCancelShoppingWhenSeveralItemArePresent() {
 			verify(order).clear();
 			verify(broker).returnProduct(product.getId(), QUANTITY);
 			verify(broker).returnProduct(product_2.getId(), QUANTITY);
-			verify(totemView).clearOrderList();
+			verify(totemView).allItemsRemoved();
 			verify(totemView).showWelcome();
 		}
 
@@ -358,7 +358,7 @@ void testConfirmOrderWhenOrderIsNotEmpty() {
 			InOrder inOrder = inOrder(totemView, orderRepository);
 			inOrder.verify(orderRepository).save(order);
 			inOrder.verify(totemView).showGoodbye();
-			inOrder.verify(totemView).clearOrderList();
+			inOrder.verify(totemView).allItemsRemoved();
 			assertThat(totemController.getOrder()).isNull();
 		}
 

diff --git a/...hop-totem/src/test/java/com/github/raffaelliscandiffio/view/swing/TotemSwingViewTest.java b/...hop-totem/src/test/java/com/github/raffaelliscandiffio/view/swing/TotemSwingViewTest.java
@@ -456,13 +456,13 @@ void testItemModifiedShouldUpdateTheOldOrderItemWithTheNewOneInCartList() {
 
 		@Test
 		@GUITest
-		@DisplayName("Method 'clearOrderList' should remove all items from the cart list")
-		void testClearOrderListShouldClearTheCartList() {
+		@DisplayName("Method 'allItemsRemoved' should remove all items from the cart list")
+		void testAllItemsRemovedShouldClearTheCartList() {
 			GuiActionRunner.execute(() -> totemSwingView.getCartPane().getListOrderItemsModel()
 					.addElement(new OrderItem(new Product(1, "Product1", 2), 5)));
 			GuiActionRunner.execute(() -> totemSwingView.getCartPane().getListOrderItemsModel()
 					.addElement(new OrderItem(new Product(1, "Product2", 3), 4)));
-			GuiActionRunner.execute(() -> totemSwingView.clearOrderList());
+			GuiActionRunner.execute(() -> totemSwingView.allItemsRemoved());
 			String[] listContents = window.list("cartList").contents();
 			assertThat(listContents).isEmpty();
 		}