Merge remote-tracking branch 'origin/release/4.4.0' into feature/invalid_data_info

3 files changed, 0 insertions, 71 deletions

diff --git a/src/components/formatters/test/meta_formatter_test.cc b/src/components/formatters/test/meta_formatter_test.cc
index 293f881c4a..87f05ab50e 100644
--- a/src/components/formatters/test/meta_formatter_test.cc
+++ b/src/components/formatters/test/meta_formatter_test.cc
@@ -68,20 +68,6 @@ TEST_F(CMetaFormatterTestHelper,
       CMetaFormatter::CreateObjectByPattern(object2, schema, result_object2);
   EXPECT_TRUE(creationresult);
 
-  // Uncomment code to print objects in console
-  //    std::string formatted_string;
-  //    CFormatterJsonSDLRPCv1::toString(object1, formatted_string);
-  //    printf("object1 %s\n", formatted_string.c_str());
-  //
-  //    CFormatterJsonSDLRPCv1::toString(result_object1, formatted_string);
-  //    printf("result_object1 %s\n", formatted_string.c_str());
-  //
-  //    CFormatterJsonSDLRPCv1::toString(object2, formatted_string);
-  //    printf("object2 %s\n", formatted_string.c_str());
-  //
-  //    CFormatterJsonSDLRPCv1::toString(result_object2, formatted_string);
-  //    printf("result_object2 %s\n", formatted_string.c_str());
-
   CompareObjects(object1, result_object1);
   CompareObjects(object2, result_object2);
 
@@ -112,13 +98,6 @@ TEST_F(CMetaFormatterTestHelper, NormalSchemaWithEmptyObject) {
   FillObjectWithDefaultValues(expected_object);
 
   CompareObjects(expected_object, result_object);
-
-  // Uncomment code to print objects in console
-  //    std::string str;
-  //    AnyObjectToJsonString(result_object, str);
-  //    printf("result_object(default) %s", str.c_str());
-  //    AnyObjectToJsonString(expected_object, str);
-  //    printf("expected_object %s", str.c_str());
 }
 
 TEST_F(CMetaFormatterTestHelper,
@@ -140,11 +119,6 @@ TEST_F(CMetaFormatterTestHelper,
       0, result_object[S_MSG_PARAMS]["syncMsgVersion"]["minorVersion"].asInt());
   EXPECT_EQ(
       0, result_object[S_MSG_PARAMS]["syncMsgVersion"]["patchVersion"].asInt());
-
-  // Uncomment code to print object in console
-  //    std::string str;
-  //    AnyObjectToJsonString(result_object, str);
-  //    printf("result_object %s", str.c_str());
 }
 
 TEST_F(CMetaFormatterTestHelper, ObjectWithEmptyMap) {
@@ -191,11 +165,6 @@ TEST_F(CMetaFormatterTestHelper, ObjectWithEmptyMap) {
   EXPECT_EQ(SmartType_Map, result_object_empty_map.getType())
       << "smartObject is not map type";
   EXPECT_EQ(0u, result_object_empty_map.length()) << "non empty map";
-
-  // Uncomment code to print object in console
-  //    std::string str;
-  //    AnyObjectToJsonString(result_object_empty_map, str);
-  //    printf("result_object(empty map) %s", str.c_str());
 }
 
 TEST_F(CMetaFormatterTestHelper, ObjectWithEmptyArray) {
@@ -233,11 +202,6 @@ TEST_F(CMetaFormatterTestHelper, ObjectWithEmptyArray) {
   EXPECT_EQ(SmartType_Array, result_object_empty_array.getType())
       << "smartObject is not array type";
   EXPECT_EQ(0u, result_object_empty_array.length()) << "non empty array";
-
-  // Uncomment code to print object in console
-  //    std::string str;
-  //    AnyObjectToJsonString(result_object_empty_array, str);
-  //    printf("result_object(empty array) %s", str.c_str());
 }
 
 TEST_F(CMetaFormatterTestHelper,
@@ -325,13 +289,6 @@ TEST_F(CMetaFormatterTestHelper,
 
   CMetaFormatter::CreateObjectByPattern(object, schema, result_object);
 
-  // Uncomment code to print object in console
-  //    std::string str;
-  //    AnyObjectToJsonString(object, str);
-  //    printf("object %s", str.c_str());
-  //    AnyObjectToJsonString(result_object, str);
-  //    printf("result_object %s", str.c_str());
-
   // Assert
   EXPECT_EQ(500, result_object[S_PARAMS][S_FUNCTION_ID].asInt());
   EXPECT_EQ(-1, result_object[S_PARAMS][S_MESSAGE_TYPE].asInt());
diff --git a/src/components/formatters/test/src/create_smartSchema.cc b/src/components/formatters/test/src/create_smartSchema.cc
index 4ae692429c..1497fbf281 100644
--- a/src/components/formatters/test/src/create_smartSchema.cc
+++ b/src/components/formatters/test/src/create_smartSchema.cc
@@ -339,7 +339,6 @@ CSmartSchema initSchemaForMetaFormatter() {
   ISchemaItemPtr majorVersion_SchemaItem = TNumberSchemaItem<int>::create();
   ISchemaItemPtr minorVersion_SchemaItem = TNumberSchemaItem<int>::create();
   ISchemaItemPtr patchVersion_SchemaItem = TNumberSchemaItem<int>::create();
-
   ISchemaItemPtr syncMsg_SchemaItem =
       CStringSchemaItem::create(TSchemaItemParameter<size_t>(0),
                                 TSchemaItemParameter<size_t>(1000),
diff --git a/src/components/formatters/test/src/meta_formatter_test_helper.cc b/src/components/formatters/test/src/meta_formatter_test_helper.cc
index a29c1bceb3..897c8d364d 100644
--- a/src/components/formatters/test/src/meta_formatter_test_helper.cc
+++ b/src/components/formatters/test/src/meta_formatter_test_helper.cc
@@ -109,17 +109,6 @@ void CMetaFormatterTestHelper::
   obj[S_MSG_PARAMS]["languageDesired"] = Language::EN_EU;
   obj[S_MSG_PARAMS]["hmiDisplayLanguageDesired"] = Language::RU_RU;
   obj[S_MSG_PARAMS]["appID"] = "APP ID";
-
-  // Commented not mandatory params for check creation object without them
-  //   obj[S_MSG_PARAMS]["ttsName"][0]["text"] = "ABC";
-  //   obj[S_MSG_PARAMS]["ttsName"][0]["type"] =
-  //       SpeechCapabilities::SC_TEXT;
-
-  //   obj[S_MSG_PARAMS]["vrSynonyms"][0] = "Synonym1";
-  //   obj[S_MSG_PARAMS]["vrSynonyms"][1] = "Synonym2";
-
-  //   obj[S_MSG_PARAMS]["appType"][0] = AppTypeTest::SYSTEM; // not mandatory
-  //   obj[S_MSG_PARAMS]["appType"][1] = AppTypeTest::MEDIA;
 }
 
 void CMetaFormatterTestHelper::FillObjectWithoutSomeMandatoryFields(
@@ -130,11 +119,6 @@ void CMetaFormatterTestHelper::FillObjectWithoutSomeMandatoryFields(
   obj[S_PARAMS][S_PROTOCOL_VERSION] = 1;
   obj[S_PARAMS][S_PROTOCOL_TYPE] = 0;
 
-  // Commented mandatory params for check creation object without them
-  //   obj[S_PARAMS][S_CORRELATION_ID] = 12;
-  //   obj[S_MSG_PARAMS]["syncMsgVersion"]["majorVersion"] = 2;
-  //   obj[S_MSG_PARAMS]["syncMsgVersion"]["minorVersion"] = 10;
-
   obj[S_MSG_PARAMS]["appName"] = "APP NAME";
   obj[S_MSG_PARAMS]["ttsName"][0]["text"] = "ABC";
   obj[S_MSG_PARAMS]["ttsName"][0]["type"] = SpeechCapabilities::SC_TEXT;
@@ -200,17 +184,6 @@ void CMetaFormatterTestHelper::FillObjectWithDefaultValues(SmartObject& obj) {
   obj[S_MSG_PARAMS]["languageDesired"] = -1;
   obj[S_MSG_PARAMS]["hmiDisplayLanguageDesired"] = -1;
   obj[S_MSG_PARAMS]["appID"] = "";
-
-  // Commented params for check creation object with only default values
-  //   obj[S_MSG_PARAMS]["ttsName"][0]["text"] = "ABC";
-  //   obj[S_MSG_PARAMS]["ttsName"][0]["type"] =
-  //       SpeechCapabilities::SC_TEXT;
-
-  //   obj[S_MSG_PARAMS]["vrSynonyms"][0] = "Synonym1";
-  //   obj[S_MSG_PARAMS]["vrSynonyms"][1] = "Synonym2";
-
-  //   obj[S_MSG_PARAMS]["appType"][0] = AppTypeTest::SYSTEM;
-  //   obj[S_MSG_PARAMS]["appType"][1] = AppTypeTest::MEDIA;
 }
 
 }  // namespace formatters