Removed lenient from AllergyStructureMapperTest

Author: chiaramapellimt

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

@@ -4,7 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import static uk.nhs.adaptors.gp2gp.utils.IdUtil.buildIdType;
@@ -71,12 +70,8 @@ private static Stream<Arguments> resourceFileParams() {
             Arguments.of("input-with-onset-date-only.json", "expected-uses-onset-date.xml"),
             Arguments.of("input-with-reason-end-date-only.json", "expected-uses-end-date.xml"),
             Arguments.of("input-with-no-dates.json", "expected-uses-null-flavor-date.xml"),
-            Arguments.of("input-with-environment-category.json", "expected-uses-environment-category.xml"),
             Arguments.of("input-with-medication-category.json", "expected-uses-medication-category.xml"),
             Arguments.of("input-with-reaction.json", "expected-uses-reaction.xml"),
-            Arguments.of("input-with-relation-to-condition-with-one-note.json", "expected-uses-relation-to-condition-with-one-note.xml"),
-            Arguments.of("input-with-relation-to-condition-with-two-notes.json", "expected-uses-relation-to-condition-with-two-notes.xml"),
-            Arguments.of("input-with-no-relation-to-condition.json", "expected-uses-no-relation-to-condition.xml"),
             Arguments.of("input-with-device-recorder-and-asserter.json", "expected-uses-device-recorder-and-asserter.xml"),
             Arguments.of("input-with-related-person-asserter.json", "expected-uses-related-person-asserter.xml"),
             Arguments.of("input-with-related-person-asserter-name-text.json", "expected-uses-related-person-asserter.xml"),
@@ -94,22 +89,21 @@ private static Stream<Arguments> resourceFileParams() {
         );
     }
 
+    private static Stream<Arguments> resourceFileParamsWithEnvironmentCategoryAndConditionRelatedData() {
+        return Stream.of(
+                Arguments.of("input-with-environment-category.json", "expected-uses-environment-category.xml"),
+                Arguments.of("input-with-relation-to-condition-with-one-note.json", "expected-uses-relation-to-condition-with-one-note.xml"),
+                Arguments.of("input-with-relation-to-condition-with-two-notes.json", "expected-uses-relation-to-condition-with-two-notes.xml"),
+                Arguments.of("input-with-no-relation-to-condition.json", "expected-uses-no-relation-to-condition.xml")
+        );
+    }
+
     @BeforeEach
     void setUp() {
         when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
         when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
-
-        lenient().when(codeableConceptCdMapper.mapToNullFlavorCodeableConcept(any(CodeableConcept.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        lenient().when(codeableConceptCdMapper.mapCodeableConceptToCd(any(CodeableConcept.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        lenient().when(codeableConceptCdMapper.mapCodeableConceptToCdForAllergy(any(CodeableConcept.class),
-                any(AllergyIntolerance.AllergyIntoleranceClinicalStatus.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        lenient().when(codeableConceptCdMapper.mapToNullFlavorCodeableConceptForAllergy(any(CodeableConcept.class),
-                any(AllergyIntolerance.AllergyIntoleranceClinicalStatus.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        lenient().when(confidentialityService.generateConfidentialityCode(any()))
+        when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
+        when(confidentialityService.generateConfidentialityCode(any()))
             .thenReturn(Optional.empty());
 
         var bundleInput = ResourceTestFileUtils.getFileContent(INPUT_JSON_BUNDLE);
@@ -145,6 +139,24 @@ void When_MappingAllergyIntoleranceJson_Expect_AllergyStructureXmlOutput(String
         final var expectedMessage = ResourceTestFileUtils.getFileContent(TEST_FILE_DIRECTORY + outputXml);
         final var allergyIntolerance = parseAllergyIntoleranceFromJsonFile(TEST_FILE_DIRECTORY + inputJson);
 
+        when(codeableConceptCdMapper.mapToNullFlavorCodeableConceptForAllergy(any(CodeableConcept.class),
+                any(AllergyIntolerance.AllergyIntoleranceClinicalStatus.class)))
+                .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
+
+        String message = allergyStructureMapper.mapAllergyIntoleranceToAllergyStructure(allergyIntolerance);
+        assertThat(message).contains(expectedMessage);
+    }
+
+    @ParameterizedTest
+    @MethodSource("resourceFileParamsWithEnvironmentCategoryAndConditionRelatedData")
+    void When_MappingAllergyIntoleranceJson_Expect_AllergyStructureXmlOutputWithEnvironmentCategoryAndConditionRelatedData(String inputJson, String outputXml) {
+        final var expectedMessage = ResourceTestFileUtils.getFileContent(TEST_FILE_DIRECTORY + outputXml);
+        final var allergyIntolerance = parseAllergyIntoleranceFromJsonFile(TEST_FILE_DIRECTORY + inputJson);
+
+        when(codeableConceptCdMapper.mapCodeableConceptToCdForAllergy(any(CodeableConcept.class),
+                any(AllergyIntolerance.AllergyIntoleranceClinicalStatus.class)))
+            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
+
         String message = allergyStructureMapper.mapAllergyIntoleranceToAllergyStructure(allergyIntolerance);
         assertThat(message).contains(expectedMessage);
     }