1 files changed, 27 insertions, 14 deletions
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 20a84e7f00..545090bf30 100644
--- a/src/components/include/test/application_manager/mock_state_controller.h
+++ b/src/components/include/test/application_manager/mock_state_controller.h
@@ -46,55 +46,68 @@ namespace am = application_manager;
 
 class MockStateController : public am::StateController {
  public:
-  MOCK_METHOD3(SetRegularState,
+  MOCK_METHOD4(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     am::HmiStatePtr state,
                     const bool request_hmi_state_change));
-  MOCK_METHOD5(SetRegularState,
+  MOCK_METHOD6(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::HMILevel::eType hmi_level,
                     const mobile_apis::AudioStreamingState::eType audio_state,
                     const mobile_apis::VideoStreamingState::eType video_state,
                     const bool request_hmi_state_change));
-  MOCK_METHOD3(SetRegularState,
+  MOCK_METHOD4(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::HMILevel::eType hmi_level,
                     const bool request_hmi_state_change));
-  MOCK_METHOD6(SetRegularState,
+  MOCK_METHOD7(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::HMILevel::eType hmi_level,
                     const mobile_apis::AudioStreamingState::eType audio_state,
                     const mobile_apis::VideoStreamingState::eType video_state,
                     const mobile_apis::SystemContext::eType system_context,
                     const bool request_hmi_state_change));
-  MOCK_METHOD2(SetRegularState,
+  MOCK_METHOD3(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::HMILevel::eType hmi_level));
-  MOCK_METHOD3(SetRegularState,
+  MOCK_METHOD4(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::AudioStreamingState::eType audio_state,
                     const mobile_apis::VideoStreamingState::eType video_state));
-  MOCK_METHOD2(SetRegularState,
+  MOCK_METHOD3(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::SystemContext::eType system_context));
-  MOCK_METHOD2(SetRegularState,
-               void(am::ApplicationSharedPtr app, am::HmiStatePtr state));
+  MOCK_METHOD3(SetRegularState,
+               void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
+                    am::HmiStatePtr state));
   MOCK_METHOD2(OnApplicationRegistered,
                void(am::ApplicationSharedPtr app,
                     const mobile_apis::HMILevel::eType default_level));
-  MOCK_METHOD3(RequestHMIStateChange,
-               int64_t(am::ApplicationConstSharedPtr app,
-                       hmi_apis::Common_HMILevel::eType level,
-                       bool send_policy_priority));
+  MOCK_METHOD4(OnAppWindowAdded,
+               void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
+                    const mobile_apis::WindowType::eType window_type,
+                    const mobile_apis::HMILevel::eType default_level));
   MOCK_METHOD1(OnVideoStreamingStarted,
                void(am::ApplicationConstSharedPtr app));
   MOCK_METHOD1(OnVideoStreamingStopped,
                void(am::ApplicationConstSharedPtr app));
-  MOCK_METHOD3(OnStateChanged,
+  MOCK_METHOD4(OnStateChanged,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     am::HmiStatePtr old_state,
                     am::HmiStatePtr new_state));
   MOCK_CONST_METHOD1(IsStateActive, bool(am::HmiState::StateID state_id));
+  MOCK_METHOD1(ActivateDefaultWindow, void(am::ApplicationSharedPtr app));
+  MOCK_METHOD1(ExitDefaultWindow, void(am::ApplicationSharedPtr app));
 };
 
 }  // namespace application_manager_test