diff options
author | Andriy Byzhynar <abyzhynar@luxoft.com> | 2018-06-18 15:55:56 +0300 |
---|---|---|
committer | Ira Lytvynenko (GitHub) <ILytvynenko@luxoft.com> | 2018-06-26 12:01:49 +0300 |
commit | 069b2b8bc692623ee2bc87ecb118a48777b5999c (patch) | |
tree | ad9fd1b1841be401b8b10102b5ed6107d89f5257 | |
parent | 0a1e969a12ddf8aaebc21a6ef98f732ef3cd7567 (diff) | |
download | sdl_core-069b2b8bc692623ee2bc87ecb118a48777b5999c.tar.gz |
Fix unit tests
Fixed the following unit tests:
- resume_ctrl_test
- resumption_data_json_test
5 files changed, 172 insertions, 123 deletions
diff --git a/src/components/application_manager/test/include/application_manager/resumption_data_test.h b/src/components/application_manager/test/include/application_manager/resumption_data_test.h index 5ef6b54f42..7043e3f623 100644 --- a/src/components/application_manager/test/include/application_manager/resumption_data_test.h +++ b/src/components/application_manager/test/include/application_manager/resumption_data_test.h @@ -39,6 +39,7 @@ #include "application_manager/usage_statistics.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" +#include "application_manager/mock_app_extension.h" #include "utils/data_accessor.h" #include "config_profile/profile.h" #include "application_manager/policies/policy_handler.h" @@ -146,6 +147,9 @@ class ResumptionDataTest : public ::testing::Test { application_manager_test::MockApplicationManagerSettings mock_application_manager_settings_; application_manager_test::MockApplicationManager mock_application_manager_; + utils::SharedPtr<NiceMock<application_manager_test::MockAppExtension> > + mock_app_extension_; + std::list<application_manager::AppExtensionPtr> extensions_; }; } // namespace resumption_test diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc index 736d5d1839..70bbe4bd96 100644 --- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc +++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc @@ -37,6 +37,7 @@ #include "application_manager/resumption/resume_ctrl_impl.h" #include "application_manager/usage_statistics.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_app_extension.h" #include "application_manager/mock_resumption_data.h" #include "interfaces/MOBILE_API.h" #include "application_manager/application_manager_impl.h" @@ -83,21 +84,23 @@ class ResumeCtrlTest : public ::testing::Test { , kTestTimeStamp_(1452074434u) {} virtual void SetUp() OVERRIDE { - Mock::VerifyAndClearExpectations(&app_mngr_); - ON_CALL(app_mngr_, event_dispatcher()) + Mock::VerifyAndClearExpectations(&mock_app_mngr_); + ON_CALL(mock_app_mngr_, event_dispatcher()) .WillByDefault(ReturnRef(mock_event_dispatcher_)); mock_storage_ = ::utils::MakeShared<NiceMock<resumption_test::MockResumptionData> >( - app_mngr_); - app_mock_ = utils::MakeShared<NiceMock<MockApplication> >(); + mock_app_mngr_); + mock_app_ = utils::MakeShared<NiceMock<MockApplication> >(); + mock_app_extension_ = utils::MakeShared< + NiceMock<application_manager_test::MockAppExtension> >(); const_app_ = - static_cast<application_manager::ApplicationConstSharedPtr>(app_mock_); - res_ctrl_ = utils::MakeShared<ResumeCtrlImpl>(app_mngr_); + static_cast<application_manager::ApplicationConstSharedPtr>(mock_app_); + res_ctrl_ = utils::MakeShared<ResumeCtrlImpl>(mock_app_mngr_); res_ctrl_->set_resumption_storage(mock_storage_); - ON_CALL(app_mngr_, state_controller()) - .WillByDefault(ReturnRef(state_controller_)); - ON_CALL(app_mngr_, get_settings()) + ON_CALL(mock_app_mngr_, state_controller()) + .WillByDefault(ReturnRef(mock_state_controller_)); + ON_CALL(mock_app_mngr_, get_settings()) .WillByDefault(ReturnRef(mock_application_manager_settings_)); ON_CALL(mock_application_manager_settings_, use_db_for_resumption()) @@ -106,25 +109,27 @@ class ResumeCtrlTest : public ::testing::Test { .WillByDefault(ReturnRef(kAppResumingTimeout_)); } void TearDown() OVERRIDE { - Mock::VerifyAndClearExpectations(&app_mngr_); + Mock::VerifyAndClearExpectations(&mock_app_mngr_); } void GetInfoFromApp() { - ON_CALL(*app_mock_, policy_app_id()) + ON_CALL(*mock_app_, policy_app_id()) .WillByDefault(Return(kTestPolicyAppId_)); - ON_CALL(*app_mock_, mac_address()).WillByDefault(ReturnRef(kMacAddress_)); - ON_CALL(*app_mock_, device()).WillByDefault(Return(kTestDevId_)); - ON_CALL(*app_mock_, app_id()).WillByDefault(Return(kTestAppId_)); + ON_CALL(*mock_app_, mac_address()).WillByDefault(ReturnRef(kMacAddress_)); + ON_CALL(*mock_app_, device()).WillByDefault(Return(kTestDevId_)); + ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kTestAppId_)); } NiceMock<event_engine_test::MockEventDispatcher> mock_event_dispatcher_; application_manager_test::MockApplicationManagerSettings mock_application_manager_settings_; - application_manager_test::MockApplicationManager app_mngr_; - MockStateController state_controller_; + application_manager_test::MockApplicationManager mock_app_mngr_; + utils::SharedPtr<NiceMock<application_manager_test::MockAppExtension> > + mock_app_extension_; + MockStateController mock_state_controller_; utils::SharedPtr<ResumeCtrl> res_ctrl_; utils::SharedPtr<NiceMock<resumption_test::MockResumptionData> > mock_storage_; - utils::SharedPtr<NiceMock<MockApplication> > app_mock_; + utils::SharedPtr<NiceMock<MockApplication> > mock_app_; application_manager::ApplicationConstSharedPtr const_app_; const uint32_t kTestAppId_; const std::string kTestPolicyAppId_; @@ -151,15 +156,15 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithGrammarId) { // Check RestoreApplicationData GetInfoFromApp(); - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_CALL(*app_mock_, UpdateHash()); - EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_)); + EXPECT_CALL(*mock_app_, UpdateHash()); + EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); - const bool res = res_ctrl_->StartResumption(app_mock_, kHash_); + const bool res = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_TRUE(res); } @@ -175,16 +180,16 @@ TEST_F(ResumeCtrlTest, StartResumption_WithoutGrammarId) { saved_app[application_manager::strings::hash_id] = kHash_; GetInfoFromApp(); - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); // Check RestoreApplicationData ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_CALL(*app_mock_, UpdateHash()); - EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_)).Times(0); + EXPECT_CALL(*mock_app_, UpdateHash()); + EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)).Times(0); - bool res = res_ctrl_->StartResumption(app_mock_, kHash_); + bool res = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_FALSE(res); } @@ -223,15 +228,15 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithFiles) { test_application_files; // Check RestoreApplicationData - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_CALL(*app_mock_, UpdateHash()); - EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_)); + EXPECT_CALL(*mock_app_, UpdateHash()); + EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); for (uint32_t i = 0; i < count_of_files; ++i) { - EXPECT_CALL(*app_mock_, + EXPECT_CALL(*mock_app_, AddFile(CheckAppFile( true, true, @@ -239,7 +244,7 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithFiles) { static_cast<mobile_apis::FileType::eType>(file_types[i])))); } - const bool res = res_ctrl_->StartResumption(app_mock_, kHash_); + const bool res = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_TRUE(res); } @@ -261,27 +266,27 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubmenues) { test_application_submenues; // Check RestoreApplicationData - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_)); + EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); for (uint32_t i = 0; i < count_of_submenues; ++i) { - EXPECT_CALL(*app_mock_, AddSubMenu(i, test_application_submenues[i])); + EXPECT_CALL(*mock_app_, AddSubMenu(i, test_application_submenues[i])); } smart_objects::SmartObjectList requests; - EXPECT_CALL(app_mngr_, GetNextHMICorrelationID()) + EXPECT_CALL(mock_app_mngr_, GetNextHMICorrelationID()) .WillRepeatedly(Return(kCorId_)); EXPECT_CALL(*application_manager::MockMessageHelper::message_helper_mock(), CreateAddSubMenuRequestToHMI(_, kCorId_)) .WillRepeatedly(Return(requests)); - EXPECT_CALL(*app_mock_, UpdateHash()); - const bool res = res_ctrl_->StartResumption(app_mock_, kHash_); + EXPECT_CALL(*mock_app_, UpdateHash()); + const bool res = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_TRUE(res); } @@ -302,17 +307,17 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithCommands) { saved_app[application_manager::strings::application_commands] = test_application_commands; - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); // Check RestoreApplicationData ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_CALL(*app_mock_, UpdateHash()); - EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_)); + EXPECT_CALL(*mock_app_, UpdateHash()); + EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); for (uint32_t i = 0; i < count_of_commands; ++i) { - EXPECT_CALL(*app_mock_, AddCommand(i, test_application_commands[i])); + EXPECT_CALL(*mock_app_, AddCommand(i, test_application_commands[i])); } smart_objects::SmartObjectList requests; @@ -320,7 +325,7 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithCommands) { CreateAddCommandRequestToHMI(_, _)) .WillRepeatedly(Return(requests)); - const bool res = res_ctrl_->StartResumption(app_mock_, kHash_); + const bool res = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_TRUE(res); } @@ -354,17 +359,17 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithChoiceSet) { application_choice_sets; // Check RestoreApplicationData - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); GetInfoFromApp(); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_CALL(*app_mock_, UpdateHash()); - EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_)); + EXPECT_CALL(*mock_app_, UpdateHash()); + EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); for (uint32_t i = 0; i < count_of_choice_sets; ++i) { - EXPECT_CALL(*app_mock_, AddChoiceSet(i, application_choice_sets[i])); + EXPECT_CALL(*mock_app_, AddChoiceSet(i, application_choice_sets[i])); } smart_objects::SmartObjectList requests; @@ -372,7 +377,7 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithChoiceSet) { CreateAddVRCommandRequestFromChoiceToHMI(_)) .WillRepeatedly(Return(requests)); - const bool res = res_ctrl_->StartResumption(app_mock_, kHash_); + const bool res = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_TRUE(res); } @@ -386,22 +391,22 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithGlobalProperties) { test_global_properties; // Check RestoreApplicationData - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); GetInfoFromApp(); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_)); + EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); EXPECT_CALL(*application_manager::MockMessageHelper::message_helper_mock(), SendGlobalPropertiesToHMI(_)); - EXPECT_CALL(*app_mock_, load_global_properties(test_global_properties)); + EXPECT_CALL(*mock_app_, load_global_properties(test_global_properties)); - EXPECT_CALL(*app_mock_, UpdateHash()); - const bool res = res_ctrl_->StartResumption(app_mock_, kHash_); + EXPECT_CALL(*mock_app_, UpdateHash()); + const bool res = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_TRUE(res); } @@ -410,7 +415,7 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscribeOnButtons) { smart_objects::SmartObject test_subscriptions; smart_objects::SmartObject app_buttons; - uint32_t count_of_buttons = 17; + const uint32_t count_of_buttons = 17; for (uint32_t i = 0; i < count_of_buttons; ++i) { app_buttons[i] = i; } @@ -425,26 +430,33 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscribeOnButtons) { test_subscriptions; // Check RestoreApplicationData - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); GetInfoFromApp(); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_)); + EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); for (uint32_t i = 0; i < count_of_buttons; ++i) { EXPECT_CALL( - *app_mock_, + *mock_app_, SubscribeToButton(static_cast<mobile_apis::ButtonName::eType>(i))); } - EXPECT_CALL(*app_mock_, UpdateHash()); + EXPECT_CALL(*mock_app_, UpdateHash()); + + std::list<application_manager::AppExtensionPtr> extensions; + extensions.insert(extensions.begin(), mock_app_extension_); + + EXPECT_CALL(*mock_app_, Extensions()).WillOnce(ReturnRef(extensions)); + + EXPECT_CALL(*mock_app_extension_, ProcessResumption(test_subscriptions)); EXPECT_CALL(*application_manager::MockMessageHelper::message_helper_mock(), SendAllOnButtonSubscriptionNotificationsForApp(_, _)).Times(2); - const bool res = res_ctrl_->StartResumption(app_mock_, kHash_); + const bool res = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_TRUE(res); } @@ -470,19 +482,26 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscriptionToIVI) { test_subscriptions; // Check RestoreApplicationData - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); GetInfoFromApp(); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_)); + EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); smart_objects::SmartObjectList requests; - EXPECT_CALL(*app_mock_, UpdateHash()); - const bool res = res_ctrl_->StartResumption(app_mock_, kHash_); + EXPECT_CALL(*mock_app_, UpdateHash()); + std::list<application_manager::AppExtensionPtr> extensions; + + extensions.insert(extensions.begin(), mock_app_extension_); + + EXPECT_CALL(*mock_app_, Extensions()).WillOnce(ReturnRef(extensions)); + + EXPECT_CALL(*mock_app_extension_, ProcessResumption(test_subscriptions)); + const bool res = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_TRUE(res); } @@ -497,30 +516,30 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscriptionToWayPoints) { ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_)); + EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); EXPECT_CALL( - app_mngr_, + mock_app_mngr_, SubscribeAppForWayPoints(A<application_manager::ApplicationSharedPtr>())); const mobile_apis::HMILevel::eType hmi_test_level = mobile_apis::HMILevel::HMI_FULL; - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(hmi_test_level)); - EXPECT_CALL(state_controller_, SetRegularState(_, hmi_test_level)); + EXPECT_CALL(mock_state_controller_, SetRegularState(_, hmi_test_level)); - const bool result = res_ctrl_->StartResumption(app_mock_, kHash_); + const bool result = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_TRUE(result); } TEST_F(ResumeCtrlTest, StartResumptionOnlyHMILevel) { smart_objects::SmartObject saved_app; - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); GetInfoFromApp(); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - const bool res = res_ctrl_->StartResumptionOnlyHMILevel(app_mock_); + const bool res = res_ctrl_->StartResumptionOnlyHMILevel(mock_app_); EXPECT_TRUE(res); } @@ -531,7 +550,7 @@ TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppInFull) { saved_app[application_manager::strings::ign_off_count] = ign_off_count; saved_app[application_manager::strings::hmi_level] = restored_test_type; - EXPECT_CALL(state_controller_, SetRegularState(_, restored_test_type)) + EXPECT_CALL(mock_state_controller_, SetRegularState(_, restored_test_type)) .Times(AtLeast(1)); GetInfoFromApp(); ON_CALL(*mock_storage_, @@ -542,9 +561,9 @@ TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppInFull) { RemoveApplicationFromSaved(kTestPolicyAppId_, kMacAddress_)) .WillOnce(Return(true)); - ON_CALL(app_mngr_, GetUserConsentForDevice("12345")) + ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")) .WillByDefault(Return(policy::kDeviceAllowed)); - res_ctrl_->StartAppHmiStateResumption(app_mock_); + res_ctrl_->StartAppHmiStateResumption(mock_app_); } TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppInBackground) { @@ -555,13 +574,13 @@ TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppInBackground) { saved_app[application_manager::strings::ign_off_count] = ign_off_count; saved_app[application_manager::strings::hmi_level] = restored_test_type; - EXPECT_CALL(app_mngr_, state_controller()).Times(0); + EXPECT_CALL(mock_app_mngr_, state_controller()).Times(0); GetInfoFromApp(); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - res_ctrl_->StartAppHmiStateResumption(app_mock_); + res_ctrl_->StartAppHmiStateResumption(mock_app_); } /** @@ -576,18 +595,18 @@ TEST_F(ResumeCtrlTest, RestoreAppHMIState_RestoreHMILevelFull) { saved_app[application_manager::strings::grammar_id] = kTestGrammarId_; saved_app[application_manager::strings::hmi_level] = restored_test_type; - EXPECT_CALL(state_controller_, SetRegularState(_, restored_test_type)) + EXPECT_CALL(mock_state_controller_, SetRegularState(_, restored_test_type)) .Times(AtLeast(1)); GetInfoFromApp(); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - ON_CALL(app_mngr_, GetUserConsentForDevice("12345")) + ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")) .WillByDefault(Return(policy::kDeviceAllowed)); - EXPECT_CALL(*app_mock_, set_is_resuming(true)); + EXPECT_CALL(*mock_app_, set_is_resuming(true)); - const bool res = res_ctrl_->RestoreAppHMIState(app_mock_); + const bool res = res_ctrl_->RestoreAppHMIState(mock_app_); EXPECT_TRUE(res); } @@ -596,22 +615,23 @@ TEST_F(ResumeCtrlTest, SetupDefaultHMILevel) { saved_app[application_manager::strings::hmi_level] = kDefaultTestLevel_; - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); GetInfoFromApp(); - EXPECT_CALL(app_mngr_, GetUserConsentForDevice("12345")).Times(0); + EXPECT_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")).Times(0); - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); - EXPECT_CALL(state_controller_, SetRegularState(_, kDefaultTestLevel_)) + EXPECT_CALL(mock_state_controller_, SetRegularState(_, kDefaultTestLevel_)) .Times(AtLeast(1)); - res_ctrl_->SetupDefaultHMILevel(app_mock_); + res_ctrl_->SetupDefaultHMILevel(mock_app_); } TEST_F(ResumeCtrlTest, ApplicationResumptiOnTimer_AppInFull) { - ON_CALL(app_mngr_, application(kTestAppId_)).WillByDefault(Return(app_mock_)); + ON_CALL(mock_app_mngr_, application(kTestAppId_)) + .WillByDefault(Return(mock_app_)); mobile_apis::HMILevel::eType restored_test_type = eType::HMI_FULL; const uint32_t ign_off_count = 0u; @@ -620,7 +640,7 @@ TEST_F(ResumeCtrlTest, ApplicationResumptiOnTimer_AppInFull) { saved_app[application_manager::strings::hmi_level] = restored_test_type; MockStateController state_controller; - EXPECT_CALL(app_mngr_, state_controller()) + EXPECT_CALL(mock_app_mngr_, state_controller()) .WillOnce(ReturnRef(state_controller)); EXPECT_CALL(state_controller, SetRegularState(_, restored_test_type)) .Times(AtLeast(1)); @@ -633,9 +653,9 @@ TEST_F(ResumeCtrlTest, ApplicationResumptiOnTimer_AppInFull) { RemoveApplicationFromSaved(kTestPolicyAppId_, kMacAddress_)) .WillOnce(Return(true)); - ON_CALL(app_mngr_, GetUserConsentForDevice(kMacAddress_)) + ON_CALL(mock_app_mngr_, GetUserConsentForDevice(kMacAddress_)) .WillByDefault(Return(policy::kDeviceAllowed)); - res_ctrl_->StartAppHmiStateResumption(app_mock_); + res_ctrl_->StartAppHmiStateResumption(mock_app_); } /** @@ -645,25 +665,25 @@ TEST_F(ResumeCtrlTest, ApplicationResumptiOnTimer_AppInFull) { TEST_F(ResumeCtrlTest, SetAppHMIState_HMINone_WithoutCheckPolicy) { GetInfoFromApp(); - EXPECT_CALL(app_mngr_, GetUserConsentForDevice("12345")).Times(0); + EXPECT_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")).Times(0); - EXPECT_CALL(*app_mock_, set_is_resuming(true)); - EXPECT_CALL(state_controller_, SetRegularState(_, kDefaultTestLevel_)) + EXPECT_CALL(*mock_app_, set_is_resuming(true)); + EXPECT_CALL(mock_state_controller_, SetRegularState(_, kDefaultTestLevel_)) .Times(AtLeast(1)); const bool res = - res_ctrl_->SetAppHMIState(app_mock_, kDefaultTestLevel_, false); + res_ctrl_->SetAppHMIState(mock_app_, kDefaultTestLevel_, false); EXPECT_TRUE(res); } TEST_F(ResumeCtrlTest, SetAppHMIState_HMILimited_WithoutCheckPolicy) { mobile_apis::HMILevel::eType test_type = eType::HMI_LIMITED; GetInfoFromApp(); - EXPECT_CALL(app_mngr_, GetUserConsentForDevice("12345")).Times(0); + EXPECT_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")).Times(0); - EXPECT_CALL(*app_mock_, set_is_resuming(true)); - EXPECT_CALL(state_controller_, SetRegularState(_, test_type)) + EXPECT_CALL(*mock_app_, set_is_resuming(true)); + EXPECT_CALL(mock_state_controller_, SetRegularState(_, test_type)) .Times(AtLeast(1)); - const bool res = res_ctrl_->SetAppHMIState(app_mock_, test_type, false); + const bool res = res_ctrl_->SetAppHMIState(mock_app_, test_type, false); EXPECT_TRUE(res); } @@ -671,14 +691,14 @@ TEST_F(ResumeCtrlTest, SetAppHMIState_HMIFull_WithoutCheckPolicy) { mobile_apis::HMILevel::eType test_type = eType::HMI_FULL; GetInfoFromApp(); // GetDefaultHmiLevel should not be called - EXPECT_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)).Times(0); - EXPECT_CALL(app_mngr_, GetUserConsentForDevice("12345")).Times(0); + EXPECT_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)).Times(0); + EXPECT_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")).Times(0); - EXPECT_CALL(*app_mock_, set_is_resuming(true)); - EXPECT_CALL(state_controller_, SetRegularState(_, test_type)) + EXPECT_CALL(*mock_app_, set_is_resuming(true)); + EXPECT_CALL(mock_state_controller_, SetRegularState(_, test_type)) .Times(AtLeast(1)); - const bool res = res_ctrl_->SetAppHMIState(app_mock_, test_type, false); + const bool res = res_ctrl_->SetAppHMIState(mock_app_, test_type, false); EXPECT_TRUE(res); } @@ -686,14 +706,14 @@ TEST_F(ResumeCtrlTest, SetAppHMIState_HMIFull_WithPolicy_DevAllowed) { mobile_apis::HMILevel::eType test_type = eType::HMI_FULL; GetInfoFromApp(); - ON_CALL(app_mngr_, GetUserConsentForDevice("12345")) + ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")) .WillByDefault(Return(policy::kDeviceAllowed)); - EXPECT_CALL(*app_mock_, set_is_resuming(true)); - EXPECT_CALL(state_controller_, SetRegularState(_, test_type)) + EXPECT_CALL(*mock_app_, set_is_resuming(true)); + EXPECT_CALL(mock_state_controller_, SetRegularState(_, test_type)) .Times(AtLeast(1)); - const bool res = res_ctrl_->SetAppHMIState(app_mock_, test_type, true); + const bool res = res_ctrl_->SetAppHMIState(mock_app_, test_type, true); EXPECT_TRUE(res); } @@ -701,15 +721,15 @@ TEST_F(ResumeCtrlTest, SetAppHMIState_HMIFull_WithPolicy_DevDisallowed) { mobile_apis::HMILevel::eType test_type = eType::HMI_FULL; GetInfoFromApp(); - ON_CALL(app_mngr_, GetUserConsentForDevice("12345")) + ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")) .WillByDefault(Return(policy::kDeviceDisallowed)); - EXPECT_CALL(*app_mock_, set_is_resuming(true)); - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + EXPECT_CALL(*mock_app_, set_is_resuming(true)); + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); - EXPECT_CALL(state_controller_, SetRegularState(_, kDefaultTestLevel_)) + EXPECT_CALL(mock_state_controller_, SetRegularState(_, kDefaultTestLevel_)) .Times(AtLeast(1)); - const bool res = res_ctrl_->SetAppHMIState(app_mock_, test_type, true); + const bool res = res_ctrl_->SetAppHMIState(mock_app_, test_type, true); EXPECT_FALSE(res); } @@ -724,7 +744,7 @@ TEST_F(ResumeCtrlTest, SaveAllApplications) { DataAccessor<application_manager::ApplicationSet> accessor(app_set, app_set_lock_); - ON_CALL(app_mngr_, applications()).WillByDefault(Return(accessor)); + ON_CALL(mock_app_mngr_, applications()).WillByDefault(Return(accessor)); EXPECT_CALL(*mock_storage_, SaveApplication(Eq(test_app))); res_ctrl_->SaveAllApplications(); } @@ -738,7 +758,7 @@ TEST_F(ResumeCtrlTest, SaveAllApplications_EmptyApplicationlist) { DataAccessor<application_manager::ApplicationSet> accessor(app_set, app_set_lock_); - ON_CALL(app_mngr_, applications()).WillByDefault(Return(accessor)); + ON_CALL(mock_app_mngr_, applications()).WillByDefault(Return(accessor)); EXPECT_CALL(*mock_storage_, SaveApplication(mock_app)).Times(0); res_ctrl_->SaveAllApplications(); } @@ -755,14 +775,14 @@ TEST_F(ResumeCtrlTest, OnAppActivated_ResumptionHasStarted) { smart_objects::SmartObject saved_app; GetInfoFromApp(); - ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_)) + ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)) .WillByDefault(Return(kDefaultTestLevel_)); ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - ON_CALL(*app_mock_, app_id()).WillByDefault(Return(kTestAppId_)); + ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kTestAppId_)); - const bool res = res_ctrl_->StartResumptionOnlyHMILevel(app_mock_); + const bool res = res_ctrl_->StartResumptionOnlyHMILevel(mock_app_); EXPECT_TRUE(res); utils::SharedPtr<application_manager_test::MockApplication> app_sh_mock = @@ -832,7 +852,7 @@ TEST_F(ResumeCtrlTest, CheckPersistenceFiles_WithoutCommandAndChoiceSets) { GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_TRUE(res_ctrl_->CheckPersistenceFilesForResumption(app_mock_)); + EXPECT_TRUE(res_ctrl_->CheckPersistenceFilesForResumption(mock_app_)); } TEST_F(ResumeCtrlTest, CheckPersistenceFilesForResumption_WithCommands) { @@ -853,7 +873,7 @@ TEST_F(ResumeCtrlTest, CheckPersistenceFilesForResumption_WithCommands) { VerifyImageFiles(_, _, _)) .WillRepeatedly(Return(mobile_apis::Result::SUCCESS)); - EXPECT_TRUE(res_ctrl_->CheckPersistenceFilesForResumption(app_mock_)); + EXPECT_TRUE(res_ctrl_->CheckPersistenceFilesForResumption(mock_app_)); } TEST_F(ResumeCtrlTest, CheckPersistenceFilesForResumption_WithChoiceSet) { @@ -870,7 +890,7 @@ TEST_F(ResumeCtrlTest, CheckPersistenceFilesForResumption_WithChoiceSet) { GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_TRUE(res_ctrl_->CheckPersistenceFilesForResumption(app_mock_)); + EXPECT_TRUE(res_ctrl_->CheckPersistenceFilesForResumption(mock_app_)); } // TODO (VVeremjova) APPLINK-16718 @@ -888,7 +908,7 @@ TEST_F(ResumeCtrlTest, OnSuspend_EmptyApplicationlist) { DataAccessor<application_manager::ApplicationSet> accessor(app_set, app_set_lock_); - ON_CALL(app_mngr_, applications()).WillByDefault(Return(accessor)); + ON_CALL(mock_app_mngr_, applications()).WillByDefault(Return(accessor)); EXPECT_CALL(*mock_storage_, SaveApplication(mock_app)).Times(0); EXPECT_CALL(*mock_storage_, IncrementIgnOffCount()).Times(0); @@ -910,7 +930,7 @@ TEST_F(ResumeCtrlTest, RemoveApplicationFromSaved) { EXPECT_CALL(*mock_storage_, RemoveApplicationFromSaved(kTestPolicyAppId_, kMacAddress_)) .WillOnce(Return(true)); - EXPECT_TRUE(res_ctrl_->RemoveApplicationFromSaved(app_mock_)); + EXPECT_TRUE(res_ctrl_->RemoveApplicationFromSaved(mock_app_)); } TEST_F(ResumeCtrlTest, CheckApplicationkHash_) { @@ -921,7 +941,7 @@ TEST_F(ResumeCtrlTest, CheckApplicationkHash_) { ON_CALL(*mock_storage_, GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _)) .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); - EXPECT_TRUE(res_ctrl_->CheckApplicationHash(app_mock_, kHash_)); + EXPECT_TRUE(res_ctrl_->CheckApplicationHash(mock_app_, kHash_)); } TEST_F(ResumeCtrlTest, GetSavedAppHmiLevel_NoAskedApp_INVALID_ENUM) { diff --git a/src/components/application_manager/test/resumption/resumption_data_json_test.cc b/src/components/application_manager/test/resumption/resumption_data_json_test.cc index a38afd8bdf..ea257b902c 100644 --- a/src/components/application_manager/test/resumption/resumption_data_json_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_json_test.cc @@ -52,6 +52,7 @@ namespace resumption_test { using ::testing::_; using ::testing::Return; +using ::testing::ReturnRef; using ::testing::NiceMock; namespace am = application_manager; @@ -109,12 +110,14 @@ class ResumptionDataJsonTest : public ResumptionDataTest { TEST_F(ResumptionDataJsonTest, SaveApplication) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); } TEST_F(ResumptionDataJsonTest, SavedApplicationTwice) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)).Times(2); res_json.SaveApplication(app_mock); CheckSavedJson(); res_json.SaveApplication(app_mock); @@ -123,6 +126,7 @@ TEST_F(ResumptionDataJsonTest, SavedApplicationTwice) { TEST_F(ResumptionDataJsonTest, SavedApplicationTwice_UpdateApp) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)).Times(2); res_json.SaveApplication(app_mock); CheckSavedJson(); (*vr_help_)[0][am::strings::position] = 2; @@ -133,6 +137,7 @@ TEST_F(ResumptionDataJsonTest, SavedApplicationTwice_UpdateApp) { TEST_F(ResumptionDataJsonTest, RemoveApplicationFromSaved) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); EXPECT_TRUE( res_json.RemoveApplicationFromSaved(policy_app_id_, kMacAddress_)); @@ -150,6 +155,7 @@ TEST_F(ResumptionDataJsonTest, RemoveApplicationFromSaved_AppNotSaved) { TEST_F(ResumptionDataJsonTest, IsApplicationSaved_ApplicationSaved) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); ssize_t result = res_json.IsApplicationSaved(policy_app_id_, kMacAddress_); @@ -158,6 +164,7 @@ TEST_F(ResumptionDataJsonTest, IsApplicationSaved_ApplicationSaved) { TEST_F(ResumptionDataJsonTest, IsApplicationSaved_ApplicationRemoved) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); EXPECT_TRUE( @@ -168,6 +175,7 @@ TEST_F(ResumptionDataJsonTest, IsApplicationSaved_ApplicationRemoved) { TEST_F(ResumptionDataJsonTest, GetSavedApplication) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); smart_objects::SmartObject saved_app; EXPECT_TRUE( @@ -184,6 +192,7 @@ TEST_F(ResumptionDataJsonTest, GetSavedApplication_AppNotSaved) { TEST_F(ResumptionDataJsonTest, GetDataForLoadResumeData) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); smart_objects::SmartObject saved_app; @@ -201,6 +210,7 @@ TEST_F(ResumptionDataJsonTest, GetDataForLoadResumeData_AppRemove) { smart_objects::SmartObject saved_app; PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); EXPECT_TRUE( @@ -211,6 +221,7 @@ TEST_F(ResumptionDataJsonTest, GetDataForLoadResumeData_AppRemove) { TEST_F(ResumptionDataJsonTest, UpdateHmiLevel) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); HMILevel::eType new_hmi_level = HMILevel::HMI_LIMITED; @@ -222,6 +233,7 @@ TEST_F(ResumptionDataJsonTest, UpdateHmiLevel) { TEST_F(ResumptionDataJsonTest, IsHMIApplicationIdExist_AppIsSaved) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); EXPECT_TRUE(res_json.IsHMIApplicationIdExist(hmi_app_id_)); @@ -229,6 +241,7 @@ TEST_F(ResumptionDataJsonTest, IsHMIApplicationIdExist_AppIsSaved) { TEST_F(ResumptionDataJsonTest, IsHMIApplicationIdExist_AppNotSaved) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); @@ -238,6 +251,7 @@ TEST_F(ResumptionDataJsonTest, IsHMIApplicationIdExist_AppNotSaved) { TEST_F(ResumptionDataJsonTest, GetHMIApplicationID) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); EXPECT_EQ(hmi_app_id_, @@ -246,6 +260,7 @@ TEST_F(ResumptionDataJsonTest, GetHMIApplicationID) { TEST_F(ResumptionDataJsonTest, GetHMIApplicationID_AppNotSaved) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); EXPECT_EQ(0u, res_json.GetHMIApplicationID(policy_app_id_, "other_dev_id")); } @@ -253,7 +268,7 @@ TEST_F(ResumptionDataJsonTest, GetHMIApplicationID_AppNotSaved) { TEST_F(ResumptionDataJsonTest, OnSuspend) { SetZeroIgnOff(); PrepareData(); - + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); @@ -265,6 +280,7 @@ TEST_F(ResumptionDataJsonTest, OnSuspend) { TEST_F(ResumptionDataJsonTest, OnSuspendFourTimes) { PrepareData(); SetZeroIgnOff(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); @@ -282,6 +298,7 @@ TEST_F(ResumptionDataJsonTest, OnSuspendFourTimes) { TEST_F(ResumptionDataJsonTest, OnSuspendOnAwake) { PrepareData(); SetZeroIgnOff(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); @@ -297,6 +314,7 @@ TEST_F(ResumptionDataJsonTest, OnSuspendOnAwake) { TEST_F(ResumptionDataJsonTest, Awake_AppNotSuspended) { SetZeroIgnOff(); PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); @@ -308,6 +326,7 @@ TEST_F(ResumptionDataJsonTest, Awake_AppNotSuspended) { TEST_F(ResumptionDataJsonTest, TwiceAwake_AppNotSuspended) { SetZeroIgnOff(); PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); @@ -322,6 +341,7 @@ TEST_F(ResumptionDataJsonTest, TwiceAwake_AppNotSuspended) { TEST_F(ResumptionDataJsonTest, GetHashId) { PrepareData(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); @@ -334,6 +354,7 @@ TEST_F(ResumptionDataJsonTest, GetIgnOffTime_AfterSuspendAndAwake) { uint32_t last_ign_off_time; PrepareData(); SetZeroIgnOff(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); last_ign_off_time = res_json.GetIgnOffTime(); @@ -355,6 +376,7 @@ TEST_F(ResumptionDataJsonTest, GetIgnOffTime_AfterSuspendAndAwake) { TEST_F(ResumptionDataJsonTest, DropAppDataResumption) { PrepareData(); SetZeroIgnOff(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); diff --git a/src/components/application_manager/test/resumption/resumption_data_test.cc b/src/components/application_manager/test/resumption/resumption_data_test.cc index a70f96adb9..9501da5c60 100644 --- a/src/components/application_manager/test/resumption/resumption_data_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_test.cc @@ -40,6 +40,7 @@ #include "application_manager/application.h" #include "utils/data_accessor.h" #include "application_manager/message_helper.h" +#include "utils/make_shared.h" #include "application_manager/resumption_data_test.h" @@ -50,6 +51,7 @@ namespace custom_str = utils::custom_string; using ::testing::Return; using ::testing::ReturnRef; using ::testing::ReturnPointee; +using ::testing::_; void ResumptionDataTest::CheckSavedApp(sm::SmartObject& resume_app_list) { EXPECT_EQ(policy_app_id_, resume_app_list[am::strings::app_id].asString()); @@ -137,8 +139,6 @@ void ResumptionDataTest::CheckSubscriptions(sm::SmartObject& res_list) { res_list[am::strings::application_buttons][0].asUInt()); EXPECT_EQ(static_cast<uint32_t>(ButtonName::eType::CUSTOM_BUTTON), res_list[am::strings::application_buttons][1].asUInt()); - EXPECT_EQ(0u, res_list[am::strings::application_vehicle_info][0].asUInt()); - EXPECT_EQ(5u, res_list[am::strings::application_vehicle_info][1].asUInt()); } void ResumptionDataTest::CheckChoiceSet(sm::SmartObject& res_list) { @@ -322,6 +322,10 @@ void ResumptionDataTest::CheckVRTitle( } void ResumptionDataTest::PrepareData() { + mock_app_extension_ = utils::MakeShared< + NiceMock<application_manager_test::MockAppExtension> >(); + extensions_.insert(extensions_.begin(), mock_app_extension_); + ON_CALL(*app_mock, Extensions()).WillByDefault(ReturnRef(extensions_)); SetGlobalProporties(); SetCommands(); SetSubmenues(); diff --git a/src/components/include/test/application_manager/mock_rpc_plugin.h b/src/components/include/test/application_manager/mock_rpc_plugin.h index 4059132b50..1f7dd8951b 100644 --- a/src/components/include/test/application_manager/mock_rpc_plugin.h +++ b/src/components/include/test/application_manager/mock_rpc_plugin.h @@ -8,7 +8,6 @@ namespace application_manager { class CommandFactory; namespace plugin_manager { -namespace plugin_manager {} class MockRPCPlugin : public RPCPlugin { public: MOCK_METHOD4(Init, |