From 1f4bec401aa30e30e2449937b02782fee90fdad3 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 18 Dec 2024 12:21:21 +0100
Subject: [PATCH] Revert "adjust itcase"
This reverts commit 7d7938244ae8c1439246eecf47e66e89ef5c9814.
---
.../document/bescheid/BescheidDocumentITCase.java | 1 -
.../ozgcloud/document/bescheid/BescheidITCase.java | 1 -
.../{ => document/bescheid}/TestEventListener.java | 5 ++---
.../vorgang/collaboration/CollaborationITCase.java | 12 +-----------
4 files changed, 3 insertions(+), 16 deletions(-)
rename vorgang-manager-server/src/test/java/de/ozgcloud/{ => document/bescheid}/TestEventListener.java (93%)
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidDocumentITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidDocumentITCase.java
index 47cd0f59d..cea527a2c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidDocumentITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidDocumentITCase.java
@@ -42,7 +42,6 @@ import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.test.annotation.DirtiesContext;
-import de.ozgcloud.TestEventListener;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEvent;
import de.ozgcloud.command.CommandFailedEvent;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java
index 4315bd68f..90bf36e78 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java
@@ -55,7 +55,6 @@ import org.springframework.test.annotation.DirtiesContext;
import com.mongodb.client.gridfs.model.GridFSFile;
-import de.ozgcloud.TestEventListener;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.user.OzgCloudUserProfile;
import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/TestEventListener.java b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/TestEventListener.java
similarity index 93%
rename from vorgang-manager-server/src/test/java/de/ozgcloud/TestEventListener.java
rename to vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/TestEventListener.java
index de6fa9b32..9267814b3 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/TestEventListener.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/TestEventListener.java
@@ -21,16 +21,15 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud;
+package de.ozgcloud.document.bescheid;
import org.springframework.context.event.EventListener;
import de.ozgcloud.command.CommandFailedEvent;
import de.ozgcloud.document.BescheidDocumentCreatedEvent;
-import de.ozgcloud.document.bescheid.BescheidSentEvent;
import de.ozgcloud.vorgang.status.StatusChangedEvent;
-public class TestEventListener {
+class TestEventListener {
@EventListener
public void onBescheidDocumentCreated(BescheidDocumentCreatedEvent event) {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
index 7b8f7b556..7c3ca7a24 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
@@ -50,7 +50,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
@@ -61,7 +60,6 @@ import org.springframework.test.util.ReflectionTestUtils;
import com.google.protobuf.ByteString;
import com.thedeanda.lorem.LoremIpsum;
-import de.ozgcloud.TestEventListener;
import de.ozgcloud.apilib.client_attribute.grpc.OzgCloudClientAttributeMapper;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.user.OzgCloudUserProfile;
@@ -76,7 +74,6 @@ import de.ozgcloud.collaboration.request.CollaborationRequestServiceGrpc.Collabo
import de.ozgcloud.collaboration.request.GrpcFindRequestsRequest;
import de.ozgcloud.collaboration.request.GrpcGetRequestRequest;
import de.ozgcloud.command.Command;
-import de.ozgcloud.command.CommandFailedEvent;
import de.ozgcloud.command.CommandStatus;
import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.common.test.DataITCase;
@@ -128,8 +125,6 @@ class CollaborationITCase {
@Autowired
private MongoOperations mongoOperations;
- @SpyBean
- private TestEventListener testEventListener;
@MockBean
@Qualifier(CollaborationManagerConfiguration.OZGCLOUD_USER_PROFILE_SERVICE_NAME)
@@ -300,8 +295,6 @@ class CollaborationITCase {
class TestSuccessfully {
@Captor
private ArgumentCaptor<PostfachNachricht> postfachNachrichtCaptor;
- @Captor
- private ArgumentCaptor<CommandFailedEvent> commandFailedEventCaptor;
@BeforeEach
void init() {
@@ -336,10 +329,7 @@ class CollaborationITCase {
doThrow(TechnicalException.class).when(postfachRemoteService).sendMessage(any());
var command = commandService.createCommand(buildCreateCollaborationVorgangCommand(vorgangId, COLLABORATION_LEVEL));
- await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> {
- verify(testEventListener, atLeastOnce()).onCommandFailed(commandFailedEventCaptor.capture());
- assertThat(commandFailedEventCaptor.getValue().getSource()).isEqualTo(command.getId());
- });
+ waitUntilCommandHasStatus(command.getId(), CommandStatus.ERROR);
assertThat(loadCollaborationRequest(vorgangId)).isEmpty();
}
--
GitLab