Merge pull request #74 from januschung/mock-bean-fix

replace MockBean to MockitoBean

Author: januschung

README.md

@@ -85,7 +85,7 @@ Job Winner has two components
 This is the backend for Job Winner and here is the stack:
 
 1. Java 17
-1. Spring Boot 3.4.0
+1. Spring Boot 3.4.5
 1. Spring Reactive
 1. GraphQL
 1. Postgres DB

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.2</version>
+		<version>3.4.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.tnite</groupId>

src/test/java/com/tnite/jobwinner/controller/FrequentUrlGraphQlTest.java

@@ -9,10 +9,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureGraphQlTester;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.graphql.test.tester.GraphQlTester;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -36,7 +36,7 @@ public class FrequentUrlGraphQlTest {
     @Autowired
     private GraphQlTester graphQlTester;
 
-    @MockBean
+    @MockitoBean
     FrequentUrlRepository frequentUrlRepository;
 
     private FrequentUrl frequentUrl1;

src/test/java/com/tnite/jobwinner/controller/InterviewGraphQlTest.java

@@ -10,10 +10,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureGraphQlTester;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.graphql.test.tester.GraphQlTester;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -35,10 +35,10 @@ public class InterviewGraphQlTest {
     @Autowired
     private GraphQlTester graphQlTester;
 
-    @MockBean
+    @MockitoBean
     InterviewRepository interviewRepository;
 
-    @MockBean
+    @MockitoBean
     JobApplicationRepository jobApplicationRepository;
 
     private Interview interview1;
@@ -86,9 +86,9 @@ void testAllInterview() {
             .entityList(Interview.class)
             .hasSize(3)
             .satisfies(offers -> {
-                assertEquals(offers.get(0).getJobApplication().getCompanyName(), "Company A");
-                assertEquals(offers.get(1).getJobApplication().getCompanyName(), "Company A");
-                assertEquals(offers.get(2).getJobApplication().getCompanyName(), "Company B");
+                assertEquals("Company A", offers.get(0).getJobApplication().getCompanyName());
+                assertEquals("Company A", offers.get(1).getJobApplication().getCompanyName());
+                assertEquals("Company B", offers.get(2).getJobApplication().getCompanyName());
             });
 
         verify(interviewRepository, times(1)).findAll();
@@ -175,7 +175,7 @@ void testAllInterviewByJobApplicationId() {
     @Test
     void testAllInterviewByJobApplicationIdWhenOnlyOneMatches() {
         when(interviewRepository.findAllByJobApplicationId(2)).thenReturn(Flux.just(interview3));
-        when(jobApplicationRepository.findById(1)).thenReturn(Mono.just(jobApplication2));
+        when(jobApplicationRepository.findById(2)).thenReturn(Mono.just(jobApplication2));
 
         String document = """
         query {

src/test/java/com/tnite/jobwinner/controller/JobApplicationGraphQlTest.java

@@ -9,10 +9,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureGraphQlTester;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.graphql.test.tester.GraphQlTester;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -38,7 +38,7 @@ public class JobApplicationGraphQlTest {
     @Autowired
     private GraphQlTester graphQlTester;
 
-    @MockBean
+    @MockitoBean
     JobApplicationRepository jobApplicationRepository;
 
     private JobApplication jobApplication1;

src/test/java/com/tnite/jobwinner/controller/OfferGraphQlTest.java

@@ -7,16 +7,13 @@
 import com.tnite.jobwinner.repo.OfferRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureGraphQlTester;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.graphql.test.tester.GraphQlTester;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -38,10 +35,10 @@ public class OfferGraphQlTest {
     @Autowired
     private GraphQlTester graphQlTester;
 
-    @MockBean
+    @MockitoBean
     OfferRepository offerRepository;
 
-    @MockBean
+    @MockitoBean
     JobApplicationRepository jobApplicationRepository;
 
     private Offer offer1;

src/test/java/com/tnite/jobwinner/controller/ProfileGraphQlTest.java

@@ -10,10 +10,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureGraphQlTester;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.graphql.test.tester.GraphQlTester;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import reactor.core.publisher.Mono;
 
 import static org.mockito.Mockito.*;
@@ -31,7 +31,7 @@ public class ProfileGraphQlTest {
     @Autowired
     private GraphQlTester graphQlTester;
 
-    @MockBean
+    @MockitoBean
     ProfileRepository profileRepository;
 
     private Profile profile;

src/test/java/com/tnite/jobwinner/controller/QuestionGraphQlTest.java

@@ -9,10 +9,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureGraphQlTester;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.graphql.test.tester.GraphQlTester;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -36,7 +36,7 @@ public class QuestionGraphQlTest {
     @Autowired
     private GraphQlTester graphQlTester;
 
-    @MockBean
+    @MockitoBean
     QuestionRepository questionRepository;
 
     private Question question1;