From 49ca8053eadc7023a30874b880ded32b15009291 Mon Sep 17 00:00:00 2001 From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de> Date: Tue, 24 Sep 2024 16:42:32 +0200 Subject: [PATCH] OZG-6753 apply review comments --- .../ozgcloud/xta/client/XtaClientITCase.java | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java b/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java index d8047ea..1c58d10 100644 --- a/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java +++ b/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java @@ -109,32 +109,14 @@ class XtaClientITCase { assertThat(result.transportReport().status()).isEqualTo(XtaMessageStatus.GREEN); } - @DisplayName("should return message with correct message file metadata") - @Test - @SneakyThrows - void shouldReturnMessageWithCorrectMessageFileMetadata() { - var messageFile = message.messageFile(); - - var result = client.getMessage(CLIENT_IDENTIFIER1.value(), messageId); - var resultMessageFile = result.message().messageFile(); - - assertThat(resultMessageFile.contentType()).isEqualTo(messageFile.contentType()); - assertThat(resultMessageFile.contentDescription()).isEqualTo(messageFile.contentDescription()); - assertThat(resultMessageFile.encoding()).isEqualTo(messageFile.encoding()); - assertThat(resultMessageFile.id()).isEqualTo(messageFile.id()); - assertThat(resultMessageFile.language()).isEqualTo(messageFile.language()); - assertThat(resultMessageFile.name()).isEqualTo(messageFile.name()); - assertThat(resultMessageFile.size()).isEqualTo(messageFile.size()); - } - @DisplayName("should return message with correct message file content") @Test @SneakyThrows void shouldReturnMessageWithCorrectMessageFileContent() { - var messageContent = message.messageFile().content().getInputStream().readAllBytes(); + var messageContent = extractMessageFileContent(message); var result = client.getMessage(CLIENT_IDENTIFIER1.value(), messageId); - var resultContent = result.message().messageFile().content().getInputStream().readAllBytes(); + var resultContent = extractMessageFileContent(result.message()); assertThat(messageContent).isEqualTo(resultContent); } @@ -160,6 +142,11 @@ class XtaClientITCase { assertThatThrownBy(() -> client.getMessage(CLIENT_IDENTIFIER2.value(), messageId)) .isInstanceOf(InvalidMessageIDException.class); } + + @SneakyThrows + private byte[] extractMessageFileContent(XtaMessage xtaMessage) { + return xtaMessage.messageFile().content().getInputStream().readAllBytes(); + } } @DisplayName("send message") -- GitLab