test: improve coverage#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 1 commit into from
Jun 10, 2026
Merged

test: improve coverage #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/common/file_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ namespace display_device {
}

std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
std::error_code error_code;
if (!std::filesystem::exists(m_filepath, error_code)) {
if (error_code) {
DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
<< "[" << error_code.value() << "] " << error_code.message();
Expand All@@ -50,6 +51,17 @@ namespace display_device {
return std::vector<std::uint8_t> {};
}

if (!std::filesystem::is_regular_file(m_filepath, error_code)) {
if (error_code) {
DD_LOG(error) << "Failed to inspect " << m_filepath << "! Error:\n"
<< "[" << error_code.value() << "] " << error_code.message();
} else {
DD_LOG(error) << "Failed to load " << m_filepath << "! Path is not a regular file.";
}

return std::nullopt;
}

try {
std::ifstream stream {m_filepath, std::ios::binary};
if (!stream) {
Expand Down
1 change: 1 addition & 0 deletions src/common/include/display_device/file_settings_persistence.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ namespace display_device {
/**
* @copydoc SettingsPersistenceInterface::load
* @note If file does not exist, an empty data list will be returned instead of null optional.
* @note If the path exists but is not a regular file, null optional will be returned.
*/
[[nodiscard]] std::optional<std::vector<std::uint8_t>> load() const override;

Expand Down
2 changes: 2 additions & 0 deletions src/common/json.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
// clang-format on

namespace display_device {
const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

DD_JSON_DEFINE_CONVERTER(EdidData)
DD_JSON_DEFINE_CONVERTER(EnumeratedDevice)
DD_JSON_DEFINE_CONVERTER(EnumeratedDeviceList)
Expand Down
2 changes: 0 additions & 2 deletions src/windows/json.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
// clang-format on

namespace display_device {
const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

DD_JSON_DEFINE_CONVERTER(ActiveTopology)
DD_JSON_DEFINE_CONVERTER(DeviceDisplayModeMap)
DD_JSON_DEFINE_CONVERTER(HdrStateMap)
Expand Down
28 changes: 28 additions & 0 deletions tests/fixtures/include/fixtures/json_converter_test.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,32 @@ class JsonConverterTest: public BaseTest {
}
EXPECT_EQ(input, defaulted_input);
}

template<class T>
void executeInvalidJsonTestCase() const {
executeFromJsonFailureTestCase<T>("{");
}

template<class T>
void executeFromJsonFailureTestCase(const std::string &input) const {
const T original {};
T output {original};
std::string error_message {"unchanged"};

EXPECT_FALSE(display_device::fromJson(input, output, &error_message));
EXPECT_EQ(output, original);
EXPECT_FALSE(error_message.empty());

EXPECT_FALSE(display_device::fromJson(input, output, nullptr));
EXPECT_EQ(output, original);
}

template<class T>
void executeToJsonFailureTestCase(const T &input) const {
bool success {true};

EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, &success).empty());
EXPECT_FALSE(success);
EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, nullptr).empty());
}
};
25 changes: 24 additions & 1 deletion tests/unit/general/test_file_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <algorithm>
#include <filesystem>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand All@@ -16,7 +17,8 @@ namespace {
class FileSettingsPersistenceTest: public BaseTest {
public:
~FileSettingsPersistenceTest() override {
std::filesystem::remove(m_filepath);
std::error_code error_code;
std::filesystem::remove_all(m_filepath, error_code);
}

display_device::FileSettingsPersistence &getImpl(const std::filesystem::path &filepath = "testfile.ext") {
Expand DownExpand Up@@ -101,6 +103,13 @@ TEST_F_S(Load, FileRead) {
EXPECT_EQ(getImpl(filepath).load(), data);
}

TEST_F_S(Load, FilepathIsDirectory) {
const std::filesystem::path filepath {"settings-dir"};

std::filesystem::create_directory(filepath);
EXPECT_EQ(getImpl(filepath).load(), std::nullopt);
}

TEST_F_S(Clear, NoFileAvailable) {
EXPECT_TRUE(getImpl().clear());
}
Expand All@@ -116,3 +125,17 @@ TEST_F_S(Clear, FileRemoved) {
EXPECT_TRUE(getImpl(filepath).clear());
EXPECT_FALSE(std::filesystem::exists(filepath));
}

TEST_F_S(Clear, NonEmptyDirectory) {
const std::filesystem::path filepath {"settings-dir"};

std::filesystem::create_directory(filepath);
{
std::ofstream file {filepath / "child.ext"};
file << "some data";
}

EXPECT_TRUE(std::filesystem::exists(filepath));
EXPECT_FALSE(getImpl(filepath).clear());
EXPECT_TRUE(std::filesystem::exists(filepath));
}
159 changes: 158 additions & 1 deletion tests/unit/general/test_json.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,18 @@ namespace display_device {
friend bool operator==(const TestStruct &lhs, const TestStruct &rhs) = default;
};

struct TestThrowingStruct {
enum class Error {
None,
OutOfRange,
InvalidArgument
};

Error m_error {Error::None};

friend bool operator==(const TestThrowingStruct &lhs, const TestThrowingStruct &rhs) = default;
};

using TestVariant = std::variant<double, Rational>;

DD_JSON_DEFINE_SERIALIZE_ENUM_GCOVR_EXCL_BR_LINE(TestEnum, {{TestEnum::Value1, "Value1"}, {TestEnum::Value2, "ValueMaybe2"}})
Expand All@@ -48,6 +60,34 @@ namespace display_device {
DD_JSON_DEFINE_CONVERTER(std::chrono::weeks)
DD_JSON_DEFINE_CONVERTER(std::chrono::months)
DD_JSON_DEFINE_CONVERTER(std::chrono::years)

void to_json(nlohmann::json &json, const TestThrowingStruct &value) {
using enum TestThrowingStruct::Error;

switch (value.m_error) {
case None:
json = {{"error", "none"}};
return;
case OutOfRange:
throw std::out_of_range {"to_json out_of_range"};
case InvalidArgument:
throw std::invalid_argument {"to_json invalid_argument"};
}
}

void from_json(const nlohmann::json &json, TestThrowingStruct &value) {
const auto error {json.at("error").get<std::string>()};
if (error == "out_of_range") {
throw std::out_of_range {"from_json out_of_range"};
}
if (error == "invalid_argument") {
throw std::invalid_argument {"from_json invalid_argument"};
}

value = {};
}

DD_JSON_DEFINE_CONVERTER(TestThrowingStruct)
} // namespace display_device

namespace {
Expand All@@ -57,6 +97,28 @@ namespace {
// Additional convenience global const(s)
constexpr auto MIN_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::min()};
constexpr auto MAX_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::max()};

template<class T>
void expectToJsonSuccessWithSuccessParam(const T &input) {
bool success {false};

EXPECT_FALSE(display_device::toJson(input, std::nullopt, &success).empty());
EXPECT_TRUE(success);
}

template<class T>
void expectInvalidJsonFailure() {
const T original {};
T output {original};
std::string error_message {"unchanged"};

EXPECT_FALSE(display_device::fromJson("{", output, &error_message));
EXPECT_EQ(output, original);
EXPECT_FALSE(error_message.empty());

EXPECT_FALSE(display_device::fromJson("{", output, nullptr));
EXPECT_EQ(output, original);
}
} // namespace

TEST_S(ToJson, NoError, WithSuccessParam) {
Expand All@@ -72,6 +134,25 @@ TEST_S(ToJson, NoError, WithoutSuccessParam) {
EXPECT_EQ(json_string, R"({"a":"","b":{"c":0}})");
}

TEST_S(ToJson, SuccessParam, LocalConverterTypes) {
using namespace std::chrono;

expectToJsonSuccessWithSuccessParam(display_device::TestEnum::Value1);
expectToJsonSuccessWithSuccessParam(display_device::TestStruct {});
expectToJsonSuccessWithSuccessParam(display_device::TestThrowingStruct {});
expectToJsonSuccessWithSuccessParam(display_device::TestVariant {123.});
expectToJsonSuccessWithSuccessParam(nanoseconds {2000000000});
expectToJsonSuccessWithSuccessParam(microseconds {2000000});
expectToJsonSuccessWithSuccessParam(milliseconds {2000});
expectToJsonSuccessWithSuccessParam(seconds {2});
expectToJsonSuccessWithSuccessParam(minutes {20});
expectToJsonSuccessWithSuccessParam(hours {20});
expectToJsonSuccessWithSuccessParam(days {20});
expectToJsonSuccessWithSuccessParam(weeks {20});
expectToJsonSuccessWithSuccessParam(months {20});
expectToJsonSuccessWithSuccessParam(years {20});
}

TEST_S(ToJson, Error, WithSuccessParam) {
bool success {true};
const auto json_string {display_device::toJson(display_device::TestStruct {"123\xC2"}, std::nullopt, &success)};
Expand All@@ -85,6 +166,46 @@ TEST_S(ToJson, Error, WithoutSuccessParam) {
EXPECT_EQ(json_string, "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2");
}

TEST_S(ToJson, Error, StandardExceptions) {
bool success {true};
auto json_string {
display_device::toJson(
display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
std::nullopt,
&success
)
};

EXPECT_FALSE(success);
EXPECT_EQ(json_string, "to_json out_of_range");
EXPECT_EQ(
display_device::toJson(
display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
std::nullopt,
nullptr
),
"to_json out_of_range"
);

success = true;
json_string = display_device::toJson(
display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
std::nullopt,
&success
);

EXPECT_FALSE(success);
EXPECT_EQ(json_string, "to_json invalid_argument");
EXPECT_EQ(
display_device::toJson(
display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
std::nullopt,
nullptr
),
"to_json invalid_argument"
);
}

TEST_S(ToJson, Compact) {
const auto json_string {display_device::toJson(display_device::TestStruct {}, std::nullopt, nullptr)};
EXPECT_EQ(json_string, "{\"a\":\"\",\"b\":{\"c\":0}}");
Expand DownExpand Up@@ -150,6 +271,38 @@ TEST_S(FromJson, Error, WithoutErrorMessageParam) {
EXPECT_EQ(original, copy);
}

TEST_S(FromJson, InvalidJson, LocalConverterTypes) {
using namespace std::chrono;

expectInvalidJsonFailure<display_device::TestEnum>();
expectInvalidJsonFailure<display_device::TestStruct>();
expectInvalidJsonFailure<display_device::TestThrowingStruct>();
expectInvalidJsonFailure<display_device::TestVariant>();
expectInvalidJsonFailure<nanoseconds>();
expectInvalidJsonFailure<microseconds>();
expectInvalidJsonFailure<milliseconds>();
expectInvalidJsonFailure<seconds>();
expectInvalidJsonFailure<minutes>();
expectInvalidJsonFailure<hours>();
expectInvalidJsonFailure<days>();
expectInvalidJsonFailure<weeks>();
expectInvalidJsonFailure<months>();
expectInvalidJsonFailure<years>();
}

TEST_S(FromJson, Error, StandardExceptions) {
display_device::TestThrowingStruct value {};
std::string error_message {};

EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, &error_message));
EXPECT_EQ(error_message, "from_json out_of_range");
EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, nullptr));

EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, &error_message));
EXPECT_EQ(error_message, "from_json invalid_argument");
EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, nullptr));
}

