sdaveb/IOCore
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Add missing TomlConfigFile unit tests and adjust Toml code to make it work
All checks were successful
buildbot/IOCore-linux-builder Build done.
Details
buildbot/IOCore-macos-builder Build done.
Details
buildbot/IOCore-freebsd-builder Build done.
Details

Browse Source
This commit is contained in:
S David 2024-08-13 14:25:41 -04:00
parent 054a5cd59b
commit 47a681e369
4 changed files with 91 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/TomlConfigFile.hpp
View File

@ -25,10 +25,15 @@ class TomlConfigFile : public FileResource {
auto read() -> IOCore::TomlTable&;
void write();
template<typename T>
[[nodiscard]] auto as() const -> T
{
return config_toml.as<T>();
}
template<typename T>
[[nodiscard]] auto get() const -> T
{
return config_toml.value<T>().value();
return TomlConfigFile::as<T>();
}
template<typename T>

12
include/TomlTable.hpp
View File

@ -30,7 +30,8 @@ struct TomlTable : public toml::table {
template<typename T>
auto operator=(const T& obj) -> TomlTable&
{
toml::table::operator=(to_toml_table<T>(obj));
auto value = to_toml_table(obj);
toml::table::operator=(value);
return *this;
}
@ -38,12 +39,13 @@ struct TomlTable : public toml::table {
template<typename T>
auto operator=(T&& obj) -> TomlTable&
{
toml::table::operator=(std::move(to_toml_table(obj)));
auto value = to_toml_table(obj);
toml::table::operator=(std::move(value));
return *this;
}
template<typename T>
auto as() -> T
auto get() const -> T
{
T retval;
from_toml_table(*this, retval);
@ -51,9 +53,9 @@ struct TomlTable : public toml::table {
}
template<typename T>
inline auto get() -> T
inline auto as() const -> T
{
return this->as<T>();
return TomlTable::get<T>();
}
};

3
include/util/toml.hpp
View File

@ -65,9 +65,9 @@ template<typename T>
void extract_from_toml_table(
const toml::table& tbl, const char* fieldName, T& output
);
template<typename T>
auto to_toml_table(const T& obj) -> toml::table;
template<typename T>
void from_toml_table(const toml::table& tbl, T& result);
@ -80,6 +80,7 @@ void from_toml_table(const toml::table& tbl, T& result);
{ \
return #CLASS; \
} \
\
friend auto to_toml_table(const CLASS& obj)->toml::table \
{ \
toml::table tbl; \

118
tests/TomlConfigFile.test.cpp
View File

@ -52,6 +52,24 @@ void from_toml_table<DataDict>(const toml::table& source, DataDict& out_data)
out_data.emplace(std::make_pair(key, value.ref<std::string>()));
}
}
struct SimpleStruct {
int field1;
int field2;
auto operator==(const SimpleStruct& other) const -> bool
{
return field1 == other.field1 && field2 == other.field2;
}
IOCORE_TOML_SERIALIZABLE(SimpleStruct, field1, field2);
};
struct ComplexStruct {
SimpleStruct field1;
int field2;
IOCORE_TOML_SERIALIZABLE(ComplexStruct, field1, field2);
};
BEGIN_TEST_SUITE("elemental::TomlConfigFile")
{
@ -180,56 +198,72 @@ BEGIN_TEST_SUITE("elemental::TomlConfigFile")
auto written_data =
toml_object.as<IOCore::Dictionary<std::string>>();
/*
REQUIRE(
written_data["one"] ==
test_data["one"].ref<std::string>()
);
REQUIRE(
written_data["resolution"] ==
test_data["resolution"].ref<std::string>()
);
REQUIRE(
written_data["Hello"] ==
test_data["Hello"].ref<std::string>()
); /*/
REQUIRE(
written_data["one"] ==
test_data["one"].ref<std::string>()
);
REQUIRE(
written_data["resolution"] ==
test_data["resolution"].ref<std::string>()
);
REQUIRE(
written_data["Hello"] ==
test_data["Hello"].ref<std::string>()
);
}
fs::remove(kINPUT_FILE_PATH);
}
/*
FIXTURE_TEST(
"TomlConfigFile::Get<T>() basically wraps
toml::table::get<T>()"
)
{
auto config_file = TomlConfigFile(kINPUT_FILE_PATH);
auto& json_data = config_file.getTomlTable();
config_file.read();
auto obtained_data =
config_file.get<IOCore::Dictionary<std::string>>();
FIXTURE_TEST(
"TomlConfigFile::Get<T>() basically wraps toml::table::get<T>() "
)
{
auto config_file = TomlConfigFile(kINPUT_FILE_PATH);
auto& json_data = config_file.getTomlTable();
REQUIRE(obtained_data["key1"] == "value1");
REQUIRE(obtained_data["key2"] == "value2");
}
FIXTURE_TEST(
"TomlConfigFile::Set() basically wraps
toml::table::operator=()"
)
{
auto config_file = TomlConfigFile(kINPUT_FILE_PATH);
IOCore::Dictionary<std::string> test_data;
config_file.read();
auto obtained_data =
config_file.get<IOCore::Dictionary<std::string>>();
test_data["one"] = "1";
test_data["resolution"] = "1280x720";
test_data["Hello"] = "world";
REQUIRE(obtained_data["key1"] == "value1");
REQUIRE(obtained_data["key2"] == "value2");
}
FIXTURE_TEST(
"TomlConfigFile::Set() basically wraps toml::table::operator=() "
)
{
auto config_file = TomlConfigFile(kINPUT_FILE_PATH);
IOCore::Dictionary<std::string> expected_data;
expected_data["one"] = "1";
expected_data["resolution"] = "1280x720";
expected_data["Hello"] = "world";
REQUIRE(json_data["one"] == test_data["one"]);
REQUIRE(json_data["resolution"] ==
test_data["resolution"]); REQUIRE(json_data["Hello"] ==
test_data["Hello"]);
} */
config_file.set(expected_data);
auto& toml_data = config_file.getTomlTable();
REQUIRE(
toml_data["one"].value<std::string>() == expected_data["one"]
);
REQUIRE(
toml_data["resolution"].value<std::string>() ==
expected_data["resolution"]
);
REQUIRE(
toml_data["Hello"].value<std::string>() ==
expected_data["Hello"]
);
}
FIXTURE_TEST("TomlConfigFile works with ComplexStruct ")
{
auto config_file = TomlConfigFile(kINPUT_FILE_PATH);
config_file.set(ComplexStruct{ { 11, 22 }, 30 });
auto toml_data = config_file.getTomlTable();
REQUIRE(toml_data["field1"]["field1"].value<int>() == 11);
REQUIRE(toml_data["field1"]["field2"].value<int>() == 22);
REQUIRE(toml_data["field2"].value<int>() == 30);
}
}
// clang-format off
// vim: set foldmethod=syntax textwidth=80 ts=8 sts=0 sw=8 noexpandtab ft=cpp.doxygen :