BlockStorage/repertory
1
0
Fork 0
Code Issues 8 Pull Requests Releases 6 Wiki Activity

Refactored app_config unit tests

Browse Source
This commit is contained in:
Scott E. Graves 2025-02-14 10:57:00 -06:00
parent a244781b8d
commit 542a80542a
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
repertory/librepertory/include/types/repertory.hpp
View File

@ -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>> { template <> struct adl_serializer<std::atomic<repertory::download_type>> {
static void to_json(json &data, static void to_json(json &data,
const std::atomic<repertory::download_type> &value) { 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>> { template <> struct adl_serializer<repertory::event_level> {
static void to_json(json &data, static void to_json(json &data, const repertory::event_level &value) {
const std::atomic<repertory::event_level> &value) { data = repertory::event_level_to_string(value);
data = repertory::event_level_to_string(value.load());
} }
static void from_json(const json &data, static void from_json(const json &data, repertory::event_level &value) {
std::atomic<repertory::event_level> &value) { value = repertory::event_level_from_string(data.get<std::string>());
value.store(repertory::event_level_from_string(data.get<std::string>()));
} }
}; };
NLOHMANN_JSON_NAMESPACE_END NLOHMANN_JSON_NAMESPACE_END

14
repertory/repertory_test/src/app_config_test.cpp
View File

@ -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_RING_BUFFER_FILE_SIZE);
json_defaults.erase(JSON_S3_CONFIG); json_defaults.erase(JSON_S3_CONFIG);
json_defaults.erase(JSON_SIA_CONFIG); json_defaults.erase(JSON_SIA_CONFIG);
json_defaults[JSON_REMOTE_MOUNT][JSON_API_PORT] =
app_config::default_remote_api_port(prov);
break; break;
case provider_type::remote: 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_HOST_CONFIG);
json_defaults.erase(JSON_REMOTE_CONFIG); json_defaults.erase(JSON_REMOTE_CONFIG);
json_defaults.erase(JSON_SIA_CONFIG); json_defaults.erase(JSON_SIA_CONFIG);
json_defaults[JSON_REMOTE_MOUNT][JSON_API_PORT] =
app_config::default_remote_api_port(prov);
break; break;
case provider_type::sia: case provider_type::sia:
json_defaults.erase(JSON_ENCRYPT_CONFIG); json_defaults.erase(JSON_ENCRYPT_CONFIG);
json_defaults.erase(JSON_REMOTE_CONFIG); json_defaults.erase(JSON_REMOTE_CONFIG);
json_defaults.erase(JSON_S3_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; break;
default: 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), ASSERT_EQ(std::size_t(default_api_auth_size),
json_data.at(JSON_API_AUTH).get<std::string>().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), fmt::println("testing default|{}-{}", app_config::get_provider_name(prov),
element.key()); key);
EXPECT_EQ(json_defaults.value(), json_data.at(element.key())); EXPECT_EQ(value, json_data.at(key));
} }
} }