refactor(sonar): reduce code duplication#268

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 2 commits into from
Jun 10, 2026
Merged

refactor(sonar): reduce code duplication #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
440d427
refactor(sonar): reduce code duplication
ReenigneArcher Jun 10, 2026
86d6dea
Refactor Windows unit tests: helpers, includes, enums
ReenigneArcher Jun 10, 2026
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
96 changes: 40 additions & 56 deletions tests/unit/general/test_json_converter.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,42 @@
// Specialized TEST macro(s) for this test file
#define TEST_F_S(...) DD_MAKE_TEST(TEST_F, JsonConverterTest, __VA_ARGS__)

namespace {
display_device::EnumeratedDevice makeEnumeratedDeviceOne() {
return {
"ID_1",
"NAME_2",
"FU_NAME_3",
std::nullopt,
display_device::EnumeratedDevice::Info {
{1920, 1080},
display_device::Rational {175, 100},
119.9554,
false,
{1, 2},
display_device::HdrState::Enabled
}
};
}

display_device::EnumeratedDevice makeEnumeratedDeviceTwo() {
return {
"ID_2",
"NAME_2",
"FU_NAME_2",
display_device::EdidData {},
display_device::EnumeratedDevice::Info {
{1920, 1080},
1.75,
display_device::Rational {1199554, 10000},
true,
{0, 0},
display_device::HdrState::Disabled
}
};
}
} // namespace

TEST_F_S(EdidData) {
display_device::EdidData item {
.m_manufacturer_id = "LOL",
Expand All@@ -16,69 +52,17 @@ TEST_F_S(EdidData) {
}

TEST_F_S(EnumeratedDevice) {
display_device::EnumeratedDevice item_1 {
"ID_1",
"NAME_2",
"FU_NAME_3",
std::nullopt,
display_device::EnumeratedDevice::Info {
{1920, 1080},
display_device::Rational {175, 100},
119.9554,
false,
{1, 2},
display_device::HdrState::Enabled
}
};
display_device::EnumeratedDevice item_2 {
"ID_2",
"NAME_2",
"FU_NAME_2",
display_device::EdidData {},
display_device::EnumeratedDevice::Info {
{1920, 1080},
1.75,
display_device::Rational {1199554, 10000},
true,
{0, 0},
display_device::HdrState::Disabled
}
};
const auto item_1 {makeEnumeratedDeviceOne()};
const auto item_2 {makeEnumeratedDeviceTwo()};

executeTestCase(display_device::EnumeratedDevice {}, R"({"device_id":"","display_name":"","edid":null,"friendly_name":"","info":null})");
executeTestCase(item_1, R"({"device_id":"ID_1","display_name":"NAME_2","edid":null,"friendly_name":"FU_NAME_3","info":{"hdr_state":"Enabled","origin_point":{"x":1,"y":2},"primary":false,"refresh_rate":{"type":"double","value":119.9554},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"rational","value":{"denominator":100,"numerator":175}}}})");
executeTestCase(item_2, R"({"device_id":"ID_2","display_name":"NAME_2","edid":{"manufacturer_id":"","product_code":"","serial_number":0},"friendly_name":"FU_NAME_2","info":{"hdr_state":"Disabled","origin_point":{"x":0,"y":0},"primary":true,"refresh_rate":{"type":"rational","value":{"denominator":10000,"numerator":1199554}},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"double","value":1.75}}})");
}

TEST_F_S(EnumeratedDeviceList) {
display_device::EnumeratedDevice item_1 {
"ID_1",
"NAME_2",
"FU_NAME_3",
std::nullopt,
display_device::EnumeratedDevice::Info {
{1920, 1080},
display_device::Rational {175, 100},
119.9554,
false,
{1, 2},
display_device::HdrState::Enabled
}
};
display_device::EnumeratedDevice item_2 {
"ID_2",
"NAME_2",
"FU_NAME_2",
display_device::EdidData {},
display_device::EnumeratedDevice::Info {
{1920, 1080},
1.75,
display_device::Rational {1199554, 10000},
true,
{0, 0},
display_device::HdrState::Disabled
}
};
const auto item_1 {makeEnumeratedDeviceOne()};
const auto item_2 {makeEnumeratedDeviceTwo()};
display_device::EnumeratedDevice item_3 {};

executeTestCase(display_device::EnumeratedDeviceList {}, R"([])");
Expand Down
164 changes: 62 additions & 102 deletions tests/unit/general/test_retry_scheduler.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,13 @@ namespace {
// Test fixture(s) for this file
class RetrySchedulerTest: public BaseTest {
public:
struct TwoCallScheduleResult {
std::optional<std::thread::id> m_first_call_thread_id;
std::optional<std::thread::id> m_second_call_thread_id;
int m_first_call_delay {-1};
int m_second_call_delay {-1};
};

int scheduleAndGetAverageDelays(const std::vector<std::chrono::milliseconds> &durations) {
m_impl.execute([](TestIface &iface) {
iface.m_durations.clear();
Expand DownExpand Up@@ -74,6 +81,34 @@ namespace {
});
}

TwoCallScheduleResult scheduleAndWaitForTwoCalls(const std::chrono::milliseconds default_duration, const display_device::SchedulerOptions::Execution execution) {
TwoCallScheduleResult result;

auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&result, &prev](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;

if (!result.m_first_call_thread_id) {
result.m_first_call_delay = duration;
result.m_first_call_thread_id = std::this_thread::get_id();
return;
}

result.m_second_call_delay = duration;
result.m_second_call_thread_id = std::this_thread::get_id();
stop_token.requestStop();
},
{.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = execution});

while (m_impl.isScheduled()) {
std::this_thread::sleep_for(1ms);
}

return result;
}

display_device::RetryScheduler<TestIface> m_impl {std::make_unique<TestIface>()};
};

Expand DownExpand Up@@ -165,127 +200,52 @@ TEST_F_S(Schedule, StoppedImmediately) {
TEST_F_S(Schedule, Execution, Immediate) {
const auto default_duration {500ms};
const auto calling_thread_id {std::this_thread::get_id()};
std::optional<std::thread::id> first_call_scheduler_thread_id;
std::optional<std::thread::id> second_call_scheduler_thread_id;

int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;

if (!first_call_scheduler_thread_id) {
first_call_delay = duration;
first_call_scheduler_thread_id = std::this_thread::get_id();
return;
}

second_call_delay = duration;
second_call_scheduler_thread_id = std::this_thread::get_id();
stop_token.requestStop();
},
{.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::Immediate});

while (m_impl.isScheduled()) {
std::this_thread::sleep_for(1ms);
}
const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::Immediate)};

EXPECT_GE(first_call_delay, roundTo99(0));
EXPECT_LT(first_call_delay, default_duration.count());
EXPECT_GE(second_call_delay, roundTo99(default_duration.count() * 2));
EXPECT_LT(second_call_delay, default_duration.count() * 3);
EXPECT_GE(result.m_first_call_delay, roundTo99(0));
EXPECT_LT(result.m_first_call_delay, default_duration.count());
EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count() * 2));
EXPECT_LT(result.m_second_call_delay, default_duration.count() * 3);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
const auto default_duration {500ms};
const auto calling_thread_id {std::this_thread::get_id()};
std::optional<std::thread::id> first_call_scheduler_thread_id;
std::optional<std::thread::id> second_call_scheduler_thread_id;

