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..f051953be4c4f0639765059ab839c37b6d597751 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())
+ .zustaendigeStelles(List.of(ZustaendigeStelleTestFactory.create()))
.formData(Map.of(
SIMPLE_VALUE_KEY, SIMPLE_VALUE,
SUBFORM_KEY, SUBFORM_VALUE,
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..e3b420185c604cac46ab110ca801bac8cae7f5bc 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
@@ -234,7 +234,6 @@ class VorgangServiceTest {
@BeforeEach
void mock() {
preservedFormData = FormDataTestFactory.createBuilder()
- .zustaendigeStelle(ZustaendigeStelleTestFactory.create())
.zustaendigeStelle(ZustaendigeStelleTestFactory.createBuilder()
.organisationseinheitenId(ORGANISATIONSEINHEIT_ID_2)
.build())
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();
}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
index 57a4cc131104e30e83a7492e9c14419159fde868..377ff70a5036a54bc7e362c198a8339febc48dc1 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
@@ -181,6 +181,7 @@ class MantelantragZustaendigeStelleMapperTest {
getOrganisationseinheitIDFieldName(10), "1111111"
));
formData = FormDataTestFactory.createBuilder()
+ .clearZustaendigeStelles()
.formData(fieldMap)
.build();
}