diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2016-04-22 09:43:44 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2016-04-22 09:43:44 -0500 |
commit | ce5234162fa0c534ff9abf3fce3d03f4b01e893e (patch) | |
tree | fa1de28390d3fad05b9a9405190f82cde3fa70e5 /tests/utils | |
parent | b37db33c628675971f118fb3e241dc32a9f0a5d0 (diff) | |
download | ayatana-indicator-display-ce5234162fa0c534ff9abf3fce3d03f4b01e893e.tar.gz ayatana-indicator-display-ce5234162fa0c534ff9abf3fce3d03f4b01e893e.tar.bz2 ayatana-indicator-display-ce5234162fa0c534ff9abf3fce3d03f4b01e893e.zip |
don't prompt when the greeter's not running yet: change greeter's payload from an 'is_active' bool to a three-value state of active, inactive, and unavailable
Diffstat (limited to 'tests/utils')
-rw-r--r-- | tests/utils/gtest-print-helpers.h | 18 | ||||
-rw-r--r-- | tests/utils/mock-greeter.h | 4 |
2 files changed, 20 insertions, 2 deletions
diff --git a/tests/utils/gtest-print-helpers.h b/tests/utils/gtest-print-helpers.h new file mode 100644 index 0000000..75ee13b --- /dev/null +++ b/tests/utils/gtest-print-helpers.h @@ -0,0 +1,18 @@ + +#pragma once + +#include <src/greeter.h> + +inline void PrintTo(const Greeter::State& state, std::ostream* os) { + switch(state) { + case Greeter::State::ACTIVE: *os << "Active"; break; + case Greeter::State::INACTIVE: *os << "Inactive"; break; + default: *os << "Unavailable"; break; + } +} + +std::ostream& operator<<(std::ostream& os, const Greeter::State& state) { + PrintTo(state, &os); + return os; +} + diff --git a/tests/utils/mock-greeter.h b/tests/utils/mock-greeter.h index 5ac85a0..5015087 100644 --- a/tests/utils/mock-greeter.h +++ b/tests/utils/mock-greeter.h @@ -26,7 +26,7 @@ class MockGreeter: public Greeter public: MockGreeter() =default; virtual ~MockGreeter() =default; - core::Property<bool>& is_active() override {return m_is_active;} - core::Property<bool> m_is_active {false}; + core::Property<Greeter::State>& state() override {return m_state;} + core::Property<Greeter::State> m_state {State::INACTIVE}; }; |