TEST_S(ToJson, Enum) {
EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value1, std::nullopt, nullptr), R"("Value1")");
EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value2, std::nullopt, nullptr), R"("ValueMaybe2")");
Expand All@@ -166,8 +319,12 @@ TEST_S(FromJson, Enum) {
}

TEST_S(ToJson, Enum, MissingMappingValue) {
const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr)};
bool success {true};
const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, &success)};

EXPECT_FALSE(success);
EXPECT_EQ(json_string, "TestEnum is missing enum mapping!");
EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr), "TestEnum is missing enum mapping!");
}

TEST_S(FromJson, Enum, MissingMappingValue) {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
test: improve coverage#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 10, 2026
 Merged


test: improve coverage
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ namespace display_device {
 }

 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 std::error_code error_code;
 if (!std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
Expand All@@ -50,6 +51,17 @@ namespace display_device {
 return std::vector<std::uint8_t> {};
 }

 if (!std::filesystem::is_regular_file(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to inspect " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
 } else {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Path is not a regular file.";
 }

 return std::nullopt;
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
Expand Down

1 change: 1 addition & 0 deletions
src/common/include/display_device/file_settings_persistence.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ namespace display_device {
 /**
 * @copydoc SettingsPersistenceInterface::load
 * @note If file does not exist, an empty data list will be returned instead of null optional.
 * @note If the path exists but is not a regular file, null optional will be returned.
 */
 [[nodiscard]] std::optional<std::vector<std::uint8_t>> load() const override;

Expand Down

2 changes: 2 additions & 0 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(EdidData)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDevice)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDeviceList)
Expand Down

2 changes: 0 additions & 2 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(ActiveTopology)
 DD_JSON_DEFINE_CONVERTER(DeviceDisplayModeMap)
 DD_JSON_DEFINE_CONVERTER(HdrStateMap)
Expand Down

28 changes: 28 additions & 0 deletions
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,32 @@ class JsonConverterTest: public BaseTest {
 }
 EXPECT_EQ(input, defaulted_input);
 }

 template<class T>
 void executeInvalidJsonTestCase() const {
 executeFromJsonFailureTestCase<T>("{");
 }

 template<class T>
 void executeFromJsonFailureTestCase(const std::string &input) const {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson(input, output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson(input, output, nullptr));
 EXPECT_EQ(output, original);
 }

 template<class T>
 void executeToJsonFailureTestCase(const T &input) const {
 bool success {true};

 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, &success).empty());
 EXPECT_FALSE(success);
 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, nullptr).empty());
 }
};

25 changes: 24 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <algorithm>
#include <filesystem>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand All@@ -16,7 +17,8 @@ namespace {
 class FileSettingsPersistenceTest: public BaseTest {
 public:
 ~FileSettingsPersistenceTest() override {
 std::filesystem::remove(m_filepath);
 std::error_code error_code;
 std::filesystem::remove_all(m_filepath, error_code);
 }

 display_device::FileSettingsPersistence &getImpl(const std::filesystem::path &filepath = "testfile.ext") {
Expand DownExpand Up@@ -101,6 +103,13 @@ TEST_F_S(Load, FileRead) {
 EXPECT_EQ(getImpl(filepath).load(), data);
}

TEST_F_S(Load, FilepathIsDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 EXPECT_EQ(getImpl(filepath).load(), std::nullopt);
}

TEST_F_S(Clear, NoFileAvailable) {
 EXPECT_TRUE(getImpl().clear());
}
Expand All@@ -116,3 +125,17 @@ TEST_F_S(Clear, FileRemoved) {
 EXPECT_TRUE(getImpl(filepath).clear());
 EXPECT_FALSE(std::filesystem::exists(filepath));
}

TEST_F_S(Clear, NonEmptyDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 {
 std::ofstream file {filepath / "child.ext"};
 file << "some data";
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
 EXPECT_FALSE(getImpl(filepath).clear());
 EXPECT_TRUE(std::filesystem::exists(filepath));
}

159 changes: 158 additions & 1 deletion
tests/unit/general/test_json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,18 @@ namespace display_device {
 friend bool operator==(const TestStruct &lhs, const TestStruct &rhs) = default;
 };

 struct TestThrowingStruct {
 enum class Error {
 None,
 OutOfRange,
 InvalidArgument
 };

 Error m_error {Error::None};

 friend bool operator==(const TestThrowingStruct &lhs, const TestThrowingStruct &rhs) = default;
 };

 using TestVariant = std::variant<double, Rational>;

 DD_JSON_DEFINE_SERIALIZE_ENUM_GCOVR_EXCL_BR_LINE(TestEnum, {{TestEnum::Value1, "Value1"}, {TestEnum::Value2, "ValueMaybe2"}})
Expand All@@ -48,6 +60,34 @@ namespace display_device {
 DD_JSON_DEFINE_CONVERTER(std::chrono::weeks)
 DD_JSON_DEFINE_CONVERTER(std::chrono::months)
 DD_JSON_DEFINE_CONVERTER(std::chrono::years)

 void to_json(nlohmann::json &json, const TestThrowingStruct &value) {
 using enum TestThrowingStruct::Error;

 switch (value.m_error) {
 case None:
 json = {{"error", "none"}};
 return;
 case OutOfRange:
 throw std::out_of_range {"to_json out_of_range"};
 case InvalidArgument:
 throw std::invalid_argument {"to_json invalid_argument"};
 }
 }

 void from_json(const nlohmann::json &json, TestThrowingStruct &value) {
 const auto error {json.at("error").get<std::string>()};
 if (error == "out_of_range") {
 throw std::out_of_range {"from_json out_of_range"};
 }
 if (error == "invalid_argument") {
 throw std::invalid_argument {"from_json invalid_argument"};
 }

 value = {};
 }

 DD_JSON_DEFINE_CONVERTER(TestThrowingStruct)
} // namespace display_device

namespace {
Expand All@@ -57,6 +97,28 @@ namespace {
 // Additional convenience global const(s)
 constexpr auto MIN_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::min()};
 constexpr auto MAX_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::max()};

 template<class T>
 void expectToJsonSuccessWithSuccessParam(const T &input) {
 bool success {false};

 EXPECT_FALSE(display_device::toJson(input, std::nullopt, &success).empty());
 EXPECT_TRUE(success);
 }

 template<class T>
 void expectInvalidJsonFailure() {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson("{", output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson("{", output, nullptr));
 EXPECT_EQ(output, original);
 }
} // namespace

TEST_S(ToJson, NoError, WithSuccessParam) {
Expand All@@ -72,6 +134,25 @@ TEST_S(ToJson, NoError, WithoutSuccessParam) {
 EXPECT_EQ(json_string, R"({"a":"","b":{"c":0}})");
}

TEST_S(ToJson, SuccessParam, LocalConverterTypes) {
 using namespace std::chrono;

 expectToJsonSuccessWithSuccessParam(display_device::TestEnum::Value1);
 expectToJsonSuccessWithSuccessParam(display_device::TestStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestThrowingStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestVariant {123.});
 expectToJsonSuccessWithSuccessParam(nanoseconds {2000000000});
 expectToJsonSuccessWithSuccessParam(microseconds {2000000});
 expectToJsonSuccessWithSuccessParam(milliseconds {2000});
 expectToJsonSuccessWithSuccessParam(seconds {2});
 expectToJsonSuccessWithSuccessParam(minutes {20});
 expectToJsonSuccessWithSuccessParam(hours {20});
 expectToJsonSuccessWithSuccessParam(days {20});
 expectToJsonSuccessWithSuccessParam(weeks {20});
 expectToJsonSuccessWithSuccessParam(months {20});
 expectToJsonSuccessWithSuccessParam(years {20});
}

TEST_S(ToJson, Error, WithSuccessParam) {
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestStruct {"123\xC2"}, std::nullopt, &success)};
Expand All@@ -85,6 +166,46 @@ TEST_S(ToJson, Error, WithoutSuccessParam) {
 EXPECT_EQ(json_string, "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2");
}

TEST_S(ToJson, Error, StandardExceptions) {
 bool success {true};
 auto json_string {
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 &success
 )
 };

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json out_of_range");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 nullptr
 ),
 "to_json out_of_range"
 );

 success = true;
 json_string = display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 &success
 );

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json invalid_argument");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 nullptr
 ),
 "to_json invalid_argument"
 );
}

