Skip to content

refactor(sonar): fix cpp:S6177 #263

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

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

refactor(sonar): fix cpp:S6177 #263

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/common/logging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
7 changes: 4 additions & 3 deletions src/windows/settings_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
12 changes: 7 additions & 5 deletions tests/fixtures/fixtures.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,23 @@ std::string BaseTest::skipTest() const {
std::optional<display_device::Logger::LogLevel> BaseTest::getDefaultLogLevel() const {
const static auto default_log_level {
[]() -> std::optional<display_device::Logger::LogLevel> {
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;
Expand Down
10 changes: 6 additions & 4 deletions tests/unit/general/test_json_converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}})");
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/general/test_logging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down
28 changes: 17 additions & 11 deletions tests/unit/windows/test_settings_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
Loading