Added better assertion.

Alex-Nita · Alex-Nita · commit af999655ebc7 · 2024-11-05T10:43:45.000Z
diff --git a/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/DiagnosticReportMapper.java b/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/DiagnosticReportMapper.java
@@ -9,7 +9,6 @@
 import static uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.ObservationMapper.NARRATIVE_STATEMENT_TEMPLATE;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
diff --git a/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/DiagnosticReportMapperTest.java b/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/DiagnosticReportMapperTest.java
@@ -318,7 +318,9 @@ void When_DiagnosticReport_Has_SpecimenALinkedTestResultAndAnUnlinkedTestResult_
         when(messageContext.getInputBundleHolder()).thenReturn(inputBundle);
 
         final String actualXml = mapper.mapDiagnosticReportToCompoundStatement(diagnosticReport);
-        assertThat(actualXml).contains("Mapped Specimen with id: DUMMY-SPECIMEN-");
+
+        assertThat(actualXml).matches("(?s).*<!-- Mapped Specimen with id: DUMMY-SPECIMEN-[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12} with linked Observations: Observation/AD373CA7-3940-4249-85A2-D3A22E9F17C7, -->.*");
+
     }
 
     private Bundle getBundleResourceFromJson(String filename) {

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,9 @@ void When_DiagnosticReport_Has_SpecimenALinkedTestResultAndAnUnlinkedTestResult_`
`318`	`318`	`when(messageContext.getInputBundleHolder()).thenReturn(inputBundle);`
`319`	`319`
`320`	`320`	`final String actualXml = mapper.mapDiagnosticReportToCompoundStatement(diagnosticReport);`
`321`		`- assertThat(actualXml).contains("Mapped Specimen with id: DUMMY-SPECIMEN-");`
	`321`	`+`
	`322`	`+ assertThat(actualXml).matches("(?s).<!-- Mapped Specimen with id: DUMMY-SPECIMEN-[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12} with linked Observations: Observation/AD373CA7-3940-4249-85A2-D3A22E9F17C7, -->.");`
	`323`	`+`
`322`	`324`	`}`
`323`	`325`
`324`	`326`	`private Bundle getBundleResourceFromJson(String filename) {`