werg

Author: chiaramapellimt

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

@@ -42,6 +42,17 @@ public class AllergyStructureMapperTest {
     private static final String TEST_FILE_DIRECTORY = "/ehr/mapper/allergy/";
     private static final String INPUT_JSON_BUNDLE = TEST_FILE_DIRECTORY + "fhir-bundle.json";
     private static final String INPUT_JSON_WITH_OPTIONAL_TEXT_FIELDS = TEST_FILE_DIRECTORY + "input-with-optional-text-fields.json";
+    private static final String INPUT_WITH_ENV_CATEGORY = "input-with-environment-category.json";
+    private static final String EXPECTED_WITH_ENV_CATEGORY = "expected-uses-environment-category.xml";
+
+    private static final String INPUT_WITH_CONDITION_ONE_NOTE = "input-with-relation-to-condition-with-one-note.json";
+    private static final String EXPECTED_WITH_CONDITION_ONE_NOTE = "expected-uses-relation-to-condition-with-one-note.xml";
+
+    private static final String INPUT_WITH_CONDITION_TWO_NOTES = "input-with-relation-to-condition-with-two-notes.json";
+    private static final String EXPECTED_WITH_CONDITION_TWO_NOTES = "expected-uses-relation-to-condition-with-two-notes.xml";
+
+    private static final String INPUT_WITH_NO_CONDITION = "input-with-no-relation-to-condition.json";
+    private static final String EXPECTED_WITH_NO_CONDITION = "expected-uses-no-relation-to-condition.xml";
 
     private static final String COMMON_ID = "6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73";
 
@@ -91,12 +102,10 @@ 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")
+                Arguments.of(INPUT_WITH_ENV_CATEGORY, EXPECTED_WITH_ENV_CATEGORY),
+                Arguments.of(INPUT_WITH_CONDITION_ONE_NOTE, EXPECTED_WITH_CONDITION_ONE_NOTE),
+                Arguments.of(INPUT_WITH_CONDITION_TWO_NOTES, EXPECTED_WITH_CONDITION_TWO_NOTES),
+                Arguments.of(INPUT_WITH_NO_CONDITION, EXPECTED_WITH_NO_CONDITION)
         );
     }
 

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

@@ -4,7 +4,6 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import org.hl7.fhir.dstu3.model.IdType;
@@ -41,8 +40,7 @@ void before() {
         when(messageContext.getIdMapper()).thenReturn(idMapper);
         when(idMapper.getOrNew(eq(ResourceType.Observation), any(IdType.class)))
             .thenReturn(MAPPED_ID);
-        lenient().when(randomIdGeneratorService.createNewId()).thenReturn(RANDOM_ID);
-        lenient().when(observation.getResourceType()).thenReturn(ResourceType.Observation);
+        when(observation.getResourceType()).thenReturn(ResourceType.Observation);
         when(observation.getIdElement()).thenReturn(new IdType());
         multiStatementObservationHolder = new MultiStatementObservationHolder(
             observation, messageContext, randomIdGeneratorService
@@ -51,6 +49,8 @@ void before() {
 
     @Test
     void When_NextHl7InstanceIdentifier_Expect_FirstIsMappedSecondIsRandomAndVerifies() {
+        when(randomIdGeneratorService.createNewId()).thenReturn(RANDOM_ID);
+
         assertThat(multiStatementObservationHolder.nextHl7InstanceIdentifier())
             .isEqualTo(MAPPED_ID);
         assertThatCode(() -> multiStatementObservationHolder.verifyObservationWasMapped())