From 8c4df6215a986695edc6c6530f6d6388ea9640d5 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 13 Feb 2023 22:02:46 +0100 Subject: UnitySession -> LomiriSession: Re-rename related changes that we erroneously hid away as Ayatana DesktopSession. This brings full Lomiri integration finally. Until now, the session indicator somehow seemed to work, but in some odd ways. On the phone, the session indicator would fallback to direct systemd interaction while on Lomiri in Debian, it would fallback to Zenity dialogs (most of all because Zenity got installed by some other package as a dependency). With this massive renaming change, ayatana-indicator-session should now smoothly interact with the com.lomiri.Shell.Session DBus interface and also with the mimicked GNOME SessionManager End-Session-Dialog interface. As a downside, this change nearly fully removes Unity7 support which would need to be brought back +/- as a full duplicate of what we do for Lomiri. But as noone has dared integrating Ayatana Indicator Session with Unity7, so far, we should be able to live with that for now. Fixes https://github.com/AyatanaIndicators/ayatana-indicator-session/issues/82 --- tests/backend-dbus/CMakeLists.txt | 4 +- tests/backend-dbus/gtest-mock-dbus-fixture.h | 2 +- tests/backend-dbus/mock-end-session-dialog.cc | 2 +- tests/backend-dbus/mock-lomiri-session.cc | 83 +++++++++++++++++++++++++++ tests/backend-dbus/mock-lomiri-session.h | 57 ++++++++++++++++++ tests/backend-dbus/mock-unity-session.cc | 83 --------------------------- tests/backend-dbus/mock-unity-session.h | 57 ------------------ tests/backend-dbus/test-actions.cc | 36 ++++++------ 8 files changed, 162 insertions(+), 162 deletions(-) create mode 100644 tests/backend-dbus/mock-lomiri-session.cc create mode 100644 tests/backend-dbus/mock-lomiri-session.h delete mode 100644 tests/backend-dbus/mock-unity-session.cc delete mode 100644 tests/backend-dbus/mock-unity-session.h (limited to 'tests') diff --git a/tests/backend-dbus/CMakeLists.txt b/tests/backend-dbus/CMakeLists.txt index 92d5a02..393fc13 100644 --- a/tests/backend-dbus/CMakeLists.txt +++ b/tests/backend-dbus/CMakeLists.txt @@ -14,8 +14,8 @@ add_library (desktopmock STATIC mock-object.h mock-screen-saver.cc mock-screen-saver.h - mock-unity-session.cc - mock-unity-session.h + mock-lomiri-session.cc + mock-lomiri-session.h mock-session-manager.cc mock-session-manager.h mock-user.cc diff --git a/tests/backend-dbus/gtest-mock-dbus-fixture.h b/tests/backend-dbus/gtest-mock-dbus-fixture.h index 16b4648..df5bc82 100644 --- a/tests/backend-dbus/gtest-mock-dbus-fixture.h +++ b/tests/backend-dbus/gtest-mock-dbus-fixture.h @@ -25,7 +25,7 @@ #include "mock-display-manager-seat.h" #include "mock-end-session-dialog.h" #include "mock-screen-saver.h" -#include "mock-unity-session.h" +#include "mock-lomiri-session.h" #include "mock-session-manager.h" #include "mock-user.h" #include "mock-webcredentials.h" diff --git a/tests/backend-dbus/mock-end-session-dialog.cc b/tests/backend-dbus/mock-end-session-dialog.cc index 5e8797f..3134dd5 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 = "org.ayatana.Desktop"; + const char * const MY_NAME = "com.lomiri.Shell"; const char * const MY_PATH = "/org/gnome/SessionManager/EndSessionDialog"; } diff --git a/tests/backend-dbus/mock-lomiri-session.cc b/tests/backend-dbus/mock-lomiri-session.cc new file mode 100644 index 0000000..dd3fec5 --- /dev/null +++ b/tests/backend-dbus/mock-lomiri-session.cc @@ -0,0 +1,83 @@ +/* + * Copyright 2014 Canonical Ltd. + * + * Authors: + * Marco Trevisan + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include "mock-lomiri-session.h" + + +gboolean +MockLomiriSession :: handle_lock (LomiriShellSession * us, + GDBusMethodInvocation * inv, + gpointer gself) +{ + static_cast(gself)->my_last_action = Lock; + lomiri_shell_session_complete_lock (us, inv); + return true; +} + +gboolean +MockLomiriSession :: handle_prompt_lock (LomiriShellSession * us, + GDBusMethodInvocation * inv, + gpointer gself) +{ + static_cast(gself)->my_last_action = PromptLock; + lomiri_shell_session_complete_prompt_lock (us, inv); + return true; +} + +gboolean +MockLomiriSession :: handle_request_logout (LomiriShellSession * us, + GDBusMethodInvocation * inv, + gpointer gself) +{ + static_cast(gself)->my_last_action = RequestLogout; + lomiri_shell_session_complete_request_logout (us, inv); + return true; +} + +/*** +**** +***/ + +namespace +{ + const char * const LOMIRI_SESSION_NAME = "com.lomiri.Shell"; + const char * const LOMIRI_SESSION_PATH = "/com/lomiri/Shell/Session"; + +} + +MockLomiriSession :: MockLomiriSession (GMainLoop * loop, + GDBusConnection * bus_connection): + MockObject (loop, bus_connection, LOMIRI_SESSION_NAME, LOMIRI_SESSION_PATH), + my_skeleton (lomiri_shell_session_skeleton_new ()), + my_last_action (None) +{ + g_signal_connect (my_skeleton, "handle-lock", + G_CALLBACK(handle_lock), this); + g_signal_connect (my_skeleton, "handle-prompt-lock", + G_CALLBACK(handle_prompt_lock), this); + g_signal_connect (my_skeleton, "handle-request-logout", + G_CALLBACK(handle_request_logout), this); + + set_skeleton (G_DBUS_INTERFACE_SKELETON(my_skeleton)); +} + +MockLomiriSession :: ~MockLomiriSession () +{ + g_clear_object (&my_skeleton); +} diff --git a/tests/backend-dbus/mock-lomiri-session.h b/tests/backend-dbus/mock-lomiri-session.h new file mode 100644 index 0000000..1f42f49 --- /dev/null +++ b/tests/backend-dbus/mock-lomiri-session.h @@ -0,0 +1,57 @@ +/* + * Copyright 2014 Canonical Ltd. + * + * Authors: + * Marco Trevisan + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef MOCK_LOMIRI_SESSION_H +#define MOCK_LOMIRI_SESSION_H + +#include "mock-object.h" // parent class +#include "backend-dbus/lomiri-session.h" // Lomiri Session + +class MockLomiriSession: public MockObject +{ + public: + + MockLomiriSession (GMainLoop * loop, + GDBusConnection * bus_connection); + virtual ~MockLomiriSession (); + + public: + + enum Action { None, Lock, PromptLock, RequestLogout, RequestShutdown, RequestReboot }; + Action last_action () { return my_last_action; } + void clear_last_action () { my_last_action = None; } + + private: + + LomiriShellSession * my_skeleton; + Action my_last_action; + + static gboolean handle_lock (LomiriShellSession *, + GDBusMethodInvocation *, + gpointer); + static gboolean handle_prompt_lock (LomiriShellSession *, + GDBusMethodInvocation *, + gpointer); + static gboolean handle_request_logout (LomiriShellSession *, + GDBusMethodInvocation *, + gpointer); + +}; + +#endif diff --git a/tests/backend-dbus/mock-unity-session.cc b/tests/backend-dbus/mock-unity-session.cc deleted file mode 100644 index 8bc06a3..0000000 --- a/tests/backend-dbus/mock-unity-session.cc +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright 2014 Canonical Ltd. - * - * Authors: - * Marco Trevisan - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include "mock-unity-session.h" - - -gboolean -MockUnitySession :: handle_lock (DesktopSession * us, - GDBusMethodInvocation * inv, - gpointer gself) -{ - static_cast(gself)->my_last_action = Lock; - desktop_session_complete_lock (us, inv); - return true; -} - -gboolean -MockUnitySession :: handle_prompt_lock (DesktopSession * us, - GDBusMethodInvocation * inv, - gpointer gself) -{ - static_cast(gself)->my_last_action = PromptLock; - desktop_session_complete_prompt_lock (us, inv); - return true; -} - -gboolean -MockUnitySession :: handle_request_logout (DesktopSession * us, - GDBusMethodInvocation * inv, - gpointer gself) -{ - static_cast(gself)->my_last_action = RequestLogout; - desktop_session_complete_request_logout (us, inv); - return true; -} - -/*** -**** -***/ - -namespace -{ - 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 (desktop_session_skeleton_new ()), - my_last_action (None) -{ - g_signal_connect (my_skeleton, "handle-lock", - G_CALLBACK(handle_lock), this); - g_signal_connect (my_skeleton, "handle-prompt-lock", - G_CALLBACK(handle_prompt_lock), this); - g_signal_connect (my_skeleton, "handle-request-logout", - G_CALLBACK(handle_request_logout), this); - - set_skeleton (G_DBUS_INTERFACE_SKELETON(my_skeleton)); -} - -MockUnitySession :: ~MockUnitySession () -{ - g_clear_object (&my_skeleton); -} diff --git a/tests/backend-dbus/mock-unity-session.h b/tests/backend-dbus/mock-unity-session.h deleted file mode 100644 index 890f2ac..0000000 --- a/tests/backend-dbus/mock-unity-session.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2014 Canonical Ltd. - * - * Authors: - * Marco Trevisan - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#ifndef MOCK_UNITY_SESSION_H -#define MOCK_UNITY_SESSION_H - -#include "mock-object.h" // parent class -#include "backend-dbus/desktop-session.h" // Desktop Session - -class MockUnitySession: public MockObject -{ - public: - - MockUnitySession (GMainLoop * loop, - GDBusConnection * bus_connection); - virtual ~MockUnitySession (); - - public: - - enum Action { None, Lock, PromptLock, RequestLogout, RequestShutdown, RequestReboot }; - Action last_action () { return my_last_action; } - void clear_last_action () { my_last_action = None; } - - private: - - DesktopSession * my_skeleton; - Action my_last_action; - - static gboolean handle_lock (DesktopSession *, - GDBusMethodInvocation *, - gpointer); - static gboolean handle_prompt_lock (DesktopSession *, - GDBusMethodInvocation *, - gpointer); - static gboolean handle_request_logout (DesktopSession *, - GDBusMethodInvocation *, - gpointer); - -}; - -#endif diff --git a/tests/backend-dbus/test-actions.cc b/tests/backend-dbus/test-actions.cc index 709273a..bced3e9 100644 --- a/tests/backend-dbus/test-actions.cc +++ b/tests/backend-dbus/test-actions.cc @@ -263,10 +263,10 @@ TEST_F (Actions, PowerOff) g_settings_reset (indicator_settings, SUPPRESS_KEY); } -TEST_F (Actions, LogoutUnity) +TEST_F (Actions, LogoutLomiri) { - MockUnitySession desktop_session(loop, conn); - ASSERT_EQ (MockUnitySession::None, desktop_session.last_action()); + MockLomiriSession lomiri_session(loop, conn); + ASSERT_EQ (MockLomiriSession::None, lomiri_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, desktop_session.last_action()); + ASSERT_EQ (MockLomiriSession::None, lomiri_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, desktop_session.last_action()); + ASSERT_EQ (MockLomiriSession::RequestLogout, lomiri_session.last_action()); // confirm that we try to call SessionManager::LogoutQuet // when prompts are disabled login1_manager->clear_last_action (); - desktop_session.clear_last_action (); + lomiri_session.clear_last_action (); ASSERT_EQ ("", login1_manager->last_action()); - ASSERT_EQ (MockUnitySession::None, desktop_session.last_action ()); + ASSERT_EQ (MockLomiriSession::None, lomiri_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, desktop_session.last_action ()); + ASSERT_EQ (MockLomiriSession::RequestLogout, lomiri_session.last_action ()); g_settings_reset (indicator_settings, SUPPRESS_KEY); } @@ -356,29 +356,29 @@ TEST_F (Actions, Hibernate) TEST_F (Actions, SwitchToScreensaver) { - MockUnitySession desktop_session(loop, conn); + MockLomiriSession lomiri_session(loop, conn); - ASSERT_EQ (MockUnitySession::None, desktop_session.last_action()); + ASSERT_EQ (MockLomiriSession::None, lomiri_session.last_action()); indicator_session_actions_switch_to_screensaver (actions); wait_msec (50); - ASSERT_EQ (MockUnitySession::Lock, desktop_session.last_action()); + ASSERT_EQ (MockLomiriSession::Lock, lomiri_session.last_action()); } TEST_F (Actions, SwitchToGreeter) { - MockUnitySession desktop_session(loop, conn); + MockLomiriSession lomiri_session(loop, conn); ASSERT_NE (MockDisplayManagerSeat::GREETER, dm_seat->last_action()); - ASSERT_EQ (MockUnitySession::None, desktop_session.last_action()); + ASSERT_EQ (MockLomiriSession::None, lomiri_session.last_action()); indicator_session_actions_switch_to_greeter (actions); wait_msec (50); - ASSERT_EQ (MockUnitySession::PromptLock, desktop_session.last_action()); + ASSERT_EQ (MockLomiriSession::PromptLock, lomiri_session.last_action()); ASSERT_EQ (MockDisplayManagerSeat::GREETER, dm_seat->last_action()); } TEST_F (Actions, SwitchToGuest) { - MockUnitySession desktop_session(loop, conn); + MockLomiriSession lomiri_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, desktop_session.last_action()); + ASSERT_EQ (MockLomiriSession::PromptLock, lomiri_session.last_action()); } TEST_F (Actions, SwitchToUsername) { - MockUnitySession desktop_session(loop, conn); + MockLomiriSession lomiri_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, desktop_session.last_action()); + ASSERT_EQ (MockLomiriSession::PromptLock, lomiri_session.last_action()); indicator_session_actions_switch_to_username (actions, dr2_username); wait_for_signal (login1_seat->skeleton(), "notify::active-session"); -- cgit v1.2.3