DTSCCI-414 Remove Spring context

hmcts · Jul 23, 2024 · 79aac82 · 79aac82
1 parent a42e326
commit 79aac82
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 149 deletions.
diff --git a/.../civil/handler/callback/camunda/automatedhearingnotice/UpdateCaseProgressHandlerTest.java b/.../civil/handler/callback/camunda/automatedhearingnotice/UpdateCaseProgressHandlerTest.java
@@ -1,17 +1,15 @@
 package uk.gov.hmcts.reform.civil.handler.callback.camunda.automatedhearingnotice;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.hmcts.reform.ccd.client.model.AboutToStartOrSubmitCallbackResponse;
 import uk.gov.hmcts.reform.civil.callback.CallbackType;
 import uk.gov.hmcts.reform.civil.handler.callback.BaseCallbackHandlerTest;
-import uk.gov.hmcts.reform.civil.helpers.CaseDetailsConverter;
 import uk.gov.hmcts.reform.civil.model.BusinessProcess;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.service.hearingnotice.HearingNoticeCamundaService;
@@ -23,18 +21,13 @@
 import static uk.gov.hmcts.reform.civil.enums.CaseState.HEARING_READINESS;
 import static uk.gov.hmcts.reform.civil.enums.CaseState.PREPARE_FOR_HEARING_CONDUCT_HEARING;
 
