Skip to content

Commit abd2515

Browse files
ClemsazertClemsazert
committed
test(dispatcher): update test cases to use dedicated v3 user
1 parent ec16079 commit abd2515

2 files changed

Lines changed: 17 additions & 16 deletions

File tree

‎hub/dispatcher/src/test/java/com/hubsante/hub/service/DispatcherTest.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@
3636
import com.hubsante.hub.exception.HubPersistenceException;
3737
import com.hubsante.hub.exception.SchemaValidationException;
3838
import com.hubsante.hub.exception.UnroutableMessageException;
39-
import com.hubsante.hub.utils.ConversionRulesCommand;
40-
import com.hubsante.hub.utils.EdxlUtils;
41-
import com.hubsante.hub.utils.MessagePersistencePolicy;
42-
import com.hubsante.hub.utils.MessageUtils;
39+
import com.hubsante.hub.utils.*;
4340
import com.hubsante.model.EdxlHandler;
4441
import com.hubsante.model.Validator;
4542
import com.hubsante.model.edxl.EdxlMessage;
@@ -105,6 +102,7 @@ public class DispatcherTest {
105102
private final String SDIS_C_MESSAGE_QUEUE = SDIS_C_ROUTING_KEY + ".message";
106103
private final String SAMU_V1_ROUTING_KEY = "fr.health.samuV1";
107104
private final String SAMU_V3_ROUTING_KEY = "fr.health.samuV3";
105+
private final String SAMU_V3_MESSAGE_QUEUE = SAMU_V3_ROUTING_KEY + ".message";
108106
private final String FIRE_ROUTING_KEY = "fr.fire.sga";
109107

110108
private final String TEST_EDITOR = "default-editor";
@@ -259,7 +257,7 @@ public void shouldCallConversionServiceForCisuMessages() throws IOException {
259257
doReturn(NEXSIS_VHOST).when(hubConfig).getVhost();
260258

261259
Message fromFireMessage =
262-
createMessage("EDXL-DE", XML, SDIS_C_ROUTING_KEY, SAMU_A_ROUTING_KEY);
260+
createMessage("EDXL-DE", XML, SDIS_C_ROUTING_KEY, SAMU_V3_ROUTING_KEY);
263261

264262
doAnswer(invocation -> List.of(invocation.getArgument(0).toString()))
265263
.when(conversionHandler)
@@ -321,7 +319,7 @@ public void cisuTranscodingFromHealthToCisuOnNexsisVhost() throws IOException {
321319
public void cisuTranscodingFromCisuToHealthOnNexsisVhost() throws IOException {
322320
doReturn(NEXSIS_VHOST).when(hubConfig).getVhost();
323321
Message messageFromFire =
324-
createMessage("EDXL-DE", JSON, SDIS_C_ROUTING_KEY, SAMU_A_ROUTING_KEY);
322+
createMessage("EDXL-DE", JSON, SDIS_C_ROUTING_KEY, SAMU_V3_ROUTING_KEY);
325323
// Manually override the received routing key to put fr.fire.sga as per the hubex partner
326324
// shovel configuration
327325
messageFromFire.getMessageProperties().setReceivedRoutingKey(FIRE_ROUTING_KEY);
@@ -349,7 +347,7 @@ public void cisuTranscodingFromCisuToHealthOnNexsisVhost() throws IOException {
349347
"should not call conversion service for messages from CISU to health on health vhost")
350348
public void cisuTranscodingFromCisuToHealthOnHealthVhost() throws IOException {
351349
Message messageFromFire =
352-
createMessage("EDXL-DE", JSON, SDIS_C_ROUTING_KEY, SAMU_A_ROUTING_KEY);
350+
createMessage("EDXL-DE", JSON, SDIS_C_ROUTING_KEY, SAMU_V3_ROUTING_KEY);
353351
// Manually override the received routing key to put fr.fire.sga as per the hubex partner
354352
// shovel configuration
355353
messageFromFire.getMessageProperties().setReceivedRoutingKey("fr.fire.sga");
@@ -362,7 +360,7 @@ public void cisuTranscodingFromCisuToHealthOnHealthVhost() throws IOException {
362360

363361
ArgumentCaptor<Message> argument = ArgumentCaptor.forClass(Message.class);
364362
Mockito.verify(rabbitTemplate, times(1))
365-
.send(eq(DISTRIBUTION_EXCHANGE), eq(SAMU_A_MESSAGE_QUEUE), argument.capture());
363+
.send(eq(DISTRIBUTION_EXCHANGE), eq(SAMU_V3_MESSAGE_QUEUE), argument.capture());
366364
}
367365

368366
@Test
@@ -660,15 +658,14 @@ public void sendToTransferExchange() throws IOException {
660658
EdxlMessage edxlMessage =
661659
edxlHandler.deserializeXmlEDXL(
662660
new String(message.getBody(), StandardCharsets.UTF_8));
663-
String queueName = SAMU_A_ROUTING_KEY;
664661
String exchangeName = "transfer_15-15_v2.1_to_15-15_v1.5";
665662

666663
ConversionRulesCommand conversionRulesCommand =
667664
new ConversionRulesCommand(edxlMessage, hubConfig);
668665

669666
dispatcher.sendToTransferExchange(message.toString(), message, conversionRulesCommand);
670667

671-
verify(rabbitTemplate).send(eq(exchangeName), eq(queueName), any(Message.class));
668+
verify(rabbitTemplate).send(eq(exchangeName), eq(SAMU_A_ROUTING_KEY), any(Message.class));
672669
}
673670

674671
@Test
@@ -826,7 +823,7 @@ public void incrementMetricsCounter() throws IOException {
826823
@Test
827824
@DisplayName("should handle conversion service error correctly")
828825
public void shouldHandleConversionServiceError() throws IOException {
829-
// sdisC -> samuA on vhost 15-nexsis_v1.9 => transcoding triggered
826+
// sdisC -> samuV3 on vhost 15-nexsis_v1.9 => transcoding triggered
830827
doReturn(NEXSIS_VHOST).when(hubConfig).getVhost();
831828

832829
MessageHandler messageHandlerSpy = spy(messageHandler);
@@ -842,7 +839,7 @@ public void shouldHandleConversionServiceError() throws IOException {
842839
persistenceService);
843840

844841
Message receivedMessage =
845-
createMessage("EDXL-DE", JSON, SDIS_C_ROUTING_KEY, SAMU_A_ROUTING_KEY);
842+
createMessage("EDXL-DE", JSON, SDIS_C_ROUTING_KEY, SAMU_V3_ROUTING_KEY);
846843
EdxlMessage edxlMessage =
847844
edxlHandler.deserializeJsonEDXL(
848845
new String(receivedMessage.getBody(), StandardCharsets.UTF_8));
@@ -1151,7 +1148,8 @@ public void shouldCallPersistenceServiceBeforeCisuConversion() throws Exception
11511148
mockStatic(MessagePersistencePolicy.class)) {
11521149
doReturn(NEXSIS_VHOST).when(hubConfig).getVhost();
11531150

1154-
Message fromFireMessage = createMessage("EDXL-DE", XML, SDIS_C_ROUTING_KEY);
1151+
Message fromFireMessage =
1152+
createMessage("EDXL-DE", XML, SDIS_C_ROUTING_KEY, SAMU_V3_ROUTING_KEY);
11551153

11561154
mockedPersistencePolicy
11571155
.when(() -> MessagePersistencePolicy.shouldPersist(anyString(), anyString()))
@@ -1195,7 +1193,8 @@ public void shouldHavePersistedEvenIfCisuConversionFails() throws Exception {
11951193
mockStatic(MessagePersistencePolicy.class)) {
11961194
doReturn(NEXSIS_VHOST).when(hubConfig).getVhost();
11971195

1198-
Message fromFireMessage = createMessage("EDXL-DE", XML, SDIS_C_ROUTING_KEY);
1196+
Message fromFireMessage =
1197+
createMessage("EDXL-DE", XML, SDIS_C_ROUTING_KEY, SAMU_V3_ROUTING_KEY);
11991198

12001199
mockedPersistencePolicy
12011200
.when(() -> MessagePersistencePolicy.shouldPersist(anyString(), anyString()))
@@ -1224,7 +1223,8 @@ public void shouldThrowPersistenceExceptionIfPersistenceFails() throws Exception
12241223
mockStatic(MessagePersistencePolicy.class)) {
12251224
doReturn(NEXSIS_VHOST).when(hubConfig).getVhost();
12261225

1227-
Message fromFireMessage = createMessage("EDXL-DE", XML, SDIS_C_ROUTING_KEY);
1226+
Message fromFireMessage =
1227+
createMessage("EDXL-DE", XML, SDIS_C_ROUTING_KEY, SAMU_V3_ROUTING_KEY);
12281228

12291229
mockedPersistencePolicy
12301230
.when(() -> MessagePersistencePolicy.shouldPersist(anyString(), anyString()))

‎hub/dispatcher/src/test/resources/config/client.preferences.csv‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ fr.health.samuA;false;false;default-editor;false;1.5,2.0,2.1;1.9;1.7;2.0
33
fr.health.samuB;true;true;default-editor;false;1.5,2.0,2.1;1.9;1.7;2.0
44
fr.health.samuV1;false;false;default-editor;false;1.5;1.9;1.7;2.0
55
fr.health.samuV2;false;false;default-editor;false;2.0;1.9;1.7;2.0
6-
fr.health.samuV3;false;false;default-editor;false;2.1;1.9;1.7;2.0
6+
fr.health.samuV3;false;false;default-editor;false;2.1;;1.7;2.0
7+
fr.health.samuV3-nexsis;true;false;default-editor;false;;1.9;;

0 commit comments

Comments
 (0)