diff options
author | Sho Amano <samano@xevo.com> | 2019-08-16 11:09:25 +0900 |
---|---|---|
committer | Sho Amano <samano@xevo.com> | 2019-08-16 12:17:39 +0900 |
commit | 2aedd705a97a380a88323b34879d597a797f17c5 (patch) | |
tree | 209574e38d1a47e4b27859e8176641619ef6d898 /src/components | |
parent | 4b4d7144e19176602b083381df82dae432712564 (diff) | |
download | sdl_core-2aedd705a97a380a88323b34879d597a797f17c5.tar.gz |
Omit the case where UI.GetCapabilityResponse returns a list in audioPassThruCapabilities
Reflecting review comment.
Diffstat (limited to 'src/components')
2 files changed, 13 insertions, 14 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc index fb372349b0..d2e15d7350 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc @@ -78,19 +78,12 @@ void UIGetCapabilitiesResponse::Run() { hmi_capabilities.set_audio_pass_thru_capabilities( msg_params[strings::audio_pass_thru_capabilities_list]); } else if (msg_params.keyExists(strings::audio_pass_thru_capabilities)) { - const smart_objects::SmartObject& audio_pass_thru_capabilities = + smart_objects::SmartObject audio_pass_thru_capabilities_list( + smart_objects::SmartType_Array); + audio_pass_thru_capabilities_list[0] = msg_params[strings::audio_pass_thru_capabilities]; - if (smart_objects::SmartType_Array == - audio_pass_thru_capabilities.getType()) { - hmi_capabilities.set_audio_pass_thru_capabilities( - audio_pass_thru_capabilities); - } else { - smart_objects::SmartObject audio_pass_thru_capabilities_list( - smart_objects::SmartType_Array); - audio_pass_thru_capabilities_list[0] = audio_pass_thru_capabilities; - hmi_capabilities.set_audio_pass_thru_capabilities( - audio_pass_thru_capabilities_list); - } + hmi_capabilities.set_audio_pass_thru_capabilities( + audio_pass_thru_capabilities_list); } if (msg_params.keyExists(strings::hmi_capabilities)) { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc index 3fa26f7bd1..f2feb75b63 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc @@ -145,7 +145,7 @@ TEST_F(UIGetCapabilitiesResponseTest, SetHmiZone_SUCCESS) { TEST_F(UIGetCapabilitiesResponseTest, SetAudioPassThru_SUCCESS) { MessageSharedPtr command_msg = CreateCommandMsg(); (*command_msg)[strings::msg_params][strings::audio_pass_thru_capabilities] = - smart_objects::SmartObject(smart_objects::SmartType_Array); + smart_objects::SmartObject(smart_objects::SmartType_Map); ResponseFromHMIPtr command( CreateCommand<UIGetCapabilitiesResponse>(command_msg)); @@ -153,9 +153,15 @@ TEST_F(UIGetCapabilitiesResponseTest, SetAudioPassThru_SUCCESS) { smart_objects::SmartObject audio_pass_thru_capabilities_so = (*command_msg)[strings::msg_params] [strings::audio_pass_thru_capabilities]; + + // hmi_capabilities will receive a list of capabilities, the first element + // being audio_pass_thru_capabilities_so + smart_objects::SmartObject audio_pass_thru_capabilities_list_so = + smart_objects::SmartObject(smart_objects::SmartType_Array); + audio_pass_thru_capabilities_list_so[0] = audio_pass_thru_capabilities_so; EXPECT_CALL( mock_hmi_capabilities_, - set_audio_pass_thru_capabilities(audio_pass_thru_capabilities_so)); + set_audio_pass_thru_capabilities(audio_pass_thru_capabilities_list_so)); command->Run(); } |