int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;

if (!first_call_scheduler_thread_id) {
first_call_delay = duration;
first_call_scheduler_thread_id = std::this_thread::get_id();
return;
}

second_call_delay = duration;
second_call_scheduler_thread_id = std::this_thread::get_id();
stop_token.requestStop();
},
{.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ImmediateWithSleep});
const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ImmediateWithSleep)};

while (m_impl.isScheduled()) {
std::this_thread::sleep_for(1ms);
}
EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
EXPECT_LT(first_call_delay, default_duration.count() * 3);
EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
EXPECT_LT(second_call_delay, default_duration.count() * 2);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);

EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ScheduledOnly) {
const auto default_duration {500ms};
const auto calling_thread_id {std::this_thread::get_id()};
std::optional<std::thread::id> first_call_scheduler_thread_id;
std::optional<std::thread::id> second_call_scheduler_thread_id;

int first_call_delay {-1};
int second_call_delay {-1};
auto prev = std::chrono::high_resolution_clock::now();
m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
const auto now = std::chrono::high_resolution_clock::now();
const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
prev = now;

if (!first_call_scheduler_thread_id) {
first_call_delay = duration;
first_call_scheduler_thread_id = std::this_thread::get_id();
return;
}

second_call_delay = duration;
second_call_scheduler_thread_id = std::this_thread::get_id();
stop_token.requestStop();
},
{.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ScheduledOnly});

while (m_impl.isScheduled()) {
std::this_thread::sleep_for(1ms);
}
const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ScheduledOnly)};

EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
EXPECT_LT(first_call_delay, default_duration.count() * 3);
EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
EXPECT_LT(second_call_delay, default_duration.count() * 2);
EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

