f

Author: chiaramapellimt

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

@@ -38,9 +38,8 @@
 import static org.assertj.core.api.Assumptions.assumeThatThrownBy;
 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 org.mockito.Mockito.spy;
+import static org.mockito.Mockito.*;
+import static uk.nhs.adaptors.gp2gp.utils.CodeableConceptMapperMockUtil.TEST_CONDITION_CODE;
 import static uk.nhs.adaptors.gp2gp.utils.ConfidentialityCodeUtility.NOPAT;
 import static uk.nhs.adaptors.gp2gp.utils.ConfidentialityCodeUtility.NOPAT_HL7_CONFIDENTIALITY_CODE;
 import static uk.nhs.adaptors.gp2gp.utils.ConfidentialityCodeUtility.NOSCRUB;
@@ -260,27 +259,38 @@ void When_MappingParsedCondition_With_RelatedClinicalContentAllergy_Expect_LinkS
         assertThat(actualXml).isEqualTo(expectedXml);
     }
 
+    // It works but the indentation is giving me pain in the test comparison
     @Test
     void When_MappingParsedCondition_With_AllergyIntolerance_Expect_LinkSetXml() {
-        final Condition condition = getConditionResourceFromJson(INPUT_JSON_WITH_ACTUAL_PROBLEM_ALLERGY_INTOLERANCE);
-        final String expectedXml = getXmlStringFromFile(OUTPUT_XML_ALLERGY_INTOLERANCE_ACTUAL_PROBLEM);
+        final Condition condition =
+                getConditionResourceFromJson(INPUT_JSON_WITH_ACTUAL_PROBLEM_ALLERGY_INTOLERANCE);
+        final String expectedXml =
+                getXmlStringFromFile(OUTPUT_XML_ALLERGY_INTOLERANCE_ACTUAL_PROBLEM);
+        IdType conditionId = buildIdType(ResourceType.Condition, CONDITION_ID);
 
-        when(codeableConceptCdMapper.mapCodeableConceptToCd(any(CodeableConcept.class)))
-                .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
         when(messageContext.getIdMapper()).thenReturn(idMapper);
         when(messageContext.getAgentDirectory()).thenReturn(agentDirectory);
         when(messageContext.getInputBundleHolder()).thenReturn(inputBundle);
-
-        IdType conditionId = buildIdType(ResourceType.Condition, CONDITION_ID);
-        when(idMapper.getOrNew(ResourceType.Condition, conditionId)).thenReturn(CONDITION_ID);
-        when(idMapper.getOrNew(any(Reference.class))).thenAnswer(answerWithObjectId(ResourceType.Condition));
-        when(agentDirectory.getAgentId(any(Reference.class))).thenAnswer(answerWithObjectId());
-        when(randomIdGeneratorService.createNewId()).thenReturn(GENERATED_ID);
-        lenient().doNothing().when(conditionLinkSetMapperSpy).testForValidReferences(any());
-
-        final String actualXml = conditionLinkSetMapperSpy.mapConditionToLinkSet(condition, false);
+        when(idMapper.getOrNew(ResourceType.Condition, conditionId))
+                .thenReturn(CONDITION_ID);
+        when(idMapper.getOrNew(any(Reference.class)))
+                .thenAnswer(answerWithObjectId(ResourceType.Condition));
+        when(agentDirectory.getAgentId(any(Reference.class)))
+                .thenAnswer(answerWithObjectId());
+        when(randomIdGeneratorService.createNewId())
+                .thenReturn(GENERATED_ID);
+        lenient().doNothing().when(conditionLinkSetMapperSpy)
+                .testForValidReferences(any());
+        when(codeableConceptCdMapper.mapCodeableConceptToCdForTransformedActualProblemHeader(
+                any(CodeableConcept.class)))
+                .thenReturn(CodeableConceptMapperMockUtil.TEST_CONDITION_CODE);
+
+        final String actualXml =
+                conditionLinkSetMapperSpy.mapConditionToLinkSet(condition, false);
 
         assertThat(actualXml).isEqualTo(expectedXml);
+        verify(codeableConceptCdMapper).mapCodeableConceptToCdForTransformedActualProblemHeader(any());
+        verify(codeableConceptCdMapper, never()).mapCodeableConceptToCd(any());
     }
 
     @Test
@@ -457,7 +467,9 @@ private static Stream<Arguments> testObservationArguments() {
                 Arguments.of(INPUT_JSON_NO_ACTUAL_PROBLEM, OUTPUT_XML_WITH_GENERATED_PROBLEM_IS_NESTED, true),
                 Arguments.of(INPUT_JSON_WITH_ACTUAL_PROBLEM_CONDITION, OUTPUT_XML_WITH_CONDITION_NAMED_OBSERVATION_STATEMENT_GENERATED, false),
                 Arguments.of(INPUT_JSON_NO_ACTUAL_PROBLEM_NO_DATE, OUTPUT_XML_WITH_NULL_FLAVOR_OBSERVATION_STATEMENT_AVAILABILITY_TIME,
-                        true)
+                        true),
+                Arguments.of(INPUT_JSON_WITH_ACTUAL_PROBLEM_IMMUNIZATION, OUTPUT_XML_IMMUNIZATION_ACTUAL_PROBLEM, false),
+                Arguments.of(INPUT_JSON_WITH_ACTUAL_PROBLEM_MEDICATION_REQUEST, OUTPUT_XML_MEDICATION_REQUEST_ACTUAL_PROBLEM, false)
         );
     }
 

service/src/test/java/uk/nhs/adaptors/gp2gp/utils/CodeableConceptMapperMockUtil.java

@@ -4,4 +4,9 @@ public class CodeableConceptMapperMockUtil {
     public static final String NULL_FLAVOR_CODE = "<code nullFlavor=\"UNK\"><originalText>Mocked code</originalText></code>";
     public static final String ACTUAL_PROBLEM_CODE =
             "<code code=\"55607006\" codeSystem=\"2.16.840.1.113883.2.1.3.2.4.15\" displayName=\"Problem\">";
+
+    public static final String TEST_CONDITION_CODE = "<code code=\"55607006\" codeSystem=\"2.16.840.1.113883.2.1.3.2.4.15\" displayName=\"Problem\">\n" +
+            "        <originalText>Test Condition</originalText>\n" +
+            "    </code>";
+
 }