Removedlenient

Author: chiaramapellimt

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

@@ -36,7 +36,6 @@
 import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.common.service.FhirParseService;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
-import uk.nhs.adaptors.gp2gp.ehr.mapper.AgentDirectory;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.IdMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.InputBundle;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.MessageContext;
@@ -63,8 +62,6 @@ class SpecimenMapperTest {
     @Mock
     private IdMapper idMapper;
     @Mock
-    private AgentDirectory agentDirectory;
-    @Mock
     private ObservationMapper observationMapper;
     @Mock
     private RandomIdGeneratorService randomIdGeneratorService;
@@ -75,14 +72,7 @@ class SpecimenMapperTest {
 
     @BeforeEach
     void setUp() {
-        var inputBundleString = ResourceTestFileUtils.getFileContent(FHIR_INPUT_BUNDLE);
-        var inputBundle = new FhirParseService().parseResource(inputBundleString, Bundle.class);
-        lenient().when(messageContext.getIdMapper()).thenReturn(idMapper);
-        lenient().when(messageContext.getAgentDirectory()).thenReturn(agentDirectory);
-        lenient().when(messageContext.getInputBundleHolder()).thenReturn(new InputBundle(inputBundle));
-        lenient().when(idMapper.getOrNew(any(ResourceType.class), any(IdType.class))).thenAnswer(mockId());
-        lenient().when(agentDirectory.getAgentId(any(Reference.class))).thenAnswer(mockReference());
-
+        when(messageContext.getIdMapper()).thenReturn(idMapper);
         when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
 
         observations = List.of(
@@ -95,7 +85,12 @@ void setUp() {
     void When_MappingSpecimen_Expect_XmlOutput(String inputPath, String expectedPath) {
         final Specimen specimen = getSpecimenResourceFromJson(inputPath);
         final String expectedXml = ResourceTestFileUtils.getFileContent(SPECIMEN_TEST_FILES_DIRECTORY + expectedPath);
+        var inputBundleString = ResourceTestFileUtils.getFileContent(FHIR_INPUT_BUNDLE);
+        var inputBundle = new FhirParseService().parseResource(inputBundleString, Bundle.class);
 
+        when(messageContext.getIdMapper()).thenReturn(idMapper);
+        lenient().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());