From a92bf945ed7f7e9d5ff3c49841ca2275989a6173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 May 2014 04:43:45 +0200 Subject: EdgeBarrierController: disable the input barrier if we don't really need it (bzr r3788.8.2) --- tests/test_edge_barrier_controller.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests') 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; }; -- cgit v1.2.3 From 610f9301494f991e7cd322069e1367d65f8c7b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 21 May 2014 16:15:14 +0200 Subject: PanelView: use InputMonitor to track menu events (bzr r3788.9.2) --- tests/test_panel_controller.cpp | 2 ++ tests/test_panel_view.cpp | 2 ++ 2 files changed, 4 insertions(+) (limited to 'tests') 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 +#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 window_; nux::ObjectPtr panel_view_; testwrapper::StandaloneWM WM; + input::Monitor im; TestPanelView() : window_(new MockableBaseWindow()) -- cgit v1.2.3 From 4f62bcbed2e124809eb9cb774a55aa542a560dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 22 Aug 2016 14:08:46 +0200 Subject: Tests: add input monitor insances in Panel and Launcher controllers These are needed since they initialize edge barriers (bzr r3788.8.4) --- tests/test_launcher_controller.cpp | 2 ++ tests/test_panel_controller.cpp | 2 ++ 2 files changed, 4 insertions(+) (limited to 'tests') 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 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_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 +#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) -- cgit v1.2.3 From 0520196e9d51070496d2f0f64d95be9a0ee49821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 29 Aug 2016 19:45:46 +0200 Subject: LockScreen: pass menu::Manager to Shields (bzr r3788.9.16) --- tests/test_lockscreen_controller.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/test_lockscreen_controller.cpp b/tests/test_lockscreen_controller.cpp index d1c5af5fa..969cdc38c 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(), 0, false) + : BaseShield(nullptr, nullptr, nux::ObjectPtr(), 0, false) {} MOCK_CONST_METHOD0(IsIndicatorOpen, bool()); @@ -67,7 +67,7 @@ struct MockShield : BaseShield struct ShieldFactoryMock : ShieldFactoryInterface { nux::ObjectPtr CreateShield(session::Manager::Ptr const&, - indicator::Indicators::Ptr const&, + menu::Manager::Ptr const&, Accelerators::Ptr const&, nux::ObjectPtr const&, int, bool) override -- cgit v1.2.3