From 4b0fe5eb82851ad8429d30d568b6879e479d2f48 Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Mon, 22 Jul 2024 10:30:15 +0200
Subject: [PATCH] collect errors to the end

---
 .../hsadminng/hs/migration/CsvDataImport.java        | 12 +++++++++---
 .../hsadminng/hs/migration/ImportHostingAssets.java  |  6 ++++++
 .../hsadminng/hs/migration/ImportOfficeData.java     |  1 -
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/test/java/net/hostsharing/hsadminng/hs/migration/CsvDataImport.java b/src/test/java/net/hostsharing/hsadminng/hs/migration/CsvDataImport.java
index bd305b8d..d16e5f9b 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/migration/CsvDataImport.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/migration/CsvDataImport.java
@@ -20,15 +20,14 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.constraints.NotNull;
 
 import java.io.BufferedReader;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -69,6 +68,8 @@ public class CsvDataImport extends ContextBasedTest {
     @MockBean
     HttpServletRequest request;
 
+    private static final List<AssertionError> errors = new ArrayList<>();
+
     public List<String[]> readAllLines(Reader reader) throws Exception {
 
         final var parser = new CSVParserBuilder()
@@ -211,12 +212,17 @@ public class CsvDataImport extends ContextBasedTest {
     }
 
     void logError(final Runnable assertion) {
+        assertion.run();
         try {
             assertion.run();
         } catch (final AssertionError exc) {
-            System.err.println(exc);
+            errors.add(exc);
         }
     }
+
+    void logErrors() {
+        assumeThat(errors).isEmpty();
+    }
 }
 
 class Columns {
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java b/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
index 49ca2221..cda4c482 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
@@ -310,6 +310,12 @@ public class ImportHostingAssets extends ImportOfficeData {
         persistHostingAssetsOfType(IPV4_NUMBER);
     }
 
+    @Test
+    @Order(99999)
+    void logErrors() {
+        super.logErrors();
+    }
+
     private void persistRecursively(final Integer key, final HsBookingItemEntity bi) {
         if (bi.getParentItem() != null) {
             persistRecursively(key, HsBookingItemEntityValidatorRegistry.validated(bi.getParentItem()));
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportOfficeData.java b/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportOfficeData.java
index c5507a6d..7d20db99 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportOfficeData.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportOfficeData.java
@@ -500,7 +500,6 @@ public class ImportOfficeData extends CsvDataImport {
 
     @Test
     @Order(2000)
-    // @Disabled // FIXME
     void verifyAllPartnersHavePersons() {
         partners.forEach((id, p) -> {
             final var partnerRel = p.getPartnerRel();