From ce5234162fa0c534ff9abf3fce3d03f4b01e893e Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 22 Apr 2016 09:43:44 -0500
Subject: 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

---
 tests/unit/greeter-test.cpp | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/greeter-test.cpp b/tests/unit/greeter-test.cpp
index 72df3bc..bfa88e8 100644
--- a/tests/unit/greeter-test.cpp
+++ b/tests/unit/greeter-test.cpp
@@ -18,6 +18,7 @@
  */
 
 #include <tests/utils/qt-fixture.h>
+#include <tests/utils/gtest-print-helpers.h>
 
 #include <src/dbus-names.h>
 #include <src/greeter.h>
@@ -110,45 +111,49 @@ protected:
 
 TEST_F(GreeterFixture, ActiveServiceStartsBeforeWatcher)
 {
-    constexpr bool expected {true};
+    constexpr bool is_active {true};
+    constexpr Greeter::State expected {Greeter::State::ACTIVE};
 
-    start_greeter_service(expected);
+    start_greeter_service(is_active);
 
     UnityGreeter greeter;
 
-    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active());
+    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state());
 }
 
 TEST_F(GreeterFixture, WatcherStartsBeforeActiveService)
 {
-    constexpr bool expected {true};
+    constexpr bool is_active {true};
+    constexpr Greeter::State expected {Greeter::State::ACTIVE};
 
     UnityGreeter greeter;
 
-    start_greeter_service(expected);
+    start_greeter_service(is_active);
 
-    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active());
+    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state());
 }
 
 TEST_F(GreeterFixture, InactiveServiceStartsBeforeWatcher)
 {
-    constexpr bool expected {false};
+    constexpr bool is_active {false};
+    constexpr Greeter::State expected {Greeter::State::INACTIVE};
 
-    start_greeter_service(expected);
+    start_greeter_service(is_active);
 
     UnityGreeter greeter;
 
-    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active());
+    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state());
 }
 
 TEST_F(GreeterFixture, WatcherStartsBeforeInactiveService)
 {
-    constexpr bool expected {false};
+    constexpr bool is_active {false};
+    constexpr Greeter::State expected {Greeter::State::INACTIVE};
 
     UnityGreeter greeter;
 
-    start_greeter_service(expected);
+    start_greeter_service(is_active);
 
-    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active());
+    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state());
 }
 
-- 
cgit v1.2.3