From 542a80542a2945ea51989a2d5ed4a2c083de3206 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Fri, 14 Feb 2025 10:57:00 -0600
Subject: [PATCH] Refactored app_config unit tests

---
 .../librepertory/include/types/repertory.hpp  | 24 +++++++++++++------
 .../repertory_test/src/app_config_test.cpp    | 14 ++++++++---
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/repertory/librepertory/include/types/repertory.hpp b/repertory/librepertory/include/types/repertory.hpp
index c04580f8..2790c08e 100644
--- a/repertory/librepertory/include/types/repertory.hpp
+++ b/repertory/librepertory/include/types/repertory.hpp
@@ -652,6 +652,18 @@ template <> struct adl_serializer<std::atomic<repertory::database_type>> {
   }
 };
 
+template <> struct adl_serializer<std::atomic<repertory::event_level>> {
+  static void to_json(json &data,
+                      const std::atomic<repertory::event_level> &value) {
+    data = repertory::event_level_to_string(value.load());
+  }
+
+  static void from_json(const json &data,
+                        std::atomic<repertory::event_level> &value) {
+    value.store(repertory::event_level_from_string(data.get<std::string>()));
+  }
+};
+
 template <> struct adl_serializer<std::atomic<repertory::download_type>> {
   static void to_json(json &data,
                       const std::atomic<repertory::download_type> &value) {
@@ -684,15 +696,13 @@ template <> struct adl_serializer<repertory::download_type> {
   }
 };
 
-template <> struct adl_serializer<std::atomic<repertory::event_level>> {
-  static void to_json(json &data,
-                      const std::atomic<repertory::event_level> &value) {
-    data = repertory::event_level_to_string(value.load());
+template <> struct adl_serializer<repertory::event_level> {
+  static void to_json(json &data, const repertory::event_level &value) {
+    data = repertory::event_level_to_string(value);
   }
 
-  static void from_json(const json &data,
-                        std::atomic<repertory::event_level> &value) {
-    value.store(repertory::event_level_from_string(data.get<std::string>()));
+  static void from_json(const json &data, repertory::event_level &value) {
+    value = repertory::event_level_from_string(data.get<std::string>());
   }
 };
 NLOHMANN_JSON_NAMESPACE_END
diff --git a/repertory/repertory_test/src/app_config_test.cpp b/repertory/repertory_test/src/app_config_test.cpp
index b5086f5b..f347e6a6 100644
--- a/repertory/repertory_test/src/app_config_test.cpp
+++ b/repertory/repertory_test/src/app_config_test.cpp
@@ -118,6 +118,8 @@ static void defaults_tests(const json &json_data, provider_type prov) {
     json_defaults.erase(JSON_RING_BUFFER_FILE_SIZE);
     json_defaults.erase(JSON_S3_CONFIG);
     json_defaults.erase(JSON_SIA_CONFIG);
+    json_defaults[JSON_REMOTE_MOUNT][JSON_API_PORT] =
+        app_config::default_remote_api_port(prov);
     break;
 
   case provider_type::remote:
@@ -148,12 +150,18 @@ static void defaults_tests(const json &json_data, provider_type prov) {
     json_defaults.erase(JSON_HOST_CONFIG);
     json_defaults.erase(JSON_REMOTE_CONFIG);
     json_defaults.erase(JSON_SIA_CONFIG);
+    json_defaults[JSON_REMOTE_MOUNT][JSON_API_PORT] =
+        app_config::default_remote_api_port(prov);
     break;
 
   case provider_type::sia:
     json_defaults.erase(JSON_ENCRYPT_CONFIG);
     json_defaults.erase(JSON_REMOTE_CONFIG);
     json_defaults.erase(JSON_S3_CONFIG);
+    json_defaults[JSON_HOST_CONFIG][JSON_API_PORT] =
+        app_config::default_api_port(prov);
+    json_defaults[JSON_REMOTE_MOUNT][JSON_API_PORT] =
+        app_config::default_remote_api_port(prov);
     break;
 
   default:
@@ -162,10 +170,10 @@ static void defaults_tests(const json &json_data, provider_type prov) {
 
   ASSERT_EQ(std::size_t(default_api_auth_size),
             json_data.at(JSON_API_AUTH).get<std::string>().size());
-  for (const auto &element : json_defaults) {
+  for (const auto &[key, value] : json_defaults.items()) {
     fmt::println("testing default|{}-{}", app_config::get_provider_name(prov),
-                 element.key());
-    EXPECT_EQ(json_defaults.value(), json_data.at(element.key()));
+                 key);
+    EXPECT_EQ(value, json_data.at(key));
   }
 }