-@SpringBootTest(classes = {
-    UpdateCaseProgressHandler.class,
-    JacksonAutoConfiguration.class,
-    CaseDetailsConverter.class
-})
+@ExtendWith(MockitoExtension.class)
 class UpdateCaseProgressHandlerTest extends BaseCallbackHandlerTest {
 
-    @Autowired
+    @InjectMocks
     private UpdateCaseProgressHandler handler;
-    @Autowired
-    private ObjectMapper objectMapper;
-    @MockBean
+
+    @Mock
     private HearingNoticeCamundaService camundaService;
 
     @Test

diff --git a/.../handler/callback/camunda/automatedhearingnotice/UpdateHmcPartiesNotifiedHandlerTest.java b/.../handler/callback/camunda/automatedhearingnotice/UpdateHmcPartiesNotifiedHandlerTest.java
@@ -1,17 +1,15 @@
 package uk.gov.hmcts.reform.civil.handler.callback.camunda.automatedhearingnotice;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import uk.gov.hmcts.reform.civil.callback.CallbackParams;
 import uk.gov.hmcts.reform.civil.handler.callback.BaseCallbackHandlerTest;
-import uk.gov.hmcts.reform.civil.helpers.CaseDetailsConverter;
 import uk.gov.hmcts.reform.civil.model.BusinessProcess;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.sampledata.CaseDataBuilder;
@@ -32,20 +30,16 @@
 import static org.mockito.Mockito.when;
 import static uk.gov.hmcts.reform.civil.callback.CallbackType.ABOUT_TO_SUBMIT;
 
-@SpringBootTest(classes = {
-    UpdateHmcPartiesNotifiedHandler.class,
-    JacksonAutoConfiguration.class,
-    CaseDetailsConverter.class
-})
+@ExtendWith(MockitoExtension.class)
 class UpdateHmcPartiesNotifiedHandlerTest extends BaseCallbackHandlerTest {
 
-    @Autowired
+    @InjectMocks
     private UpdateHmcPartiesNotifiedHandler handler;
-    @Autowired
-    private ObjectMapper objectMapper;
-    @MockBean
+
+    @Mock
     private HearingNoticeCamundaService hearingNoticeCamundaService;
-    @MockBean
+
+    @Mock
     private HearingsService hearingsService;
 
     @BeforeEach
@@ -55,15 +49,15 @@ void setUp() {
                             .hearingId("HER1234")
                             .hearingLocationEpims("12345")
                             .days(List.of(HearingDay.builder()
-                                      .hearingStartDateTime(LocalDateTime.of(2023, 01, 01, 0, 0, 0))
-                                      .hearingEndDateTime(LocalDateTime.of(2023, 01, 01, 12, 0, 0))
+                                      .hearingStartDateTime(LocalDateTime.of(2023, 1, 1, 0, 0, 0))
+                                      .hearingEndDateTime(LocalDateTime.of(2023, 1, 1, 12, 0, 0))
                                       .build()))
                             .hearingStartDateTime(LocalDateTime.of(2022, 11, 7, 15, 15))
                             .requestVersion(10L)
                             .responseDateTime(LocalDateTime.of(2022, 10, 10, 15, 15))
                             .build());
         when(hearingsService.updatePartiesNotifiedResponse(anyString(), anyString(), anyInt(), any(), any()))
-            .thenReturn(new ResponseEntity<String>("Ok", HttpStatus.ACCEPTED));
+            .thenReturn(new ResponseEntity<>("Ok", HttpStatus.ACCEPTED));
     }
 
     @Test
@@ -75,8 +69,8 @@ void shouldReturnExpectedCallbackResponseOnAboutToSubmit() {
 
         LocalDateTime receivedDate = LocalDateTime.of(2022, 10, 10, 15, 15);
         List<HearingDay> hearingDays = List.of(HearingDay.builder()
-                                             .hearingStartDateTime(LocalDateTime.of(2023, 01, 01, 0, 0, 0))
-                                             .hearingEndDateTime(LocalDateTime.of(2023, 01, 01, 12, 0, 0))
+                                             .hearingStartDateTime(LocalDateTime.of(2023, 1, 1, 0, 0, 0))
+                                             .hearingEndDateTime(LocalDateTime.of(2023, 1, 1, 12, 0, 0))
                                              .build());
         PartiesNotified partiesNotified = PartiesNotified.builder()
             .serviceData(PartiesNotifiedServiceData.builder()
@@ -86,7 +80,7 @@ void shouldReturnExpectedCallbackResponseOnAboutToSubmit() {
                              .build())
             .build();
 
-        var result = handler.handle(params);
+        handler.handle(params);
 
         verify(hearingsService).updatePartiesNotifiedResponse("BEARER_TOKEN", "HER1234", 10, receivedDate, partiesNotified);
     }

diff --git a/.../handler/callback/camunda/businessprocess/DispatchBusinessProcessCallbackHandlerTest.java b/.../handler/callback/camunda/businessprocess/DispatchBusinessProcessCallbackHandlerTest.java
@@ -1,12 +1,12 @@
 package uk.gov.hmcts.reform.civil.handler.callback.camunda.businessprocess;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.BeforeEach;
 import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.hmcts.reform.ccd.client.model.AboutToStartOrSubmitCallbackResponse;
 import uk.gov.hmcts.reform.civil.callback.CallbackParams;

diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/AirlineEpimsDataLoaderTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/AirlineEpimsDataLoaderTest.java
@@ -1,12 +1,13 @@
 package uk.gov.hmcts.reform.civil.service;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
-import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@SpringBootTest(classes = {AirlineEpimsDataLoader.class})
+@ExtendWith(MockitoExtension.class)
 class AirlineEpimsDataLoaderTest {
 
     private AirlineEpimsDataLoader airlineEpimsDataLoader;

diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/AirlineEpimsServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/AirlineEpimsServiceTest.java
@@ -2,20 +2,22 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.hmcts.reform.civil.model.AirlineEpimsId;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.BDDMockito.given;
 
-@SpringBootTest(classes = {AirlineEpimsService.class})
+@ExtendWith(MockitoExtension.class)
 class AirlineEpimsServiceTest {
 
-    @MockBean
+    @Mock
     private AirlineEpimsDataLoader airlineEpimsDataLoader;
 
     private AirlineEpimsService airlineEpimsService;
@@ -28,73 +30,48 @@ void setup() {
 
         given(airlineEpimsDataLoader.getAirlineEpimsIDList())
             .willReturn(airlineEpimsIDList);
+
+        airlineEpimsService = new AirlineEpimsService(airlineEpimsDataLoader);
+
     }
 
     @Test
     void getEpimsIdForAirline_shouldReturnCorrespondingEpimsIdForAirline() {
-        // Given
-        airlineEpimsService = new AirlineEpimsService(airlineEpimsDataLoader);
-
-        // When
         String result = airlineEpimsService.getEpimsIdForAirline("Gulf Air");
 
-        // Then
         assertThat(result).isEqualTo("36791");
     }
 
     @Test
     void getEpimsIdForAirline_givenInvalidAirline_shouldThrowException() {
-        // Given
-        airlineEpimsService = new AirlineEpimsService(airlineEpimsDataLoader);
-
-        // Then
         assertThatExceptionOfType(IllegalStateException.class)
             .isThrownBy(() -> airlineEpimsService.getEpimsIdForAirline("INVALID_AIRLINE"));
     }
 
     @Test
     void getEpimsIdForAirline_givenNoLocationAirline_shouldThrowException() {
-        // Given
-        airlineEpimsService = new AirlineEpimsService(airlineEpimsDataLoader);
-
-        // Then
         assertThatExceptionOfType(IllegalStateException.class)
             .isThrownBy(() -> airlineEpimsService.getEpimsIdForAirline("NoLocationAirline"));
     }
 
     @Test
     void getEpimsIdForAirlineIgnoreCase_shouldReturnCorrespondingEpimsIdForAirline() {
-        // Given
-        airlineEpimsService = new AirlineEpimsService(airlineEpimsDataLoader);
-
-        // When
         String result = airlineEpimsService.getEpimsIdForAirlineIgnoreCase("gulf air");
 
-        // Then
         assertThat(result).isEqualTo("36791");
     }
 
     @Test
     void getEpimsIdForAirlineIgnoreCase_givenInvalidAirline_shouldThrowException() {
-        // Given
-        airlineEpimsService = new AirlineEpimsService(airlineEpimsDataLoader);
-
-        // When
         String result = airlineEpimsService.getEpimsIdForAirlineIgnoreCase("INVALID_AIRLINE");
 
-        // Then
         assertThat(result).isNull();
     }
 
     @Test
     void getEpimsIdForAirlineIgnoreCase_givenNoLocationAirline_shouldThrowException() {
-        // Given
-        airlineEpimsService = new AirlineEpimsService(airlineEpimsDataLoader);
-
-        // When
         String result = airlineEpimsService.getEpimsIdForAirlineIgnoreCase("NoLocationAirline");
 
-        // Then
         assertThat(result).isNull();
     }
 }
diff --git a/...t/java/uk/gov/hmcts/reform/civil/service/stitching/CivilDocumentStitchingServiceTest.java b/...t/java/uk/gov/hmcts/reform/civil/service/stitching/CivilDocumentStitchingServiceTest.java
@@ -1,19 +1,17 @@
 package uk.gov.hmcts.reform.civil.service.stitching;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 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;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.hmcts.reform.civil.config.StitchingConfiguration;
 import uk.gov.hmcts.reform.civil.documentmanagement.model.CaseDocument;
 import uk.gov.hmcts.reform.civil.documentmanagement.model.Document;
 import uk.gov.hmcts.reform.civil.exceptions.StitchingFailedException;
-import uk.gov.hmcts.reform.civil.helpers.CaseDetailsConverter;
 import uk.gov.hmcts.reform.civil.model.Bundle;
 import uk.gov.hmcts.reform.civil.model.BundleRequest;
 import uk.gov.hmcts.reform.civil.model.CaseData;
@@ -36,21 +34,21 @@
 import static uk.gov.hmcts.reform.civil.documentmanagement.model.DocumentType.SEALED_CLAIM;
 import static uk.gov.hmcts.reform.civil.service.docmosis.DocmosisTemplates.N1;
 
-@ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = {
-    CivilDocumentStitchingService.class,
-    JacksonAutoConfiguration.class,
-    CaseDetailsConverter.class
-})
+@ExtendWith(MockitoExtension.class)
 class CivilDocumentStitchingServiceTest {
 
-    @Autowired
+    @InjectMocks
     private CivilDocumentStitchingService civilDocumentStitchingService;
-    @MockBean
+
+    @Mock
     private BundleRequestExecutor bundleRequestExecutor;
-    @MockBean
+
+    @Mock
     private StitchingConfiguration stitchingConfiguration;
 
+    @Mock
+    private ObjectMapper objectMapper;
+
     CaseData caseData;
 
     private static final CaseDocument CLAIM_FORM =

diff --git a/src/test/java/uk/gov/hmcts/reform/civil/utils/ServiceOfDateValidationMessageUtilsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/utils/ServiceOfDateValidationMessageUtilsTest.java
@@ -1,10 +1,10 @@
 package uk.gov.hmcts.reform.civil.utils;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.hmcts.reform.civil.bankholidays.WorkingDayIndicator;
 import uk.gov.hmcts.reform.civil.model.CertificateOfService;
 import uk.gov.hmcts.reform.civil.service.DeadlinesCalculator;
@@ -18,23 +18,19 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-@SpringBootTest(classes = {
-    ServiceOfDateValidationMessageUtils.class,
-
-})
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@ExtendWith(MockitoExtension.class)
 class ServiceOfDateValidationMessageUtilsTest {
 
-    @MockBean
+    @Mock
     private DeadlinesCalculator deadlinesCalculator;
 
-    @MockBean
+    @Mock
     private WorkingDayIndicator workingDayIndicator;
 
-    @MockBean
+    @Mock
     private Time time;
 
-    @Autowired
+    @InjectMocks
     private ServiceOfDateValidationMessageUtils serviceUtils;
 
     @Test
@@ -49,7 +45,6 @@ void shouldThrowError_whenDeemedServedDateIsOlderThan14Days() {
         LocalDateTime currentDateTime = LocalDateTime.now();
         when(time.now()).thenReturn(currentDateTime);
         when(deadlinesCalculator.plusWorkingDays(currentDate, 2)).thenReturn(currentDate);
-        when(workingDayIndicator.isWorkingDay(any(LocalDate.class))).thenReturn(true);
 
         List<String> errorMessages = serviceUtils.getServiceOfDateValidationMessages(certificateOfService);
 
@@ -101,10 +96,9 @@ void shouldThrowError_whenCosDefendantNotifyDateIsOlderThan14Days() {
     @Test
     void shouldThrowError_whenDeemedServedDateIsNotWorkingDay() {
         LocalDate currentDate = LocalDate.now();
-        LocalDate deemedServedDate = currentDate;
         CertificateOfService certificateOfService = CertificateOfService.builder()
             .cosDateOfServiceForDefendant(currentDate)
-            .cosDateDeemedServedForDefendant(deemedServedDate)
+            .cosDateDeemedServedForDefendant(currentDate)
             .build();
 
         LocalDateTime currentDateTime = LocalDateTime.now();