diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
index e496826bf677bb6bd3a9202f54095ce4a5140e75..8d23e2cb03b702eb1fb9fc3869e5eb750f72cd84 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
@@ -61,6 +61,7 @@ public class FormDataTestFactory {
return FormData.builder()
.header(FormHeaderTestFactory.create())
.antragsteller(AntragstellerTestFactory.create())
+ .zustaendigeStelle(ZustaendigeStelleTestFactory.create())
.formData(Map.of(
SIMPLE_VALUE_KEY, SIMPLE_VALUE,
SUBFORM_KEY, SUBFORM_VALUE,
diff --git a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java
index 2982a7a881fd716d3c7dec518a6053786bbf00d8..edde8e256ad108a7458f4325b7444c4a585f776d 100644
--- a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java
+++ b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java
@@ -6,8 +6,6 @@ import static org.mockito.Mockito.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-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.mockito.ArgumentCaptor;
@@ -38,12 +36,8 @@ class EnterpriseEntryITCase {
@Autowired
private MockMvc mockMvc;
- private static final String VORGANG_ID = "vorgangId1";
-
@Test
void shouldCallVorgangService() {
- when(vorgangService.createVorgang(any())).thenReturn(VORGANG_ID);
-
doPostRequest();
verify(vorgangService).createVorgang(any());
@@ -63,11 +57,6 @@ class EnterpriseEntryITCase {
@Captor
private ArgumentCaptor<FormData> formDataCaptor;
- @BeforeEach
- void mock() {
- when(vorgangService.createVorgang(any())).thenReturn(VORGANG_ID);
- }
-
@Test
void shouldCreateVorgang() {
var formData = doPostRequest();
@@ -76,7 +65,7 @@ class EnterpriseEntryITCase {
}
@Test
- void shouldHaveTwoRepresentations() {
+ void shouldHaveNoOfRepresentations() {
var formData = doPostRequest();
assertThat(formData.getNumberOfRepresentations()).isEqualTo(2);
@@ -96,15 +85,6 @@ class EnterpriseEntryITCase {
assertThat(formData.getHeader().getServiceKonto().getType()).isEqualTo("MUK");
}
- @DisplayName("should have organisationseinheit id")
- @Test
- void shouldHaveOrganisationseinheitId() {
- var formData = doPostRequest();
-
- assertThat(formData.getZustaendigeStelles().getFirst().getOrganisationseinheitenId()).isEqualTo(
- ControlDataTestFactory.ZUSTAENDIGE_STELLE);
- }
-
@SneakyThrows
private FormData doPostRequest() {
mockMvc.perform(multipart("/antrag")
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
index cd8053fc026f9d93171e85bb047897d35a254c71..077a22039a5d9da064404d03e2ec4c24b6584915 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
@@ -32,6 +32,7 @@ import org.mockito.InjectMocks;
import org.mockito.Spy;
import de.ozgcloud.eingang.common.formdata.FormHeaderTestFactory;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
import de.ozgcloud.vorgang.common.grpc.GrpcFormDataMapper;
class FormCycleFormDataMapperTest {
@@ -59,7 +60,9 @@ class FormCycleFormDataMapperTest {
void shouldMapZustaendigeStelle() {
var mapped = mapper.toFormData(FormCycleFormDataTestFactory.create());
- assertThat(mapped.getZustaendigeStelles().getFirst().getOrganisationseinheitenId()).isEqualTo(FormCycleFormHeaderTestFactory.ORGANISATIONSEINHEIT_ID);
+ assertThat(mapped.getZustaendigeStelles())
+ .extracting(ZustaendigeStelle::getOrganisationseinheitenId)
+ .containsExactly(FormCycleFormHeaderTestFactory.ORGANISATIONSEINHEIT_ID);
}
}
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
index 91d203b2fd562200dc9f9df7990e63d2dadaac99..22abba8cb58224ab8a14a838630ed6698c096137 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
@@ -41,11 +41,13 @@ public class VorgangService {
private final VorgangRemoteService remoteService;
public String createVorgang(FormData formData) {
- var preparedFormData = preserveConsistency(formData);
- var organisationseinheitIds = getOrganisationsEinheitIds(formData);
- return organisationseinheitIds.isEmpty()
+ return createVorgangForOrganisationsEinheitIds(getOrganisationsEinheitIds(formData), preserveConsistency(formData));
+ }
+
+ String createVorgangForOrganisationsEinheitIds(List<String> organisationsEinheitIds, FormData preparedFormData) {
+ return organisationsEinheitIds.isEmpty()
? createVorgangOnMissingZustaendigeStelle(preparedFormData)
- : createMultipleVorgangs(preparedFormData, organisationseinheitIds).getFirst();
+ : createMultipleVorgangs(preparedFormData, organisationsEinheitIds).getFirst();
}
String createVorgangOnMissingZustaendigeStelle(FormData formData) {
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java
index fbb17f294ffbe8a3e51012c16422c73334c12f1e..f3c15dea9839888f9895a6e440489ee6f09b9b8e 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java
@@ -37,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import de.ozgcloud.eingang.common.formdata.AntragstellerTestFactory;
-import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import de.ozgcloud.eingang.common.formdata.ZustaendigeStelleTestFactory;
@@ -50,15 +49,6 @@ class GrpcEingangMapperITCase {
@Autowired
private GrpcEingangMapper grpcEingangMapper;
- private FormData inputFormData;
-
- @BeforeEach
- void mock() {
- inputFormData = FormDataTestFactory.createBuilder()
- .zustaendigeStelle(ZustaendigeStelleTestFactory.create())
- .build();
- }
-
@DisplayName("Mapped GrpcEingang")
@Nested
class TestToEingang {
@@ -69,8 +59,7 @@ class GrpcEingangMapperITCase {
@Test
void antragstellerShouldBeMapped() {
- var antragSteller = grpcEingangMapper.toEingang(inputFormData,
- Optional.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID)).getAntragsteller();
+ var antragSteller = grpcEingangMapper.toEingang(FormDataTestFactory.create(), Optional.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID)).getAntragsteller();
assertThat(antragSteller.getPostfachId()).isEqualTo(AntragstellerTestFactory.POSTFACH_ID);
assertThat(antragSteller.getVorname()).isEqualTo(AntragstellerTestFactory.VORNAME);
@@ -79,8 +68,7 @@ class GrpcEingangMapperITCase {
@Test
void dataShouldBeMapped() {
- var antragsteller = grpcEingangMapper.toEingang(inputFormData,
- Optional.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID)).getAntragsteller();
+ var antragsteller = grpcEingangMapper.toEingang(FormDataTestFactory.create(), Optional.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID)).getAntragsteller();
assertThat(antragsteller.getOtherData().getFieldList()).hasSize(1);
assertThat(antragsteller.getOtherData().getField(0).getName()).isEqualTo(AntragstellerTestFactory.GEBIET_BEZEICHNUNG_KEY);
@@ -93,8 +81,7 @@ class GrpcEingangMapperITCase {
class TestZustaendigeStelle {
@Test
void eingangShouldHaveZustaendigeStelle() {
- var zustaendigeStelle = grpcEingangMapper.toEingang(inputFormData, Optional.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID))
- .getZustaendigeStelle();
+ var zustaendigeStelle = grpcEingangMapper.toEingang(FormDataTestFactory.create(), Optional.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID)).getZustaendigeStelle();
assertThat(zustaendigeStelle).isNotNull();
assertThat(zustaendigeStelle.getOrganisationseinheitenId()).isEqualTo(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID);
@@ -104,7 +91,7 @@ class GrpcEingangMapperITCase {
@DisplayName("should map empty organisationeinheitId if missing")
@Test
void shouldMapEmptyOrganisationeinheitIdIfMissing() {
- var zustaendigeStelle = grpcEingangMapper.toEingang(inputFormData, Optional.empty()).getZustaendigeStelle();
+ var zustaendigeStelle = grpcEingangMapper.toEingang(FormDataTestFactory.create(), Optional.empty()).getZustaendigeStelle();
assertThat(zustaendigeStelle).isNotNull();
assertThat(zustaendigeStelle.getOrganisationseinheitenId()).isEmpty();
@@ -120,7 +107,7 @@ class GrpcEingangMapperITCase {
@BeforeEach
void init() {
- eingang = grpcEingangMapper.toEingang(inputFormData, Optional.empty());
+ eingang = grpcEingangMapper.toEingang(FormDataTestFactory.create(), Optional.empty());
}
@Test
@@ -200,8 +187,7 @@ class GrpcEingangMapperITCase {
void valueListShouldGenerateFields() {
GrpcEingang eingang = grpcEingangMapper
- .toEingang(FormDataTestFactory.createBuilder().formData(Map.of("key", List.of("value1", "value2"))).build(),
- Optional.empty());
+ .toEingang(FormDataTestFactory.createBuilder().formData(Map.of("key", List.of("value1", "value2"))).build(), Optional.empty());
assertThat(eingang.getFormData().getFieldCount()).isEqualTo(2);
}
@@ -211,8 +197,7 @@ class GrpcEingangMapperITCase {
GrpcEingang eingang = grpcEingangMapper
.toEingang(FormDataTestFactory.createBuilder()
- .formData(Map.of("key-1", List.of(Map.of("sub_key", "value1"), Map.of("sub_key", "value2")))).build(),
- Optional.empty());
+ .formData(Map.of("key-1", List.of(Map.of("sub_key", "value1"), Map.of("sub_key", "value2")))).build(), Optional.empty());
assertThat(eingang.getFormData().getFormCount()).isEqualTo(2);
assertThat(eingang.getFormData().getForm(0).getFieldCount()).isEqualTo(1);
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
index bb1294f2bad530b55eb9dafb45b5dc86dac05306..a78d71e8cdf178413195e438ec4d4820d62e1707 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
@@ -53,90 +53,88 @@ class VorgangServiceTest {
@Spy
@InjectMocks
private VorgangService service;
-
@Mock
private VorgangRemoteService remoteService;
- private static final String ORGANISATIONSEINHEIT_ID_2 = "08150816";
-
@DisplayName("Create vorgang")
@Nested
- class TestCreateVorgangs {
- private FormData formData;
- private FormData preservedFormData;
+ class TestCreateVorgang {
+
+ private final FormData formData = FormDataTestFactory.create();
+ private final FormData preservedFormData = FormDataTestFactory.create();
+ private final List<String> organisationseinheitIds = List.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID);
@BeforeEach
- void setup() {
- formData = FormDataTestFactory.create();
- preservedFormData = FormDataTestFactory.createBuilder()
- .zustaendigeStelle(ZustaendigeStelleTestFactory.createBuilder()
- .organisationseinheitenId(ORGANISATIONSEINHEIT_ID_2)
- .build())
- .build();
- doReturn(preservedFormData).when(service).preserveConsistency(any());
+ void mockEingangMapper() {
+ doReturn(preservedFormData).when(service).preserveConsistency(formData);
+ doReturn(organisationseinheitIds).when(service).getOrganisationsEinheitIds(any());
+ doReturn(VORGANG_ID).when(service).createVorgangForOrganisationsEinheitIds(organisationseinheitIds, preservedFormData);
}
- @DisplayName("should call preserve consistency")
@Test
- void shouldCallPreserveConsistency() {
- mockOrganisationseinheitId();
+ void shouldPreserverConsistency() {
+ callCreateVorgang();
+
+ verify(service).preserveConsistency(formData);
+ }
- createVorgang();
+ @DisplayName("should call create vorgang for organisationseinheitIds")
+ @Test
+ void shouldCallCreateVorgangForOrganisationseinheitIds() {
+ callCreateVorgang();
- verify(service).preserveConsistency(eq(formData));
+ verify(service).createVorgangForOrganisationsEinheitIds(organisationseinheitIds, preservedFormData);
}
@DisplayName("should call get organisationseinheit ids")
@Test
void shouldCallGetOrganisationseinheitIds() {
- mockOrganisationseinheitId();
+ callCreateVorgang();
+
+ verify(service).getOrganisationsEinheitIds(formData);
+ }
+
+ @DisplayName("should return vorgang id")
+ @Test
+ void shouldReturn() {
+ var vorgangId = callCreateVorgang();
- createVorgang();
+ assertThat(vorgangId).isEqualTo(VORGANG_ID);
+ }
- verify(service).getOrganisationsEinheitIds(eq(formData));
+ private String callCreateVorgang() {
+ return service.createVorgang(formData);
}
+ }
+
+ @DisplayName("create vorgang for organisationsEinheitIds")
+ @Nested
+ class TestCreateVorgangForOrganisationsEinheitIds {
+ private final FormData preservedFormData = FormDataTestFactory.create();
+ private final List<String> organisationseinheitIds = List.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID);
@DisplayName("should call create multiple vorgangs")
@Test
void shouldCallCreateMultipleVorgangs() {
- var organisationseinheitIds = List.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID, ORGANISATIONSEINHEIT_ID_2);
- mockOrganisationseinheitIds(organisationseinheitIds);
+ service.createVorgangForOrganisationsEinheitIds(organisationseinheitIds, preservedFormData);
- createVorgang();
-
- verify(service).createMultipleVorgangs(
- eq(preservedFormData),
- eq(organisationseinheitIds));
+ verify(service).createMultipleVorgangs(preservedFormData, organisationseinheitIds);
}
@DisplayName("should return first vorgang id with multiple organisationseinheits")
@Test
void shouldReturnFirstVorgangIdWithMultipleOrganisationseinheits() {
- var organisationseinheitIds = List.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID, ORGANISATIONSEINHEIT_ID_2);
- mockOrganisationseinheitIds(organisationseinheitIds);
-
- var vorgangIds = createVorgang();
-
- assertThat(vorgangIds).isEqualTo(VORGANG_ID);
- }
-
- private void mockOrganisationseinheitId() {
- doReturn(List.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID)).when(service).getOrganisationsEinheitIds(any());
doReturn(List.of(VORGANG_ID)).when(service).createMultipleVorgangs(any(), any());
- }
- private void mockOrganisationseinheitIds(List<String> organisationseinheitIds) {
- doReturn(organisationseinheitIds).when(service)
- .getOrganisationsEinheitIds(any());
- doReturn(List.of(VORGANG_ID, "otherId")).when(service).createMultipleVorgangs(any(), any());
+ var vorgangId = service.createVorgangForOrganisationsEinheitIds(organisationseinheitIds, preservedFormData);
+
+ assertThat(vorgangId).isEqualTo(VORGANG_ID);
}
@DisplayName("should call create vorgang on missing zustaendige stelle if organisationseinheit is missing")
@Test
void shouldCallCreateVorgangOnMissingZustaendigeStelleIfOrganisationseinheitIsMissing() {
- mockMissingOrganisationseinheitIds();
-
- createVorgang();
+ service.createVorgangForOrganisationsEinheitIds(emptyList(), preservedFormData);
verify(service).createVorgangOnMissingZustaendigeStelle(eq(preservedFormData));
}
@@ -144,21 +142,13 @@ class VorgangServiceTest {
@DisplayName("should return single vorgang id if organisationseinheit is missing")
@Test
void shouldReturnSingleVorgangIdIfOrganisationseinheitIsMissing() {
- mockMissingOrganisationseinheitIds();
+ doReturn(VORGANG_ID).when(service).createVorgangOnMissingZustaendigeStelle(any());
- var firstVorgangId = createVorgang();
+ var firstVorgangId = service.createVorgangForOrganisationsEinheitIds(emptyList(), preservedFormData);
assertThat(firstVorgangId).isEqualTo(VORGANG_ID);
}
- private void mockMissingOrganisationseinheitIds() {
- doReturn(emptyList()).when(service).getOrganisationsEinheitIds(any());
- doReturn(VORGANG_ID).when(service).createVorgangOnMissingZustaendigeStelle(any());
- }
-
- private String createVorgang() {
- return service.createVorgang(formData);
- }
}
@DisplayName("create vorgang on missing zustaendige stelle")
@@ -193,63 +183,42 @@ class VorgangServiceTest {
@Nested
class TestCreateMultipleVorgangs {
- private static final String VORGANG_ID_2 = "vorgangId2";
- private static final List<String> ORGANISATIONSEINHEIT_IDS = List.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID,
- ORGANISATIONSEINHEIT_ID_2);
-
@Mock
private FormData formData;
@BeforeEach
void mock() {
- when(remoteService.createVorgang(any(), any()))
- .thenReturn(VORGANG_ID)
- .thenReturn(VORGANG_ID_2);
+ when(remoteService.createVorgang(any(), any())).thenReturn(VORGANG_ID);
}
@DisplayName("should call create vorgang twice")
@Test
void shouldCallCreateVorgangTwice() {
- service.createMultipleVorgangs(formData, ORGANISATIONSEINHEIT_IDS);
+ service.createMultipleVorgangs(formData, List.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID));
verify(remoteService).createVorgang(formData, Optional.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID));
- verify(remoteService).createVorgang(formData, Optional.of(ORGANISATIONSEINHEIT_ID_2));
}
@DisplayName("should return")
@Test
void shouldReturn() {
- var vorgangIds = service.createMultipleVorgangs(formData, ORGANISATIONSEINHEIT_IDS);
+ var vorgangIds = service.createMultipleVorgangs(formData, List.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID));
- assertThat(vorgangIds).containsExactlyInAnyOrder(VORGANG_ID, VORGANG_ID_2);
+ assertThat(vorgangIds).containsExactly(VORGANG_ID);
}
}
@DisplayName("get organisationseinheit ids")
@Nested
class TestGetOrganisationseinheitIds {
-
- private FormData preservedFormData;
-
- @BeforeEach
- void mock() {
- preservedFormData = FormDataTestFactory.createBuilder()
- .zustaendigeStelle(ZustaendigeStelleTestFactory.create())
- .zustaendigeStelle(ZustaendigeStelleTestFactory.createBuilder()
- .organisationseinheitenId(ORGANISATIONSEINHEIT_ID_2)
- .build())
- .build();
- }
+ private final FormData preservedFormData = FormDataTestFactory.create();
@DisplayName("should return")
@Test
void shouldReturn() {
var organisationseinheitIds = service.getOrganisationsEinheitIds(preservedFormData);
- assertThat(organisationseinheitIds).containsExactly(
- ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID,
- ORGANISATIONSEINHEIT_ID_2
- );
+ assertThat(organisationseinheitIds).containsExactly(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID);
}
}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperTest.java
index d2b0412c81d0830aa3080902ea8c91371fac7e17..56058ec127401eeff1744df316e1aa60ef62449e 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperTest.java
@@ -44,6 +44,7 @@ class ZustaendigeStelleMetadataMapperTest {
behoerdeMetadataFile = IncomingFileTestFactory.createBuilder().name(ZustaendigeStelleMetadataMapper.BEHOERDE_METADATA_FILE_NAME)
.build();
formData = FormDataTestFactory.createBuilder()
+ .clearZustaendigeStelles()
.representation(behoerdeMetadataFile).build();
}
@@ -75,7 +76,7 @@ class ZustaendigeStelleMetadataMapperTest {
var result = mapper.parseZustaendigeStelleData(formData);
- assertThat(result.getZustaendigeStelles().getFirst()).isEqualTo(zustaendigeStelle);
+ assertThat(result.getZustaendigeStelles()).containsExactly(zustaendigeStelle);
}
}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java
index 1d078b3f189f4469c0a81e7f43da820f35b654fe..512d0a840d9c9018c5eb0b3c81495b470636f8e1 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java
@@ -224,7 +224,9 @@ class DFoerdermittelEngineBasedSemantikAdapterTest {
class TestWithNoExistingZustaendigeStelles {
@Test
void shouldHaveOrganisationsEinheitId() {
- var inputFormData = DFoerdermittelFormDataTestFactory.create();
+ var inputFormData = DFoerdermittelFormDataTestFactory.createBuilder()
+ .clearZustaendigeStelles()
+ .build();
var formData = adapter.addOrganisationsEinheitId(inputFormData);
@@ -238,18 +240,9 @@ class DFoerdermittelEngineBasedSemantikAdapterTest {
@Nested
class TestWithOneExistingZustaendigeStelle {
- private FormData inputFormData;
-
- @BeforeEach
- void mock() {
- inputFormData = DFoerdermittelFormDataTestFactory.createBuilder()
- .zustaendigeStelle(ZustaendigeStelleTestFactory.create())
- .build();
- }
-
@Test
void shouldHaveOrganisationsEinheitId() {
- var formData = adapter.addOrganisationsEinheitId(inputFormData);
+ var formData = adapter.addOrganisationsEinheitId(DFoerdermittelFormDataTestFactory.create());
assertThat(formData.getZustaendigeStelles())
.extracting(ZustaendigeStelle::getOrganisationseinheitenId)
@@ -259,7 +252,7 @@ class DFoerdermittelEngineBasedSemantikAdapterTest {
@DisplayName("should log error for existing zustaendige stelle")
@Test
void shouldLogErrorForExistingZustaendigeStelle() {
- adapter.addOrganisationsEinheitId(inputFormData);
+ adapter.addOrganisationsEinheitId(DFoerdermittelFormDataTestFactory.create());
verify(adapter).logErrorForExistingZustaendigeStelle();
}