removed

Author: chiaramapellimt

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/SpecimenMapperTest.java

@@ -3,7 +3,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 import static uk.nhs.adaptors.gp2gp.utils.ConfidentialityCodeUtility.NOPAT_HL7_CONFIDENTIALITY_CODE;
 
@@ -89,7 +88,7 @@ void When_MappingSpecimen_Expect_XmlOutput(String inputPath, String expectedPath
         var inputBundle = new FhirParseService().parseResource(inputBundleString, Bundle.class);
 
         when(messageContext.getIdMapper()).thenReturn(idMapper);
-        lenient().when(messageContext.getInputBundleHolder()).thenReturn(new InputBundle(inputBundle));
+        when(messageContext.getInputBundleHolder()).thenReturn(new InputBundle(inputBundle));
         when(idMapper.getOrNew(any(ResourceType.class), any(IdType.class))).thenAnswer(mockId());
         when(observationMapper.mapObservationToCompoundStatement(any(Observation.class)))
             .thenAnswer(mockObservationMapping());
@@ -99,6 +98,22 @@ void When_MappingSpecimen_Expect_XmlOutput(String inputPath, String expectedPath
         assertThat(actualXml).isEqualTo(expectedXml);
     }
 
+    @ParameterizedTest
+    @MethodSource("testDataNoNeedToMockBundle")
+    void When_MappingSpecimen_Expect_XmlOutputWithoutCertainData(String inputPath, String expectedPath) {
+        final Specimen specimen = getSpecimenResourceFromJson(inputPath);
+        final String expectedXml = ResourceTestFileUtils.getFileContent(SPECIMEN_TEST_FILES_DIRECTORY + expectedPath);
+
+        when(messageContext.getIdMapper()).thenReturn(idMapper);
+        when(idMapper.getOrNew(any(ResourceType.class), any(IdType.class))).thenAnswer(mockId());
+        when(observationMapper.mapObservationToCompoundStatement(any(Observation.class)))
+                .thenAnswer(mockObservationMapping());
+
+        final String actualXml = specimenMapper.mapSpecimenToCompoundStatement(specimen, observations, DIAGNOSTIC_REPORT);
+
+        assertThat(actualXml).isEqualTo(expectedXml);
+    }
+
     @Test
     void When_MappingDefaultSpecimenWithDefaultObservation_Expect_DefaultXmlOutput() {
         final Specimen specimen = getDefaultSpecimen();
@@ -197,13 +212,6 @@ private Specimen getSpecimenResourceFromJson(String filename) {
     private static Stream<Arguments> testData() {
         return Stream.of(
             Arguments.of("input-specimen.json", "expected-specimen.xml"),
-            Arguments.of("input-specimen-with-collection-period.json", "expected-specimen-with-collection-period.xml"),
-            Arguments.of("input-specimen-without-accession-identifier.json", "expected-specimen-without-accession-identifier.xml"),
-            Arguments.of("input-specimen-without-collection-time.json", "expected-specimen-without-collection-time.xml"),
-            Arguments.of("input-specimen-without-type.json", "expected-specimen-without-type.xml"),
-            Arguments.of("input-specimen-without-type-text.json", "expected-specimen-without-type-text.xml"),
-            Arguments.of("input-specimen-without-agent-person.json", "expected-specimen-without-agent-person.xml"),
-            Arguments.of("input-specimen-without-collection-details.json", "expected-specimen-without-collection-details.xml"),
             Arguments.of("input-specimen-without-fasting-status.json", "expected-specimen-without-fasting-status.xml"),
             Arguments.of("input-specimen-without-fasting-duration.json", "expected-specimen-without-fasting-duration.xml"),
             Arguments.of("input-specimen-without-quantity.json", "expected-specimen-without-quantity.xml"),
@@ -215,6 +223,18 @@ private static Stream<Arguments> testData() {
         );
     }
 
+    private static Stream<Arguments> testDataNoNeedToMockBundle() {
+        return Stream.of(
+            Arguments.of("input-specimen-with-collection-period.json", "expected-specimen-with-collection-period.xml"),
+            Arguments.of("input-specimen-without-accession-identifier.json", "expected-specimen-without-accession-identifier.xml"),
+            Arguments.of("input-specimen-without-collection-time.json", "expected-specimen-without-collection-time.xml"),
+            Arguments.of("input-specimen-without-type.json", "expected-specimen-without-type.xml"),
+            Arguments.of("input-specimen-without-type-text.json", "expected-specimen-without-type-text.xml"),
+            Arguments.of("input-specimen-without-agent-person.json", "expected-specimen-without-agent-person.xml"),
+            Arguments.of("input-specimen-without-collection-details.json", "expected-specimen-without-collection-details.xml")
+        );
+    }
+
     private Answer<String> mockId() {
         return invocation -> {
             ResourceType resourceType = invocation.getArgument(0);
@@ -223,13 +243,6 @@ private Answer<String> mockId() {
         };
     }
 
-    private Answer<String> mockReference() {
-        return invocation -> {
-            Reference reference = invocation.getArgument(0);
-            return String.format("REFERENCE-to-%s", reference.getReference());
-        };
-    }
-
     private Answer<String> mockObservationMapping() {
         return invocation -> {
             Observation observation = invocation.getArgument(0);