Skip to content
Snippets Groups Projects
Commit e0ff858d authored by Jan Zickermann's avatar Jan Zickermann
Browse files

OZG-6891 KOP-2733 Test fetchMessages in XtaClientRemoteITCase

parent 400b012a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 300 additions and 81 deletions
src/main/java/de/ozgcloud/xta/client/xdomea/XdomeaXtaMessageCreator.java
+ 4
− 0
View file @ e0ff858d
...@@ -32,6 +32,10 @@ public class XdomeaXtaMessageCreator { ...@@ -32,6 +32,10 @@ public class XdomeaXtaMessageCreator {
private final ZipFileEntryReader zipFileEntryReader; private final ZipFileEntryReader zipFileEntryReader;
private final XdomeaMetaDataValidator metaDataValidator; private final XdomeaMetaDataValidator metaDataValidator;
public static XdomeaXtaMessageCreator createInstance() {
return XdomeaXtaMessageCreatorFactory.createInstance().create();
}
public XtaMessage createMessage(XtaFile xdomeaZipFile) throws ClientException { public XtaMessage createMessage(XtaFile xdomeaZipFile) throws ClientException {
return XtaMessage.builder() return XtaMessage.builder()
.metaData(deriveValidMetaData(xdomeaZipFile)) .metaData(deriveValidMetaData(xdomeaZipFile))
......
src/test/java/de/ozgcloud/xta/client/XtaClientRemoteITCase.java
+ 222
− 30
View file @ e0ff858d
package de.ozgcloud.xta.client; package de.ozgcloud.xta.client;
import static de.ozgcloud.xta.client.XtaClientITCase.*;
import static de.ozgcloud.xta.client.extension.XtaServerSetupExtensionTestUtil.*; import static de.ozgcloud.xta.client.extension.XtaServerSetupExtensionTestUtil.*;
import static java.util.Collections.*;
import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.*;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.stream.Stream;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
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;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource; import org.junit.jupiter.params.provider.ValueSource;
import de.ozgcloud.xta.client.config.XtaClientConfig;
import de.ozgcloud.xta.client.extension.StaticStringListAppender;
import de.ozgcloud.xta.client.extension.XtaMessageExampleLoader; import de.ozgcloud.xta.client.extension.XtaMessageExampleLoader;
import de.ozgcloud.xta.client.extension.XtaRemoteServerSetupExtension; import de.ozgcloud.xta.client.extension.XtaRemoteServerSetupExtension;
import de.ozgcloud.xta.client.model.XtaFile; import de.ozgcloud.xta.client.model.XtaFile;
import de.ozgcloud.xta.client.model.XtaIdentifier;
import de.ozgcloud.xta.client.model.XtaMessage; import de.ozgcloud.xta.client.model.XtaMessage;
import de.ozgcloud.xta.client.model.XtaMessageMetaData;
import de.ozgcloud.xta.client.model.XtaMessageStatus; import de.ozgcloud.xta.client.model.XtaMessageStatus;
import de.ozgcloud.xta.client.xdomea.XdomeaXtaMessageCreatorFactory; import de.ozgcloud.xta.client.model.XtaTransportReport;
import de.ozgcloud.xta.client.xdomea.XdomeaXtaMessageCreator;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -36,62 +51,239 @@ class XtaClientRemoteITCase { ...@@ -36,62 +51,239 @@ class XtaClientRemoteITCase {
@RegisterExtension @RegisterExtension
static final XtaRemoteServerSetupExtension XTA_REMOTE_SERVER_SETUP_EXTENSION = new XtaRemoteServerSetupExtension(); static final XtaRemoteServerSetupExtension XTA_REMOTE_SERVER_SETUP_EXTENSION = new XtaRemoteServerSetupExtension();
private XtaClient authorClient; private static final XdomeaXtaMessageCreator XDOMEA_XTA_MESSAGE_CREATOR = XdomeaXtaMessageCreator.createInstance();
private XtaClient readerClient;
private static XtaClient testClient;
private static XtaClient silentTestClient;
private static XtaClient devClient;
private static XtaClient silentDevClient;
private List<XtaMessageMetaData> supportCheckedMetadataItems;
private List<XtaMessage> processedMessages;
private Consumer<XtaMessage> processMessageDummy;
private Predicate<XtaMessageMetaData> isSupportedDummy;
@BeforeAll
static void checkNoMessagePending() {
testClient = XTA_REMOTE_SERVER_SETUP_EXTENSION.getTestClient();
silentTestClient = XTA_REMOTE_SERVER_SETUP_EXTENSION.getSilentTestClient();
devClient = XTA_REMOTE_SERVER_SETUP_EXTENSION.getDevClient();
silentDevClient = XTA_REMOTE_SERVER_SETUP_EXTENSION.getSilentDevClient();
throwIfAnyMessagePending(silentDevClient, DEV_READER_CLIENT_IDENTIFIER);
throwIfAnyMessagePending(silentTestClient, TEST_READER_CLIENT_IDENTIFIER);
}
@BeforeEach @BeforeEach
@SneakyThrows @SneakyThrows
void setup() { void setup() {
authorClient = XTA_REMOTE_SERVER_SETUP_EXTENSION.getAuthorClient(); processMessageDummy = (message) -> {
readerClient = XTA_REMOTE_SERVER_SETUP_EXTENSION.getReaderClient(); };
supportCheckedMetadataItems = new ArrayList<>();
isSupportedDummy = (metaData) -> true;
processedMessages = new ArrayList<>();
StaticStringListAppender.clearLogLines();
}
@AfterEach
void cleanup() {
closeMessagesForAllReaders();
}
private void closeMessagesForAllReaders() {
closeAllMessages(silentDevClient, DEV_READER_CLIENT_IDENTIFIER);
closeAllMessages(silentTestClient, TEST_READER_CLIENT_IDENTIFIER);
} }
@DisplayName("fetch messages") @DisplayName("fetch messages")
@Nested @Nested
class TestFetchMessages { class TestFetchMessages {
// TODO KOP-2733
private List<XtaMessage> sendMessages;
private List<String> sendMessageIds;
@BeforeEach
void setup() {
sendMessages = List.of(
createMessage("dfoerdermittel", DEV_READER_CLIENT_IDENTIFIER, DEV_READER_CLIENT_IDENTIFIER),
createMessage("dfoerdermittel", DEV_READER_CLIENT_IDENTIFIER, TEST_READER_CLIENT_IDENTIFIER),
createMessage("abgabe0401-kleiner-waffenschein", TEST_AUTHOR_CLIENT_IDENTIFIER, TEST_READER_CLIENT_IDENTIFIER),
createMessage("dfoerdermittel", TEST_READER_CLIENT_IDENTIFIER, TEST_READER_CLIENT_IDENTIFIER)
);
sendMessageIds = sendMessages.stream()
.map(message -> sendTestMessage(
message.metaData().authorIdentifier().equals(DEV_READER_CLIENT_IDENTIFIER)
? silentDevClient
: silentTestClient,
message))
.toList();
} }
@DisplayName("send message") @DisplayName("should fetch no messages if no client identifier is configured")
@Nested @Test
class TestSendMessage { void shouldFetchNoMessagesIfNoClientIdentifierIsConfigured() {
setupClientsWithIdentifiers(emptyList());
@AfterEach var messages = fetchMessages();
assertThat(supportCheckedMetadataItems).isEmpty();
assertThat(processedMessages).isEmpty();
assertThat(messages).isEmpty();
}
@DisplayName("should fetch no messages if client identifier has no messages pending")
@Test
void shouldFetchNoMessagesIfClientIdentifierHasNoMessagesPending() {
setupClientsWithIdentifiers(List.of(TEST_AUTHOR_CLIENT_IDENTIFIER));
var messages = fetchMessages();
assertThat(supportCheckedMetadataItems).isEmpty();
assertThat(processedMessages).isEmpty();
assertThat(messages).isEmpty();
}
@DisplayName("should fetch messages from first reader")
@Test
@SneakyThrows @SneakyThrows
void afterEach() { void shouldFetchMessagesFromFirstReader() {
closeAllMessages(readerClient, READER_CLIENT_IDENTIFIER1); setupClientsWithIdentifiers(List.of(DEV_READER_CLIENT_IDENTIFIER));
var transportReports = fetchMessages();
assertThat(supportCheckedMetadataItems).hasSize(1);
assertThatMessages(processedMessages).containExactlyInAnyOrder(sendMessages.getFirst());
assertThatTransportReports(transportReports)
.reportExactlyFor(processedMessages)
.haveExactlyGreenStatusFor(messageIdBySendIndex(0));
}
@DisplayName("should fetch messages from second reader")
@Test
void shouldFetchMessagesFromSecondReader() {
setupClientsWithIdentifiers(List.of(TEST_READER_CLIENT_IDENTIFIER));
var transportReports = fetchMessages();
assertThat(supportCheckedMetadataItems).hasSize(3);
assertThatMessages(processedMessages).containExactlyInAnyOrder(sendMessages.get(1), sendMessages.get(2), sendMessages.get(3));
assertThatTransportReports(transportReports)
.reportExactlyFor(processedMessages)
.haveExactlyGreenStatusFor(messageIdBySendIndex(1), messageIdBySendIndex(2), messageIdBySendIndex(3));
} }
@DisplayName("should fetch messages from first and second reader")
@Test
void shouldFetchMessagesFromFirstAndSecondReader() {
setupClientsWithIdentifiers(List.of(DEV_READER_CLIENT_IDENTIFIER, TEST_READER_CLIENT_IDENTIFIER));
var transportReports = fetchMessages();
assertThat(supportCheckedMetadataItems).hasSize(1 + 3);
assertThatMessages(processedMessages).containExactlyInAnyOrder(
sendMessages.get(0),
sendMessages.get(1), sendMessages.get(2), sendMessages.get(3)
);
assertThatTransportReports(transportReports)
.reportExactlyFor(processedMessages)
.haveExactlyGreenStatusFor(
messageIdBySendIndex(0),
messageIdBySendIndex(1), messageIdBySendIndex(2), messageIdBySendIndex(3)
);
}
@SneakyThrows
private void setupClientsWithIdentifiers(List<XtaIdentifier> identifiers) {
devClient = createClientWithIdentifiersAndClientCert(
identifiers,
XTA_REMOTE_SERVER_SETUP_EXTENSION.getDevClientCertKeyStore()
);
testClient = createClientWithIdentifiersAndClientCert(
identifiers,
XTA_REMOTE_SERVER_SETUP_EXTENSION.getTestClientCertKeyStore()
);
}
@SneakyThrows
private XtaClient createClientWithIdentifiersAndClientCert(List<XtaIdentifier> identifiers, XtaClientConfig.KeyStore clientCertKeyStore) {
return XtaClient.from(
XTA_REMOTE_SERVER_SETUP_EXTENSION.createSpecificClientConfigBuilder()
.clientCertKeystore(clientCertKeyStore)
.clientIdentifiers(identifiers)
.maxListItems(TWO_MAX_LIST_ITEMS)
.isMessageSupported(this::isSupported)
.build()
);
}
private boolean isSupported(XtaMessageMetaData metaData) {
supportCheckedMetadataItems.add(metaData);
return isSupportedDummy.test(metaData);
}
private String messageIdBySendIndex(int sendIndex) {
return sendMessageIds.get(sendIndex);
}
private List<XtaTransportReport> fetchMessages() {
return Stream.concat(
fetchDevMessages().stream(),
fetchTestMessages().stream()
).toList();
}
private List<XtaTransportReport> fetchDevMessages() {
return devClient.fetchMessages(this::processMessage);
}
private List<XtaTransportReport> fetchTestMessages() {
return testClient.fetchMessages(this::processMessage);
}
private void processMessage(XtaMessage message) {
processedMessages.add(message);
processMessageDummy.accept(message);
}
}
@DisplayName("send message")
@Nested
class TestSendMessage {
@DisplayName("should return transport report with open status") @DisplayName("should return transport report with open status")
@SneakyThrows @SneakyThrows
@ParameterizedTest @ParameterizedTest
@ValueSource(strings = { "dfoerdermittel", "abgabe0401-kleiner-waffenschein" }) @ValueSource(strings = { "dfoerdermittel", "abgabe0401-kleiner-waffenschein" })
void shouldReturn(String messageLabel) { void shouldReturn(String messageLabel) {
XtaMessage xtaMessage = createXdomeaMessage(messageLabel); XtaMessage xtaMessage = createXdomeaMessage(loadMessage(messageLabel).messageFile());
var result = authorClient.sendMessage(xtaMessage); var result = testClient.sendMessage(xtaMessage);
assertThat(result.status()).isEqualTo(XtaMessageStatus.OPEN); assertThat(result.status()).isEqualTo(XtaMessageStatus.OPEN);
} }
}
@SneakyThrows private XtaMessage createMessage(String messageLabel, XtaIdentifier author, XtaIdentifier reader) {
private static XtaMessage createXdomeaMessage( return XtaMessageExampleLoader.load(
String messageLabel) { XtaMessageExampleLoader.MessageExampleConfig.builder()
var creator = XdomeaXtaMessageCreatorFactory .messageLabel(messageLabel)
.createInstance() .reader(reader)
.create(); .author(author)
.build());
}
return creator.createMessage(loadMessageFile(messageLabel)); @SneakyThrows
private static XtaMessage createXdomeaMessage(XtaFile messageFile) {
return XDOMEA_XTA_MESSAGE_CREATOR.createMessage(messageFile);
} }
private static XtaFile loadMessageFile(String messageLabel) { private static XtaMessage loadMessage(String messageLabel) {
var message = XtaMessageExampleLoader.load(XtaMessageExampleLoader.MessageExampleConfig.builder() return XtaMessageExampleLoader.load(XtaMessageExampleLoader.MessageExampleConfig.builder()
.messageLabel(messageLabel) .messageLabel(messageLabel)
.author(AUTHOR_CLIENT_IDENTIFIER) .author(AUTHOR_CLIENT_IDENTIFIER)
.reader(READER_CLIENT_IDENTIFIER1) .reader(READER_CLIENT_IDENTIFIER1)
.build()); .build());
return message.messageFile();
}
} }
} }
......
src/test/java/de/ozgcloud/xta/client/extension/XtaRemoteServerSetupExtension.java
+ 31
− 36
View file @ e0ff858d
...@@ -6,7 +6,6 @@ import java.io.File; ...@@ -6,7 +6,6 @@ import java.io.File;
import java.util.Objects; import java.util.Objects;
import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext;
import com.google.common.io.Files; import com.google.common.io.Files;
...@@ -15,7 +14,6 @@ import de.ozgcloud.xta.client.XtaClient; ...@@ -15,7 +14,6 @@ import de.ozgcloud.xta.client.XtaClient;
import de.ozgcloud.xta.client.XtaClientFactory; import de.ozgcloud.xta.client.XtaClientFactory;
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.XtaMessage;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -25,12 +23,16 @@ import lombok.extern.slf4j.Slf4j; ...@@ -25,12 +23,16 @@ import lombok.extern.slf4j.Slf4j;
@Getter @Getter
@Setter @Setter
@Slf4j @Slf4j
public class XtaRemoteServerSetupExtension implements BeforeAllCallback, BeforeEachCallback { public class XtaRemoteServerSetupExtension implements BeforeAllCallback {
private XtaClient testClient;
private XtaClient silentTestClient;
private XtaClientConfig.KeyStore testClientCertKeyStore;
private XtaClient devClient;
private XtaClient silentDevClient;
private XtaClientConfig.KeyStore devClientCertKeyStore;
private XtaClient authorClient;
private XtaClient readerClient;
private WrappedXtaService service; private WrappedXtaService service;
private XtaClientConfig config;
private XtaClientFactory clientFactory; private XtaClientFactory clientFactory;
static final String BASE_URL = "https://li33-0005.dp.dsecurecloud.de/MB_XTA-WS/XTA210"; static final String BASE_URL = "https://li33-0005.dp.dsecurecloud.de/MB_XTA-WS/XTA210";
...@@ -38,54 +40,47 @@ public class XtaRemoteServerSetupExtension implements BeforeAllCallback, BeforeE ...@@ -38,54 +40,47 @@ public class XtaRemoteServerSetupExtension implements BeforeAllCallback, BeforeE
@Override @Override
@SneakyThrows @SneakyThrows
public void beforeAll(ExtensionContext context) { public void beforeAll(ExtensionContext context) {
authorClient = setupClient(getEnvVar("KOP_SH_KIEL_TEST_PATH"), getEnvVar("KOP_SH_KIEL_TEST_PASSWORD")); testClientCertKeyStore = createClientCertKeyStore(getEnvVar("KOP_SH_KIEL_TEST_PATH"), getEnvVar("KOP_SH_KIEL_TEST_PASSWORD"));
readerClient = setupClient(getEnvVar("KOP_SH_KIEL_DEV_PATH"), getEnvVar("KOP_SH_KIEL_DEV_PASSWORD")); testClient = setupClient(testClientCertKeyStore, true);
silentTestClient = setupClient(testClientCertKeyStore, false);
devClientCertKeyStore = createClientCertKeyStore(getEnvVar("KOP_SH_KIEL_DEV_PATH"), getEnvVar("KOP_SH_KIEL_DEV_PASSWORD"));
devClient = setupClient(devClientCertKeyStore, true);
silentDevClient = setupClient(devClientCertKeyStore, false);
} }
@SneakyThrows private XtaClientConfig.KeyStore createClientCertKeyStore(String clientCertKeystorePath, String clientCertKeystorePassword) {
XtaClient setupClient(String clientCertKeystorePath, String clientCertKeystorePassword) { return XtaClientConfig.KeyStore.builder()
var clientCertKeyStore = XtaClientConfig.KeyStore.builder()
.content(readBytesFromFile(clientCertKeystorePath)) .content(readBytesFromFile(clientCertKeystorePath))
.type("PKCS12") .type("PKCS12")
.password(clientCertKeystorePassword.toCharArray()) .password(clientCertKeystorePassword.toCharArray())
.build(); .build();
config = createClientConfigBuilder() }
.managementServiceUrl(BASE_URL + "managementPort.svc")
.sendServiceUrl(BASE_URL + "sendPort.svc") @SneakyThrows
.msgBoxServiceUrl(BASE_URL + "msgBoxPort.svc") XtaClient setupClient(XtaClientConfig.KeyStore clientCertKeyStore, boolean verbose) {
return XtaClient.from(createSpecificClientConfigBuilder()
.logSoapRequests(verbose)
.logSoapResponses(verbose)
.clientCertKeystore(clientCertKeyStore) .clientCertKeystore(clientCertKeyStore)
.build(); .build());
clientFactory = XtaClientFactory.from(config);
return clientFactory.create();
} }
private String getEnvVar(String name) { private String getEnvVar(String name) {
return Objects.requireNonNull(System.getenv(name), "Environment variable " + name + " is required!"); return Objects.requireNonNull(System.getenv(name), "Environment variable " + name + " is required!");
} }
@Override
@SneakyThrows
public void beforeEach(ExtensionContext context) {
XtaServerSetupExtensionTestUtil.closeAllMessages(readerClient, READER_CLIENT_IDENTIFIER1);
}
@SneakyThrows
public String sendTestMessage() {
return XtaServerSetupExtensionTestUtil.sendTestMessage(authorClient, XtaMessageExampleLoader.MessageExampleConfig.builder()
.messageLabel("dfoerdermittel")
.reader(READER_CLIENT_IDENTIFIER1)
.author(AUTHOR_CLIENT_IDENTIFIER)
.build());
}
@SneakyThrows @SneakyThrows
public String sendTestMessage(XtaMessage message) { private static byte[] readBytesFromFile(String path) {
return XtaServerSetupExtensionTestUtil.sendTestMessage(authorClient, message); return Files.toByteArray(new File(path));
} }
@SneakyThrows @SneakyThrows
private static byte[] readBytesFromFile(String path) { public XtaClientConfig.XtaClientConfigBuilder createSpecificClientConfigBuilder() {
return Files.toByteArray(new File(path)); return createClientConfigBuilder()
.managementServiceUrl(BASE_URL + "managementPort.svc")
.sendServiceUrl(BASE_URL + "sendPort.svc")
.msgBoxServiceUrl(BASE_URL + "msgBoxPort.svc");
} }
} }
src/test/java/de/ozgcloud/xta/client/extension/XtaServerSetupExtensionTestUtil.java
+ 42
− 14
View file @ e0ff858d
...@@ -32,11 +32,24 @@ import lombok.extern.log4j.Log4j2; ...@@ -32,11 +32,24 @@ import lombok.extern.log4j.Log4j2;
@Log4j2 @Log4j2
public class XtaServerSetupExtensionTestUtil { public class XtaServerSetupExtensionTestUtil {
public static final XtaIdentifier AUTHOR_CLIENT_IDENTIFIER = XtaIdentifier.builder() public static final XtaIdentifier DEV_READER_CLIENT_IDENTIFIER = XtaIdentifier.builder()
.value("gae:dev-environment@ozg-cloud.de")
.category("Generischer Antragsempfänger")
.name("OZG-Cloud Leser Dev")
.build();
public static final XtaIdentifier TEST_READER_CLIENT_IDENTIFIER = XtaIdentifier.builder()
.value("gae:test-environment@ozg-cloud.de")
.category("Generischer Antragsempfänger")
.name("OZG-Cloud Leser Test")
.build();
public static final XtaIdentifier TEST_AUTHOR_CLIENT_IDENTIFIER = XtaIdentifier.builder()
.value("gad:010103000000") .value("gad:010103000000")
.category("DMS Schleswig-Holstein") .category("DMS Schleswig-Holstein")
.name("Generischer Antragsdienst") .name("Generischer Antragsdienst")
.build(); .build();
public static final XtaIdentifier AUTHOR_CLIENT_IDENTIFIER = TEST_AUTHOR_CLIENT_IDENTIFIER;
public static final XtaIdentifier AUTHOR_CLIENT_IDENTIFIER2 = XtaIdentifier.builder() public static final XtaIdentifier AUTHOR_CLIENT_IDENTIFIER2 = XtaIdentifier.builder()
.value("ehp:010100100000") .value("ehp:010100100000")
.category("Engagement- und Hobbyportal (FIM Sender)") .category("Engagement- und Hobbyportal (FIM Sender)")
...@@ -48,22 +61,16 @@ public class XtaServerSetupExtensionTestUtil { ...@@ -48,22 +61,16 @@ public class XtaServerSetupExtensionTestUtil {
.name("OSI-Onlinedienst Hamburg Versammlungsanzeige Test") .name("OSI-Onlinedienst Hamburg Versammlungsanzeige Test")
.build(); .build();
public static final XtaIdentifier READER_CLIENT_IDENTIFIER2 = XtaIdentifier.builder() public static final XtaIdentifier READER_CLIENT_IDENTIFIER1 = DEV_READER_CLIENT_IDENTIFIER;
.value("gae:test-environment@ozg-cloud.de") public static final XtaIdentifier READER_CLIENT_IDENTIFIER2 = TEST_READER_CLIENT_IDENTIFIER;
.category("Generischer Antragsempfänger")
.name("OZG-Cloud Test")
.build();
public static final XtaIdentifier READER_CLIENT_IDENTIFIER1 = XtaIdentifier.builder()
.value("gae:dev-environment@ozg-cloud.de")
.category("Generischer Antragsempfänger")
.name("OZG-Cloud Dev")
.build();
public static final XtaIdentifier READER_CLIENT_IDENTIFIER3 = XtaIdentifier.builder() public static final XtaIdentifier READER_CLIENT_IDENTIFIER3 = XtaIdentifier.builder()
.value("vbe:010510440100") .value("vbe:010510440100")
.category("Versammlungsbehörde (FIM Empfänger)") .category("Versammlungsbehörde (FIM Empfänger)")
.name("Kreisordnungsbehörde Dithmarschen") .name("Kreisordnungsbehörde Dithmarschen")
.build(); .build();
public static XtaClientConfig.XtaClientConfigBuilder createClientConfigBuilder() { public static XtaClientConfig.XtaClientConfigBuilder createClientConfigBuilder() {
return XtaClientConfig.builder() return XtaClientConfig.builder()
.clientIdentifiers(emptyList()) .clientIdentifiers(emptyList())
...@@ -102,10 +109,18 @@ public class XtaServerSetupExtensionTestUtil { ...@@ -102,10 +109,18 @@ public class XtaServerSetupExtensionTestUtil {
log.error("[{}] {}", fehlernummer.getCode(), fehlernummer.getName()); log.error("[{}] {}", fehlernummer.getCode(), fehlernummer.getName());
} }
@SneakyThrows
public static void throwIfAnyMessagePending(XtaClient client, XtaIdentifier clientId) {
var wrappedService = getWrappedService(client);
var result = wrappedService.getStatusList(clientId, 1);
if (!result.messages().isEmpty()) {
fail("Expect no pending xta-messages for reader %s!".formatted(clientId.value()));
}
}
@SneakyThrows @SneakyThrows
public static void closeAllMessages(XtaClient client, XtaIdentifier clientId) { public static void closeAllMessages(XtaClient client, XtaIdentifier clientId) {
XtaClientService clientService = getPrivateFieldValue(client, "service"); var wrappedService = getWrappedService(client);
WrappedXtaService wrappedService = getPrivateFieldValue(clientService, "service");
var result = wrappedService.getStatusList(clientId, 100); var result = wrappedService.getStatusList(clientId, 100);
var messageIds = result.messages().stream() var messageIds = result.messages().stream()
...@@ -116,6 +131,11 @@ public class XtaServerSetupExtensionTestUtil { ...@@ -116,6 +131,11 @@ public class XtaServerSetupExtensionTestUtil {
} }
} }
private static WrappedXtaService getWrappedService(XtaClient client) {
XtaClientService clientService = getPrivateFieldValue(client, "service");
return getPrivateFieldValue(clientService, "service");
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@SneakyThrows @SneakyThrows
private static <T> T getPrivateFieldValue(Object object, String fieldName) { private static <T> T getPrivateFieldValue(Object object, String fieldName) {
...@@ -131,6 +151,12 @@ public class XtaServerSetupExtensionTestUtil { ...@@ -131,6 +151,12 @@ public class XtaServerSetupExtensionTestUtil {
.build(); .build();
} }
public static XtaMessageMetaData withoutMessageSize(XtaMessageMetaData metaData) {
return metaData.toBuilder()
.messageSize(null)
.build();
}
public record MessagesAssert(List<XtaMessage> processedMessages) { public record MessagesAssert(List<XtaMessage> processedMessages) {
public MessagesAssert containExactlyInAnyOrder(XtaMessage... messages) { public MessagesAssert containExactlyInAnyOrder(XtaMessage... messages) {
try { try {
...@@ -244,11 +270,13 @@ public class XtaServerSetupExtensionTestUtil { ...@@ -244,11 +270,13 @@ public class XtaServerSetupExtensionTestUtil {
.map(XtaMessage::metaData) .map(XtaMessage::metaData)
.map(XtaMessageMetaData::messageId) .map(XtaMessageMetaData::messageId)
.toList()); .toList());
// Compare message metadata // Compare message metadata (ignoring size since it may be null for transport report (due to message closed?))
assertThat(transportReports) assertThat(transportReports)
.extracting(XtaTransportReport::metaData) .extracting(XtaTransportReport::metaData)
.extracting(XtaServerSetupExtensionTestUtil::withoutMessageSize)
.containsExactlyElementsOf(processedMessages.stream() .containsExactlyElementsOf(processedMessages.stream()
.map(XtaMessage::metaData) .map(XtaMessage::metaData)
.map(XtaServerSetupExtensionTestUtil::withoutMessageSize)
.toList()); .toList());
} catch (AssertionError | RuntimeException e) { } catch (AssertionError | RuntimeException e) {
log.error("TransportReports do not exactly match messages metadata!"); log.error("TransportReports do not exactly match messages metadata!");
......
src/test/resources/messages/abgabe0401-kleiner-waffenschein/xta-message.yaml
+ 1
− 1
View file @ e0ff858d
metaData: metaData:
service: urn:xoev-de:xdomea:schema:3.0.0/xdomea300Antrag.wsdl service: urn:xoev-de:xdomea:schema:3.0.0/xdomea300Abgabe.wsdl
businessScenarioCode: XDOMEAGAD_DATA businessScenarioCode: XDOMEAGAD_DATA
businessScenarioListUri: urn:de:dataport:codeliste:business.scenario businessScenarioListUri: urn:de:dataport:codeliste:business.scenario
businessScenarioListVersionId: 1.0 businessScenarioListVersionId: 1.0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit