remove lenient

Author: chiaramapellimt

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

@@ -5,6 +5,7 @@
 import org.hl7.fhir.dstu3.model.QuestionnaireResponse;
 import org.hl7.fhir.dstu3.model.Reference;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -13,19 +14,13 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
 import uk.nhs.adaptors.gp2gp.ehr.utils.IgnoredResourcesUtils;
 import org.hl7.fhir.dstu3.model.ResourceType;
 import java.util.Optional;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
 class EhrExtractResourceMapperTest {
 
     @Mock
@@ -42,7 +37,6 @@ class EhrExtractResourceMapperTest {
 
     @BeforeEach
     public void setUp() {
-        when(messageContext.getInputBundleHolder()).thenReturn(inputBundleHolder);
         when(messageContext.getIdMapper()).thenReturn(idMapper);
         when(idMapper.hasIdBeenMapped(any(), any())).thenReturn(false);
     }
@@ -54,29 +48,31 @@ public void tearDown() {
 
     @Test
     void When_ReferencedResourceIsEmpty_Expect_MapMedicationRequest() {
-
         MedicationRequest medRequest = new MedicationRequest();
         medRequest.setId("MedicationRequest/1");
         medRequest.addBasedOn(new Reference("ServiceRequest/123"));
+
+        when(messageContext.getInputBundleHolder()).thenReturn(inputBundleHolder);
         when(inputBundleHolder.getResource(new IdType("ServiceRequest/123"))).thenReturn(Optional.empty());
 
         boolean result = resourceMapper.shouldMapResource(medRequest);
 
-        assertTrue(result);
+        Assertions.assertTrue(result);
     }
 
     @Test
     void When_ReferencedResourceHasNotBeenMapped_Expect_MapMedicationRequest() {
-
         MedicationRequest medRequest = new MedicationRequest();
         medRequest.setId("MedicationRequest/1");
         medRequest.addBasedOn(new Reference("ServiceRequest/123"));
+        when(messageContext.getInputBundleHolder()).thenReturn(inputBundleHolder);
+
         when(inputBundleHolder.getResource(new IdType("ServiceRequest/123"))).thenReturn(
             Optional.ofNullable(new MedicationRequest().setId("111")));
 
         boolean result = resourceMapper.shouldMapResource(medRequest);
 
-        assertTrue(result);
+        Assertions.assertTrue(result);
     }
 
     @Test
@@ -85,12 +81,11 @@ void When_ReferencedResourceHasBeenMapped_Expect_MedicationRequestIsNotMapped()
         MedicationRequest medRequest = new MedicationRequest();
         medRequest.setId("MedicationRequest/1");
         medRequest.addBasedOn(new Reference("ServiceRequest/123"));
-        when(inputBundleHolder.getResource(new IdType("ServiceRequest/123"))).thenReturn(Optional.empty());
         when(idMapper.hasIdBeenMapped(any(), any())).thenReturn(true);
 
         boolean result = resourceMapper.shouldMapResource(medRequest);
 
-        assertFalse(result);
+        Assertions.assertFalse(result);
     }
 
     @Test
@@ -101,7 +96,7 @@ void When_ReferencedResourceHasNoBasedOn_Expect_MedicationRequestShouldBeMapped(
 
         boolean result = resourceMapper.shouldMapResource(medRequest);
 
-        assertTrue(result);
+        Assertions.assertTrue(result);
     }
 
     @Test
@@ -115,7 +110,7 @@ void When_ReferencedResourceHasBeenIgnored_Expect_MedicationRequestShouldNotBeMa
 
             boolean result = resourceMapper.shouldMapResource(questionnaireResp);
 
-            assertFalse(result);
+            Assertions.assertFalse(result);
         }
     }