diff options
Diffstat (limited to 'src/components/include/test/application_manager')
13 files changed, 199 insertions, 67 deletions
diff --git a/src/components/include/test/application_manager/mock_app_extension.h b/src/components/include/test/application_manager/mock_app_extension.h index 5898bc9b72..10a911e799 100644 --- a/src/components/include/test/application_manager/mock_app_extension.h +++ b/src/components/include/test/application_manager/mock_app_extension.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APP_EXTENSION_H_ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APP_EXTENSION_H_ -#include "gmock/gmock.h" #include "application_manager/app_extension.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/test/application_manager/mock_app_launch_settings.h b/src/components/include/test/application_manager/mock_app_launch_settings.h index c59eb276ce..57bd708d62 100644 --- a/src/components/include/test/application_manager/mock_app_launch_settings.h +++ b/src/components/include/test/application_manager/mock_app_launch_settings.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APP_LAUNCH_SETTINGS_H_ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APP_LAUNCH_SETTINGS_H_ -#include "gmock/gmock.h" #include "application_manager/app_launch_settings.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h index 679e6ccfb3..e533228656 100644 --- a/src/components/include/test/application_manager/mock_application_manager.h +++ b/src/components/include/test/application_manager/mock_application_manager.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APPLICATION_MANAGER_H_ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APPLICATION_MANAGER_H_ +#include <memory> #include <string> #include <vector> -#include <memory> #include "gmock/gmock.h" @@ -80,6 +80,8 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_CONST_METHOD0( pending_applications, DataAccessor<application_manager::AppsWaitRegistrationSet>()); + MOCK_CONST_METHOD0(reregister_applications, + DataAccessor<application_manager::ReregisterWaitList>()); MOCK_CONST_METHOD1( application, application_manager::ApplicationSharedPtr(uint32_t app_id)); MOCK_CONST_METHOD0(active_application, @@ -111,6 +113,9 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_CONST_METHOD1(pending_application_by_policy_id, application_manager::ApplicationSharedPtr( const std::string& policy_app_id)); + MOCK_CONST_METHOD1(reregister_application_by_policy_id, + application_manager::ApplicationSharedPtr( + const std::string& policy_app_id)); MOCK_METHOD1( applications_by_button, std::vector<application_manager::ApplicationSharedPtr>(uint32_t button)); @@ -194,11 +199,11 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_METHOD1(SetIconFileFromSystemRequest, void(const std::string policy_id)); MOCK_CONST_METHOD0(IsHMICooperating, bool()); MOCK_METHOD2(IviInfoUpdated, - void(mobile_apis::VehicleDataType::eType vehicle_info, - int value)); + void(const std::string& vehicle_info, int value)); MOCK_METHOD1(RegisterApplication, - application_manager::ApplicationSharedPtr(const std::shared_ptr< - smart_objects::SmartObject>& request_for_registration)); + application_manager::ApplicationSharedPtr( + const std::shared_ptr<smart_objects::SmartObject>& + request_for_registration)); MOCK_METHOD0(SendUpdateAppList, void()); MOCK_METHOD2(MarkAppsGreyOut, void(const connection_handler::DeviceHandle handle, @@ -247,9 +252,10 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_CONST_METHOD2(HMILevelAllowsStreaming, bool(uint32_t app_id, protocol_handler::ServiceType service_type)); - MOCK_METHOD4(CheckPolicyPermissions, + MOCK_METHOD5(CheckPolicyPermissions, mobile_apis::Result::eType( const application_manager::ApplicationSharedPtr app, + const application_manager::WindowID window_id, const std::string& function_id, const application_manager::RPCParams& rpc_params, application_manager::CommandParametersPermissions* @@ -276,9 +282,10 @@ class MockApplicationManager : public application_manager::ApplicationManager { void(uint32_t app_id, protocol_handler::ServiceType service_type, bool state)); - MOCK_CONST_METHOD5(CreateRegularState, + MOCK_CONST_METHOD6(CreateRegularState, application_manager::HmiStatePtr( application_manager::ApplicationSharedPtr app, + const mobile_apis::WindowType::eType window_type, mobile_apis::HMILevel::eType hmi_level, mobile_apis::AudioStreamingState::eType audio_state, mobile_apis::VideoStreamingState::eType video_state, @@ -334,8 +341,9 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_METHOD2(ProcessReconnection, void(application_manager::ApplicationSharedPtr application, const uint32_t connection_key)); - MOCK_CONST_METHOD1(IsAppInReconnectMode, - bool(const std::string& policy_app_id)); + MOCK_CONST_METHOD2(IsAppInReconnectMode, + bool(const connection_handler::DeviceHandle& device_id, + const std::string& policy_app_id)); MOCK_CONST_METHOD0(GetCommandFactory, application_manager::CommandFactory&()); MOCK_CONST_METHOD0(get_current_audio_source, uint32_t()); MOCK_METHOD1(set_current_audio_source, void(const uint32_t)); diff --git a/src/components/include/test/application_manager/mock_application_manager_settings.h b/src/components/include/test/application_manager/mock_application_manager_settings.h index a4ec7c0317..998ff252fe 100644 --- a/src/components/include/test/application_manager/mock_application_manager_settings.h +++ b/src/components/include/test/application_manager/mock_application_manager_settings.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APPLICATION_MANAGER_SETTINGS_H_ #include <string> -#include "gmock/gmock.h" #include "application_manager/application_manager_settings.h" +#include "gmock/gmock.h" namespace test { namespace components { @@ -89,6 +89,7 @@ class MockApplicationManagerSettings MOCK_CONST_METHOD0(named_audio_pipe_path, const std::string&()); MOCK_CONST_METHOD0(video_stream_file, const std::string&()); MOCK_CONST_METHOD0(audio_stream_file, const std::string&()); + MOCK_CONST_METHOD0(period_for_consent_expiration, uint16_t()); MOCK_CONST_METHOD0(use_full_app_id, bool()); MOCK_CONST_METHOD0(cloud_app_retry_timeout, uint32_t()); MOCK_CONST_METHOD0(cloud_app_max_retry_attempts, uint16_t()); diff --git a/src/components/include/test/application_manager/mock_request_controller_settings.h b/src/components/include/test/application_manager/mock_request_controller_settings.h index fe848f4a75..d4d4e29a61 100644 --- a/src/components/include/test/application_manager/mock_request_controller_settings.h +++ b/src/components/include/test/application_manager/mock_request_controller_settings.h @@ -37,8 +37,8 @@ #include <string> #include <vector> -#include "gmock/gmock.h" #include "application_manager/request_controller_settings.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/test/application_manager/mock_rpc_handler.h b/src/components/include/test/application_manager/mock_rpc_handler.h new file mode 100644 index 0000000000..fb577622ce --- /dev/null +++ b/src/components/include/test/application_manager/mock_rpc_handler.h @@ -0,0 +1,41 @@ +#ifndef MOCK_RPC_HANDLER_H +#define MOCK_RPC_HANDLER_H + +#include "application_manager/rpc_handler.h" +#include "telemetry_monitor/telemetry_observable.h" + +#include "gmock/gmock.h" + +namespace test { +namespace components { +namespace application_manager_test { + +class MockRPCHandler : public application_manager::rpc_handler::RPCHandler { + public: + MOCK_METHOD4(ValidateRpcSO, + bool(smart_objects::SmartObject& message, + utils::SemanticVersion& msg_version, + rpc::ValidationReport& report_out, + bool allow_unknown_parameters)); + + MOCK_METHOD1(OnMessageReceived, + void(protocol_handler::RawMessagePtr message)); + + MOCK_METHOD1(OnMobileMessageSent, + void(protocol_handler::RawMessagePtr message)); + + MOCK_METHOD1(OnMessageReceived, + void(std::shared_ptr<application_manager::Message> message)); + + MOCK_METHOD1(OnErrorSending, + void(std::shared_ptr<application_manager::Message> message)); + + MOCK_METHOD1(SetTelemetryObserver, + void(application_manager::AMTelemetryObserver* observer)); +}; + +} // namespace application_manager_test +} // namespace components +} // namespace test + +#endif // MOCK_RPC_HANDLER_H 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 1f7dd8951b..7e4ff11bc7 100644 --- a/src/components/include/test/application_manager/mock_rpc_plugin.h +++ b/src/components/include/test/application_manager/mock_rpc_plugin.h @@ -1,8 +1,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_MOCK_RPC_PLUGIN_H #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_MOCK_RPC_PLUGIN_H -#include "gmock/gmock.h" #include "application_manager/plugin_manager/rpc_plugin.h" +#include "gmock/gmock.h" namespace application_manager { class CommandFactory; @@ -10,11 +10,12 @@ namespace plugin_manager { class MockRPCPlugin : public RPCPlugin { public: - MOCK_METHOD4(Init, + MOCK_METHOD5(Init, bool(ApplicationManager& app_manager, rpc_service::RPCService& rpc_service, HMICapabilities& hmi_capabilities, - policy::PolicyHandlerInterface& policy_handler)); + policy::PolicyHandlerInterface& policy_handler, + resumption::LastState& last_state)); MOCK_METHOD2(IsAbleToProcess, bool(const int32_t function_id, const commands::Command::CommandSource message_source)); diff --git a/src/components/include/test/application_manager/mock_rpc_plugin_manager.h b/src/components/include/test/application_manager/mock_rpc_plugin_manager.h index 74763f00d6..db0c04624b 100644 --- a/src/components/include/test/application_manager/mock_rpc_plugin_manager.h +++ b/src/components/include/test/application_manager/mock_rpc_plugin_manager.h @@ -2,8 +2,8 @@ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_RPC_PLUGIN_MANAGER_H_ #include <string> -#include "gmock/gmock.h" #include "application_manager/plugin_manager/rpc_plugin_manager.h" +#include "gmock/gmock.h" namespace application_manager { namespace plugin_manager { diff --git a/src/components/include/test/application_manager/mock_rpc_service.h b/src/components/include/test/application_manager/mock_rpc_service.h index aacb48a5ab..ed06b930d8 100644 --- a/src/components/include/test/application_manager/mock_rpc_service.h +++ b/src/components/include/test/application_manager/mock_rpc_service.h @@ -1,13 +1,16 @@ #ifndef MOCK_RPC_SERVICE_H #define MOCK_RPC_SERVICE_H -#include "gmock/gmock.h" #include "application_manager/rpc_service.h" +#include "gmock/gmock.h" +#include "smart_objects/object_schema_item.h" namespace test { namespace components { namespace application_manager_test { +using ns_smart_device_link::ns_smart_objects::SMember; + class MockRPCService : public application_manager::rpc_service::RPCService { public: MOCK_METHOD2( @@ -31,9 +34,20 @@ class MockRPCService : public application_manager::rpc_service::RPCService { IsAppServiceRPC, bool(int32_t function_id, application_manager::commands::Command::CommandSource source)); + MOCK_METHOD3(UpdateMobileRPCParams, + void(const mobile_apis::FunctionID::eType& function_id, + const mobile_apis::messageType::eType& message_type, + const std::map<std::string, SMember>& members)); + + MOCK_METHOD3(UpdateHMIRPCParams, + void(const hmi_apis::FunctionID::eType& function_id, + const hmi_apis::messageType::eType& message_type, + const std::map<std::string, SMember>& members)); + + MOCK_METHOD0(Stop, void()); }; -} -} -} +} // namespace application_manager_test +} // namespace components +} // namespace test #endif // MOCK_RPC_SERVICE_H diff --git a/src/components/include/test/application_manager/mock_state_controller.h b/src/components/include/test/application_manager/mock_state_controller.h index 0165180a0a..545090bf30 100644 --- a/src/components/include/test/application_manager/mock_state_controller.h +++ b/src/components/include/test/application_manager/mock_state_controller.h @@ -33,12 +33,11 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_STATE_CONTROLLER_H_ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_STATE_CONTROLLER_H_ -#include "gmock/gmock.h" #include "application_manager/application.h" #include "application_manager/hmi_state.h" #include "application_manager/state_controller.h" +#include "gmock/gmock.h" #include "interfaces/MOBILE_API.h" -#include "application_manager/application.h" namespace test { namespace components { @@ -47,55 +46,68 @@ namespace am = application_manager; class MockStateController : public am::StateController { public: - MOCK_METHOD3(SetRegularState, + MOCK_METHOD4(SetRegularState, void(am::ApplicationSharedPtr app, + const am::WindowID window_id, am::HmiStatePtr state, - const bool SendActivateApp)); - MOCK_METHOD5(SetRegularState, + const bool request_hmi_state_change)); + MOCK_METHOD6(SetRegularState, void(am::ApplicationSharedPtr app, + const am::WindowID window_id, const mobile_apis::HMILevel::eType hmi_level, const mobile_apis::AudioStreamingState::eType audio_state, const mobile_apis::VideoStreamingState::eType video_state, - const bool SendActivateApp)); - MOCK_METHOD3(SetRegularState, + const bool request_hmi_state_change)); + MOCK_METHOD4(SetRegularState, void(am::ApplicationSharedPtr app, + const am::WindowID window_id, const mobile_apis::HMILevel::eType hmi_level, - const bool SendActivateApp)); - MOCK_METHOD6(SetRegularState, + const bool request_hmi_state_change)); + MOCK_METHOD7(SetRegularState, void(am::ApplicationSharedPtr app, + const am::WindowID window_id, const mobile_apis::HMILevel::eType hmi_level, const mobile_apis::AudioStreamingState::eType audio_state, const mobile_apis::VideoStreamingState::eType video_state, const mobile_apis::SystemContext::eType system_context, - const bool SendActivateApp)); - MOCK_METHOD2(SetRegularState, + const bool request_hmi_state_change)); + MOCK_METHOD3(SetRegularState, void(am::ApplicationSharedPtr app, + const am::WindowID window_id, const mobile_apis::HMILevel::eType hmi_level)); - MOCK_METHOD3(SetRegularState, + MOCK_METHOD4(SetRegularState, void(am::ApplicationSharedPtr app, + const am::WindowID window_id, const mobile_apis::AudioStreamingState::eType audio_state, const mobile_apis::VideoStreamingState::eType video_state)); - MOCK_METHOD2(SetRegularState, + MOCK_METHOD3(SetRegularState, void(am::ApplicationSharedPtr app, + const am::WindowID window_id, const mobile_apis::SystemContext::eType system_context)); - MOCK_METHOD2(SetRegularState, - void(am::ApplicationSharedPtr app, am::HmiStatePtr state)); + MOCK_METHOD3(SetRegularState, + void(am::ApplicationSharedPtr app, + const am::WindowID window_id, + am::HmiStatePtr state)); MOCK_METHOD2(OnApplicationRegistered, void(am::ApplicationSharedPtr app, const mobile_apis::HMILevel::eType default_level)); - MOCK_METHOD3(SendBCActivateApp, - int64_t(am::ApplicationConstSharedPtr app, - hmi_apis::Common_HMILevel::eType level, - bool send_policy_priority)); + MOCK_METHOD4(OnAppWindowAdded, + void(am::ApplicationSharedPtr app, + const am::WindowID window_id, + const mobile_apis::WindowType::eType window_type, + const mobile_apis::HMILevel::eType default_level)); MOCK_METHOD1(OnVideoStreamingStarted, void(am::ApplicationConstSharedPtr app)); MOCK_METHOD1(OnVideoStreamingStopped, void(am::ApplicationConstSharedPtr app)); - MOCK_METHOD3(OnStateChanged, + MOCK_METHOD4(OnStateChanged, void(am::ApplicationSharedPtr app, + const am::WindowID window_id, am::HmiStatePtr old_state, am::HmiStatePtr new_state)); MOCK_CONST_METHOD1(IsStateActive, bool(am::HmiState::StateID state_id)); + MOCK_METHOD1(ActivateDefaultWindow, void(am::ApplicationSharedPtr app)); + MOCK_METHOD1(ExitDefaultWindow, void(am::ApplicationSharedPtr app)); }; } // namespace application_manager_test diff --git a/src/components/include/test/application_manager/policies/mock_custom_vehicle_data_provider.h b/src/components/include/test/application_manager/policies/mock_custom_vehicle_data_provider.h new file mode 100644 index 0000000000..ba077122ce --- /dev/null +++ b/src/components/include/test/application_manager/policies/mock_custom_vehicle_data_provider.h @@ -0,0 +1,24 @@ +#ifndef MOCK_CUSTOM_VEHICLE_DATA_MANAGER_H +#define MOCK_CUSTOM_VEHICLE_DATA_MANAGER_H + +#include "application_manager/policies/custom_vehicle_data_provider.h" +#include "gmock/gmock.h" + +namespace test { +namespace components { +namespace policy_test { + +class MockCustomVehicleDataProvider : public policy::VehicleDataItemProvider { + public: + MOCK_CONST_METHOD0( + GetVehicleDataItems, + const std::vector<rpc::policy_table_interface_base::VehicleDataItem>()); + MOCK_CONST_METHOD0( + GetRemovedVehicleDataItems, + std::vector<rpc::policy_table_interface_base::VehicleDataItem>()); +}; + +} // namespace policy_test +} // namespace components +} // namespace test +#endif // MOCK_CUSTOM_VEHICLE_DATA_MANAGER_H diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h index 3521d84a84..f74526148a 100644 --- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h +++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h @@ -33,8 +33,9 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_POLICIES_MOCK_POLICY_HANDLER_INTERFACE_H_ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_POLICIES_MOCK_POLICY_HANDLER_INTERFACE_H_ -#include "application_manager/policies/policy_handler_interface.h" #include "application_manager/application_manager.h" +#include "application_manager/policies/policy_encryption_flag_getter.h" +#include "application_manager/policies/policy_handler_interface.h" #include "gmock/gmock.h" #include "policy/policy_types.h" #include "smart_objects/smart_object.h" @@ -46,6 +47,8 @@ namespace policy_test { class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { public: MOCK_METHOD0(LoadPolicyLibrary, bool()); + MOCK_CONST_METHOD0(PolicyEncryptionFlagGetter, + policy::PolicyEncryptionFlagGetterInterfaceSPtr()); MOCK_CONST_METHOD0(PolicyEnabled, bool()); MOCK_METHOD0(InitPolicyTable, bool()); MOCK_METHOD0(ResetPolicyTable, bool()); @@ -57,13 +60,22 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { bool(const std::string& file, const policy::BinaryMessage& pt_string)); MOCK_METHOD0(UnloadPolicyLibrary, bool()); - MOCK_METHOD3(OnPermissionsUpdated, - void(const std::string& policy_app_id, + MOCK_METHOD4(OnPermissionsUpdated, + void(const std::string& device_id, + const std::string& policy_app_id, const policy::Permissions& permissions, const policy::HMILevel& default_hmi)); - MOCK_METHOD2(OnPermissionsUpdated, - void(const std::string& policy_app_id, + MOCK_METHOD3(OnPermissionsUpdated, + void(const std::string& device_id, + const std::string& policy_app_id, const policy::Permissions& permissions)); + MOCK_CONST_METHOD0(GetPolicyTableData, Json::Value()); + MOCK_CONST_METHOD0( + GetVehicleDataItems, + const std::vector<rpc::policy_table_interface_base::VehicleDataItem>()); + MOCK_CONST_METHOD0( + GetRemovedVehicleDataItems, + std::vector<rpc::policy_table_interface_base::VehicleDataItem>()); #ifdef EXTERNAL_PROPRIETARY_MODE MOCK_METHOD3(OnSnapshotCreated, @@ -71,14 +83,17 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { const std::vector<int>& retry_delay_seconds, uint32_t timeout_exchange)); #else // EXTERNAL_PROPRIETARY_MODE - MOCK_METHOD1(OnSnapshotCreated, void(const policy::BinaryMessage& pt_string)); + MOCK_METHOD2(OnSnapshotCreated, + void(const policy::BinaryMessage& pt_string, + const policy::PTUIterationType iteration_type)); #endif // EXTERNAL_PROPRIETARY_MODE MOCK_CONST_METHOD2(GetPriority, bool(const std::string& policy_app_id, std::string* priority)); - MOCK_METHOD4(CheckPermissions, + MOCK_METHOD5(CheckPermissions, void(const application_manager::ApplicationSharedPtr app, + const application_manager::WindowID window_id, const policy::PTString& rpc, const application_manager::RPCParams& rpc_params, policy::CheckPermissionResult& result)); @@ -86,8 +101,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { uint32_t(const std::string& priority)); MOCK_CONST_METHOD1(GetUserConsentForDevice, policy::DeviceConsent(const std::string& device_id)); - MOCK_CONST_METHOD2(GetDefaultHmi, - bool(const std::string& policy_app_id, + MOCK_CONST_METHOD3(GetDefaultHmi, + bool(const std::string& device_id, + const std::string& policy_app_id, std::string* default_hmi)); MOCK_METHOD3(GetInitialAppData, @@ -109,6 +125,10 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_CONST_METHOD0(TimeoutExchangeMSec, uint32_t()); MOCK_METHOD0(OnExceededTimeout, void()); MOCK_METHOD0(OnSystemReady, void()); + MOCK_CONST_METHOD0(LockScreenDismissalEnabledState, + const boost::optional<bool>()); + MOCK_CONST_METHOD1(LockScreenDismissalWarningMessage, + const boost::optional<std::string>(const std::string&)); MOCK_METHOD2(PTUpdatedAt, void(policy::Counters counter, int value)); MOCK_METHOD1(add_listener, void(policy::PolicyHandlerObserver* listener)); MOCK_METHOD1(remove_listener, void(policy::PolicyHandlerObserver* listener)); @@ -123,8 +143,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_METHOD2(OnAllowSDLFunctionalityNotification, void(bool is_allowed, const std::string& device_id)); MOCK_METHOD0(OnIgnitionCycleOver, void()); - MOCK_METHOD1(OnPendingPermissionChange, - void(const std::string& policy_app_id)); + MOCK_METHOD2(OnPendingPermissionChange, + void(const std::string& device_id, + const std::string& policy_app_id)); MOCK_METHOD1(PTExchangeAtUserRequest, void(uint32_t correlation_id)); MOCK_METHOD2(AddDevice, void(const std::string& device_id, @@ -152,8 +173,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { const uint32_t correlation_id)); MOCK_METHOD1(OnGetStatusUpdate, void(const uint32_t correlation_id)); MOCK_METHOD1(OnUpdateStatusChanged, void(const std::string& status)); - MOCK_METHOD1(OnCurrentDeviceIdUpdateRequired, - std::string(const std::string& policy_app_id)); + MOCK_METHOD2(OnCurrentDeviceIdUpdateRequired, + std::string(const transport_manager::DeviceHandle& device_handle, + const std::string& policy_app_id)); MOCK_METHOD1(OnSystemInfoChanged, void(const std::string& language)); MOCK_METHOD3(OnGetSystemInfo, void(const std::string& ccpu_version, @@ -174,18 +196,22 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { void(std::map<std::string, policy::StringArray> app_hmi_types)); MOCK_METHOD1(OnCertificateUpdated, void(const std::string& certificate_data)); MOCK_METHOD1(OnPTUFinished, void(const bool ptu_result)); + MOCK_METHOD0(OnPTInited, void()); + MOCK_METHOD0(StopRetrySequence, void()); MOCK_METHOD1(OnCertificateDecrypted, void(bool is_succeeded)); MOCK_METHOD0(CanUpdate, bool()); MOCK_METHOD2(OnDeviceConsentChanged, void(const std::string& device_id, bool is_allowed)); - MOCK_CONST_METHOD2(SendOnAppPermissionsChanged, + MOCK_CONST_METHOD3(SendOnAppPermissionsChanged, void(const policy::AppPermissions& permissions, + const std::string& device_id, const std::string& policy_app_id)); MOCK_METHOD0(OnPTExchangeNeeded, void()); MOCK_METHOD1(GetAvailableApps, void(std::queue<std::string>& apps)); - MOCK_METHOD2( + MOCK_METHOD3( AddApplication, policy::StatusNotifier( + const std::string& device_id, const std::string& application_id, const rpc::policy_table_interface_base::AppHmiTypes& hmi_types)); MOCK_METHOD1(IsApplicationRevoked, bool(const std::string& app_id)); @@ -193,10 +219,12 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_CONST_METHOD1(HeartBeatTimeout, uint32_t(const std::string& app_id)); MOCK_METHOD0(OnAppsSearchStarted, void()); MOCK_METHOD1(OnAppsSearchCompleted, void(const bool trigger_ptu)); - MOCK_METHOD1(OnAppRegisteredOnMobile, - void(const std::string& application_id)); - MOCK_CONST_METHOD2(IsRequestTypeAllowed, - bool(const std::string& policy_app_id, + MOCK_METHOD2(OnAppRegisteredOnMobile, + void(const std::string& device_id, + const std::string& application_id)); + MOCK_CONST_METHOD3(IsRequestTypeAllowed, + bool(const transport_manager::DeviceHandle& device_handle, + const std::string& policy_app_id, mobile_apis::RequestType::eType type)); MOCK_CONST_METHOD2(IsRequestSubTypeAllowed, bool(const std::string& policy_app_id, @@ -210,10 +238,10 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_CONST_METHOD1( GetAppRequestSubTypes, const std::vector<std::string>(const std::string& policy_app_id)); - MOCK_CONST_METHOD1( - GetAppRequestTypes, - const std::vector<std::string>(const std::string& policy_app_id)); - MOCK_CONST_METHOD0(GetVehicleInfo, const policy::VehicleInfo()); + MOCK_CONST_METHOD2(GetAppRequestTypes, + const std::vector<std::string>( + const transport_manager::DeviceHandle& device_handle, + const std::string& policy_app_id)); MOCK_CONST_METHOD1(GetEnabledCloudApps, void(std::vector<std::string>& enabled_apps)); MOCK_CONST_METHOD1(CheckCloudAppEnabled, @@ -242,6 +270,8 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { #ifdef EXTERNAL_PROPRIETARY_MODE MOCK_CONST_METHOD0(GetMetaInfo, const policy::MetaInfo()); + MOCK_METHOD0(IncrementRetryIndex, void()); + MOCK_CONST_METHOD0(ptu_retry_handler, policy::PTURetryHandler&()); #endif // EXTERNAL_PROPRIETARY_MODE MOCK_METHOD1(Increment, void(usage_statistics::GlobalCounterId type)); @@ -289,8 +319,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_CONST_METHOD2(GetModuleTypes, bool(const std::string& policy_app_id, std::vector<std::string>* modules)); - MOCK_METHOD2(SetDefaultHmiTypes, - void(const std::string& application_id, + MOCK_METHOD3(SetDefaultHmiTypes, + void(const transport_manager::DeviceHandle& device_handle, + const std::string& application_id, const smart_objects::SmartObject* app_types)); MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from, diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_observer.h b/src/components/include/test/application_manager/policies/mock_policy_handler_observer.h index bd8c83d897..43e4983368 100644 --- a/src/components/include/test/application_manager/policies/mock_policy_handler_observer.h +++ b/src/components/include/test/application_manager/policies/mock_policy_handler_observer.h @@ -37,8 +37,8 @@ #include <string> #include <vector> -#include "gmock/gmock.h" #include "application_manager/policies/policy_handler_observer.h" +#include "gmock/gmock.h" namespace test { namespace components { |