From b388d402fc6c14ecb934143c6b4063c1cca6d59f Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 6 Nov 2024 09:56:24 +0100
Subject: [PATCH] OZG-5778 fix test issues after renaming / update
---
.../common/formdata/FormMetaDataTestFactory.java | 4 ++--
.../eingang/fim/ZustaendigeStelleMapper.java | 7 ++++---
.../eingang/fim/ZustaendigeStelleMapperTest.java | 15 +++++++++++----
...k.boot.autoconfigure.AutoConfiguration.imports | 6 ------
.../eingang/xta/XtaMessageMapperTest.java | 2 +-
5 files changed, 18 insertions(+), 16 deletions(-)
delete mode 100644 router/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormMetaDataTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormMetaDataTestFactory.java
index 3b649ced0..987fef7dd 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormMetaDataTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormMetaDataTestFactory.java
@@ -4,7 +4,7 @@ import java.time.ZonedDateTime;
public class FormMetaDataTestFactory {
- public static final String DESTINATION_ID_ENTRY_NAME = "destinationId";
+ public static final String XTA_IDENTIFIER_ENTRY_NAME = "xtaIdentifier";
public static final String XTA_IDENTIFIER = "vbe:010550120100";
public static final String OE_ID = "010550120100";
@@ -25,7 +25,7 @@ public class FormMetaDataTestFactory {
@Override
public String getEntry(String name) {
switch (name) {
- case DESTINATION_ID_ENTRY_NAME:
+ case XTA_IDENTIFIER_ENTRY_NAME:
return XTA_IDENTIFIER;
}
return null;
diff --git a/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/ZustaendigeStelleMapper.java b/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/ZustaendigeStelleMapper.java
index 541082619..72146cb77 100644
--- a/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/ZustaendigeStelleMapper.java
+++ b/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/ZustaendigeStelleMapper.java
@@ -1,5 +1,6 @@
package de.ozgcloud.eingang.fim;
+import java.util.List;
import java.util.Objects;
import java.util.Optional;
@@ -21,13 +22,13 @@ class ZustaendigeStelleMapper implements FimEngineBasedMapper {
return formData.getControl().getMetaData()
.map(metaData -> metaData.getEntry(XTA_IDENTIFIER_ENTRY_NAME))
.filter(Objects::nonNull)
- .map(oeId -> setOrganisationsEinheitId(formData.getZustaendigeStelle(), oeId))
+ .map(oeId -> setOrganisationsEinheitId(formData.getZustaendigeStelles(), oeId))
.map(zustStelle -> formData.toBuilder().zustaendigeStelle(zustStelle).build())
.orElse(formData);
}
- private ZustaendigeStelle setOrganisationsEinheitId(ZustaendigeStelle stelle, @NonNull String oeid) {
- var builder = Objects.isNull(stelle) ? ZustaendigeStelle.builder() : stelle.toBuilder();
+ private ZustaendigeStelle setOrganisationsEinheitId(List<ZustaendigeStelle> stelles, @NonNull String oeid) {
+ var builder = stelles.isEmpty() ? ZustaendigeStelle.builder() : stelles.getFirst().toBuilder();
extractOrganisationsEinheitId(oeid).ifPresent(builder::organisationseinheitenId);
return builder.build();
diff --git a/fim-adapter/src/test/java/de/ozgcloud/eingang/fim/ZustaendigeStelleMapperTest.java b/fim-adapter/src/test/java/de/ozgcloud/eingang/fim/ZustaendigeStelleMapperTest.java
index 40b4c2fd3..23fa26757 100644
--- a/fim-adapter/src/test/java/de/ozgcloud/eingang/fim/ZustaendigeStelleMapperTest.java
+++ b/fim-adapter/src/test/java/de/ozgcloud/eingang/fim/ZustaendigeStelleMapperTest.java
@@ -7,6 +7,7 @@ import org.mockito.InjectMocks;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.FormMetaDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
class ZustaendigeStelleMapperTest {
@@ -15,16 +16,22 @@ class ZustaendigeStelleMapperTest {
@Test
void shouldSetOrganisationsEinheitId() {
- var parsed = mapper.parseFormData(FormDataTestFactory.create());
+ var parsed = mapper.parseFormData(FormDataTestFactory.createBuilder().clearZustaendigeStelles().build());
- assertThat(parsed.getZustaendigeStelle().getOrganisationseinheitenId()).isEqualTo(FormMetaDataTestFactory.OE_ID);
+ assertThat(parsed.getZustaendigeStelles()).hasSize(1).first().extracting(ZustaendigeStelle::getOrganisationseinheitenId)
+ .isEqualTo(FormMetaDataTestFactory.OE_ID);
+
+// assertThat(parsed.getZustaendigeStelle().getOrganisationseinheitenId()).isEqualTo(FormMetaDataTestFactory.OE_ID);
}
@Test
void shouldWorkWithoutGivenZustaendigeStelle() {
- var parsed = mapper.parseFormData(FormDataTestFactory.createBuilder().zustaendigeStelle(null).build());
+ var parsed = mapper.parseFormData(FormDataTestFactory.createBuilder().clearZustaendigeStelles().build());
+
+ assertThat(parsed.getZustaendigeStelles()).hasSize(1).first().extracting(ZustaendigeStelle::getOrganisationseinheitenId)
+ .isNotNull();
- assertThat(parsed.getZustaendigeStelle()).isNotNull();
+// assertThat(parsed.getZustaendigeStelle()).isNotNull();
}
@Test
diff --git a/router/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/router/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 099d75998..000000000
--- a/router/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,6 +0,0 @@
-net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration
-net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration
-net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration
-net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration
-net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration
-net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration
\ No newline at end of file
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
index e2ae20d60..884595456 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
@@ -92,7 +92,7 @@ class XtaMessageMapperTest {
var formData = doMapping();
assertThat(formData.getControl().getMetaData()).isPresent().get()
- .extracting(metaData -> metaData.getEntry(FormMetaDataTestFactory.DESTINATION_ID_ENTRY_NAME))
+ .extracting(metaData -> metaData.getEntry(FormMetaDataTestFactory.XTA_IDENTIFIER))
.isEqualTo(FormMetaDataTestFactory.XTA_IDENTIFIER);
}
--
GitLab