TEST_S(ToJson, Compact) {
 const auto json_string {display_device::toJson(display_device::TestStruct {}, std::nullopt, nullptr)};
 EXPECT_EQ(json_string, "{\"a\":\"\",\"b\":{\"c\":0}}");
Expand DownExpand Up@@ -150,6 +271,38 @@ TEST_S(FromJson, Error, WithoutErrorMessageParam) {
 EXPECT_EQ(original, copy);
}

TEST_S(FromJson, InvalidJson, LocalConverterTypes) {
 using namespace std::chrono;

 expectInvalidJsonFailure<display_device::TestEnum>();
 expectInvalidJsonFailure<display_device::TestStruct>();
 expectInvalidJsonFailure<display_device::TestThrowingStruct>();
 expectInvalidJsonFailure<display_device::TestVariant>();
 expectInvalidJsonFailure<nanoseconds>();
 expectInvalidJsonFailure<microseconds>();
 expectInvalidJsonFailure<milliseconds>();
 expectInvalidJsonFailure<seconds>();
 expectInvalidJsonFailure<minutes>();
 expectInvalidJsonFailure<hours>();
 expectInvalidJsonFailure<days>();
 expectInvalidJsonFailure<weeks>();
 expectInvalidJsonFailure<months>();
 expectInvalidJsonFailure<years>();
}

TEST_S(FromJson, Error, StandardExceptions) {
 display_device::TestThrowingStruct value {};
 std::string error_message {};

 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json out_of_range");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, nullptr));

 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json invalid_argument");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, nullptr));
}

TEST_S(ToJson, Enum) {
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value1, std::nullopt, nullptr), R"("Value1")");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value2, std::nullopt, nullptr), R"("ValueMaybe2")");
Expand All@@ -166,8 +319,12 @@ TEST_S(FromJson, Enum) {
}

TEST_S(ToJson, Enum, MissingMappingValue) {
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr)};
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, &success)};

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "TestEnum is missing enum mapping!");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr), "TestEnum is missing enum mapping!");
}

TEST_S(FromJson, Enum, MissingMappingValue) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test: improve coverage#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 10, 2026
 Merged


test: improve coverage
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ namespace display_device {
 }

 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 std::error_code error_code;
 if (!std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
Expand All@@ -50,6 +51,17 @@ namespace display_device {
 return std::vector<std::uint8_t> {};
 }

 if (!std::filesystem::is_regular_file(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to inspect " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
 } else {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Path is not a regular file.";
 }

 return std::nullopt;
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
Expand Down

1 change: 1 addition & 0 deletions
src/common/include/display_device/file_settings_persistence.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ namespace display_device {
 /**
 * @copydoc SettingsPersistenceInterface::load
 * @note If file does not exist, an empty data list will be returned instead of null optional.
 * @note If the path exists but is not a regular file, null optional will be returned.
 */
 [[nodiscard]] std::optional<std::vector<std::uint8_t>> load() const override;

Expand Down

2 changes: 2 additions & 0 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(EdidData)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDevice)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDeviceList)
Expand Down

2 changes: 0 additions & 2 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(ActiveTopology)
 DD_JSON_DEFINE_CONVERTER(DeviceDisplayModeMap)
 DD_JSON_DEFINE_CONVERTER(HdrStateMap)
Expand Down

28 changes: 28 additions & 0 deletions
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,32 @@ class JsonConverterTest: public BaseTest {
 }
 EXPECT_EQ(input, defaulted_input);
 }

 template<class T>
 void executeInvalidJsonTestCase() const {
 executeFromJsonFailureTestCase<T>("{");
 }

 template<class T>
 void executeFromJsonFailureTestCase(const std::string &input) const {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson(input, output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson(input, output, nullptr));
 EXPECT_EQ(output, original);
 }

 template<class T>
 void executeToJsonFailureTestCase(const T &input) const {
 bool success {true};

 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, &success).empty());
 EXPECT_FALSE(success);
 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, nullptr).empty());
 }
};

25 changes: 24 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <algorithm>
#include <filesystem>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand All@@ -16,7 +17,8 @@ namespace {
 class FileSettingsPersistenceTest: public BaseTest {
 public:
 ~FileSettingsPersistenceTest() override {
 std::filesystem::remove(m_filepath);
 std::error_code error_code;
 std::filesystem::remove_all(m_filepath, error_code);
 }

 display_device::FileSettingsPersistence &getImpl(const std::filesystem::path &filepath = "testfile.ext") {
Expand DownExpand Up@@ -101,6 +103,13 @@ TEST_F_S(Load, FileRead) {
 EXPECT_EQ(getImpl(filepath).load(), data);
}

TEST_F_S(Load, FilepathIsDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 EXPECT_EQ(getImpl(filepath).load(), std::nullopt);
}

TEST_F_S(Clear, NoFileAvailable) {
 EXPECT_TRUE(getImpl().clear());
}
Expand All@@ -116,3 +125,17 @@ TEST_F_S(Clear, FileRemoved) {
 EXPECT_TRUE(getImpl(filepath).clear());
 EXPECT_FALSE(std::filesystem::exists(filepath));
}

TEST_F_S(Clear, NonEmptyDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 {
 std::ofstream file {filepath / "child.ext"};
 file << "some data";
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
 EXPECT_FALSE(getImpl(filepath).clear());
 EXPECT_TRUE(std::filesystem::exists(filepath));
}

159 changes: 158 additions & 1 deletion
tests/unit/general/test_json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,18 @@ namespace display_device {
 friend bool operator==(const TestStruct &lhs, const TestStruct &rhs) = default;
 };

 struct TestThrowingStruct {
 enum class Error {
 None,
 OutOfRange,
 InvalidArgument
 };

 Error m_error {Error::None};

 friend bool operator==(const TestThrowingStruct &lhs, const TestThrowingStruct &rhs) = default;
 };

 using TestVariant = std::variant<double, Rational>;

 DD_JSON_DEFINE_SERIALIZE_ENUM_GCOVR_EXCL_BR_LINE(TestEnum, {{TestEnum::Value1, "Value1"}, {TestEnum::Value2, "ValueMaybe2"}})
Expand All@@ -48,6 +60,34 @@ namespace display_device {
 DD_JSON_DEFINE_CONVERTER(std::chrono::weeks)
 DD_JSON_DEFINE_CONVERTER(std::chrono::months)
 DD_JSON_DEFINE_CONVERTER(std::chrono::years)

 void to_json(nlohmann::json &json, const TestThrowingStruct &value) {
 using enum TestThrowingStruct::Error;

 switch (value.m_error) {
 case None:
 json = {{"error", "none"}};
 return;
 case OutOfRange:
 throw std::out_of_range {"to_json out_of_range"};
 case InvalidArgument:
 throw std::invalid_argument {"to_json invalid_argument"};
 }
 }

 void from_json(const nlohmann::json &json, TestThrowingStruct &value) {
 const auto error {json.at("error").get<std::string>()};
 if (error == "out_of_range") {
 throw std::out_of_range {"from_json out_of_range"};
 }
 if (error == "invalid_argument") {
 throw std::invalid_argument {"from_json invalid_argument"};
 }

 value = {};
 }

 DD_JSON_DEFINE_CONVERTER(TestThrowingStruct)
} // namespace display_device

namespace {
Expand All@@ -57,6 +97,28 @@ namespace {
 // Additional convenience global const(s)
 constexpr auto MIN_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::min()};
 constexpr auto MAX_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::max()};

 template<class T>
 void expectToJsonSuccessWithSuccessParam(const T &input) {
 bool success {false};

 EXPECT_FALSE(display_device::toJson(input, std::nullopt, &success).empty());
 EXPECT_TRUE(success);
 }

 template<class T>
 void expectInvalidJsonFailure() {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson("{", output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson("{", output, nullptr));
 EXPECT_EQ(output, original);
 }
} // namespace

TEST_S(ToJson, NoError, WithSuccessParam) {
Expand All@@ -72,6 +134,25 @@ TEST_S(ToJson, NoError, WithoutSuccessParam) {
 EXPECT_EQ(json_string, R"({"a":"","b":{"c":0}})");
}

TEST_S(ToJson, SuccessParam, LocalConverterTypes) {
 using namespace std::chrono;

 expectToJsonSuccessWithSuccessParam(display_device::TestEnum::Value1);
 expectToJsonSuccessWithSuccessParam(display_device::TestStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestThrowingStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestVariant {123.});
 expectToJsonSuccessWithSuccessParam(nanoseconds {2000000000});
 expectToJsonSuccessWithSuccessParam(microseconds {2000000});
 expectToJsonSuccessWithSuccessParam(milliseconds {2000});
 expectToJsonSuccessWithSuccessParam(seconds {2});
 expectToJsonSuccessWithSuccessParam(minutes {20});
 expectToJsonSuccessWithSuccessParam(hours {20});
 expectToJsonSuccessWithSuccessParam(days {20});
 expectToJsonSuccessWithSuccessParam(weeks {20});
 expectToJsonSuccessWithSuccessParam(months {20});
 expectToJsonSuccessWithSuccessParam(years {20});
}

TEST_S(ToJson, Error, WithSuccessParam) {
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestStruct {"123\xC2"}, std::nullopt, &success)};
Expand All@@ -85,6 +166,46 @@ TEST_S(ToJson, Error, WithoutSuccessParam) {
 EXPECT_EQ(json_string, "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2");
}

TEST_S(ToJson, Error, StandardExceptions) {
 bool success {true};
 auto json_string {
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 &success
 )
 };

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json out_of_range");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 nullptr
 ),
 "to_json out_of_range"
 );

 success = true;
 json_string = display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 &success
 );

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json invalid_argument");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 nullptr
 ),
 "to_json invalid_argument"
 );
}

TEST_S(ToJson, Compact) {
 const auto json_string {display_device::toJson(display_device::TestStruct {}, std::nullopt, nullptr)};
 EXPECT_EQ(json_string, "{\"a\":\"\",\"b\":{\"c\":0}}");
Expand DownExpand Up@@ -150,6 +271,38 @@ TEST_S(FromJson, Error, WithoutErrorMessageParam) {
 EXPECT_EQ(original, copy);
}

TEST_S(FromJson, InvalidJson, LocalConverterTypes) {
 using namespace std::chrono;

 expectInvalidJsonFailure<display_device::TestEnum>();
 expectInvalidJsonFailure<display_device::TestStruct>();
 expectInvalidJsonFailure<display_device::TestThrowingStruct>();
 expectInvalidJsonFailure<display_device::TestVariant>();
 expectInvalidJsonFailure<nanoseconds>();
 expectInvalidJsonFailure<microseconds>();
 expectInvalidJsonFailure<milliseconds>();
 expectInvalidJsonFailure<seconds>();
 expectInvalidJsonFailure<minutes>();
 expectInvalidJsonFailure<hours>();
 expectInvalidJsonFailure<days>();
 expectInvalidJsonFailure<weeks>();
 expectInvalidJsonFailure<months>();
 expectInvalidJsonFailure<years>();
}

TEST_S(FromJson, Error, StandardExceptions) {
 display_device::TestThrowingStruct value {};
 std::string error_message {};

 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json out_of_range");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, nullptr));

 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json invalid_argument");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, nullptr));
}

TEST_S(ToJson, Enum) {
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value1, std::nullopt, nullptr), R"("Value1")");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value2, std::nullopt, nullptr), R"("ValueMaybe2")");
Expand All@@ -166,8 +319,12 @@ TEST_S(FromJson, Enum) {
}

