Merging with trunk

(bzr r4153.9.53)

5 files changed, 10 insertions, 2 deletions

diff --git a/tests/test_edge_barrier_controller.cpp b/tests/test_edge_barrier_controller.cpp
index 0aa069da4..4dae2cc80 100644
--- a/tests/test_edge_barrier_controller.cpp
+++ b/tests/test_edge_barrier_controller.cpp
@@ -25,6 +25,7 @@
 
 #include "EdgeBarrierController.h"
 #include "EdgeBarrierControllerPrivate.h"
+#include "InputMonitor.h"
 
 using namespace unity;
 using namespace unity::ui;
@@ -108,6 +109,7 @@ public:
 
 TestBarrierSubscriber horizontal_subscribers_[monitors::MAX];
 TestBarrierSubscriber vertical_subscribers_[monitors::MAX];
+ input::Monitor im;
 MockUScreen uscreen;
 EdgeBarrierController bc;
 };
diff --git a/tests/test_launcher_controller.cpp b/tests/test_launcher_controller.cpp
index 7faea517c..6a335bf8c 100644
--- a/tests/test_launcher_controller.cpp
+++ b/tests/test_launcher_controller.cpp
@@ -25,6 +25,7 @@
 #include "ExpoLauncherIcon.h"
 #include "DesktopLauncherIcon.h"
 #include "DesktopUtilities.h"
+#include "InputMonitor.h"
 #include "MockableBaseWindow.h"
 #include "MockLauncherIcon.h"
 #include "BFBLauncherIcon.h"
@@ -286,6 +287,7 @@ protected:
 std::shared_ptr<helper::CaptureLogOutput> logger_output_;
 MockUScreen uscreen;
 panel::Style panel_style;
+ input::Monitor im_;
 MockFavoriteStore favorite_store;
 MockXdndManager::Ptr xdnd_manager_;
 ui::EdgeBarrierController::Ptr edge_barriers_;
diff --git a/tests/test_lockscreen_controller.cpp b/tests/test_lockscreen_controller.cpp
index 75d5519c9..c7db68fd2 100644
--- a/tests/test_lockscreen_controller.cpp
+++ b/tests/test_lockscreen_controller.cpp
@@ -55,7 +55,7 @@ const unsigned TICK_DURATION = 10 * 1000;
 struct MockShield : BaseShield
 {
 MockShield()
- : BaseShield(nullptr, nullptr, nullptr, nux::ObjectPtr<AbstractUserPromptView>(), 0, false)
+ : BaseShield(nullptr, nullptr, nux::ObjectPtr<AbstractUserPromptView>(), 0, false)
 {}
 
 MOCK_CONST_METHOD0(IsIndicatorOpen, bool());
@@ -67,7 +67,7 @@ struct MockShield : BaseShield
 struct ShieldFactoryMock : ShieldFactoryInterface
 {
 nux::ObjectPtr<BaseShield> CreateShield(session::Manager::Ptr const&,
- indicator::Indicators::Ptr const&,
+ menu::Manager::Ptr const&,
 Accelerators::Ptr const&,
 nux::ObjectPtr<AbstractUserPromptView> const&,
 int, bool) override
diff --git a/tests/test_panel_controller.cpp b/tests/test_panel_controller.cpp
index eea0f2fe1..af7fe9534 100644
--- a/tests/test_panel_controller.cpp
+++ b/tests/test_panel_controller.cpp
@@ -19,6 +19,7 @@
 
 #include <gmock/gmock.h>
 
+#include "InputMonitor.h"
 #include "PanelController.h"
 #include "PanelStyle.h"
 #include "PanelView.h"
@@ -46,6 +47,7 @@ struct TestPanelController : public testing::Test
 menu::MockManager::Ptr menus;
 ui::EdgeBarrierController::Ptr edge_barriers;
 launcher::Options::Ptr options;
+ input::Monitor im;
 };
 
 TEST_F(TestPanelController, Construction)
diff --git a/tests/test_panel_view.cpp b/tests/test_panel_view.cpp
index 82fdf55b3..4eeb37993 100644
--- a/tests/test_panel_view.cpp
+++ b/tests/test_panel_view.cpp
@@ -25,6 +25,7 @@
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UBusWrapper.h"
+ #include "InputMonitor.h"
 
 #include "mock_menu_manager.h"
 #include "test_standalone_wm.h"
@@ -43,6 +44,7 @@ public:
 nux::ObjectPtr<MockableBaseWindow> window_;
 nux::ObjectPtr<PanelView> panel_view_;
 testwrapper::StandaloneWM WM;
+ input::Monitor im;
 
 TestPanelView()
 : window_(new MockableBaseWindow())