From b2b1f5daae95da01559c301213e840b5e2857705 Mon Sep 17 00:00:00 2001 From: skandala-cgi Date: Wed, 3 Sep 2025 10:39:09 +0100 Subject: [PATCH 1/3] RWA-3688 PACT test changes --- .../StartEventForCaseWorkerConsumerTest.java | 3 +- .../ccd/StartForCaseWorkerConsumerTest.java | 4 +-- .../SubmitEventForCaseWorkerConsumerTest.java | 32 ++--------------- .../ccd/SubmitForCaseWorkerConsumerTest.java | 35 +------------------ 4 files changed, 7 insertions(+), 67 deletions(-) diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartEventForCaseWorkerConsumerTest.java index 73431bbe..4e64a94c 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartEventForCaseWorkerConsumerTest.java @@ -31,7 +31,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_monitor") + @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_monitor") public V4Pact startEventForCaseWorker(PactDslWithProvider builder) throws JSONException { return builder .given("A Start Event for a Caseworker is requested", @@ -64,6 +64,7 @@ public void verifyStartEventForCaseworker() throws JSONException { START_APPEAL); assertThat(startEventResponse.getEventId(), is(START_APPEAL)); + assertNotNull(startEventResponse.getToken()); assertCaseDetails(startEventResponse.getCaseDetails()); } diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartForCaseWorkerConsumerTest.java index cc9f2abc..dfc2bec1 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartForCaseWorkerConsumerTest.java @@ -32,7 +32,7 @@ public Map setUpStateMapForProviderWithoutCaseData() { return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_monitor") + @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_monitor") public V4Pact startForCaseWorker(PactDslWithProvider builder) { return builder .given("A Start for a Caseworker is requested", setUpStateMapForProviderWithoutCaseData()) @@ -62,7 +62,7 @@ public void verifyStartEventForCaseworker() throws JSONException { 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/wataskmonitor/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java index 9b96998b..2f458ee4 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java @@ -16,7 +16,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; @@ -32,7 +31,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_monitor") + @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_monitor") public V4Pact submitEventForCaseWorker(PactDslWithProvider builder) throws JSONException { return builder .given("A Submit Event for a Caseworker is requested", @@ -67,34 +66,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/wataskmonitor/consumer/ccd/SubmitForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitForCaseWorkerConsumerTest.java index 224040c5..87fcfad0 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitForCaseWorkerConsumerTest.java @@ -15,10 +15,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; @@ -35,7 +32,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_monitor") + @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_monitor") public V4Pact submitCaseWorkerDetails(PactDslWithProvider builder) throws Exception { return builder .given("A Submit for a Caseworker is requested", @@ -69,37 +66,7 @@ public void submitForCaseWorker() throws Exception { 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() { From 8eee892902b7cf673804d2aeb1e42bda8441b08e Mon Sep 17 00:00:00 2001 From: skandala-cgi Date: Wed, 3 Sep 2025 11:08:13 +0100 Subject: [PATCH 2/3] RWA-3688 PACT test changes --- .../ccd/util/PactDslBuilderForCaseDetailsList.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java index 2d299caf..6a916cf3 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java @@ -18,7 +18,6 @@ public static DslPart buildStartEventForCaseWorkerPactDsl(String eventId) { return newJsonBody(o -> o.stringType("event_id", eventId) .stringType("token", "token") - .nullValue("token") .object("case_details", cd -> { cd.numberType("id", 2000); cd.stringMatcher("jurisdiction", ALPHABETIC_REGEX, "IA"); @@ -33,7 +32,6 @@ public static DslPart buildStartForCaseWorkerPactDsl(String eventId) { return newJsonBody( o -> o.stringType("event_id", eventId) .stringType("token", "token") - .nullValue("token") .object("case_details", cd -> { cd.stringMatcher("jurisdiction", ALPHABETIC_REGEX, "IA"); cd.stringMatcher("case_type_id", ALPHABETIC_REGEX, "Asylum"); @@ -56,14 +54,6 @@ public static DslPart buildSubmitForCaseWorkedPactDsl(Long caseId) { .object("case_data", PactDslBuilderForCaseDetailsList::getCaseDataPactDsl)).build(); } - public static DslPart buildSearchResultDsl(Long caseId) { - return newJsonBody(o -> { - o.numberType("total", 1) - .minArrayLike("cases", 1, cd -> { - cd.numberType("id", caseId); - }); - }).build(); - } private static void getCaseDataPactDsl(final LambdaDslObject dataMap) { dataMap From ccd48a6093331d2a31d58f86202bddd500c541f7 Mon Sep 17 00:00:00 2001 From: skandala-cgi Date: Wed, 24 Sep 2025 15:45:08 +0100 Subject: [PATCH 3/3] RWA-3688 PACT test changes --- .../consumer/ccd/StartEventForCaseWorkerConsumerTest.java | 2 +- .../consumer/ccd/StartForCaseWorkerConsumerTest.java | 2 +- .../consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java | 2 +- .../consumer/ccd/SubmitForCaseWorkerConsumerTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartEventForCaseWorkerConsumerTest.java index 4e64a94c..37c6b153 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartEventForCaseWorkerConsumerTest.java @@ -31,7 +31,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_monitor") + @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_monitor") public V4Pact startEventForCaseWorker(PactDslWithProvider builder) throws JSONException { return builder .given("A Start Event for a Caseworker is requested", diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartForCaseWorkerConsumerTest.java index dfc2bec1..29067880 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/StartForCaseWorkerConsumerTest.java @@ -32,7 +32,7 @@ public Map setUpStateMapForProviderWithoutCaseData() { return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_monitor") + @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_monitor") public V4Pact startForCaseWorker(PactDslWithProvider builder) { return builder .given("A Start for a Caseworker is requested", setUpStateMapForProviderWithoutCaseData()) diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java index 2f458ee4..37ab447d 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java @@ -31,7 +31,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_monitor") + @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_monitor") public V4Pact submitEventForCaseWorker(PactDslWithProvider builder) throws JSONException { return builder .given("A Submit Event for a Caseworker is requested", diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitForCaseWorkerConsumerTest.java index 87fcfad0..def942b9 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmonitor/consumer/ccd/SubmitForCaseWorkerConsumerTest.java @@ -32,7 +32,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_monitor") + @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_monitor") public V4Pact submitCaseWorkerDetails(PactDslWithProvider builder) throws Exception { return builder .given("A Submit for a Caseworker is requested",