From 15e4ff5c6230bdf993f12bfa1d3aa08198e6a900 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 3 Apr 2025 14:40:56 +0200
Subject: [PATCH 1/3] KOP-2949 format: Indent test code
---
.../afm/AfmEngineBasedAdapterTest.java | 78 +++++++++----------
1 file changed, 38 insertions(+), 40 deletions(-)
diff --git a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java
index 2763d9fa..2bc6e647 100644
--- a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java
+++ b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java
@@ -79,57 +79,55 @@ class AfmEngineBasedAdapterTest {
@Nested
class TestWithoutException {
+ @BeforeEach
+ void mock() {
+ ReflectionTestUtils.setField(adapter, "mappers", List.of(mapper0, mapper1));
+ when(intelliFormRepresentationAdapters.adaptByRepresentations(any())).thenReturn(formData1);
+ when(mapper0.parseFormData(any())).thenReturn(formData2);
+ when(mapper1.parseFormData(any())).thenReturn(formData3);
+ doReturn(formData4).when(adapter).removeProcessedData(any());
+ }
- @BeforeEach
- void mock() {
- ReflectionTestUtils.setField(adapter, "mappers", List.of(mapper0, mapper1));
-
- when(intelliFormRepresentationAdapters.adaptByRepresentations(any())).thenReturn(formData1);
- when(mapper0.parseFormData(any())).thenReturn(formData2);
- when(mapper1.parseFormData(any())).thenReturn(formData3);
- doReturn(formData4).when(adapter).removeProcessedData(any());
- }
-
- @DisplayName("should call adaptByRepresentations")
- @Test
- void shouldCallAdaptByRepresentations() {
- parseFormData();
+ @DisplayName("should call adaptByRepresentations")
+ @Test
+ void shouldCallAdaptByRepresentations() {
+ parseFormData();
- verify(intelliFormRepresentationAdapters).adaptByRepresentations(formData0);
- }
+ verify(intelliFormRepresentationAdapters).adaptByRepresentations(formData0);
+ }
- @DisplayName("should call first mapper")
- @Test
- void shouldCallFirstMapper() {
- parseFormData();
+ @DisplayName("should call first mapper")
+ @Test
+ void shouldCallFirstMapper() {
+ parseFormData();
- verify(mapper0).parseFormData(formData1);
- }
+ verify(mapper0).parseFormData(formData1);
+ }
- @DisplayName("should call second mapper")
- @Test
- void shouldCallSecondMapper() {
- parseFormData();
+ @DisplayName("should call second mapper")
+ @Test
+ void shouldCallSecondMapper() {
+ parseFormData();
- verify(mapper1).parseFormData(formData2);
- }
+ verify(mapper1).parseFormData(formData2);
+ }
- @DisplayName("should call removeProcessedData")
- @Test
- void shouldCallRemoveProcessedData() {
- parseFormData();
+ @DisplayName("should call removeProcessedData")
+ @Test
+ void shouldCallRemoveProcessedData() {
+ parseFormData();
- verify(adapter).removeProcessedData(formData3);
- }
+ verify(adapter).removeProcessedData(formData3);
+ }
- @DisplayName("should return")
- @Test
- void shouldReturn() {
- var result = parseFormData();
+ @DisplayName("should return")
+ @Test
+ void shouldReturn() {
+ var result = parseFormData();
- assertThat(result).isEqualTo(formData4);
- }
+ assertThat(result).isEqualTo(formData4);
+ }
}
--
GitLab
From beea0deb0925adde343700b0b3406c38e58edb21 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 3 Apr 2025 15:45:29 +0200
Subject: [PATCH 2/3] OZG-7978 pom: Use develop eingang-manager common
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index af754f85..30826677 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<description>Semantik-Adapter für AFM/IntelliForm</description>
<properties>
- <eingang-manager.version>2.20.0</eingang-manager.version>
+ <eingang-manager.version>2.21.0-develop-SNAPSHOT</eingang-manager.version>
</properties>
<dependencies>
--
GitLab
From 143176ca90d985106c5309df7dae78e9bb9460ac Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 3 Apr 2025 15:54:25 +0200
Subject: [PATCH 3/3] OZG-7978 pipeline: Add push-merge-request step
---
.gitlab-ci.yml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index edbc9719..26838309 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,11 @@ stages:
- test
- publish
+.get-version:
+ before_script:
+ - export PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout $MAVEN_CLI_OPTS | cut -d'-' -f1)
+ - export PROJECT_ARTIFACTID=$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout $MAVEN_CLI_OPTS)
+
build:
stage: build
script:
@@ -40,6 +45,17 @@ verify:
script:
- mvn verify $MAVEN_CLI_OPTS
+push-merge-request-snapshot-nexus:
+ stage: publish
+ before_script:
+ - !reference [ .get-version, before_script ]
+ script:
+ - mvn versions:set -DnewVersion=${PROJECT_VERSION}-MR-${CI_MERGE_REQUEST_IID}-SNAPSHOT $MAVEN_CLI_OPTS
+ - mvn deploy -Pnexus-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS
+ rules:
+ - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+ when: manual
+
snapshot-gitlab:
stage: publish
script:
--
GitLab