TEST_S(ToJson, Enum, MissingMappingValue) {
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr)};
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, &success)};

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "TestEnum is missing enum mapping!");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr), "TestEnum is missing enum mapping!");
}

TEST_S(FromJson, Enum, MissingMappingValue) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test: improve coverage#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 10, 2026
 Merged


test: improve coverage
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ namespace display_device {
 }

 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 std::error_code error_code;
 if (!std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
Expand All@@ -50,6 +51,17 @@ namespace display_device {
 return std::vector<std::uint8_t> {};
 }

 if (!std::filesystem::is_regular_file(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to inspect " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
 } else {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Path is not a regular file.";
 }

 return std::nullopt;
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
Expand Down

1 change: 1 addition & 0 deletions
src/common/include/display_device/file_settings_persistence.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ namespace display_device {
 /**
 * @copydoc SettingsPersistenceInterface::load
 * @note If file does not exist, an empty data list will be returned instead of null optional.
 * @note If the path exists but is not a regular file, null optional will be returned.
 */
 [[nodiscard]] std::optional<std::vector<std::uint8_t>> load() const override;

Expand Down

2 changes: 2 additions & 0 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(EdidData)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDevice)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDeviceList)
Expand Down

2 changes: 0 additions & 2 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(ActiveTopology)
 DD_JSON_DEFINE_CONVERTER(DeviceDisplayModeMap)
 DD_JSON_DEFINE_CONVERTER(HdrStateMap)
Expand Down

28 changes: 28 additions & 0 deletions
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,32 @@ class JsonConverterTest: public BaseTest {
 }
 EXPECT_EQ(input, defaulted_input);
 }

 template<class T>
 void executeInvalidJsonTestCase() const {
 executeFromJsonFailureTestCase<T>("{");
 }

 template<class T>
 void executeFromJsonFailureTestCase(const std::string &input) const {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson(input, output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson(input, output, nullptr));
 EXPECT_EQ(output, original);
 }

 template<class T>
 void executeToJsonFailureTestCase(const T &input) const {
 bool success {true};

 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, &success).empty());
 EXPECT_FALSE(success);
 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, nullptr).empty());
 }
};

25 changes: 24 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <algorithm>
#include <filesystem>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand All@@ -16,7 +17,8 @@ namespace {
 class FileSettingsPersistenceTest: public BaseTest {
 public:
 ~FileSettingsPersistenceTest() override {
 std::filesystem::remove(m_filepath);
 std::error_code error_code;
 std::filesystem::remove_all(m_filepath, error_code);
 }

 display_device::FileSettingsPersistence &getImpl(const std::filesystem::path &filepath = "testfile.ext") {
Expand DownExpand Up@@ -101,6 +103,13 @@ TEST_F_S(Load, FileRead) {
 EXPECT_EQ(getImpl(filepath).load(), data);
}

TEST_F_S(Load, FilepathIsDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 EXPECT_EQ(getImpl(filepath).load(), std::nullopt);
}

TEST_F_S(Clear, NoFileAvailable) {
 EXPECT_TRUE(getImpl().clear());
}
Expand All@@ -116,3 +125,17 @@ TEST_F_S(Clear, FileRemoved) {
 EXPECT_TRUE(getImpl(filepath).clear());
 EXPECT_FALSE(std::filesystem::exists(filepath));
}

TEST_F_S(Clear, NonEmptyDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 {
 std::ofstream file {filepath / "child.ext"};
 file << "some data";
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
 EXPECT_FALSE(getImpl(filepath).clear());
 EXPECT_TRUE(std::filesystem::exists(filepath));
}

159 changes: 158 additions & 1 deletion
tests/unit/general/test_json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,18 @@ namespace display_device {
 friend bool operator==(const TestStruct &lhs, const TestStruct &rhs) = default;
 };

 struct TestThrowingStruct {
 enum class Error {
 None,
 OutOfRange,
 InvalidArgument
 };

 Error m_error {Error::None};

 friend bool operator==(const TestThrowingStruct &lhs, const TestThrowingStruct &rhs) = default;
 };

 using TestVariant = std::variant<double, Rational>;

 DD_JSON_DEFINE_SERIALIZE_ENUM_GCOVR_EXCL_BR_LINE(TestEnum, {{TestEnum::Value1, "Value1"}, {TestEnum::Value2, "ValueMaybe2"}})
Expand All@@ -48,6 +60,34 @@ namespace display_device {
 DD_JSON_DEFINE_CONVERTER(std::chrono::weeks)
 DD_JSON_DEFINE_CONVERTER(std::chrono::months)
 DD_JSON_DEFINE_CONVERTER(std::chrono::years)

 void to_json(nlohmann::json &json, const TestThrowingStruct &value) {
 using enum TestThrowingStruct::Error;

 switch (value.m_error) {
 case None:
 json = {{"error", "none"}};
 return;
 case OutOfRange:
 throw std::out_of_range {"to_json out_of_range"};
 case InvalidArgument:
 throw std::invalid_argument {"to_json invalid_argument"};
 }
 }

 void from_json(const nlohmann::json &json, TestThrowingStruct &value) {
 const auto error {json.at("error").get<std::string>()};
 if (error == "out_of_range") {
 throw std::out_of_range {"from_json out_of_range"};
 }
 if (error == "invalid_argument") {
 throw std::invalid_argument {"from_json invalid_argument"};
 }

 value = {};
 }

 DD_JSON_DEFINE_CONVERTER(TestThrowingStruct)
} // namespace display_device

namespace {
Expand All@@ -57,6 +97,28 @@ namespace {
 // Additional convenience global const(s)
 constexpr auto MIN_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::min()};
 constexpr auto MAX_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::max()};

 template<class T>
 void expectToJsonSuccessWithSuccessParam(const T &input) {
 bool success {false};

 EXPECT_FALSE(display_device::toJson(input, std::nullopt, &success).empty());
 EXPECT_TRUE(success);
 }

 template<class T>
 void expectInvalidJsonFailure() {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson("{", output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson("{", output, nullptr));
 EXPECT_EQ(output, original);
 }
} // namespace

TEST_S(ToJson, NoError, WithSuccessParam) {
Expand All@@ -72,6 +134,25 @@ TEST_S(ToJson, NoError, WithoutSuccessParam) {
 EXPECT_EQ(json_string, R"({"a":"","b":{"c":0}})");
}

TEST_S(ToJson, SuccessParam, LocalConverterTypes) {
 using namespace std::chrono;

 expectToJsonSuccessWithSuccessParam(display_device::TestEnum::Value1);
 expectToJsonSuccessWithSuccessParam(display_device::TestStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestThrowingStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestVariant {123.});
 expectToJsonSuccessWithSuccessParam(nanoseconds {2000000000});
 expectToJsonSuccessWithSuccessParam(microseconds {2000000});
 expectToJsonSuccessWithSuccessParam(milliseconds {2000});
 expectToJsonSuccessWithSuccessParam(seconds {2});
 expectToJsonSuccessWithSuccessParam(minutes {20});
 expectToJsonSuccessWithSuccessParam(hours {20});
 expectToJsonSuccessWithSuccessParam(days {20});
 expectToJsonSuccessWithSuccessParam(weeks {20});
 expectToJsonSuccessWithSuccessParam(months {20});
 expectToJsonSuccessWithSuccessParam(years {20});
}

TEST_S(ToJson, Error, WithSuccessParam) {
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestStruct {"123\xC2"}, std::nullopt, &success)};
Expand All@@ -85,6 +166,46 @@ TEST_S(ToJson, Error, WithoutSuccessParam) {
 EXPECT_EQ(json_string, "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2");
}

TEST_S(ToJson, Error, StandardExceptions) {
 bool success {true};
 auto json_string {
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 &success
 )
 };

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json out_of_range");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 nullptr
 ),
 "to_json out_of_range"
 );

 success = true;
 json_string = display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 &success
 );

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json invalid_argument");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 nullptr
 ),
 "to_json invalid_argument"
 );
}

TEST_S(ToJson, Compact) {
 const auto json_string {display_device::toJson(display_device::TestStruct {}, std::nullopt, nullptr)};
 EXPECT_EQ(json_string, "{\"a\":\"\",\"b\":{\"c\":0}}");
Expand DownExpand Up@@ -150,6 +271,38 @@ TEST_S(FromJson, Error, WithoutErrorMessageParam) {
 EXPECT_EQ(original, copy);
}

TEST_S(FromJson, InvalidJson, LocalConverterTypes) {
 using namespace std::chrono;

 expectInvalidJsonFailure<display_device::TestEnum>();
 expectInvalidJsonFailure<display_device::TestStruct>();
 expectInvalidJsonFailure<display_device::TestThrowingStruct>();
 expectInvalidJsonFailure<display_device::TestVariant>();
 expectInvalidJsonFailure<nanoseconds>();
 expectInvalidJsonFailure<microseconds>();
 expectInvalidJsonFailure<milliseconds>();
 expectInvalidJsonFailure<seconds>();
 expectInvalidJsonFailure<minutes>();
 expectInvalidJsonFailure<hours>();
 expectInvalidJsonFailure<days>();
 expectInvalidJsonFailure<weeks>();
 expectInvalidJsonFailure<months>();
 expectInvalidJsonFailure<years>();
}

TEST_S(FromJson, Error, StandardExceptions) {
 display_device::TestThrowingStruct value {};
 std::string error_message {};

 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json out_of_range");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, nullptr));

 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json invalid_argument");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, nullptr));
}

TEST_S(ToJson, Enum) {
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value1, std::nullopt, nullptr), R"("Value1")");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value2, std::nullopt, nullptr), R"("ValueMaybe2")");
Expand All@@ -166,8 +319,12 @@ TEST_S(FromJson, Enum) {
}

