Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • ozg-cloud/app/eingang/intelliform-adapter
1 result
Select Git revision
Show changes
Commits on Source (2)
......@@ -42,8 +42,8 @@
<description>Eingangs Adapter - IntelliForm</description>
<properties>
<eingang-manager.version>2.19.0</eingang-manager.version>
<intelliform-semantik.version>2.19.0</intelliform-semantik.version>
<eingang-manager.version>2.20.0</eingang-manager.version>
<intelliform-semantik.version>2.20.0</intelliform-semantik.version>
<jaxb3-plugin.version>0.15.0</jaxb3-plugin.version>
<xmlschema.version>2.3.0</xmlschema.version>
......
......@@ -117,8 +117,6 @@ class FormDataEndpointITCase {
private MockWebServiceClient mockClient;
private DepositData depositData;
private final String vorgangId = UUID.randomUUID().toString();
@BeforeAll
......@@ -146,15 +144,12 @@ class FormDataEndpointITCase {
@Nested
class TestSendAntragWithManyAttachments {
@BeforeEach
void mock() {
depositData = DepositDataTestFactory.create(MANY_ATTACHMENTS);
}
private final DepositData depositData = DepositDataTestFactory.create(MANY_ATTACHMENTS);
@DisplayName("should map antragsteller nachname")
@Test
void shouldMapAntragstellerNachname() {
sendDepositAndCaptureCreateVorgang();
sendDepositAndCaptureCreateVorgang(depositData);
var antragsteller = getCapturedAntragsteller();
assertThat(antragsteller.getNachname()).isEqualTo(ANTRAGSTELLER_NACHNAME);
......@@ -163,7 +158,7 @@ class FormDataEndpointITCase {
@DisplayName("should map antragsteller anrede")
@Test
void shouldMapAntragstellerAnrede() {
sendDepositAndCaptureCreateVorgang();
sendDepositAndCaptureCreateVorgang(depositData);
var antragsteller = getCapturedAntragsteller();
assertThat(antragsteller.getAnrede()).isEqualTo(ANTRAGSTELLER_ANREDE);
......@@ -176,7 +171,7 @@ class FormDataEndpointITCase {
@DisplayName("should have representations")
@Test
void shouldHaveRepresentations() {
sendDepositAndCaptureCreateVorgang();
sendDepositAndCaptureCreateVorgang(depositData);
var eingang = grpcEingangCaptor.getValue();
var representationVendorIds = eingang.getRepresentationsList().stream()
......@@ -191,7 +186,7 @@ class FormDataEndpointITCase {
@DisplayName("should have attachments")
@Test
void shouldHaveAttachments() {
sendDepositAndCaptureCreateVorgang();
sendDepositAndCaptureCreateVorgang(depositData);
var eingang = grpcEingangCaptor.getValue();
var attachmentVendorIds = eingang.getAttachmentsList().stream()
......@@ -218,7 +213,7 @@ class FormDataEndpointITCase {
@DisplayName("should have organisationseinheitenID")
@Test
void shouldHaveOrganisationseinheitenId() {
sendDepositAndCaptureCreateVorgang();
sendDepositAndCaptureCreateVorgang(depositData);
var eingang = grpcEingangCaptor.getValue();
assertThat(eingang.getZustaendigeStelle().getOrganisationseinheitenId()).isEqualTo(ORGANISATIONSEINHEITEN_ID);
......@@ -229,16 +224,14 @@ class FormDataEndpointITCase {
@DisplayName("with duplicate keys")
@Nested
class TestWithDuplicateKeys {
@BeforeEach
void mock() {
depositData = DepositDataTestFactory.create(List.of(
withEmptyName(createXmlDaten()),
createXmlDaten(),
withEmptyName(createPdf()),
createPdf(),
withEmptyName(createPng()),
createPng()));
}
private final DepositData depositData = DepositDataTestFactory.create(List.of(
withEmptyName(createXmlDaten()),
createXmlDaten(),
withEmptyName(createPdf()),
createPdf(),
withEmptyName(createPng()),
createPng()));
private Attachment withEmptyName(Attachment attachment) {
attachment.setName("");
......@@ -248,7 +241,7 @@ class FormDataEndpointITCase {
@DisplayName("should keep last entry for representations")
@Test
void shouldKeepLastEntryForRepresentations() {
sendDepositAndCaptureCreateVorgang();
sendDepositAndCaptureCreateVorgang(depositData);
var eingang = grpcEingangCaptor.getValue();
var representationFiles = eingang.getRepresentationsList();
......@@ -259,7 +252,7 @@ class FormDataEndpointITCase {
@DisplayName("should keep last entry for attachments")
@Test
void shouldKeepLastEntryForAttachments() {
sendDepositAndCaptureCreateVorgang();
sendDepositAndCaptureCreateVorgang(depositData);
var eingang = grpcEingangCaptor.getValue();
var attachmentFiles = eingang.getAttachmentsList().stream()
......@@ -284,7 +277,7 @@ class FormDataEndpointITCase {
}
@SneakyThrows
private void sendDepositAndCaptureCreateVorgang() {
private void sendDepositAndCaptureCreateVorgang(DepositData depositData) {
mockClient.sendRequest(RequestCreators.withPayload(createEnvelopeSourceFromDepositData(depositData)))
.andExpect(ResponseMatchers.noFault())
.andExpect(ResponseMatchers.payload(getResource(RESPONSE)));
......