feat : use @MockitoBean instead of @MockBean for service mocking (#…

…1611)
rajadilipkolli · Jan 5, 2025 · 44ac4cc · 44ac4cc
1 parent 9863ddb
commit 44ac4cc
Show file tree

Hide file tree

Showing 24 changed files with 54 additions and 54 deletions.
diff --git a/...-monkey/src/test/java/com/example/choasmonkey/web/controllers/CustomerControllerTest.java b/...-monkey/src/test/java/com/example/choasmonkey/web/controllers/CustomerControllerTest.java
@@ -27,9 +27,9 @@
 import org.junit.jupiter.api.Test;
 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.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = CustomerController.class)
@@ -38,8 +38,8 @@ class CustomerControllerTest {
 
     @Autowired private MockMvc mockMvc;
 
-    @MockBean private CustomerService customerService;
-    @MockBean private ObservationRegistry observationRegistry;
+    @MockitoBean private CustomerService customerService;
+    @MockitoBean private ObservationRegistry observationRegistry;
 
     @Autowired private ObjectMapper objectMapper;
 

diff --git a/...sample/src/test/java/com/example/opensearch/web/controllers/RestaurantControllerTest.java b/...sample/src/test/java/com/example/opensearch/web/controllers/RestaurantControllerTest.java
@@ -29,12 +29,12 @@
 import org.junit.jupiter.api.Test;
 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.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.geo.Point;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = RestaurantController.class)
@@ -43,7 +43,7 @@ class RestaurantControllerTest {
 
     @Autowired private MockMvc mockMvc;
 
-    @MockBean private RestaurantService restaurantService;
+    @MockitoBean private RestaurantService restaurantService;
 
     @Autowired private ObjectMapper objectMapper;
 

diff --git a/...st-docs-sample/src/test/java/com/example/restdocs/web/controllers/UserControllerTest.java b/...st-docs-sample/src/test/java/com/example/restdocs/web/controllers/UserControllerTest.java
@@ -38,12 +38,12 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.payload.FieldDescriptor;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = UserController.class)
@@ -53,7 +53,7 @@ class UserControllerTest {
 
     @Autowired private MockMvc mockMvc;
 
-    @MockBean private UserService userService;
+    @MockitoBean private UserService userService;
 
     @Autowired private ObjectMapper objectMapper;
 

diff --git a/...src/test/java/com/example/graphql/querydsl/web/controllers/PostCommentControllerTest.java b/...src/test/java/com/example/graphql/querydsl/web/controllers/PostCommentControllerTest.java
@@ -33,12 +33,12 @@
 import org.junit.jupiter.api.Test;
 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.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = PostCommentController.class)
@@ -48,7 +48,7 @@ class PostCommentControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private PostCommentService postCommentService;
 
     @Autowired

diff --git a/...erydsl/src/test/java/com/example/graphql/querydsl/web/controllers/PostControllerTest.java b/...erydsl/src/test/java/com/example/graphql/querydsl/web/controllers/PostControllerTest.java
@@ -37,12 +37,12 @@
 import org.junit.jupiter.api.Test;
 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.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = PostController.class)
@@ -52,7 +52,7 @@ class PostControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private PostService postService;
 
     @Autowired

diff --git a/...uerydsl/src/test/java/com/example/graphql/querydsl/web/controllers/TagControllerTest.java b/...uerydsl/src/test/java/com/example/graphql/querydsl/web/controllers/TagControllerTest.java
@@ -31,12 +31,12 @@
 import org.junit.jupiter.api.Test;
 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.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = TagController.class)
@@ -46,7 +46,7 @@ class TagControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private TagService tagService;
 
     @Autowired

diff --git a/...l-webflux/src/test/java/com/example/graphql/controller/CustomerGraphQLControllerTest.java b/...l-webflux/src/test/java/com/example/graphql/controller/CustomerGraphQLControllerTest.java
@@ -11,8 +11,8 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.graphql.GraphQlTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.graphql.test.tester.GraphQlTester;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -22,7 +22,7 @@ class CustomerGraphQLControllerTest {
     @Autowired
     private GraphQlTester graphQlTester;
 
-    @MockBean
+    @MockitoBean
     private CustomerGraphQLService customerGraphQLService;
 
     @Test

diff --git a/graphql/boot-graphql-webmvc/src/test/java/com/example/graphql/gql/AuthorEntityQueryTest.java b/graphql/boot-graphql-webmvc/src/test/java/com/example/graphql/gql/AuthorEntityQueryTest.java
@@ -19,9 +19,9 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.graphql.GraphQlTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.graphql.test.tester.GraphQlTester;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 @GraphQlTest(AuthorGraphQlController.class)
 @Import(GraphQlConfiguration.class)
@@ -30,16 +30,16 @@ class AuthorEntityQueryTest {
     @Autowired
     private GraphQlTester graphQlTester;
 
-    @MockBean
+    @MockitoBean
     AuthorService authorService;
 
-    @MockBean
+    @MockitoBean
     PostService postService;
 
-    @MockBean
+    @MockitoBean
     PostCommentService postCommentService;
 
-    @MockBean
+    @MockitoBean
     TagService tagService;
 
     @Test

diff --git a/...-webmvc/src/test/java/com/example/graphql/web/controllers/AuthorEntityControllerTest.java b/...-webmvc/src/test/java/com/example/graphql/web/controllers/AuthorEntityControllerTest.java
@@ -27,10 +27,10 @@
 import org.junit.jupiter.api.Test;
 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.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = AuthorController.class)
@@ -40,7 +40,7 @@ class AuthorEntityControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private AuthorService authorService;
 
     @Autowired

diff --git a/...vc/src/test/java/com/example/graphql/web/controllers/PostCommentEntityControllerTest.java b/...vc/src/test/java/com/example/graphql/web/controllers/PostCommentEntityControllerTest.java
@@ -28,9 +28,9 @@
 import org.junit.jupiter.api.Test;
 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.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = PostCommentController.class)