TEST_S(ToJson, Enum, MissingMappingValue) {
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr)};
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, &success)};

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "TestEnum is missing enum mapping!");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr), "TestEnum is missing enum mapping!");
}

TEST_S(FromJson, Enum, MissingMappingValue) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
test: improve coverage#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 10, 2026
 Merged


test: improve coverage
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ namespace display_device {
 }

 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 std::error_code error_code;
 if (!std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
Expand All@@ -50,6 +51,17 @@ namespace display_device {
 return std::vector<std::uint8_t> {};
 }

 if (!std::filesystem::is_regular_file(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to inspect " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
 } else {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Path is not a regular file.";
 }

 return std::nullopt;
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
Expand Down

1 change: 1 addition & 0 deletions
src/common/include/display_device/file_settings_persistence.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ namespace display_device {
 /**
 * @copydoc SettingsPersistenceInterface::load
 * @note If file does not exist, an empty data list will be returned instead of null optional.
 * @note If the path exists but is not a regular file, null optional will be returned.
 */
 [[nodiscard]] std::optional<std::vector<std::uint8_t>> load() const override;

Expand Down

2 changes: 2 additions & 0 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(EdidData)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDevice)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDeviceList)
Expand Down

2 changes: 0 additions & 2 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(ActiveTopology)
 DD_JSON_DEFINE_CONVERTER(DeviceDisplayModeMap)
 DD_JSON_DEFINE_CONVERTER(HdrStateMap)
Expand Down

28 changes: 28 additions & 0 deletions
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,32 @@ class JsonConverterTest: public BaseTest {
 }
 EXPECT_EQ(input, defaulted_input);
 }

 template<class T>
 void executeInvalidJsonTestCase() const {
 executeFromJsonFailureTestCase<T>("{");
 }

 template<class T>
 void executeFromJsonFailureTestCase(const std::string &input) const {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson(input, output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson(input, output, nullptr));
 EXPECT_EQ(output, original);
 }

 template<class T>
 void executeToJsonFailureTestCase(const T &input) const {
 bool success {true};

 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, &success).empty());
 EXPECT_FALSE(success);
 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, nullptr).empty());
 }
};

25 changes: 24 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <algorithm>
#include <filesystem>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand All@@ -16,7 +17,8 @@ namespace {
 class FileSettingsPersistenceTest: public BaseTest {
 public:
 ~FileSettingsPersistenceTest() override {
 std::filesystem::remove(m_filepath);
 std::error_code error_code;
 std::filesystem::remove_all(m_filepath, error_code);
 }

 display_device::FileSettingsPersistence &getImpl(const std::filesystem::path &filepath = "testfile.ext") {
Expand DownExpand Up@@ -101,6 +103,13 @@ TEST_F_S(Load, FileRead) {
 EXPECT_EQ(getImpl(filepath).load(), data);
}

TEST_F_S(Load, FilepathIsDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 EXPECT_EQ(getImpl(filepath).load(), std::nullopt);
}

TEST_F_S(Clear, NoFileAvailable) {
 EXPECT_TRUE(getImpl().clear());
}
Expand All@@ -116,3 +125,17 @@ TEST_F_S(Clear, FileRemoved) {
 EXPECT_TRUE(getImpl(filepath).clear());
 EXPECT_FALSE(std::filesystem::exists(filepath));
}

TEST_F_S(Clear, NonEmptyDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 {
 std::ofstream file {filepath / "child.ext"};
 file << "some data";
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
 EXPECT_FALSE(getImpl(filepath).clear());
 EXPECT_TRUE(std::filesystem::exists(filepath));
}

159 changes: 158 additions & 1 deletion
tests/unit/general/test_json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,18 @@ namespace display_device {
 friend bool operator==(const TestStruct &lhs, const TestStruct &rhs) = default;
 };

 struct TestThrowingStruct {
 enum class Error {
 None,
 OutOfRange,
 InvalidArgument
 };

 Error m_error {Error::None};

 friend bool operator==(const TestThrowingStruct &lhs, const TestThrowingStruct &rhs) = default;
 };

 using TestVariant = std::variant<double, Rational>;

 DD_JSON_DEFINE_SERIALIZE_ENUM_GCOVR_EXCL_BR_LINE(TestEnum, {{TestEnum::Value1, "Value1"}, {TestEnum::Value2, "ValueMaybe2"}})
Expand All@@ -48,6 +60,34 @@ namespace display_device {
 DD_JSON_DEFINE_CONVERTER(std::chrono::weeks)
 DD_JSON_DEFINE_CONVERTER(std::chrono::months)
 DD_JSON_DEFINE_CONVERTER(std::chrono::years)

 void to_json(nlohmann::json &json, const TestThrowingStruct &value) {
 using enum TestThrowingStruct::Error;

 switch (value.m_error) {
 case None:
 json = {{"error", "none"}};
 return;
 case OutOfRange:
 throw std::out_of_range {"to_json out_of_range"};
 case InvalidArgument:
 throw std::invalid_argument {"to_json invalid_argument"};
 }
 }

 void from_json(const nlohmann::json &json, TestThrowingStruct &value) {
 const auto error {json.at("error").get<std::string>()};
 if (error == "out_of_range") {
 throw std::out_of_range {"from_json out_of_range"};
 }
 if (error == "invalid_argument") {
 throw std::invalid_argument {"from_json invalid_argument"};
 }

 value = {};
 }

 DD_JSON_DEFINE_CONVERTER(TestThrowingStruct)
} // namespace display_device

namespace {
Expand All@@ -57,6 +97,28 @@ namespace {
 // Additional convenience global const(s)
 constexpr auto MIN_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::min()};
 constexpr auto MAX_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::max()};

 template<class T>
 void expectToJsonSuccessWithSuccessParam(const T &input) {
 bool success {false};

 EXPECT_FALSE(display_device::toJson(input, std::nullopt, &success).empty());
 EXPECT_TRUE(success);
 }

 template<class T>
 void expectInvalidJsonFailure() {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson("{", output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson("{", output, nullptr));
 EXPECT_EQ(output, original);
 }
} // namespace

TEST_S(ToJson, NoError, WithSuccessParam) {
Expand All@@ -72,6 +134,25 @@ TEST_S(ToJson, NoError, WithoutSuccessParam) {
 EXPECT_EQ(json_string, R"({"a":"","b":{"c":0}})");
}

TEST_S(ToJson, SuccessParam, LocalConverterTypes) {
 using namespace std::chrono;

 expectToJsonSuccessWithSuccessParam(display_device::TestEnum::Value1);
 expectToJsonSuccessWithSuccessParam(display_device::TestStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestThrowingStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestVariant {123.});
 expectToJsonSuccessWithSuccessParam(nanoseconds {2000000000});
 expectToJsonSuccessWithSuccessParam(microseconds {2000000});
 expectToJsonSuccessWithSuccessParam(milliseconds {2000});
 expectToJsonSuccessWithSuccessParam(seconds {2});
 expectToJsonSuccessWithSuccessParam(minutes {20});
 expectToJsonSuccessWithSuccessParam(hours {20});
 expectToJsonSuccessWithSuccessParam(days {20});
 expectToJsonSuccessWithSuccessParam(weeks {20});
 expectToJsonSuccessWithSuccessParam(months {20});
 expectToJsonSuccessWithSuccessParam(years {20});
}

TEST_S(ToJson, Error, WithSuccessParam) {
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestStruct {"123\xC2"}, std::nullopt, &success)};
Expand All@@ -85,6 +166,46 @@ TEST_S(ToJson, Error, WithoutSuccessParam) {
 EXPECT_EQ(json_string, "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2");
}

TEST_S(ToJson, Error, StandardExceptions) {
 bool success {true};
 auto json_string {
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 &success
 )
 };

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json out_of_range");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 nullptr
 ),
 "to_json out_of_range"
 );

 success = true;
 json_string = display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 &success
 );

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json invalid_argument");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 nullptr
 ),
 "to_json invalid_argument"
 );
}

TEST_S(ToJson, Compact) {
 const auto json_string {display_device::toJson(display_device::TestStruct {}, std::nullopt, nullptr)};
 EXPECT_EQ(json_string, "{\"a\":\"\",\"b\":{\"c\":0}}");
Expand DownExpand Up@@ -150,6 +271,38 @@ TEST_S(FromJson, Error, WithoutErrorMessageParam) {
 EXPECT_EQ(original, copy);
}

TEST_S(FromJson, InvalidJson, LocalConverterTypes) {
 using namespace std::chrono;

 expectInvalidJsonFailure<display_device::TestEnum>();
 expectInvalidJsonFailure<display_device::TestStruct>();
 expectInvalidJsonFailure<display_device::TestThrowingStruct>();
 expectInvalidJsonFailure<display_device::TestVariant>();
 expectInvalidJsonFailure<nanoseconds>();
 expectInvalidJsonFailure<microseconds>();
 expectInvalidJsonFailure<milliseconds>();
 expectInvalidJsonFailure<seconds>();
 expectInvalidJsonFailure<minutes>();
 expectInvalidJsonFailure<hours>();
 expectInvalidJsonFailure<days>();
 expectInvalidJsonFailure<weeks>();
 expectInvalidJsonFailure<months>();
 expectInvalidJsonFailure<years>();
}

TEST_S(FromJson, Error, StandardExceptions) {
 display_device::TestThrowingStruct value {};
 std::string error_message {};

 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json out_of_range");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, nullptr));

 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json invalid_argument");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, nullptr));
}

TEST_S(ToJson, Enum) {
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value1, std::nullopt, nullptr), R"("Value1")");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value2, std::nullopt, nullptr), R"("ValueMaybe2")");
Expand All@@ -166,8 +319,12 @@ TEST_S(FromJson, Enum) {
}

TEST_S(ToJson, Enum, MissingMappingValue) {
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr)};
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, &success)};

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "TestEnum is missing enum mapping!");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr), "TestEnum is missing enum mapping!");
}

TEST_S(FromJson, Enum, MissingMappingValue) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test: improve coverage#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 10, 2026
 Merged


