From f0e1755da244c75b6817a43a36db4f926f4a026d Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Wed, 9 Sep 2026 15:58:56 +0100 Subject: [PATCH 1/2] adding more RCMR_IN030000UK07-related skeleton processing tests --- .../SkeletonProcessingServiceTests.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java index 3a2de9e50..79834e15c 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java @@ -206,6 +206,33 @@ void When_IsEntireRcmrSkeletonCalledWithNonRcmrPayload_Expect_ReturnsFalse() thr assertFalse((Boolean) method.invoke(skeletonProcessingService, "")); } + @Test + void When_IsEntireRcmrSkeletonCalledWithUk07Payload_Expect_ReturnsTrue() throws Exception { + var method = SkeletonProcessingService.class.getDeclaredMethod("isEntireRcmrSkeleton", String.class); + method.setAccessible(true); + + assertTrue((Boolean) method.invoke(skeletonProcessingService, "")); + } + + @Test + void When_SkeletonAsWholeUk07Message_Expect_InboundMessagePayloadIsNewRCMRMessage() + throws TransformerException, SAXException { + var inboundMessage = new InboundMessage(); + var attachmentLog = createSkeletonPatientAttachmentLog(); + var skeletonMessage = "" + readInboundMessagePayloadFromFile(); + + inboundMessage.setPayload(readInboundMessagePayloadFromFile()); + inboundMessage.setEbXML(readInboundMessageEbXmlFromFile()); + + when(attachmentHandlerService.getAttachment(any(), any())).thenReturn(skeletonMessage.getBytes(StandardCharsets.UTF_8)); + when(xmlParseUtilService.getStringFromDocument(any())).thenReturn(readInboundMessagePayloadFromFile()); + + var newInboundMessage = + skeletonProcessingService.updateInboundMessageWithSkeleton(attachmentLog, inboundMessage, CONVERSATION_ID); + + assertTrue(newInboundMessage.getPayload().contains(" Date: Wed, 9 Sep 2026 16:13:51 +0100 Subject: [PATCH 2/2] RCMR_IN030000UK07-related skeleton processing test fix --- .../pss/translator/service/SkeletonProcessingServiceTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java index 79834e15c..f0974dd7c 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java @@ -225,7 +225,7 @@ void When_SkeletonAsWholeUk07Message_Expect_InboundMessagePayloadIsNewRCMRMessag inboundMessage.setEbXML(readInboundMessageEbXmlFromFile()); when(attachmentHandlerService.getAttachment(any(), any())).thenReturn(skeletonMessage.getBytes(StandardCharsets.UTF_8)); - when(xmlParseUtilService.getStringFromDocument(any())).thenReturn(readInboundMessagePayloadFromFile()); + when(xmlParseUtilService.getStringFromDocument(any())).thenReturn(skeletonMessage); var newInboundMessage = skeletonProcessingService.updateInboundMessageWithSkeleton(attachmentLog, inboundMessage, CONVERSATION_ID);