@@ -40,7 +40,7 @@ class PostCommentEntityControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private PostCommentService postCommentService;
 
     @Autowired

diff --git a/...vc/src/test/java/com/example/graphql/web/controllers/PostDetailsEntityControllerTest.java b/...vc/src/test/java/com/example/graphql/web/controllers/PostDetailsEntityControllerTest.java
@@ -21,9 +21,9 @@
 import org.junit.jupiter.api.Test;
 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.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = PostDetailsController.class)
@@ -33,7 +33,7 @@ class PostDetailsEntityControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private PostDetailsService postDetailsService;
 
     @Autowired

diff --git a/...ql-webmvc/src/test/java/com/example/graphql/web/controllers/PostEntityControllerTest.java b/...ql-webmvc/src/test/java/com/example/graphql/web/controllers/PostEntityControllerTest.java
@@ -27,10 +27,10 @@
 import org.junit.jupiter.api.Test;
 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.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = PostController.class)
@@ -40,7 +40,7 @@ class PostEntityControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private PostService postService;
 
     @Autowired

diff --git a/...hql-webmvc/src/test/java/com/example/graphql/web/controllers/TagEntityControllerTest.java b/...hql-webmvc/src/test/java/com/example/graphql/web/controllers/TagEntityControllerTest.java
@@ -26,10 +26,10 @@
 import org.junit.jupiter.api.Test;
 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.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = TagController.class)
@@ -39,7 +39,7 @@ class TagEntityControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private TagService tagService;
 
     @Autowired

diff --git a/...t-http-proxy/src/test/java/com/example/rest/proxy/web/controllers/PostControllerTest.java b/...t-http-proxy/src/test/java/com/example/rest/proxy/web/controllers/PostControllerTest.java
@@ -24,9 +24,9 @@
 import org.junit.jupiter.api.Test;
 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.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = PostController.class)
@@ -35,7 +35,7 @@ class PostControllerTest {
 
     @Autowired private MockMvc mockMvc;
 
-    @MockBean private PostService postService;
+    @MockitoBean private PostService postService;
 
     @Autowired private ObjectMapper objectMapper;
 

diff --git a/...-template/src/test/java/com/example/rest/template/web/controllers/PostControllerTest.java b/...-template/src/test/java/com/example/rest/template/web/controllers/PostControllerTest.java
@@ -26,11 +26,11 @@
 import org.junit.jupiter.api.Test;
 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.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = PostController.class)
@@ -39,7 +39,7 @@ class PostControllerTest {
 
     @Autowired private MockMvc mockMvc;
 
-    @MockBean private PostService postService;
+    @MockitoBean private PostService postService;
 
     @Autowired private ObjectMapper objectMapper;
 

diff --git a/...c/test/java/com/example/restclient/bootrestclient/web/controllers/PostControllerTest.java b/...c/test/java/com/example/restclient/bootrestclient/web/controllers/PostControllerTest.java
@@ -24,9 +24,9 @@
 import org.junit.jupiter.api.Test;
 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.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = PostController.class)
@@ -35,7 +35,7 @@ class PostControllerTest {
 
     @Autowired private MockMvc mockMvc;
 
-    @MockBean private PostService postService;
+    @MockitoBean private PostService postService;
 
     @Autowired private ObjectMapper objectMapper;
 

diff --git a/...ient-mvc/src/test/java/com/example/rest/webclient/web/controllers/PostControllerTest.java b/...ient-mvc/src/test/java/com/example/rest/webclient/web/controllers/PostControllerTest.java
@@ -24,9 +24,9 @@
 import org.junit.jupiter.api.Test;
 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.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = PostController.class)
@@ -35,7 +35,7 @@ class PostControllerTest {
 
     @Autowired private MockMvc mockMvc;
 
-    @MockBean private PostService postService;
+    @MockitoBean private PostService postService;
 
     @Autowired private ObjectMapper objectMapper;
 

diff --git a/...-webflux/src/test/java/com/example/rest/webclient/web/controllers/PostControllerTest.java b/...-webflux/src/test/java/com/example/rest/webclient/web/controllers/PostControllerTest.java
@@ -16,10 +16,10 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.http.ProblemDetail;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.reactive.function.BodyInserters;
 import reactor.core.publisher.Flux;
@@ -31,7 +31,7 @@ class PostControllerTest {
 
     @Autowired private WebTestClient webTestClient;
 
-    @MockBean private PostService postService;
+    @MockitoBean private PostService postService;
 
     @Autowired private ObjectMapper objectMapper;