From d99310a4294e84964ff09051abeb2125a4837025 Mon Sep 17 00:00:00 2001 From: meulendijksm Date: Tue, 1 Oct 2024 10:27:41 +0100 Subject: [PATCH] CIV-15201 - Update test --- .../bundle/BundleRequestMapperTest.java | 66 +++++++++++++++---- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/civil/helpers/bundle/BundleRequestMapperTest.java b/src/test/java/uk/gov/hmcts/reform/civil/helpers/bundle/BundleRequestMapperTest.java index fa0096a7863..4758543d409 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/helpers/bundle/BundleRequestMapperTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/helpers/bundle/BundleRequestMapperTest.java @@ -2,6 +2,8 @@ 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.ValueSource; import org.mockito.InjectMocks; import org.mockito.Mock; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -45,12 +47,14 @@ class BundleRequestMapperTest { private static final String TEST_FILE_TYPE = "Email"; private static final String TEST_FILE_NAME = "testFileName.pdf"; - @Test - void testBundleRequestMapperWithAllDocs() { + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void testBundleRequestMapperWithAllDocs(boolean caseProgressionCuiEnabled) { // Given //Add all type of documents and other request details in case data CaseData caseData = getCaseData(); given(featureToggleService.isCaseEventsEnabled()).willReturn(false); + given(featureToggleService.isCaseProgressionEnabled()).willReturn(caseProgressionCuiEnabled); // When BundleCreateRequest bundleCreateRequest = bundleRequestMapper.mapCaseDataToBundleCreateRequest(caseData, "sample" + @@ -101,16 +105,24 @@ void testBundleRequestMapperWithAllDocs() { bundleCreateRequest.getCaseDetails().getCaseData().getStatementsOfCaseDocuments().get(7).getValue().getDocumentFileName()); assertEquals("CL 1 Directions Questionnaire 10/02/2023", bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(0).getValue().getDocumentFileName()); + if(featureToggleService.isCaseProgressionEnabled()) { + assertEquals("CL 1 Directions Questionnaire 11/03/2023", + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(1).getValue().getDocumentFileName()); + } assertEquals("DF 1 Directions Questionnaire 10/02/2023", - bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(1).getValue().getDocumentFileName()); + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(caseProgressionCuiEnabled ? 2 : 1).getValue().getDocumentFileName()); + if(featureToggleService.isCaseProgressionEnabled()) { + assertEquals("DF 1 Directions Questionnaire 12/03/2023", + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(3).getValue().getDocumentFileName()); + } assertEquals("DF 2 Directions Questionnaire 10/02/2023", - bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(2).getValue().getDocumentFileName()); + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(caseProgressionCuiEnabled ? 4 : 2).getValue().getDocumentFileName()); assertEquals("DF 2 Directions Questionnaire 11/02/2023", - bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(3).getValue().getDocumentFileName()); + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(caseProgressionCuiEnabled ? 5: 3).getValue().getDocumentFileName()); assertEquals("DF 2 Directions Questionnaire 10/03/2023", - bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(4).getValue().getDocumentFileName()); + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(caseProgressionCuiEnabled ? 6 : 4).getValue().getDocumentFileName()); assertEquals("Directions Questionnaire 10/02/2023", - bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(5).getValue().getDocumentFileName()); + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(caseProgressionCuiEnabled ? 7 : 5).getValue().getDocumentFileName()); assertEquals("Directions Order 10/02/2023", bundleCreateRequest.getCaseDetails().getCaseData().getOrdersDocuments().get(0).getValue().getDocumentFileName()); assertEquals("Order 10/02/2023", @@ -172,12 +184,14 @@ void testBundleRequestMapperWithAllDocs() { } - @Test - void testBundleRequestMapperWithAllDocsAndCaseEvenEnable() { + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void testBundleRequestMapperWithAllDocsAndCaseEvenEnable(boolean caseProgressionCuiEnabled) { // Given //Add all type of documents and other request details in case data CaseData caseData = getCaseDataNoCategoryId(); given(featureToggleService.isCaseEventsEnabled()).willReturn(true); + given(featureToggleService.isCaseProgressionEnabled()).willReturn(caseProgressionCuiEnabled); // When BundleCreateRequest bundleCreateRequest = bundleRequestMapper.mapCaseDataToBundleCreateRequest(caseData, "sample" + @@ -228,16 +242,24 @@ void testBundleRequestMapperWithAllDocsAndCaseEvenEnable() { bundleCreateRequest.getCaseDetails().getCaseData().getStatementsOfCaseDocuments().get(7).getValue().getDocumentFileName()); assertEquals("CL 1 Directions Questionnaire 10/02/2023", bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(0).getValue().getDocumentFileName()); + if(featureToggleService.isCaseProgressionEnabled()) { + assertEquals("CL 1 Directions Questionnaire 11/03/2023", + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(1).getValue().getDocumentFileName()); + } assertEquals("DF 1 Directions Questionnaire 10/02/2023", - bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(1).getValue().getDocumentFileName()); + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(caseProgressionCuiEnabled ? 2 : 1).getValue().getDocumentFileName()); + if(featureToggleService.isCaseProgressionEnabled()) { + assertEquals("DF 1 Directions Questionnaire 12/03/2023", + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(3).getValue().getDocumentFileName()); + } assertEquals("DF 2 Directions Questionnaire 10/02/2023", - bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(2).getValue().getDocumentFileName()); + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(caseProgressionCuiEnabled ? 4 : 2).getValue().getDocumentFileName()); assertEquals("DF 2 Directions Questionnaire 11/02/2023", - bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(3).getValue().getDocumentFileName()); + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(caseProgressionCuiEnabled ? 5: 3).getValue().getDocumentFileName()); assertEquals("DF 2 Directions Questionnaire 10/03/2023", - bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(4).getValue().getDocumentFileName()); + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(caseProgressionCuiEnabled ? 6 : 4).getValue().getDocumentFileName()); assertEquals("Directions Questionnaire 10/02/2023", - bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(5).getValue().getDocumentFileName()); + bundleCreateRequest.getCaseDetails().getCaseData().getDirectionsQuestionnaires().get(caseProgressionCuiEnabled ? 7 : 5).getValue().getDocumentFileName()); assertEquals("Directions Order 10/02/2023", bundleCreateRequest.getCaseDetails().getCaseData().getOrdersDocuments().get(0).getValue().getDocumentFileName()); assertEquals("Order 10/02/2023", @@ -822,12 +844,28 @@ private List> setupSystemGeneratedCaseDocs() { .documentFileName("DQ_NO_CATEGORY_ID").build()) .createdDatetime(LocalDateTime.of(2023, 2, 10, 2, 2, 2)).build(); + CaseDocument caseDocumentDQApp1LiP = + CaseDocument.builder() + .documentType(DocumentType.DIRECTIONS_QUESTIONNAIRE) + .documentLink(Document.builder().documentUrl(TEST_URL).categoryID(DocCategory.DQ_APP1.getValue()) + .documentFileName(TEST_FILE_NAME).build()) + .createdDatetime(LocalDateTime.of(2023, 3, 11, 2, + 2, 2)).build(); + CaseDocument caseDocumentDQDef1LiP = + CaseDocument.builder() + .documentType(DocumentType.DIRECTIONS_QUESTIONNAIRE) + .documentLink(Document.builder().documentUrl(TEST_URL).categoryID(DocCategory.DQ_DEF1.getValue()) + .documentFileName(TEST_FILE_NAME).build()) + .createdDatetime(LocalDateTime.of(2023, 3, 12, 2, + 2, 2)).build(); systemGeneratedCaseDocuments.add(ElementUtils.element(caseDocumentDQDef1)); systemGeneratedCaseDocuments.add(ElementUtils.element(caseDocumentDQApp1)); systemGeneratedCaseDocuments.add(ElementUtils.element(caseDocumentDQDef22)); systemGeneratedCaseDocuments.add(ElementUtils.element(caseDocumentDQDef21)); systemGeneratedCaseDocuments.add(ElementUtils.element(caseDocumentDQDef23)); systemGeneratedCaseDocuments.add(ElementUtils.element(caseDocumentDQNoId)); + systemGeneratedCaseDocuments.add(ElementUtils.element(caseDocumentDQApp1LiP)); + systemGeneratedCaseDocuments.add(ElementUtils.element(caseDocumentDQDef1LiP)); CaseDocument caseDocumentDJ = CaseDocument.builder() .documentType(DocumentType.DEFAULT_JUDGMENT_SDO_ORDER)