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
  • KOP-3131-entfernen-grosser-strings
  • OZG-8085-ci-components-poc
  • main
  • release
  • 0.1.0
  • 0.10.0
  • 0.11.0
  • 0.12.0
  • 0.13.0
  • 0.14.0
  • 0.15.0
  • 0.16.0
  • 0.17.0
  • 0.18.0
  • 0.19.0
  • 0.2.0
  • 0.20.0
  • 0.21.0
  • 0.22.0
  • 0.23.0
  • 0.24.0
  • 0.25.0
  • 0.25.1
  • 0.3.0
  • 0.5.0
  • 0.8.0
  • 0.9.0
  • 1.0.0
  • 1.1.0
  • 1.1.1
  • 1.10.0
  • 1.10.1
  • 1.10.2
  • 1.10.3
  • 1.11.1
  • 1.12.0
  • 1.13.0
  • 1.14.0
  • 1.2.0
  • 1.3.0
  • 1.3.1
  • 1.3.2
  • 1.4.0
  • 1.5.0
  • 1.6.0
  • 1.7.0
  • 1.8.0
  • 1.9.0
  • 2.0.0
  • 2.0.1
  • 2.1.0
  • 2.1.1
  • 2.10.0
  • 2.11.0
  • 2.12.0
  • 2.13.0
  • 2.14.0
  • 2.15.0
  • 2.17.0
  • 2.18.0
  • 2.19.0
  • 2.2.0
  • 2.20.0
  • 2.21.0
  • 2.3.0
  • 2.4.0
  • 2.5.0
  • 2.6.0
  • 2.7.0
  • 2.8.0
  • 2.9.0
  • 2.9.1
  • v0.6.0
  • v0.7.0
74 results

Target

Select target project
  • ozg-cloud/app/eingang/intelliform-adapter
1 result
Select Git revision
  • KOP-3131-entfernen-grosser-strings
  • OZG-8085-ci-components-poc
  • main
  • release
  • 0.1.0
  • 0.10.0
  • 0.11.0
  • 0.12.0
  • 0.13.0
  • 0.14.0
  • 0.15.0
  • 0.16.0
  • 0.17.0
  • 0.18.0
  • 0.19.0
  • 0.2.0
  • 0.20.0
  • 0.21.0
  • 0.22.0
  • 0.23.0
  • 0.24.0
  • 0.25.0
  • 0.25.1
  • 0.3.0
  • 0.5.0
  • 0.8.0
  • 0.9.0
  • 1.0.0
  • 1.1.0
  • 1.1.1
  • 1.10.0
  • 1.10.1
  • 1.10.2
  • 1.10.3
  • 1.11.1
  • 1.12.0
  • 1.13.0
  • 1.14.0
  • 1.2.0
  • 1.3.0
  • 1.3.1
  • 1.3.2
  • 1.4.0
  • 1.5.0
  • 1.6.0
  • 1.7.0
  • 1.8.0
  • 1.9.0
  • 2.0.0
  • 2.0.1
  • 2.1.0
  • 2.1.1
  • 2.10.0
  • 2.11.0
  • 2.12.0
  • 2.13.0
  • 2.14.0
  • 2.15.0
  • 2.17.0
  • 2.18.0
  • 2.19.0
  • 2.2.0
  • 2.20.0
  • 2.21.0
  • 2.3.0
  • 2.4.0
  • 2.5.0
  • 2.6.0
  • 2.7.0
  • 2.8.0
  • 2.9.0
  • 2.9.1
  • v0.6.0
  • v0.7.0
