From c565606edf9b1364faca6f253d992df0fb32bf80 Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Wed, 19 Jun 2024 18:10:54 +0200
Subject: [PATCH] amending other tests to improved error messages

---
 .../HsBookingItemEntityValidator.java         |  6 +++-
 ...oudServerBookingItemValidatorUnitTest.java |  8 ++---
 ...gedServerBookingItemValidatorUnitTest.java |  8 ++---
 ...ingAssetPropsControllerAcceptanceTest.java | 29 +++++++++++--------
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidator.java b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidator.java
index c7a1dfa1..ee07e981 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidator.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidator.java
@@ -60,7 +60,7 @@ public class HsBookingItemEntityValidator extends HsEntityValidator<HsBookingIte
         final var totalValue = ofNullable(bookingItem.getSubBookingItems()).orElse(emptyList())
                 .stream()
                 .map(subItem -> propDef.getValue(subItem.getResources()))
-                .map(v -> v instanceof Boolean ? BooleanUtils.toInteger((Boolean)v) : v) // FIXME: remove?
+                .map(HsBookingItemEntityValidator::convertBooleanToInteger)
                 .map(HsBookingItemEntityValidator::toIntegerWithDefault0)
                 .reduce(0, Integer::sum);
         final var maxValue = getIntegerValueWithDefault0(propDef, bookingItem.getResources());
@@ -76,4 +76,8 @@ public class HsBookingItemEntityValidator extends HsEntityValidator<HsBookingIte
                     : null;
         }
     }
+
+    private static Object convertBooleanToInteger(final Object value) {
+        return value instanceof Boolean ? BooleanUtils.toInteger((Boolean)value) : value;
+    }
 }
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsCloudServerBookingItemValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsCloudServerBookingItemValidatorUnitTest.java
index a5072eca..6f854554 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsCloudServerBookingItemValidatorUnitTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsCloudServerBookingItemValidatorUnitTest.java
@@ -110,10 +110,10 @@ class HsCloudServerBookingItemValidatorUnitTest {
 
         // then
         assertThat(result).containsExactlyInAnyOrder(
-                "'D-12345:Test-Project:Test Cloud.resources.CPUs' maximum total is 4, but actual total CPUs 5",
-                "'D-12345:Test-Project:Test Cloud.resources.RAM' maximum total is 20 GB, but actual total RAM 30 GB",
-                "'D-12345:Test-Project:Test Cloud.resources.SSD' maximum total is 100 GB, but actual total SSD 150 GB",
-                "'D-12345:Test-Project:Test Cloud.resources.Traffic' maximum total is 5000 GB, but actual total Traffic 5500 GB"
+                "'D-12345:Test-Project:Test Cloud.resources.CPUs' maximum total is 4, but actual total CPUs is 5",
+                "'D-12345:Test-Project:Test Cloud.resources.RAM' maximum total is 20 GB, but actual total RAM is 30 GB",
+                "'D-12345:Test-Project:Test Cloud.resources.SSD' maximum total is 100 GB, but actual total SSD is 150 GB",
+                "'D-12345:Test-Project:Test Cloud.resources.Traffic' maximum total is 5000 GB, but actual total Traffic is 5500 GB"
         );
     }
 }
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java
index 549b5700..1fe754ea 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java
@@ -120,10 +120,10 @@ class HsManagedServerBookingItemValidatorUnitTest {
 
         // then
         assertThat(result).containsExactlyInAnyOrder(
-                "'D-12345:Test-Project:null.resources.CPUs' maximum total is 4, but actual total CPUs 5",
-                "'D-12345:Test-Project:null.resources.RAM' maximum total is 20 GB, but actual total RAM 30 GB",
-                "'D-12345:Test-Project:null.resources.SSD' maximum total is 100 GB, but actual total SSD 150 GB",
-                "'D-12345:Test-Project:null.resources.Traffic' maximum total is 5000 GB, but actual total Traffic 5500 GB"
+                "'D-12345:Test-Project:null.resources.CPUs' maximum total is 4, but actual total CPUs is 5",
+                "'D-12345:Test-Project:null.resources.RAM' maximum total is 20 GB, but actual total RAM is 30 GB",
+                "'D-12345:Test-Project:null.resources.SSD' maximum total is 100 GB, but actual total SSD is 150 GB",
+                "'D-12345:Test-Project:null.resources.Traffic' maximum total is 5000 GB, but actual total Traffic is 5500 GB"
         );
     }
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsControllerAcceptanceTest.java
index f25ec366..9a04c9b4 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsControllerAcceptanceTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsControllerAcceptanceTest.java
@@ -111,15 +111,6 @@ class HsHostingAssetPropsControllerAcceptanceTest {
                                 "defaultValue": 10,
                                 "isTotalsValidator": false
                             },
-                            {
-                                "type": "integer",
-                                "propertyName": "fastcgi_small",
-                                "min": 0,
-                                "max": 16,
-                                "required": false,
-                                "defaultValue": 4,
-                                "isTotalsValidator": false
-                            },
                             {
                                 "type": "boolean",
                                 "propertyName": "software-pgsql",
@@ -205,13 +196,27 @@ class HsHostingAssetPropsControllerAcceptanceTest {
                                 "type": "boolean",
                                 "propertyName": "software-php-8.1",
                                 "required": false,
-                                "defaultValue": true,
+                                "defaultValue": false,
                                 "isTotalsValidator": false
                             },
                             {
                                 "type": "boolean",
                                 "propertyName": "software-php-8.2",
                                 "required": false,
+                                "defaultValue": true,
+                                "isTotalsValidator": false
+                            },
+                            {
+                                "type": "boolean",
+                                "propertyName": "software-postfix-tls-1.0",
+                                "required": false,
+                                "defaultValue": false,
+                                "isTotalsValidator": false
+                            },
+                            {
+                                "type": "boolean",
+                                "propertyName": "software-dovecot-tls-1.0",
+                                "required": false,
                                 "defaultValue": false,
                                 "isTotalsValidator": false
                             },
@@ -238,9 +243,9 @@ class HsHostingAssetPropsControllerAcceptanceTest {
                             },
                             {
                                 "type": "boolean",
-                                "propertyName": "software-imagick-ghostscript",
+                                "propertyName": "software-imagemagick-ghostscript",
                                 "required": false,
-                                "defaultValue": true,
+                                "defaultValue": false,
                                 "isTotalsValidator": false
                             }
                         ]