Updates mocks and tests, makes code buildable with tests enabled

5 files changed, 92 insertions, 88 deletions

diff --git a/src/components/application_manager/test/application_impl_test.cc b/src/components/application_manager/test/application_impl_test.cc
index 02a257e5d9..825448fe95 100644
--- a/src/components/application_manager/test/application_impl_test.cc
+++ b/src/components/application_manager/test/application_impl_test.cc
@@ -78,14 +78,12 @@ class ApplicationImplTest : public ::testing::Test {
     policy_app_id = "policy_app_id";
     app_name = "app_name";
     mac_address = "mac_address";
+    device_handle = 0;
     test_lvl = HMILevel::INVALID_ENUM;
     state_id = HmiState::STATE_ID_REGULAR;
     audiostate = AudioStreamingState::NOT_AUDIBLE;
     syst_context = SystemContext::SYSCTXT_MAIN;
 
-    testHmiState = CreateTestHmiState();
-    EXPECT_CALL(mock_application_manager_, CreateRegularState(app_id, _, _, _))
-        .WillOnce(Return(testHmiState));
     EXPECT_CALL(mock_application_manager_, get_settings())
         .WillRepeatedly(ReturnRef(mock_application_manager_settings_));
     EXPECT_CALL(mock_application_manager_settings_, app_icons_folder())
@@ -96,15 +94,14 @@ class ApplicationImplTest : public ::testing::Test {
                 audio_data_stopped_timeout()).WillOnce(Return(0));
     EXPECT_CALL(mock_application_manager_settings_,
                 video_data_stopped_timeout()).WillOnce(Return(0));
-    app_impl = new ApplicationImpl(app_id,
-                                   policy_app_id,
-                                   mac_address,
-                                   app_name,
-                                   utils::MakeShared<MockStatisticsManager>(),
-                                   mock_application_manager_);
-  }
-  void TearDown() OVERRIDE {
-    delete app_impl;
+    app_impl.reset(
+        new ApplicationImpl(app_id,
+                            policy_app_id,
+                            mac_address,
+                            device_handle,
+                            app_name,
+                            utils::MakeShared<MockStatisticsManager>(),
+                            mock_application_manager_));
   }
   HmiStatePtr CreateTestHmiState();
 
