From e7602a10b94cdb18e1d47a147627b1c3d36e8420 Mon Sep 17 00:00:00 2001 From: na0th <105775683+na0th@users.noreply.github.com> Date: Sat, 4 Jan 2025 02:09:29 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20resolve?= =?UTF-8?q?r=EB=A5=BC=20MockConfig=EB=A1=9C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/AuctionControllerTest.java | 9 ++++++--- .../auth/presentation/AuthControllerTest.java | 3 +++ .../auction/bid/BidControllerTest.java | 3 +++ .../common/config/TestMockResolverConfig.java | 17 +++++++++++++++++ .../presentation/PaymentControllerTest.java | 4 +++- .../presentation/ProductControllerTest.java | 3 +++ .../user/presentation/UserControllerTest.java | 3 +++ 7 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/tasksprints/auction/common/config/TestMockResolverConfig.java diff --git a/src/test/java/com/tasksprints/auction/auction/presentation/AuctionControllerTest.java b/src/test/java/com/tasksprints/auction/auction/presentation/AuctionControllerTest.java index c3575caa..fc91a096 100644 --- a/src/test/java/com/tasksprints/auction/auction/presentation/AuctionControllerTest.java +++ b/src/test/java/com/tasksprints/auction/auction/presentation/AuctionControllerTest.java @@ -2,6 +2,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.tasksprints.auction.BaseControllerTest; +import com.tasksprints.auction.bid.application.resolver.BidValidationResolver; +import com.tasksprints.auction.chat.application.resolver.ChatValidationResolver; +import com.tasksprints.auction.chat.application.resolver.WhisperValidationResolver; +import com.tasksprints.auction.common.config.TestMockResolverConfig; import com.tasksprints.auction.common.constant.ApiResponseMessages; import com.tasksprints.auction.auction.domain.dto.request.AuctionRequest; import com.tasksprints.auction.auction.domain.dto.response.AuctionResponse; @@ -18,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; @@ -39,6 +44,7 @@ @WebMvcTest(AuctionController.class) @MockBean(JpaMetamodelMappingContext.class) +@Import(TestMockResolverConfig.class) public class AuctionControllerTest extends BaseControllerTest { @Autowired @@ -47,9 +53,6 @@ public class AuctionControllerTest extends BaseControllerTest { @MockBean private AuctionService auctionService; - @MockBean - private BidService bidService; - @MockBean private ReviewService reviewService; diff --git a/src/test/java/com/tasksprints/auction/auth/presentation/AuthControllerTest.java b/src/test/java/com/tasksprints/auction/auth/presentation/AuthControllerTest.java index 558e334d..a0789d94 100644 --- a/src/test/java/com/tasksprints/auction/auth/presentation/AuthControllerTest.java +++ b/src/test/java/com/tasksprints/auction/auth/presentation/AuthControllerTest.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.tasksprints.auction.BaseControllerTest; import com.tasksprints.auction.auth.presentation.AuthController; +import com.tasksprints.auction.common.config.TestMockResolverConfig; import com.tasksprints.auction.common.constant.ApiResponseMessages; import com.tasksprints.auction.auth.domain.dto.request.LoginRequest; import com.tasksprints.auction.auth.domain.dto.request.LoginRequest.Login; @@ -24,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext; import org.springframework.http.MediaType; import org.springframework.http.ResponseCookie; @@ -33,6 +35,7 @@ @WebMvcTest(AuthController.class) @MockBean(JpaMetamodelMappingContext.class) +@Import(TestMockResolverConfig.class) class AuthControllerTest extends BaseControllerTest { @Autowired private MockMvc mockMvc; diff --git a/src/test/java/com/tasksprints/auction/bid/BidControllerTest.java b/src/test/java/com/tasksprints/auction/bid/BidControllerTest.java index 7da5ccaa..3cd19c88 100644 --- a/src/test/java/com/tasksprints/auction/bid/BidControllerTest.java +++ b/src/test/java/com/tasksprints/auction/bid/BidControllerTest.java @@ -5,6 +5,7 @@ import com.tasksprints.auction.bid.domain.dto.BidResponse; import com.tasksprints.auction.bid.application.service.BidService; import com.tasksprints.auction.bid.presentation.BidController; +import com.tasksprints.auction.common.config.TestMockResolverConfig; import com.tasksprints.auction.common.constant.ApiResponseMessages; import com.tasksprints.auction.chat.application.service.ChatService; import com.tasksprints.auction.user.application.service.UserService; @@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext; import org.springframework.http.MediaType; import org.springframework.messaging.simp.SimpMessageSendingOperations; @@ -29,6 +31,7 @@ @WebMvcTest(BidController.class) @MockBean(JpaMetamodelMappingContext.class) +@Import(TestMockResolverConfig.class) public class BidControllerTest extends BaseControllerTest { @Autowired diff --git a/src/test/java/com/tasksprints/auction/common/config/TestMockResolverConfig.java b/src/test/java/com/tasksprints/auction/common/config/TestMockResolverConfig.java new file mode 100644 index 00000000..43b21346 --- /dev/null +++ b/src/test/java/com/tasksprints/auction/common/config/TestMockResolverConfig.java @@ -0,0 +1,17 @@ +package com.tasksprints.auction.common.config; + +import com.tasksprints.auction.bid.application.resolver.BidValidationResolver; +import com.tasksprints.auction.chat.application.resolver.ChatValidationResolver; +import com.tasksprints.auction.chat.application.resolver.WhisperValidationResolver; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class TestMockResolverConfig { + @MockBean + public BidValidationResolver bidValidationResolver; + @MockBean + public ChatValidationResolver chatValidationResolver; + @MockBean + public WhisperValidationResolver whisperValidationResolver; +} diff --git a/src/test/java/com/tasksprints/auction/payment/presentation/PaymentControllerTest.java b/src/test/java/com/tasksprints/auction/payment/presentation/PaymentControllerTest.java index fa47274b..961fc6e2 100644 --- a/src/test/java/com/tasksprints/auction/payment/presentation/PaymentControllerTest.java +++ b/src/test/java/com/tasksprints/auction/payment/presentation/PaymentControllerTest.java @@ -1,6 +1,7 @@ package com.tasksprints.auction.payment.presentation; import com.tasksprints.auction.BaseControllerTest; +import com.tasksprints.auction.common.config.TestMockResolverConfig; import com.tasksprints.auction.common.constant.ApiResponseMessages; import com.tasksprints.auction.payment.api.Response; import com.tasksprints.auction.payment.domain.dto.response.PaymentErrorResponse; @@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext; import org.springframework.http.MediaType; import org.springframework.mock.web.MockHttpSession; @@ -32,7 +34,7 @@ @WebMvcTest(PaymentController.class) @MockBean(JpaMetamodelMappingContext.class) - +@Import(TestMockResolverConfig.class) public class PaymentControllerTest extends BaseControllerTest { @Autowired private MockMvc mockMvc; diff --git a/src/test/java/com/tasksprints/auction/product/presentation/ProductControllerTest.java b/src/test/java/com/tasksprints/auction/product/presentation/ProductControllerTest.java index fe04f2c5..4aeb0f12 100644 --- a/src/test/java/com/tasksprints/auction/product/presentation/ProductControllerTest.java +++ b/src/test/java/com/tasksprints/auction/product/presentation/ProductControllerTest.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.tasksprints.auction.BaseControllerTest; +import com.tasksprints.auction.common.config.TestMockResolverConfig; import com.tasksprints.auction.common.constant.ApiResponseMessages; import com.tasksprints.auction.product.domain.dto.request.ProductRequest; import com.tasksprints.auction.product.domain.dto.response.ProductResponse; @@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext; import org.springframework.http.MediaType; import org.springframework.mock.web.MockMultipartFile; @@ -28,6 +30,7 @@ @WebMvcTest(ProductController.class) @MockBean(JpaMetamodelMappingContext.class) +@Import(TestMockResolverConfig.class) public class ProductControllerTest extends BaseControllerTest { @Autowired diff --git a/src/test/java/com/tasksprints/auction/user/presentation/UserControllerTest.java b/src/test/java/com/tasksprints/auction/user/presentation/UserControllerTest.java index 102c944b..cacbc308 100644 --- a/src/test/java/com/tasksprints/auction/user/presentation/UserControllerTest.java +++ b/src/test/java/com/tasksprints/auction/user/presentation/UserControllerTest.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.tasksprints.auction.BaseControllerTest; +import com.tasksprints.auction.common.config.TestMockResolverConfig; import com.tasksprints.auction.common.constant.ApiResponseMessages; import com.tasksprints.auction.user.domain.dto.request.UserRequest; import com.tasksprints.auction.user.domain.dto.response.UserDetailResponse; @@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; @@ -30,6 +32,7 @@ @WebMvcTest(UserController.class) @MockBean(JpaMetamodelMappingContext.class) +@Import(TestMockResolverConfig.class) class UserControllerTest extends BaseControllerTest { @Autowired