Skip to content

Logging test coverage #341

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
ORybak5 merged 10 commits into from
Jul 27, 2026
Merged

Logging test coverage #341

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e6b2b69
adding more tests
ORybak5 Jul 24, 2026
18eea00
Merge branch 'main' into logging-improvements4
ORybak5 Jul 24, 2026
d9e8162
checkstyle
ORybak5 Jul 24, 2026
09a3801
Merge remote-tracking branch 'origin/logging-improvements4' into logg…
ORybak5 Jul 24, 2026
85ed72c
checkstyle
ORybak5 Jul 24, 2026
86ff66c
additional tests
ORybak5 Jul 27, 2026
9320b05
Merge branch 'main' into logging-improvements5
ORybak5 Jul 27, 2026
f2ec465
a missing import
ORybak5 Jul 27, 2026
be4c27f
Merge remote-tracking branch 'origin/logging-improvements5' into logg…
ORybak5 Jul 27, 2026
555e2ea
removing trialing spaces
ORybak5 Jul 27, 2026
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
149 changes: 149 additions & 0 deletions service/src/test/java/uk/nhs/adaptors/gpc/consumer/sds/SdsClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import reactor.test.StepVerifier;
import uk.nhs.adaptors.gpc.consumer.sds.builder.SdsRequestBuilder;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.verify;

@ExtendWith(MockitoExtension.class)
class SdsClientTest {
Expand Down Expand Up @@ -117,6 +118,154 @@ void When_BothBundlesAreValid_Expect_CallForGetStructuredRecordReturnsSdsRespons
.verifyComplete();
}

