From 5104ecaca91abb357061f9d0ea6a84821e4e33c6 Mon Sep 17 00:00:00 2001
From: Joerg Bolay <joerg.bolay@dataport.de>
Date: Thu, 30 Jan 2025 15:16:33 +0100
Subject: [PATCH] KOP-2964 umstellen von WebClient auf RestClient und entfernen
von Bindestrichen aus Spring Properties
---
.../osiv2/OsiPostfachRemoteServiceITCase.java | 36 +++++--------------
1 file changed, 8 insertions(+), 28 deletions(-)
diff --git a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/OsiPostfachRemoteServiceITCase.java b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/OsiPostfachRemoteServiceITCase.java
index 2c5e81f..c5faa3c 100644
--- a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/OsiPostfachRemoteServiceITCase.java
+++ b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/OsiPostfachRemoteServiceITCase.java
@@ -7,19 +7,16 @@ import static org.mockserver.mock.OpenAPIExpectation.*;
import static org.mockserver.model.HttpRequest.*;
import static org.mockserver.model.HttpResponse.*;
-import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.OffsetDateTime;
import java.util.Arrays;
import java.util.Map;
-import java.util.Objects;
import java.util.UUID;
import de.ozgcloud.nachrichten.postfach.osiv2.factory.JsonUtil;
import de.ozgcloud.nachrichten.postfach.osiv2.factory.V1ReplyMessageFactory;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -32,18 +29,12 @@ import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.springframework.test.context.TestPropertySource;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-
import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
import de.ozgcloud.nachrichten.postfach.osiv2.extension.Jwt;
import de.ozgcloud.nachrichten.postfach.osiv2.extension.OsiMockServerExtension;
import de.ozgcloud.nachrichten.postfach.osiv2.factory.PostfachNachrichtTestFactory;
import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.MessageExchangeReceiveMessage;
import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.MessageExchangeReceiveMessagesResponse;
-import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1ReplyBehavior;
-import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1ReplyMessage;
import lombok.SneakyThrows;
@SpringBootTest(classes = TestApplication.class)
@@ -83,8 +74,6 @@ public class OsiPostfachRemoteServiceITCase {
.withSpecUrlOrPayload(getPostfachApiSpec())
.withOperationsAndResponses(operationsAndResponses)
);
-
- assertDoesNotThrow(() -> osiPostfachRemoteService.deleteMessage("00000000-0000-0000-0000-000000000000"));
}
@SneakyThrows
@@ -173,30 +162,21 @@ public class OsiPostfachRemoteServiceITCase {
assertThat(messageList).hasSize(2);
}
- private void createMessagesCall(final String receiveMessages, final String messagesJson) throws IOException {
- postfachFacadeMockClient
- .when(
- new OpenAPIDefinition()
- .withSpecUrlOrPayload(Files.readString(Path.of("spec", "postfach-api-facade.yaml")))
- .withOperationId(receiveMessages)
- )
- .respond(response().withHeader("Content-type", "application/json").withBody(messagesJson));
- }
-
@DisplayName("should delete message")
@Test
@SneakyThrows
void shouldDeleteMessage() {
- postfachFacadeMockClient.upsert(
- openAPIExpectation()
- .withSpecUrlOrPayload(Files.readString(Path.of("spec", "postfach-api-facade.yaml")))
- .withOperationsAndResponses(Map.of(
- "deleteMessage", "200"
- ))
- );
+ mockOperationsAndResponses(Map.of(
+ "deleteMessage", "200"
+ ));
assertDoesNotThrow(() -> osiPostfachRemoteService.deleteMessage("00000000-0000-0000-0000-000000000000"));
+
+ // TODO verify delete message called
+ // var requests = postfachFacadeMockClient.retrieveRecordedRequests(request());
}
+
+
}
--
GitLab