From d37f14e1afe65aa0e9065d938da1f5911195cfaf Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Tue, 28 Jan 2025 09:41:54 +0100
Subject: [PATCH] OZG-7474 apply code review comments
---
...ardingVorgangWithEingangProcessorTest.java | 30 ++++++++++++-------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingVorgangWithEingangProcessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingVorgangWithEingangProcessorTest.java
index 12f00f5726..d8031d15c9 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingVorgangWithEingangProcessorTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingVorgangWithEingangProcessorTest.java
@@ -5,7 +5,6 @@ import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -67,6 +66,8 @@ class ForwardingVorgangWithEingangProcessorTest {
@Test
void shouldCallIsForwardableByOzgCloud() {
+ doReturn(false).when(processor).isForwardableByOzgCloud(any());
+
processor.process(EntityModel.of(vorgang));
verify(processor).isForwardableByOzgCloud(vorgang);
@@ -74,6 +75,7 @@ class ForwardingVorgangWithEingangProcessorTest {
@Nested
class TestOnIsNotForwardableByOzgCloud {
+
@BeforeEach
void givenIsNotForwardableByOzgCloud() {
doReturn(false).when(processor).isForwardableByOzgCloud(any());
@@ -89,6 +91,7 @@ class ForwardingVorgangWithEingangProcessorTest {
@Nested
class TestOnIsForwardableByOzgCloud {
+
@BeforeEach
void givenIsNotForwardableByOzgCloud() {
doReturn(true).when(processor).isForwardableByOzgCloud(any());
@@ -111,33 +114,40 @@ class ForwardingVorgangWithEingangProcessorTest {
@Nested
class TestForwardingLink {
- @DisplayName("should NOT be present in other Role then EA")
+ @Test
+ void shouldCallUserServiceForCurrentRole() {
+ processor.process(EntityModel.of(VorgangWithEingangTestFactory.create()));
+
+ verify(userService).hasRole(UserRole.EINHEITLICHER_ANSPRECHPARTNER);
+ }
+
@ParameterizedTest
@EnumSource
void shouldNotBePresentWithoutRole(Vorgang.VorgangStatus status) {
- when(userService.hasRole(UserRole.EINHEITLICHER_ANSPRECHPARTNER)).thenReturn(false);
+ when(userService.hasRole(any())).thenReturn(false);
var link = processor.process(buildVorgangInStatus(status)).getLink(ForwardingVorgangWithEingangProcessor.REL_FORWARD_BY_EMAIL);
assertThat(link).isEmpty();
}
- @DisplayName("with role EinheitlicherAnsprechpartner")
@Nested
class TestWithRoleEinheitlicherAnsprechpartner {
+
@BeforeEach
void init() {
- when(userService.hasRole(UserRole.EINHEITLICHER_ANSPRECHPARTNER)).thenReturn(true);
+ when(userService.hasRole(any())).thenReturn(true);
}
- @DisplayName("should be present in any Status")
@ParameterizedTest
- @EnumSource()
- void shouldBePresent(VorgangStatus status) {
+ @EnumSource
+ void shouldBePresentOnAnyStatus(VorgangStatus status) {
+ var expectedHref = UriComponentsBuilder.fromUriString(ForwardingController.LIST_PATH)
+ .queryParam(ForwardingController.PARAM_VORGANG_ID, VorgangHeaderTestFactory.ID).build().toString();
+
var link = processor.process(buildVorgangInStatus(status)).getLink(ForwardingVorgangWithEingangProcessor.REL_FORWARD_BY_EMAIL);
- assertThat(link).isPresent().get().extracting(Link::getHref)
- .isEqualTo("/api/forwardings?vorgangId=" + VorgangHeaderTestFactory.ID);
+ assertThat(link).isPresent().get().extracting(Link::getHref).isEqualTo(expectedHref);
}
}
--
GitLab