diff options
| author | ChrisB-Elektrobit <chris.boguslawski@elektrobit.com> | 2017-08-17 11:53:17 -0400 |
|---|---|---|
| committer | ChrisB-Elektrobit <chris.boguslawski@elektrobit.com> | 2017-08-17 11:53:17 -0400 |
| commit | 5ac94cb84735c9e58681bcbf300b700b931be360 (patch) | |
| tree | 9e8517e06b78959c07cb2f5cfaab18a564cd37e0 /src/components/application_manager/test/commands | |
| parent | c03f1aeea948623306d954f3202d0f54d6f8ee01 (diff) | |
| download | sdl_core-5ac94cb84735c9e58681bcbf300b700b931be360.tar.gz | |
- performed renamings suggested in smartdevicelink/sdl_evolution#239
Diffstat (limited to 'src/components/application_manager/test/commands')
| -rw-r--r-- | src/components/application_manager/test/commands/mobile/show_test.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/components/application_manager/test/commands/mobile/show_test.cc b/src/components/application_manager/test/commands/mobile/show_test.cc index b1e6d93b39..01d4c8105f 100644 --- a/src/components/application_manager/test/commands/mobile/show_test.cc +++ b/src/components/application_manager/test/commands/mobile/show_test.cc @@ -161,11 +161,11 @@ class ShowRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> { (*msg)[am::strings::params][am::strings::connection_key] = kConnectionKey; (*msg)[am::strings::params][am::strings::function_id] = kFunctionID; msg_params[field] = text_field_; - msg_params[am::strings::text_field_metadata][field] = + msg_params[am::strings::metadata_tags][field] = smart_objects::SmartObject(smart_objects::SmartType_Array); for (size_t i = 0; i < num_tags; ++i) { const int32_t current_tag = field_tags[i]; - msg_params[am::strings::text_field_metadata][field][i] = current_tag; + msg_params[am::strings::metadata_tags][field][i] = current_tag; } (*msg)[am::strings::msg_params] = msg_params; @@ -176,7 +176,7 @@ class ShowRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> { EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kAppId)); msg_params.erase(field); - msg_params.erase(am::strings::text_field_metadata); + msg_params.erase(am::strings::metadata_tags); msg_params[am::strings::app_id] = kAppId; msg_params[am::hmi_request::show_strings] = @@ -643,7 +643,7 @@ TEST_F(ShowRequestTest, Run_MainField1_MetadataTag) { text_field_ = "Main_Field_1"; const size_t num_tags = 1; - int32_t tags[num_tags] = {hmi_apis::Common_TextFieldType::mediaArtist}; + int32_t tags[num_tags] = {hmi_apis::Common_MetadataType::mediaArtist}; TestSetupHelperWithMetadata(msg, hmi_apis::Common_TextFieldName::mainField1, am::strings::main_field_1, @@ -659,11 +659,11 @@ TEST_F(ShowRequestTest, Run_MainField1_MultipleMetadataTags) { text_field_ = "Main_Field_1"; const size_t num_tags = 5; - int32_t tags[num_tags] = {hmi_apis::Common_TextFieldType::mediaTitle, - hmi_apis::Common_TextFieldType::mediaArtist, - hmi_apis::Common_TextFieldType::rating, - hmi_apis::Common_TextFieldType::humidity, - hmi_apis::Common_TextFieldType::currentTemperature}; + int32_t tags[num_tags] = {hmi_apis::Common_MetadataType::mediaTitle, + hmi_apis::Common_MetadataType::mediaArtist, + hmi_apis::Common_MetadataType::rating, + hmi_apis::Common_MetadataType::humidity, + hmi_apis::Common_MetadataType::currentTemperature}; TestSetupHelperWithMetadata(msg, hmi_apis::Common_TextFieldName::mainField1, am::strings::main_field_1, @@ -679,7 +679,7 @@ TEST_F(ShowRequestTest, Run_MainField2_MetadataTag) { text_field_ = "Main_Field_2"; const size_t num_tags = 1; - int32_t tags[num_tags] = {hmi_apis::Common_TextFieldType::mediaArtist}; + int32_t tags[num_tags] = {hmi_apis::Common_MetadataType::mediaArtist}; TestSetupHelperWithMetadata(msg, hmi_apis::Common_TextFieldName::mainField2, am::strings::main_field_2, @@ -695,7 +695,7 @@ TEST_F(ShowRequestTest, Run_MainField3_MetadataTag) { text_field_ = "Main_Field_3"; const size_t num_tags = 1; - int32_t tags[num_tags] = {hmi_apis::Common_TextFieldType::mediaArtist}; + int32_t tags[num_tags] = {hmi_apis::Common_MetadataType::mediaArtist}; TestSetupHelperWithMetadata(msg, hmi_apis::Common_TextFieldName::mainField3, am::strings::main_field_3, @@ -711,7 +711,7 @@ TEST_F(ShowRequestTest, Run_MainField4_MetadataTag) { text_field_ = "Main_Field_4"; const size_t num_tags = 1; - int32_t tags[num_tags] = {hmi_apis::Common_TextFieldType::mediaArtist}; + int32_t tags[num_tags] = {hmi_apis::Common_MetadataType::mediaArtist}; TestSetupHelperWithMetadata(msg, hmi_apis::Common_TextFieldName::mainField4, am::strings::main_field_4, |