Kop 3126 adjust tests

src/test/java/de/ozgcloud/xta/client/extension/XtaServerSetupExtensionTestUtil.java

@@ -16,6 +16,7 @@ import de.ozgcloud.xta.client.core.WrappedXtaService;
 import de.ozgcloud.xta.client.core.WrappedXtaServiceFactory;
 import de.ozgcloud.xta.client.exception.XtaClientRuntimeException;
 import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.CodeFehlernummer;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.InvalidMessageIDException;
 import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MessageSchemaViolationException;
 import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ParameterIsNotValidException;
 import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.PermissionDeniedException;
@@ -122,11 +123,19 @@ public class XtaServerSetupExtensionTestUtil {
 		closeMessagesById(config, clientId, messageIds);
 	}
 
-	@SneakyThrows
 	public static void closeMessagesById(XtaClientConfig config, XtaIdentifier clientId, List<String> messageIds) {
 		var wrappedService = createWrappedService(config);
 		for (var messageId : messageIds) {
+			closeMessageById(wrappedService, messageId, clientId);
+		}
+	}
+
+	@SneakyThrows
+	private static void closeMessageById(WrappedXtaService wrappedService, String messageId, XtaIdentifier clientId) {
+		try {
 			wrappedService.close(messageId, clientId);
+		} catch (InvalidMessageIDException e) {
+			log.warn("Failed closing message, possibly it has already been closed! '{}' (reader: {})", messageId, clientId);
 		}
 	}
 
@@ -135,16 +144,20 @@ public class XtaServerSetupExtensionTestUtil {
 		return WrappedXtaServiceFactory.from(config).create();
 	}
 
-	public static XtaMessageMetaData withoutMessageIdAndSize(XtaMessageMetaData metaData) {
+	public static XtaMessageMetaData withoutMessageIdAndSizeAndDelivery(XtaMessageMetaData metaData) {
 		return metaData.toBuilder()
 				.messageId(null)
 				.messageSize(null)
+				.deliveryAttributesDelivery(null)
+				.deliveryAttributesOrigin(null)
 				.build();
 	}
 
-	public static XtaMessageMetaData withoutMessageSize(XtaMessageMetaData metaData) {
+	public static XtaMessageMetaData withoutMessageSizeAndDelivery(XtaMessageMetaData metaData) {
 		return metaData.toBuilder()
 				.messageSize(null)
+				.deliveryAttributesDelivery(null)
+				.deliveryAttributesOrigin(null)
 				.build();
 	}
 
@@ -268,9 +281,9 @@ public class XtaServerSetupExtensionTestUtil {
 				// Assert equal metadata (ignoring message id and size since they should be null before sending)
 				assertThat(processedMessages)
 						.extracting(XtaMessage::metaData)
-						.extracting(XtaServerSetupExtensionTestUtil::withoutMessageIdAndSize)
+						.extracting(XtaServerSetupExtensionTestUtil::withoutMessageIdAndSizeAndDelivery)
 						.containsExactlyInAnyOrderElementsOf(Arrays.stream(messageMetaDataItems)
-								.map(XtaServerSetupExtensionTestUtil::withoutMessageIdAndSize)
+								.map(XtaServerSetupExtensionTestUtil::withoutMessageIdAndSizeAndDelivery)
 								.toList());
 			} catch (AssertionError | RuntimeException e) {
 				log.error("Messages do not exactly contain excepted metadata!");
@@ -314,10 +327,10 @@ public class XtaServerSetupExtensionTestUtil {
 			// ignoring size since it may be null for transport report (due to message closed?)
 			assertThat(transportReports)
 					.extracting(XtaTransportReport::metaData)
-					.extracting(XtaServerSetupExtensionTestUtil::withoutMessageSize)
+					.extracting(XtaServerSetupExtensionTestUtil::withoutMessageSizeAndDelivery)
 					.containsExactlyElementsOf(processedMessages.stream()
 							.map(XtaMessage::metaData)
-							.map(XtaServerSetupExtensionTestUtil::withoutMessageSize)
+							.map(XtaServerSetupExtensionTestUtil::withoutMessageSizeAndDelivery)
 							.toList());
 		}