@Test
void When_DeviceBundleHasNoEntries_Expect_CallForGetStructuredRecordErrors() {
when(sdsRequestBuilder.buildGetStructuredRecordAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(deviceRequest);
when(sdsRequestBuilder.buildGetStructuredRecordEndpointRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(endpointRequest);
stubDeviceResponse(buildEmptyBundle());

StepVerifier.create(sdsClient.callForGetStructuredRecord(FROM_ODS_CODE, CORRELATION_ID))
.expectErrorSatisfies(e -> assertThat(e).isInstanceOf(RuntimeException.class)
.hasMessageContaining("SDS returned no result"))
.verify();
}

@Test
void When_EndpointBundleHasNoEntries_Expect_CallForGetStructuredRecordErrors() {
when(sdsRequestBuilder.buildGetStructuredRecordAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(deviceRequest);
when(sdsRequestBuilder.buildGetStructuredRecordEndpointRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(endpointRequest);
stubDeviceResponse(buildDeviceBundle(TEST_ASID));
stubEndpointResponse(buildEmptyBundle());

StepVerifier.create(sdsClient.callForGetStructuredRecord(FROM_ODS_CODE, CORRELATION_ID))
.expectErrorSatisfies(e -> assertThat(e).isInstanceOf(RuntimeException.class)
.hasMessageContaining("SDS returned no result"))
.verify();
}

@Test
void When_EndpointAddressIsBlank_Expect_CallForGetStructuredRecordErrors() {
when(sdsRequestBuilder.buildGetStructuredRecordAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(deviceRequest);
when(sdsRequestBuilder.buildGetStructuredRecordEndpointRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(endpointRequest);
stubDeviceResponse(buildDeviceBundle(TEST_ASID));
stubEndpointResponse(buildEndpointBundle("", TEST_MHS_ID));

StepVerifier.create(sdsClient.callForGetStructuredRecord(FROM_ODS_CODE, CORRELATION_ID))
.expectErrorSatisfies(e -> assertThat(e).isInstanceOf(RuntimeException.class)
.hasMessageContaining("empty address"))
.verify();
}

@Test
void When_EndpointMissingNhsMhsIdIdentifier_Expect_CallForGetStructuredRecordErrors() {
when(sdsRequestBuilder.buildGetStructuredRecordAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(deviceRequest);
when(sdsRequestBuilder.buildGetStructuredRecordEndpointRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(endpointRequest);
stubDeviceResponse(buildDeviceBundle(TEST_ASID));
stubEndpointResponse(buildEndpointBundleWithoutMhsId(TEST_ADDRESS));

StepVerifier.create(sdsClient.callForGetStructuredRecord(FROM_ODS_CODE, CORRELATION_ID))
.expectErrorSatisfies(e -> assertThat(e).isInstanceOf(RuntimeException.class)
.hasMessageContaining(NHS_MHS_ID_SYSTEM))
.verify();
}

@Test
void When_DeviceBundleHasMultipleEntries_Expect_CallForGetStructuredRecordSucceeds() {
when(sdsRequestBuilder.buildGetStructuredRecordAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(deviceRequest);
when(sdsRequestBuilder.buildGetStructuredRecordEndpointRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(endpointRequest);
stubDeviceResponse(buildDeviceBundleWithMultipleEntries(TEST_ASID, "other-asid"));
stubEndpointResponse(buildEndpointBundle(TEST_ADDRESS, TEST_MHS_ID));

StepVerifier.create(sdsClient.callForGetStructuredRecord(FROM_ODS_CODE, CORRELATION_ID))
.assertNext(data -> assertThat(data.getNhsSpineAsid()).isEqualTo(TEST_ASID))
.verifyComplete();
}

@Test
void When_CallingForMigrateStructuredRecord_Expect_CorrectBuilderMethodsInvoked() {
when(sdsRequestBuilder.buildMigrateStructuredRecordAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(deviceRequest);
when(sdsRequestBuilder.buildMigrateStructuredRecordEndpointRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(endpointRequest);
stubDeviceResponse(buildDeviceBundle(TEST_ASID));
stubEndpointResponse(buildEndpointBundle(TEST_ADDRESS, TEST_MHS_ID));

sdsClient.callForMigrateStructuredRecord(FROM_ODS_CODE, CORRELATION_ID).block();

verify(sdsRequestBuilder).buildMigrateStructuredRecordAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID);
verify(sdsRequestBuilder).buildMigrateStructuredRecordEndpointRequest(FROM_ODS_CODE, CORRELATION_ID);
}

@Test
void When_CallingForPatientSearchAccessDocument_Expect_CorrectBuilderMethodsInvoked() {
when(sdsRequestBuilder.buildPatientSearchAccessDocumentAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(deviceRequest);
when(sdsRequestBuilder.buildPatientSearchAccessDocumentEndpointRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(endpointRequest);
stubDeviceResponse(buildDeviceBundle(TEST_ASID));
stubEndpointResponse(buildEndpointBundle(TEST_ADDRESS, TEST_MHS_ID));

sdsClient.callForPatientSearchAccessDocument(FROM_ODS_CODE, CORRELATION_ID).block();

verify(sdsRequestBuilder).buildPatientSearchAccessDocumentAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID);
verify(sdsRequestBuilder).buildPatientSearchAccessDocumentEndpointRequest(FROM_ODS_CODE, CORRELATION_ID);
}

@Test
void When_CallingForSearchForDocumentRecord_Expect_CorrectBuilderMethodsInvoked() {
when(sdsRequestBuilder.buildSearchForDocumentAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(deviceRequest);
when(sdsRequestBuilder.buildSearchForDocumentEndpointRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(endpointRequest);
stubDeviceResponse(buildDeviceBundle(TEST_ASID));
stubEndpointResponse(buildEndpointBundle(TEST_ADDRESS, TEST_MHS_ID));

sdsClient.callForSearchForDocumentRecord(FROM_ODS_CODE, CORRELATION_ID).block();

verify(sdsRequestBuilder).buildSearchForDocumentAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID);
verify(sdsRequestBuilder).buildSearchForDocumentEndpointRequest(FROM_ODS_CODE, CORRELATION_ID);
}

@Test
void When_CallingForRetrieveDocumentRecord_Expect_CorrectBuilderMethodsInvoked() {
when(sdsRequestBuilder.buildRetrieveDocumentAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(deviceRequest);
when(sdsRequestBuilder.buildRetrieveDocumentEndpointRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(endpointRequest);
stubDeviceResponse(buildDeviceBundle(TEST_ASID));
stubEndpointResponse(buildEndpointBundle(TEST_ADDRESS, TEST_MHS_ID));

sdsClient.callForRetrieveDocumentRecord(FROM_ODS_CODE, CORRELATION_ID).block();

verify(sdsRequestBuilder).buildRetrieveDocumentAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID);
verify(sdsRequestBuilder).buildRetrieveDocumentEndpointRequest(FROM_ODS_CODE, CORRELATION_ID);
}

@Test
void When_CallingForMigrateDocumentRecord_Expect_CorrectBuilderMethodsInvoked() {
when(sdsRequestBuilder.buildMigrateDocumentAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(deviceRequest);
when(sdsRequestBuilder.buildMigrateDocumentEndpointRequest(FROM_ODS_CODE, CORRELATION_ID))
.thenReturn(endpointRequest);
stubDeviceResponse(buildDeviceBundle(TEST_ASID));
stubEndpointResponse(buildEndpointBundle(TEST_ADDRESS, TEST_MHS_ID));

sdsClient.callForMigrateDocumentRecord(FROM_ODS_CODE, CORRELATION_ID).block();

verify(sdsRequestBuilder).buildMigrateDocumentAsDeviceRequest(FROM_ODS_CODE, CORRELATION_ID);
verify(sdsRequestBuilder).buildMigrateDocumentEndpointRequest(FROM_ODS_CODE, CORRELATION_ID);
}

@SuppressWarnings("unchecked")
private void stubDeviceResponse(String json) {
when(deviceRequest.retrieve()).thenReturn(deviceResponseSpec);
Expand Down
Loading