aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/backend-dbus/mock-end-session-dialog.cc2
-rw-r--r--tests/backend-dbus/mock-unity-session.cc18
-rw-r--r--tests/backend-dbus/mock-unity-session.h10
-rw-r--r--tests/backend-dbus/test-actions.cc34
4 files changed, 32 insertions, 32 deletions
diff --git a/tests/backend-dbus/mock-end-session-dialog.cc b/tests/backend-dbus/mock-end-session-dialog.cc
index 2772423..5e8797f 100644
--- a/tests/backend-dbus/mock-end-session-dialog.cc
+++ b/tests/backend-dbus/mock-end-session-dialog.cc
@@ -39,7 +39,7 @@ MockEndSessionDialog :: handle_open (EndSessionDialog * object,
namespace
{
- const char * const MY_NAME = "com.canonical.Unity";
+ const char * const MY_NAME = "org.ayatana.Desktop";
const char * const MY_PATH = "/org/gnome/SessionManager/EndSessionDialog";
}
diff --git a/tests/backend-dbus/mock-unity-session.cc b/tests/backend-dbus/mock-unity-session.cc
index d32e339..8bc06a3 100644
--- a/tests/backend-dbus/mock-unity-session.cc
+++ b/tests/backend-dbus/mock-unity-session.cc
@@ -21,32 +21,32 @@
gboolean
-MockUnitySession :: handle_lock (UnitySession * us,
+MockUnitySession :: handle_lock (DesktopSession * us,
GDBusMethodInvocation * inv,
gpointer gself)
{
static_cast<MockUnitySession*>(gself)->my_last_action = Lock;
- unity_session_complete_lock (us, inv);
+ desktop_session_complete_lock (us, inv);
return true;
}
gboolean
-MockUnitySession :: handle_prompt_lock (UnitySession * us,
+MockUnitySession :: handle_prompt_lock (DesktopSession * us,
GDBusMethodInvocation * inv,
gpointer gself)
{
static_cast<MockUnitySession*>(gself)->my_last_action = PromptLock;
- unity_session_complete_prompt_lock (us, inv);
+ desktop_session_complete_prompt_lock (us, inv);
return true;
}
gboolean
-MockUnitySession :: handle_request_logout (UnitySession * us,
+MockUnitySession :: handle_request_logout (DesktopSession * us,
GDBusMethodInvocation * inv,
gpointer gself)
{
static_cast<MockUnitySession*>(gself)->my_last_action = RequestLogout;
- unity_session_complete_request_logout (us, inv);
+ desktop_session_complete_request_logout (us, inv);
return true;
}
@@ -56,15 +56,15 @@ MockUnitySession :: handle_request_logout (UnitySession * us,
namespace
{
- const char * const UNITY_SESSION_NAME = "com.canonical.Unity";
- const char * const UNITY_SESSION_PATH = "/com/canonical/Unity/Session";
+ const char * const UNITY_SESSION_NAME = "org.ayatana.Desktop";
+ const char * const UNITY_SESSION_PATH = "/org/ayatana/Desktop/Session";
}
MockUnitySession :: MockUnitySession (GMainLoop * loop,
GDBusConnection * bus_connection):
MockObject (loop, bus_connection, UNITY_SESSION_NAME, UNITY_SESSION_PATH),
- my_skeleton (unity_session_skeleton_new ()),
+ my_skeleton (desktop_session_skeleton_new ()),
my_last_action (None)
{
g_signal_connect (my_skeleton, "handle-lock",
diff --git a/tests/backend-dbus/mock-unity-session.h b/tests/backend-dbus/mock-unity-session.h
index 9ca5fe9..890f2ac 100644
--- a/tests/backend-dbus/mock-unity-session.h
+++ b/tests/backend-dbus/mock-unity-session.h
@@ -21,7 +21,7 @@
#define MOCK_UNITY_SESSION_H
#include "mock-object.h" // parent class
-#include "backend-dbus/unity-session.h" // Unity Session
+#include "backend-dbus/desktop-session.h" // Desktop Session
class MockUnitySession: public MockObject
{
@@ -39,16 +39,16 @@ class MockUnitySession: public MockObject
private:
- UnitySession * my_skeleton;
+ DesktopSession * my_skeleton;
Action my_last_action;
- static gboolean handle_lock (UnitySession *,
+ static gboolean handle_lock (DesktopSession *,
GDBusMethodInvocation *,
gpointer);
- static gboolean handle_prompt_lock (UnitySession *,
+ static gboolean handle_prompt_lock (DesktopSession *,
GDBusMethodInvocation *,
gpointer);
- static gboolean handle_request_logout (UnitySession *,
+ static gboolean handle_request_logout (DesktopSession *,
GDBusMethodInvocation *,
gpointer);
diff --git a/tests/backend-dbus/test-actions.cc b/tests/backend-dbus/test-actions.cc
index 76a0ab4..709273a 100644
--- a/tests/backend-dbus/test-actions.cc
+++ b/tests/backend-dbus/test-actions.cc
@@ -265,8 +265,8 @@ TEST_F (Actions, PowerOff)
TEST_F (Actions, LogoutUnity)
{
- MockUnitySession unity_session(loop, conn);
- ASSERT_EQ (MockUnitySession::None, unity_session.last_action());
+ MockUnitySession desktop_session(loop, conn);
+ ASSERT_EQ (MockUnitySession::None, desktop_session.last_action());
wait_msec();
// confirm that user is prompted
@@ -276,7 +276,7 @@ TEST_F (Actions, LogoutUnity)
ASSERT_TRUE (end_session_dialog->is_open());
end_session_dialog->cancel();
wait_msec (50);
- ASSERT_EQ (MockUnitySession::None, unity_session.last_action());
+ ASSERT_EQ (MockUnitySession::None, desktop_session.last_action());
// confirm that user is prompted
// and that logout is called when user confirms the logout dialog
@@ -285,19 +285,19 @@ TEST_F (Actions, LogoutUnity)
ASSERT_TRUE (end_session_dialog->is_open ());
end_session_dialog->confirm_logout ();
wait_msec (100);
- ASSERT_EQ (MockUnitySession::RequestLogout, unity_session.last_action());
+ ASSERT_EQ (MockUnitySession::RequestLogout, desktop_session.last_action());
// confirm that we try to call SessionManager::LogoutQuet
// when prompts are disabled
login1_manager->clear_last_action ();
- unity_session.clear_last_action ();
+ desktop_session.clear_last_action ();
ASSERT_EQ ("", login1_manager->last_action());
- ASSERT_EQ (MockUnitySession::None, unity_session.last_action ());
+ ASSERT_EQ (MockUnitySession::None, desktop_session.last_action ());
g_settings_set_boolean (indicator_settings, SUPPRESS_KEY, TRUE);
wait_msec (50);
indicator_session_actions_logout (actions);
wait_msec (50);
- ASSERT_EQ (MockUnitySession::RequestLogout, unity_session.last_action ());
+ ASSERT_EQ (MockUnitySession::RequestLogout, desktop_session.last_action ());
g_settings_reset (indicator_settings, SUPPRESS_KEY);
}
@@ -356,29 +356,29 @@ TEST_F (Actions, Hibernate)
TEST_F (Actions, SwitchToScreensaver)
{
- MockUnitySession unity_session(loop, conn);
+ MockUnitySession desktop_session(loop, conn);
- ASSERT_EQ (MockUnitySession::None, unity_session.last_action());
+ ASSERT_EQ (MockUnitySession::None, desktop_session.last_action());
indicator_session_actions_switch_to_screensaver (actions);
wait_msec (50);
- ASSERT_EQ (MockUnitySession::Lock, unity_session.last_action());
+ ASSERT_EQ (MockUnitySession::Lock, desktop_session.last_action());
}
TEST_F (Actions, SwitchToGreeter)
{
- MockUnitySession unity_session(loop, conn);
+ MockUnitySession desktop_session(loop, conn);
ASSERT_NE (MockDisplayManagerSeat::GREETER, dm_seat->last_action());
- ASSERT_EQ (MockUnitySession::None, unity_session.last_action());
+ ASSERT_EQ (MockUnitySession::None, desktop_session.last_action());
indicator_session_actions_switch_to_greeter (actions);
wait_msec (50);
- ASSERT_EQ (MockUnitySession::PromptLock, unity_session.last_action());
+ ASSERT_EQ (MockUnitySession::PromptLock, desktop_session.last_action());
ASSERT_EQ (MockDisplayManagerSeat::GREETER, dm_seat->last_action());
}
TEST_F (Actions, SwitchToGuest)
{
- MockUnitySession unity_session(loop, conn);
+ MockUnitySession desktop_session(loop, conn);
// allow guests
dm_seat->set_guest_allowed (true);
@@ -394,12 +394,12 @@ TEST_F (Actions, SwitchToGuest)
wait_for_signal (login1_seat->skeleton(), "notify::active-session");
ASSERT_EQ (guest_session_tag, login1_seat->active_session());
wait_msec (50);
- ASSERT_EQ (MockUnitySession::PromptLock, unity_session.last_action());
+ ASSERT_EQ (MockUnitySession::PromptLock, desktop_session.last_action());
}
TEST_F (Actions, SwitchToUsername)
{
- MockUnitySession unity_session(loop, conn);
+ MockUnitySession desktop_session(loop, conn);
const char * const dr1_username = "whartnell";
const char * const dr2_username = "ptroughton";
MockUser * dr1_user;
@@ -417,7 +417,7 @@ TEST_F (Actions, SwitchToUsername)
wait_for_signal (login1_seat->skeleton(), "notify::active-session");
ASSERT_EQ (dr1_session, login1_seat->active_session());
wait_msec (50);
- ASSERT_EQ (MockUnitySession::PromptLock, unity_session.last_action());
+ ASSERT_EQ (MockUnitySession::PromptLock, desktop_session.last_action());
indicator_session_actions_switch_to_username (actions, dr2_username);
wait_for_signal (login1_seat->skeleton(), "notify::active-session");
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 01:30:35 +0000