diff options
Diffstat (limited to 'src/components/application_manager/rpc_plugins/rc_rpc_plugin/test')
4 files changed, 15 insertions, 6 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc index f4ef39f488..17d4f05be7 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc @@ -97,10 +97,12 @@ class ButtonPressRequestTest ON_CALL(mock_hmi_capabilities_, rc_capability()) .WillByDefault(Return(rc_capabilities_)); ON_CALL(*mock_app_, policy_app_id()).WillByDefault(Return(kPolicyAppId)); - ON_CALL(mock_policy_handler_, - CheckHMIType(kPolicyAppId, - mobile_apis::AppHMIType::eType::REMOTE_CONTROL, - nullptr)) + ON_CALL(*mock_app_, app_types()) + .WillByDefault(Return(std::shared_ptr<smart_objects::SmartObject>())); + ON_CALL( + mock_policy_handler_, + CheckHMIType( + kPolicyAppId, mobile_apis::AppHMIType::eType::REMOTE_CONTROL, _)) .WillByDefault(Return(true)); ON_CALL(mock_allocation_manager_, is_rc_enabled()) .WillByDefault(Return(true)); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc index 5fa474c631..b4f9d177ea 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc @@ -104,6 +104,10 @@ class GetInteriorVehicleDataRequestTest smart_objects::SmartType::SmartType_Array)) { ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId)); ON_CALL(*mock_app2_, app_id()).WillByDefault(Return(kAppId2)); + ON_CALL(*mock_app_, app_types()) + .WillByDefault(Return(std::shared_ptr<smart_objects::SmartObject>())); + ON_CALL(*mock_app2_, app_types()) + .WillByDefault(Return(std::shared_ptr<smart_objects::SmartObject>())); ON_CALL(*mock_app_, is_remote_control_supported()) .WillByDefault(Return(true)); ON_CALL(*mock_app2_, is_remote_control_supported()) @@ -158,8 +162,7 @@ class GetInteriorVehicleDataRequestTest ON_CALL(mock_hmi_capabilities_, rc_capability()) .WillByDefault(Return(rc_capabilities_)); ON_CALL(mock_policy_handler_, - CheckHMIType( - _, mobile_apis::AppHMIType::eType::REMOTE_CONTROL, nullptr)) + CheckHMIType(_, mobile_apis::AppHMIType::eType::REMOTE_CONTROL, _)) .WillByDefault(Return(true)); ON_CALL(mock_policy_handler_, CheckModule(_, _)) .WillByDefault(Return(true)); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc index 82d1b128f0..07ab202620 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc @@ -131,6 +131,8 @@ class RCGetInteriorVehicleDataConsentTest smart_objects::SmartObject control_caps((smart_objects::SmartType_Array)); (*rc_capabilities_)[strings::kradioControlCapabilities] = control_caps; ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId)); + ON_CALL(*mock_app_, app_types()) + .WillByDefault(Return(std::shared_ptr<smart_objects::SmartObject>())); ON_CALL(app_mngr_, hmi_interfaces()) .WillByDefault(ReturnRef(mock_hmi_interfaces_)); ON_CALL( diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc index fe190a796f..3e6c271ed3 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc @@ -98,6 +98,8 @@ class SetInteriorVehicleDataRequestTest ON_CALL(mock_allocation_manager_, AcquireResource(_, _, _)) .WillByDefault(Return(AcquireResult::ALLOWED)); ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId)); + ON_CALL(*mock_app_, app_types()) + .WillByDefault(Return(std::shared_ptr<smart_objects::SmartObject>())); ON_CALL(mock_policy_handler_, CheckHMIType(kPolicyAppId, mobile_apis::AppHMIType::eType::REMOTE_CONTROL, |