diff options
Diffstat (limited to 'src/components/application_manager/test')
13 files changed, 119 insertions, 84 deletions
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 e94ffa5961..5568db4dd1 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 @@ -404,8 +404,9 @@ class MockApplication : public ::application_manager::Application { MOCK_METHOD1(AddExtension, bool(application_manager::AppExtensionPtr extention)); MOCK_METHOD1(RemoveExtension, bool(application_manager::AppExtensionUID uid)); - MOCK_CONST_METHOD0(Extensions, - const std::list<application_manager::AppExtensionPtr>&()); + MOCK_CONST_METHOD0( + Extensions, + const DataAccessor<std::list<application_manager::AppExtensionPtr> >()); MOCK_CONST_METHOD0(is_remote_control_supported, bool()); MOCK_METHOD1(set_remote_control_supported, void(const bool allow)); MOCK_CONST_METHOD0(cloud_app_endpoint, const std::string&()); diff --git a/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h b/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h index b44345deff..74f40c7613 100644 --- a/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h +++ b/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h @@ -51,7 +51,13 @@ class MockHelpPromptManager : public ::application_manager::HelpPromptManager { void(uint32_t cmd_id, const bool should_send_requests)); MOCK_METHOD2(OnSetGlobalPropertiesReceived, void(const smart_objects::SmartObject& msg, bool is_response)); + MOCK_METHOD1(OnResetGlobalPropertiesReceived, + void(const smart_objects::SmartObject& msg)); + MOCK_CONST_METHOD0(GetSendingType, SendingType()); + MOCK_METHOD1(CreatePromptMsg, + void(smart_objects::SmartObject& out_msg_params)); + MOCK_METHOD1(CreateVRMsg, void(smart_objects::SmartObject& out_msg_params)); }; } // namespace application_manager_test diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h index 67d992d4af..0892a47f8c 100644 --- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h +++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h @@ -312,8 +312,6 @@ class MockMessageHelper { MOCK_METHOD2(SendQueryApps, void(const uint32_t connection_key, ApplicationManager& app_man)); - MOCK_METHOD1(CreateAppVrHelp, - smart_objects::SmartObjectSPtr(ApplicationConstSharedPtr app)); MOCK_METHOD3(VerifyImageVrHelpItems, mobile_apis::Result::eType(smart_objects::SmartObject& message, ApplicationConstSharedPtr app, diff --git a/src/components/application_manager/test/include/application_manager/mock_request.h b/src/components/application_manager/test/include/application_manager/mock_request.h index 4348e39020..098002f15d 100644 --- a/src/components/application_manager/test/include/application_manager/mock_request.h +++ b/src/components/application_manager/test/include/application_manager/mock_request.h @@ -63,6 +63,8 @@ class MockRequest : public application_manager::commands::Command { MOCK_METHOD0(AllowedToTerminate, bool()); MOCK_METHOD1(SetAllowedToTerminate, void(bool is_allowed)); + MOCK_CONST_METHOD0(GetApplicationManager, + application_manager::ApplicationManager&()); MOCK_CONST_METHOD0(connection_key, uint32_t()); MOCK_CONST_METHOD0(correlation_id, uint32_t()); }; diff --git a/src/components/application_manager/test/include/application_manager/mock_resumption_data.h b/src/components/application_manager/test/include/application_manager/mock_resumption_data.h index 7cabc12086..b99ce11619 100644 --- a/src/components/application_manager/test/include/application_manager/mock_resumption_data.h +++ b/src/components/application_manager/test/include/application_manager/mock_resumption_data.h @@ -78,7 +78,7 @@ class MockResumptionData : public ::resumption::ResumptionData { MOCK_METHOD2(RemoveApplicationFromSaved, bool(const std::string& policy_app_id, const std::string& device_id)); - MOCK_CONST_METHOD0(GetIgnOffTime, uint32_t()); + MOCK_CONST_METHOD0(GetIgnOffTime, int64_t()); MOCK_CONST_METHOD2(IsApplicationSaved, ssize_t(const std::string& policy_app_id, const std::string& device_id)); 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 bea920e44e..93fa6bcae9 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 @@ -75,6 +75,7 @@ class ResumptionDataTest : public ::testing::Test { , setlock_ptr_(std::make_shared<sync_primitives::Lock>()) , btnlock_ptr_(std::make_shared<sync_primitives::Lock>()) , ivilock_ptr_(std::make_shared<sync_primitives::Lock>()) + , extensions_lock_(std::make_shared<sync_primitives::RecursiveLock>()) , window_params_map_lock_ptr_(std::make_shared<sync_primitives::Lock>()) { } virtual ~ResumptionDataTest(); @@ -162,6 +163,7 @@ class ResumptionDataTest : public ::testing::Test { std::shared_ptr<sync_primitives::Lock> setlock_ptr_; std::shared_ptr<sync_primitives::Lock> btnlock_ptr_; std::shared_ptr<sync_primitives::Lock> ivilock_ptr_; + std::shared_ptr<sync_primitives::RecursiveLock> extensions_lock_; std::shared_ptr<sync_primitives::Lock> window_params_map_lock_ptr_; application_manager_test::MockApplicationManagerSettings mock_application_manager_settings_; diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc index 9212b0feab..16e696a3bd 100644 --- a/src/components/application_manager/test/mock_message_helper.cc +++ b/src/components/application_manager/test/mock_message_helper.cc @@ -479,11 +479,6 @@ void MessageHelper::SendQueryApps(const uint32_t connection_key, app_man); } -smart_objects::SmartObjectSPtr MessageHelper::CreateAppVrHelp( - ApplicationConstSharedPtr app) { - return MockMessageHelper::message_helper_mock()->CreateAppVrHelp(app); -} - mobile_apis::Result::eType MessageHelper::VerifyImageVrHelpItems( smart_objects::SmartObject& message, ApplicationConstSharedPtr app, diff --git a/src/components/application_manager/test/request_controller/request_controller_test.cc b/src/components/application_manager/test/request_controller/request_controller_test.cc index 2de2a69cf7..796df0810f 100644 --- a/src/components/application_manager/test/request_controller/request_controller_test.cc +++ b/src/components/application_manager/test/request_controller/request_controller_test.cc @@ -45,7 +45,6 @@ #include "application_manager/event_engine/event_dispatcher.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_application_manager.h" #include "application_manager/mock_request_controller_settings.h" #include "application_manager/mock_request_timeout_handler.h" #include "application_manager/policies/policy_handler.h" @@ -62,10 +61,12 @@ namespace request_controller_test { using ::application_manager::request_controller::RequestController; using ::application_manager::request_controller::RequestControllerImpl; using ::application_manager::request_controller::RequestInfo; +using ::test::components::application_manager_test::MockApplicationManager; using test::components::application_manager_test::MockRequestTimeoutHandler; using ::test::components::event_engine_test::MockEventDispatcher; using ::testing::_; +using ::testing::DoAll; using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; @@ -168,6 +169,7 @@ class RequestControllerTestClass : public ::testing::Test { RequestControllerSPtr request_ctrl_; RequestPtr empty_mock_request_; const TestSettings default_settings_; + NiceMock<MockApplicationManager> app_mngr_; }; TEST_F(RequestControllerTestClass, @@ -179,13 +181,20 @@ TEST_F(RequestControllerTestClass, EXPECT_CALL(*request_valid, Run()) .Times(1) .WillRepeatedly(NotifyTestAsyncWaiter(waiter_valid)); + EXPECT_CALL(*request_valid, GetApplicationManager()) + .Times(1) + .WillRepeatedly(ReturnRef(app_mngr_)); + EXPECT_CALL(app_mngr_, IsStopping()) + .Times(1) + .WillRepeatedly( + DoAll(NotifyTestAsyncWaiter(waiter_valid), Return(false))); EXPECT_EQ(RequestController::TResult::SUCCESS, AddRequest(default_settings_, request_valid, RequestInfo::RequestType::MobileRequest, mobile_apis::HMILevel::HMI_NONE)); - EXPECT_TRUE(waiter_valid->WaitFor(1, 1000)); + EXPECT_TRUE(waiter_valid->WaitFor(2, 1000)); // The command should not be run if another command with the same // correlation_id is waiting for a response @@ -206,43 +215,25 @@ TEST_F(RequestControllerTestClass, TEST_F(RequestControllerTestClass, CheckPosibilitytoAdd_ZeroValueLimiters_SUCCESS) { + auto waiter_valid = TestAsyncWaiter::createInstance(); // Test case than pending_requests_amount, // app_time_scale_max_requests_ and // app_hmi_level_none_time_scale_max_requests_ equals 0 // (in the default settings they setted to 0) for (size_t i = 0; i < kMaxRequestAmount; ++i) { + RequestPtr request_valid = GetMockRequest(i); + EXPECT_CALL(*request_valid, GetApplicationManager()) + .WillRepeatedly(ReturnRef(app_mngr_)); + EXPECT_CALL(app_mngr_, IsStopping()) + .WillRepeatedly( + DoAll(NotifyTestAsyncWaiter(waiter_valid), Return(false))); EXPECT_EQ(RequestController::TResult::SUCCESS, AddRequest(default_settings_, - GetMockRequest(i), - RequestInfo::RequestType::MobileRequest, - mobile_apis::HMILevel::HMI_FULL)); - } -} - -TEST_F( - RequestControllerTestClass, - CheckPosibilitytoAdd_ExcessPendingRequestsAmount_TooManyPendingRequests) { - TestSettings settings; - settings.pending_requests_amount_ = kNumberOfRequests; - - request_ctrl_->DestroyThreadpool(); - - // Adding requests to fit in pending_requests_amount_ - for (size_t i = 0; i < kNumberOfRequests; ++i) { - EXPECT_EQ(RequestController::TResult::SUCCESS, - AddRequest(settings, - GetMockRequest(), + request_valid, RequestInfo::RequestType::MobileRequest, mobile_apis::HMILevel::HMI_FULL)); } - - // Trying to add one more extra request - // Expect overflow and TOO_MANY_PENDING_REQUESTS result - EXPECT_EQ(RequestController::TResult::TOO_MANY_PENDING_REQUESTS, - AddRequest(settings, - GetMockRequest(), - RequestInfo::RequestType::MobileRequest, - mobile_apis::HMILevel::HMI_FULL)); + EXPECT_TRUE(waiter_valid->WaitFor(kMaxRequestAmount, 1000)); } TEST_F(RequestControllerTestClass, IsLowVoltage_SetOnLowVoltage_TRUE) { @@ -258,11 +249,26 @@ TEST_F(RequestControllerTestClass, IsLowVoltage_SetOnWakeUp_FALSE) { } TEST_F(RequestControllerTestClass, AddMobileRequest_SetValidData_SUCCESS) { + RequestPtr request_valid = GetMockRequest(); + auto waiter_valid = TestAsyncWaiter::createInstance(); + ON_CALL(*request_valid, default_timeout()).WillByDefault(Return(0)); + EXPECT_CALL(*request_valid, Init()).WillOnce(Return(true)); + EXPECT_CALL(*request_valid, Run()) + .Times(1) + .WillRepeatedly(NotifyTestAsyncWaiter(waiter_valid)); + EXPECT_CALL(*request_valid, GetApplicationManager()) + .Times(1) + .WillRepeatedly(ReturnRef(app_mngr_)); + EXPECT_CALL(app_mngr_, IsStopping()) + .Times(1) + .WillRepeatedly( + DoAll(NotifyTestAsyncWaiter(waiter_valid), Return(false))); EXPECT_EQ(RequestController::TResult::SUCCESS, AddRequest(default_settings_, - GetMockRequest(), + request_valid, RequestInfo::RequestType::MobileRequest, mobile_apis::HMILevel::HMI_FULL)); + EXPECT_TRUE(waiter_valid->WaitFor(2, 1000)); } TEST_F(RequestControllerTestClass, @@ -292,18 +298,23 @@ TEST_F(RequestControllerTestClass, OnTimer_SUCCESS) { const uint32_t request_timeout = 1u; RequestPtr mock_request = GetMockRequest( kDefaultCorrelationID, kDefaultConnectionKey, request_timeout); - auto waiter = TestAsyncWaiter::createInstance(); + EXPECT_CALL(*mock_request, GetApplicationManager()) + .Times(1) + .WillRepeatedly(ReturnRef(app_mngr_)); + EXPECT_CALL(app_mngr_, IsStopping()) + .Times(1) + .WillRepeatedly(DoAll(NotifyTestAsyncWaiter(waiter), Return(false))); + EXPECT_CALL(*mock_request, HandleTimeOut()) + .WillOnce(NotifyTestAsyncWaiter(waiter)); + EXPECT_EQ(RequestController::TResult::SUCCESS, AddRequest(default_settings_, mock_request, RequestInfo::RequestType::MobileRequest)); - EXPECT_CALL(*mock_request, HandleTimeOut()) - .WillOnce(NotifyTestAsyncWaiter(waiter)); - // Waiting for call of `onTimeOut` for `kTimeScale` seconds - EXPECT_TRUE(waiter->WaitFor(1, kTimeScale)); + EXPECT_TRUE(waiter->WaitFor(2, kTimeScale)); } } // namespace request_controller_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 1ff04c332c..058be224a7 100644 --- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc +++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc @@ -98,7 +98,8 @@ class ResumeCtrlTest : public ::testing::Test { , kDefaultDeferredTestLevel_(eType::INVALID_ENUM) , kNaviLowbandwidthLevel_("LIMITED") , kProjectionLowbandwidthLevel_("NONE") - , kMediaLowbandwidthLevel_("NONE") { + , kMediaLowbandwidthLevel_("NONE") + , extensions_lock_(std::make_shared<sync_primitives::RecursiveLock>()) { profile::Profile profile_; profile_.set_config_file_name("smartDeviceLink.ini"); resumption_delay_before_ign_ = profile_.resumption_delay_before_ign(); @@ -245,6 +246,7 @@ class ResumeCtrlTest : public ::testing::Test { const std::string kMediaLowbandwidthLevel_; NiceMock<application_manager_test::MockRPCService> mock_rpc_service_; resumption::ResumeCtrl::ResumptionCallBack callback_; + std::shared_ptr<sync_primitives::RecursiveLock> extensions_lock_; }; /** @@ -327,7 +329,9 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithFiles) { .WillRepeatedly(Return(requests)); std::list<application_manager::AppExtensionPtr> extensions; extensions.insert(extensions.begin(), mock_app_extension_); - EXPECT_CALL(*mock_app_, Extensions()).WillOnce(ReturnRef(extensions)); + DataAccessor<std::list<application_manager::AppExtensionPtr> > accessor( + extensions, extensions_lock_); + EXPECT_CALL(*mock_app_, Extensions()).WillOnce(Return(accessor)); EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); for (uint32_t i = 0; i < count_of_files; ++i) { EXPECT_CALL(*mock_app_, @@ -387,7 +391,9 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubmenues) { std::list<application_manager::AppExtensionPtr> extensions; extensions.insert(extensions.begin(), mock_app_extension_); - EXPECT_CALL(*mock_app_, Extensions()).WillOnce(ReturnRef(extensions)); + DataAccessor<std::list<application_manager::AppExtensionPtr> > accessor( + extensions, extensions_lock_); + EXPECT_CALL(*mock_app_, Extensions()).WillOnce(Return(accessor)); const bool res = res_ctrl_->StartResumption(mock_app_, kHash_, callback_); EXPECT_TRUE(res); @@ -461,7 +467,9 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithCommands) { .WillRepeatedly(Return(requests)); std::list<application_manager::AppExtensionPtr> extensions; extensions.insert(extensions.begin(), mock_app_extension_); - EXPECT_CALL(*mock_app_, Extensions()).WillOnce(ReturnRef(extensions)); + DataAccessor<std::list<application_manager::AppExtensionPtr> > accessor( + extensions, extensions_lock_); + EXPECT_CALL(*mock_app_, Extensions()).WillOnce(Return(accessor)); const bool res = res_ctrl_->StartResumption(mock_app_, kHash_, callback_); EXPECT_TRUE(res); @@ -521,7 +529,9 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithChoiceSet) { std::list<application_manager::AppExtensionPtr> extensions; extensions.insert(extensions.begin(), mock_app_extension_); - EXPECT_CALL(*mock_app_, Extensions()).WillOnce(ReturnRef(extensions)); + DataAccessor<std::list<application_manager::AppExtensionPtr> > accessor( + extensions, extensions_lock_); + EXPECT_CALL(*mock_app_, Extensions()).WillOnce(Return(accessor)); const bool res = res_ctrl_->StartResumption(mock_app_, kHash_, callback_); EXPECT_TRUE(res); @@ -560,9 +570,12 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithGlobalProperties) { EXPECT_CALL(*application_manager::MockMessageHelper::message_helper_mock(), CreateAddCommandRequestToHMI(_, _)) .WillRepeatedly(Return(requests)); + std::list<application_manager::AppExtensionPtr> extensions; extensions.insert(extensions.begin(), mock_app_extension_); - EXPECT_CALL(*mock_app_, Extensions()).WillOnce(ReturnRef(extensions)); + DataAccessor<std::list<application_manager::AppExtensionPtr> > accessor( + extensions, extensions_lock_); + EXPECT_CALL(*mock_app_, Extensions()).WillOnce(Return(accessor)); const bool res = res_ctrl_->StartResumption(mock_app_, kHash_, callback_); EXPECT_TRUE(res); } @@ -613,8 +626,9 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscribeOnButtons) { std::list<application_manager::AppExtensionPtr> extensions; extensions.insert(extensions.begin(), mock_app_extension_); - - EXPECT_CALL(*mock_app_, Extensions()).WillOnce(ReturnRef(extensions)); + DataAccessor<std::list<application_manager::AppExtensionPtr> > accessor( + extensions, extensions_lock_); + EXPECT_CALL(*mock_app_, Extensions()).WillOnce(Return(accessor)); EXPECT_CALL(*mock_app_extension_, ProcessResumption(saved_app)); EXPECT_CALL(*application_manager::MockMessageHelper::message_helper_mock(), @@ -660,10 +674,11 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscriptionToIVI) { smart_objects::SmartObjectList requests; std::list<application_manager::AppExtensionPtr> extensions; - extensions.insert(extensions.begin(), mock_app_extension_); - EXPECT_CALL(*mock_app_, Extensions()).WillOnce(ReturnRef(extensions)); + DataAccessor<std::list<application_manager::AppExtensionPtr> > accessor( + extensions, extensions_lock_); + EXPECT_CALL(*mock_app_, Extensions()).WillOnce(Return(accessor)); EXPECT_CALL(*mock_app_extension_, ProcessResumption(saved_app)); const bool res = res_ctrl_->StartResumption(mock_app_, kHash_, callback_); @@ -693,7 +708,6 @@ TEST_F(ResumeCtrlTest, std::list<application_manager::AppExtensionPtr> extensions; // It will work only for WayPointsAppExtension, need to rework this test extensions.insert(extensions.begin(), mock_app_extension_); - EXPECT_CALL(*mock_app_, Extensions()).WillOnce(ReturnRef(extensions)); EXPECT_CALL(mock_app_mngr_, SubscribeAppForWayPoints( @@ -752,8 +766,8 @@ TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppInFull) { mobile_apis::HMILevel::eType restored_test_type = eType::HMI_FULL; uint32_t ign_off_count = 0; smart_objects::SmartObject saved_app; - const uint32_t time_offset = 5; - const uint32_t time_stamp = + const int64_t time_offset = 5; + const int64_t time_stamp = time(nullptr) - resumption_delay_before_ign_ + time_offset; saved_app[application_manager::strings::ign_off_count] = ign_off_count; saved_app[application_manager::strings::hmi_level] = restored_test_type; @@ -808,8 +822,8 @@ TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppHasDeferredResumption) { mobile_apis::HMILevel::eType deferred_level = eType::HMI_FULL; uint32_t ign_off_count = 0; smart_objects::SmartObject saved_app; - const uint32_t time_offset = 5; - const uint32_t time_stamp = + const int64_t time_offset = 5; + const int64_t time_stamp = time(nullptr) - resumption_delay_before_ign_ + time_offset; saved_app[application_manager::strings::ign_off_count] = ign_off_count; saved_app[application_manager::strings::hmi_level] = restored_test_type; @@ -848,8 +862,8 @@ TEST_F(ResumeCtrlTest, mobile_apis::HMILevel::eType restored_test_type = eType::HMI_FULL; uint32_t ign_off_count = 0; smart_objects::SmartObject saved_app; - const uint32_t time_offset = 5; - const uint32_t time_stamp = + const int64_t time_offset = 5; + const int64_t time_stamp = time(nullptr) - resumption_delay_before_ign_ + time_offset; saved_app[application_manager::strings::ign_off_count] = ign_off_count; saved_app[application_manager::strings::hmi_level] = restored_test_type; @@ -894,8 +908,8 @@ TEST_F( mobile_apis::HMILevel::eType restored_test_type = eType::HMI_LIMITED; uint32_t ign_off_count = 0; smart_objects::SmartObject saved_app; - const uint32_t time_offset = 5; - const uint32_t time_stamp = + const int64_t time_offset = 5; + const int64_t time_stamp = time(nullptr) - resumption_delay_before_ign_ + time_offset; saved_app[application_manager::strings::ign_off_count] = ign_off_count; saved_app[application_manager::strings::hmi_level] = restored_test_type; @@ -1041,8 +1055,8 @@ TEST_F(ResumeCtrlTest, ApplicationResumptionTimer_AppInFull) { mobile_apis::HMILevel::eType restored_test_type = eType::HMI_FULL; const uint32_t ign_off_count = 0u; smart_objects::SmartObject saved_app; - const uint32_t time_offset = 5; - const uint32_t time_stamp = + const int64_t time_offset = 5; + const int64_t time_stamp = time(nullptr) - resumption_delay_before_ign_ + time_offset; saved_app[application_manager::strings::ign_off_count] = ign_off_count; saved_app[application_manager::strings::hmi_level] = restored_test_type; @@ -1387,8 +1401,8 @@ TEST_F( ResumeCtrlTest, ResumptionLowVoltage_AppInFullUnregisteredWithinTimeFrame_HMILevelRestored) { const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_FULL; - const uint32_t time_offset = 5; - const uint32_t time_stamp = + const int64_t time_offset = 5; + const int64_t time_stamp = time(nullptr) - resumption_delay_before_ign_ + time_offset; smart_objects::SmartObject saved_app; saved_app[application_manager::strings::hmi_level] = restored_test_type; @@ -1434,8 +1448,8 @@ TEST_F( ResumeCtrlTest, ResumptionLowVoltage_AppInFullUnregisteredBeyondTimeFrame_HMILevelNotRestored) { const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_FULL; - const uint32_t time_offset = 5; - const uint32_t time_stamp = + const int64_t time_offset = 5; + const int64_t time_stamp = time(nullptr) - resumption_delay_before_ign_ - time_offset; smart_objects::SmartObject saved_app; saved_app[application_manager::strings::hmi_level] = restored_test_type; @@ -1473,8 +1487,8 @@ TEST_F( TEST_F(ResumeCtrlTest, ResumptionLowVoltage_AppInBackground_NotRestored) { const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_BACKGROUND; - const uint32_t time_offset = 5; - const uint32_t time_stamp = + const int64_t time_offset = 5; + const int64_t time_stamp = time(nullptr) - resumption_delay_before_ign_ - time_offset; smart_objects::SmartObject saved_app; saved_app[application_manager::strings::hmi_level] = restored_test_type; @@ -1501,8 +1515,8 @@ TEST_F( ResumeCtrlTest, ResumptionLowVoltage_AppInLimitedlUnregisteredWithinTimeFrame_HMILevelRestored) { const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_LIMITED; - const uint32_t time_offset = 5; - const uint32_t time_stamp = + const int64_t time_offset = 5; + const int64_t time_stamp = time(nullptr) - resumption_delay_before_ign_ + time_offset; smart_objects::SmartObject saved_app; saved_app[application_manager::strings::hmi_level] = restored_test_type; @@ -1548,8 +1562,8 @@ TEST_F( ResumeCtrlTest, ResumptionLowVoltage_AppInLimitedlUnregisteredBeyondTimeFrame_HMILevelNotRestored) { const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_LIMITED; - const uint32_t time_offset = 5; - const uint32_t time_stamp = + const int64_t time_offset = 5; + const int64_t time_stamp = time(nullptr) - resumption_delay_before_ign_ - time_offset; smart_objects::SmartObject saved_app; saved_app[application_manager::strings::hmi_level] = restored_test_type; diff --git a/src/components/application_manager/test/resumption/resumption_data_db_test.cc b/src/components/application_manager/test/resumption/resumption_data_db_test.cc index ec390e4be0..9f7058bec2 100644 --- a/src/components/application_manager/test/resumption/resumption_data_db_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_db_test.cc @@ -846,7 +846,7 @@ TEST_F(ResumptionDataDBTest, GetIgnOffTime_AfterSuspendAndAwake) { PrepareData(); EXPECT_TRUE(res_db()->Init()); SetZeroIgnOffTime(); - uint32_t last_ign_off_time; + int64_t last_ign_off_time; EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); @@ -856,11 +856,11 @@ TEST_F(ResumptionDataDBTest, GetIgnOffTime_AfterSuspendAndAwake) { res_db()->IncrementIgnOffCount(); - uint32_t after_suspend; + int64_t after_suspend; after_suspend = res_db()->GetIgnOffTime(); EXPECT_LE(last_ign_off_time, after_suspend); - uint32_t after_awake; + int64_t after_awake; res_db()->DecrementIgnOffCount(); after_awake = res_db()->GetIgnOffTime(); 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 9d348ecbb7..24904dbce0 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 @@ -360,7 +360,7 @@ TEST_F(ResumptionDataJsonTest, GetHashId) { } TEST_F(ResumptionDataJsonTest, GetIgnOffTime_AfterSuspendAndAwake) { - uint32_t last_ign_off_time; + int64_t last_ign_off_time; PrepareData(); SetZeroIgnOff(); EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); @@ -371,11 +371,11 @@ TEST_F(ResumptionDataJsonTest, GetIgnOffTime_AfterSuspendAndAwake) { res_json.IncrementIgnOffCount(); - uint32_t after_suspend; + int64_t after_suspend; after_suspend = res_json.GetIgnOffTime(); EXPECT_LE(last_ign_off_time, after_suspend); - uint32_t after_awake; + int64_t after_awake; res_json.DecrementIgnOffCount(); after_awake = res_json.GetIgnOffTime(); 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 cb5a4d9a56..603af4ca47 100644 --- a/src/components/application_manager/test/resumption/resumption_data_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_test.cc @@ -383,7 +383,9 @@ void ResumptionDataTest::PrepareData() { mock_app_extension_ = std::make_shared<NiceMock<application_manager_test::MockAppExtension> >(); extensions_.insert(extensions_.begin(), mock_app_extension_); - ON_CALL(*app_mock, Extensions()).WillByDefault(ReturnRef(extensions_)); + DataAccessor<std::list<application_manager::AppExtensionPtr> > accessor( + extensions_, extensions_lock_); + ON_CALL(*app_mock, Extensions()).WillByDefault(Return(accessor)); SetGlobalProporties(); SetCommands(); SetSubmenues(); 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 b6ec4fc8ef..f255223136 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 @@ -3654,7 +3654,11 @@ TEST_F(StateControllerImplTest, static_cast<hmi_apis::Common_HMILevel::eType>(new_state->hmi_level()), kCorrID); - smart_objects::SmartObjectSPtr bc_activate_app_request; + smart_objects::SmartObjectSPtr bc_activate_app_request = + std::make_shared<smart_objects::SmartObject>(); + (*bc_activate_app_request)[am::strings::params][am::strings::correlation_id] = + kCorrID; + EXPECT_CALL(message_helper_mock_, GetBCActivateAppRequestToHMI(_, _, _, _, _)) .WillOnce(Return(bc_activate_app_request)); EXPECT_CALL(*simple_app_ptr_, SetRegularState(_, _)).Times(0); |