diff options
Diffstat (limited to 'src/components/smart_objects/test/CObjectSchemaItem_test.cc')
| -rw-r--r-- | src/components/smart_objects/test/CObjectSchemaItem_test.cc | 76 |
1 files changed, 37 insertions, 39 deletions
diff --git a/src/components/smart_objects/test/CObjectSchemaItem_test.cc b/src/components/smart_objects/test/CObjectSchemaItem_test.cc index 646e60bf61..8a7d09f31e 100644 --- a/src/components/smart_objects/test/CObjectSchemaItem_test.cc +++ b/src/components/smart_objects/test/CObjectSchemaItem_test.cc @@ -32,18 +32,18 @@ #include <string> +#include "formatters/CSmartFactory.h" +#include "formatters/generic_json_formatter.h" #include "gmock/gmock.h" -#include "smart_objects/smart_object.h" -#include "smart_objects/smart_schema.h" #include "smart_objects/array_schema_item.h" #include "smart_objects/bool_schema_item.h" -#include "smart_objects/string_schema_item.h" #include "smart_objects/enum_schema_item.h" #include "smart_objects/number_schema_item.h" -#include "smart_objects/schema_item_parameter.h" #include "smart_objects/object_schema_item.h" -#include "formatters/generic_json_formatter.h" -#include "formatters/CSmartFactory.h" +#include "smart_objects/schema_item_parameter.h" +#include "smart_objects/smart_object.h" +#include "smart_objects/smart_schema.h" +#include "smart_objects/string_schema_item.h" #include "utils/semantic_version.h" namespace formatters = ns_smart_device_link::ns_json_handler::formatters; @@ -89,7 +89,7 @@ namespace Keys { const char RESULT_CODE[] = "resultCode"; const char INFO[] = "info"; const char SUCCESS[] = "success"; -} +} // namespace Keys class ObjectSchemaItemTest : public ::testing::Test { protected: @@ -117,28 +117,27 @@ class ObjectSchemaItemTest : public ::testing::Test { resultCode_values.insert(ResultType::GENERIC_ERROR); resultCode_values.insert(ResultType::DISALLOWED); - CObjectSchemaItem::Members paramsMembersMap; - paramsMembersMap[S_FUNCTION_ID] = CObjectSchemaItem::SMember( + Members paramsMembersMap; + paramsMembersMap[S_FUNCTION_ID] = SMember( TEnumSchemaItem<FunctionID::eType>::create(function_values), true); paramsMembersMap[S_CORRELATION_ID] = - CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true); - paramsMembersMap[S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember( - TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1), - TSchemaItemParameter<int>(2)), - true); - - CObjectSchemaItem::Members schemaMembersMap; - schemaMembersMap[Keys::RESULT_CODE] = CObjectSchemaItem::SMember( + SMember(TNumberSchemaItem<int>::create(), true); + paramsMembersMap[S_PROTOCOL_VERSION] = + SMember(TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1), + TSchemaItemParameter<int>(2)), + true); + + Members schemaMembersMap; + schemaMembersMap[Keys::RESULT_CODE] = SMember( TEnumSchemaItem<ResultType::eType>::create(resultCode_values), false); - schemaMembersMap[Keys::INFO] = CObjectSchemaItem::SMember( - CStringSchemaItem::create(TSchemaItemParameter<size_t>(0), - TSchemaItemParameter<size_t>(10)), - false); - schemaMembersMap[Keys::SUCCESS] = - CObjectSchemaItem::SMember(CBoolSchemaItem::create(), false); + schemaMembersMap[Keys::INFO] = + SMember(CStringSchemaItem::create(TSchemaItemParameter<size_t>(0), + TSchemaItemParameter<size_t>(10)), + false); + schemaMembersMap[Keys::SUCCESS] = SMember(CBoolSchemaItem::create(), false); // Create fake param that has breaking history changes - std::vector<CObjectSchemaItem::SMember> fake_param_history_vector; + std::vector<SMember> fake_param_history_vector; std::shared_ptr<ISchemaItem> fake_param_SchemaItem = CArraySchemaItem::create( @@ -156,22 +155,21 @@ class ObjectSchemaItemTest : public ::testing::Test { TSchemaItemParameter<size_t>(1), TSchemaItemParameter<size_t>(100)); - fake_param_history_vector.push_back(CObjectSchemaItem::SMember( + fake_param_history_vector.push_back(SMember( fake_param_history_v1_SchemaItem, true, "", "4.5.0", false, false)); - schemaMembersMap["fakeParam"] = - CObjectSchemaItem::SMember(fake_param_SchemaItem, - false, - "4.5.0", - "", - false, - false, - fake_param_history_vector); - - CObjectSchemaItem::Members rootMembersMap; - rootMembersMap[S_PARAMS] = CObjectSchemaItem::SMember( - CObjectSchemaItem::create(paramsMembersMap), true); - rootMembersMap[S_MSG_PARAMS] = CObjectSchemaItem::SMember( - CObjectSchemaItem::create(schemaMembersMap), true); + schemaMembersMap["fakeParam"] = SMember(fake_param_SchemaItem, + false, + "4.5.0", + "", + false, + false, + fake_param_history_vector); + + Members rootMembersMap; + rootMembersMap[S_PARAMS] = + SMember(CObjectSchemaItem::create(paramsMembersMap), true); + rootMembersMap[S_MSG_PARAMS] = + SMember(CObjectSchemaItem::create(schemaMembersMap), true); schema_item = CObjectSchemaItem::create(rootMembersMap); } |