From b7c39d705f70a5dbcdf4bf5b7f94ef4a56506bc3 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Fri, 5 Jun 2026 12:18:00 +0100 Subject: [PATCH 01/10] increasing test coverage --- .../MessagePersistDurationServiceTest.java | 74 +++++++++++++++++++ .../PatientMigrationRequestServiceTest.java | 55 ++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java create mode 100644 db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java new file mode 100644 index 000000000..0720cf9e4 --- /dev/null +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java @@ -0,0 +1,74 @@ +package uk.nhs.adaptors.connector.service; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.time.Duration; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import uk.nhs.adaptors.connector.dao.MessagePersistDurationDao; +import uk.nhs.adaptors.connector.model.MessagePersistDuration; + +@ExtendWith(MockitoExtension.class) +public class MessagePersistDurationServiceTest { + + @Mock + private MessagePersistDurationDao messagePersistDurationDao; + + @InjectMocks + private MessagePersistDurationService messagePersistDurationService; + + @Test + public void shouldSaveAndReturnPersistDuration() { + var expected = MessagePersistDuration.builder() + .id(1) + .messageType("ehrExtract") + .persistDuration(Duration.ofSeconds(300)) + .callsSinceUpdate(2) + .migrationRequestId(10) + .build(); + + when(messagePersistDurationDao.getMessagePersistDuration(10, "ehrExtract")).thenReturn(expected); + + var actual = messagePersistDurationService.addMessagePersistDuration("ehrExtract", Duration.ofMinutes(5), 2, 10); + + verify(messagePersistDurationDao).saveMessagePersistDuration("ehrExtract", 300L, 2, 10); + assertEquals(expected, actual); + } + + @Test + public void shouldReturnPersistDurationWhenMessageTypeExists() { + var expected = MessagePersistDuration.builder() + .messageType("copc") + .migrationRequestId(99) + .build(); + + when(messagePersistDurationDao.messageTypeExists(99, "copc")).thenReturn(true); + when(messagePersistDurationDao.getMessagePersistDuration(99, "copc")).thenReturn(expected); + + var actual = messagePersistDurationService.getMessagePersistDuration(99, "copc"); + + assertTrue(actual.isPresent()); + assertEquals(expected, actual.get()); + } + + @Test + public void shouldReturnEmptyWhenMessageTypeDoesNotExist() { + when(messagePersistDurationDao.messageTypeExists(7, "missing")).thenReturn(false); + + var actual = messagePersistDurationService.getMessagePersistDuration(7, "missing"); + + assertFalse(actual.isPresent()); + verify(messagePersistDurationDao, never()).getMessagePersistDuration(7, "missing"); + } +} + diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java new file mode 100644 index 000000000..0a85d1dcc --- /dev/null +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java @@ -0,0 +1,55 @@ +package uk.nhs.adaptors.connector.service; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import uk.nhs.adaptors.common.enums.MigrationStatus; +import uk.nhs.adaptors.connector.dao.PatientMigrationRequestDao; +import uk.nhs.adaptors.connector.model.PatientMigrationRequest; + +@ExtendWith(MockitoExtension.class) +public class PatientMigrationRequestServiceTest { + + @Mock + private PatientMigrationRequestDao patientMigrationRequestDao; + + @InjectMocks + private PatientMigrationRequestService patientMigrationRequestService; + + @Test + public void shouldReturnRequestsByMigrationStatus() { + var statuses = List.of(MigrationStatus.REQUEST_RECEIVED); + var request = PatientMigrationRequest.builder() + .id(11) + .conversationId("conversation-id-123") + .build(); + + when(patientMigrationRequestDao.getMigrationRequestsByLatestMigrationStatusIn(statuses)).thenReturn(List.of(request)); + + var actual = patientMigrationRequestService.getMigrationRequestsByMigrationStatusIn(statuses); + + assertEquals(1, actual.size()); + assertEquals("conversation-id-123", actual.get(0).getConversationId()); + } + + @Test + public void shouldReturnTrueWhenMigrationRequestExists() { + when(patientMigrationRequestDao.existsByConversationId("conversation-id-123")).thenReturn(true); + + var exists = patientMigrationRequestService.hasMigrationRequest("conversation-id-123"); + + assertTrue(exists); + verify(patientMigrationRequestDao).existsByConversationId("conversation-id-123"); + } +} + From 88e30332e8201ed22f5adfa2cf1ae7350c49a54a Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Fri, 5 Jun 2026 12:24:53 +0100 Subject: [PATCH 02/10] making copc with capital letters --- .../service/MessagePersistDurationServiceTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java index 0720cf9e4..6eb7fcf80 100644 --- a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java @@ -48,14 +48,14 @@ public void shouldSaveAndReturnPersistDuration() { @Test public void shouldReturnPersistDurationWhenMessageTypeExists() { var expected = MessagePersistDuration.builder() - .messageType("copc") + .messageType("COPC") .migrationRequestId(99) .build(); - when(messagePersistDurationDao.messageTypeExists(99, "copc")).thenReturn(true); - when(messagePersistDurationDao.getMessagePersistDuration(99, "copc")).thenReturn(expected); + when(messagePersistDurationDao.messageTypeExists(99, "COPC")).thenReturn(true); + when(messagePersistDurationDao.getMessagePersistDuration(99, "COPC")).thenReturn(expected); - var actual = messagePersistDurationService.getMessagePersistDuration(99, "copc"); + var actual = messagePersistDurationService.getMessagePersistDuration(99, "COPC"); assertTrue(actual.isPresent()); assertEquals(expected, actual.get()); From e8682820dc0a1b0e3e60d954b073557a90279cf4 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Fri, 5 Jun 2026 12:40:56 +0100 Subject: [PATCH 03/10] checkstyle --- .../MessagePersistDurationServiceTest.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java index 6eb7fcf80..16e599ba6 100644 --- a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java @@ -21,6 +21,12 @@ @ExtendWith(MockitoExtension.class) public class MessagePersistDurationServiceTest { + public static final int THREE_H_SECONDS = 300; + public static final int MIGRATION_REQUEST_ID = 10; + public static final int TWO = 2; + public static final int NINETY_NINE = 99; + public static final int SEVEN = 7; + public static final long PERSIST_DURATION = 300L; @Mock private MessagePersistDurationDao messagePersistDurationDao; @@ -32,16 +38,16 @@ public void shouldSaveAndReturnPersistDuration() { var expected = MessagePersistDuration.builder() .id(1) .messageType("ehrExtract") - .persistDuration(Duration.ofSeconds(300)) - .callsSinceUpdate(2) - .migrationRequestId(10) + .persistDuration(Duration.ofSeconds(THREE_H_SECONDS)) + .callsSinceUpdate(TWO) + .migrationRequestId(MIGRATION_REQUEST_ID) .build(); - when(messagePersistDurationDao.getMessagePersistDuration(10, "ehrExtract")).thenReturn(expected); + when(messagePersistDurationDao.getMessagePersistDuration(MIGRATION_REQUEST_ID, "ehrExtract")).thenReturn(expected); var actual = messagePersistDurationService.addMessagePersistDuration("ehrExtract", Duration.ofMinutes(5), 2, 10); - verify(messagePersistDurationDao).saveMessagePersistDuration("ehrExtract", 300L, 2, 10); + verify(messagePersistDurationDao).saveMessagePersistDuration("ehrExtract", PERSIST_DURATION, 2, 10); assertEquals(expected, actual); } @@ -49,13 +55,13 @@ public void shouldSaveAndReturnPersistDuration() { public void shouldReturnPersistDurationWhenMessageTypeExists() { var expected = MessagePersistDuration.builder() .messageType("COPC") - .migrationRequestId(99) + .migrationRequestId(NINETY_NINE) .build(); - when(messagePersistDurationDao.messageTypeExists(99, "COPC")).thenReturn(true); - when(messagePersistDurationDao.getMessagePersistDuration(99, "COPC")).thenReturn(expected); + when(messagePersistDurationDao.messageTypeExists(NINETY_NINE, "COPC")).thenReturn(true); + when(messagePersistDurationDao.getMessagePersistDuration(NINETY_NINE, "COPC")).thenReturn(expected); - var actual = messagePersistDurationService.getMessagePersistDuration(99, "COPC"); + var actual = messagePersistDurationService.getMessagePersistDuration(NINETY_NINE, "COPC"); assertTrue(actual.isPresent()); assertEquals(expected, actual.get()); @@ -63,12 +69,12 @@ public void shouldReturnPersistDurationWhenMessageTypeExists() { @Test public void shouldReturnEmptyWhenMessageTypeDoesNotExist() { - when(messagePersistDurationDao.messageTypeExists(7, "missing")).thenReturn(false); + when(messagePersistDurationDao.messageTypeExists(SEVEN, "missing")).thenReturn(false); - var actual = messagePersistDurationService.getMessagePersistDuration(7, "missing"); + var actual = messagePersistDurationService.getMessagePersistDuration(SEVEN, "missing"); assertFalse(actual.isPresent()); - verify(messagePersistDurationDao, never()).getMessagePersistDuration(7, "missing"); + verify(messagePersistDurationDao, never()).getMessagePersistDuration(SEVEN, "missing"); } } From 54cdc992f4f1d3173a152402fea33ae1f97f68fa Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Fri, 5 Jun 2026 12:46:09 +0100 Subject: [PATCH 04/10] checkstyle --- .../service/MessagePersistDurationServiceTest.java | 11 ++++++----- .../service/PatientMigrationRequestServiceTest.java | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java index 16e599ba6..433e47ae0 100644 --- a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java @@ -22,11 +22,12 @@ public class MessagePersistDurationServiceTest { public static final int THREE_H_SECONDS = 300; - public static final int MIGRATION_REQUEST_ID = 10; + public static final int TEN = 10; public static final int TWO = 2; public static final int NINETY_NINE = 99; public static final int SEVEN = 7; public static final long PERSIST_DURATION = 300L; + public static final int FIVE = 5; @Mock private MessagePersistDurationDao messagePersistDurationDao; @@ -40,14 +41,14 @@ public void shouldSaveAndReturnPersistDuration() { .messageType("ehrExtract") .persistDuration(Duration.ofSeconds(THREE_H_SECONDS)) .callsSinceUpdate(TWO) - .migrationRequestId(MIGRATION_REQUEST_ID) + .migrationRequestId(TEN) .build(); - when(messagePersistDurationDao.getMessagePersistDuration(MIGRATION_REQUEST_ID, "ehrExtract")).thenReturn(expected); + when(messagePersistDurationDao.getMessagePersistDuration(TEN, "ehrExtract")).thenReturn(expected); - var actual = messagePersistDurationService.addMessagePersistDuration("ehrExtract", Duration.ofMinutes(5), 2, 10); + var actual = messagePersistDurationService.addMessagePersistDuration("ehrExtract", Duration.ofMinutes(FIVE), TWO, TEN); - verify(messagePersistDurationDao).saveMessagePersistDuration("ehrExtract", PERSIST_DURATION, 2, 10); + verify(messagePersistDurationDao).saveMessagePersistDuration("ehrExtract", PERSIST_DURATION, TWO, TEN); assertEquals(expected, actual); } diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java index 0a85d1dcc..e0e399fa7 100644 --- a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java @@ -20,6 +20,7 @@ @ExtendWith(MockitoExtension.class) public class PatientMigrationRequestServiceTest { + public static final int ELEVEN = 11; @Mock private PatientMigrationRequestDao patientMigrationRequestDao; @@ -30,7 +31,7 @@ public class PatientMigrationRequestServiceTest { public void shouldReturnRequestsByMigrationStatus() { var statuses = List.of(MigrationStatus.REQUEST_RECEIVED); var request = PatientMigrationRequest.builder() - .id(11) + .id(ELEVEN) .conversationId("conversation-id-123") .build(); From 4a4ac0b96d02b2bee5e5e45b2c4a54ac5d365533 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:13:22 +0100 Subject: [PATCH 05/10] refactoring --- .../MessagePersistDurationServiceTest.java | 23 ++++++++++--------- .../PatientMigrationRequestServiceTest.java | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java index 433e47ae0..241c67c79 100644 --- a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java @@ -22,12 +22,13 @@ public class MessagePersistDurationServiceTest { public static final int THREE_H_SECONDS = 300; - public static final int TEN = 10; - public static final int TWO = 2; + public static final int MIGRATION_REQUEST_ID = 101010; + public static final int TWO_CALLS = 2; public static final int NINETY_NINE = 99; public static final int SEVEN = 7; public static final long PERSIST_DURATION = 300L; public static final int FIVE = 5; + public static final String COPC = "COPC"; @Mock private MessagePersistDurationDao messagePersistDurationDao; @@ -40,29 +41,29 @@ public void shouldSaveAndReturnPersistDuration() { .id(1) .messageType("ehrExtract") .persistDuration(Duration.ofSeconds(THREE_H_SECONDS)) - .callsSinceUpdate(TWO) - .migrationRequestId(TEN) + .callsSinceUpdate(TWO_CALLS) + .migrationRequestId(MIGRATION_REQUEST_ID) .build(); - when(messagePersistDurationDao.getMessagePersistDuration(TEN, "ehrExtract")).thenReturn(expected); + when(messagePersistDurationDao.getMessagePersistDuration(MIGRATION_REQUEST_ID, "ehrExtract")).thenReturn(expected); - var actual = messagePersistDurationService.addMessagePersistDuration("ehrExtract", Duration.ofMinutes(FIVE), TWO, TEN); + var actual = messagePersistDurationService.addMessagePersistDuration("ehrExtract", Duration.ofMinutes(FIVE), TWO_CALLS, MIGRATION_REQUEST_ID); - verify(messagePersistDurationDao).saveMessagePersistDuration("ehrExtract", PERSIST_DURATION, TWO, TEN); + verify(messagePersistDurationDao).saveMessagePersistDuration("ehrExtract", PERSIST_DURATION, TWO_CALLS, MIGRATION_REQUEST_ID); assertEquals(expected, actual); } @Test public void shouldReturnPersistDurationWhenMessageTypeExists() { var expected = MessagePersistDuration.builder() - .messageType("COPC") + .messageType(COPC) .migrationRequestId(NINETY_NINE) .build(); - when(messagePersistDurationDao.messageTypeExists(NINETY_NINE, "COPC")).thenReturn(true); - when(messagePersistDurationDao.getMessagePersistDuration(NINETY_NINE, "COPC")).thenReturn(expected); + when(messagePersistDurationDao.messageTypeExists(NINETY_NINE, COPC)).thenReturn(true); + when(messagePersistDurationDao.getMessagePersistDuration(NINETY_NINE, COPC)).thenReturn(expected); - var actual = messagePersistDurationService.getMessagePersistDuration(NINETY_NINE, "COPC"); + var actual = messagePersistDurationService.getMessagePersistDuration(NINETY_NINE, COPC); assertTrue(actual.isPresent()); assertEquals(expected, actual.get()); diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java index e0e399fa7..3cfb7eb67 100644 --- a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java @@ -20,7 +20,7 @@ @ExtendWith(MockitoExtension.class) public class PatientMigrationRequestServiceTest { - public static final int ELEVEN = 11; + public static final int PATIENT_MIGRATION_REQUEST = 11111111; @Mock private PatientMigrationRequestDao patientMigrationRequestDao; @@ -31,7 +31,7 @@ public class PatientMigrationRequestServiceTest { public void shouldReturnRequestsByMigrationStatus() { var statuses = List.of(MigrationStatus.REQUEST_RECEIVED); var request = PatientMigrationRequest.builder() - .id(ELEVEN) + .id(PATIENT_MIGRATION_REQUEST) .conversationId("conversation-id-123") .build(); From 2e15d95ecb4f03664856fb0bda45a6bc11f8b9d3 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:17:59 +0100 Subject: [PATCH 06/10] checkstyle --- .../connector/service/MessagePersistDurationServiceTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java index 241c67c79..daf6fa1f9 100644 --- a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java @@ -47,7 +47,10 @@ public void shouldSaveAndReturnPersistDuration() { when(messagePersistDurationDao.getMessagePersistDuration(MIGRATION_REQUEST_ID, "ehrExtract")).thenReturn(expected); - var actual = messagePersistDurationService.addMessagePersistDuration("ehrExtract", Duration.ofMinutes(FIVE), TWO_CALLS, MIGRATION_REQUEST_ID); + var actual = messagePersistDurationService.addMessagePersistDuration("ehrExtract", + Duration.ofMinutes(FIVE), + TWO_CALLS, + MIGRATION_REQUEST_ID); verify(messagePersistDurationDao).saveMessagePersistDuration("ehrExtract", PERSIST_DURATION, TWO_CALLS, MIGRATION_REQUEST_ID); assertEquals(expected, actual); From aebe78890550a0c691e789f1553300190c3a6959 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Mon, 8 Jun 2026 12:31:31 +0100 Subject: [PATCH 07/10] adding more tests --- .../adaptors/common/util/FileUtilTest.java | 24 +++++++++++++++++++ .../src/test/resources/file-util/sample.txt | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java create mode 100644 common/src/test/resources/file-util/sample.txt diff --git a/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java b/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java new file mode 100644 index 000000000..0547eaee3 --- /dev/null +++ b/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java @@ -0,0 +1,24 @@ +package uk.nhs.adaptors.common.util; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.io.FileNotFoundException; + +import org.junit.jupiter.api.Test; + +public class FileUtilTest { + + @Test + public void shouldReadTextFromClasspathResource() { + var content = FileUtil.readResourceAsString("/file-util/sample.txt"); + + assertEquals("sample-content\n", content); + } + + @Test + public void shouldThrowWhenResourceDoesNotExist() { + assertThrows(FileNotFoundException.class, () -> FileUtil.readResourceAsString("/file-util/missing.txt")); + } +} + diff --git a/common/src/test/resources/file-util/sample.txt b/common/src/test/resources/file-util/sample.txt new file mode 100644 index 000000000..ea0b6a931 --- /dev/null +++ b/common/src/test/resources/file-util/sample.txt @@ -0,0 +1,2 @@ +sample-content + From 2771856774f93a1c84c4277cb4ff0eae26edc4c3 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Mon, 8 Jun 2026 12:57:47 +0100 Subject: [PATCH 08/10] fixing a failing test --- common/build.gradle | 4 ++-- .../test/java/uk/nhs/adaptors/common/util/FileUtilTest.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 5c1547307..bec4c3b10 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -29,8 +29,8 @@ dependencies { compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' compileOnly 'jakarta.annotation:jakarta.annotation-api:3.0.0' - testImplementation 'org.junit.jupiter:junit-jupiter:6.0.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter:6.0.0' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java b/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java index 0547eaee3..0106de575 100644 --- a/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java +++ b/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java @@ -13,7 +13,7 @@ public class FileUtilTest { public void shouldReadTextFromClasspathResource() { var content = FileUtil.readResourceAsString("/file-util/sample.txt"); - assertEquals("sample-content\n", content); + assertEquals("sample-content", content.trim()); } @Test @@ -21,4 +21,3 @@ public void shouldThrowWhenResourceDoesNotExist() { assertThrows(FileNotFoundException.class, () -> FileUtil.readResourceAsString("/file-util/missing.txt")); } } - From d27396f72412e1b9624e2348364f55d5693ec9dd Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Mon, 8 Jun 2026 12:58:54 +0100 Subject: [PATCH 09/10] fixing a failing test --- .../src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java b/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java index 0106de575..1f91d4fe1 100644 --- a/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java +++ b/common/src/test/java/uk/nhs/adaptors/common/util/FileUtilTest.java @@ -10,7 +10,7 @@ public class FileUtilTest { @Test - public void shouldReadTextFromClasspathResource() { + public void shouldReadTextResource() { var content = FileUtil.readResourceAsString("/file-util/sample.txt"); assertEquals("sample-content", content.trim()); From d80dabbcf29d4e761df77f5fef90024f3e09a781 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Mon, 8 Jun 2026 15:01:37 +0100 Subject: [PATCH 10/10] refactoring --- .../connector/service/MessagePersistDurationServiceTest.java | 4 ++-- .../connector/service/PatientMigrationRequestServiceTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java index daf6fa1f9..207fdfc60 100644 --- a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/MessagePersistDurationServiceTest.java @@ -21,7 +21,7 @@ @ExtendWith(MockitoExtension.class) public class MessagePersistDurationServiceTest { - public static final int THREE_H_SECONDS = 300; + public static final int PERSIST_DURATION_SECONDS = 300; public static final int MIGRATION_REQUEST_ID = 101010; public static final int TWO_CALLS = 2; public static final int NINETY_NINE = 99; @@ -40,7 +40,7 @@ public void shouldSaveAndReturnPersistDuration() { var expected = MessagePersistDuration.builder() .id(1) .messageType("ehrExtract") - .persistDuration(Duration.ofSeconds(THREE_H_SECONDS)) + .persistDuration(Duration.ofSeconds(PERSIST_DURATION_SECONDS)) .callsSinceUpdate(TWO_CALLS) .migrationRequestId(MIGRATION_REQUEST_ID) .build(); diff --git a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java index 3cfb7eb67..ce401a1c6 100644 --- a/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java +++ b/db-connector/src/test/java/uk/nhs/adaptors/connector/service/PatientMigrationRequestServiceTest.java @@ -20,7 +20,7 @@ @ExtendWith(MockitoExtension.class) public class PatientMigrationRequestServiceTest { - public static final int PATIENT_MIGRATION_REQUEST = 11111111; + private static final int MIGRATION_REQUEST_ID = 11111111; @Mock private PatientMigrationRequestDao patientMigrationRequestDao; @@ -31,7 +31,7 @@ public class PatientMigrationRequestServiceTest { public void shouldReturnRequestsByMigrationStatus() { var statuses = List.of(MigrationStatus.REQUEST_RECEIVED); var request = PatientMigrationRequest.builder() - .id(PATIENT_MIGRATION_REQUEST) + .id(MIGRATION_REQUEST_ID) .conversationId("conversation-id-123") .build();