From 8fb913d61d3146bbc885dc16022339ca70eec8a5 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 9 Jun 2026 15:53:41 -0400 Subject: [PATCH] refactor(sonar): fix cpp:S6177 --- src/common/logging.cpp | 14 ++++++----- src/windows/settings_utils.cpp | 7 +++--- tests/fixtures/fixtures.cpp | 12 ++++++---- tests/unit/general/test_json_converter.cpp | 10 ++++---- tests/unit/general/test_logging.cpp | 10 ++++---- tests/unit/windows/test_settings_utils.cpp | 28 +++++++++++++--------- 6 files changed, 47 insertions(+), 34 deletions(-) diff --git a/src/common/logging.cpp b/src/common/logging.cpp index 2df39d7..c05d1b5 100644 --- a/src/common/logging.cpp +++ b/src/common/logging.cpp @@ -84,22 +84,24 @@ namespace display_device { // Log level switch (log_level) { // GCOVR_EXCL_BR_LINE for when there is no case match... - case LogLevel::verbose: + using enum LogLevel; + + case verbose: stream << "VERBOSE: "; break; - case LogLevel::debug: + case debug: stream << "DEBUG: "; break; - case LogLevel::info: + case info: stream << "INFO: "; break; - case LogLevel::warning: + case warning: stream << "WARNING: "; break; - case LogLevel::error: + case error: stream << "ERROR: "; break; - case LogLevel::fatal: + case fatal: stream << "FATAL: "; break; } diff --git a/src/windows/settings_utils.cpp b/src/windows/settings_utils.cpp index 1fd8427..682e5fc 100644 --- a/src/windows/settings_utils.cpp +++ b/src/windows/settings_utils.cpp @@ -361,14 +361,15 @@ namespace display_device::win_utils { StringSet device_ids; HdrStateMap original_states; HdrStateMap inverse_states; + using enum HdrState; for (const auto &[device_id, state] : current_states) { - if (!state || *state != HdrState::Enabled) { + if (!state || *state != Enabled) { continue; } device_ids.insert(device_id); - original_states[device_id] = HdrState::Enabled; - inverse_states[device_id] = HdrState::Disabled; + original_states[device_id] = Enabled; + inverse_states[device_id] = Disabled; } if (device_ids.empty()) { diff --git a/tests/fixtures/fixtures.cpp b/tests/fixtures/fixtures.cpp index 7ac07e0..b3ca5a9 100644 --- a/tests/fixtures/fixtures.cpp +++ b/tests/fixtures/fixtures.cpp @@ -94,21 +94,23 @@ std::string BaseTest::skipTest() const { std::optional BaseTest::getDefaultLogLevel() const { const static auto default_log_level { []() -> std::optional { + using enum display_device::Logger::LogLevel; + const auto value {getEnv("LOG_LEVEL")}; if (value == "verbose") { - return display_device::Logger::LogLevel::verbose; + return verbose; } if (value == "debug") { - return display_device::Logger::LogLevel::debug; + return debug; } if (value == "info") { - return display_device::Logger::LogLevel::info; + return info; } if (value == "warning") { - return display_device::Logger::LogLevel::warning; + return warning; } if (value == "error") { - return display_device::Logger::LogLevel::error; + return error; } return std::nullopt; diff --git a/tests/unit/general/test_json_converter.cpp b/tests/unit/general/test_json_converter.cpp index 514aaa1..b07d419 100644 --- a/tests/unit/general/test_json_converter.cpp +++ b/tests/unit/general/test_json_converter.cpp @@ -90,10 +90,12 @@ TEST_F_S(EnumeratedDeviceList) { } TEST_F_S(SingleDisplayConfiguration) { - display_device::SingleDisplayConfiguration config_1 {"ID_1", display_device::SingleDisplayConfiguration::DevicePreparation::VerifyOnly, {{156, 123}}, 85., display_device::HdrState::Enabled}; - display_device::SingleDisplayConfiguration config_2 {"ID_2", display_device::SingleDisplayConfiguration::DevicePreparation::EnsureActive, std::nullopt, display_device::Rational {85, 1}, display_device::HdrState::Disabled}; - display_device::SingleDisplayConfiguration config_3 {"ID_3", display_device::SingleDisplayConfiguration::DevicePreparation::EnsureOnlyDisplay, {{156, 123}}, std::nullopt, std::nullopt}; - display_device::SingleDisplayConfiguration config_4 {"ID_4", display_device::SingleDisplayConfiguration::DevicePreparation::EnsurePrimary, std::nullopt, std::nullopt, std::nullopt}; + using enum display_device::SingleDisplayConfiguration::DevicePreparation; + + display_device::SingleDisplayConfiguration config_1 {"ID_1", VerifyOnly, {{156, 123}}, 85., display_device::HdrState::Enabled}; + display_device::SingleDisplayConfiguration config_2 {"ID_2", EnsureActive, std::nullopt, display_device::Rational {85, 1}, display_device::HdrState::Disabled}; + display_device::SingleDisplayConfiguration config_3 {"ID_3", EnsureOnlyDisplay, {{156, 123}}, std::nullopt, std::nullopt}; + display_device::SingleDisplayConfiguration config_4 {"ID_4", EnsurePrimary, std::nullopt, std::nullopt, std::nullopt}; executeTestCase(display_device::SingleDisplayConfiguration {}, R"({"device_id":"","device_prep":"VerifyOnly","hdr_state":null,"refresh_rate":null,"resolution":null})"); executeTestCase(config_1, R"({"device_id":"ID_1","device_prep":"VerifyOnly","hdr_state":"Enabled","refresh_rate":{"type":"double","value":85.0},"resolution":{"height":123,"width":156}})"); diff --git a/tests/unit/general/test_logging.cpp b/tests/unit/general/test_logging.cpp index 080cbf7..1984497 100644 --- a/tests/unit/general/test_logging.cpp +++ b/tests/unit/general/test_logging.cpp @@ -160,17 +160,17 @@ TEST_S(CustomCallback) { } TEST_S(WriteMethodRespectsLogLevel, DefaultLogger) { - using level = display_device::Logger::LogLevel; + using enum display_device::Logger::LogLevel; auto &logger {display_device::Logger::get()}; EXPECT_TRUE(m_cout_buffer.str().empty()); - logger.setLogLevel(level::error); - logger.write(level::info, "Hello World!"); + logger.setLogLevel(error); + logger.write(info, "Hello World!"); EXPECT_TRUE(m_cout_buffer.str().empty()); - logger.setLogLevel(level::info); - logger.write(level::info, "Hello World!"); + logger.setLogLevel(info); + logger.write(info, "Hello World!"); EXPECT_FALSE(m_cout_buffer.str().empty()); } diff --git a/tests/unit/windows/test_settings_utils.cpp b/tests/unit/windows/test_settings_utils.cpp index 7fcc1be..564c8b8 100644 --- a/tests/unit/windows/test_settings_utils.cpp +++ b/tests/unit/windows/test_settings_utils.cpp @@ -301,13 +301,15 @@ TEST_F_S_MOCKED(BlankHdrStates, NothingToApply) { } TEST_F_S_MOCKED(BlankHdrStates, FailedToApplyInverseStates) { + using enum display_device::HdrState; + const display_device::HdrStateMap initial_states { - {"DeviceId1", {display_device::HdrState::Enabled}}, - {"DeviceId2", {display_device::HdrState::Disabled}}, + {"DeviceId1", {Enabled}}, + {"DeviceId2", {Disabled}}, {"DeviceId3", std::nullopt} }; const display_device::HdrStateMap inverse_states { - {"DeviceId1", {display_device::HdrState::Disabled}} + {"DeviceId1", {Disabled}} }; Sequence sequence; @@ -320,16 +322,18 @@ TEST_F_S_MOCKED(BlankHdrStates, FailedToApplyInverseStates) { } TEST_F_S_MOCKED(BlankHdrStates, FailedToApplyOriginalStates) { + using enum display_device::HdrState; + const display_device::HdrStateMap initial_states { - {"DeviceId1", {display_device::HdrState::Enabled}}, - {"DeviceId2", {display_device::HdrState::Disabled}}, + {"DeviceId1", {Enabled}}, + {"DeviceId2", {Disabled}}, {"DeviceId3", std::nullopt} }; const display_device::HdrStateMap inverse_states { - {"DeviceId1", {display_device::HdrState::Disabled}} + {"DeviceId1", {Disabled}} }; const display_device::HdrStateMap original_states { - {"DeviceId1", {display_device::HdrState::Enabled}} + {"DeviceId1", {Enabled}} }; Sequence sequence; @@ -347,16 +351,18 @@ TEST_F_S_MOCKED(BlankHdrStates, NullDelay) { } TEST_F_S_MOCKED(BlankHdrStates, Success) { + using enum display_device::HdrState; + const display_device::HdrStateMap initial_states { - {"DeviceId1", {display_device::HdrState::Enabled}}, - {"DeviceId2", {display_device::HdrState::Disabled}}, + {"DeviceId1", {Enabled}}, + {"DeviceId2", {Disabled}}, {"DeviceId3", std::nullopt} }; const display_device::HdrStateMap inverse_states { - {"DeviceId1", {display_device::HdrState::Disabled}} + {"DeviceId1", {Disabled}} }; const display_device::HdrStateMap original_states { - {"DeviceId1", {display_device::HdrState::Enabled}} + {"DeviceId1", {Enabled}} }; Sequence sequence;