test: improve coverage
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ namespace display_device {
 }

 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 std::error_code error_code;
 if (!std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
Expand All@@ -50,6 +51,17 @@ namespace display_device {
 return std::vector<std::uint8_t> {};
 }

 if (!std::filesystem::is_regular_file(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to inspect " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
 } else {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Path is not a regular file.";
 }

 return std::nullopt;
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
Expand Down

1 change: 1 addition & 0 deletions
src/common/include/display_device/file_settings_persistence.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ namespace display_device {
 /**
 * @copydoc SettingsPersistenceInterface::load
 * @note If file does not exist, an empty data list will be returned instead of null optional.
 * @note If the path exists but is not a regular file, null optional will be returned.
 */
 [[nodiscard]] std::optional<std::vector<std::uint8_t>> load() const override;

Expand Down

2 changes: 2 additions & 0 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(EdidData)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDevice)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDeviceList)
Expand Down

2 changes: 0 additions & 2 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(ActiveTopology)
 DD_JSON_DEFINE_CONVERTER(DeviceDisplayModeMap)
 DD_JSON_DEFINE_CONVERTER(HdrStateMap)
Expand Down

28 changes: 28 additions & 0 deletions
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,32 @@ class JsonConverterTest: public BaseTest {
 }
 EXPECT_EQ(input, defaulted_input);
 }

 template<class T>
 void executeInvalidJsonTestCase() const {
 executeFromJsonFailureTestCase<T>("{");
 }

 template<class T>
 void executeFromJsonFailureTestCase(const std::string &input) const {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson(input, output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson(input, output, nullptr));
 EXPECT_EQ(output, original);
 }

 template<class T>
 void executeToJsonFailureTestCase(const T &input) const {
 bool success {true};

 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, &success).empty());
 EXPECT_FALSE(success);
 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, nullptr).empty());
 }
};

25 changes: 24 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <algorithm>
#include <filesystem>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand All@@ -16,7 +17,8 @@ namespace {
 class FileSettingsPersistenceTest: public BaseTest {
 public:
 ~FileSettingsPersistenceTest() override {
 std::filesystem::remove(m_filepath);
 std::error_code error_code;
 std::filesystem::remove_all(m_filepath, error_code);
 }

 display_device::FileSettingsPersistence &getImpl(const std::filesystem::path &filepath = "testfile.ext") {
Expand DownExpand Up@@ -101,6 +103,13 @@ TEST_F_S(Load, FileRead) {
 EXPECT_EQ(getImpl(filepath).load(), data);
}

TEST_F_S(Load, FilepathIsDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 EXPECT_EQ(getImpl(filepath).load(), std::nullopt);
}

TEST_F_S(Clear, NoFileAvailable) {
 EXPECT_TRUE(getImpl().clear());
}
Expand All@@ -116,3 +125,17 @@ TEST_F_S(Clear, FileRemoved) {
 EXPECT_TRUE(getImpl(filepath).clear());
 EXPECT_FALSE(std::filesystem::exists(filepath));
}

TEST_F_S(Clear, NonEmptyDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 {
 std::ofstream file {filepath / "child.ext"};
 file << "some data";
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
 EXPECT_FALSE(getImpl(filepath).clear());
 EXPECT_TRUE(std::filesystem::exists(filepath));
}

159 changes: 158 additions & 1 deletion
tests/unit/general/test_json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,18 @@ namespace display_device {
 friend bool operator==(const TestStruct &lhs, const TestStruct &rhs) = default;
 };

 struct TestThrowingStruct {
 enum class Error {
 None,
 OutOfRange,
 InvalidArgument
 };

 Error m_error {Error::None};

 friend bool operator==(const TestThrowingStruct &lhs, const TestThrowingStruct &rhs) = default;
 };

 using TestVariant = std::variant<double, Rational>;

 DD_JSON_DEFINE_SERIALIZE_ENUM_GCOVR_EXCL_BR_LINE(TestEnum, {{TestEnum::Value1, "Value1"}, {TestEnum::Value2, "ValueMaybe2"}})
Expand All@@ -48,6 +60,34 @@ namespace display_device {
 DD_JSON_DEFINE_CONVERTER(std::chrono::weeks)
 DD_JSON_DEFINE_CONVERTER(std::chrono::months)
 DD_JSON_DEFINE_CONVERTER(std::chrono::years)

 void to_json(nlohmann::json &json, const TestThrowingStruct &value) {
 using enum TestThrowingStruct::Error;

 switch (value.m_error) {
 case None:
 json = {{"error", "none"}};
 return;
 case OutOfRange:
 throw std::out_of_range {"to_json out_of_range"};
 case InvalidArgument:
 throw std::invalid_argument {"to_json invalid_argument"};
 }
 }

 void from_json(const nlohmann::json &json, TestThrowingStruct &value) {
 const auto error {json.at("error").get<std::string>()};
 if (error == "out_of_range") {
 throw std::out_of_range {"from_json out_of_range"};
 }
 if (error == "invalid_argument") {
 throw std::invalid_argument {"from_json invalid_argument"};
 }

 value = {};
 }

 DD_JSON_DEFINE_CONVERTER(TestThrowingStruct)
} // namespace display_device

namespace {
Expand All@@ -57,6 +97,28 @@ namespace {
 // Additional convenience global const(s)
 constexpr auto MIN_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::min()};
 constexpr auto MAX_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::max()};

 template<class T>
 void expectToJsonSuccessWithSuccessParam(const T &input) {
 bool success {false};

 EXPECT_FALSE(display_device::toJson(input, std::nullopt, &success).empty());
 EXPECT_TRUE(success);
 }

 template<class T>
 void expectInvalidJsonFailure() {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson("{", output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson("{", output, nullptr));
 EXPECT_EQ(output, original);
 }
} // namespace

TEST_S(ToJson, NoError, WithSuccessParam) {
Expand All@@ -72,6 +134,25 @@ TEST_S(ToJson, NoError, WithoutSuccessParam) {
 EXPECT_EQ(json_string, R"({"a":"","b":{"c":0}})");
}

TEST_S(ToJson, SuccessParam, LocalConverterTypes) {
 using namespace std::chrono;

 expectToJsonSuccessWithSuccessParam(display_device::TestEnum::Value1);
 expectToJsonSuccessWithSuccessParam(display_device::TestStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestThrowingStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestVariant {123.});
 expectToJsonSuccessWithSuccessParam(nanoseconds {2000000000});
 expectToJsonSuccessWithSuccessParam(microseconds {2000000});
 expectToJsonSuccessWithSuccessParam(milliseconds {2000});
 expectToJsonSuccessWithSuccessParam(seconds {2});
 expectToJsonSuccessWithSuccessParam(minutes {20});
 expectToJsonSuccessWithSuccessParam(hours {20});
 expectToJsonSuccessWithSuccessParam(days {20});
 expectToJsonSuccessWithSuccessParam(weeks {20});
 expectToJsonSuccessWithSuccessParam(months {20});
 expectToJsonSuccessWithSuccessParam(years {20});
}

TEST_S(ToJson, Error, WithSuccessParam) {
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestStruct {"123\xC2"}, std::nullopt, &success)};
Expand All@@ -85,6 +166,46 @@ TEST_S(ToJson, Error, WithoutSuccessParam) {
 EXPECT_EQ(json_string, "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2");
}

TEST_S(ToJson, Error, StandardExceptions) {
 bool success {true};
 auto json_string {
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 &success
 )
 };

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json out_of_range");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 nullptr
 ),
 "to_json out_of_range"
 );

 success = true;
 json_string = display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 &success
 );

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json invalid_argument");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 nullptr
 ),
 "to_json invalid_argument"
 );
}

TEST_S(ToJson, Compact) {
 const auto json_string {display_device::toJson(display_device::TestStruct {}, std::nullopt, nullptr)};
 EXPECT_EQ(json_string, "{\"a\":\"\",\"b\":{\"c\":0}}");
Expand DownExpand Up@@ -150,6 +271,38 @@ TEST_S(FromJson, Error, WithoutErrorMessageParam) {
 EXPECT_EQ(original, copy);
}

TEST_S(FromJson, InvalidJson, LocalConverterTypes) {
 using namespace std::chrono;

 expectInvalidJsonFailure<display_device::TestEnum>();
 expectInvalidJsonFailure<display_device::TestStruct>();
 expectInvalidJsonFailure<display_device::TestThrowingStruct>();
 expectInvalidJsonFailure<display_device::TestVariant>();
 expectInvalidJsonFailure<nanoseconds>();
 expectInvalidJsonFailure<microseconds>();
 expectInvalidJsonFailure<milliseconds>();
 expectInvalidJsonFailure<seconds>();
 expectInvalidJsonFailure<minutes>();
 expectInvalidJsonFailure<hours>();
 expectInvalidJsonFailure<days>();
 expectInvalidJsonFailure<weeks>();
 expectInvalidJsonFailure<months>();
 expectInvalidJsonFailure<years>();
}

TEST_S(FromJson, Error, StandardExceptions) {
 display_device::TestThrowingStruct value {};
 std::string error_message {};

 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json out_of_range");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, nullptr));

 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json invalid_argument");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, nullptr));
}

TEST_S(ToJson, Enum) {
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value1, std::nullopt, nullptr), R"("Value1")");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value2, std::nullopt, nullptr), R"("ValueMaybe2")");
Expand All@@ -166,8 +319,12 @@ TEST_S(FromJson, Enum) {
}

TEST_S(ToJson, Enum, MissingMappingValue) {
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr)};
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, &success)};

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "TestEnum is missing enum mapping!");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr), "TestEnum is missing enum mapping!");
}

TEST_S(FromJson, Enum, MissingMappingValue) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test: improve coverage#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 10, 2026
 Merged