74 results
Show changes
Commits on Source (2)
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
<description>Eingangs Adapter - IntelliForm</description> <description>Eingangs Adapter - IntelliForm</description>
<properties> <properties>
<eingang-manager.version>2.19.0</eingang-manager.version> <eingang-manager.version>2.20.0</eingang-manager.version>
<intelliform-semantik.version>2.19.0</intelliform-semantik.version> <intelliform-semantik.version>2.20.0</intelliform-semantik.version>
<jaxb3-plugin.version>0.15.0</jaxb3-plugin.version> <jaxb3-plugin.version>0.15.0</jaxb3-plugin.version>
<xmlschema.version>2.3.0</xmlschema.version> <xmlschema.version>2.3.0</xmlschema.version>
......
...@@ -117,8 +117,6 @@ class FormDataEndpointITCase { ...@@ -117,8 +117,6 @@ class FormDataEndpointITCase {
private MockWebServiceClient mockClient; private MockWebServiceClient mockClient;
private DepositData depositData;
private final String vorgangId = UUID.randomUUID().toString(); private final String vorgangId = UUID.randomUUID().toString();
@BeforeAll @BeforeAll
...@@ -146,15 +144,12 @@ class FormDataEndpointITCase { ...@@ -146,15 +144,12 @@ class FormDataEndpointITCase {
@Nested @Nested
class TestSendAntragWithManyAttachments { class TestSendAntragWithManyAttachments {
@BeforeEach private final DepositData depositData = DepositDataTestFactory.create(MANY_ATTACHMENTS);
void mock() {
depositData = DepositDataTestFactory.create(MANY_ATTACHMENTS);
}
@DisplayName("should map antragsteller nachname") @DisplayName("should map antragsteller nachname")
@Test @Test
void shouldMapAntragstellerNachname() { void shouldMapAntragstellerNachname() {
sendDepositAndCaptureCreateVorgang(); sendDepositAndCaptureCreateVorgang(depositData);
var antragsteller = getCapturedAntragsteller(); var antragsteller = getCapturedAntragsteller();
assertThat(antragsteller.getNachname()).isEqualTo(ANTRAGSTELLER_NACHNAME); assertThat(antragsteller.getNachname()).isEqualTo(ANTRAGSTELLER_NACHNAME);
...@@ -163,7 +158,7 @@ class FormDataEndpointITCase { ...@@ -163,7 +158,7 @@ class FormDataEndpointITCase {
@DisplayName("should map antragsteller anrede") @DisplayName("should map antragsteller anrede")
@Test @Test
void shouldMapAntragstellerAnrede() { void shouldMapAntragstellerAnrede() {
sendDepositAndCaptureCreateVorgang(); sendDepositAndCaptureCreateVorgang(depositData);
var antragsteller = getCapturedAntragsteller(); var antragsteller = getCapturedAntragsteller();
assertThat(antragsteller.getAnrede()).isEqualTo(ANTRAGSTELLER_ANREDE); assertThat(antragsteller.getAnrede()).isEqualTo(ANTRAGSTELLER_ANREDE);
...@@ -176,7 +171,7 @@ class FormDataEndpointITCase { ...@@ -176,7 +171,7 @@ class FormDataEndpointITCase {
@DisplayName("should have representations") @DisplayName("should have representations")
@Test @Test
void shouldHaveRepresentations() { void shouldHaveRepresentations() {
sendDepositAndCaptureCreateVorgang(); sendDepositAndCaptureCreateVorgang(depositData);
var eingang = grpcEingangCaptor.getValue(); var eingang = grpcEingangCaptor.getValue();
var representationVendorIds = eingang.getRepresentationsList().stream() var representationVendorIds = eingang.getRepresentationsList().stream()
...@@ -191,7 +186,7 @@ class FormDataEndpointITCase { ...@@ -191,7 +186,7 @@ class FormDataEndpointITCase {
@DisplayName("should have attachments") @DisplayName("should have attachments")
@Test @Test
void shouldHaveAttachments() { void shouldHaveAttachments() {
sendDepositAndCaptureCreateVorgang(); sendDepositAndCaptureCreateVorgang(depositData);
var eingang = grpcEingangCaptor.getValue(); var eingang = grpcEingangCaptor.getValue();
var attachmentVendorIds = eingang.getAttachmentsList().stream() var attachmentVendorIds = eingang.getAttachmentsList().stream()
...@@ -218,7 +213,7 @@ class FormDataEndpointITCase { ...@@ -218,7 +213,7 @@ class FormDataEndpointITCase {
@DisplayName("should have organisationseinheitenID") @DisplayName("should have organisationseinheitenID")
@Test @Test
void shouldHaveOrganisationseinheitenId() { void shouldHaveOrganisationseinheitenId() {
sendDepositAndCaptureCreateVorgang(); sendDepositAndCaptureCreateVorgang(depositData);
var eingang = grpcEingangCaptor.getValue(); var eingang = grpcEingangCaptor.getValue();
assertThat(eingang.getZustaendigeStelle().getOrganisationseinheitenId()).isEqualTo(ORGANISATIONSEINHEITEN_ID); assertThat(eingang.getZustaendigeStelle().getOrganisationseinheitenId()).isEqualTo(ORGANISATIONSEINHEITEN_ID);
...@@ -229,16 +224,14 @@ class FormDataEndpointITCase { ...@@ -229,16 +224,14 @@ class FormDataEndpointITCase {
@DisplayName("with duplicate keys") @DisplayName("with duplicate keys")
@Nested @Nested
class TestWithDuplicateKeys { class TestWithDuplicateKeys {
@BeforeEach
void mock() { private final DepositData depositData = DepositDataTestFactory.create(List.of(
depositData = DepositDataTestFactory.create(List.of( withEmptyName(createXmlDaten()),
withEmptyName(createXmlDaten()), createXmlDaten(),
createXmlDaten(), withEmptyName(createPdf()),
withEmptyName(createPdf()), createPdf(),
createPdf(), withEmptyName(createPng()),
withEmptyName(createPng()), createPng()));
createPng()));
}
private Attachment withEmptyName(Attachment attachment) { private Attachment withEmptyName(Attachment attachment) {
attachment.setName(""); attachment.setName("");
...@@ -248,7 +241,7 @@ class FormDataEndpointITCase { ...@@ -248,7 +241,7 @@ class FormDataEndpointITCase {
@DisplayName("should keep last entry for representations") @DisplayName("should keep last entry for representations")
@Test @Test
void shouldKeepLastEntryForRepresentations() { void shouldKeepLastEntryForRepresentations() {
sendDepositAndCaptureCreateVorgang(); sendDepositAndCaptureCreateVorgang(depositData);
var eingang = grpcEingangCaptor.getValue(); var eingang = grpcEingangCaptor.getValue();
var representationFiles = eingang.getRepresentationsList(); var representationFiles = eingang.getRepresentationsList();
...@@ -259,7 +252,7 @@ class FormDataEndpointITCase { ...@@ -259,7 +252,7 @@ class FormDataEndpointITCase {
@DisplayName("should keep last entry for attachments") @DisplayName("should keep last entry for attachments")
@Test @Test
void shouldKeepLastEntryForAttachments() { void shouldKeepLastEntryForAttachments() {
sendDepositAndCaptureCreateVorgang(); sendDepositAndCaptureCreateVorgang(depositData);
var eingang = grpcEingangCaptor.getValue(); var eingang = grpcEingangCaptor.getValue();
var attachmentFiles = eingang.getAttachmentsList().stream() var attachmentFiles = eingang.getAttachmentsList().stream()
...@@ -284,7 +277,7 @@ class FormDataEndpointITCase { ...@@ -284,7 +277,7 @@ class FormDataEndpointITCase {
} }
@SneakyThrows @SneakyThrows
private void sendDepositAndCaptureCreateVorgang() { private void sendDepositAndCaptureCreateVorgang(DepositData depositData) {
mockClient.sendRequest(RequestCreators.withPayload(createEnvelopeSourceFromDepositData(depositData))) mockClient.sendRequest(RequestCreators.withPayload(createEnvelopeSourceFromDepositData(depositData)))
.andExpect(ResponseMatchers.noFault()) .andExpect(ResponseMatchers.noFault())
.andExpect(ResponseMatchers.payload(getResource(RESPONSE))); .andExpect(ResponseMatchers.payload(getResource(RESPONSE)));
......