Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public void verifyStartEventForCaseworker() throws JSONException {
START_APPEAL);

assertThat(startEventResponse.getEventId(), is(START_APPEAL));
assertNotNull(startEventResponse.getToken());
assertCaseDetails(startEventResponse.getCaseDetails());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<String, Object> 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<String, String> caseManagementLocation = (Map<String, String>) 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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<String, Object> 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<String, String> caseManagementLocation = (Map<String, String>) 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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand All @@ -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
Expand Down