Reduces interfaces, adds more constraints, fixes tests

Implements: APPLINK-20560

Conflicts:
	src/components/application_manager/test/CMakeLists.txt
	src/components/application_manager/test/hmi_capabilities_test.cc
	src/components/application_manager/test/mock_message_helper.cc
	src/components/application_manager/test/mock_message_helper.h

8 files changed, 198 insertions, 150 deletions

diff --git a/src/components/application_manager/include/application_manager/hmi_language_handler.h b/src/components/application_manager/include/application_manager/hmi_language_handler.h
index 60560a7d48..e210288526 100644
--- a/src/components/application_manager/include/application_manager/hmi_language_handler.h
+++ b/src/components/application_manager/include/application_manager/hmi_language_handler.h
@@ -50,45 +50,33 @@ public:
   typedef std::map<uint32_t, bool> Apps;
 
   /**
-   * @brief Class constructor
-   */
-  HMILanguageHandler();
-
-  /**
-   * @brief Sets UI language value in persistent storage
-   * @param language UI language
-   */
-  void set_ui_language(hmi_apis::Common_Language::eType language);
-
-  /**
-   * @brief Sets VR language value in persistent storage
-   * @param language VR language
-   */
-  void set_vr_language(hmi_apis::Common_Language::eType language);
+  * @brief System interfaces
+  */
+  enum Interface {
+    INTERFACE_UI,
+    INTERFACE_VR,
+    INTERFACE_TTS
+  };
 
   /**
-   * @brief Sets TTS language value in persistent storage
-   * @param language TTS language
-   */
-  void set_tts_language(hmi_apis::Common_Language::eType language);
-
-  /**
-   * @brief Gets UI language value from persistent storage
-   * @return UI language
+   * @brief Class constructor
    */
-  hmi_apis::Common_Language::eType get_ui_language() const;
+  HMILanguageHandler();
 
   /**
-   * @brief Gets VR language from persistent storage
-   * @return VR language
+   * @brief Sets language for interface
+   * @param interface Interface
+   * @param language Language
    */
-  hmi_apis::Common_Language::eType get_vr_language() const;
+  void set_language_for(Interface interface,
+                        hmi_apis::Common_Language::eType language);
 
   /**
-   * @brief Gets TTS language value from persistent storage
-   * @return TTS language
+   * @brief Gets language for interface
+   * @param interface Interface
+   * @return Language
    */
-  hmi_apis::Common_Language::eType get_tts_language() const;
+  hmi_apis::Common_Language::eType get_language_for(Interface interface) const;
 
   void on_event(const event_engine::Event& event) OVERRIDE;
 
@@ -122,7 +110,7 @@ private:
    * have been received
    * @param app_id Application id
    */
