Cleanup IllogicalMessage

Author: chiaramapellimt

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

@@ -7,7 +7,6 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -31,14 +30,11 @@
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.FileCopyUtils;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import lombok.SneakyThrows;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.common.service.XPathService;
 import uk.nhs.adaptors.gp2gp.common.task.TaskDispatcher;
 import uk.nhs.adaptors.gp2gp.ehr.model.EhrExtractStatus;
-import uk.nhs.adaptors.gp2gp.mhs.InboundMessage;
 import uk.nhs.adaptors.gp2gp.mhs.InboundMessageHandler;
 import uk.nhs.adaptors.gp2gp.testcontainers.ActiveMQExtension;
 import uk.nhs.adaptors.gp2gp.testcontainers.MongoDBExtension;
@@ -48,15 +44,8 @@
 @SpringBootTest
 @DirtiesContext
 public class IllogicalMessageComponentTest {
-    private static final String CONTINUE_REQUEST = "COPC_IN000001UK01";
-    private static final String ACKNOWLEDGMENT_REQUEST = "MCCI_IN010000UK13";
-    private static final String NON_EXISTING_CONVERSATION_ID = "d3746650-096e-414b-92a4-146ceaf74f0e";
     private static final XPathService SERVICE = new XPathService();
 
-    @Mock
-    private XPathService xPathService;
-    @Mock
-    private ObjectMapper objectMapper;
     @Mock
     private TaskDispatcher taskDispatcher;
     @InjectMocks
@@ -67,28 +56,18 @@ public class IllogicalMessageComponentTest {
     private RandomIdGeneratorService randomIdGeneratorService;
     @Mock
     private Message message;
-    @Mock
-    private InboundMessage inboundMessage;
 
-    @Value("classpath:illogicalmessage/RCMR_IN010000UK05_ebxml.txt")
-    private Resource requestResponseEbxml;
-    @Value("classpath:illogicalmessage/RCMR_IN010000UK05_payload.txt")
-    private Resource requestResponsePayload;
     @Value("classpath:illogicalmessage/COPC_IN000001UK01_ebxml.txt")
     private Resource continueResponseEbxml;
-    @Value("classpath:illogicalmessage/COPC_IN000001UK01_payload.txt")
-    private Resource continueResponsePayload;
     @Value("classpath:illogicalmessage/MCCI_IN010000UK13_ebxml.txt")
     private Resource acknowledgementResponseEbxml;
-    @Value("classpath:illogicalmessage/MCCI_IN010000UK13_payload.txt")
-    private Resource acknowledgementResponsePayload;
+
 
     @Test
     public void When_ContinueReceivedToNonExistingEhrExtractStatus_Expect_ErrorThrown() {
-        String continuePayload = asString(continueResponsePayload);
         String continueEbxml = asString(continueResponseEbxml);
 
-        mockIncomingMessage(continueEbxml, continuePayload, CONTINUE_REQUEST, NON_EXISTING_CONVERSATION_ID);
+        mockIncomingMessage(continueEbxml);
 
         assertFalse(inboundMessageHandler.handle(message));
 
@@ -97,10 +76,9 @@ public void When_ContinueReceivedToNonExistingEhrExtractStatus_Expect_ErrorThrow
 
     @Test
     public void When_AcknowledgementReceivedToNonExistingEhrExtractStatus_Expect_ErrorThrown() {
-        String acknowledgementPayload = asString(acknowledgementResponsePayload);
         String acknowledgementEbxml = asString(acknowledgementResponseEbxml);
 
-        mockAcknowledgementMessage(acknowledgementEbxml, acknowledgementPayload, ACKNOWLEDGMENT_REQUEST, NON_EXISTING_CONVERSATION_ID);
+        mockAcknowledgementMessage(acknowledgementEbxml);
 
         assertFalse(inboundMessageHandler.handle(message));
 
@@ -112,10 +90,9 @@ public void When_ContinueReceivedOutOfOrderExtractCoreNotSent_Expect_ErrorThrown
         var ehrExtractStatus = EhrExtractStatusTestUtils.prepareEhrExtractStatus(randomIdGeneratorService.createNewId());
         ehrExtractStatusRepository.save(ehrExtractStatus);
 
-        String continuePayload = asString(continueResponsePayload);
         String continueEbxml = asString(continueResponseEbxml);
 
-        mockIncomingMessage(continueEbxml, continuePayload, CONTINUE_REQUEST, ehrExtractStatus.getConversationId());
+        mockIncomingMessage(continueEbxml);
 
         assertFalse(inboundMessageHandler.handle(message));
 
@@ -127,11 +104,9 @@ public void When_AcknowledgementReceivedOutOfOrderAcknowledgmentNotSent_Expect_E
         var ehrExtractStatus = EhrExtractStatusTestUtils.prepareEhrExtractStatus(randomIdGeneratorService.createNewId());
         ehrExtractStatusRepository.save(ehrExtractStatus);
 
-        String acknowledgementPayload = asString(acknowledgementResponsePayload);
         String acknowledgementEbxml = asString(acknowledgementResponseEbxml);
 
-        mockAcknowledgementMessage(acknowledgementEbxml, acknowledgementPayload, ACKNOWLEDGMENT_REQUEST,
-            ehrExtractStatus.getConversationId());
+        mockAcknowledgementMessage(acknowledgementEbxml);
 
         assertFalse(inboundMessageHandler.handle(message));
 
@@ -163,10 +138,9 @@ public void When_DuplicateContinueReceived_Expect_SkippedNoDatabaseUpdated() {
         ehrExtractStatus.setEhrContinue(EhrExtractStatus.EhrContinue.builder().build());
         ehrExtractStatusRepository.save(ehrExtractStatus);
 
-        String continuePayload = asString(continueResponsePayload);
         String continueEbxml = asString(continueResponseEbxml);
 
-        mockIncomingMessage(continueEbxml, continuePayload, CONTINUE_REQUEST, ehrExtractStatus.getConversationId());
+        mockIncomingMessage(continueEbxml);
 
         inboundMessageHandler.handle(message);
         var firstEhrStatus = ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).get();
@@ -184,11 +158,9 @@ public void When_DuplicateAcknowledgementSentTwice_Expect_SkippedNoDatabaseUpdat
         ehrExtractStatus.setEhrReceivedAcknowledgement(EhrExtractStatus.EhrReceivedAcknowledgement.builder().build());
         ehrExtractStatusRepository.save(ehrExtractStatus);
 
-        String acknowledgementPayload = asString(acknowledgementResponsePayload);
         String acknowledgementEbxml = asString(acknowledgementResponseEbxml);
 
-        mockAcknowledgementMessage(acknowledgementEbxml, acknowledgementPayload, ACKNOWLEDGMENT_REQUEST,
-            ehrExtractStatus.getConversationId());
+        mockAcknowledgementMessage(acknowledgementEbxml);
 
         inboundMessageHandler.handle(message);
         var firstEhrStatus = ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).get();
@@ -216,12 +188,12 @@ private static String asString(Resource resource) {
     }
 
     @SneakyThrows
-    private void mockIncomingMessage(String ebxml, String payload, String interactionId, String conversationId) {
+    private void mockIncomingMessage(String ebxml) {
         SERVICE.parseDocumentFromXml(ebxml);
     }
 
     @SneakyThrows
-    private void mockAcknowledgementMessage(String ebxml, String payload, String interactionId, String conversationId) {
-        mockIncomingMessage(ebxml, payload, interactionId, conversationId);
+    private void mockAcknowledgementMessage(String ebxml) {
+        mockIncomingMessage(ebxml);
     }
 }