wqeRAST

Author: chiaramapellimt

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

@@ -160,8 +160,7 @@ void When_MappingAllergyIntoleranceJson_Expect_AllergyStructureXmlOutput(String
 
     @ParameterizedTest
     @MethodSource("resourceFileParamsWithEnvironmentCategoryAndConditionRelatedData")
-    void When_MappingAllergyIntoleranceJson_Expect_AllergyStructureXmlOutputWithEnvironmentCategoryAndConditionRelatedData
-            (String inputJson, String outputXml) {
+    void When_MappingAllergyIntoleranceJson_Expect_AllergyStructureXmlOutputWithEnvironmentAndData(String inputJson, String outputXml) {
         final var expectedMessage = ResourceTestFileUtils.getFileContent(TEST_FILE_DIRECTORY + outputXml);
         final var allergyIntolerance = parseAllergyIntoleranceFromJsonFile(TEST_FILE_DIRECTORY + inputJson);
 
@@ -185,11 +184,11 @@ void When_MappingInvalidAllergyIntoleranceJson_Expect_Exception(String inputJson
     @Test
     void When_ConfidentialityServiceReturnsConfidentialityCode_Expect_MessageContainsConfidentialityCode() {
         final var allergyIntolerance = parseAllergyIntoleranceFromJsonFile(INPUT_JSON_WITH_OPTIONAL_TEXT_FIELDS);
-        when(confidentialityService.generateConfidentialityCode(allergyIntolerance))
-            .thenReturn(Optional.of(CONFIDENTIALITY_CODE));
-
         final var message = allergyStructureMapper.mapAllergyIntoleranceToAllergyStructure(allergyIntolerance);
 
+        when(confidentialityService.generateConfidentialityCode(allergyIntolerance))
+                .thenReturn(Optional.of(CONFIDENTIALITY_CODE));
+
         assertThat(message).contains(CONFIDENTIALITY_CODE);
         assertThat(StringUtils.countOccurrencesOf(message, CONFIDENTIALITY_CODE))
             .withFailMessage("<confidentialityCode /> should appear within both the CompoundStatement and ObservationStatement")