-  void HandleWrongLanguageApp(const Apps::value_type app_id);
+  void HandleWrongLanguageApp(const Apps::value_type& app_id);
 
   /**
    * @brief Checks if application needs to be handled because of language(s)
diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index afaf27e0ea..6ae0bf710a 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -125,7 +125,11 @@ class MessageHelper {
       int32_t connection_key,
       mobile_apis::AppInterfaceUnregisteredReason::eType reason);
 
-    static void SendOnLanguageChangeToMobile(int32_t connection_key);
+    /**
+     * @brief Sends OnLanguageChange notification to application
+     * @param connection_key Connection key of application
+     */
+    static void SendOnLanguageChangeToMobile(uint32_t connection_key);
 
     /*
      * @brief Retrieve vehicle data map for param name in mobile request
@@ -615,7 +619,7 @@ class MessageHelper {
      * @return Mobile language string representation
      */
     static std::string MobileLanguageToString(
-            mobile_apis::Language::eType language);
+            const mobile_apis::Language::eType language);
 
     /**
      * @brief Converts string to mobile language enum value
diff --git a/src/components/application_manager/src/hmi_capabilities.cc b/src/components/application_manager/src/hmi_capabilities.cc
index be73aa23c2..27189c7240 100644
--- a/src/components/application_manager/src/hmi_capabilities.cc
+++ b/src/components/application_manager/src/hmi_capabilities.cc
@@ -332,7 +332,7 @@ void HMICapabilities::set_is_vr_cooperating(bool value) {
   if (is_vr_cooperating_) {
     utils::SharedPtr<smart_objects::SmartObject> get_language(
       MessageHelper::CreateModuleInfoSO(hmi_apis::FunctionID::VR_GetLanguage));
-    hmi_language_handler_.set_handle_response_for(*get_language.get());
+    hmi_language_handler_.set_handle_response_for(*get_language);
     app_mngr_->ManageHMICommand(get_language);
     utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
         MessageHelper::CreateModuleInfoSO(
@@ -352,7 +352,7 @@ void HMICapabilities::set_is_tts_cooperating(bool value) {
     utils::SharedPtr<smart_objects::SmartObject> get_language(
       MessageHelper::CreateModuleInfoSO(
         hmi_apis::FunctionID::TTS_GetLanguage));
-    hmi_language_handler_.set_handle_response_for(*get_language.get());
+    hmi_language_handler_.set_handle_response_for(*get_language);
     app_mngr_->ManageHMICommand(get_language);
     utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
         MessageHelper::CreateModuleInfoSO(
@@ -372,7 +372,7 @@ void HMICapabilities::set_is_ui_cooperating(bool value) {
     utils::SharedPtr<smart_objects::SmartObject> get_language(
       MessageHelper::CreateModuleInfoSO(
         hmi_apis::FunctionID::UI_GetLanguage));
-    hmi_language_handler_.set_handle_response_for(*get_language.get());
+    hmi_language_handler_.set_handle_response_for(*get_language);
     app_mngr_->ManageHMICommand(get_language);
     utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
         MessageHelper::CreateModuleInfoSO(
@@ -408,26 +408,29 @@ void HMICapabilities::set_attenuated_supported(bool state) {
 void HMICapabilities::set_active_ui_language(
     const hmi_apis::Common_Language::eType& language) {
   ui_language_ = language;
-  hmi_language_handler_.set_ui_language(language);
+  hmi_language_handler_.set_language_for(HMILanguageHandler::INTERFACE_UI,
+                                         language);
 }
 
 void HMICapabilities::set_active_vr_language(
     const hmi_apis::Common_Language::eType& language) {
   vr_language_ = language;
-  hmi_language_handler_.set_vr_language(language);
+  hmi_language_handler_.set_language_for(HMILanguageHandler::INTERFACE_VR,
+                                         language);
 }
 
 void HMICapabilities::set_active_tts_language(
     const hmi_apis::Common_Language::eType& language) {
   tts_language_ = language;
-  hmi_language_handler_.set_tts_language(language);
+  hmi_language_handler_.set_language_for(HMILanguageHandler::INTERFACE_TTS,
+                                         language);
 }
 
 const hmi_apis::Common_Language::eType
 HMICapabilities::active_ui_language() const {
   using namespace hmi_apis;
   const Common_Language::eType language =
-      hmi_language_handler_.get_ui_language();
+      hmi_language_handler_.get_language_for(HMILanguageHandler::INTERFACE_UI);
   return Common_Language::INVALID_ENUM != language ? language : ui_language_;
 }
 
@@ -435,7 +438,7 @@ const hmi_apis::Common_Language::eType
 HMICapabilities::active_vr_language() const {
   using namespace hmi_apis;
   const Common_Language::eType language =
-      hmi_language_handler_.get_vr_language();
+      hmi_language_handler_.get_language_for(HMILanguageHandler::INTERFACE_VR);
   return Common_Language::INVALID_ENUM != language ? language : vr_language_;
 }
 
@@ -443,7 +446,7 @@ const hmi_apis::Common_Language::eType
 HMICapabilities::active_tts_language() const {
   using namespace hmi_apis;
   const Common_Language::eType language =
-      hmi_language_handler_.get_tts_language();
+      hmi_language_handler_.get_language_for(HMILanguageHandler::INTERFACE_TTS);
   return Common_Language::INVALID_ENUM != language ? language : tts_language_;
 }
 
diff --git a/src/components/application_manager/src/hmi_language_handler.cc b/src/components/application_manager/src/hmi_language_handler.cc
index 31a235728f..39c9a383fa 100644
--- a/src/components/application_manager/src/hmi_language_handler.cc
+++ b/src/components/application_manager/src/hmi_language_handler.cc
@@ -54,75 +54,66 @@ HMILanguageHandler::HMILanguageHandler()  :
     is_vr_language_received_(false),
     is_tts_language_received_(false) {
 
-  persisted_ui_language_ = get_ui_language();
-  persisted_vr_language_ = get_vr_language();
-  persisted_tts_language_ = get_tts_language();
+  persisted_ui_language_ = get_language_for(INTERFACE_UI);
+  persisted_vr_language_ = get_language_for(INTERFACE_VR);
+  persisted_tts_language_ = get_language_for(INTERFACE_TTS);
 
   subscribe_on_event(
         hmi_apis::FunctionID::BasicCommunication_OnAppRegistered);
 }
 
-void HMILanguageHandler::set_ui_language(
-      hmi_apis::Common_Language::eType language) {
+void HMILanguageHandler::set_language_for(
+    HMILanguageHandler::Interface interface,
+    hmi_apis::Common_Language::eType language) {
   LOG4CXX_AUTO_TRACE(logger_);
-  resumption::LastState::instance()->dictionary[LanguagesKey][UIKey] = language;
-}
-
-void HMILanguageHandler::set_vr_language(
-      hmi_apis::Common_Language::eType language) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  resumption::LastState::instance()->dictionary[LanguagesKey][VRKey] = language;
-}
-
-void HMILanguageHandler::set_tts_language(
-      hmi_apis::Common_Language::eType language) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  resumption::LastState::instance()->dictionary[LanguagesKey][TTSKey] = language;
-}
-
-hmi_apis::Common_Language::eType HMILanguageHandler::get_ui_language() const {
-  LOG4CXX_AUTO_TRACE(logger_);
-  using namespace resumption;
-  using namespace hmi_apis;
-  if (LastState::instance()->dictionary.isMember(LanguagesKey)) {
-    if (LastState::instance()->dictionary[LanguagesKey].isMember(UIKey)) {
-      Common_Language::eType ui_language =
-          static_cast<Common_Language::eType>(
-          LastState::instance()->dictionary[LanguagesKey][UIKey].asInt());
-
-      return ui_language;
+  std::string key = "UNKNOWN";
+  switch (interface) {
+    case INTERFACE_UI:
+      key = UIKey;
+      break;
+    case INTERFACE_VR:
+      key = VRKey;
+      break;
+    case INTERFACE_TTS:
+      key = TTSKey;
+      break;
+    default:
+      LOG4CXX_WARN(logger_, "Unknown interface has been passed " << interface);
+      return;
     }
-  }
-  return Common_Language::INVALID_ENUM;
+  LOG4CXX_DEBUG(logger_, "Setting language " << language
+               << " for interface " << interface);
+  resumption::LastState::instance()->dictionary[LanguagesKey][key] = language;
+  return;
 }
 
-hmi_apis::Common_Language::eType HMILanguageHandler::get_vr_language() const {
+hmi_apis::Common_Language::eType HMILanguageHandler::get_language_for(
+    HMILanguageHandler::Interface interface) const {
   LOG4CXX_AUTO_TRACE(logger_);
   using namespace resumption;
   using namespace hmi_apis;
-  if (LastState::instance()->dictionary.isMember(LanguagesKey)) {
-    if (LastState::instance()->dictionary[LanguagesKey].isMember(VRKey)) {
-      Common_Language::eType vr_language =
-          static_cast<Common_Language::eType>(
-          LastState::instance()->dictionary[LanguagesKey][VRKey].asInt());
-
-      return vr_language;
-    }
+  std::string key = "UNKNOWN";
+  switch (interface) {
+    case INTERFACE_UI:
+      key = UIKey;
+      break;
+    case INTERFACE_VR:
+      key = VRKey;
+      break;
+    case INTERFACE_TTS:
+      key = TTSKey;
+      break;
+    default:
+      LOG4CXX_WARN(logger_, "Unknown interfcase has been passed " << interface);
+      return Common_Language::INVALID_ENUM;
   }
-  return Common_Language::INVALID_ENUM;
-}
 
-hmi_apis::Common_Language::eType HMILanguageHandler::get_tts_language() const {
-  LOG4CXX_AUTO_TRACE(logger_);
-  using namespace resumption;
-  using namespace hmi_apis;
   if (LastState::instance()->dictionary.isMember(LanguagesKey)) {
-    if (LastState::instance()->dictionary[LanguagesKey].isMember(TTSKey)) {
-      Common_Language::eType tts_language =
+    if (LastState::instance()->dictionary[LanguagesKey].isMember(key)) {
+      Common_Language::eType language =
           static_cast<Common_Language::eType>(
-          LastState::instance()->dictionary[LanguagesKey][TTSKey].asInt());
-
-      return tts_language;
+          LastState::instance()->dictionary[LanguagesKey][key].asUInt());
+      return language;
     }
   }
   return Common_Language::INVALID_ENUM;
@@ -228,7 +219,7 @@ void HMILanguageHandler::set_default_capabilities_languages(
 void HMILanguageHandler::VerifyWithPersistedLanguages() {
   LOG4CXX_AUTO_TRACE(logger_);
   using namespace helpers;
-  HMICapabilities& hmi_capabilities =
+  const HMICapabilities& hmi_capabilities =
         ApplicationManagerImpl::instance()->hmi_capabilities();
 
   // Updated values compared with persisted
@@ -246,7 +237,7 @@ void HMILanguageHandler::VerifyWithPersistedLanguages() {
   ApplicationManagerImpl::ApplicationListAccessor accessor;
   ApplicationSetIt it = accessor.begin();
   for (; accessor.end() != it;) {
-    ApplicationSharedPtr app = *it++;
+    ApplicationConstSharedPtr app = *it++;
 
     LOG4CXX_INFO(logger_, "Application with app_id " << app->app_id()
                  << " will be unregistered because of "
@@ -256,15 +247,14 @@ void HMILanguageHandler::VerifyWithPersistedLanguages() {
   }
 
   sync_primitives::AutoLock lock(apps_lock_);
-  if (!apps_.size()) {
+  if (0 == apps_.size()) {
     LOG4CXX_DEBUG(logger_,
                   "No registered apps found. Unsubscribing from all events.");
     unsubscribe_from_all_events();
   }
 }
 
-void HMILanguageHandler::HandleWrongLanguageApp(
-      const Apps::value_type app) {
+void HMILanguageHandler::HandleWrongLanguageApp(const Apps::value_type& app) {
   LOG4CXX_AUTO_TRACE(logger_);
   Apps::iterator it = apps_.find(app.first);
   if (apps_.end() == it) {
@@ -283,7 +273,7 @@ void HMILanguageHandler::HandleWrongLanguageApp(
   ApplicationManagerImpl::instance()->
       UnregisterApplication(app.first, mobile_apis::Result::SUCCESS, false);
   apps_.erase(it);
-  if (!apps_.size()) {
+  if (0 == apps_.size()) {
     LOG4CXX_DEBUG(logger_,
                   "All apps processed. Unsubscribing from all events.");
     unsubscribe_from_all_events();
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index eb47467eb8..07324d5bca 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -220,7 +220,7 @@ hmi_apis::Common_Language::eType MessageHelper::CommonLanguageFromString(
 }
 
 std::string MessageHelper::MobileLanguageToString(
-  mobile_apis::Language::eType language) {
+  const mobile_apis::Language::eType language) {
   using namespace NsSmartDeviceLink::NsSmartObjects;
   const char* str = 0;
   if (EnumConversionHelper<mobile_apis::Language::eType>::EnumToCString(
@@ -495,12 +495,11 @@ void MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile(
   }
 }
 
-
-void MessageHelper::SendOnLanguageChangeToMobile(int32_t connection_key) {
+void MessageHelper::SendOnLanguageChangeToMobile(uint32_t connection_key) {
   LOG4CXX_AUTO_TRACE(logger_);
 
   smart_objects::SmartObjectSPtr notification = new smart_objects::SmartObject;
-  DCHECK(notification);
+  DCHECK_OR_RETURN_VOID(notification);
   smart_objects::SmartObject& message = *notification;
 
   message[strings::params][strings::function_id] =
@@ -522,7 +521,7 @@ void MessageHelper::SendOnLanguageChangeToMobile(int32_t connection_key) {
 
   if (ApplicationManagerImpl::instance()->ManageMobileCommand(
       notification, commands::Command::ORIGIN_SDL)) {
-    LOG4CXX_DEBUG(logger_, "Mobile command sent");
+    LOG4CXX_INFO(logger_, "Mobile command sent");
   }
   else {
     LOG4CXX_WARN(logger_, "Cannot send mobile command");
diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt
index 3834c4956e..6385bb5dc0 100644
--- a/src/components/application_manager/test/CMakeLists.txt
+++ b/src/components/application_manager/test/CMakeLists.txt
@@ -89,37 +89,68 @@ set(testSources
     ${AM_TEST_DIR}/request_info_test.cc
     ${AM_TEST_DIR}/resumption_sql_queries_test.cc
     ${AM_TEST_DIR}/event_engine_test.cc
-)
-
-set(mockedSources
-  ${AM_MOCK_DIR}/src/application_manager_impl.cc
-)
+    ${AM_TEST_DIR}/policy_event_observer_test.cc
+    ${AM_TEST_DIR}/application_impl_test.cc
+    ${AM_TEST_DIR}/hmi_capabilities_test.cc
+    ${AM_TEST_DIR}/application_state_test.cc
+    # TODO(VVeremjova) APPLINK-12835
+    #${AM_TEST_DIR}/zero_request_amount_test.cc
+  )
+  set (request_controller_SOURCES
+    ${AM_TEST_DIR}/request_controller/request_controller_test.cc
+    )
+
+  set(mockedSources ${AM_MOCK_DIR}/src/application_manager_impl.cc)
+
+  set(AM_SOURCES
+
+    ${AM_SOURCE_DIR}/src/policies/policy_handler.cc
+    ${AM_SOURCE_DIR}/src/policies/policy_event_observer.cc
+    ${AM_SOURCE_DIR}/src/policies/delegates/app_permission_delegate.cc
+    ${AM_SOURCE_DIR}/src/policies/delegates/statistics_delegate.cc
+
+    ${AM_SOURCE_DIR}/src/event_engine/event_dispatcher.cc
+    ${AM_SOURCE_DIR}/src/event_engine/event_observer.cc
+    ${AM_SOURCE_DIR}/src/event_engine/event.cc
+
+    ${AM_SOURCE_DIR}/src/commands/command_impl.cc
+    ${AM_SOURCE_DIR}/src/commands/command_request_impl.cc
+    ${AM_SOURCE_DIR}/src/commands/command_response_impl.cc
+    ${AM_SOURCE_DIR}/src/commands/command_notification_impl.cc
+    ${AM_SOURCE_DIR}/src/commands/command_notification_from_mobile_impl.cc
+    ${AM_SOURCE_DIR}/src/commands/pending.cc
+
+    ${AM_SOURCE_DIR}/src/resumption/resume_ctrl.cc
+    ${AM_SOURCE_DIR}/src/resumption/resumption_data_db.cc
+    ${AM_SOURCE_DIR}/src/resumption/resumption_data_json.cc
+    ${AM_SOURCE_DIR}/src/resumption/resumption_data.cc
+    ${AM_SOURCE_DIR}/src/resumption/resumption_sql_queries.cc
+
+    ${AM_SOURCE_DIR}/src/usage_statistics.cc
+    ${AM_SOURCE_DIR}/src/request_info.cc
+    ${AM_SOURCE_DIR}/src/message.cc
+    ${AM_SOURCE_DIR}/src/application_impl.cc
+    ${AM_SOURCE_DIR}/src/application_state.cc
+    ${AM_SOURCE_DIR}/src/state_controller.cc
+    ${AM_SOURCE_DIR}/src/mobile_command_factory.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/application_manager/mock_message_helper.cc
+
+    ${AM_SOURCE_DIR}/src/hmi_command_factory.cc
+    ${AM_SOURCE_DIR}/src/hmi_state.cc
+
+    ${AM_SOURCE_DIR}/src/hmi_capabilities.cc
+    ${AM_SOURCE_DIR}/src/hmi_language_handler.cc
+    ${AM_SOURCE_DIR}/src/application_data_impl.cc
+    ${AM_SOURCE_DIR}/src/request_controller.cc
+
+    ${AM_SOURCE_DIR}/src/commands/mobile/register_app_interface_request.cc
+    ${AM_SOURCE_DIR}/src/commands/mobile/unregister_app_interface_request.cc
+
+    ${AM_SOURCE_DIR}/src/mobile_message_handler.cc
+    ${AM_SOURCE_DIR}/src/commands/mobile/put_file_request.cc
+    ${AM_SOURCE_DIR}/src/commands/command_request_impl.cc
+  )
 
-set(AM_SOURCES
-  ${AM_SOURCE_DIR}/src/policies/policy_handler.cc
-  ${AM_SOURCE_DIR}/src/policies/policy_event_observer.cc
-
-  ${AM_SOURCE_DIR}/src/commands/command_impl.cc
-  ${AM_SOURCE_DIR}/src/commands/command_request_impl.cc
-  ${AM_SOURCE_DIR}/src/commands/command_response_impl.cc
-  ${AM_SOURCE_DIR}/src/commands/command_notification_impl.cc
-  ${AM_SOURCE_DIR}/src/commands/command_notification_from_mobile_impl.cc
-  ${AM_SOURCE_DIR}/src/commands/pending.cc
-
-  ${AM_SOURCE_DIR}/src/usage_statistics.cc
-  ${AM_SOURCE_DIR}/src/request_info.cc
-  ${AM_SOURCE_DIR}/src/message.cc
-  ${AM_SOURCE_DIR}/src/application_impl.cc
-  ${AM_SOURCE_DIR}/src/state_controller.cc
-  ${AM_SOURCE_DIR}/src/mobile_command_factory.cc
-  ${AM_SOURCE_DIR}/src/message_helper.cc
-  ${AM_SOURCE_DIR}/src/hmi_command_factory.cc
-  ${AM_SOURCE_DIR}/src/hmi_capabilities.cc
-  ${AM_SOURCE_DIR}/src/application_data_impl.cc
-  ${AM_SOURCE_DIR}/src/request_controller.cc
-  ${AM_SOURCE_DIR}/src/resumption/resume_ctrl.cc
-  ${AM_SOURCE_DIR}/src/mobile_message_handler.cc
-)
   include_directories(
     ${AM_SOURCE_DIR}/policy/src/policy/policy_table/table_struct
   )
diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc
index dd13e40fc5..8adfd3a8b9 100644
--- a/src/components/application_manager/test/mock_message_helper.cc
+++ b/src/components/application_manager/test/mock_message_helper.cc
@@ -217,16 +217,39 @@ void MessageHelper::SendUpdateSDLResponse(const std::string& result,
       result, correlation_id);
 }
 
-hmi_apis::Common_Language::eType MessageHelper::CommonLanguageFromString(
-    const std::string& language) {
-  return MockMessageHelper::message_helper_mock()->CommonLanguageFromString(
-      language);
+void MessageHelper::SendOnLanguageChangeToMobile(uint32_t connection_key) {
+  MockMessageHelper::message_helper_mock()->SendOnLanguageChangeToMobile(connection_key);
 }
 
-smart_objects::SmartObjectSPtr MessageHelper::CreateModuleInfoSO(
-    uint32_t function_id) {
-  return MockMessageHelper::message_helper_mock()->CreateModuleInfoSO(
-      function_id);
+void MessageHelper::SendDecryptCertificateToHMI(const std::string& file_name) {
+  MockMessageHelper::message_helper_mock()->SendDecryptCertificateToHMI(
+      file_name);
+}
+
+hmi_apis::Common_Language::eType MessageHelper::CommonLanguageFromString(const std::string& language) {
+   return MockMessageHelper::message_helper_mock()->CommonLanguageFromString(
+        language);
+}
+
+std::string MessageHelper::MobileLanguageToString(const mobile_apis::Language::eType language) {
+  return  MockMessageHelper::message_helper_mock()->MobileLanguageToString(language);
+}
+
+mobile_apis::Language::eType MessageHelper::MobileLanguageFromString(const std::string& language) {
+  return  MockMessageHelper::message_helper_mock()->MobileLanguageFromString(language);
+}
+
+hmi_apis::Common_Language::eType MessageHelper::MobileToCommonLanguage(const mobile_apis::Language::eType language) {
+  return MockMessageHelper::message_helper_mock()->MobileToCommonLanguage(language);
+}
+
+mobile_apis::Language::eType MessageHelper::CommonToMobileLanguage(const hmi_apis::Common_Language::eType language) {
+  return  MockMessageHelper::message_helper_mock()->CommonToMobileLanguage(language);
+}
+
+smart_objects::SmartObjectSPtr MessageHelper::CreateModuleInfoSO (uint32_t function_id) {
+    return  MockMessageHelper::message_helper_mock()->CreateModuleInfoSO(
+                function_id);
 }
 
 MockMessageHelper* MockMessageHelper::message_helper_mock() {
diff --git a/src/components/application_manager/test/mock_message_helper.h b/src/components/application_manager/test/mock_message_helper.h
index cf4c6f2411..64054baaaf 100644
--- a/src/components/application_manager/test/mock_message_helper.h
+++ b/src/components/application_manager/test/mock_message_helper.h
@@ -118,12 +118,22 @@ class MockMessageHelper {
   MOCK_METHOD2(SendOnAppInterfaceUnregisteredNotificationToMobile,
                void(int32_t connection_key,
                     mobile_apis::AppInterfaceUnregisteredReason::eType reason));
-  MOCK_METHOD1(CommonLanguageFromString,
-               hmi_apis::Common_Language::eType(const std::string& language));
-  MOCK_METHOD1(CommonLanguageToString,
-               std::string(hmi_apis::Common_Language::eType));
-  MOCK_METHOD1(CreateModuleInfoSO,
-               smart_objects::SmartObjectSPtr(uint32_t function_id));
+  MOCK_METHOD1(SendOnLanguageChangeToMobile,
+               void(uint32_t connection_key));
+  MOCK_METHOD1(CommonLanguageFromString, hmi_apis::Common_Language::eType(
+          const std::string& language)) ;
+  MOCK_METHOD1(CommonLanguageToString, std::string(
+          hmi_apis::Common_Language::eType));
+  MOCK_METHOD1(MobileLanguageToString,
+               std::string(const mobile_apis::Language::eType language));
+  MOCK_METHOD1(MobileLanguageFromString,
+               mobile_apis::Language::eType(const std::string& lanugage));
+  MOCK_METHOD1(MobileToCommonLanguage,
+               hmi_apis::Common_Language::eType(const mobile_apis::Language::eType language));
+  MOCK_METHOD1(CommonToMobileLanguage,
+               mobile_apis::Language::eType(const hmi_apis::Common_Language::eType language));
+
+  MOCK_METHOD1(CreateModuleInfoSO, smart_objects::SmartObjectSPtr(uint32_t function_id));
   MOCK_METHOD1(SendAllOnButtonSubscriptionNotificationsForApp,
                void(ApplicationConstSharedPtr app));