Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/common/include/display_device/logging.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace display_device {
* Logger::get().write(Logger::LogLevel::Info, "Hello World!");
* @examples_end
*/
void write(LogLevel log_level, std::string value);
void write(LogLevel log_level, std::string value) const;

/**
* @brief A deleted copy constructor for singleton pattern.
Expand Down
2 changes: 1 addition & 1 deletion src/common/logging.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace display_device {
m_custom_callback = std::move(callback);
}

void Logger::write(const LogLevel log_level, std::string value) {
void Logger::write(const LogLevel log_level, std::string value) const {
if (!isLogLevelEnabled(log_level)) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/include/fixtures/json_converter_test.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class JsonConverterTest: public BaseTest {
public:
template<class T>
void executeTestCase(const T &input, const std::string &expected_string) {
void executeTestCase(const T &input, const std::string &expected_string) const {
bool success {false};
const auto json_string {display_device::toJson(input, std::nullopt, &success)};
EXPECT_TRUE(success);
Expand Down
4 changes: 3 additions & 1 deletion tests/unit/general/test_retry_scheduler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ namespace {
struct TestIface {
std::vector<int> m_durations;

void nonConstMethod() { /* noop */ }
void nonConstMethod() {
m_durations.clear();
}

void constMethod() const { /* noop */ }
};
Expand Down
16 changes: 8 additions & 8 deletions tests/unit/windows/test_settings_manager_apply.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace {
return *m_impl;
}

void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) {
void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) const {
EXPECT_CALL(*m_settings_persistence_api, load())
.Times(1)
.WillOnce(Return(serializeState(state)))
Expand All @@ -73,7 +73,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) {
void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) const {
EXPECT_CALL(*m_audio_context_api, isCaptured())
.Times(1)
.WillOnce(Return(is_captured))
Expand All @@ -100,14 +100,14 @@ namespace {
.RetiresOnSaturation();
}

void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) {
void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) const {
EXPECT_CALL(*m_dd_api, enumAvailableDevices())
.Times(1)
.WillOnce(Return(devices))
.RetiresOnSaturation();
}

void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) {
void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) const {
EXPECT_CALL(*m_dd_api, isTopologyTheSame(lhs, rhs))
.Times(1)
.WillOnce(Return(lhs == rhs))
Expand Down Expand Up @@ -141,7 +141,7 @@ namespace {
}
}

void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) {
void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) const {
EXPECT_CALL(*m_dd_api, isPrimary(device_id))
.Times(1)
.WillOnce(Return(success))
Expand Down Expand Up @@ -169,7 +169,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) {
void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) const {
EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(devices))
.Times(1)
.WillOnce(Return(modes))
Expand All @@ -190,7 +190,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) {
void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) const {
EXPECT_CALL(*m_dd_api, getCurrentHdrStates(devices))
.Times(1)
.WillOnce(Return(states))
Expand All @@ -204,7 +204,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
// Using the "failure" path, to keep it simple
EXPECT_CALL(*m_dd_api, getCurrentTopology())
.Times(1)
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/windows/test_settings_manager_revert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ namespace {
return *m_impl;
}

void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) {
void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) const {
EXPECT_CALL(*m_settings_persistence_api, load())
.Times(1)
.WillOnce(Return(serializeState(state)))
.RetiresOnSaturation();
expectedDefaultCallsUntilModifiedSettingsNoPersistence(sequence);
}

void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) {
void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) const {
EXPECT_CALL(*m_dd_api, isApiAccessAvailable())
.Times(1)
.WillOnce(Return(true))
Expand Down Expand Up @@ -89,7 +89,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
EXPECT_CALL(*m_dd_api, getCurrentHdrStates(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
.Times(1)
.WillOnce(Return(CURRENT_MODIFIED_HDR_STATES))
Expand All @@ -103,7 +103,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
.Times(1)
.WillOnce(Return(CURRENT_MODIFIED_DISPLAY_MODES))
Expand All @@ -117,7 +117,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
EXPECT_CALL(*m_dd_api, isPrimary("DeviceId1"))
.Times(1)
.WillOnce(Return(false))
Expand Down Expand Up @@ -231,7 +231,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
// Using the "failure" path, to keep it simple
EXPECT_CALL(*m_dd_api, getCurrentTopology())
.Times(1)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/windows/test_win_api_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace {
// Test fixture(s) for this file
class WinApiUtilsMocked: public BaseTest {
public:
void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) {
void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) const {
for (int i = 1; i <= number_of_calls; ++i) {
EXPECT_CALL(m_layer, getMonitorDevicePath(_))
.Times(1)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/windows/test_win_display_device_hdr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace {

class WinDisplayDeviceHdrMocked: public BaseTest {
public:
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
for (int i = 1; i <= id_number; ++i) {
EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
.Times(1)
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/windows/test_win_display_device_modes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace {

class WinDisplayDeviceModesMocked: public BaseTest {
public:
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
for (int i = 1; i <= id_number; ++i) {
EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
.Times(1)
Expand All @@ -49,7 +49,7 @@ namespace {
}
}

void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) {
void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) const {
EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
.Times(1)
.WillOnce(Return(pam))
Expand All @@ -60,7 +60,7 @@ namespace {
}
}

void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) {
void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) const {
EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
.Times(1)
.WillOnce(Return(ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES))
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/windows/test_win_display_device_primary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace {

class WinDisplayDevicePrimaryMocked: public BaseTest {
public:
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
for (int i = 1; i <= id_number; ++i) {
EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
.Times(1)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/windows/test_win_display_device_topology.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace {

class WinDisplayDeviceTopologyMocked: public BaseTest {
public:
void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) {
void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) const {
EXPECT_CALL(*m_layer, queryDisplayConfig(query_type))
.Times(1)
.WillOnce(Return(ut_consts::PAM_3_ACTIVE))
Expand Down
Loading