summaryrefslogtreecommitdiff
path: root/tests
diff options
authorAndrea Azzarone <azzaronea@gmail.com>2014-07-11 15:27:09 +0200
committerAndrea Azzarone <azzaronea@gmail.com>2014-07-11 15:27:09 +0200
commit942eff2adb3b3543dc9c525927a17e513276271e (patch)
treebbfad1bf44eea37a095c69bc8e866a706b68f563 /tests
parent979dae5c9a843f322a71694c403bca2a2be4e985 (diff)
Share the lockscreen password entry between screens.
Fixes LP: #1308540 (bzr r3785.4.6)
Diffstat (limited to 'tests')
-rw-r--r--tests/test_lockscreen_controller.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/test_lockscreen_controller.cpp b/tests/test_lockscreen_controller.cpp
index 55add06bc..5bee578ed 100644
--- a/tests/test_lockscreen_controller.cpp
+++ b/tests/test_lockscreen_controller.cpp
@@ -20,6 +20,7 @@
#include <gmock/gmock.h>
using namespace testing;
+#include "lockscreen/UserPromptView.h"
#include "lockscreen/LockScreenController.h"
#include <Nux/NuxTimerTickSource.h>
@@ -29,6 +30,7 @@ using namespace testing;
#include "lockscreen/LockScreenSettings.h"
#include "lockscreen/ScreenSaverDBusManager.h"
+#include "unity-shared/DashStyle.h"
#include "unity-shared/PanelStyle.h"
#include "unity-shared/UScreen.h"
#include "test_mock_session_manager.h"
@@ -61,7 +63,7 @@ struct MockShield : AbstractShield
struct ShieldFactoryMock : ShieldFactoryInterface
{
- nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, int, bool) override
+ nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, nux::ObjectPtr<UserPromptView> const&, int, bool) override
{
return nux::ObjectPtr<AbstractShield>(new MockShield());
}
@@ -95,6 +97,7 @@ struct TestLockScreenController : Test
nux::animation::AnimationController animation_controller;
MockUScreen uscreen;
+ unity::dash::Style dash_style;
unity::panel::Style panel_style;
unity::lockscreen::Settings lockscreen_settings;
session::MockManager::Ptr session_manager;