diff options
author | Sho Amano <samano@xevo.com> | 2019-08-01 10:39:41 +0900 |
---|---|---|
committer | Sho Amano <samano@xevo.com> | 2019-08-01 11:11:43 +0900 |
commit | 50a32e2e4311f255d14db71d6743b50227e248f0 (patch) | |
tree | 88c9e5f2e75155a977711f99898387e4dc3eb45c /src | |
parent | 20dceff93010cb3418f7f71f8f62301189be03d4 (diff) | |
download | sdl_core-50a32e2e4311f255d14db71d6743b50227e248f0.tar.gz |
always make audio_pass_thru_capabilities_ an array
Reflecting code review comment.
Diffstat (limited to 'src')
-rw-r--r-- | src/components/application_manager/src/hmi_capabilities_impl.cc | 10 | ||||
-rw-r--r-- | src/components/application_manager/test/hmi_capabilities_test.cc | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc index 3b101e73a8..2ec2ebb302 100644 --- a/src/components/application_manager/src/hmi_capabilities_impl.cc +++ b/src/components/application_manager/src/hmi_capabilities_impl.cc @@ -1066,20 +1066,16 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { if (check_existing_json_member(ui, "audioPassThruCapabilities")) { Json::Value audio_capabilities = ui.get("audioPassThruCapabilities", ""); - smart_objects::SmartObject audio_capabilities_so; + smart_objects::SmartObject audio_capabilities_so( + smart_objects::SmartType_Array); if (audio_capabilities.type() == Json::arrayValue) { - audio_capabilities_so = - smart_objects::SmartObject(smart_objects::SmartType_Array); for (uint32_t i = 0; i < audio_capabilities.size(); i++) { convert_audio_capability_to_obj(audio_capabilities[i], audio_capabilities_so[i]); } } else if (audio_capabilities.type() == Json::objectValue) { - // old format which supports only one capability set - audio_capabilities_so = - smart_objects::SmartObject(smart_objects::SmartType_Map); convert_audio_capability_to_obj(audio_capabilities, - audio_capabilities_so); + audio_capabilities_so[0]); } set_audio_pass_thru_capabilities(audio_capabilities_so); } diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc index a82e6fe191..3d47c717e1 100644 --- a/src/components/application_manager/test/hmi_capabilities_test.cc +++ b/src/components/application_manager/test/hmi_capabilities_test.cc @@ -602,21 +602,25 @@ TEST_F(HMICapabilitiesTest, std::make_shared<HMICapabilitiesForTesting>(mock_app_mngr); hmi_capabilities->Init(&last_state_); - // with old audio pass thru format, the object is a map + // with old audio pass thru format, the object is an array containing a single + // object smart_objects::SmartObject audio_pass_thru_capabilities_so = *(hmi_capabilities->audio_pass_thru_capabilities()); - EXPECT_TRUE(audio_pass_thru_capabilities_so.keyExists("samplingRate")); + EXPECT_EQ(smart_objects::SmartType_Array, + audio_pass_thru_capabilities_so.getType()); + EXPECT_EQ(1u, audio_pass_thru_capabilities_so.length()); + EXPECT_TRUE(audio_pass_thru_capabilities_so[0].keyExists("samplingRate")); EXPECT_EQ(hmi_apis::Common_SamplingRate::RATE_22KHZ, static_cast<hmi_apis::Common_SamplingRate::eType>( - audio_pass_thru_capabilities_so["samplingRate"].asInt())); - EXPECT_TRUE(audio_pass_thru_capabilities_so.keyExists("bitsPerSample")); + audio_pass_thru_capabilities_so[0]["samplingRate"].asInt())); + EXPECT_TRUE(audio_pass_thru_capabilities_so[0].keyExists("bitsPerSample")); EXPECT_EQ(hmi_apis::Common_BitsPerSample::RATE_16_BIT, static_cast<hmi_apis::Common_BitsPerSample::eType>( - audio_pass_thru_capabilities_so["bitsPerSample"].asInt())); - EXPECT_TRUE(audio_pass_thru_capabilities_so.keyExists("audioType")); + audio_pass_thru_capabilities_so[0]["bitsPerSample"].asInt())); + EXPECT_TRUE(audio_pass_thru_capabilities_so[0].keyExists("audioType")); EXPECT_EQ(hmi_apis::Common_AudioType::PCM, static_cast<hmi_apis::Common_AudioType::eType>( - audio_pass_thru_capabilities_so["audioType"].asInt())); + audio_pass_thru_capabilities_so[0]["audioType"].asInt())); } TEST_F(HMICapabilitiesTest, VerifyImageType) { |