From 9a9542443e5f66633ec33822be6e665f455fce5e Mon Sep 17 00:00:00 2001
From: Tobias Bruns <tobias.bruns@mgm-tp.com>
Date: Fri, 3 Jan 2025 13:18:07 +0100
Subject: [PATCH] OZG-6988 fix tests
---
.../ozgcloud/admin/reporting/AggregationMapping.java | 4 ++++
.../reporting/AggregationMappingTestFactory.java | 2 +-
.../admin/reporting/ReportingSettingITCase.java | 12 ++++++++----
src/test/resources/reporting/request.json | 2 +-
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java b/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
index 962142f1..24dd9371 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
@@ -15,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Builder;
import lombok.Getter;
import lombok.Singular;
+import lombok.ToString;
import lombok.extern.jackson.Jacksonized;
@Document("settings")
@@ -22,6 +23,7 @@ import lombok.extern.jackson.Jacksonized;
@Jacksonized
@Builder
@Getter
+@ToString
public class AggregationMapping {
@Id
@@ -39,6 +41,7 @@ public class AggregationMapping {
@Builder
@Getter
+ @ToString
static class FieldMapping {
@NotBlank
private String sourcePath;
@@ -48,6 +51,7 @@ public class AggregationMapping {
@Builder
@Getter
+ @ToString
static class FormIdentifier {
@NotBlank
private String formEngineName;
diff --git a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
index 1054ba6c..a5628289 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
@@ -9,7 +9,7 @@ class AggregationMappingTestFactory {
public static final String ID = UUID.randomUUID().toString();
public static final String FORM_ENGINE_NAME = "A12";
- public static final String FORM_ID = "123AABC";
+ public static final String FORM_ID = "42";
public static final String SOURCE_PATH = "name";
public static final String TARGET_PATH = "antragsteller.name";
diff --git a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingITCase.java b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingITCase.java
index 298e5a19..076a7b93 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingITCase.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingITCase.java
@@ -3,6 +3,7 @@ package de.ozgcloud.admin.reporting;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
import org.junit.jupiter.api.BeforeEach;
@@ -39,13 +40,14 @@ class ReportingSettingITCase {
void shouldHaveLinkToReporting() {
mockMvc.perform(get("/api/configuration"))
.andExpect(status().is2xxSuccessful())
- .andExpect(jsonPath("$._links.reportingSettings").exists());
+ .andDo(print())
+ .andExpect(jsonPath("$._links.aggregationMappings").exists());
}
@Test
@SneakyThrows
void shouldDenyWhileMissingFields() {
- mockMvc.perform(post("/api/configuration/reportingSettings").with(csrf())
+ mockMvc.perform(post("/api/configuration/aggregationMappings").with(csrf())
.contentType(MediaType.APPLICATION_JSON).content("{}"))
.andExpect(status().isUnprocessableEntity());
}
@@ -53,18 +55,20 @@ class ReportingSettingITCase {
@Test
@SneakyThrows
void shouldAddReportingSetting() {
- mockMvc.perform(post("/api/configuration/reportingSettings").with(csrf())
+ mockMvc.perform(post("/api/configuration/aggregationMappings").with(csrf())
.contentType(MediaType.APPLICATION_JSON).content(TestUtils.loadTextFile("reporting/request.json")))
.andExpect(status().isCreated());
var collection = mongoOperations.getCollection("settings");
assertThat(collection.countDocuments()).isEqualTo(1);
+ var mapping = mongoOperations.findAll(AggregationMapping.class).getFirst();
+ assertThat(mapping).usingRecursiveComparison().ignoringFields("id").isEqualTo(AggregationMappingTestFactory.create());
}
@Test
@SneakyThrows
void shouldListReportings() {
- mockMvc.perform(get("/api/configuration/reportingSettings"))
+ mockMvc.perform(get("/api/configuration/aggregationMappings"))
.andExpect(status().is2xxSuccessful());
}
diff --git a/src/test/resources/reporting/request.json b/src/test/resources/reporting/request.json
index 19608183..c2db9de8 100644
--- a/src/test/resources/reporting/request.json
+++ b/src/test/resources/reporting/request.json
@@ -1,6 +1,6 @@
{
"formIdentifier": {
- "formEngineName": "AFM",
+ "formEngineName": "A12",
"formId": "42"
},
"mappings": [
--
GitLab