From 8f2ad3b291da87349bcfa78b4bab1f3413a9eab5 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 4 Nov 2024 15:47:12 +0100
Subject: [PATCH] OZG-6991 implement comments from code review
---
.../de/ozgcloud/vorgang/command/CommandServiceTest.java | 2 +-
.../java/de/ozgcloud/vorgang/vorgang/LockTestFactory.java | 6 ++++--
.../vorgang/vorgang/VorgangEventListenerTest.java | 2 +-
.../de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java | 8 ++------
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
index d41622675..a129a4c38 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
@@ -184,7 +184,7 @@ class CommandServiceTest {
void shouldCallIsVorgangLocked() {
service.validateVorgang(VorgangTestFactory.ID);
- verify(vorgangService).isVorgangLocked(anyString());
+ verify(vorgangService).isVorgangLocked(VorgangTestFactory.ID);
}
@Test
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/LockTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/LockTestFactory.java
index 77b612728..7b4905e52 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/LockTestFactory.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/LockTestFactory.java
@@ -27,12 +27,14 @@ import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Map;
+import com.thedeanda.lorem.LoremIpsum;
+
import de.ozgcloud.vorgang.vorgang.Lock.LockBuilder;
public class LockTestFactory {
- public static final String CLIENT_NAME = "clientName";
- public static final String REASON = "reason";
+ public static final String CLIENT_NAME = LoremIpsum.getInstance().getFirstName() + "-Client";
+ public static final String REASON = LoremIpsum.getInstance().getWords(5);
public static final String LOCKED_SINCE_STR = ZonedDateTime.now().withNano(0).format(DateTimeFormatter.ISO_INSTANT);
public static final ZonedDateTime LOCKED_SINCE = ZonedDateTime.parse(LOCKED_SINCE_STR);
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerTest.java
index 95d602135..d57886aa6 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerTest.java
@@ -235,7 +235,7 @@ class VorgangEventListenerTest {
}
@Nested
- class TestLockVorgang {
+ class TestOnLockVorgang {
@Captor
private ArgumentCaptor<CommandFailedEvent> eventCaptor;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java
index 0fc449d69..5e4c2e469 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java
@@ -586,10 +586,10 @@ class VorgangServiceTest {
@Nested
class TestBuildLockPatch {
+ private final Command command = CommandTestFactory.createBuilder().bodyObject(Map.of(Lock.FIELD_REASON, LockTestFactory.REASON)).build();
+
@Test
void shouldSetClientName() {
- var command = CommandTestFactory.createBuilder().bodyObject(Map.of(Lock.FIELD_REASON, LockTestFactory.REASON)).build();
-
var result = service.buildLockPatch(command);
assertThat(result).extractingByKey(VorgangService.KEY_HEADER_LOCK, MAP)
@@ -598,8 +598,6 @@ class VorgangServiceTest {
@Test
void shouldSetLockedSince() {
- var command = CommandTestFactory.createBuilder().bodyObject(Map.of(Lock.FIELD_REASON, LockTestFactory.REASON)).build();
-
var result = service.buildLockPatch(command);
assertThat(result).extractingByKey(VorgangService.KEY_HEADER_LOCK, MAP)
@@ -609,8 +607,6 @@ class VorgangServiceTest {
@Test
void shouldSetReason() {
- var command = CommandTestFactory.createBuilder().bodyObject(Map.of(Lock.FIELD_REASON, LockTestFactory.REASON)).build();
-
var result = service.buildLockPatch(command);
assertThat(result).extractingByKey(VorgangService.KEY_HEADER_LOCK, MAP).containsEntry(Lock.FIELD_REASON, LockTestFactory.REASON);
--
GitLab