Replace deprecated SpyBean with MockitoSpyBean

Author: adrianclay

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

@@ -24,10 +24,10 @@
 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.SpyBean;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -79,9 +79,9 @@ public class AmqpServiceFailureTest {
     private JmsTemplate inboundJmsTemplate;
     @Autowired
     private ProcessDetectionService processDetectionService;
-    @SpyBean
+    @MockitoSpyBean
     private ProcessFailureHandlingService processFailureHandlingService;
-    @SpyBean
+    @MockitoSpyBean
     private SendEhrExtractCoreTaskExecutor sendEhrExtractCoreTaskExecutor;
     private String conversationId;
 

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

@@ -26,8 +26,8 @@
 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.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -51,15 +51,15 @@ public class TaskHandlingTest {
     private static final String TASK_TYPE_HEADER_NAME = "TaskType";
     private static final String NACK_TYPE_CODE = "AE";
 
-    @SpyBean
+    @MockitoSpyBean
     private ObjectMapper objectMapper;
     @Autowired
     private TaskConsumer taskConsumer;
     @Autowired
     private EhrExtractStatusRepository ehrExtractStatusRepository;
-    @SpyBean
+    @MockitoSpyBean
     private EhrExtractStatusService ehrExtractStatusService;
-    @SpyBean
+    @MockitoSpyBean
     private TaskExecutorFactory taskExecutorFactory;
     @MockBean
     private TaskDispatcher taskDispatcher;

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

@@ -22,8 +22,8 @@
 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.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import uk.nhs.adaptors.gp2gp.common.storage.StorageConnector;
@@ -58,7 +58,7 @@ public class GetGpcDocumentComponentTest extends BaseTaskTest {
     @Autowired
     private StorageConnector storageConnector;
 
-    @SpyBean
+    @MockitoSpyBean
     private StorageConnectorService storageConnectorService;
 
     @MockBean

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

@@ -29,8 +29,8 @@
 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.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.annotation.DirtiesContext;
+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;
 import org.w3c.dom.Document;
@@ -73,10 +73,10 @@ public class GetGpcStructuredComponentTest extends BaseTaskTest {
     @Autowired
     private StorageConnector storageConnector;
 
-    @SpyBean
+    @MockitoSpyBean
     private MessageContext messageContext;
 
-    @SpyBean
+    @MockitoSpyBean
     private StorageConnectorService storageConnectorService;
 
     @MockBean

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

@@ -22,9 +22,9 @@
 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.SpyBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import okhttp3.mockwebserver.MockResponse;
@@ -60,9 +60,9 @@ public class GpcWebClientTest {
     private static final MockResponse STUB_NO_RESPONSE = initialiseNoResponse();
 
     private String baseUrl;
-    @SpyBean
+    @MockitoSpyBean
     private GpcConfiguration gpcConfiguration;
-    @SpyBean
+    @MockitoSpyBean
     private GpcTokenBuilder gpcTokenBuilder;
     @Autowired
     private GpcClient gpcWebClient;

service/src/intTest/java/uk/nhs/adaptors/gp2gp/mhs/MhsWebClientTest.java

@@ -21,8 +21,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.SpyBean;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import okhttp3.mockwebserver.MockResponse;
@@ -52,7 +52,7 @@ public class MhsWebClientTest {
     @Autowired
     private MhsClient mhsClient;
 
-    @SpyBean
+    @MockitoSpyBean
     private MhsConfiguration mhsConfiguration;
 
     private static Stream<Arguments> maxAttachmentsValidationErrors() {