Skip to content
Snippets Groups Projects
Commit 246625db authored by Lukas Malte Monnerjahn's avatar Lukas Malte Monnerjahn
Browse files

OZG-6753 api test getMessage

- check messageFile Content
parent c8ccbeae
Branches
Tags
No related merge requests found
...@@ -3,9 +3,6 @@ package de.ozgcloud.xta.client; ...@@ -3,9 +3,6 @@ package de.ozgcloud.xta.client;
import static de.ozgcloud.xta.client.extension.XtaServerSetupExtensionTestUtil.*; import static de.ozgcloud.xta.client.extension.XtaServerSetupExtensionTestUtil.*;
import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
...@@ -13,6 +10,7 @@ import org.junit.jupiter.api.Test; ...@@ -13,6 +10,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import de.ozgcloud.xta.client.extension.XtaMessageExampleLoader; import de.ozgcloud.xta.client.extension.XtaMessageExampleLoader;
import de.ozgcloud.xta.client.extension.XtaServerSetupExtensionTestUtil;
import de.ozgcloud.xta.client.extension.XtaTestServerSetupExtension; import de.ozgcloud.xta.client.extension.XtaTestServerSetupExtension;
import de.ozgcloud.xta.client.model.XtaMessage; import de.ozgcloud.xta.client.model.XtaMessage;
import de.ozgcloud.xta.client.model.XtaMessageStatus; import de.ozgcloud.xta.client.model.XtaMessageStatus;
...@@ -96,8 +94,8 @@ class XtaClientITCase { ...@@ -96,8 +94,8 @@ class XtaClientITCase {
.reader(CLIENT_IDENTIFIER1) .reader(CLIENT_IDENTIFIER1)
.author(CLIENT_IDENTIFIER1) .author(CLIENT_IDENTIFIER1)
.build(); .build();
messageId = XTA_TEST_SERVER_SETUP_EXTENSION.sendTestMessage(messageConfig);
message = XtaMessageExampleLoader.load(messageConfig); message = XtaMessageExampleLoader.load(messageConfig);
messageId = XtaServerSetupExtensionTestUtil.sendTestMessage(client, message);
} }
@DisplayName("should return message with green status") @DisplayName("should return message with green status")
...@@ -133,12 +131,12 @@ class XtaClientITCase { ...@@ -133,12 +131,12 @@ class XtaClientITCase {
@Test @Test
@SneakyThrows @SneakyThrows
void shouldReturnMessageWithCorrectMessageFileContent() { void shouldReturnMessageWithCorrectMessageFileContent() {
var messageStream = new ZipInputStream(message.messageFile().content().getInputStream()); var messageContent = message.messageFile().content().getInputStream().readAllBytes();
var result = client.getMessage(CLIENT_IDENTIFIER1.value(), messageId); var result = client.getMessage(CLIENT_IDENTIFIER1.value(), messageId);
var resultStream = new ZipInputStream(result.message().messageFile().content().getInputStream()); var resultContent = result.message().messageFile().content().getInputStream().readAllBytes();
checkZipStreamContentEquals(messageStream, resultStream); assertThat(messageContent).isEqualTo(resultContent);
} }
@DisplayName("should throw invalid message id exception for a closed message") @DisplayName("should throw invalid message id exception for a closed message")
...@@ -162,20 +160,6 @@ class XtaClientITCase { ...@@ -162,20 +160,6 @@ class XtaClientITCase {
assertThatThrownBy(() -> client.getMessage(CLIENT_IDENTIFIER2.value(), messageId)) assertThatThrownBy(() -> client.getMessage(CLIENT_IDENTIFIER2.value(), messageId))
.isInstanceOf(InvalidMessageIDException.class); .isInstanceOf(InvalidMessageIDException.class);
} }
@SneakyThrows
private void checkZipStreamContentEquals(ZipInputStream expectedStream, ZipInputStream actualStream) {
ZipEntry messageEntry, resultEntry;
while((messageEntry = expectedStream.getNextEntry()) != null) {
resultEntry = actualStream.getNextEntry();
assertThat(resultEntry).isNotNull();
assertThat(resultEntry.getName()).isEqualTo(messageEntry.getName());
assertThat(resultEntry.getSize()).isEqualTo(messageEntry.getSize());
assertThat(actualStream.readAllBytes()).isEqualTo(expectedStream.readAllBytes());
}
}
} }
@DisplayName("send message") @DisplayName("send message")
......
...@@ -6,6 +6,7 @@ import de.ozgcloud.xta.client.XtaClient; ...@@ -6,6 +6,7 @@ import de.ozgcloud.xta.client.XtaClient;
import de.ozgcloud.xta.client.config.XtaClientConfig; import de.ozgcloud.xta.client.config.XtaClientConfig;
import de.ozgcloud.xta.client.core.WrappedXtaService; import de.ozgcloud.xta.client.core.WrappedXtaService;
import de.ozgcloud.xta.client.model.XtaIdentifier; import de.ozgcloud.xta.client.model.XtaIdentifier;
import de.ozgcloud.xta.client.model.XtaMessage;
import de.ozgcloud.xta.client.model.XtaMessageMetaData; import de.ozgcloud.xta.client.model.XtaMessageMetaData;
import genv3.de.xoev.transport.xta.x211.CodeFehlernummer; import genv3.de.xoev.transport.xta.x211.CodeFehlernummer;
import genv3.de.xoev.transport.xta.x211.MessageSchemaViolationException; import genv3.de.xoev.transport.xta.x211.MessageSchemaViolationException;
...@@ -44,6 +45,11 @@ public class XtaServerSetupExtensionTestUtil { ...@@ -44,6 +45,11 @@ public class XtaServerSetupExtensionTestUtil {
@SneakyThrows @SneakyThrows
public static String sendTestMessage(XtaClient client, XtaMessageExampleLoader.MessageExampleConfig messageExampleConfig) { public static String sendTestMessage(XtaClient client, XtaMessageExampleLoader.MessageExampleConfig messageExampleConfig) {
var message = XtaMessageExampleLoader.load(messageExampleConfig); var message = XtaMessageExampleLoader.load(messageExampleConfig);
return sendTestMessage(client, message);
}
@SneakyThrows
public static String sendTestMessage(XtaClient client, XtaMessage message) {
try { try {
log.info("Sending from author {} to reader {}.", message.metaData().authorIdentifier(), message.metaData().readerIdentifier()); log.info("Sending from author {} to reader {}.", message.metaData().authorIdentifier(), message.metaData().readerIdentifier());
var transportReport = client.sendMessage(message); var transportReport = client.sendMessage(message);
......
...@@ -105,11 +105,6 @@ public class XtaTestServerSetupExtension implements BeforeAllCallback, AfterAllC ...@@ -105,11 +105,6 @@ public class XtaTestServerSetupExtension implements BeforeAllCallback, AfterAllC
.build()); .build());
} }
@SneakyThrows
public String sendTestMessage(XtaMessageExampleLoader.MessageExampleConfig messageExampleConfig) {
return XtaServerSetupExtensionTestUtil.sendTestMessage(client, messageExampleConfig);
}
@SneakyThrows @SneakyThrows
private static byte[] readBytesFromResource(String resourcePath) { private static byte[] readBytesFromResource(String resourcePath) {
try (var inputStream = XtaTestServerSetupExtension.class.getClassLoader().getResourceAsStream(resourcePath)) { try (var inputStream = XtaTestServerSetupExtension.class.getClassLoader().getResourceAsStream(resourcePath)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment