- performed renamings suggested in smartdevicelink/sdl_evolution#239

6 files changed, 30 insertions, 31 deletions

diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
index 88a904764b..3d8849fb73 100644
--- a/src/components/application_manager/include/application_manager/smart_object_keys.h
+++ b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -90,7 +90,7 @@ extern const char* main_field_1;
 extern const char* main_field_2;
 extern const char* main_field_3;
 extern const char* main_field_4;
-extern const char* text_field_metadata;
+extern const char* metadata_tags;
 extern const char* eta;
 extern const char* time_to_destination;
 extern const char* total_distance;
diff --git a/src/components/application_manager/src/commands/mobile/show_request.cc b/src/components/application_manager/src/commands/mobile/show_request.cc
index 7664df602e..5b8e98d7ea 100644
--- a/src/components/application_manager/src/commands/mobile/show_request.cc
+++ b/src/components/application_manager/src/commands/mobile/show_request.cc
@@ -53,18 +53,18 @@ ShowRequest::~ShowRequest() {}
 void ShowRequest::HandleMetadata(const char* field_id,
                                  int32_t field_index,
                                  smart_objects::SmartObject& msg_params) {
-  smart_objects::SmartObject& metadata_struct =
-      (*message_)[strings::msg_params][strings::text_field_metadata];
+  smart_objects::SmartObject& metadata_tags =
+      (*message_)[strings::msg_params][strings::metadata_tags];
 
-  if (metadata_struct.keyExists(field_id)) {
+  if (metadata_tags.keyExists(field_id)) {
     if (field_index != -1) {
       msg_params[hmi_request::show_strings][field_index]
                 [hmi_request::field_types] =
                     smart_objects::SmartObject(smart_objects::SmartType_Array);
 
-      const size_t num_tags = metadata_struct[field_id].length();
+      const size_t num_tags = metadata_tags[field_id].length();
       for (size_t i = 0; i < num_tags; ++i) {
-        const int32_t current_tag = metadata_struct[field_id][i].asInt();
+        const int32_t current_tag = metadata_tags[field_id][i].asInt();
         msg_params[hmi_request::show_strings][field_index]
                   [hmi_request::field_types][i] = current_tag;
       }
@@ -201,8 +201,7 @@ void ShowRequest::Run() {
     ++index;
   }
 
-  if ((*message_)[strings::msg_params].keyExists(
-          strings::text_field_metadata)) {
+  if ((*message_)[strings::msg_params].keyExists(strings::metadata_tags)) {
     HandleMetadata(strings::main_field_1, main_field_1_index, msg_params);
     HandleMetadata(strings::main_field_2, main_field_2_index, msg_params);
     HandleMetadata(strings::main_field_3, main_field_3_index, msg_params);
diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc
index cafb7f7388..d0a8d42df7 100644
--- a/src/components/application_manager/src/smart_object_keys.cc
+++ b/src/components/application_manager/src/smart_object_keys.cc
@@ -57,7 +57,7 @@ const char* main_field_1 = "mainField1";
 const char* main_field_2 = "mainField2";
 const char* main_field_3 = "mainField3";
 const char* main_field_4 = "mainField4";
-const char* text_field_metadata = "textFieldMetadata";
+const char* metadata_tags = "metadataTags";
 const char* eta = "eta";
 const char* time_to_destination = "timeToDestination";
 const char* total_distance = "totalDistance";
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,
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index d813f27ed1..d92455a90b 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -503,7 +503,7 @@
     <element name="turnText"/>
 </enum>
 
-<enum name="TextFieldType">
+<enum name="MetadataType">
   <element name="mediaTitle">
     <description>The data in this field contains the title of the currently playing audio track.</description>
   </element>
@@ -1686,7 +1686,7 @@
   <param name="fieldText" type="String" maxlength="500" mandatory="true">
     <description>The  text itself.</description>
   </param>
-  <param name="fieldTypes" type="Common.TextFieldType" minsize="0" maxsize="5" array="true" mandatory="false">
+  <param name="fieldTypes" type="Common.MetadataType" minsize="0" maxsize="5" array="true" mandatory="false">
     <description>The type of data contained in the field.</description>
   </param>
 </struct>
diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml
index 861ebc7a5d..e9689edb83 100644
--- a/src/components/interfaces/MOBILE_API.xml
+++ b/src/components/interfaces/MOBILE_API.xml
@@ -701,7 +701,7 @@
 

   </enum>

 

-  <enum name="TextFieldType">

+  <enum name="MetadataType">

     <element name="mediaTitle">

       <description>The data in this field contains the title of the currently playing audio track.</description>

     </element>

@@ -880,17 +880,17 @@
     </param>

   </struct>

 

-  <struct name="MetadataStruct">

-    <param name="mainField1" type="TextFieldType" minsize="0" maxsize="5" array="true" mandatory="false">

+  <struct name="MetadataTags">

+    <param name="mainField1" type="MetadataType" minsize="0" maxsize="5" array="true" mandatory="false">

       <description>The type of data contained in the "mainField1" text field.</description>

     </param>

-    <param name="mainField2" type="TextFieldType" minsize="0" maxsize="5" array="true" mandatory="false">

+    <param name="mainField2" type="MetadataType" minsize="0" maxsize="5" array="true" mandatory="false">

       <description>The type of data contained in the "mainField2" text field.</description>

     </param>

-    <param name="mainField3" type="TextFieldType" minsize="0" maxsize="5" array="true" mandatory="false">

+    <param name="mainField3" type="MetadataType" minsize="0" maxsize="5" array="true" mandatory="false">

       <description>The type of data contained in the "mainField3" text field.</description>

     </param>

-    <param name="mainField4" type="TextFieldType" minsize="0" maxsize="5" array="true" mandatory="false">

+    <param name="mainField4" type="MetadataType" minsize="0" maxsize="5" array="true" mandatory="false">

       <description>The type of data contained in the "mainField4" text field.</description>

     </param>

   </struct>

@@ -3342,9 +3342,9 @@
       </description>

     </param>

 

-    <param name="textFieldMetadata" type="MetadataStruct" mandatory="false">

+    <param name="metadataTags" type="MetadataTags" mandatory="false">

         <description>

-            App defined metadata information. See MetadataStruct. Uses mainField1, mainField2, mainField3, mainField4.

+            App defined metadata information. See MetadataTags. Uses mainField1, mainField2, mainField3, mainField4.

             If omitted on supported displays, the currently set metadata tags will not change.

             If any text field contains no tags, the metadata tag for that textfield should be removed.

         </description>