Skip to content

Commit 2ca64d9

Browse files
chiaramapellimtchiaramapellimt
committed
Restore main for test while I debug docker
1 parent df99f45 commit 2ca64d9

File tree

1 file changed

+55
-54
lines changed

1 file changed

+55
-54
lines changed

‎service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/SendAcknowledgementComponentTest.java‎

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
55
import static org.mockito.ArgumentMatchers.any;
66
import static org.mockito.Mockito.doThrow;
7+
import static org.mockito.Mockito.lenient;
78
import static org.mockito.Mockito.verify;
89
import static org.mockito.Mockito.when;
910

@@ -39,7 +40,7 @@
3940
@ExtendWith({SpringExtension.class, MongoDBExtension.class, ActiveMQExtension.class, MockitoExtension.class})
4041
@DirtiesContext
4142
@SpringBootTest(properties = {
42-
"command.line.runner.enabled=false"})
43+
"command.line.runner.enabled=false"})
4344
public class SendAcknowledgementComponentTest {
4445
private static final String GENERATED_RANDOM_ID = "GENERATED-RANDOM-ID";
4546
private static final String FROM_ASID = "0000222-from-asid";
@@ -82,7 +83,7 @@ public class SendAcknowledgementComponentTest {
8283
@BeforeEach
8384
public void setUp() {
8485
when(randomIdGeneratorService.createNewId()).thenReturn(GENERATED_RANDOM_ID);
85-
// when(timestampService.now()).thenReturn(Instant.parse(DATE));
86+
lenient().when(timestampService.now()).thenReturn(Instant.parse(DATE));
8687

8788
ehrExtractStatus = EhrExtractStatusTestUtils.prepareEhrExtractStatus();
8889
ehrExtractStatusRepository.save(ehrExtractStatus);
@@ -112,26 +113,26 @@ public void When_AcknowledgementTaskRunsTwice_Expect_DatabaseOverwritesEhrExtrac
112113
@Test
113114
public void When_NegativeAcknowledgementTaskExecuted_Expect_ValidRequestSentToMhs() {
114115
var taskDefinition =
115-
SendAcknowledgementTaskDefinition.builder()
116-
.fromAsid(FROM_ASID)
117-
.toAsid(TO_ASID)
118-
.fromOdsCode(FROM_ODS_CODE)
119-
.toOdsCode(TO_ODS_CODE)
120-
.ehrRequestMessageId(EHR_REQUEST_MESSAGE_ID)
121-
.reasonCode(REASON_CODE)
122-
.detail(REASON_MESSAGE)
123-
.conversationId(EhrStatusConstants.CONVERSATION_ID)
124-
.taskId(TASK_ID)
125-
.typeCode(NEGATIVE_ACK_TYPE_CODE)
126-
.build();
116+
SendAcknowledgementTaskDefinition.builder()
117+
.fromAsid(FROM_ASID)
118+
.toAsid(TO_ASID)
119+
.fromOdsCode(FROM_ODS_CODE)
120+
.toOdsCode(TO_ODS_CODE)
121+
.ehrRequestMessageId(EHR_REQUEST_MESSAGE_ID)
122+
.reasonCode(REASON_CODE)
123+
.detail(REASON_MESSAGE)
124+
.conversationId(EhrStatusConstants.CONVERSATION_ID)
125+
.taskId(TASK_ID)
126+
.typeCode(NEGATIVE_ACK_TYPE_CODE)
127+
.build();
127128

128129
sendAcknowledgementExecutor.execute(taskDefinition);
129130

130131
verify(mhsRequestBuilder).buildSendAcknowledgementRequest(
131-
asString(expectedNackMessage), FROM_ODS_CODE, EhrStatusConstants.CONVERSATION_ID, GENERATED_RANDOM_ID);
132+
asString(expectedNackMessage), FROM_ODS_CODE, EhrStatusConstants.CONVERSATION_ID, GENERATED_RANDOM_ID);
132133

133134
EhrExtractStatus updatedEhrExtractStatus =
134-
ehrExtractStatusRepository.findByConversationId(EhrStatusConstants.CONVERSATION_ID).get();
135+
ehrExtractStatusRepository.findByConversationId(EhrStatusConstants.CONVERSATION_ID).get();
135136
EhrExtractStatus.AckToRequester ackToRequester = updatedEhrExtractStatus.getAckToRequester();
136137
assertThat(ackToRequester.getTaskId()).isEqualTo(TASK_ID);
137138
assertThat(ackToRequester.getMessageId()).isEqualTo(GENERATED_RANDOM_ID);
@@ -143,24 +144,24 @@ public void When_NegativeAcknowledgementTaskExecuted_Expect_ValidRequestSentToMh
143144
@Test
144145
public void When_PositiveAcknowledgementTaskExecuted_Expect_ValidRequestSentToMhs() {
145146
var taskDefinition =
146-
SendAcknowledgementTaskDefinition.builder()
147-
.fromAsid(FROM_ASID)
148-
.toAsid(TO_ASID)
149-
.fromOdsCode(FROM_ODS_CODE)
150-
.toOdsCode(TO_ODS_CODE)
151-
.ehrRequestMessageId(EHR_REQUEST_MESSAGE_ID)
152-
.conversationId(EhrStatusConstants.CONVERSATION_ID)
153-
.taskId(TASK_ID)
154-
.typeCode(POSITIVE_ACK_TYPE_CODE)
155-
.build();
147+
SendAcknowledgementTaskDefinition.builder()
148+
.fromAsid(FROM_ASID)
149+
.toAsid(TO_ASID)
150+
.fromOdsCode(FROM_ODS_CODE)
151+
.toOdsCode(TO_ODS_CODE)
152+
.ehrRequestMessageId(EHR_REQUEST_MESSAGE_ID)
153+
.conversationId(EhrStatusConstants.CONVERSATION_ID)
154+
.taskId(TASK_ID)
155+
.typeCode(POSITIVE_ACK_TYPE_CODE)
156+
.build();
156157

157158
sendAcknowledgementExecutor.execute(taskDefinition);
158159

159160
verify(mhsRequestBuilder).buildSendAcknowledgementRequest(
160-
asString(expectedAckMessage), FROM_ODS_CODE, EhrStatusConstants.CONVERSATION_ID, GENERATED_RANDOM_ID);
161+
asString(expectedAckMessage), FROM_ODS_CODE, EhrStatusConstants.CONVERSATION_ID, GENERATED_RANDOM_ID);
161162

162163
EhrExtractStatus updatedEhrExtractStatus =
163-
ehrExtractStatusRepository.findByConversationId(EhrStatusConstants.CONVERSATION_ID).get();
164+
ehrExtractStatusRepository.findByConversationId(EhrStatusConstants.CONVERSATION_ID).get();
164165
EhrExtractStatus.AckToRequester ackToRequester = updatedEhrExtractStatus.getAckToRequester();
165166
assertThat(ackToRequester.getTaskId()).isEqualTo(TASK_ID);
166167
assertThat(ackToRequester.getMessageId()).isEqualTo(GENERATED_RANDOM_ID);
@@ -172,51 +173,51 @@ public void When_PositiveAcknowledgementTaskExecuted_Expect_ValidRequestSentToMh
172173
@Test
173174
public void When_SendAckTaskExecuted_WithMhsConnectionException_Expect_ExceptionThrownAndDbNotUpdated() {
174175
var taskDefinition =
175-
SendAcknowledgementTaskDefinition.builder()
176-
.fromAsid(FROM_ASID)
177-
.toAsid(TO_ASID)
178-
.fromOdsCode(FROM_ODS_CODE)
179-
.toOdsCode(TO_ODS_CODE)
180-
.ehrRequestMessageId(EHR_REQUEST_MESSAGE_ID)
181-
.conversationId(EhrStatusConstants.CONVERSATION_ID)
182-
.taskId(TASK_ID)
183-
.typeCode(POSITIVE_ACK_TYPE_CODE)
184-
.build();
176+
SendAcknowledgementTaskDefinition.builder()
177+
.fromAsid(FROM_ASID)
178+
.toAsid(TO_ASID)
179+
.fromOdsCode(FROM_ODS_CODE)
180+
.toOdsCode(TO_ODS_CODE)
181+
.ehrRequestMessageId(EHR_REQUEST_MESSAGE_ID)
182+
.conversationId(EhrStatusConstants.CONVERSATION_ID)
183+
.taskId(TASK_ID)
184+
.typeCode(POSITIVE_ACK_TYPE_CODE)
185+
.build();
185186

186187
doThrow(MhsConnectionException.class).when(mhsClient).sendMessageToMHS(any());
187188

188189
assertThatExceptionOfType(MhsConnectionException.class)
189-
.isThrownBy(() -> sendAcknowledgementExecutor.execute(taskDefinition));
190+
.isThrownBy(() -> sendAcknowledgementExecutor.execute(taskDefinition));
190191

191192
var updatedEhrExtractStatus = ehrExtractStatusRepository
192-
.findByConversationId(EhrStatusConstants.CONVERSATION_ID)
193-
.orElseThrow();
193+
.findByConversationId(EhrStatusConstants.CONVERSATION_ID)
194+
.orElseThrow();
194195

195196
assertThat(updatedEhrExtractStatus.getAckToRequester()).isNull();
196197
}
197198

198199
@Test
199200
public void When_SendAckTaskExecuted_WithMhsServerErrorException_Expect_ExceptionThrownAndDbNotUpdated() {
200201
var taskDefinition =
201-
SendAcknowledgementTaskDefinition.builder()
202-
.fromAsid(FROM_ASID)
203-
.toAsid(TO_ASID)
204-
.fromOdsCode(FROM_ODS_CODE)
205-
.toOdsCode(TO_ODS_CODE)
206-
.ehrRequestMessageId(EHR_REQUEST_MESSAGE_ID)
207-
.conversationId(EhrStatusConstants.CONVERSATION_ID)
208-
.taskId(TASK_ID)
209-
.typeCode(POSITIVE_ACK_TYPE_CODE)
210-
.build();
202+
SendAcknowledgementTaskDefinition.builder()
203+
.fromAsid(FROM_ASID)
204+
.toAsid(TO_ASID)
205+
.fromOdsCode(FROM_ODS_CODE)
206+
.toOdsCode(TO_ODS_CODE)
207+
.ehrRequestMessageId(EHR_REQUEST_MESSAGE_ID)
208+
.conversationId(EhrStatusConstants.CONVERSATION_ID)
209+
.taskId(TASK_ID)
210+
.typeCode(POSITIVE_ACK_TYPE_CODE)
211+
.build();
211212

212213
doThrow(MhsServerErrorException.class).when(mhsClient).sendMessageToMHS(any());
213214

214215
assertThatExceptionOfType(MhsServerErrorException.class)
215-
.isThrownBy(() -> sendAcknowledgementExecutor.execute(taskDefinition));
216+
.isThrownBy(() -> sendAcknowledgementExecutor.execute(taskDefinition));
216217

217218
var updatedEhrExtractStatus = ehrExtractStatusRepository
218-
.findByConversationId(EhrStatusConstants.CONVERSATION_ID)
219-
.orElseThrow();
219+
.findByConversationId(EhrStatusConstants.CONVERSATION_ID)
220+
.orElseThrow();
220221

221222
assertThat(updatedEhrExtractStatus.getAckToRequester()).isNull();
222223
}

0 commit comments

Comments
 (0)