테스트

module-api/src/test/java/com/cosmetics/goods/GoodsApiApplicationTest.java

@@ -1,7 +1,8 @@
 package com.cosmetics.goods;
 
-import com.cosmetics.domain.goods.dto.GoodsItemManagement;
-import com.cosmetics.domain.goods.dto.GoodsManagement;
+import com.cosmetics.domain.goods.dto.GoodsManagementRequest;
+import com.cosmetics.domain.goods.dto.GoodsManagementResponse;
+import com.cosmetics.domain.goods.dto.item.GoodsItemManagementRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +15,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -30,74 +30,71 @@ public class GoodsApiApplicationTest {
     @Autowired
     private TestRestTemplate testRestTemplate;
 
-    private static GoodsManagement requestGoods() {
-        //item
-        List<GoodsItemManagement> items = new ArrayList<>();
+    private static GoodsManagementRequest requestGoods() {
+        //item 왜반영이안ddddd되냐
+        List<GoodsItemManagementRequest> items = new ArrayList<>();
 
-        items.add(GoodsItemManagement.builder()
+        items.add(GoodsItemManagementRequest.builder()
                 .itemNm("건성용")
                 .itemQty(50).build());
-        items.add(GoodsItemManagement.builder()
+        items.add(GoodsItemManagementRequest.builder()
                 .itemNm("지성용")
                 .itemQty(30).build());
 
-        return GoodsManagement.builder()
+
+        return GoodsManagementRequest.builder()
                 .category("스킨케어")
                 .goodsNm("닥터스킨")
                 .marketPrice(15000)
                 .salePrice(12000)
                 .supplyPrice(10000)
-                .vendorId("lv202400002")
+                .vendorId(1L)
                 .stockQty(80)
                 .brandNm("닥터펫")
                 .saleStartDtime("2024-05-01 00:00:00")
                 .saleEndDtime("2024-08-01 00:00:00")
                 .image("https://cdn.localhost:8081/images/lv202400002/goods/image_1.png")
                 .addImage("https://cdn.localhost:8081/images/lv202400002/goods/image_2.png")
-                .item(items)
+                .items(items)
                 .build();
     }
 
     @DisplayName("상품등록")
     @Test
-    @Order(1)
-    public void 상품등록() throws Exception{
+    public void 상품등록() throws Exception {
         String url = "http://localhost:" + port + "/v1/goods";
-        GoodsManagement goodsManagement = requestGoods();
-        ResponseEntity<GoodsManagement> responseEntity = testRestTemplate.postForEntity(url, goodsManagement, GoodsManagement.class);
+        GoodsManagementRequest goodsManagementRequest = requestGoods();
+
+        ResponseEntity<GoodsManagementResponse> responseEntity = testRestTemplate.postForEntity(url, goodsManagementRequest, GoodsManagementResponse.class);
+
         assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.CREATED);
         assertNotNull(responseEntity.getBody().getGoodsNo());
         assertThat(responseEntity.getBody().getResultCode()).isEqualTo("0000");
     }
 
-    @DisplayName("상품조회")
+    @DisplayName("상품 조회")
     @Test
-    @Order(2)
-    public void 상품조회() throws Exception{
+    public void 상품조회() throws Exception {
         String url = "http://localhost:" + port + "/v1/goods/{goodsNo}";
-        ResponseEntity<GoodsManagement> responseEntity = testRestTemplate.getForEntity(url, GoodsManagement.class,"240501100001");
+        ResponseEntity<GoodsManagementResponse> responseEntity = testRestTemplate.getForEntity(url, GoodsManagementResponse.class, 1L);
         assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
         assertThat(responseEntity.getBody().getGoodsNm()).isEqualTo("닥터스킨");
     }
 
-    @DisplayName("상품삭제")
+   /* @DisplayName("상품 삭제")
     @Test
-    @Order(3)
-    public void 상품삭제() throws Exception{
-        String url =  "http://localhost:" + port + "/v1/goods/{goodsNo}";
-        ResponseEntity<Map> responseEntity = testRestTemplate.exchange(url, HttpMethod.DELETE, null, Map.class, "240501100001");
+    public void 상품_삭제(){
+        String url = "http://localhost:" + port + "/v1/goods/{goodsNo}";
+        ResponseEntity<GoodsManagementResponse> responseEntity = testRestTemplate.exchange(url, HttpMethod.DELETE, null, GoodsManagementResponse.class, 26L);
         assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
-        assertThat(responseEntity.getBody().get("resultCode")).isEqualTo("0000");
-    }
+    }*/
 
     @Test
-    @Order(4)
     @DisplayName("삭제할 상품번호가 존재하지 않습니다._ llegalArgumentExceptionHandler 테스트")
     public void illegalGoodsTest() throws Exception {
-        //통합테스트에서도 이런 테스트를 해보는게 맞는걸까? 확인필요
         String goodsNo = "존재하지않는상품번호";
-        String url =  "http://localhost:" + port + "/v1/goods/{goodsNo}";
-        ResponseEntity<GoodsManagement> responseEntity = testRestTemplate.exchange(url, HttpMethod.DELETE, null, GoodsManagement.class, goodsNo);
+        String url = "http://localhost:" + port + "/v1/goods/{goodsNo}";
+        ResponseEntity<GoodsManagementResponse> responseEntity = testRestTemplate.exchange(url, HttpMethod.DELETE, null, GoodsManagementResponse.class, goodsNo);
         assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
         assertThat(jsonPath("errorCode").value("INVALID_PARAMETER"));
         assertThat(jsonPath("errorMessage").value("존재하지 않는 상품입니다"));

module-api/src/test/java/com/cosmetics/goods/controller/GoodsControllerTest2.java

@@ -3,8 +3,8 @@
 import com.cosmetics.api.goods.controller.GoodsController;
 import com.cosmetics.domain.exception.custom.CustomException;
 import com.cosmetics.domain.exception.error.GoodsErrorManagement;
-import com.cosmetics.domain.goods.dto.GoodsItemManagement;
-import com.cosmetics.domain.goods.dto.GoodsManagement;
+import com.cosmetics.domain.goods.dto.GoodsManagementRequest;
+import com.cosmetics.domain.goods.dto.item.GoodsItemManagementRequest;
 import com.cosmetics.domain.goods.service.GoodsService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -21,14 +21,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
  * 컨트롤러 단위 테스트
+ * 들어가면 안되는 필드가 들어갔는지는 어떻게 테스트 할 수 있을까요?
  */
 @WebMvcTest(GoodsController.class)
 @Slf4j
@@ -44,7 +49,7 @@ public class GoodsControllerTest2 {
     @DisplayName("상품등록 파라미터가 누락되었을 경우_validation handler_MethodArgumentNotValidException 테스트")
     public void validGoodsTest() throws Exception {
         //given
-        GoodsManagement goodsManagement = requestValidGoods();
+        GoodsManagementRequest goodsManagement = requestValidGoods();
 
         //when
         ResultActions resultActions = mockMvc.perform(
@@ -56,33 +61,33 @@ public void validGoodsTest() throws Exception {
         //then
         resultActions.andExpect(jsonPath("errorCode").value("INVALID_PARAMETER"));
         resultActions.andExpect(jsonPath("errorMessage").value("유효하지 않는 값입니다"));
-        resultActions.andExpect(jsonPath("$.fieldErrorList[0].field").value("goodsNm"));
+        resultActions.andExpect(jsonPath("$.fieldErrorList[0].field").value(anyOf(is("items[0].itemNm"), is("goodsNm"))));
         resultActions.andExpect(jsonPath("$.fieldErrorList[0].message").value("must not be blank"));
-        resultActions.andExpect(jsonPath("$.fieldErrorList[1].field").value("item[0].itemNm"));
+        resultActions.andExpect(jsonPath("$.fieldErrorList[1].field").value(anyOf(is("items[0].itemNm"), is("goodsNm"))));
         resultActions.andExpect(jsonPath("$.fieldErrorList[1].message").value("must not be blank"));
     }
 
     @Test
     @DisplayName("상품등록 시 내부오류로 상품등록이 실패했을 경우_커스텀 예외_CustomExceptionHandler 테스트")
     public void saveGoodsFailErrorTest() throws Exception {
-        GoodsManagement goodsManagement = requestGoods();
+        GoodsManagementRequest goodsManagement = requestGoods();
 
-        given(goodsService.save(goodsManagement)).willThrow(new CustomException(GoodsErrorManagement.GOODS_SAVE_ERROR));
+        given(goodsService.save(any())).willThrow(new CustomException(GoodsErrorManagement.GOODS_SAVE_ERROR));
 
         //when
         ResultActions resultActions = mockMvc.perform(
                 post("http://localhost:8080/v1/goods")
                         .contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(goodsManagement)));
         resultActions.andDo(print()).andExpect(jsonPath("errorCode").value("GOODS_SAVE_ERROR"));
+        resultActions.andExpect(jsonPath("errorMessage").value("상품 등록에 실패하였습니다  잠시 후에 시도해 주세요"));
 
-        //확인필요 실패 illegalGoodsTest는 되는데 왜 이거는 안되는지 도저히 모르겠습니다
     }
 
     @Test
     @DisplayName("삭제할 상품번호가 존재하지 않습니다_IllegalArgumentExceptionHandler 테스트 ")
     public void illegalGoodsTest() throws Exception {
-        String goodsNo = "2024050100001";
-        given(goodsService.deleteGoods(goodsNo)).willThrow(new IllegalArgumentException("존재하지 않는 상품입니다"));
+        Long goodsNo = 1L;
+        given(goodsService.deleteByGoodsNo(goodsNo)).willThrow(new IllegalArgumentException("존재하지 않는 상품입니다"));
 
         mockMvc.perform(MockMvcRequestBuilders.delete("http://localhost:8080/v1/goods/{goodsNo}", goodsNo))
                 .andDo(print())
@@ -91,59 +96,59 @@ public void illegalGoodsTest() throws Exception {
                 .andExpect(jsonPath("errorMessage").value("존재하지 않는 상품입니다"));
     }
 
-    private static GoodsManagement requestGoods() {
+    private static GoodsManagementRequest requestGoods() {
         //item
-        List<GoodsItemManagement> items = new ArrayList<>();
+        List<GoodsItemManagementRequest> items = new ArrayList<>();
 
-        items.add(GoodsItemManagement.builder()
+        items.add(GoodsItemManagementRequest.builder()
                 .itemNm("건성용")
                 .itemQty(50).build());
-        items.add(GoodsItemManagement.builder()
+        items.add(GoodsItemManagementRequest.builder()
                 .itemNm("지성용")
                 .itemQty(30).build());
 
-        return GoodsManagement.builder()
+        return GoodsManagementRequest.builder()
                 .category("스킨케어")
                 .goodsNm("닥터스킨")
                 .marketPrice(15000)
                 .salePrice(12000)
                 .supplyPrice(10000)
-                .vendorId("lv202400002")
+                .vendorId(1L)
                 .stockQty(80)
                 .brandNm("닥터펫")
                 .saleStartDtime("2024-05-01 00:00:00")
                 .saleEndDtime("2024-08-01 00:00:00")
                 .image("https://cdn.localhost:8081/images/lv202400002/goods/image_1.png")
                 .addImage("https://cdn.localhost:8081/images/lv202400002/goods/image_2.png")
-                .item(items)
+                .items(items)
                 .build();
     }
 
-    private static GoodsManagement requestValidGoods() {
+    private static GoodsManagementRequest requestValidGoods() {
         //item
-        List<GoodsItemManagement> items = new ArrayList<>();
+        List<GoodsItemManagementRequest> items = new ArrayList<>();
 
-        items.add(GoodsItemManagement.builder()
+        items.add(GoodsItemManagementRequest.builder()
                 //.itemNm("건성용")
                 .itemQty(50).build());
-        items.add(GoodsItemManagement.builder()
+        items.add(GoodsItemManagementRequest.builder()
                 .itemNm("지성용")
                 .itemQty(30).build());
 
-        return GoodsManagement.builder()
+        return GoodsManagementRequest.builder()
                 .category("스킨케어")
                 //.goodsNm("닥터스킨")
                 .marketPrice(15000)
                 .salePrice(12000)
                 .supplyPrice(10000)
-                .vendorId("lv202400002")
+                .vendorId(1L)
                 .stockQty(80)
                 .brandNm("닥터펫")
                 .saleStartDtime("2024-05-01 00:00:00")
                 .saleEndDtime("2024-08-01 00:00:00")
                 .image("https://cdn.localhost:8081/images/lv202400002/goods/image_1.png")
                 .addImage("https://cdn.localhost:8081/images/lv202400002/goods/image_2.png")
-                .item(items)
+                .items(items)
                 .build();
     }