@@ -115,10 +112,11 @@ class ApplicationImplTest : public ::testing::Test {
   void CheckCurrentHMIState();
   MockApplicationManagerSettings mock_application_manager_settings_;
   MockApplicationManager mock_application_manager_;
-  ApplicationImpl* app_impl;
+  utils::SharedPtr<ApplicationImpl> app_impl;
   uint32_t app_id;
   std::string policy_app_id;
   std::string mac_address;
+  connection_handler::DeviceHandle device_handle;
   custom_str::CustomString app_name;
   const std::string directory_name = "./test_storage";
   HmiState::StateID state_id;
@@ -129,8 +127,8 @@ class ApplicationImplTest : public ::testing::Test {
 };
 
 HmiStatePtr ApplicationImplTest::CreateTestHmiState() {
-  HmiStatePtr testState =
-      utils::MakeShared<HmiState>(app_id, mock_application_manager_, state_id);
+  HmiStatePtr testState = utils::MakeShared<HmiState>(
+      app_impl, mock_application_manager_, state_id);
   testState->set_hmi_level(test_lvl);
   testState->set_audio_streaming_state(audiostate);
   testState->set_system_context(syst_context);
@@ -143,7 +141,7 @@ HmiStatePtr ApplicationImplTest::TestAddHmiState(HMILevel::eType hmi_lvl,
   test_lvl = hmi_lvl;
   state_id = id_state;
   HmiStatePtr state = CreateTestHmiState();
-  (app_impl->*hmi_action)(state);
+  ((app_impl.get())->*hmi_action)(state);
   return state;
 }
 
@@ -566,7 +564,7 @@ TEST_F(ApplicationImplTest, SubscribeToSoftButton_UnsubscribeFromSoftButton) {
 
 TEST_F(ApplicationImplTest, ChangeSupportingAppHMIType_TypeNotNaviNotVoice) {
   smart_objects::SmartObject type_media;
-  type_media[0] = AppHMIType::MEDIA;
+  type_media[0] = mobile_apis::AppHMIType::MEDIA;
 
   EXPECT_FALSE(app_impl->is_navi());
   EXPECT_FALSE(app_impl->is_voice_communication_supported());
@@ -582,7 +580,7 @@ TEST_F(ApplicationImplTest, ChangeSupportingAppHMIType_TypeNotNaviNotVoice) {
 
 TEST_F(ApplicationImplTest, ChangeSupportingAppHMIType_TypeIsVoice) {
   smart_objects::SmartObject type_comm;
-  type_comm[0] = AppHMIType::COMMUNICATION;
+  type_comm[0] = mobile_apis::AppHMIType::COMMUNICATION;
 
   EXPECT_FALSE(app_impl->is_navi());
   EXPECT_FALSE(app_impl->is_voice_communication_supported());
@@ -598,7 +596,7 @@ TEST_F(ApplicationImplTest, ChangeSupportingAppHMIType_TypeIsVoice) {
 
 TEST_F(ApplicationImplTest, ChangeSupportingAppHMIType_TypeIsNavi) {
   smart_objects::SmartObject type_navi;
-  type_navi[0] = AppHMIType::NAVIGATION;
+  type_navi[0] = mobile_apis::AppHMIType::NAVIGATION;
 
   EXPECT_FALSE(app_impl->is_navi());
   EXPECT_FALSE(app_impl->is_voice_communication_supported());
@@ -614,9 +612,9 @@ TEST_F(ApplicationImplTest, ChangeSupportingAppHMIType_TypeIsNavi) {
 
 TEST_F(ApplicationImplTest, ChangeSupportingAppHMIType_TypeIsNaviAndVoice) {
   smart_objects::SmartObject app_types;
-  app_types[0] = AppHMIType::NAVIGATION;
-  app_types[1] = AppHMIType::COMMUNICATION;
-  app_types[2] = AppHMIType::MEDIA;
+  app_types[0] = mobile_apis::AppHMIType::NAVIGATION;
+  app_types[1] = mobile_apis::AppHMIType::COMMUNICATION;
+  app_types[2] = mobile_apis::AppHMIType::MEDIA;
 
   EXPECT_FALSE(app_impl->is_navi());
   EXPECT_FALSE(app_impl->is_voice_communication_supported());
@@ -633,10 +631,10 @@ TEST_F(ApplicationImplTest, ChangeSupportingAppHMIType_TypeIsNaviAndVoice) {
 TEST_F(ApplicationImplTest,
        ChangeSupportingAppHMIType_TypeIsNaviAndVoiceAndProjection) {
   smart_objects::SmartObject app_types;
-  app_types[0] = AppHMIType::NAVIGATION;
-  app_types[1] = AppHMIType::COMMUNICATION;
-  app_types[2] = AppHMIType::MEDIA;
-  app_types[3] = AppHMIType::PROJECTION;
+  app_types[0] = mobile_apis::AppHMIType::NAVIGATION;
+  app_types[1] = mobile_apis::AppHMIType::COMMUNICATION;
+  app_types[2] = mobile_apis::AppHMIType::MEDIA;
+  app_types[3] = mobile_apis::AppHMIType::PROJECTION;
 
   EXPECT_FALSE(app_impl->is_navi());
   EXPECT_FALSE(app_impl->is_voice_communication_supported());
diff --git a/src/components/application_manager/test/application_state_test.cc b/src/components/application_manager/test/application_state_test.cc
index 7bc34966b4..2e80273e8c 100644
--- a/src/components/application_manager/test/application_state_test.cc
+++ b/src/components/application_manager/test/application_state_test.cc
@@ -34,6 +34,7 @@
 #include "gtest/gtest.h"
 #include "application_manager/hmi_state.h"
 #include "application_manager/mock_application_manager.h"
+#include "application_manager/mock_application.h"
 #include "application_manager/event_engine/event_dispatcher.h"
 #include "resumption/last_state.h"
 #include "application_manager/policies/policy_handler.h"
@@ -64,12 +65,17 @@ std::vector<StateID> GenerateCurrentStates() {
 }
 
 class ApplicationStateTest : public ::testing::Test {
+ public:
+  void SetUp() OVERRIDE {
+    mock_app_.reset(new MockApplication);
+  }
+
  protected:
   static std::vector<StateID> added_states_;
   ApplicationState app_state;
   const StateID current_id = StateID::STATE_ID_CURRENT;
   const StateID postponed_id = StateID::STATE_ID_POSTPONED;
-  const uint32_t app_id = 10;
+  utils::SharedPtr<MockApplication> mock_app_;
   MockApplicationManager app_mngr_;
 };
 
@@ -80,7 +86,7 @@ TEST_F(ApplicationStateTest, AddStates_GetCurrentStates) {
   std::vector<StateID>::iterator new_state = added_states_.begin();
   for (; new_state != added_states_.end(); ++new_state) {
     HmiStatePtr state =
-        utils::MakeShared<HmiState>(app_id, app_mngr_, *new_state);
+        utils::MakeShared<HmiState>(mock_app_, app_mngr_, *new_state);
     app_state.AddState(state);
     EXPECT_EQ(state, app_state.GetState(current_id));
   }
@@ -90,7 +96,7 @@ TEST_F(ApplicationStateTest, AddStates_RemoveStates_GetCurrentState) {
   std::vector<StateID>::iterator new_state = added_states_.begin();
   for (; new_state != added_states_.end(); ++new_state) {
     HmiStatePtr state =
-        utils::MakeShared<HmiState>(app_id, app_mngr_, *new_state);
+        utils::MakeShared<HmiState>(mock_app_, app_mngr_, *new_state);
     app_state.AddState(state);
 
     HmiStatePtr curr_state = app_state.GetState(current_id);
@@ -111,7 +117,7 @@ TEST_F(ApplicationStateTest, AddStatesAddPostponedState_GetPostponedState) {
   std::vector<StateID>::iterator new_state = added_states_.begin();
   for (; new_state != added_states_.end(); ++new_state) {
     HmiStatePtr state =
-        utils::MakeShared<HmiState>(app_id, app_mngr_, *new_state);
+        utils::MakeShared<HmiState>(mock_app_, app_mngr_, *new_state);
     app_state.AddState(state);
   }
   // Postponed state wasn't added
@@ -119,7 +125,7 @@ TEST_F(ApplicationStateTest, AddStatesAddPostponedState_GetPostponedState) {
   EXPECT_EQ(NULL, get_postponed_id);
   // Add posponed state
   HmiStatePtr state =
-      utils::MakeShared<HmiState>(app_id, app_mngr_, postponed_id);
+      utils::MakeShared<HmiState>(mock_app_, app_mngr_, postponed_id);
   app_state.AddState(state);
   // Postponed state exists
   get_postponed_id = app_state.GetState(postponed_id);
@@ -130,13 +136,13 @@ TEST_F(ApplicationStateTest, AddStates_GetRegularState) {
   // Add state
   std::vector<StateID>::iterator new_state = added_states_.begin();
   HmiStatePtr state =
-      utils::MakeShared<HmiState>(app_id, app_mngr_, *new_state);
+      utils::MakeShared<HmiState>(mock_app_, app_mngr_, *new_state);
   state->set_hmi_level(HMILevel::HMI_FULL);
   app_state.AddState(state);
   ++new_state;
   // Add some other
   for (; new_state != added_states_.end(); ++new_state) {
-    state = utils::MakeShared<HmiState>(app_id, app_mngr_, *new_state);
+    state = utils::MakeShared<HmiState>(mock_app_, app_mngr_, *new_state);
     app_state.AddState(state);
     state->set_hmi_level(HMILevel::HMI_LIMITED);
   }
@@ -151,12 +157,12 @@ TEST_F(ApplicationStateTest, AddStates_GetRegularState) {
 TEST_F(ApplicationStateTest, AddRegularState_RemoveFirstState_GetRegularState) {
   std::vector<StateID>::iterator new_state = added_states_.begin();
   HmiStatePtr state =
-      utils::MakeShared<HmiState>(app_id, app_mngr_, *new_state);
+      utils::MakeShared<HmiState>(mock_app_, app_mngr_, *new_state);
   app_state.AddState(state);
   ++new_state;
 
   // Add postponed state
-  state = utils::MakeShared<HmiState>(app_id, app_mngr_, postponed_id);
+  state = utils::MakeShared<HmiState>(mock_app_, app_mngr_, postponed_id);
   app_state.AddState(state);
 
   // Make sure that the state was added
@@ -164,7 +170,7 @@ TEST_F(ApplicationStateTest, AddRegularState_RemoveFirstState_GetRegularState) {
   ASSERT_EQ(state, post_state);
 
   for (; new_state != added_states_.end(); ++new_state) {
-    state = utils::MakeShared<HmiState>(app_id, app_mngr_, *new_state);
+    state = utils::MakeShared<HmiState>(mock_app_, app_mngr_, *new_state);
     app_state.AddState(state);
   }
 
@@ -185,21 +191,21 @@ TEST_F(ApplicationStateTest, AddRegularState_PreviousStatePostponed) {
   // Add some state
   StateID first_state = StateID::STATE_ID_PHONE_CALL;
   HmiStatePtr state =
-      utils::MakeShared<HmiState>(app_id, app_mngr_, first_state);
+      utils::MakeShared<HmiState>(mock_app_, app_mngr_, first_state);
   app_state.AddState(state);
 
   // Add postponed state
-  state = utils::MakeShared<HmiState>(app_id, app_mngr_, postponed_id);
+  state = utils::MakeShared<HmiState>(mock_app_, app_mngr_, postponed_id);
   app_state.AddState(state);
 
   // Add new postponed state
-  const uint32_t app_id2 = 10;
-  state = utils::MakeShared<HmiState>(app_id2, app_mngr_, postponed_id);
+  utils::SharedPtr<MockApplication> mock_app_2(new MockApplication);
+  state = utils::MakeShared<HmiState>(mock_app_2, app_mngr_, postponed_id);
   app_state.AddState(state);
 
   // Add regular state
-  state =
-      utils::MakeShared<HmiState>(app_id, app_mngr_, StateID::STATE_ID_REGULAR);
+  state = utils::MakeShared<HmiState>(
+      mock_app_, app_mngr_, StateID::STATE_ID_REGULAR);
   app_state.AddState(state);
 
   // Postponed state is the first
@@ -214,7 +220,7 @@ TEST_F(ApplicationStateTest, AddRegularState_PreviousStatePostponed) {
 TEST_F(ApplicationStateTest, InitState_GetRegularState) {
   StateID init_state = StateID::STATE_ID_REGULAR;
   HmiStatePtr state =
-      utils::MakeShared<HmiState>(app_id, app_mngr_, init_state);
+      utils::MakeShared<HmiState>(mock_app_, app_mngr_, init_state);
 
   app_state.InitState(state);
 
@@ -229,13 +235,13 @@ TEST_F(ApplicationStateTest, AddPosponedState_DeletePosponedState) {
   // Precondition
   StateID init_state = StateID::STATE_ID_REGULAR;
   HmiStatePtr state =
-      utils::MakeShared<HmiState>(app_id, app_mngr_, init_state);
+      utils::MakeShared<HmiState>(mock_app_, app_mngr_, init_state);
   state->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
 
   app_state.InitState(state);
 
   // Add postponed state
-  state = utils::MakeShared<HmiState>(app_id, app_mngr_, postponed_id);
+  state = utils::MakeShared<HmiState>(mock_app_, app_mngr_, postponed_id);
   app_state.AddState(state);
 
   // Make sure that state was added
@@ -252,7 +258,8 @@ TEST_F(ApplicationStateTest, AddPosponedState_DeletePosponedState) {
 TEST_F(ApplicationStateTest,
        AddRegularState_RemoveRegularState_RegularStateNotDeleted) {
   StateID reg_state = StateID::STATE_ID_REGULAR;
-  HmiStatePtr state = utils::MakeShared<HmiState>(app_id, app_mngr_, reg_state);
+  HmiStatePtr state =
+      utils::MakeShared<HmiState>(mock_app_, app_mngr_, reg_state);
   app_state.InitState(state);
 
   // Try deleting regular state
diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h
index a8c4f96b35..9790774831 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application.h
@@ -157,6 +157,7 @@ class MockApplication : public ::application_manager::Application {
                bool(mobile_apis::FunctionID::eType cmd_id,
                     ::application_manager::TLimitSource source));
   MOCK_METHOD0(usage_report, ::application_manager::UsageStatistics&());
+  MOCK_METHOD1(SetInitialState, void(::application_manager::HmiStatePtr state));
   MOCK_METHOD1(SetRegularState, void(::application_manager::HmiStatePtr state));
   MOCK_METHOD1(SetPostponedState,
                void(::application_manager::HmiStatePtr state));
diff --git a/src/components/application_manager/test/message_helper/CMakeLists.txt b/src/components/application_manager/test/message_helper/CMakeLists.txt
index ccf05fc1c9..8ebb2dea0e 100755
--- a/src/components/application_manager/test/message_helper/CMakeLists.txt
+++ b/src/components/application_manager/test/message_helper/CMakeLists.txt
@@ -49,8 +49,8 @@ set(LIBRARIES
 
 if(REMOTE_CONTROL)
     SET (LIBRARIES
-      FunctionalModule
-      ${LIBRARIES}
+        FunctionalModule
+        ${LIBRARIES}
     )
 endif(REMOTE_CONTROL)
 
diff --git a/src/components/application_manager/test/state_controller/state_controller_test.cc b/src/components/application_manager/test/state_controller/state_controller_test.cc
index eb718c8b8b..694e105fbd 100644
--- a/src/components/application_manager/test/state_controller/state_controller_test.cc
+++ b/src/components/application_manager/test/state_controller/state_controller_test.cc
@@ -213,7 +213,7 @@ class StateControllerImplTest : public ::testing::Test {
     namespace SystemContext = mobile_apis::SystemContext;
 
     am::HmiStatePtr state =
-        utils::MakeShared<am::HmiState>(simple_app_id_, app_manager_mock_);
+        utils::MakeShared<am::HmiState>(simple_app_, app_manager_mock_);
     state->set_hmi_level(hmi_level);
     state->set_audio_streaming_state(aidio_ss);
     state->set_system_context(system_context);
@@ -229,9 +229,9 @@ class StateControllerImplTest : public ::testing::Test {
       const mobile_apis::HMILevel::eType hmi_level,
       const mobile_apis::AudioStreamingState::eType audio_ss,
       const mobile_apis::SystemContext::eType system_context,
-      const uint32_t app_id) {
+      const am::ApplicationSharedPtr app) {
     am::HmiStatePtr new_state =
-        utils::MakeShared<HmiStateType>(app_id, app_manager_mock_);
+        utils::MakeShared<HmiStateType>(app, app_manager_mock_);
 
     new_state->set_hmi_level(hmi_level);
     new_state->set_audio_streaming_state(audio_ss);
@@ -591,9 +591,9 @@ class StateControllerImplTest : public ::testing::Test {
       app_type = AppType(app_id);
       app = (*it_begin);
       am::HmiStatePtr state_first =
-          utils::MakeShared<T>(app_id, app_manager_mock_);
+          utils::MakeShared<T>(app, app_manager_mock_);
       am::HmiStatePtr state_second =
-          utils::MakeShared<Q>(app_id, app_manager_mock_);
+          utils::MakeShared<Q>(app, app_manager_mock_);
       TestSetSeveralState(
           app, state_first, state_second, app_type, call_back_result);
       TestSetSeveralState(
@@ -1981,8 +1981,8 @@ TEST_F(StateControllerImplTest, ApplyTempStatesForMediaNaviVCApp) {
 }
 
 TEST_F(StateControllerImplTest, SetStatePhoneCallForNonMediaApplication) {
-  am::HmiStatePtr state_phone_call = utils::MakeShared<am::PhoneCallHmiState>(
-      simple_app_id_, app_manager_mock_);
+  am::HmiStatePtr state_phone_call =
+      utils::MakeShared<am::PhoneCallHmiState>(simple_app_, app_manager_mock_);
   TestSetState(simple_app_,
                state_phone_call,
                APP_TYPE_NON_MEDIA,
@@ -1990,8 +1990,8 @@ TEST_F(StateControllerImplTest, SetStatePhoneCallForNonMediaApplication) {
 }
 
 TEST_F(StateControllerImplTest, SetStatePhoneCallForMediaApplication) {
-  am::HmiStatePtr state_phone_call = utils::MakeShared<am::PhoneCallHmiState>(
-      media_app_id_, app_manager_mock_);
+  am::HmiStatePtr state_phone_call =
+      utils::MakeShared<am::PhoneCallHmiState>(media_app_, app_manager_mock_);
   TestSetState(media_app_,
                state_phone_call,
                APP_TYPE_MEDIA,
@@ -2000,7 +2000,7 @@ TEST_F(StateControllerImplTest, SetStatePhoneCallForMediaApplication) {
 
 TEST_F(StateControllerImplTest, SetStatePhoneCallForMediaNaviApplication) {
   am::HmiStatePtr state_phone_call = utils::MakeShared<am::PhoneCallHmiState>(
-      media_navi_app_id_, app_manager_mock_);
+      media_navi_app_, app_manager_mock_);
   TestSetState(media_navi_app_,
                state_phone_call,
                APP_TYPE_NAVI,
@@ -2009,7 +2009,7 @@ TEST_F(StateControllerImplTest, SetStatePhoneCallForMediaNaviApplication) {
 
 TEST_F(StateControllerImplTest, SetVRStateForNonMediaApplication) {
   am::HmiStatePtr state_vr =
-      utils::MakeShared<am::VRHmiState>(simple_app_id_, app_manager_mock_);
+      utils::MakeShared<am::VRHmiState>(simple_app_, app_manager_mock_);
   TestSetState(simple_app_,
                state_vr,
                APP_TYPE_NON_MEDIA,
@@ -2018,7 +2018,7 @@ TEST_F(StateControllerImplTest, SetVRStateForNonMediaApplication) {
 
 TEST_F(StateControllerImplTest, SetVRStateForMediaApplication) {
   am::HmiStatePtr state_vr =
-      utils::MakeShared<am::VRHmiState>(media_app_id_, app_manager_mock_);
+      utils::MakeShared<am::VRHmiState>(media_app_, app_manager_mock_);
   TestSetState(media_app_,
                state_vr,
                APP_TYPE_MEDIA,
@@ -2026,8 +2026,8 @@ TEST_F(StateControllerImplTest, SetVRStateForMediaApplication) {
 }
 
 TEST_F(StateControllerImplTest, SetVRStateForMediaNaviVoiceApplication) {
-  am::HmiStatePtr state_vr = utils::MakeShared<am::VRHmiState>(
-      media_navi_vc_app_id_, app_manager_mock_);
+  am::HmiStatePtr state_vr =
+      utils::MakeShared<am::VRHmiState>(media_navi_vc_app_, app_manager_mock_);
   TestSetState(media_navi_vc_app_,
                state_vr,
                APP_TYPE_MEDIA,
@@ -2037,7 +2037,7 @@ TEST_F(StateControllerImplTest, SetVRStateForMediaNaviVoiceApplication) {
 TEST_F(StateControllerImplTest,
        SetTTSStateForNonMediaApplicationAttenuatedNotSupported) {
   am::HmiStatePtr state_tts =
-      utils::MakeShared<am::TTSHmiState>(simple_app_id_, app_manager_mock_);
+      utils::MakeShared<am::TTSHmiState>(simple_app_, app_manager_mock_);
   EXPECT_CALL(app_manager_mock_, is_attenuated_supported())
       .WillRepeatedly(Return(false));
   TestSetState(simple_app_,
@@ -2049,7 +2049,7 @@ TEST_F(StateControllerImplTest,
 TEST_F(StateControllerImplTest,
        SetTTSStateForNonMediaApplicationAttenuatedSupported) {
   am::HmiStatePtr state_tts =
-      utils::MakeShared<am::TTSHmiState>(simple_app_id_, app_manager_mock_);
+      utils::MakeShared<am::TTSHmiState>(simple_app_, app_manager_mock_);
   EXPECT_CALL(app_manager_mock_, is_attenuated_supported())
       .WillRepeatedly(Return(true));
   TestSetState(simple_app_,
@@ -2061,7 +2061,7 @@ TEST_F(StateControllerImplTest,
 TEST_F(StateControllerImplTest,
        SetTTSStateForMediaApplicationAttenuatedNotSupported) {
   am::HmiStatePtr state_tts =
-      utils::MakeShared<am::TTSHmiState>(media_app_id_, app_manager_mock_);
+      utils::MakeShared<am::TTSHmiState>(media_app_, app_manager_mock_);
   EXPECT_CALL(app_manager_mock_, is_attenuated_supported())
       .WillRepeatedly(Return(false));
   TestSetState(media_app_,
@@ -2073,7 +2073,7 @@ TEST_F(StateControllerImplTest,
 TEST_F(StateControllerImplTest,
        SetTTSStateForMediaApplicationAttenuatedSupported) {
   am::HmiStatePtr state_tts =
-      utils::MakeShared<am::TTSHmiState>(media_app_id_, app_manager_mock_);
+      utils::MakeShared<am::TTSHmiState>(media_app_, app_manager_mock_);
   EXPECT_CALL(app_manager_mock_, is_attenuated_supported())
       .WillRepeatedly(Return(true));
   TestSetState(media_app_,
@@ -2084,8 +2084,8 @@ TEST_F(StateControllerImplTest,
 
 TEST_F(StateControllerImplTest,
        SetTTSStateForMediaNaviVCApplicationAttenuatedNotSupported) {
-  am::HmiStatePtr state_tts = utils::MakeShared<am::TTSHmiState>(
-      media_navi_vc_app_id_, app_manager_mock_);
+  am::HmiStatePtr state_tts =
+      utils::MakeShared<am::TTSHmiState>(media_navi_vc_app_, app_manager_mock_);
   EXPECT_CALL(app_manager_mock_, is_attenuated_supported())
       .WillRepeatedly(Return(false));
   TestSetState(media_navi_vc_app_,
@@ -2096,8 +2096,8 @@ TEST_F(StateControllerImplTest,
 
 TEST_F(StateControllerImplTest,
        SetTTSStateForMediaNaviVCApplicationAttenuatedSupported) {
-  am::HmiStatePtr state_tts = utils::MakeShared<am::TTSHmiState>(
-      media_navi_vc_app_id_, app_manager_mock_);
+  am::HmiStatePtr state_tts =
+      utils::MakeShared<am::TTSHmiState>(media_navi_vc_app_, app_manager_mock_);
   EXPECT_CALL(app_manager_mock_, is_attenuated_supported())
       .WillRepeatedly(Return(true));
   TestSetState(media_navi_vc_app_,
@@ -2108,7 +2108,7 @@ TEST_F(StateControllerImplTest,
 
 TEST_F(StateControllerImplTest, SetNaviStreamingStateForNonMediaApplication) {
   am::HmiStatePtr state_navi_streming =
-      utils::MakeShared<am::NaviStreamingHmiState>(simple_app_id_,
+      utils::MakeShared<am::NaviStreamingHmiState>(simple_app_,
                                                    app_manager_mock_);
   TestSetState(simple_app_,
                state_navi_streming,
@@ -2119,7 +2119,7 @@ TEST_F(StateControllerImplTest, SetNaviStreamingStateForNonMediaApplication) {
 TEST_F(StateControllerImplTest,
        SetNaviStreamingStateMediaApplicationAttenuatedNotSupported) {
   am::HmiStatePtr state_navi_streming =
-      utils::MakeShared<am::NaviStreamingHmiState>(media_app_id_,
+      utils::MakeShared<am::NaviStreamingHmiState>(media_app_,
                                                    app_manager_mock_);
   EXPECT_CALL(app_manager_mock_, is_attenuated_supported())
       .WillRepeatedly(Return(false));
@@ -2132,7 +2132,7 @@ TEST_F(StateControllerImplTest,
 TEST_F(StateControllerImplTest,
        SetNaviStreamingStateMediaApplicationAttenuatedSupported) {
   am::HmiStatePtr state_navi_streming =
-      utils::MakeShared<am::NaviStreamingHmiState>(media_app_id_,
+      utils::MakeShared<am::NaviStreamingHmiState>(media_app_,
                                                    app_manager_mock_);
   EXPECT_CALL(app_manager_mock_, is_attenuated_supported())
       .WillRepeatedly(Return(true));
@@ -2145,8 +2145,7 @@ TEST_F(StateControllerImplTest,
 TEST_F(StateControllerImplTest,
        SetNaviStreamingStateVCApplicationAttenuatedNotSupported) {
   am::HmiStatePtr state_navi_streming =
-      utils::MakeShared<am::NaviStreamingHmiState>(vc_app_id_,
-                                                   app_manager_mock_);
+      utils::MakeShared<am::NaviStreamingHmiState>(vc_app_, app_manager_mock_);
   EXPECT_CALL(app_manager_mock_, is_attenuated_supported())
       .WillRepeatedly(Return(false));
   TestSetState(vc_app_,
@@ -2158,8 +2157,7 @@ TEST_F(StateControllerImplTest,
 TEST_F(StateControllerImplTest,
        SetNaviStreamingStateVCApplicationAttenuatedSupported) {
   am::HmiStatePtr state_navi_streming =
-      utils::MakeShared<am::NaviStreamingHmiState>(vc_app_id_,
-                                                   app_manager_mock_);
+      utils::MakeShared<am::NaviStreamingHmiState>(vc_app_, app_manager_mock_);
   EXPECT_CALL(app_manager_mock_, is_attenuated_supported())
       .WillRepeatedly(Return(true));
   TestSetState(vc_app_,
@@ -2170,7 +2168,7 @@ TEST_F(StateControllerImplTest,
 
 TEST_F(StateControllerImplTest, SetNaviStreamingStateNaviApplication) {
   am::HmiStatePtr state_navi_streming =
-      utils::MakeShared<am::NaviStreamingHmiState>(navi_app_id_,
+      utils::MakeShared<am::NaviStreamingHmiState>(navi_app_,
                                                    app_manager_mock_);
   TestSetState(navi_app_,
                state_navi_streming,
@@ -2180,7 +2178,7 @@ TEST_F(StateControllerImplTest, SetNaviStreamingStateNaviApplication) {
 
 TEST_F(StateControllerImplTest, SetNaviStreamingStateMediaNaviApplication) {
   am::HmiStatePtr state_navi_streming =
-      utils::MakeShared<am::NaviStreamingHmiState>(media_navi_app_id_,
+      utils::MakeShared<am::NaviStreamingHmiState>(media_navi_app_,
                                                    app_manager_mock_);
   TestSetState(media_navi_app_,
                state_navi_streming,
@@ -2189,8 +2187,8 @@ TEST_F(StateControllerImplTest, SetNaviStreamingStateMediaNaviApplication) {
 }
 
 TEST_F(StateControllerImplTest, SetSafetyModeStateForNonMediaApplication) {
-  am::HmiStatePtr state_safety_mode = utils::MakeShared<am::SafetyModeHmiState>(
-      simple_app_id_, app_manager_mock_);
+  am::HmiStatePtr state_safety_mode =
+      utils::MakeShared<am::SafetyModeHmiState>(simple_app_, app_manager_mock_);
   TestSetState(simple_app_,
                state_safety_mode,
                APP_TYPE_NON_MEDIA,
@@ -2199,7 +2197,7 @@ TEST_F(StateControllerImplTest, SetSafetyModeStateForNonMediaApplication) {
 
 TEST_F(StateControllerImplTest, SetSafetyModeStateForMediaApplication) {
   am::HmiStatePtr state_safety_mode =
-      utils::MakeShared<am::VRHmiState>(media_app_id_, app_manager_mock_);
+      utils::MakeShared<am::VRHmiState>(media_app_, app_manager_mock_);
   TestSetState(media_app_,
                state_safety_mode,
                APP_TYPE_MEDIA,
@@ -2208,8 +2206,8 @@ TEST_F(StateControllerImplTest, SetSafetyModeStateForMediaApplication) {
 
 TEST_F(StateControllerImplTest,
        SetSafetyModeStateForMediaNaviVoiceApplication) {
-  am::HmiStatePtr state_safety_mode = utils::MakeShared<am::VRHmiState>(
-      media_navi_vc_app_id_, app_manager_mock_);
+  am::HmiStatePtr state_safety_mode =
+      utils::MakeShared<am::VRHmiState>(media_navi_vc_app_, app_manager_mock_);
   TestSetState(media_navi_vc_app_,
                state_safety_mode,
                APP_TYPE_MEDIA,
@@ -2909,7 +2907,7 @@ TEST_F(StateControllerImplTest, OnApplicationRegisteredDifferentStates) {
       mobile_apis::HMILevel::HMI_FULL,
       mobile_apis::AudioStreamingState::AUDIBLE,
       mobile_apis::SystemContext::SYSCTXT_MAIN,
-      app_id);
+      simple_app_);
 
   EXPECT_CALL(*simple_app_ptr_, app_id()).WillRepeatedly(Return(app_id));
   EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
@@ -2921,7 +2919,7 @@ TEST_F(StateControllerImplTest, OnApplicationRegisteredDifferentStates) {
           mobile_apis::HMILevel::HMI_BACKGROUND,
           mobile_apis::AudioStreamingState::AUDIBLE,
           mobile_apis::SystemContext::SYSCTXT_MAIN,
-          app_id);
+          simple_app_);
 
   EXPECT_CALL(*simple_app_ptr_, RegularHmiState()).WillOnce(Return(old_state));
   EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
@@ -2958,7 +2956,7 @@ TEST_F(StateControllerImplTest, OnApplicationRegisteredEqualStates) {
       mobile_apis::HMILevel::HMI_FULL,
       mobile_apis::AudioStreamingState::AUDIBLE,
       mobile_apis::SystemContext::SYSCTXT_MAIN,
-      app_id);
+      simple_app_);
 
   EXPECT_CALL(*simple_app_ptr_, app_id()).WillRepeatedly(Return(app_id));
   EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
@@ -2970,7 +2968,7 @@ TEST_F(StateControllerImplTest, OnApplicationRegisteredEqualStates) {
           mobile_apis::HMILevel::HMI_BACKGROUND,
           mobile_apis::AudioStreamingState::AUDIBLE,
           mobile_apis::SystemContext::SYSCTXT_MAIN,
-          app_id);
+          simple_app_);
   EXPECT_CALL(*simple_app_ptr_, RegularHmiState())
       .WillOnce(Return(default_state));
   EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())