test: improve coverage
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ namespace display_device {
 }

 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 std::error_code error_code;
 if (!std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
Expand All@@ -50,6 +51,17 @@ namespace display_device {
 return std::vector<std::uint8_t> {};
 }

 if (!std::filesystem::is_regular_file(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to inspect " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
 } else {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Path is not a regular file.";
 }

 return std::nullopt;
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
Expand Down

1 change: 1 addition & 0 deletions
src/common/include/display_device/file_settings_persistence.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ namespace display_device {
 /**
 * @copydoc SettingsPersistenceInterface::load
 * @note If file does not exist, an empty data list will be returned instead of null optional.
 * @note If the path exists but is not a regular file, null optional will be returned.
 */
 [[nodiscard]] std::optional<std::vector<std::uint8_t>> load() const override;

Expand Down

2 changes: 2 additions & 0 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(EdidData)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDevice)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDeviceList)
Expand Down

2 changes: 0 additions & 2 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(ActiveTopology)
 DD_JSON_DEFINE_CONVERTER(DeviceDisplayModeMap)
 DD_JSON_DEFINE_CONVERTER(HdrStateMap)
Expand Down

28 changes: 28 additions & 0 deletions
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,32 @@ class JsonConverterTest: public BaseTest {
 }
 EXPECT_EQ(input, defaulted_input);
 }

 template<class T>
 void executeInvalidJsonTestCase() const {
 executeFromJsonFailureTestCase<T>("{");
 }

 template<class T>
 void executeFromJsonFailureTestCase(const std::string &input) const {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson(input, output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson(input, output, nullptr));
 EXPECT_EQ(output, original);
 }

 template<class T>
 void executeToJsonFailureTestCase(const T &input) const {
 bool success {true};

 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, &success).empty());
 EXPECT_FALSE(success);
 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, nullptr).empty());
 }
};

25 changes: 24 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <algorithm>
#include <filesystem>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand All@@ -16,7 +17,8 @@ namespace {
 class FileSettingsPersistenceTest: public BaseTest {
 public:
 ~FileSettingsPersistenceTest() override {
 std::filesystem::remove(m_filepath);
 std::error_code error_code;
 std::filesystem::remove_all(m_filepath, error_code);
 }

 display_device::FileSettingsPersistence &getImpl(const std::filesystem::path &filepath = "testfile.ext") {
Expand DownExpand Up@@ -101,6 +103,13 @@ TEST_F_S(Load, FileRead) {
 EXPECT_EQ(getImpl(filepath).load(), data);
}

TEST_F_S(Load, FilepathIsDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 EXPECT_EQ(getImpl(filepath).load(), std::nullopt);
}

TEST_F_S(Clear, NoFileAvailable) {
 EXPECT_TRUE(getImpl().clear());
}
Expand All@@ -116,3 +125,17 @@ TEST_F_S(Clear, FileRemoved) {
 EXPECT_TRUE(getImpl(filepath).clear());
 EXPECT_FALSE(std::filesystem::exists(filepath));
}

TEST_F_S(Clear, NonEmptyDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 {
 std::ofstream file {filepath / "child.ext"};
 file << "some data";
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
 EXPECT_FALSE(getImpl(filepath).clear());
 EXPECT_TRUE(std::filesystem::exists(filepath));
}

159 changes: 158 additions & 1 deletion
tests/unit/general/test_json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,18 @@ namespace display_device {
 friend bool operator==(const TestStruct &lhs, const TestStruct &rhs) = default;
 };

 struct TestThrowingStruct {
 enum class Error {
 None,
 OutOfRange,
 InvalidArgument
 };

 Error m_error {Error::None};

 friend bool operator==(const TestThrowingStruct &lhs, const TestThrowingStruct &rhs) = default;
 };

 using TestVariant = std::variant<double, Rational>;

 DD_JSON_DEFINE_SERIALIZE_ENUM_GCOVR_EXCL_BR_LINE(TestEnum, {{TestEnum::Value1, "Value1"}, {TestEnum::Value2, "ValueMaybe2"}})
Expand All@@ -48,6 +60,34 @@ namespace display_device {
 DD_JSON_DEFINE_CONVERTER(std::chrono::weeks)
 DD_JSON_DEFINE_CONVERTER(std::chrono::months)
 DD_JSON_DEFINE_CONVERTER(std::chrono::years)

 void to_json(nlohmann::json &json, const TestThrowingStruct &value) {
 using enum TestThrowingStruct::Error;

 switch (value.m_error) {
 case None:
 json = {{"error", "none"}};
 return;
 case OutOfRange:
 throw std::out_of_range {"to_json out_of_range"};
 case InvalidArgument:
 throw std::invalid_argument {"to_json invalid_argument"};
 }
 }

 void from_json(const nlohmann::json &json, TestThrowingStruct &value) {
 const auto error {json.at("error").get<std::string>()};
 if (error == "out_of_range") {
 throw std::out_of_range {"from_json out_of_range"};
 }
 if (error == "invalid_argument") {
 throw std::invalid_argument {"from_json invalid_argument"};
 }

 value = {};
 }

 DD_JSON_DEFINE_CONVERTER(TestThrowingStruct)
} // namespace display_device

namespace {
Expand All@@ -57,6 +97,28 @@ namespace {
 // Additional convenience global const(s)
 constexpr auto MIN_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::min()};
 constexpr auto MAX_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::max()};

 template<class T>
 void expectToJsonSuccessWithSuccessParam(const T &input) {
 bool success {false};

 EXPECT_FALSE(display_device::toJson(input, std::nullopt, &success).empty());
 EXPECT_TRUE(success);
 }

 template<class T>
 void expectInvalidJsonFailure() {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson("{", output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson("{", output, nullptr));
 EXPECT_EQ(output, original);
 }
} // namespace

TEST_S(ToJson, NoError, WithSuccessParam) {
Expand All@@ -72,6 +134,25 @@ TEST_S(ToJson, NoError, WithoutSuccessParam) {
 EXPECT_EQ(json_string, R"({"a":"","b":{"c":0}})");
}

TEST_S(ToJson, SuccessParam, LocalConverterTypes) {
 using namespace std::chrono;

 expectToJsonSuccessWithSuccessParam(display_device::TestEnum::Value1);
 expectToJsonSuccessWithSuccessParam(display_device::TestStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestThrowingStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestVariant {123.});
 expectToJsonSuccessWithSuccessParam(nanoseconds {2000000000});
 expectToJsonSuccessWithSuccessParam(microseconds {2000000});
 expectToJsonSuccessWithSuccessParam(milliseconds {2000});
 expectToJsonSuccessWithSuccessParam(seconds {2});
 expectToJsonSuccessWithSuccessParam(minutes {20});
 expectToJsonSuccessWithSuccessParam(hours {20});
 expectToJsonSuccessWithSuccessParam(days {20});
 expectToJsonSuccessWithSuccessParam(weeks {20});
 expectToJsonSuccessWithSuccessParam(months {20});
 expectToJsonSuccessWithSuccessParam(years {20});
}

TEST_S(ToJson, Error, WithSuccessParam) {
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestStruct {"123\xC2"}, std::nullopt, &success)};
Expand All@@ -85,6 +166,46 @@ TEST_S(ToJson, Error, WithoutSuccessParam) {
 EXPECT_EQ(json_string, "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2");
}

TEST_S(ToJson, Error, StandardExceptions) {
 bool success {true};
 auto json_string {
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 &success
 )
 };

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json out_of_range");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 nullptr
 ),
 "to_json out_of_range"
 );

 success = true;
 json_string = display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 &success
 );

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json invalid_argument");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 nullptr
 ),
 "to_json invalid_argument"
 );
}

TEST_S(ToJson, Compact) {
 const auto json_string {display_device::toJson(display_device::TestStruct {}, std::nullopt, nullptr)};
 EXPECT_EQ(json_string, "{\"a\":\"\",\"b\":{\"c\":0}}");
Expand DownExpand Up@@ -150,6 +271,38 @@ TEST_S(FromJson, Error, WithoutErrorMessageParam) {
 EXPECT_EQ(original, copy);
}

TEST_S(FromJson, InvalidJson, LocalConverterTypes) {
 using namespace std::chrono;

 expectInvalidJsonFailure<display_device::TestEnum>();
 expectInvalidJsonFailure<display_device::TestStruct>();
 expectInvalidJsonFailure<display_device::TestThrowingStruct>();
 expectInvalidJsonFailure<display_device::TestVariant>();
 expectInvalidJsonFailure<nanoseconds>();
 expectInvalidJsonFailure<microseconds>();
 expectInvalidJsonFailure<milliseconds>();
 expectInvalidJsonFailure<seconds>();
 expectInvalidJsonFailure<minutes>();
 expectInvalidJsonFailure<hours>();
 expectInvalidJsonFailure<days>();
 expectInvalidJsonFailure<weeks>();
 expectInvalidJsonFailure<months>();
 expectInvalidJsonFailure<years>();
}

TEST_S(FromJson, Error, StandardExceptions) {
 display_device::TestThrowingStruct value {};
 std::string error_message {};

 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json out_of_range");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, nullptr));

 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json invalid_argument");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, nullptr));
}

TEST_S(ToJson, Enum) {
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value1, std::nullopt, nullptr), R"("Value1")");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value2, std::nullopt, nullptr), R"("ValueMaybe2")");
Expand All@@ -166,8 +319,12 @@ TEST_S(FromJson, Enum) {
}

TEST_S(ToJson, Enum, MissingMappingValue) {
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr)};
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, &success)};

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "TestEnum is missing enum mapping!");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr), "TestEnum is missing enum mapping!");
}

TEST_S(FromJson, Enum, MissingMappingValue) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
test: improve coverage#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 10, 2026
 Merged


test: improve coverage
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 13 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ namespace display_device {
 }

 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 std::error_code error_code;
 if (!std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
Expand All@@ -50,6 +51,17 @@ namespace display_device {
 return std::vector<std::uint8_t> {};
 }

 if (!std::filesystem::is_regular_file(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to inspect " << m_filepath << "! Error:\n"
 << "[" << error_code.value() << "] " << error_code.message();
 } else {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Path is not a regular file.";
 }

 return std::nullopt;
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
Expand Down

1 change: 1 addition & 0 deletions
src/common/include/display_device/file_settings_persistence.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ namespace display_device {
 /**
 * @copydoc SettingsPersistenceInterface::load
 * @note If file does not exist, an empty data list will be returned instead of null optional.
 * @note If the path exists but is not a regular file, null optional will be returned.
 */
 [[nodiscard]] std::optional<std::vector<std::uint8_t>> load() const override;

Expand Down

2 changes: 2 additions & 0 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(EdidData)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDevice)
 DD_JSON_DEFINE_CONVERTER(EnumeratedDeviceList)
Expand Down

2 changes: 0 additions & 2 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@
// clang-format on

namespace display_device {
 const std::optional<unsigned int> JSON_COMPACT {std::nullopt};

 DD_JSON_DEFINE_CONVERTER(ActiveTopology)
 DD_JSON_DEFINE_CONVERTER(DeviceDisplayModeMap)
 DD_JSON_DEFINE_CONVERTER(HdrStateMap)
Expand Down

28 changes: 28 additions & 0 deletions
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,32 @@ class JsonConverterTest: public BaseTest {
 }
 EXPECT_EQ(input, defaulted_input);
 }

 template<class T>
 void executeInvalidJsonTestCase() const {
 executeFromJsonFailureTestCase<T>("{");
 }

 template<class T>
 void executeFromJsonFailureTestCase(const std::string &input) const {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson(input, output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson(input, output, nullptr));
 EXPECT_EQ(output, original);
 }

 template<class T>
 void executeToJsonFailureTestCase(const T &input) const {
 bool success {true};

 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, &success).empty());
 EXPECT_FALSE(success);
 EXPECT_FALSE(display_device::toJson(input, display_device::JSON_COMPACT, nullptr).empty());
 }
};

