diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-04-10 17:39:10 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-04-10 17:39:10 +0000 |
| commit | 36fe650a80739727b9fe10a59196d504c1b8aecd (patch) | |
| tree | ed4d9ca250824e0955342d291626f575f2369c64 /tests/backend-dbus/test-actions.cc | |
| parent | 74352b31c0addac59c36e767096d0ddddf9eee93 (diff) | |
| parent | e4b9f042a74b471f0b5992b99701231c3052e3ef (diff) | |
| download | ayatana-indicator-session-36fe650a80739727b9fe10a59196d504c1b8aecd.tar.gz ayatana-indicator-session-36fe650a80739727b9fe10a59196d504c1b8aecd.tar.bz2 ayatana-indicator-session-36fe650a80739727b9fe10a59196d504c1b8aecd.zip | |
DBusActions: use unity session APIs when unity is running
Use Immediate lock when switching, and rely to standard lock (with fade) in normal cases. Fixes: 1305194
Diffstat (limited to 'tests/backend-dbus/test-actions.cc')
| -rw-r--r-- | tests/backend-dbus/test-actions.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/backend-dbus/test-actions.cc b/tests/backend-dbus/test-actions.cc index c0f8517..717509d 100644 --- a/tests/backend-dbus/test-actions.cc +++ b/tests/backend-dbus/test-actions.cc @@ -316,17 +316,19 @@ TEST_F (Actions, Hibernate) TEST_F (Actions, SwitchToScreensaver) { - ASSERT_EQ (MockScreenSaver::None, screen_saver->last_action()); + ASSERT_EQ (MockUnitySession::None, unity_session->last_action()); indicator_session_actions_switch_to_screensaver (actions); wait_msec (50); - ASSERT_EQ (MockScreenSaver::Lock, screen_saver->last_action()); + ASSERT_EQ (MockUnitySession::Lock, unity_session->last_action()); } TEST_F (Actions, SwitchToGreeter) { ASSERT_NE (MockDisplayManagerSeat::GREETER, dm_seat->last_action()); + ASSERT_EQ (MockUnitySession::None, unity_session->last_action()); indicator_session_actions_switch_to_greeter (actions); wait_msec (50); + ASSERT_EQ (MockUnitySession::PromptLock, unity_session->last_action()); ASSERT_EQ (MockDisplayManagerSeat::GREETER, dm_seat->last_action()); } @@ -346,6 +348,7 @@ 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()); } TEST_F (Actions, SwitchToUsername) @@ -367,6 +370,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()); indicator_session_actions_switch_to_username (actions, dr2_username); wait_for_signal (login1_seat->skeleton(), "notify::active-session"); |