diff options
Diffstat (limited to 'src/components/application_manager/test/include')
6 files changed, 14 insertions, 5 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_; |