EXPECT_NE(*first_call_scheduler_thread_id, calling_thread_id);
EXPECT_EQ(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
EXPECT_NE(*result.m_first_call_thread_id, calling_thread_id);
EXPECT_EQ(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
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
refactor(sonar): reduce code duplication#268

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 2 commits into

from

Jun 10, 2026
 Merged


refactor(sonar): reduce code duplication
#268
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
440d427

refactor(sonar): reduce code duplication


ReenigneArcher Jun 10, 2026
86d6dea

Refactor Windows unit tests: helpers, includes, enums


ReenigneArcher Jun 10, 2026

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


96 changes: 40 additions & 56 deletions
tests/unit/general/test_json_converter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,42 @@
// Specialized TEST macro(s) for this test file
#define TEST_F_S(...) DD_MAKE_TEST(TEST_F, JsonConverterTest, __VA_ARGS__)

namespace {
 display_device::EnumeratedDevice makeEnumeratedDeviceOne() {
 return {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 }

 display_device::EnumeratedDevice makeEnumeratedDeviceTwo() {
 return {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 }
} // namespace

TEST_F_S(EdidData) {
 display_device::EdidData item {
 .m_manufacturer_id = "LOL",
Expand All@@ -16,69 +52,17 @@ TEST_F_S(EdidData) {
}

TEST_F_S(EnumeratedDevice) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};

 executeTestCase(display_device::EnumeratedDevice {}, R"({"device_id":"","display_name":"","edid":null,"friendly_name":"","info":null})");
 executeTestCase(item_1, R"({"device_id":"ID_1","display_name":"NAME_2","edid":null,"friendly_name":"FU_NAME_3","info":{"hdr_state":"Enabled","origin_point":{"x":1,"y":2},"primary":false,"refresh_rate":{"type":"double","value":119.9554},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"rational","value":{"denominator":100,"numerator":175}}}})");
 executeTestCase(item_2, R"({"device_id":"ID_2","display_name":"NAME_2","edid":{"manufacturer_id":"","product_code":"","serial_number":0},"friendly_name":"FU_NAME_2","info":{"hdr_state":"Disabled","origin_point":{"x":0,"y":0},"primary":true,"refresh_rate":{"type":"rational","value":{"denominator":10000,"numerator":1199554}},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"double","value":1.75}}})");
}

TEST_F_S(EnumeratedDeviceList) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};
 display_device::EnumeratedDevice item_3 {};

 executeTestCase(display_device::EnumeratedDeviceList {}, R"([])");
Expand Down

164 changes: 62 additions & 102 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,13 @@ namespace {
 // Test fixture(s) for this file
 class RetrySchedulerTest: public BaseTest {
 public:
 struct TwoCallScheduleResult {
 std::optional<std::thread::id> m_first_call_thread_id;
 std::optional<std::thread::id> m_second_call_thread_id;
 int m_first_call_delay {-1};
 int m_second_call_delay {-1};
 };

 int scheduleAndGetAverageDelays(const std::vector<std::chrono::milliseconds> &durations) {
 m_impl.execute([](TestIface &iface) {
 iface.m_durations.clear();
Expand DownExpand Up@@ -74,6 +81,34 @@ namespace {
 });
 }

 TwoCallScheduleResult scheduleAndWaitForTwoCalls(const std::chrono::milliseconds default_duration, const display_device::SchedulerOptions::Execution execution) {
 TwoCallScheduleResult result;

 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&result, &prev](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!result.m_first_call_thread_id) {
 result.m_first_call_delay = duration;
 result.m_first_call_thread_id = std::this_thread::get_id();
 return;
 }

 result.m_second_call_delay = duration;
 result.m_second_call_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = execution});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }

 return result;
 }

 display_device::RetryScheduler<TestIface> m_impl {std::make_unique<TestIface>()};
 };

Expand DownExpand Up@@ -165,127 +200,52 @@ TEST_F_S(Schedule, StoppedImmediately) {
TEST_F_S(Schedule, Execution, Immediate) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::Immediate});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::Immediate)};

 EXPECT_GE(first_call_delay, roundTo99(0));
 EXPECT_LT(first_call_delay, default_duration.count());
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(second_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_first_call_delay, roundTo99(0));
 EXPECT_LT(result.m_first_call_delay, default_duration.count());
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 3);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ImmediateWithSleep});
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ImmediateWithSleep)};

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 ASSERT_TRUE(result.m_first_call_thread_id);
 ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_TRUE(first_call_scheduler_thread_id);
 EXPECT_TRUE(second_call_scheduler_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ScheduledOnly) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ScheduledOnly});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ScheduledOnly)};

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_NE(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_EQ(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
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
refactor(sonar): reduce code duplication#268

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 2 commits into

from

Jun 10, 2026
 Merged


refactor(sonar): reduce code duplication
#268
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
440d427

refactor(sonar): reduce code duplication


ReenigneArcher Jun 10, 2026
86d6dea

Refactor Windows unit tests: helpers, includes, enums


ReenigneArcher Jun 10, 2026

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


96 changes: 40 additions & 56 deletions
tests/unit/general/test_json_converter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,42 @@
// Specialized TEST macro(s) for this test file
#define TEST_F_S(...) DD_MAKE_TEST(TEST_F, JsonConverterTest, __VA_ARGS__)

namespace {
 display_device::EnumeratedDevice makeEnumeratedDeviceOne() {
 return {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 }

 display_device::EnumeratedDevice makeEnumeratedDeviceTwo() {
 return {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 }
} // namespace

TEST_F_S(EdidData) {
 display_device::EdidData item {
 .m_manufacturer_id = "LOL",
Expand All@@ -16,69 +52,17 @@ TEST_F_S(EdidData) {
}

TEST_F_S(EnumeratedDevice) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};

 executeTestCase(display_device::EnumeratedDevice {}, R"({"device_id":"","display_name":"","edid":null,"friendly_name":"","info":null})");
 executeTestCase(item_1, R"({"device_id":"ID_1","display_name":"NAME_2","edid":null,"friendly_name":"FU_NAME_3","info":{"hdr_state":"Enabled","origin_point":{"x":1,"y":2},"primary":false,"refresh_rate":{"type":"double","value":119.9554},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"rational","value":{"denominator":100,"numerator":175}}}})");
 executeTestCase(item_2, R"({"device_id":"ID_2","display_name":"NAME_2","edid":{"manufacturer_id":"","product_code":"","serial_number":0},"friendly_name":"FU_NAME_2","info":{"hdr_state":"Disabled","origin_point":{"x":0,"y":0},"primary":true,"refresh_rate":{"type":"rational","value":{"denominator":10000,"numerator":1199554}},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"double","value":1.75}}})");
}

TEST_F_S(EnumeratedDeviceList) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};
 display_device::EnumeratedDevice item_3 {};

 executeTestCase(display_device::EnumeratedDeviceList {}, R"([])");
Expand Down

164 changes: 62 additions & 102 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,13 @@ namespace {
 // Test fixture(s) for this file
 class RetrySchedulerTest: public BaseTest {
 public:
 struct TwoCallScheduleResult {
 std::optional<std::thread::id> m_first_call_thread_id;
 std::optional<std::thread::id> m_second_call_thread_id;
 int m_first_call_delay {-1};
 int m_second_call_delay {-1};
 };

 int scheduleAndGetAverageDelays(const std::vector<std::chrono::milliseconds> &durations) {
 m_impl.execute([](TestIface &iface) {
 iface.m_durations.clear();
Expand DownExpand Up@@ -74,6 +81,34 @@ namespace {
 });
 }

 TwoCallScheduleResult scheduleAndWaitForTwoCalls(const std::chrono::milliseconds default_duration, const display_device::SchedulerOptions::Execution execution) {
 TwoCallScheduleResult result;

 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&result, &prev](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!result.m_first_call_thread_id) {
 result.m_first_call_delay = duration;
 result.m_first_call_thread_id = std::this_thread::get_id();
 return;
 }

 result.m_second_call_delay = duration;
 result.m_second_call_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = execution});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }

 return result;
 }

 display_device::RetryScheduler<TestIface> m_impl {std::make_unique<TestIface>()};
 };

Expand DownExpand Up@@ -165,127 +200,52 @@ TEST_F_S(Schedule, StoppedImmediately) {
TEST_F_S(Schedule, Execution, Immediate) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::Immediate});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::Immediate)};

 EXPECT_GE(first_call_delay, roundTo99(0));
 EXPECT_LT(first_call_delay, default_duration.count());
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(second_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_first_call_delay, roundTo99(0));
 EXPECT_LT(result.m_first_call_delay, default_duration.count());
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 3);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ImmediateWithSleep});
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ImmediateWithSleep)};

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 ASSERT_TRUE(result.m_first_call_thread_id);
 ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_TRUE(first_call_scheduler_thread_id);
 EXPECT_TRUE(second_call_scheduler_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ScheduledOnly) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ScheduledOnly});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ScheduledOnly)};

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_NE(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_EQ(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
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
refactor(sonar): reduce code duplication#268

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 2 commits into

from

Jun 10, 2026
 Merged


refactor(sonar): reduce code duplication
#268
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
440d427

refactor(sonar): reduce code duplication


ReenigneArcher Jun 10, 2026
86d6dea

Refactor Windows unit tests: helpers, includes, enums


ReenigneArcher Jun 10, 2026

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


96 changes: 40 additions & 56 deletions
tests/unit/general/test_json_converter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,42 @@
// Specialized TEST macro(s) for this test file
#define TEST_F_S(...) DD_MAKE_TEST(TEST_F, JsonConverterTest, __VA_ARGS__)

namespace {
 display_device::EnumeratedDevice makeEnumeratedDeviceOne() {
 return {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 }

 display_device::EnumeratedDevice makeEnumeratedDeviceTwo() {
 return {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 }
} // namespace

TEST_F_S(EdidData) {
 display_device::EdidData item {
 .m_manufacturer_id = "LOL",
Expand All@@ -16,69 +52,17 @@ TEST_F_S(EdidData) {
}

TEST_F_S(EnumeratedDevice) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};

 executeTestCase(display_device::EnumeratedDevice {}, R"({"device_id":"","display_name":"","edid":null,"friendly_name":"","info":null})");
 executeTestCase(item_1, R"({"device_id":"ID_1","display_name":"NAME_2","edid":null,"friendly_name":"FU_NAME_3","info":{"hdr_state":"Enabled","origin_point":{"x":1,"y":2},"primary":false,"refresh_rate":{"type":"double","value":119.9554},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"rational","value":{"denominator":100,"numerator":175}}}})");
 executeTestCase(item_2, R"({"device_id":"ID_2","display_name":"NAME_2","edid":{"manufacturer_id":"","product_code":"","serial_number":0},"friendly_name":"FU_NAME_2","info":{"hdr_state":"Disabled","origin_point":{"x":0,"y":0},"primary":true,"refresh_rate":{"type":"rational","value":{"denominator":10000,"numerator":1199554}},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"double","value":1.75}}})");
}

TEST_F_S(EnumeratedDeviceList) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};
 display_device::EnumeratedDevice item_3 {};

 executeTestCase(display_device::EnumeratedDeviceList {}, R"([])");
Expand Down

164 changes: 62 additions & 102 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,13 @@ namespace {
 // Test fixture(s) for this file
 class RetrySchedulerTest: public BaseTest {
 public:
 struct TwoCallScheduleResult {
 std::optional<std::thread::id> m_first_call_thread_id;
 std::optional<std::thread::id> m_second_call_thread_id;
 int m_first_call_delay {-1};
 int m_second_call_delay {-1};
 };

 int scheduleAndGetAverageDelays(const std::vector<std::chrono::milliseconds> &durations) {
 m_impl.execute([](TestIface &iface) {
 iface.m_durations.clear();
Expand DownExpand Up@@ -74,6 +81,34 @@ namespace {
 });
 }

 TwoCallScheduleResult scheduleAndWaitForTwoCalls(const std::chrono::milliseconds default_duration, const display_device::SchedulerOptions::Execution execution) {
 TwoCallScheduleResult result;

 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&result, &prev](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!result.m_first_call_thread_id) {
 result.m_first_call_delay = duration;
 result.m_first_call_thread_id = std::this_thread::get_id();
 return;
 }

 result.m_second_call_delay = duration;
 result.m_second_call_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = execution});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }

 return result;
 }

 display_device::RetryScheduler<TestIface> m_impl {std::make_unique<TestIface>()};
 };

Expand DownExpand Up@@ -165,127 +200,52 @@ TEST_F_S(Schedule, StoppedImmediately) {
TEST_F_S(Schedule, Execution, Immediate) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::Immediate});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::Immediate)};

 EXPECT_GE(first_call_delay, roundTo99(0));
 EXPECT_LT(first_call_delay, default_duration.count());
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(second_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_first_call_delay, roundTo99(0));
 EXPECT_LT(result.m_first_call_delay, default_duration.count());
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 3);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ImmediateWithSleep});
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ImmediateWithSleep)};

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 ASSERT_TRUE(result.m_first_call_thread_id);
 ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_TRUE(first_call_scheduler_thread_id);
 EXPECT_TRUE(second_call_scheduler_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ScheduledOnly) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ScheduledOnly});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ScheduledOnly)};

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_NE(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_EQ(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
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
refactor(sonar): reduce code duplication#268

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 2 commits into

from

Jun 10, 2026
 Merged


refactor(sonar): reduce code duplication
#268
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
440d427

refactor(sonar): reduce code duplication


ReenigneArcher Jun 10, 2026
86d6dea

Refactor Windows unit tests: helpers, includes, enums


ReenigneArcher Jun 10, 2026

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


96 changes: 40 additions & 56 deletions
tests/unit/general/test_json_converter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,42 @@
// Specialized TEST macro(s) for this test file
#define TEST_F_S(...) DD_MAKE_TEST(TEST_F, JsonConverterTest, __VA_ARGS__)

namespace {
 display_device::EnumeratedDevice makeEnumeratedDeviceOne() {
 return {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 }

 display_device::EnumeratedDevice makeEnumeratedDeviceTwo() {
 return {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 }
} // namespace

TEST_F_S(EdidData) {
 display_device::EdidData item {
 .m_manufacturer_id = "LOL",
Expand All@@ -16,69 +52,17 @@ TEST_F_S(EdidData) {
}

TEST_F_S(EnumeratedDevice) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};

 executeTestCase(display_device::EnumeratedDevice {}, R"({"device_id":"","display_name":"","edid":null,"friendly_name":"","info":null})");
 executeTestCase(item_1, R"({"device_id":"ID_1","display_name":"NAME_2","edid":null,"friendly_name":"FU_NAME_3","info":{"hdr_state":"Enabled","origin_point":{"x":1,"y":2},"primary":false,"refresh_rate":{"type":"double","value":119.9554},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"rational","value":{"denominator":100,"numerator":175}}}})");
 executeTestCase(item_2, R"({"device_id":"ID_2","display_name":"NAME_2","edid":{"manufacturer_id":"","product_code":"","serial_number":0},"friendly_name":"FU_NAME_2","info":{"hdr_state":"Disabled","origin_point":{"x":0,"y":0},"primary":true,"refresh_rate":{"type":"rational","value":{"denominator":10000,"numerator":1199554}},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"double","value":1.75}}})");
}

TEST_F_S(EnumeratedDeviceList) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};
 display_device::EnumeratedDevice item_3 {};

 executeTestCase(display_device::EnumeratedDeviceList {}, R"([])");
Expand Down

164 changes: 62 additions & 102 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,13 @@ namespace {
 // Test fixture(s) for this file
 class RetrySchedulerTest: public BaseTest {
 public:
 struct TwoCallScheduleResult {
 std::optional<std::thread::id> m_first_call_thread_id;
 std::optional<std::thread::id> m_second_call_thread_id;
 int m_first_call_delay {-1};
 int m_second_call_delay {-1};
 };

 int scheduleAndGetAverageDelays(const std::vector<std::chrono::milliseconds> &durations) {
 m_impl.execute([](TestIface &iface) {
 iface.m_durations.clear();
Expand DownExpand Up@@ -74,6 +81,34 @@ namespace {
 });
 }

 TwoCallScheduleResult scheduleAndWaitForTwoCalls(const std::chrono::milliseconds default_duration, const display_device::SchedulerOptions::Execution execution) {
 TwoCallScheduleResult result;

 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&result, &prev](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!result.m_first_call_thread_id) {
 result.m_first_call_delay = duration;
 result.m_first_call_thread_id = std::this_thread::get_id();
 return;
 }

 result.m_second_call_delay = duration;
 result.m_second_call_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = execution});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }

 return result;
 }

 display_device::RetryScheduler<TestIface> m_impl {std::make_unique<TestIface>()};
 };

Expand DownExpand Up@@ -165,127 +200,52 @@ TEST_F_S(Schedule, StoppedImmediately) {
TEST_F_S(Schedule, Execution, Immediate) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::Immediate});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::Immediate)};

 EXPECT_GE(first_call_delay, roundTo99(0));
 EXPECT_LT(first_call_delay, default_duration.count());
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(second_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_first_call_delay, roundTo99(0));
 EXPECT_LT(result.m_first_call_delay, default_duration.count());
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 3);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ImmediateWithSleep});
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ImmediateWithSleep)};

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 ASSERT_TRUE(result.m_first_call_thread_id);
 ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_TRUE(first_call_scheduler_thread_id);
 EXPECT_TRUE(second_call_scheduler_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ScheduledOnly) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ScheduledOnly});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ScheduledOnly)};

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_NE(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_EQ(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
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
refactor(sonar): reduce code duplication#268

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 2 commits into

from

Jun 10, 2026
 Merged


refactor(sonar): reduce code duplication
#268
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
440d427

refactor(sonar): reduce code duplication


ReenigneArcher Jun 10, 2026
86d6dea

Refactor Windows unit tests: helpers, includes, enums


ReenigneArcher Jun 10, 2026

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


96 changes: 40 additions & 56 deletions
tests/unit/general/test_json_converter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,42 @@
// Specialized TEST macro(s) for this test file
#define TEST_F_S(...) DD_MAKE_TEST(TEST_F, JsonConverterTest, __VA_ARGS__)

namespace {
 display_device::EnumeratedDevice makeEnumeratedDeviceOne() {
 return {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 }

 display_device::EnumeratedDevice makeEnumeratedDeviceTwo() {
 return {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 }
} // namespace

TEST_F_S(EdidData) {
 display_device::EdidData item {
 .m_manufacturer_id = "LOL",
Expand All@@ -16,69 +52,17 @@ TEST_F_S(EdidData) {
}

TEST_F_S(EnumeratedDevice) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};

 executeTestCase(display_device::EnumeratedDevice {}, R"({"device_id":"","display_name":"","edid":null,"friendly_name":"","info":null})");
 executeTestCase(item_1, R"({"device_id":"ID_1","display_name":"NAME_2","edid":null,"friendly_name":"FU_NAME_3","info":{"hdr_state":"Enabled","origin_point":{"x":1,"y":2},"primary":false,"refresh_rate":{"type":"double","value":119.9554},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"rational","value":{"denominator":100,"numerator":175}}}})");
 executeTestCase(item_2, R"({"device_id":"ID_2","display_name":"NAME_2","edid":{"manufacturer_id":"","product_code":"","serial_number":0},"friendly_name":"FU_NAME_2","info":{"hdr_state":"Disabled","origin_point":{"x":0,"y":0},"primary":true,"refresh_rate":{"type":"rational","value":{"denominator":10000,"numerator":1199554}},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"double","value":1.75}}})");
}

TEST_F_S(EnumeratedDeviceList) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};
 display_device::EnumeratedDevice item_3 {};

 executeTestCase(display_device::EnumeratedDeviceList {}, R"([])");
Expand Down

164 changes: 62 additions & 102 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,13 @@ namespace {
 // Test fixture(s) for this file
 class RetrySchedulerTest: public BaseTest {
 public:
 struct TwoCallScheduleResult {
 std::optional<std::thread::id> m_first_call_thread_id;
 std::optional<std::thread::id> m_second_call_thread_id;
 int m_first_call_delay {-1};
 int m_second_call_delay {-1};
 };

 int scheduleAndGetAverageDelays(const std::vector<std::chrono::milliseconds> &durations) {
 m_impl.execute([](TestIface &iface) {
 iface.m_durations.clear();
Expand DownExpand Up@@ -74,6 +81,34 @@ namespace {
 });
 }

 TwoCallScheduleResult scheduleAndWaitForTwoCalls(const std::chrono::milliseconds default_duration, const display_device::SchedulerOptions::Execution execution) {
 TwoCallScheduleResult result;

 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&result, &prev](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!result.m_first_call_thread_id) {
 result.m_first_call_delay = duration;
 result.m_first_call_thread_id = std::this_thread::get_id();
 return;
 }

 result.m_second_call_delay = duration;
 result.m_second_call_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = execution});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }

 return result;
 }

 display_device::RetryScheduler<TestIface> m_impl {std::make_unique<TestIface>()};
 };

Expand DownExpand Up@@ -165,127 +200,52 @@ TEST_F_S(Schedule, StoppedImmediately) {
TEST_F_S(Schedule, Execution, Immediate) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::Immediate});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::Immediate)};

 EXPECT_GE(first_call_delay, roundTo99(0));
 EXPECT_LT(first_call_delay, default_duration.count());
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(second_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_first_call_delay, roundTo99(0));
 EXPECT_LT(result.m_first_call_delay, default_duration.count());
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 3);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ImmediateWithSleep});
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ImmediateWithSleep)};

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 ASSERT_TRUE(result.m_first_call_thread_id);
 ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_TRUE(first_call_scheduler_thread_id);
 EXPECT_TRUE(second_call_scheduler_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ScheduledOnly) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ScheduledOnly});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ScheduledOnly)};

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_NE(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_EQ(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
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
refactor(sonar): reduce code duplication#268

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 2 commits into

from

Jun 10, 2026
 Merged


refactor(sonar): reduce code duplication
#268
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
440d427

refactor(sonar): reduce code duplication


ReenigneArcher Jun 10, 2026
86d6dea

Refactor Windows unit tests: helpers, includes, enums


ReenigneArcher Jun 10, 2026

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


96 changes: 40 additions & 56 deletions
tests/unit/general/test_json_converter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,42 @@
// Specialized TEST macro(s) for this test file
#define TEST_F_S(...) DD_MAKE_TEST(TEST_F, JsonConverterTest, __VA_ARGS__)

namespace {
 display_device::EnumeratedDevice makeEnumeratedDeviceOne() {
 return {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 }

 display_device::EnumeratedDevice makeEnumeratedDeviceTwo() {
 return {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 }
} // namespace

TEST_F_S(EdidData) {
 display_device::EdidData item {
 .m_manufacturer_id = "LOL",
Expand All@@ -16,69 +52,17 @@ TEST_F_S(EdidData) {
}

TEST_F_S(EnumeratedDevice) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};

 executeTestCase(display_device::EnumeratedDevice {}, R"({"device_id":"","display_name":"","edid":null,"friendly_name":"","info":null})");
 executeTestCase(item_1, R"({"device_id":"ID_1","display_name":"NAME_2","edid":null,"friendly_name":"FU_NAME_3","info":{"hdr_state":"Enabled","origin_point":{"x":1,"y":2},"primary":false,"refresh_rate":{"type":"double","value":119.9554},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"rational","value":{"denominator":100,"numerator":175}}}})");
 executeTestCase(item_2, R"({"device_id":"ID_2","display_name":"NAME_2","edid":{"manufacturer_id":"","product_code":"","serial_number":0},"friendly_name":"FU_NAME_2","info":{"hdr_state":"Disabled","origin_point":{"x":0,"y":0},"primary":true,"refresh_rate":{"type":"rational","value":{"denominator":10000,"numerator":1199554}},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"double","value":1.75}}})");
}

TEST_F_S(EnumeratedDeviceList) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};
 display_device::EnumeratedDevice item_3 {};

 executeTestCase(display_device::EnumeratedDeviceList {}, R"([])");
Expand Down

164 changes: 62 additions & 102 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,13 @@ namespace {
 // Test fixture(s) for this file
 class RetrySchedulerTest: public BaseTest {
 public:
 struct TwoCallScheduleResult {
 std::optional<std::thread::id> m_first_call_thread_id;
 std::optional<std::thread::id> m_second_call_thread_id;
 int m_first_call_delay {-1};
 int m_second_call_delay {-1};
 };

 int scheduleAndGetAverageDelays(const std::vector<std::chrono::milliseconds> &durations) {
 m_impl.execute([](TestIface &iface) {
 iface.m_durations.clear();
Expand DownExpand Up@@ -74,6 +81,34 @@ namespace {
 });
 }

 TwoCallScheduleResult scheduleAndWaitForTwoCalls(const std::chrono::milliseconds default_duration, const display_device::SchedulerOptions::Execution execution) {
 TwoCallScheduleResult result;

 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&result, &prev](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!result.m_first_call_thread_id) {
 result.m_first_call_delay = duration;
 result.m_first_call_thread_id = std::this_thread::get_id();
 return;
 }

 result.m_second_call_delay = duration;
 result.m_second_call_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = execution});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }

 return result;
 }

 display_device::RetryScheduler<TestIface> m_impl {std::make_unique<TestIface>()};
 };

Expand DownExpand Up@@ -165,127 +200,52 @@ TEST_F_S(Schedule, StoppedImmediately) {
TEST_F_S(Schedule, Execution, Immediate) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::Immediate});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::Immediate)};

 EXPECT_GE(first_call_delay, roundTo99(0));
 EXPECT_LT(first_call_delay, default_duration.count());
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(second_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_first_call_delay, roundTo99(0));
 EXPECT_LT(result.m_first_call_delay, default_duration.count());
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 3);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ImmediateWithSleep});
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ImmediateWithSleep)};

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 ASSERT_TRUE(result.m_first_call_thread_id);
 ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_TRUE(first_call_scheduler_thread_id);
 EXPECT_TRUE(second_call_scheduler_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ScheduledOnly) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ScheduledOnly});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ScheduledOnly)};

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_NE(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_EQ(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
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
refactor(sonar): reduce code duplication#268

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 2 commits into

from

Jun 10, 2026
 Merged


refactor(sonar): reduce code duplication
#268
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
440d427

refactor(sonar): reduce code duplication


ReenigneArcher Jun 10, 2026
86d6dea

Refactor Windows unit tests: helpers, includes, enums


ReenigneArcher Jun 10, 2026

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


96 changes: 40 additions & 56 deletions
tests/unit/general/test_json_converter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,42 @@
// Specialized TEST macro(s) for this test file
#define TEST_F_S(...) DD_MAKE_TEST(TEST_F, JsonConverterTest, __VA_ARGS__)

namespace {
 display_device::EnumeratedDevice makeEnumeratedDeviceOne() {
 return {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 }

 display_device::EnumeratedDevice makeEnumeratedDeviceTwo() {
 return {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 }
} // namespace

TEST_F_S(EdidData) {
 display_device::EdidData item {
 .m_manufacturer_id = "LOL",
Expand All@@ -16,69 +52,17 @@ TEST_F_S(EdidData) {
}

TEST_F_S(EnumeratedDevice) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};

 executeTestCase(display_device::EnumeratedDevice {}, R"({"device_id":"","display_name":"","edid":null,"friendly_name":"","info":null})");
 executeTestCase(item_1, R"({"device_id":"ID_1","display_name":"NAME_2","edid":null,"friendly_name":"FU_NAME_3","info":{"hdr_state":"Enabled","origin_point":{"x":1,"y":2},"primary":false,"refresh_rate":{"type":"double","value":119.9554},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"rational","value":{"denominator":100,"numerator":175}}}})");
 executeTestCase(item_2, R"({"device_id":"ID_2","display_name":"NAME_2","edid":{"manufacturer_id":"","product_code":"","serial_number":0},"friendly_name":"FU_NAME_2","info":{"hdr_state":"Disabled","origin_point":{"x":0,"y":0},"primary":true,"refresh_rate":{"type":"rational","value":{"denominator":10000,"numerator":1199554}},"resolution":{"height":1080,"width":1920},"resolution_scale":{"type":"double","value":1.75}}})");
}

TEST_F_S(EnumeratedDeviceList) {
 display_device::EnumeratedDevice item_1 {
 "ID_1",
 "NAME_2",
 "FU_NAME_3",
 std::nullopt,
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 display_device::Rational {175, 100},
 119.9554,
 false,
 {1, 2},
 display_device::HdrState::Enabled
 }
 };
 display_device::EnumeratedDevice item_2 {
 "ID_2",
 "NAME_2",
 "FU_NAME_2",
 display_device::EdidData {},
 display_device::EnumeratedDevice::Info {
 {1920, 1080},
 1.75,
 display_device::Rational {1199554, 10000},
 true,
 {0, 0},
 display_device::HdrState::Disabled
 }
 };
 const auto item_1 {makeEnumeratedDeviceOne()};
 const auto item_2 {makeEnumeratedDeviceTwo()};
 display_device::EnumeratedDevice item_3 {};

 executeTestCase(display_device::EnumeratedDeviceList {}, R"([])");
Expand Down

164 changes: 62 additions & 102 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,13 @@ namespace {
 // Test fixture(s) for this file
 class RetrySchedulerTest: public BaseTest {
 public:
 struct TwoCallScheduleResult {
 std::optional<std::thread::id> m_first_call_thread_id;
 std::optional<std::thread::id> m_second_call_thread_id;
 int m_first_call_delay {-1};
 int m_second_call_delay {-1};
 };

 int scheduleAndGetAverageDelays(const std::vector<std::chrono::milliseconds> &durations) {
 m_impl.execute([](TestIface &iface) {
 iface.m_durations.clear();
Expand DownExpand Up@@ -74,6 +81,34 @@ namespace {
 });
 }

 TwoCallScheduleResult scheduleAndWaitForTwoCalls(const std::chrono::milliseconds default_duration, const display_device::SchedulerOptions::Execution execution) {
 TwoCallScheduleResult result;

 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&result, &prev](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!result.m_first_call_thread_id) {
 result.m_first_call_delay = duration;
 result.m_first_call_thread_id = std::this_thread::get_id();
 return;
 }

 result.m_second_call_delay = duration;
 result.m_second_call_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = execution});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }

 return result;
 }

 display_device::RetryScheduler<TestIface> m_impl {std::make_unique<TestIface>()};
 };

Expand DownExpand Up@@ -165,127 +200,52 @@ TEST_F_S(Schedule, StoppedImmediately) {
TEST_F_S(Schedule, Execution, Immediate) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::Immediate});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::Immediate)};

 EXPECT_GE(first_call_delay, roundTo99(0));
 EXPECT_LT(first_call_delay, default_duration.count());
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(second_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_first_call_delay, roundTo99(0));
 EXPECT_LT(result.m_first_call_delay, default_duration.count());
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 3);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ImmediateWithSleep) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ImmediateWithSleep});
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ImmediateWithSleep)};

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 ASSERT_TRUE(result.m_first_call_thread_id);
 ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_TRUE(first_call_scheduler_thread_id);
 EXPECT_TRUE(second_call_scheduler_thread_id);

 EXPECT_EQ(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_NE(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, Execution, ScheduledOnly) {
 const auto default_duration {500ms};
 const auto calling_thread_id {std::this_thread::get_id()};
 std::optional<std::thread::id> first_call_scheduler_thread_id;
 std::optional<std::thread::id> second_call_scheduler_thread_id;

 int first_call_delay {-1};
 int second_call_delay {-1};
 auto prev = std::chrono::high_resolution_clock::now();
 m_impl.schedule([&first_call_delay, &first_call_scheduler_thread_id, &prev, &second_call_delay, &second_call_scheduler_thread_id](auto, auto &stop_token) {
 const auto now = std::chrono::high_resolution_clock::now();
 const auto duration = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(now - prev).count());
 prev = now;

 if (!first_call_scheduler_thread_id) {
 first_call_delay = duration;
 first_call_scheduler_thread_id = std::this_thread::get_id();
 return;
 }

 second_call_delay = duration;
 second_call_scheduler_thread_id = std::this_thread::get_id();
 stop_token.requestStop();
 },
 {.m_sleep_durations = {default_duration * 2, default_duration}, .m_execution = display_device::SchedulerOptions::Execution::ScheduledOnly});

 while (m_impl.isScheduled()) {
 std::this_thread::sleep_for(1ms);
 }
 const auto result {scheduleAndWaitForTwoCalls(default_duration, display_device::SchedulerOptions::Execution::ScheduledOnly)};

 EXPECT_GE(first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(first_call_delay, default_duration.count() * 3);
 EXPECT_GE(second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(second_call_delay, default_duration.count() * 2);
 EXPECT_GE(result.m_first_call_delay, roundTo99(default_duration.count() * 2));
 EXPECT_LT(result.m_first_call_delay, default_duration.count() * 3);
 EXPECT_GE(result.m_second_call_delay, roundTo99(default_duration.count()));
 EXPECT_LT(result.m_second_call_delay, default_duration.count() * 2);

EXPECT_TRUE(first_call_scheduler_thread_id);
EXPECT_TRUE(second_call_scheduler_thread_id);
ASSERT_TRUE(result.m_first_call_thread_id);
ASSERT_TRUE(result.m_second_call_thread_id);

 EXPECT_NE(*first_call_scheduler_thread_id, calling_thread_id);
 EXPECT_EQ(*first_call_scheduler_thread_id, *second_call_scheduler_thread_id);
 EXPECT_NE(*result.m_first_call_thread_id, calling_thread_id);
 EXPECT_EQ(*result.m_first_call_thread_id, *result.m_second_call_thread_id);
}

TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {
Expand Down
Loading
Loading