Skip to content

Fix IT tests #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shettyshrikanth merged 1 commit into from
Jun 10, 2026
Merged

Fix IT tests #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 54 additions & 0 deletions ...n-integration-test/src/test/java/uk/gov/moj/cpp/progression/CreateCourtApplicationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package uk.gov.moj.cpp.progression;

import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasNoJsonPath;
import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
import static java.util.UUID.randomUUID;
import static org.hamcrest.CoreMatchers.equalTo;
Expand Down Expand Up @@ -32,6 +33,10 @@
@SuppressWarnings("squid:S1607")
public class CreateCourtApplicationIT extends AbstractIT {
private static final String COURT_APPLICATION_CREATED = "public.progression.court-application-created";
private static final String MH_ACTIVE_CASE_FIXTURE =
"applications/progression.initiate-court-proceedings-mh-source-active-case.json";
private static final String MH_INACTIVE_CASE_FIXTURE =
"applications/progression.initiate-court-proceedings-mh-source-inactive-case.json";

private final JmsMessageConsumerClient consumerForCourtApplicationCreated = newPublicJmsMessageConsumerClientProvider().withEventNames(COURT_APPLICATION_CREATED).getMessageConsumerClient();

Expand Down Expand Up @@ -109,6 +114,55 @@ public void shouldCreateCourtApplicationLinkedWithCaseAndGetConfirmation() throw
pollProsecutionCasesProgressionFor(caseId, caseMatchers);
}

@Test
public void shouldNotStoreOffencesWhenApplicationSourceIsMHAndCaseIsActive() throws Exception {
addProsecutionCaseToCrownCourt(caseId, defendantId);
pollProsecutionCasesProgressionFor(caseId, getProsecutionCaseMatchers(caseId, defendantId));

final String applicationId = randomUUID().toString();

initiateCourtProceedingsForCourtApplication(applicationId, caseId, MH_ACTIVE_CASE_FIXTURE);

verifyCourtApplicationCreatedEventPublished(applicationId);

final Matcher[] matchers = {
withJsonPath("$.courtApplication.id", is(applicationId)),
withJsonPath("$.courtApplication.applicationStatus", notNullValue()),
hasNoJsonPath("$.courtApplication.courtApplicationCases[0].offences")
};

pollForApplication(applicationId, matchers);
}

@Test
public void shouldPreserveOffencesWhenApplicationSourceIsMHAndCaseIsInactive() throws Exception {
final String defendantId = randomUUID().toString();
addProsecutionCaseToCrownCourt(caseId, defendantId);
pollProsecutionCasesProgressionFor(caseId, getProsecutionCaseMatchers(caseId, defendantId));

final String applicationId = randomUUID().toString();

initiateCourtProceedingsForCourtApplication(applicationId, caseId, MH_INACTIVE_CASE_FIXTURE);

verifyCourtApplicationCreatedEventPublished(applicationId);

final Matcher[] matchers = {
withJsonPath("$.courtApplication.id", is(applicationId)),
withJsonPath("$.courtApplication.courtApplicationCases[0].caseStatus", is("INACTIVE")),
withJsonPath("$.courtApplication.courtApplicationCases[0].offences[0]", notNullValue()),
withJsonPath("$.courtApplication.courtApplicationCases[0].offences[0].offenceCode", is("CA03012"))
};

pollForApplication(applicationId, matchers);
}

private void verifyCourtApplicationCreatedEventPublished(final String applicationId) {
final Optional<JsonObject> message = retrieveMessageBody(consumerForCourtApplicationCreated);
assertTrue(message.isPresent(), "Expected court-application-created event on JMS topic");
final String idFromEvent = message.get().getJsonObject("courtApplication").getString("id");
assertThat(idFromEvent, equalTo(applicationId));
}

private void verifyInMessagingQueueForCourtApplicationCreated(String applicationId) {
final Optional<JsonObject> message = retrieveMessageBody(consumerForCourtApplicationCreated);
assertTrue(message.isPresent());
Expand Down
123 changes: 0 additions & 123 deletions ...ion-test/src/test/java/uk/gov/moj/cpp/progression/InitiateCourtProceedingsMHSourceIT.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .../resources/applications/progression.initiate-court-proceedings-mh-source-active-case.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"caseStatus": "ACTIVE",
"offences": [
{
"id": "OFFENCE_ID",
"id": "3ebe41c9-666d-4964-aa80-a005d89927a4",
"chargeDate": "2020-03-14",
"count": 1,
"isDisposed": false,
Expand Down
2 changes: 1 addition & 1 deletion ...esources/applications/progression.initiate-court-proceedings-mh-source-inactive-case.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"caseStatus": "INACTIVE",
"offences": [
{
"id": "OFFENCE_ID",
"id": "9ce6e439-d5da-4202-a446-ef4ca7072530",
"chargeDate": "2020-03-14",
"count": 1,
"isDisposed": true,
Expand Down
Loading