Merge lp:~azzar1/unity/gnome_session_manager_more_tests into lp:unity

[Andrea Azzarone]

Add/Update tests for gnome session manager.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3789
http://jenkins.qa.ubuntu.com/job/unity-ci/892/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/426

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/892/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[Andrea Azzarone (azzar1)]

Merged with trunk.

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2015-05-19 18:33:41 +0000
+++ UnityCore/GnomeSessionManager.cpp	2015-09-08 01:55:47 +0000
@@ -121,7 +121,7 @@
   }
 
   {
-    presence_proxy_ = std::make_shared<glib::DBusProxy>("org.gnome.SessionManager",
+    presence_proxy_ = std::make_shared<glib::DBusProxy>(test_mode_ ? testing::DBUS_NAME : "org.gnome.SessionManager",
                                                         "/org/gnome/SessionManager/Presence",
                                                         "org.gnome.SessionManager.Presence");
 
@@ -547,12 +547,12 @@
 
 void GnomeManager::LockScreen()
 {
-  impl_->LockScreen(false);
+  impl_->LockScreen(/* prompt */ false);
 }
 
 void GnomeManager::PromptLockScreen()
 {
-  impl_->LockScreen(true);
+  impl_->LockScreen(/* prompt */ true);
 }
 
 void GnomeManager::Logout()

=== modified file 'tests/test_gnome_session_manager.cpp'
--- tests/test_gnome_session_manager.cpp	2015-03-13 13:49:16 +0000
+++ tests/test_gnome_session_manager.cpp	2015-09-08 01:55:47 +0000
@@ -41,6 +41,7 @@
 const std::string LOGIND_SESSION_PATH = "/org/freedesktop/login1/session/id0";
 const std::string CONSOLE_KIT_PATH = "/org/freedesktop/ConsoleKit/Manager";
 const std::string SESSION_MANAGER_PATH = "/org/gnome/SessionManager";
+const std::string SESSION_MANAGER_PRESENCE_PATH = "/org/gnome/SessionManager/Presence";
 
 const std::string SESSION_OPTIONS = "com.canonical.indicator.session";
 const std::string SUPPRESS_DIALOGS_KEY = "suppress-logout-restart-shutdown";
@@ -125,6 +126,17 @@
   </interface>
 </node>
 )";
+
+const std::string SESSION_MANAGER_PRESENCE =
+R"(<node>
+  <interface name="org.gnome.SessionManager.Presence">
+    <signal name="StatusChanged">
+      <arg name="new_status" type="u" />
+    </signal>
+  </interface>
+</node>
+)";
+
 }
 
 struct MockGnomeSessionManager : session::GnomeManager {
@@ -185,6 +197,7 @@
 
     session_manager_ = std::make_shared<DBusServer>();
     session_manager_->AddObjects(introspection::SESSION_MANAGER, SESSION_MANAGER_PATH);
+    session_manager_->AddObjects(introspection::SESSION_MANAGER_PRESENCE, SESSION_MANAGER_PRESENCE_PATH);
     session_manager_->GetObjects().front()->SetMethodsCallsHandler([&] (std::string const& method, GVariant*) -> GVariant* {
       if (method == "CanShutdown")
       {
@@ -372,6 +385,45 @@
   EXPECT_EQ(manager->UserName(), g_get_user_name());
 }
 
+TEST_F(TestGnomeSessionManager, HostName)
+{
+  EXPECT_EQ(manager->HostName(), g_get_host_name());
+}
+
+TEST_F(TestGnomeSessionManager, ScreenSaverActivate)
+{
+  bool signal_emitted = false;
+  bool signal_value = false;
+
+  manager->screensaver_requested.connect([&signal_emitted, &signal_value] (bool value) {
+    signal_emitted = true;
+    signal_value = value;
+  });
+
+  manager->ScreenSaverActivate();
+
+  Utils::WaitUntilMSec(signal_emitted);
+  ASSERT_TRUE(signal_emitted);
+  ASSERT_TRUE(signal_value);
+}
+
+
+TEST_F(TestGnomeSessionManager, ScreenSaverDeactivate)
+{
+  bool signal_emitted = false;
+  bool signal_value = true;
+
+  manager->screensaver_requested.connect([&signal_emitted, &signal_value] (bool value) {
+    signal_emitted = true;
+    signal_value = value;
+  });
+
+  manager->ScreenSaverDeactivate();
+
+  Utils::WaitUntilMSec(signal_emitted);
+  ASSERT_FALSE(signal_value);
+}
+
 TEST_F(TestGnomeSessionManager, LockScreen)
 {
   bool lock_emitted = false;
@@ -387,6 +439,20 @@
   EXPECT_TRUE(lock_emitted);
 }
 
+TEST_F(TestGnomeSessionManager, PromptLockScreen)
+{
+  bool signal_emitted = false;
+
+  manager->prompt_lock_requested.connect([&signal_emitted]() {
+    signal_emitted = true;
+  });
+
+  manager->PromptLockScreen();
+
+  Utils::WaitUntilMSec(signal_emitted);
+  EXPECT_TRUE(signal_emitted);
+}
+
 TEST_F(TestGnomeSessionManager, Logout)
 {
   bool logout_called = false;
@@ -994,19 +1060,19 @@
   EXPECT_TRUE(closed);
 }
 
-TEST_F(TestGnomeSessionManager, DISABLED_LogindLock)
+TEST_F(TestGnomeSessionManager, LogindLock)
 {
-  bool lock_emitted = false;
+  bool signal_emitted = false;
 
-  manager->lock_requested.connect([&lock_emitted]()
+  manager->prompt_lock_requested.connect([&signal_emitted]()
   {
-    lock_emitted = true;
+    signal_emitted = true;
   });
 
   logind_->GetObject("org.freedesktop.login1.Session")->EmitSignal("Lock");
 
-  Utils::WaitUntilMSec(lock_emitted);
-  EXPECT_TRUE(lock_emitted);
+  Utils::WaitUntilMSec(signal_emitted);
+  EXPECT_TRUE(signal_emitted);
 }
 
 TEST_F(TestGnomeSessionManager, LogindUnLock)
@@ -1027,18 +1093,51 @@
 TEST_F(TestGnomeSessionManager, NoLockWhenLockingDisabled)
 {
   bool lock_emitted = false;
+  bool screensaver_emitted = false;
+  bool screensaver_value = false;
 
-  manager->lock_requested.connect([&lock_emitted]()
-  {
+  manager->lock_requested.connect([&lock_emitted]() {
     lock_emitted = true;
   });
 
+  manager->screensaver_requested.connect([&screensaver_emitted, &screensaver_value] (bool value) {
+    screensaver_emitted = true;
+    screensaver_value = value;
+  });
+
   DisableScreenLocking(true);
+  manager->LockScreen();
 
-  manager->LockScreen();
+  Utils::WaitUntilMSec(screensaver_emitted);
+  EXPECT_TRUE(screensaver_value);
   EXPECT_FALSE(lock_emitted);
 
   DisableScreenLocking(false);
 }
 
+TEST_F(TestGnomeSessionManager, PresenceStatusChanged)
+{
+  bool signal_emitted = false;
+  bool idle = false;
+
+  manager->presence_status_changed.connect([&signal_emitted, &idle] (bool is_idle) {
+    signal_emitted = true;
+    idle = is_idle;
+  });
+
+  session_manager_->GetObject("org.gnome.SessionManager.Presence")->EmitSignal("StatusChanged", g_variant_new("(u)", 3));
+
+  Utils::WaitUntilMSec(signal_emitted);
+  ASSERT_TRUE(signal_emitted);
+  ASSERT_TRUE(idle);
+
+  signal_emitted = false;
+
+  session_manager_->GetObject("org.gnome.SessionManager.Presence")->EmitSignal("StatusChanged", g_variant_new("(u)", 0));
+
+  Utils::WaitUntilMSec(signal_emitted);
+  ASSERT_TRUE(signal_emitted);
+  ASSERT_FALSE(idle);
+}
+
 } // Namespace