From 88f8cdc4a9ac2c764dc4dc7f45fc4357465ae9f1 Mon Sep 17 00:00:00 2001
From: OZG-Cloud Team <noreply@ozg-sh.de>
Date: Mon, 15 Jul 2024 09:24:25 +0200
Subject: [PATCH] OZG-5808 xdomea: Simplify test template
---
.../ozgcloud/eingang/xdomea/XdomeaXMLValueReaderTest.java | 7 ++-----
.../dfoerdermittel_Geschaeftsgang.Geschaeftsgang.0201.xml | 2 +-
.../mantelantrag_Geschaeftsgang.Geschaeftsgang.0201.xml | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReaderTest.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReaderTest.java
index 7d126c90..88d7d7cd 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReaderTest.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReaderTest.java
@@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import java.nio.charset.StandardCharsets;
-import java.util.List;
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.DisplayName;
@@ -23,7 +22,6 @@ class XdomeaXMLValueReaderTest {
private static final String XML_FILE_NAME = "file.xml";
private static final String PDF_FILE_NAME = "file.pdf";
private static final String XML_ATTACHMENT_FILE_NAME = "saml-attachment-file.xml";
- public static final String PDF_ATTACHMENT_FILE_NAME = "some-attachment-file.pdf";
@Spy
@InjectMocks
@@ -48,13 +46,12 @@ class XdomeaXMLValueReaderTest {
antragXMLFilename,
XML_FILE_NAME + "\n",
PDF_FILE_NAME,
- XML_ATTACHMENT_FILE_NAME,
- PDF_ATTACHMENT_FILE_NAME);
+ "\n" + XML_ATTACHMENT_FILE_NAME + "\n");
when(incomingXmlFile.getContentStream()).thenReturn(IOUtils.toInputStream(xmlString, StandardCharsets.UTF_8));
var names = valueReader.readRepresentationFileNames(incomingXmlFile);
- assertThat(names).isEqualTo(List.of(XML_FILE_NAME, PDF_FILE_NAME, XML_ATTACHMENT_FILE_NAME));
+ assertThat(names).containsExactly(XML_FILE_NAME, PDF_FILE_NAME, XML_ATTACHMENT_FILE_NAME);
}
}
diff --git a/xta-adapter/src/test/resources/xdomea/dfoerdermittel_Geschaeftsgang.Geschaeftsgang.0201.xml b/xta-adapter/src/test/resources/xdomea/dfoerdermittel_Geschaeftsgang.Geschaeftsgang.0201.xml
index 908ab7d4..06068ed7 100644
--- a/xta-adapter/src/test/resources/xdomea/dfoerdermittel_Geschaeftsgang.Geschaeftsgang.0201.xml
+++ b/xta-adapter/src/test/resources/xdomea/dfoerdermittel_Geschaeftsgang.Geschaeftsgang.0201.xml
@@ -129,7 +129,7 @@
</Name>
<Version>0.0</Version>
<Primaerdokument>
- <Dateiname>%s</Dateiname>
+ <Dateiname>anhang.pdf</Dateiname>
</Primaerdokument>
</Format>
</Version>
diff --git a/xta-adapter/src/test/resources/xdomea/mantelantrag_Geschaeftsgang.Geschaeftsgang.0201.xml b/xta-adapter/src/test/resources/xdomea/mantelantrag_Geschaeftsgang.Geschaeftsgang.0201.xml
index bc0d50a3..7bed65db 100644
--- a/xta-adapter/src/test/resources/xdomea/mantelantrag_Geschaeftsgang.Geschaeftsgang.0201.xml
+++ b/xta-adapter/src/test/resources/xdomea/mantelantrag_Geschaeftsgang.Geschaeftsgang.0201.xml
@@ -123,7 +123,7 @@
</xdomea:Name>
<xdomea:Version>0.0</xdomea:Version>
<xdomea:Primaerdokument>
- <xdomea:Dateiname>%s</xdomea:Dateiname>
+ <xdomea:Dateiname>anhang.pdf</xdomea:Dateiname>
</xdomea:Primaerdokument>
</xdomea:Format>
</xdomea:Version>
--
GitLab