DTSCCI-434 Remove Spring context from unit test (#5101)

* DTSCCI-434 Remove Spring context from unit test
hmcts · Jul 25, 2024 · 8cce6b3 · 8cce6b3
1 parent 1cb5ec3
commit 8cce6b3
Show file tree

Hide file tree

Showing 33 changed files with 599 additions and 443 deletions.
diff --git a/src/main/java/uk/gov/hmcts/reform/civil/documentmanagement/model/CaseDocument.java b/src/main/java/uk/gov/hmcts/reform/civil/documentmanagement/model/CaseDocument.java
@@ -2,9 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import uk.gov.hmcts.reform.civil.enums.CaseRole;
 
 import java.time.LocalDateTime;

diff --git a/...mcts/reform/civil/handler/callback/camunda/docmosis/GenerateClaimFormCallbackHandler.java b/...mcts/reform/civil/handler/callback/camunda/docmosis/GenerateClaimFormCallbackHandler.java
@@ -53,6 +53,10 @@ public class GenerateClaimFormCallbackHandler extends CallbackHandler {
     @Value("${stitching.enabled}")
     private boolean stitchEnabled;
 
+    public void setStitchEnabled(boolean stitchEnabled) {
+        this.stitchEnabled = stitchEnabled;
+    }
+
     @Override
     public String camundaActivityId(CallbackParams callbackParams) {
         return TASK_ID;

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/PartyFlagStructure.java b/src/main/java/uk/gov/hmcts/reform/civil/model/PartyFlagStructure.java
@@ -5,13 +5,15 @@
 import uk.gov.hmcts.reform.civil.model.caseflags.Flags;
 
 @Data
+@lombok.NoArgsConstructor
+@lombok.AllArgsConstructor
 @Builder(toBuilder = true)
 public class PartyFlagStructure {
 
-    private final String partyID;
-    private final String firstName;
-    private final String lastName;
-    private final String email;
-    private final String phone;
-    private final Flags flags;
+    private String partyID;
+    private String firstName;
+    private String lastName;
+    private String email;
+    private String phone;
+    private Flags flags;
 }
diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/ServedDocumentFiles.java b/src/main/java/uk/gov/hmcts/reform/civil/model/ServedDocumentFiles.java
@@ -14,9 +14,9 @@
 import static java.util.Optional.ofNullable;
 
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class ServedDocumentFiles {
 
     private List<Element<DocumentWithRegex>> other;

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/dq/DisclosureOfNonElectronicDocuments.java b/src/main/java/uk/gov/hmcts/reform/civil/model/dq/DisclosureOfNonElectronicDocuments.java
@@ -7,9 +7,9 @@
 import uk.gov.hmcts.reform.civil.enums.YesOrNo;
 
 @Data
-@Builder
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class DisclosureOfNonElectronicDocuments {
 
     private YesOrNo directionsForDisclosureProposed;

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/dq/Experts.java b/src/main/java/uk/gov/hmcts/reform/civil/model/dq/Experts.java
@@ -11,9 +11,9 @@
 import java.util.List;
 
 @Data
-@Builder(toBuilder = true)
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
 public class Experts {
 
     private YesOrNo expertRequired;

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/dq/FileDirectionsQuestionnaire.java b/src/main/java/uk/gov/hmcts/reform/civil/model/dq/FileDirectionsQuestionnaire.java
@@ -9,9 +9,9 @@
 import java.util.List;
 
 @Data
-@Builder
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class FileDirectionsQuestionnaire {
 
     private List<String> explainedToClient;

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/dq/FurtherInformation.java b/src/main/java/uk/gov/hmcts/reform/civil/model/dq/FurtherInformation.java
@@ -7,9 +7,9 @@
 import uk.gov.hmcts.reform.civil.enums.YesOrNo;
 
 @Data
-@Builder(toBuilder = true)
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
 public class FurtherInformation {
 
     private YesOrNo futureApplications;

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/dq/Hearing.java b/src/main/java/uk/gov/hmcts/reform/civil/model/dq/Hearing.java
@@ -12,9 +12,9 @@
 import java.util.List;
 
 @Data
-@Builder(toBuilder = true)
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
 public class Hearing {
 
     private HearingLength hearingLength;

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/dq/HearingSupport.java b/src/main/java/uk/gov/hmcts/reform/civil/model/dq/HearingSupport.java
@@ -10,9 +10,9 @@
 import java.util.List;
 
 @Data
-@Builder(toBuilder = true)
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
 public class HearingSupport {
 
     // CIV-5557 to be removed

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/dq/RequestedCourt.java b/src/main/java/uk/gov/hmcts/reform/civil/model/dq/RequestedCourt.java
@@ -9,9 +9,9 @@
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.CaseLocationCivil;
 
 @Data
-@Builder(toBuilder = true)
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
 public class RequestedCourt {
 
     /**

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/dq/VulnerabilityQuestions.java b/src/main/java/uk/gov/hmcts/reform/civil/model/dq/VulnerabilityQuestions.java
@@ -10,8 +10,8 @@
 @NoArgsConstructor
 public class VulnerabilityQuestions {
 
-    private YesOrNo vulnerabilityAdjustmentsRequired;
-    private String vulnerabilityAdjustments;
+    YesOrNo vulnerabilityAdjustmentsRequired;
+    String vulnerabilityAdjustments;
 
     public VulnerabilityQuestions(YesOrNo vulnerabilityAdjustmentsRequired, String vulnerabilityAdjustments) {
         this.vulnerabilityAdjustmentsRequired = vulnerabilityAdjustmentsRequired;

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/dq/WelshLanguageRequirements.java b/src/main/java/uk/gov/hmcts/reform/civil/model/dq/WelshLanguageRequirements.java
@@ -8,8 +8,8 @@
 
 @Data
 @Builder(toBuilder = true)
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
 public class WelshLanguageRequirements {
 
     private Language evidence;

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/dq/Witnesses.java b/src/main/java/uk/gov/hmcts/reform/civil/model/dq/Witnesses.java
@@ -10,9 +10,9 @@
 import java.util.List;
 
 @Data
-@Builder(toBuilder = true)
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
 public class Witnesses {
 
     private YesOrNo witnessesToAppear;

diff --git a/...l/handler/callback/camunda/docmosis/GenerateCUIResponseSealedFormCallBackHandlerTest.java b/...l/handler/callback/camunda/docmosis/GenerateCUIResponseSealedFormCallBackHandlerTest.java
@@ -1,15 +1,14 @@
 package uk.gov.hmcts.reform.civil.handler.callback.camunda.docmosis;
 
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentMatchers;
-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 org.springframework.test.util.ReflectionTestUtils;
 import uk.gov.hmcts.reform.ccd.client.model.AboutToStartOrSubmitCallbackResponse;
 import uk.gov.hmcts.reform.civil.documentmanagement.model.CaseDocument;
@@ -42,31 +41,34 @@
 import static uk.gov.hmcts.reform.civil.service.docmosis.DocmosisTemplates.N1;
 import static uk.gov.hmcts.reform.civil.utils.ElementUtils.element;
 
-@ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = {
-    GenerateCUIResponseSealedFormCallBackHandler.class,
-    JacksonAutoConfiguration.class,
-    AssignCategoryId.class
-})
+@ExtendWith(MockitoExtension.class)
 class GenerateCUIResponseSealedFormCallBackHandlerTest extends BaseCallbackHandlerTest {
 
-    @Autowired
-    private final ObjectMapper mapper = new ObjectMapper();
-    @Autowired
+    @Mock
+    private ObjectMapper mapper;
+    @InjectMocks
     private GenerateCUIResponseSealedFormCallBackHandler handler;
-    @MockBean
+    @Mock
     private SealedClaimLipResponseFormGenerator formGenerator;
 
-    @MockBean
+    @Mock
     private SystemGeneratedDocumentService systemGeneratedDocumentService;
-    @MockBean
+    @Mock
     private CivilDocumentStitchingService civilDocumentStitchingService;
-    @MockBean
+    @Mock
     private FeatureToggleService featureToggleService;
 
-    @MockBean
+    @Mock
     private AssignCategoryId assignCategoryId;
 
+    @BeforeEach
+    void setUp() {
+        mapper = new ObjectMapper();
+        handler = new GenerateCUIResponseSealedFormCallBackHandler(mapper, formGenerator, systemGeneratedDocumentService,
+                                                                   assignCategoryId, civilDocumentStitchingService, featureToggleService);
+        mapper.registerModule(new JavaTimeModule());
+    }
+
     private static final CaseDocument FORM =
             CaseDocument.builder()
                     .createdBy("John")
@@ -108,14 +110,9 @@ class GenerateCUIResponseSealedFormCallBackHandlerTest extends BaseCallbackHandl
                     .build();
     private static final String BEARER_TOKEN = "BEARER_TOKEN";
 
-    @BeforeEach
-    void setup() {
-        when(featureToggleService.isLipVLipEnabled()).thenReturn(false);
-        ReflectionTestUtils.setField(handler, "stitchEnabled", false);
-    }
-
     @Test
     void shouldGenerateForm_whenAboutToSubmitCalled() {
+        ReflectionTestUtils.setField(handler, "stitchEnabled", false);
         given(formGenerator.generate(any(CaseData.class), anyString())).willReturn(FORM);
         CaseData caseData = CaseData.builder().build();
         handler.handle(callbackParamsOf(caseData, ABOUT_TO_SUBMIT));
@@ -127,7 +124,6 @@ void shouldGenerateForm_whenIsLipVLipEnabledStitchingDisabled() {
         //Given
         given(formGenerator.generate(any(CaseData.class), anyString())).willReturn(FORM);
         CaseData caseData = CaseData.builder().build();
-        when(featureToggleService.isLipVLipEnabled()).thenReturn(true);
 
         //When
         handler.handle(callbackParamsOf(caseData, ABOUT_TO_SUBMIT));
@@ -139,6 +135,8 @@ void shouldGenerateForm_whenIsLipVLipEnabledStitchingDisabled() {
     @Test
     void shouldGenerateForm_whenIsLipVLipEnabledStitchingEnabled() {
         //Given
+        when(featureToggleService.isLipVLipEnabled()).thenReturn(false);
+        ReflectionTestUtils.setField(handler, "stitchEnabled", false);
         List<Element<CaseDocument>> documents = List.of(
                 element(CaseDocument.builder().documentName("Stitched document").build()),
                 element(CaseDocument.builder().documentName("document name").build()));