Replace all usages of deprecated MockBean with MockitoBean (#1095)

Author: Adrian Clay

service/src/intTest/java/uk/nhs/adaptors/gp2gp/common/amqp/MessageQueueTest.java

@@ -14,13 +14,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.test.annotation.DirtiesContext;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import lombok.SneakyThrows;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import uk.nhs.adaptors.gp2gp.ehr.EhrExtractStatusRepository;
 import uk.nhs.adaptors.gp2gp.mhs.InboundMessage;
 import uk.nhs.adaptors.gp2gp.mhs.InboundMessageHandler;
@@ -42,7 +42,7 @@ public class MessageQueueTest {
     private ObjectMapper objectMapper;
     @Autowired
     private EhrExtractStatusRepository ehrExtractStatusRepository;
-    @MockBean // mock the message handler to prevent any forward processing by the application
+    @MockitoBean // mock the message handler to prevent any forward processing by the application
     private InboundMessageHandler inboundMessageHandler;
 
     @Test

service/src/intTest/java/uk/nhs/adaptors/gp2gp/common/task/BaseTaskTest.java

@@ -2,8 +2,8 @@
 
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -19,8 +19,8 @@ public abstract class BaseTaskTest {
     public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
     public static final FhirParseService FHIR_PARSE_SERVICE = new FhirParseService();
 
-    @MockBean
+    @MockitoBean
     protected TaskDispatcher taskDispatcher;
-    @MockBean
+    @MockitoBean
     protected TaskConsumer taskConsumer;
 }

service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/EhrContinueTest.java

@@ -4,8 +4,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.common.task.TaskDispatcher;
@@ -40,7 +40,7 @@ public class EhrContinueTest {
     private EhrExtractRequestHandler ehrExtractRequestHandler;
     @Autowired
     private EhrExtractStatusRepository ehrExtractStatusRepository;
-    @MockBean
+    @MockitoBean
     private TaskDispatcher taskDispatcher;
 
     @Test

service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/EhrExtractStatusServiceIT.java

@@ -32,9 +32,9 @@
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
 
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import uk.nhs.adaptors.gp2gp.common.service.TimestampService;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrExtractException;
 import uk.nhs.adaptors.gp2gp.ehr.model.EhrExtractStatus;
@@ -65,10 +65,10 @@ public class EhrExtractStatusServiceIT {
     @Autowired
     private EhrExtractTimeoutScheduler ehrExtractTimeoutScheduler;
 
-    @MockBean
+    @MockitoBean
     private TimestampService timestampService;
 
-    @MockBean
+    @MockitoBean
     private Logger logger;
 
     @BeforeEach

service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/SendAcknowledgementComponentTest.java

@@ -20,9 +20,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.Resource;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -55,21 +55,21 @@ public class SendAcknowledgementComponentTest {
     private static final String NEGATIVE_ACK_TYPE_CODE = "AE";
     private static final String POSITIVE_ACK_TYPE_CODE = "AA";
 
-    @MockBean
+    @MockitoBean
     private WebClient.RequestHeadersSpec<?> request;
-    @MockBean
+    @MockitoBean
     private MhsRequestBuilder mhsRequestBuilder;
-    @MockBean
+    @MockitoBean
     private MhsClient mhsClient;
-    @MockBean
+    @MockitoBean
     private SendAcknowledgementTaskDefinition sendAcknowledgementTaskDefinition;
     @Autowired
     private SendAcknowledgementExecutor sendAcknowledgementExecutor;
     @Autowired
     private EhrExtractStatusRepository ehrExtractStatusRepository;
-    @MockBean
+    @MockitoBean
     private TimestampService timestampService;
-    @MockBean
+    @MockitoBean
     private RandomIdGeneratorService randomIdGeneratorService;
 
     @Value("classpath:ehr/expected-nack-message.json")

service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/SendDocumentComponentTest.java

@@ -19,8 +19,8 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -42,7 +42,7 @@ public class SendDocumentComponentTest {
     private static final String DOCUMENT_NAME = "some-conversation-id/document-name.json";
     public static final String OUTBOUND_MESSAGE_JSON = "src/intTest/resources/outboundMessage.json";
 
-    @MockBean
+    @MockitoBean
     private MhsClient mhsClient;
 
     @Autowired

service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/SendEhrExtractCoreComponentTest.java

@@ -30,8 +30,8 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -80,30 +80,30 @@ public class SendEhrExtractCoreComponentTest extends BaseTaskTest {
     public static final Instant NOW = Instant.parse("2024-01-01T10:00:00Z");
     public static final String COMPRESSED_LARGE_PAYLOAD = "H4sIAAAAAAAA/wtydfTxiVQIglBOnocWAwA3VEfTEgAAAA==";
 
-    @MockBean
+    @MockitoBean
     private EhrDocumentMapper ehrDocumentMapper;
 
-    @MockBean
+    @MockitoBean
     private TimestampService timestampService;
 
-    @MockBean
+    @MockitoBean
     private RandomIdGeneratorService randomIdGeneratorService;
 
     @Mock
     private StorageDataWrapper storageDataWrapper;
 
-    @MockBean
+    @MockitoBean
     private WebClient.RequestHeadersSpec<?> request;
 
-    @MockBean
+    @MockitoBean
     private MhsRequestBuilder mhsRequestBuilder;
 
-    @MockBean
+    @MockitoBean
     private MhsClient mhsClient;
 
     private SendEhrExtractCoreTaskDefinition sendEhrExtractCoreTaskDefinition;
 
-    @MockBean
+    @MockitoBean
     private StorageConnectorService storageConnectorService;
 
     @Autowired
@@ -113,13 +113,13 @@ public class SendEhrExtractCoreComponentTest extends BaseTaskTest {
     private EhrExtractStatusRepository ehrExtractStatusRepository;
     private EhrExtractStatus ehrExtractStatus;
 
-    @MockBean
+    @MockitoBean
     private SendAcknowledgementTaskDispatcher sendAcknowledgementTaskDispatcher;
 
-    @MockBean
+    @MockitoBean
     private StructuredRecordMappingService structuredRecordMappingService;
 
-    @MockBean
+    @MockitoBean
     private Gp2gpConfiguration gp2gpConfiguration;
 
     @Test

service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/TaskHandlingTest.java

@@ -25,8 +25,8 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -61,7 +61,7 @@ public class TaskHandlingTest {
     private EhrExtractStatusService ehrExtractStatusService;
     @MockitoSpyBean
     private TaskExecutorFactory taskExecutorFactory;
-    @MockBean
+    @MockitoBean
     private TaskDispatcher taskDispatcher;
     @Mock
     private Message message;

service/src/intTest/java/uk/nhs/adaptors/gp2gp/gpc/GetGpcDocumentComponentTest.java

@@ -21,8 +21,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
@@ -61,7 +61,7 @@ public class GetGpcDocumentComponentTest extends BaseTaskTest {
     @MockitoSpyBean
     private StorageConnectorService storageConnectorService;
 
-    @MockBean
+    @MockitoBean
     private DetectTranslationCompleteService detectTranslationCompleteService;
 
     @Autowired

service/src/intTest/java/uk/nhs/adaptors/gp2gp/gpc/GetGpcStructuredComponentTest.java

@@ -28,8 +28,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
@@ -79,7 +79,7 @@ public class GetGpcStructuredComponentTest extends BaseTaskTest {
     @MockitoSpyBean
     private StorageConnectorService storageConnectorService;
 
-    @MockBean
+    @MockitoBean
     private DetectTranslationCompleteService detectTranslationCompleteService;
 
     private final ObjectMapper objectMapper = new ObjectMapper();