25 changes: 24 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <algorithm>
#include <filesystem>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand All@@ -16,7 +17,8 @@ namespace {
 class FileSettingsPersistenceTest: public BaseTest {
 public:
 ~FileSettingsPersistenceTest() override {
 std::filesystem::remove(m_filepath);
 std::error_code error_code;
 std::filesystem::remove_all(m_filepath, error_code);
 }

 display_device::FileSettingsPersistence &getImpl(const std::filesystem::path &filepath = "testfile.ext") {
Expand DownExpand Up@@ -101,6 +103,13 @@ TEST_F_S(Load, FileRead) {
 EXPECT_EQ(getImpl(filepath).load(), data);
}

TEST_F_S(Load, FilepathIsDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 EXPECT_EQ(getImpl(filepath).load(), std::nullopt);
}

TEST_F_S(Clear, NoFileAvailable) {
 EXPECT_TRUE(getImpl().clear());
}
Expand All@@ -116,3 +125,17 @@ TEST_F_S(Clear, FileRemoved) {
 EXPECT_TRUE(getImpl(filepath).clear());
 EXPECT_FALSE(std::filesystem::exists(filepath));
}

TEST_F_S(Clear, NonEmptyDirectory) {
 const std::filesystem::path filepath {"settings-dir"};

 std::filesystem::create_directory(filepath);
 {
 std::ofstream file {filepath / "child.ext"};
 file << "some data";
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
 EXPECT_FALSE(getImpl(filepath).clear());
 EXPECT_TRUE(std::filesystem::exists(filepath));
}

159 changes: 158 additions & 1 deletion
tests/unit/general/test_json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,18 @@ namespace display_device {
 friend bool operator==(const TestStruct &lhs, const TestStruct &rhs) = default;
 };

 struct TestThrowingStruct {
 enum class Error {
 None,
 OutOfRange,
 InvalidArgument
 };

 Error m_error {Error::None};

 friend bool operator==(const TestThrowingStruct &lhs, const TestThrowingStruct &rhs) = default;
 };

 using TestVariant = std::variant<double, Rational>;

 DD_JSON_DEFINE_SERIALIZE_ENUM_GCOVR_EXCL_BR_LINE(TestEnum, {{TestEnum::Value1, "Value1"}, {TestEnum::Value2, "ValueMaybe2"}})
Expand All@@ -48,6 +60,34 @@ namespace display_device {
 DD_JSON_DEFINE_CONVERTER(std::chrono::weeks)
 DD_JSON_DEFINE_CONVERTER(std::chrono::months)
 DD_JSON_DEFINE_CONVERTER(std::chrono::years)

 void to_json(nlohmann::json &json, const TestThrowingStruct &value) {
 using enum TestThrowingStruct::Error;

 switch (value.m_error) {
 case None:
 json = {{"error", "none"}};
 return;
 case OutOfRange:
 throw std::out_of_range {"to_json out_of_range"};
 case InvalidArgument:
 throw std::invalid_argument {"to_json invalid_argument"};
 }
 }

 void from_json(const nlohmann::json &json, TestThrowingStruct &value) {
 const auto error {json.at("error").get<std::string>()};
 if (error == "out_of_range") {
 throw std::out_of_range {"from_json out_of_range"};
 }
 if (error == "invalid_argument") {
 throw std::invalid_argument {"from_json invalid_argument"};
 }

 value = {};
 }

 DD_JSON_DEFINE_CONVERTER(TestThrowingStruct)
} // namespace display_device

namespace {
Expand All@@ -57,6 +97,28 @@ namespace {
 // Additional convenience global const(s)
 constexpr auto MIN_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::min()};
 constexpr auto MAX_NANO_VAL {std::numeric_limits<decltype(std::chrono::nanoseconds {}.count())>::max()};

 template<class T>
 void expectToJsonSuccessWithSuccessParam(const T &input) {
 bool success {false};

 EXPECT_FALSE(display_device::toJson(input, std::nullopt, &success).empty());
 EXPECT_TRUE(success);
 }

 template<class T>
 void expectInvalidJsonFailure() {
 const T original {};
 T output {original};
 std::string error_message {"unchanged"};

 EXPECT_FALSE(display_device::fromJson("{", output, &error_message));
 EXPECT_EQ(output, original);
 EXPECT_FALSE(error_message.empty());

 EXPECT_FALSE(display_device::fromJson("{", output, nullptr));
 EXPECT_EQ(output, original);
 }
} // namespace

TEST_S(ToJson, NoError, WithSuccessParam) {
Expand All@@ -72,6 +134,25 @@ TEST_S(ToJson, NoError, WithoutSuccessParam) {
 EXPECT_EQ(json_string, R"({"a":"","b":{"c":0}})");
}

TEST_S(ToJson, SuccessParam, LocalConverterTypes) {
 using namespace std::chrono;

 expectToJsonSuccessWithSuccessParam(display_device::TestEnum::Value1);
 expectToJsonSuccessWithSuccessParam(display_device::TestStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestThrowingStruct {});
 expectToJsonSuccessWithSuccessParam(display_device::TestVariant {123.});
 expectToJsonSuccessWithSuccessParam(nanoseconds {2000000000});
 expectToJsonSuccessWithSuccessParam(microseconds {2000000});
 expectToJsonSuccessWithSuccessParam(milliseconds {2000});
 expectToJsonSuccessWithSuccessParam(seconds {2});
 expectToJsonSuccessWithSuccessParam(minutes {20});
 expectToJsonSuccessWithSuccessParam(hours {20});
 expectToJsonSuccessWithSuccessParam(days {20});
 expectToJsonSuccessWithSuccessParam(weeks {20});
 expectToJsonSuccessWithSuccessParam(months {20});
 expectToJsonSuccessWithSuccessParam(years {20});
}

TEST_S(ToJson, Error, WithSuccessParam) {
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestStruct {"123\xC2"}, std::nullopt, &success)};
Expand All@@ -85,6 +166,46 @@ TEST_S(ToJson, Error, WithoutSuccessParam) {
 EXPECT_EQ(json_string, "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2");
}

TEST_S(ToJson, Error, StandardExceptions) {
 bool success {true};
 auto json_string {
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 &success
 )
 };

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json out_of_range");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::OutOfRange},
 std::nullopt,
 nullptr
 ),
 "to_json out_of_range"
 );

 success = true;
 json_string = display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 &success
 );

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "to_json invalid_argument");
 EXPECT_EQ(
 display_device::toJson(
 display_device::TestThrowingStruct {.m_error = display_device::TestThrowingStruct::Error::InvalidArgument},
 std::nullopt,
 nullptr
 ),
 "to_json invalid_argument"
 );
}

TEST_S(ToJson, Compact) {
 const auto json_string {display_device::toJson(display_device::TestStruct {}, std::nullopt, nullptr)};
 EXPECT_EQ(json_string, "{\"a\":\"\",\"b\":{\"c\":0}}");
Expand DownExpand Up@@ -150,6 +271,38 @@ TEST_S(FromJson, Error, WithoutErrorMessageParam) {
 EXPECT_EQ(original, copy);
}

TEST_S(FromJson, InvalidJson, LocalConverterTypes) {
 using namespace std::chrono;

 expectInvalidJsonFailure<display_device::TestEnum>();
 expectInvalidJsonFailure<display_device::TestStruct>();
 expectInvalidJsonFailure<display_device::TestThrowingStruct>();
 expectInvalidJsonFailure<display_device::TestVariant>();
 expectInvalidJsonFailure<nanoseconds>();
 expectInvalidJsonFailure<microseconds>();
 expectInvalidJsonFailure<milliseconds>();
 expectInvalidJsonFailure<seconds>();
 expectInvalidJsonFailure<minutes>();
 expectInvalidJsonFailure<hours>();
 expectInvalidJsonFailure<days>();
 expectInvalidJsonFailure<weeks>();
 expectInvalidJsonFailure<months>();
 expectInvalidJsonFailure<years>();
}

TEST_S(FromJson, Error, StandardExceptions) {
 display_device::TestThrowingStruct value {};
 std::string error_message {};

 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json out_of_range");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"out_of_range"})", value, nullptr));

 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, &error_message));
 EXPECT_EQ(error_message, "from_json invalid_argument");
 EXPECT_FALSE(display_device::fromJson(R"({"error":"invalid_argument"})", value, nullptr));
}

TEST_S(ToJson, Enum) {
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value1, std::nullopt, nullptr), R"("Value1")");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value2, std::nullopt, nullptr), R"("ValueMaybe2")");
Expand All@@ -166,8 +319,12 @@ TEST_S(FromJson, Enum) {
}

TEST_S(ToJson, Enum, MissingMappingValue) {
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr)};
 bool success {true};
 const auto json_string {display_device::toJson(display_device::TestEnum::Value3, std::nullopt, &success)};

 EXPECT_FALSE(success);
 EXPECT_EQ(json_string, "TestEnum is missing enum mapping!");
 EXPECT_EQ(display_device::toJson(display_device::TestEnum::Value3, std::nullopt, nullptr), "TestEnum is missing enum mapping!");
}

TEST_S(FromJson, Enum, MissingMappingValue) {
Expand Down
Loading
Loading