diff options
Diffstat (limited to 'src/components/formatters/test/src/meta_formatter_test_helper.cc')
| -rw-r--r-- | src/components/formatters/test/src/meta_formatter_test_helper.cc | 57 |
1 files changed, 26 insertions, 31 deletions
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 3445d948bb..a963c08a52 100644 --- a/src/components/formatters/test/src/meta_formatter_test_helper.cc +++ b/src/components/formatters/test/src/meta_formatter_test_helper.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "gtest/gtest.h" -#include "meta_formatter_test_helper.h" +#include "formatters/meta_formatter_test_helper.h" namespace test { namespace components { @@ -58,7 +58,6 @@ void CMetaFormatterTestHelper::TearDown() { void CMetaFormatterTestHelper::AnyObjectToJsonString( const SmartObject& obj, std::string& result_string) { - Json::Value params(Json::objectValue); SmartObject formattedObj(obj); @@ -71,7 +70,6 @@ void CMetaFormatterTestHelper::AnyObjectToJsonString( //----------------------------------------------------------- void CMetaFormatterTestHelper::FillObjectIdenticalToSchema(SmartObject& obj) { - obj[S_PARAMS][S_MESSAGE_TYPE] = MessageTypeTest::request; obj[S_PARAMS][S_FUNCTION_ID] = FunctionIDTest::RegisterAppInterface; obj[S_PARAMS][S_CORRELATION_ID] = 12; @@ -95,8 +93,8 @@ void CMetaFormatterTestHelper::FillObjectIdenticalToSchema(SmartObject& obj) { } //----------------------------------------------------------- -void CMetaFormatterTestHelper::FillObjectIdenticalToSchemaWithoutNoMandatoriesParams( - SmartObject& obj) { +void CMetaFormatterTestHelper:: + FillObjectIdenticalToSchemaWithoutNoMandatoriesParams(SmartObject& obj) { obj[S_PARAMS][S_MESSAGE_TYPE] = MessageTypeTest::request; obj[S_PARAMS][S_FUNCTION_ID] = FunctionIDTest::RegisterAppInterface; obj[S_PARAMS][S_CORRELATION_ID] = 12; @@ -113,16 +111,15 @@ void CMetaFormatterTestHelper::FillObjectIdenticalToSchemaWithoutNoMandatoriesPa 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]["ttsName"][0]["text"] = "ABC"; + // obj[S_MSG_PARAMS]["ttsName"][0]["type"] = + // SpeechCapabilities::SC_TEXT; -// obj[S_MSG_PARAMS]["appType"][0] = AppTypeTest::SYSTEM; // not mandatory -// obj[S_MSG_PARAMS]["appType"][1] = AppTypeTest::MEDIA; + // 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( @@ -133,10 +130,10 @@ 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; + // 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"; @@ -156,7 +153,6 @@ void CMetaFormatterTestHelper::FillObjectWithoutSomeMandatoryFields( void CMetaFormatterTestHelper::CompareObjects(const SmartObject& first, const SmartObject& second) { - if (SmartType_Array == first.getType()) { ASSERT_EQ(SmartType_Array, second.getType()); for (size_t i = 0; i < first.length(); i++) { @@ -164,10 +160,11 @@ void CMetaFormatterTestHelper::CompareObjects(const SmartObject& first, } } else if (SmartType_Map == first.getType()) { ASSERT_EQ(SmartType_Map, second.getType()); - std::set < std::string > keys = first.enumerate(); + std::set<std::string> keys = first.enumerate(); for (std::set<std::string>::const_iterator key = keys.begin(); - key != keys.end(); key++) { + key != keys.end(); + key++) { CompareObjects(first.getElement(*key), second.getElement(*key)); } } else if (SmartType_Boolean == first.getType()) { @@ -181,14 +178,13 @@ void CMetaFormatterTestHelper::CompareObjects(const SmartObject& first, } else if (SmartType_Null == first.getType()) { ASSERT_EQ(SmartType_Null, second.getType()); } else { - FAIL()<< "Unknown SmartObject type: " << first.getType(); + FAIL() << "Unknown SmartObject type: " << first.getType(); } } //----------------------------------------------------------- void CMetaFormatterTestHelper::FillObjectWithDefaultValues(SmartObject& obj) { - obj[S_PARAMS][S_MESSAGE_TYPE] = -1; obj[S_PARAMS][S_FUNCTION_ID] = -1; obj[S_PARAMS][S_CORRELATION_ID] = 0; @@ -204,17 +200,16 @@ void CMetaFormatterTestHelper::FillObjectWithDefaultValues(SmartObject& obj) { 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"; + // 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]["appType"][0] = AppTypeTest::SYSTEM; -// obj[S_MSG_PARAMS]["appType"][1] = AppTypeTest::MEDIA; + // 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 |