#434 - Replace deprecated MockBeans

- replace @MockBean with @MockitoBean

src/test/java/de/numcodex/feasibility_gui_backend/dse/v4/DseRestControllerIT.java

@@ -12,9 +12,9 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 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.security.test.context.support.WithMockUser;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -43,10 +43,10 @@ class DseRestControllerIT {
   @Autowired
   private ObjectMapper jsonUtil;
 
-  @MockBean
+  @MockitoBean
   private DseService dseService;
 
-  @MockBean
+  @MockitoBean
   private RateLimitingInterceptor rateLimitingInterceptor;
 
   @Test

src/test/java/de/numcodex/feasibility_gui_backend/query/QueryHandlerServiceIT.java

@@ -34,9 +34,9 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static de.numcodex.feasibility_gui_backend.query.QueryHandlerService.ResultDetail.DETAILED;
@@ -101,7 +101,7 @@ public class QueryHandlerServiceIT {
     @Autowired
     private QueryHashCalculator queryHashCalculator;
 
-    @MockBean
+    @MockitoBean
     private StructuredQueryValidation structuredQueryValidation;
 
     @Autowired

src/test/java/de/numcodex/feasibility_gui_backend/query/ratelimiting/RateLimitingInterceptorIT.java

@@ -33,9 +33,9 @@
 import org.junit.jupiter.params.provider.EnumSource;
 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.security.core.Authentication;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -61,16 +61,16 @@ public class RateLimitingInterceptorIT {
   @Autowired
   private MockMvc mockMvc;
 
-  @MockBean
+  @MockitoBean
   private QueryHandlerService queryHandlerService;
 
-  @MockBean
+  @MockitoBean
   private StructuredQueryValidation structuredQueryValidation;
 
-  @MockBean
+  @MockitoBean
   AuthenticationHelper authenticationHelper;
 
-  @MockBean
+  @MockitoBean
   private UserBlacklistRepository userBlacklistRepository;
 
   @BeforeEach

src/test/java/de/numcodex/feasibility_gui_backend/query/v4/QueryHandlerRestControllerIT.java

@@ -32,12 +32,12 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 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.dao.DataIntegrityViolationException;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import reactor.core.publisher.Mono;
@@ -77,19 +77,19 @@ public class QueryHandlerRestControllerIT {
     @Autowired
     private ObjectMapper jsonUtil;
 
-    @MockBean
+    @MockitoBean
     private QueryHandlerService queryHandlerService;
 
-    @MockBean
+    @MockitoBean
     private StructuredQueryValidation structuredQueryValidation;
 
-    @MockBean
+    @MockitoBean
     private RateLimitingInterceptor rateLimitingInterceptor;
 
-    @MockBean
+    @MockitoBean
     private UserBlacklistRepository userBlacklistRepository;
 
-    @MockBean
+    @MockitoBean
     private AuthenticationHelper authenticationHelper;
 
     @Value("${app.privacy.quota.soft.create.amount}")

src/test/java/de/numcodex/feasibility_gui_backend/query/v4/QueryTemplateHandlerRestControllerIT.java

@@ -22,10 +22,10 @@
 import org.junit.jupiter.params.provider.ValueSource;
 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.dao.DataIntegrityViolationException;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -63,13 +63,13 @@ public class QueryTemplateHandlerRestControllerIT {
     @Autowired
     private ObjectMapper jsonUtil;
 
-    @MockBean
+    @MockitoBean
     private QueryHandlerService queryHandlerService;
 
-    @MockBean
+    @MockitoBean
     private StructuredQueryValidation structuredQueryValidation;
 
-    @MockBean
+    @MockitoBean
     private AuthenticationHelper authenticationHelper;
 
     @Test

src/test/java/de/numcodex/feasibility_gui_backend/terminology/es/TerminologyEsServiceIT.java

@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import static java.lang.Thread.sleep;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -61,7 +62,7 @@ public class TerminologyEsServiceIT {
       .waitingFor(Wait.forHttp("/health").forStatusCodeMatching(c -> c >= 200 && c <= 500));
 
   @BeforeAll
-  static void setUp() throws IOException {
+  static void setUp() throws IOException, InterruptedException {
     ELASTICSEARCH_CONTAINER.start();
     System.out.println(ELASTICSEARCH_CONTAINER.getHttpHostAddress());
     WebClient webClient = WebClient.builder().baseUrl("http://" + ELASTICSEARCH_CONTAINER.getHttpHostAddress()).build();
@@ -78,6 +79,10 @@ static void setUp() throws IOException {
         .retrieve()
         .toBodilessEntity()
         .block();
+
+    // There may be a timing issue when there is no short sleep here, leading to tests failing because the data is not fully loaded
+    // Although the commands to upload the data are blocking
+    sleep(1000);
   }
 
   @AfterAll

src/test/java/de/numcodex/feasibility_gui_backend/terminology/v4/CodeableConceptRestControllerIT.java

@@ -14,10 +14,10 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 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.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -47,10 +47,10 @@ class CodeableConceptRestControllerIT {
   @Autowired
   private ObjectMapper jsonUtil;
 
-  @MockBean
+  @MockitoBean
   private CodeableConceptService codeableConceptService;
 
-  @MockBean
+  @MockitoBean
   private RateLimitingInterceptor rateLimitingInterceptor;
 
   @Test

src/test/java/de/numcodex/feasibility_gui_backend/terminology/v4/TerminologyRestControllerIT.java

@@ -17,10 +17,10 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 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.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -53,16 +53,16 @@ public class TerminologyRestControllerIT {
     @Autowired
     private ObjectMapper jsonUtil;
 
-    @MockBean
+    @MockitoBean
     private StructuredQueryValidation structuredQueryValidation;
 
-    @MockBean
+    @MockitoBean
     private TerminologyService terminologyService;
 
-    @MockBean
+    @MockitoBean
     private TerminologyEsService terminologyEsService;
 
-    @MockBean
+    @MockitoBean
     private RateLimitingInterceptor rateLimitingInterceptor;
 
     @Test