From 7e8defc727eedf74e5a9336f46ef610b462597a6 Mon Sep 17 00:00:00 2001 From: "Andriy Byzhynar (GitHub)" Date: Sun, 10 May 2020 18:36:38 +0300 Subject: Move function to iface class to allow its testing --- .../include/application_manager/state_controller_impl.h | 9 ++------- src/components/include/application_manager/state_controller.h | 9 +++++++++ .../include/test/application_manager/mock_state_controller.h | 3 +++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/components/application_manager/include/application_manager/state_controller_impl.h b/src/components/application_manager/include/application_manager/state_controller_impl.h index c6121f5d1d..04851d66ab 100644 --- a/src/components/application_manager/include/application_manager/state_controller_impl.h +++ b/src/components/application_manager/include/application_manager/state_controller_impl.h @@ -125,6 +125,8 @@ class StateControllerImpl : public event_engine::EventObserver, void ActivateDefaultWindow(ApplicationSharedPtr app) OVERRIDE; void ExitDefaultWindow(ApplicationSharedPtr app) OVERRIDE; + void DeactivateApp(ApplicationSharedPtr app, + const WindowID window_id) OVERRIDE; private: int64_t RequestHMIStateChange(ApplicationConstSharedPtr app, @@ -273,13 +275,6 @@ class StateControllerImpl : public event_engine::EventObserver, */ void TempStateStopped(HmiState::StateID ID); - /** - * @brief Sets BACKGROUND or LIMITED hmi level to application - * depends on application type - * @param app Application to deactivate - */ - void DeactivateApp(ApplicationSharedPtr app, const WindowID window_id); - /** * Function to remove temporary HmiState for application */ diff --git a/src/components/include/application_manager/state_controller.h b/src/components/include/application_manager/state_controller.h index 2fa4b0c218..93d4c4fc39 100644 --- a/src/components/include/application_manager/state_controller.h +++ b/src/components/include/application_manager/state_controller.h @@ -223,6 +223,15 @@ class StateController { * @param app pointer to application to be exited */ virtual void ExitDefaultWindow(ApplicationSharedPtr app) = 0; + + /** + * @brief Sets BACKGROUND or LIMITED hmi level to application + * depends on application type + * @param window_id ID of app window to deactivate + * @param app Application to deactivate + */ + virtual void DeactivateApp(ApplicationSharedPtr app, + const WindowID window_id) = 0; }; } // namespace application_manager diff --git a/src/components/include/test/application_manager/mock_state_controller.h b/src/components/include/test/application_manager/mock_state_controller.h index 545090bf30..26d403ba75 100644 --- a/src/components/include/test/application_manager/mock_state_controller.h +++ b/src/components/include/test/application_manager/mock_state_controller.h @@ -108,6 +108,9 @@ class MockStateController : public am::StateController { MOCK_CONST_METHOD1(IsStateActive, bool(am::HmiState::StateID state_id)); MOCK_METHOD1(ActivateDefaultWindow, void(am::ApplicationSharedPtr app)); MOCK_METHOD1(ExitDefaultWindow, void(am::ApplicationSharedPtr app)); + MOCK_METHOD2(DeactivateApp, + void(am::ApplicationSharedPtr app, + const am::WindowID window_id)); }; } // namespace application_manager_test -- cgit v1.2.1