From ae57598672ccae513bb18701b1aa99bec0fee747 Mon Sep 17 00:00:00 2001 From: MohamedFarouk-HMCTS Date: Wed, 3 Jun 2026 23:55:31 +0100 Subject: [PATCH 1/2] fix for failing test --- .../uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java | 6 ++++-- .../hearing/it/PublishLatestCourtCentreHearingEventsIT.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java index 6c3b8d64b..3882ad7af 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java @@ -273,9 +273,11 @@ public void shouldRequestToPublishCourtListForApplicationApplicantRestrictionOnO withJsonPath("$.courtApplicationApplicantIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(true))))); - // Wait for applicant restriction to land in the projection before publishing + // Wait for applicant restriction to land in the projection before publishing. + // When restricted the applicant is nulled out and the defendant serialises as {} (no keys), + // so we assert on the object being empty rather than firstName being null (absent key ≠ null). courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), - withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants[0].firstName", org.hamcrest.CoreMatchers.nullValue())); + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants[0]", is(java.util.Collections.emptyMap()))); JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java index 1192b9d1e..c074751b6 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java @@ -41,7 +41,7 @@ @NotThreadSafe @TestMethodOrder(MethodOrderer.MethodName.class) -public class PublishLatestCourtCentreHearingEventsIT extends AbstractPublishLatestCourtCentreHearingIT { +public class PublishLatestCourtCentreHearingEventsIT extends AbstractPublishLatestCourtCentreHearingIT { private static final UUID RESUME_ID_WHICH_IS_NOT_TO_BE_INCLUDED_IN_FILTER = RESUME_HEARING_EVENT_DEFINITION_ID; private static final String LISTING_COMMAND_PUBLISH_COURT_LIST = "hearing.command.publish-court-list"; From 1b05a381d3a78268c38e29f0f4598c51bb1bd1be Mon Sep 17 00:00:00 2001 From: MohamedFarouk-HMCTS Date: Thu, 4 Jun 2026 08:26:57 +0100 Subject: [PATCH 2/2] Fix format --- .../cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java index c074751b6..1192b9d1e 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java @@ -41,7 +41,7 @@ @NotThreadSafe @TestMethodOrder(MethodOrderer.MethodName.class) -public class PublishLatestCourtCentreHearingEventsIT extends AbstractPublishLatestCourtCentreHearingIT { +public class PublishLatestCourtCentreHearingEventsIT extends AbstractPublishLatestCourtCentreHearingIT { private static final UUID RESUME_ID_WHICH_IS_NOT_TO_BE_INCLUDED_IN_FILTER = RESUME_HEARING_EVENT_DEFINITION_ID; private static final String LISTING_COMMAND_PUBLISH_COURT_LIST = "hearing.command.publish-court-list";