From aeba07a62bbab0b0db5c6e7600b9a7997482f865 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 31 Oct 2022 09:36:09 +0100 Subject: [PATCH] OZG-2626 OZG-3065 fix naming --- .../user/UserNotificationEventListenerTest.java | 2 +- .../notification/user/UserNotificationServiceTest.java | 8 ++++---- .../kop/notification/vorgang/GrpcVorgangTestFactory.java | 2 +- .../kop/notification/vorgang/VorgangTestFactory.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationEventListenerTest.java b/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationEventListenerTest.java index 1447874e1..904edd060 100644 --- a/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationEventListenerTest.java +++ b/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationEventListenerTest.java @@ -48,7 +48,7 @@ class UserNotificationEventListenerTest { void shouldNotifyWithOrganisationeinheitIds() { userNotificationEventListener.onVorgangCreated(EVENT); - verify(userNotificationService).sendNotification(VorgangTestFactory.ORGANISATIONEINCHEIT_ID); + verify(userNotificationService).sendNotification(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID); } } } \ No newline at end of file diff --git a/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationServiceTest.java b/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationServiceTest.java index 37dd2dc08..14baeb2d9 100644 --- a/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationServiceTest.java +++ b/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationServiceTest.java @@ -38,20 +38,20 @@ class UserNotificationServiceTest { @BeforeEach void init() { - when(userRemoteService.getRecipients(VorgangTestFactory.ORGANISATIONEINCHEIT_ID)).thenReturn(List.of(RecipientTestFactory.create())); + when(userRemoteService.getRecipients(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID)).thenReturn(List.of(RecipientTestFactory.create())); doNothing().when(emailRemoteService).sendEmail(any(UserEmail.class)); } @Test void shouldGetRecipients() { - service.sendNotification(VorgangTestFactory.ORGANISATIONEINCHEIT_ID); + service.sendNotification(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID); - verify(userRemoteService).getRecipients(VorgangTestFactory.ORGANISATIONEINCHEIT_ID); + verify(userRemoteService).getRecipients(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID); } @Test void shouldSendEmail() { - service.sendNotification(VorgangTestFactory.ORGANISATIONEINCHEIT_ID); + service.sendNotification(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID); verify(emailRemoteService).sendEmail(UserEmailTestFactory.create()); } diff --git a/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/GrpcVorgangTestFactory.java b/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/GrpcVorgangTestFactory.java index 6bfd963d9..7b9d4f89f 100644 --- a/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/GrpcVorgangTestFactory.java +++ b/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/GrpcVorgangTestFactory.java @@ -23,7 +23,7 @@ public class GrpcVorgangTestFactory { .setPostfachId(VorgangTestFactory.POSTFACH_ID) .build()) .setZustaendigeStelle( - GrpcZustaendigeStelle.newBuilder().setOrganisationseinheitenId(VorgangTestFactory.ORGANISATIONEINCHEIT_ID).build()) + GrpcZustaendigeStelle.newBuilder().setOrganisationseinheitenId(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID).build()) .build()); } diff --git a/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/VorgangTestFactory.java b/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/VorgangTestFactory.java index 4d6a27b0a..ad7d79dee 100644 --- a/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/VorgangTestFactory.java +++ b/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/VorgangTestFactory.java @@ -14,7 +14,7 @@ public class VorgangTestFactory { public static final String POSTFACH_ID = UUID.randomUUID().toString(); public static final String FORM_ENGINE_NAME = "deluxeEngine"; - public static final String ORGANISATIONEINCHEIT_ID = "1234567889"; + public static final String ORGANISATIONS_EINHEIT_ID = "1234567889"; public static Vorgang create() { return createBuilder().build(); @@ -28,7 +28,7 @@ public class VorgangTestFactory { .createdAt(CREATED_AT) .postfachId(POSTFACH_ID) .formEngineName(FORM_ENGINE_NAME) - .organisationseinheitenId(ORGANISATIONEINCHEIT_ID); + .organisationseinheitenId(ORGANISATIONS_EINHEIT_ID); } } -- GitLab