diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java index ae8da75365..4ab1219d04 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java @@ -64,6 +64,7 @@ public void verifyStartEventForCaseworker() { START_APPEAL); assertThat(startEventResponse.getEventId(), is(START_APPEAL)); + assertNotNull(startEventResponse.getToken()); assertCaseDetails(startEventResponse.getCaseDetails()); } diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java index 700ab66608..b9186bd780 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java @@ -13,9 +13,9 @@ import java.util.Map; -import static junit.framework.TestCase.assertNotNull; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNotNull; import static org.springframework.http.HttpHeaders.AUTHORIZATION; import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -62,7 +62,7 @@ public void verifyStartEventForCaseworker() { START_APPEAL); assertThat(startEventResponse.getEventId(), equalTo(START_APPEAL)); - assertNotNull(startEventResponse.getCaseDetails()); + assertNotNull(startEventResponse.getToken()); } private String buildPath() { diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java index 74bd8e5ba7..6f6fa390fb 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java @@ -17,7 +17,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNotNull; import static org.springframework.http.HttpHeaders.AUTHORIZATION; import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -68,34 +67,7 @@ public void verifySubmitEventForCaseworker() throws Exception { true, caseDataContent); - assertThat(caseDetails.getId(), is(CASE_ID)); - assertThat(caseDetails.getJurisdiction(), is("IA")); - assertCaseDetails(caseDetails); - } - - private void assertCaseDetails(final CaseDetails caseDetails) { - assertNotNull(caseDetails); - - Map caseDataMap = caseDetails.getData(); - - assertThat(caseDataMap.get("appellantTitle"), is("Mr")); - assertThat(caseDataMap.get("appellantGivenNames"), is("Bob")); - assertThat(caseDataMap.get("appellantFamilyName"), is("Smith")); - assertThat(caseDataMap.get("appellantDateOfBirth"), is("1990-12-07")); - assertThat(caseDataMap.get("homeOfficeReferenceNumber"), is("000123456")); - assertThat(caseDataMap.get("homeOfficeDecisionDate"), is("2019-08-01")); - assertThat(caseDataMap.get("appealType"), is("protection")); - assertThat(caseDataMap.get("submissionOutOfTime"), is("Yes")); - assertThat(caseDataMap.get("applicationOutOfTimeExplanation"), is("test case")); - - //caseManagementLocation - @SuppressWarnings("unchecked") - Map caseManagementLocation = (Map) caseDataMap.get("caseManagementLocation"); - assertThat(caseManagementLocation.get("region"), is("1")); - assertThat(caseManagementLocation.get("baseLocation"), is("765324")); - - assertThat(caseDataMap.get("staffLocation"), is("Taylor House")); - + assertThat(caseDetails.getCaseTypeId(), is("Asylum")); } private String buildPath() { diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java index f40a0a2e18..840de3019c 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java @@ -16,10 +16,7 @@ import java.util.Map; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.springframework.http.HttpHeaders.AUTHORIZATION; import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -70,37 +67,7 @@ public void submitForCaseWorker() { true, caseDataContent); - assertNotNull(caseDetailsResponse); - assertNotNull(caseDetailsResponse.getCaseTypeId()); assertEquals(caseDetailsResponse.getCaseTypeId(), "Asylum"); - assertEquals(caseDetailsResponse.getJurisdiction(), "IA"); - assertCaseDetails(caseDetailsResponse); - } - - - private void assertCaseDetails(final CaseDetails caseDetails) { - assertNotNull(caseDetails); - - Map caseDataMap = caseDetails.getData(); - - assertThat(caseDataMap.get("appellantTitle"), is("Mr")); - assertThat(caseDataMap.get("appellantGivenNames"), is("Bob")); - assertThat(caseDataMap.get("appellantFamilyName"), is("Smith")); - assertThat(caseDataMap.get("appellantDateOfBirth"), is("1990-12-07")); - assertThat(caseDataMap.get("homeOfficeReferenceNumber"), is("000123456")); - assertThat(caseDataMap.get("homeOfficeDecisionDate"), is("2019-08-01")); - assertThat(caseDataMap.get("appealType"), is("protection")); - assertThat(caseDataMap.get("submissionOutOfTime"), is("Yes")); - assertThat(caseDataMap.get("applicationOutOfTimeExplanation"), is("test case")); - - //caseManagementLocation - @SuppressWarnings("unchecked") - Map caseManagementLocation = (Map) caseDataMap.get("caseManagementLocation"); - assertThat(caseManagementLocation.get("region"), is("1")); - assertThat(caseManagementLocation.get("baseLocation"), is("765324")); - - assertThat(caseDataMap.get("staffLocation"), is("Taylor House")); - } private String buildPath() { diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java index 3dd4f32974..1f17f92693 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java @@ -21,9 +21,9 @@ public static DslPart buildStartEventForCaseWorkerPactDsl(String eventId) { .object("case_details", cd -> { cd.numberType("id", 2000); cd.stringMatcher("jurisdiction", ALPHABETIC_REGEX, "IA"); - cd.stringMatcher("case_type", ALPHABETIC_REGEX, "Asylum"); + cd.stringMatcher("case_type_id", ALPHABETIC_REGEX, "Asylum"); cd.stringValue("state", "appealStarted"); - cd.stringValue("securityClassification", "PUBLIC"); + cd.stringValue("security_classification", "PUBLIC"); cd.object("case_data", PactDslBuilderForCaseDetailsList::getCaseDataPactDsl); })).build(); } @@ -49,8 +49,8 @@ public static DslPart buildSubmitForCaseWorkedPactDsl(Long caseId) { .stringType("jurisdiction", "IA") .stringValue("case_type_id", "Asylum") .stringValue("state", "appealStarted") - .stringValue("securityClassification", "PUBLIC") - .stringValue("callbackResponseStatus", "CALLBACK_COMPLETED") + .stringValue("security_classification", "PUBLIC") + .stringValue("callback_response_status", "CALLBACK_COMPLETED") .object("case_data", PactDslBuilderForCaseDetailsList::getCaseDataPactDsl)).build(); } diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java index c1074388d6..4ac9c84816 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java @@ -26,6 +26,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.when; @PactTestFor(providerName = "ccdDataStoreAPI_Cases", port = "8891") @@ -53,7 +54,7 @@ void setUp() { ccdDataService = new CcdDataService(ccdDataServiceApi, authTokenGenerator, systemTokenGenerator); } - @Pact(provider = "ccd_data_store_get_case_by_id", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_management_api") public RequestResponsePact executeCcdGetCasesByCaseId(PactDslWithProvider builder) { Map responseHeaders = Map.of("Content-Type", "application/json"); @@ -79,14 +80,19 @@ public void verifyGetCaseById() { assertThat(caseDetails.getSecurityClassification(), is("PRIVATE")); assertThat(caseDetails.getJurisdiction(), is("IA")); assertThat(caseDetails.getCaseType(), is("Asylum")); + assertNotNull(caseDetails.getData()); } private PactDslJsonBody createCasesResponse() { - return new PactDslJsonBody() + PactDslJsonBody body = new PactDslJsonBody() .stringType("id", "1593694526480034") .stringValue("jurisdiction", "IA") .stringValue("case_type", "Asylum") .stringValue("security_classification", "PRIVATE"); + + body.object("data") + .closeObject(); + return body; } private CaseDetails read(String caseData) {