diff options
Diffstat (limited to 'src/components/smart_objects/test')
14 files changed, 408 insertions, 348 deletions
diff --git a/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc b/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc index 9d88178598..1f514672fd 100644 --- a/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc +++ b/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc @@ -41,7 +41,7 @@ namespace test { namespace components { namespace smart_object_test { -using namespace NsSmartDeviceLink::NsSmartObjects; +using namespace ns_smart_device_link::ns_smart_objects; /** * Test AlwaysFalseSchemaItem @@ -54,38 +54,38 @@ TEST(test_AlwaysFalseSchemaItemTest, simple_test) { obj = 5; rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::ERROR, resultType); + EXPECT_EQ(errors::ERROR, resultType); EXPECT_EQ(5, obj.asInt()); obj = true; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::ERROR, resultType); + EXPECT_EQ(errors::ERROR, resultType); EXPECT_TRUE(obj.asBool()); obj = "Test"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::ERROR, resultType); + EXPECT_EQ(errors::ERROR, resultType); EXPECT_EQ(std::string("Test"), obj.asString()); obj["First"] = "Some string"; obj["Second"] = 555; resultType = item->validate(obj["First"], &report); - EXPECT_EQ(Errors::ERROR, resultType); + EXPECT_EQ(errors::ERROR, resultType); resultType = item->validate(obj["Second"], &report); - EXPECT_EQ(Errors::ERROR, resultType); + EXPECT_EQ(errors::ERROR, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::ERROR, resultType); + EXPECT_EQ(errors::ERROR, resultType); EXPECT_EQ(std::string("Some string"), obj["First"].asString()); EXPECT_EQ(555, obj["Second"].asInt()); obj[0] = true; obj[1] = false; resultType = item->validate(obj[0], &report); - EXPECT_EQ(Errors::ERROR, resultType); + EXPECT_EQ(errors::ERROR, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(Errors::ERROR, resultType); + EXPECT_EQ(errors::ERROR, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::ERROR, resultType); + EXPECT_EQ(errors::ERROR, resultType); EXPECT_TRUE(obj[0].asBool()); EXPECT_FALSE(obj[1].asBool()); } diff --git a/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc b/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc index 40c827e17b..7f26a4968a 100644 --- a/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc +++ b/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc @@ -41,7 +41,7 @@ namespace test { namespace components { namespace smart_object_test { -using namespace NsSmartDeviceLink::NsSmartObjects; +using namespace ns_smart_device_link::ns_smart_objects; /** * Test AlwaysTrueSchemaItem @@ -54,38 +54,38 @@ TEST(test_AlwaysTrueSchemaItemTest, simple_test) { obj = 5; rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(5, obj.asInt()); obj = true; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_TRUE(obj.asBool()); obj = "Test"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(std::string("Test"), obj.asString()); obj["First"] = "Some string"; obj["Second"] = 555; resultType = item->validate(obj["First"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj["Second"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(std::string("Some string"), obj["First"].asString()); EXPECT_EQ(555, obj["Second"].asInt()); obj[0] = true; obj[1] = false; resultType = item->validate(obj[0], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_TRUE(obj[0].asBool()); EXPECT_FALSE(obj[1].asBool()); } diff --git a/src/components/smart_objects/test/ArraySchemaItem_test.cc b/src/components/smart_objects/test/ArraySchemaItem_test.cc index 9831f08442..28f435ee43 100644 --- a/src/components/smart_objects/test/ArraySchemaItem_test.cc +++ b/src/components/smart_objects/test/ArraySchemaItem_test.cc @@ -46,7 +46,7 @@ namespace smart_object_test { * Test ArraySchemaItem no schema item, no min and max size **/ TEST(test_no_default_value, test_ArraySchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = @@ -68,28 +68,28 @@ TEST(test_no_default_value, test_ArraySchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj[0], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[2], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[3], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); item->applySchema(obj, false); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj[0], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[2], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[3], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(38, obj[0].asInt()); EXPECT_TRUE(obj[1].asBool()); @@ -103,19 +103,19 @@ TEST(test_no_default_value, test_ArraySchemaItemTest) { ASSERT_EQ(std::string("New valid string"), obj.asString()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); // Obj - bool obj = true; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); // Object - number obj = 3.1415926; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); } /** @@ -125,7 +125,7 @@ TEST(test_no_default_value, test_ArraySchemaItemTest) { * only if all array elements are valid schema item objects **/ TEST(test_item_with_default_value, test_ArraySchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = CArraySchemaItem::create(); // No min and max size @@ -140,24 +140,24 @@ TEST(test_item_with_default_value, test_ArraySchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj[0], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[2], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); item->applySchema(obj, false); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj[0], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[2], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); EXPECT_EQ(std::string("Some String"), obj[0].asString()); EXPECT_EQ(std::string("true"), obj[1].asString()); @@ -172,21 +172,21 @@ TEST(test_item_with_default_value, test_ArraySchemaItemTest) { EXPECT_EQ(std::string("Another String"), obj[3][2].asString()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj[3], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); obj[3][3] = "Another very very loooooong String"; resultType = item->validate(obj[3], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); } /** * Test ArraySchemaItem with min size **/ TEST(test_array_with_min_size, test_ArraySchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = CArraySchemaItem::create( @@ -197,17 +197,17 @@ TEST(test_array_with_min_size, test_ArraySchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); obj[1] = "true"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); obj[2] = "New String"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); EXPECT_EQ(std::string("Some String"), obj[0].asString()); EXPECT_EQ(std::string("true"), obj[1].asString()); @@ -218,7 +218,7 @@ TEST(test_array_with_min_size, test_ArraySchemaItemTest) { * Test ArraySchemaItem with min size **/ TEST(test_array_with_max_size, test_ArraySchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = CArraySchemaItem::create( @@ -231,22 +231,22 @@ TEST(test_array_with_max_size, test_ArraySchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); obj[1] = "true"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); obj[2] = "New String"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); obj[3] = "Another String"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); EXPECT_EQ(std::string("Some String"), obj[0].asString()); EXPECT_EQ(std::string("true"), obj[1].asString()); @@ -258,7 +258,7 @@ TEST(test_array_with_max_size, test_ArraySchemaItemTest) { * Test ArraySchemaItem with min and max size **/ TEST(test_array_with_min_and_max_size, test_ArraySchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = CArraySchemaItem::create( @@ -271,27 +271,27 @@ TEST(test_array_with_min_and_max_size, test_ArraySchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); obj[1] = "true"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); obj[2] = "New String"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); obj[3] = "Another String"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); obj[4] = "Out of array"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); EXPECT_EQ(std::string("Some String"), obj[0].asString()); EXPECT_EQ(std::string("true"), obj[1].asString()); @@ -301,7 +301,7 @@ TEST(test_array_with_min_and_max_size, test_ArraySchemaItemTest) { } TEST(test_map_validate, test_ArraySchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = CArraySchemaItem::create( @@ -314,29 +314,29 @@ TEST(test_map_validate, test_ArraySchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj["array"], &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); obj["array"][1] = "true"; resultType = item->validate(obj["array"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); obj["array"][2] = "New String"; resultType = item->validate(obj["array"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); obj["array"][3] = "Another String"; resultType = item->validate(obj["array"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); obj["array"][4] = "Out of array"; resultType = item->validate(obj["array"], &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); EXPECT_EQ(std::string("Some String"), obj["array"][0].asString()); EXPECT_EQ(std::string("true"), obj["array"][1].asString()); diff --git a/src/components/smart_objects/test/BoolSchemaItem_test.cc b/src/components/smart_objects/test/BoolSchemaItem_test.cc index 8d67aa59b2..ed0043925b 100644 --- a/src/components/smart_objects/test/BoolSchemaItem_test.cc +++ b/src/components/smart_objects/test/BoolSchemaItem_test.cc @@ -34,8 +34,6 @@ #include "gmock/gmock.h" -#include "utils/shared_ptr.h" - #include "smart_objects/smart_object.h" #include "smart_objects/bool_schema_item.h" @@ -43,7 +41,7 @@ namespace test { namespace components { namespace smart_object_test { -using NsSmartDeviceLink::NsSmartObjects::ISchemaItemPtr; +using ns_smart_device_link::ns_smart_objects::ISchemaItemPtr; /** * Test BoolSchemaItem no default value @@ -53,26 +51,26 @@ using NsSmartDeviceLink::NsSmartObjects::ISchemaItemPtr; * and leave SmartObject in previous state. **/ TEST(test_no_default_value, test_BoolSchemaItemTest) { - NsSmartDeviceLink::NsSmartObjects::SmartObject obj; + ns_smart_device_link::ns_smart_objects::SmartObject obj; ISchemaItemPtr item = - NsSmartDeviceLink::NsSmartObjects::CBoolSchemaItem::create(); // No - // default - // value + ns_smart_device_link::ns_smart_objects::CBoolSchemaItem::create(); // No + // default + // value obj = 5; ASSERT_EQ(5, obj.asInt()); rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); obj = true; ASSERT_TRUE(obj.asBool()); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); bool resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); EXPECT_TRUE(obj.asBool()); @@ -81,12 +79,12 @@ TEST(test_no_default_value, test_BoolSchemaItemTest) { ASSERT_EQ(std::string("Test"), obj.asString()); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); } @@ -100,11 +98,11 @@ TEST(test_no_default_value, test_BoolSchemaItemTest) { *value. **/ TEST(test_item_with_default_value, test_BoolSchemaItemTest) { - NsSmartDeviceLink::NsSmartObjects::SmartObject obj; + ns_smart_device_link::ns_smart_objects::SmartObject obj; ISchemaItemPtr item = - NsSmartDeviceLink::NsSmartObjects::CBoolSchemaItem::create( - NsSmartDeviceLink::NsSmartObjects::TSchemaItemParameter<bool>( + ns_smart_device_link::ns_smart_objects::CBoolSchemaItem::create( + ns_smart_device_link::ns_smart_objects::TSchemaItemParameter<bool>( false)); // Default value = false obj = 5; @@ -112,14 +110,14 @@ TEST(test_item_with_default_value, test_BoolSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); obj = true; ASSERT_TRUE(obj.asBool()); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_FALSE(obj.asBool()); @@ -128,22 +126,22 @@ TEST(test_item_with_default_value, test_BoolSchemaItemTest) { ASSERT_EQ(std::string("Test"), obj.asString()); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_FALSE(obj.asBool()); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); EXPECT_FALSE(obj.asBool()); } TEST(test_map_validate, test_BoolSchemaItemTest) { - NsSmartDeviceLink::NsSmartObjects::SmartObject obj; + ns_smart_device_link::ns_smart_objects::SmartObject obj; ISchemaItemPtr item = - NsSmartDeviceLink::NsSmartObjects::CBoolSchemaItem::create( - NsSmartDeviceLink::NsSmartObjects::TSchemaItemParameter<bool>( + ns_smart_device_link::ns_smart_objects::CBoolSchemaItem::create( + ns_smart_device_link::ns_smart_objects::TSchemaItemParameter<bool>( false)); // Default value = false obj["aa"] = true; @@ -151,10 +149,10 @@ TEST(test_map_validate, test_BoolSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj["aa"], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); bool resDefault = item->setDefaultValue(obj["aa"]); @@ -166,18 +164,18 @@ TEST(test_map_validate, test_BoolSchemaItemTest) { EXPECT_FALSE(obj.asBool()); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); obj["ind"] = true; resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); } TEST(test_array_validate, test_BoolSchemaItemTest) { - NsSmartDeviceLink::NsSmartObjects::SmartObject obj; + ns_smart_device_link::ns_smart_objects::SmartObject obj; ISchemaItemPtr item = - NsSmartDeviceLink::NsSmartObjects::CBoolSchemaItem::create(); + ns_smart_device_link::ns_smart_objects::CBoolSchemaItem::create(); obj[0] = true; obj[1] = false; @@ -187,13 +185,13 @@ TEST(test_array_validate, test_BoolSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj[0], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); bool resDefault = item->setDefaultValue(obj[0]); @@ -205,13 +203,13 @@ TEST(test_array_validate, test_BoolSchemaItemTest) { EXPECT_FALSE(obj[1].asBool()); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); obj = false; resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); } } // namespace smart_object_test diff --git a/src/components/smart_objects/test/CObjectSchemaItem_test.cc b/src/components/smart_objects/test/CObjectSchemaItem_test.cc index 523b25a8d8..646e60bf61 100644 --- a/src/components/smart_objects/test/CObjectSchemaItem_test.cc +++ b/src/components/smart_objects/test/CObjectSchemaItem_test.cc @@ -44,12 +44,13 @@ #include "smart_objects/object_schema_item.h" #include "formatters/generic_json_formatter.h" #include "formatters/CSmartFactory.h" +#include "utils/semantic_version.h" -namespace formatters = NsSmartDeviceLink::NsJSONHandler::Formatters; -namespace smartobj = NsSmartDeviceLink::NsSmartObjects; +namespace formatters = ns_smart_device_link::ns_json_handler::formatters; +namespace smartobj = ns_smart_device_link::ns_smart_objects; -using namespace NsSmartDeviceLink::NsSmartObjects; -using namespace NsSmartDeviceLink::NsJSONHandler::strings; +using namespace ns_smart_device_link::ns_smart_objects; +using namespace ns_smart_device_link::ns_json_handler::strings; namespace test { namespace components { @@ -136,6 +137,36 @@ class ObjectSchemaItemTest : public ::testing::Test { schemaMembersMap[Keys::SUCCESS] = CObjectSchemaItem::SMember(CBoolSchemaItem::create(), false); + // Create fake param that has breaking history changes + std::vector<CObjectSchemaItem::SMember> fake_param_history_vector; + + std::shared_ptr<ISchemaItem> fake_param_SchemaItem = + CArraySchemaItem::create( + CStringSchemaItem::create(TSchemaItemParameter<size_t>(1), + TSchemaItemParameter<size_t>(99), + TSchemaItemParameter<std::string>()), + TSchemaItemParameter<size_t>(1), + TSchemaItemParameter<size_t>(100)); + + std::shared_ptr<ISchemaItem> fake_param_history_v1_SchemaItem = + CArraySchemaItem::create( + CStringSchemaItem::create(TSchemaItemParameter<size_t>(1), + TSchemaItemParameter<size_t>(99), + TSchemaItemParameter<std::string>()), + TSchemaItemParameter<size_t>(1), + TSchemaItemParameter<size_t>(100)); + + fake_param_history_vector.push_back(CObjectSchemaItem::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); @@ -156,10 +187,40 @@ TEST_F(ObjectSchemaItemTest, validation_correct) { obj[S_MSG_PARAMS][Keys::SUCCESS] = true; rpc::ValidationReport report("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); +} + +TEST_F(ObjectSchemaItemTest, validation_correct_with_new_version) { + SmartObject obj; + obj[S_PARAMS][S_FUNCTION_ID] = 0; + obj[S_PARAMS][S_CORRELATION_ID] = 0XFF0; + obj[S_PARAMS][S_PROTOCOL_VERSION] = 1; + obj[S_MSG_PARAMS][Keys::RESULT_CODE] = 0; + obj[S_MSG_PARAMS][Keys::INFO] = "0123456789"; + obj[S_MSG_PARAMS][Keys::SUCCESS] = true; + + utils::SemanticVersion messageVersion(4, 5, 0); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report, messageVersion)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); } +TEST_F(ObjectSchemaItemTest, validation_invalid_data_with_old_version) { + SmartObject obj; + obj[S_PARAMS][S_FUNCTION_ID] = 0; + obj[S_PARAMS][S_CORRELATION_ID] = 0XFF0; + obj[S_PARAMS][S_PROTOCOL_VERSION] = 1; + obj[S_MSG_PARAMS][Keys::RESULT_CODE] = 0; + obj[S_MSG_PARAMS][Keys::INFO] = "0123456789"; + obj[S_MSG_PARAMS][Keys::SUCCESS] = true; + + utils::SemanticVersion messageVersion(3, 0, 0); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(errors::MISSING_MANDATORY_PARAMETER, + schema_item->validate(obj, &report, messageVersion)); +} + TEST_F(ObjectSchemaItemTest, validation_correct_skip_not_mandatory) { SmartObject obj; obj[S_PARAMS][S_FUNCTION_ID] = 1; @@ -170,7 +231,7 @@ TEST_F(ObjectSchemaItemTest, validation_correct_skip_not_mandatory) { obj[S_MSG_PARAMS][Keys::SUCCESS] = false; rpc::ValidationReport report("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); } @@ -180,7 +241,7 @@ TEST_F(ObjectSchemaItemTest, validation_invalid_param) { obj[S_MSG_PARAMS] = "some message parameters"; rpc::ValidationReport report("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); obj[S_PARAMS][S_FUNCTION_ID] = "some function"; @@ -190,33 +251,33 @@ TEST_F(ObjectSchemaItemTest, validation_invalid_param) { obj[S_MSG_PARAMS][Keys::SUCCESS] = 0xABC; report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); obj[S_PARAMS][S_FUNCTION_ID] = 1; report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); obj[S_PARAMS][S_CORRELATION_ID] = -0xFF1; report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); obj[S_PARAMS][S_PROTOCOL_VERSION] = 2; report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); obj[S_MSG_PARAMS][Keys::RESULT_CODE] = 1; report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); obj[S_MSG_PARAMS][Keys::SUCCESS] = false; report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); } TEST_F(ObjectSchemaItemTest, validation_invalid_not_mandatory_param) { @@ -230,24 +291,24 @@ TEST_F(ObjectSchemaItemTest, validation_invalid_not_mandatory_param) { // invalid non-mandatory obj[S_MSG_PARAMS][Keys::INFO] obj[S_MSG_PARAMS][Keys::INFO] = 0x10; rpc::ValidationReport report("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); // invalid non-mandatory obj[S_MSG_PARAMS][Keys::INFO] obj[S_MSG_PARAMS][Keys::INFO] = true; report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); // invalid non-mandatory obj[S_MSG_PARAMS][Keys::INFO] obj[S_MSG_PARAMS][Keys::INFO] = SmartObject(); report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); obj[S_MSG_PARAMS][Keys::INFO] = "info"; report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); } @@ -261,27 +322,27 @@ TEST_F(ObjectSchemaItemTest, validation_missing_mandatory) { obj[S_MSG_PARAMS][Keys::SUCCESS] = false; rpc::ValidationReport report("RPC"); - EXPECT_EQ(Errors::MISSING_MANDATORY_PARAMETER, + EXPECT_EQ(errors::MISSING_MANDATORY_PARAMETER, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); obj[S_PARAMS][S_FUNCTION_ID] = 2; // S_CORRELATION_ID and S_PROTOCOL_VERSION is still missed report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::MISSING_MANDATORY_PARAMETER, + EXPECT_EQ(errors::MISSING_MANDATORY_PARAMETER, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); obj[S_PARAMS][S_CORRELATION_ID] = 0XFF2; // S_PROTOCOL_VERSION is still missed report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::MISSING_MANDATORY_PARAMETER, + EXPECT_EQ(errors::MISSING_MANDATORY_PARAMETER, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); obj[S_PARAMS][S_PROTOCOL_VERSION] = 1; report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); } @@ -301,19 +362,19 @@ TEST_F(ObjectSchemaItemTest, validation_unexpected_param) { obj[fake1] = SmartObject(static_cast<int64_t>(0)); // any fake parameter is OK rpc::ValidationReport report("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); obj[S_PARAMS][fake2] = SmartObject("123"); // any fake parameters are OK report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); obj[S_MSG_PARAMS][fake3] = true; // any fake parameters are OK report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); } @@ -341,7 +402,7 @@ TEST_F(ObjectSchemaItemTest, validation_unexpected_param_remove) { EXPECT_TRUE(obj[S_PARAMS].keyExists(fake2)); EXPECT_TRUE(obj[S_MSG_PARAMS].keyExists(fake3)); rpc::ValidationReport report("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); // Check apply schema, remove fake parameter @@ -356,7 +417,7 @@ TEST_F(ObjectSchemaItemTest, validation_unexpected_param_remove) { EXPECT_TRUE(obj[S_MSG_PARAMS].keyExists(Keys::INFO)); EXPECT_TRUE(obj[S_MSG_PARAMS].keyExists(Keys::SUCCESS)); report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); obj[fake1] = SmartObject(static_cast<int64_t>(0)); @@ -372,7 +433,7 @@ TEST_F(ObjectSchemaItemTest, validation_unexpected_param_remove) { EXPECT_FALSE(obj[S_MSG_PARAMS].keyExists(fake3)); // Invalide state after enum convertion report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); } @@ -388,18 +449,18 @@ TEST_F(ObjectSchemaItemTest, validation_empty_params) { obj[S_MSG_PARAMS]["FAKE_PARAM3"] = SmartObject("2"); rpc::ValidationReport report("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); schema_item->applySchema(obj, false); report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(obj, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); schema_item->unapplySchema(obj); // Invalide state after enum convertion report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::INVALID_VALUE, schema_item->validate(obj, &report)); + EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); } @@ -436,12 +497,12 @@ TEST_F(ObjectSchemaItemTest, test_strings_to_enum_conversion) { // S_FUNCTION_ID and RESULT_CODE are not converted to int rpc::ValidationReport report("RPC"); - EXPECT_NE(Errors::OK, schema_item->validate(object, &report)); + EXPECT_NE(errors::OK, schema_item->validate(object, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); schema_item->applySchema(object, false); report = rpc::ValidationReport("RPC"); - EXPECT_EQ(Errors::OK, schema_item->validate(object, &report)); + EXPECT_EQ(errors::OK, schema_item->validate(object, &report)); EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); // check conversion result @@ -451,7 +512,7 @@ TEST_F(ObjectSchemaItemTest, test_strings_to_enum_conversion) { schema_item->unapplySchema(object); // S_FUNCTION_ID and RESULT_CODE are string report = rpc::ValidationReport("RPC"); - EXPECT_NE(Errors::OK, schema_item->validate(object, &report)); + EXPECT_NE(errors::OK, schema_item->validate(object, &report)); EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); // check conversion result @@ -466,8 +527,8 @@ TEST_F(ObjectSchemaItemTest, test_strings_to_enum_conversion) { } // namespace components } // namespace test -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { namespace FunctionID = test::components::smart_object_test::FunctionID; typedef EnumConversionHelper<FunctionID::eType> FunctionConvertor; @@ -541,5 +602,5 @@ const ResultType::eType ResultTypeConvertor::enum_values_[] = { ResultType::USER_DISALLOWED, ResultType::GENERIC_ERROR, ResultType::DISALLOWED}; -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/test/EnumSchemaItem_test.cc b/src/components/smart_objects/test/EnumSchemaItem_test.cc index 9914167e5a..edfa563336 100644 --- a/src/components/smart_objects/test/EnumSchemaItem_test.cc +++ b/src/components/smart_objects/test/EnumSchemaItem_test.cc @@ -42,7 +42,7 @@ namespace test { namespace components { namespace smart_object_test { -using namespace NsSmartDeviceLink::NsSmartObjects; +using namespace ns_smart_device_link::ns_smart_objects; namespace TestType { enum eType { INVALID_ENUM = -1, @@ -94,7 +94,7 @@ TEST_F(EnumSchemaItemTest, test_item_with_default_value) { obj = TestType::BLUETOOTH_OFF; rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_EQ(TestType::FACTORY_DEFAULTS, obj.asInt()); @@ -103,7 +103,7 @@ TEST_F(EnumSchemaItemTest, test_item_with_default_value) { obj = true; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_EQ(TestType::FACTORY_DEFAULTS, obj.asInt()); @@ -112,7 +112,7 @@ TEST_F(EnumSchemaItemTest, test_item_with_default_value) { obj = 3.1415926; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); @@ -121,7 +121,7 @@ TEST_F(EnumSchemaItemTest, test_item_with_default_value) { // Object - string obj = "Some string"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); @@ -145,7 +145,7 @@ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { obj = TestType::BLUETOOTH_OFF; rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); bool resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); EXPECT_EQ(TestType::BLUETOOTH_OFF, obj.asInt()); @@ -154,7 +154,7 @@ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { obj = true; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); EXPECT_TRUE(obj.asBool()); @@ -163,7 +163,7 @@ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { obj = 3.1415926; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); @@ -172,7 +172,7 @@ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { // Object - string obj = "Some string"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); @@ -181,12 +181,12 @@ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { // Object - int in range of enum obj = 6; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object - int out of enum range obj = 15; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); } /** @@ -203,31 +203,31 @@ TEST_F(EnumSchemaItemTest, test_apply_unapply_schema) { obj = TestType::BLUETOOTH_OFF; rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_EQ(TestType::FACTORY_DEFAULTS, obj.asInt()); item->unapplySchema(obj); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); EXPECT_EQ(std::string("FACTORY_DEFAULTS"), obj.asString()); item->applySchema(obj, false); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(TestType::FACTORY_DEFAULTS, obj.asInt()); obj = "TOO_MANY_REQUESTS"; item->applySchema(obj, false); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(TestType::TOO_MANY_REQUESTS, obj.asInt()); obj = "ENOUGH_REQUESTS"; item->applySchema(obj, false); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); EXPECT_EQ(std::string("ENOUGH_REQUESTS"), obj.asString()); } @@ -235,8 +235,8 @@ TEST_F(EnumSchemaItemTest, test_apply_unapply_schema) { } // namespace components } // namespace test -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { template <> const EnumConversionHelper<test::components::SmartObjects::SchemaItem:: diff --git a/src/components/smart_objects/test/NumberSchemaItem_test.cc b/src/components/smart_objects/test/NumberSchemaItem_test.cc index 0315bcedb3..eb227e4e9b 100644 --- a/src/components/smart_objects/test/NumberSchemaItem_test.cc +++ b/src/components/smart_objects/test/NumberSchemaItem_test.cc @@ -40,7 +40,7 @@ namespace test { namespace components { namespace smart_object_test { -using NsSmartDeviceLink::NsSmartObjects::ISchemaItemPtr; +using ns_smart_device_link::ns_smart_objects::ISchemaItemPtr; /** * Test NumberSchemaItem as INT with no default value @@ -50,7 +50,7 @@ using NsSmartDeviceLink::NsSmartObjects::ISchemaItemPtr; * and leave SmartObject in previous state. **/ TEST(test_int_no_default_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -63,20 +63,20 @@ TEST(test_int_no_default_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Obj bool obj = true; ASSERT_TRUE(obj.asBool()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); EXPECT_TRUE(obj.asBool()); // Obj string @@ -84,18 +84,18 @@ TEST(test_int_no_default_value, test_NumberSchemaItemTest) { ASSERT_EQ(std::string("Test"), obj.asString()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); } /** * Test NumberSchemaItem as INT with setted min value **/ TEST(test_int_min_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -108,28 +108,28 @@ TEST(test_int_min_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object int incorrect obj = 9; ASSERT_EQ(9, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Object int correct obj = 10; ASSERT_EQ(10, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); } /** * Test NumberSchemaItem as INT with setted max value **/ TEST(test_int_max_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -143,28 +143,28 @@ TEST(test_int_max_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object int incorrect obj = 750; ASSERT_EQ(750, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Object int correct obj = -750; ASSERT_EQ(-750, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); } /** * Test NumberSchemaItem as INT with setted min and max value **/ TEST(test_int_min_max_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -178,35 +178,35 @@ TEST(test_int_min_max_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object int incorrect obj = 750; ASSERT_EQ(750, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Object int correct obj = -949; ASSERT_EQ(-949, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object int incorrect obj = -950; ASSERT_EQ(-950, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); } /** * Test NumberSchemaItem as INT with correct default value **/ TEST(test_int_correct_default_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -221,44 +221,44 @@ TEST(test_int_correct_default_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object int incorrect obj = -12001; ASSERT_EQ(-12001, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Object int correct obj = 100; ASSERT_EQ(100, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object int incorrect obj = 101; ASSERT_EQ(101, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(-38, obj.asInt()); // Object string obj = "string"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(-38, obj.asInt()); } @@ -266,7 +266,7 @@ TEST(test_int_correct_default_value, test_NumberSchemaItemTest) { * Test NumberSchemaItem as INT with default value out of range **/ TEST(test_int_default_value_out_of_range, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -281,49 +281,49 @@ TEST(test_int_default_value_out_of_range, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object int incorrect obj = 89; ASSERT_EQ(89, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Object int correct obj = 100; ASSERT_EQ(100, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object int incorrect obj = 101; ASSERT_EQ(101, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); EXPECT_EQ(50, obj.asInt()); // Object string obj = "string"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); EXPECT_EQ(50, obj.asInt()); } TEST(test_int_map_validate, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -339,15 +339,15 @@ TEST(test_int_map_validate, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj["min"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj["max"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj["out_of_min"], &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj["out_of_max"], &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); // Set default value bool resDefault = item->setDefaultValue(obj["aa"]); @@ -359,17 +359,17 @@ TEST(test_int_map_validate, test_NumberSchemaItemTest) { EXPECT_EQ(-38, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj["min"], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); } TEST(test_int_array_validate, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -385,21 +385,21 @@ TEST(test_int_array_validate, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj[0], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OUT_OF_RANGE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); resultType = item->validate(obj[2], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); resultType = item->validate(obj[3], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OUT_OF_RANGE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); bool resDefault = item->setDefaultValue(obj[0]); @@ -411,14 +411,14 @@ TEST(test_int_array_validate, test_NumberSchemaItemTest) { EXPECT_EQ(-38, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); resultType = item->validate(obj[0], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); } @@ -430,7 +430,7 @@ TEST(test_int_array_validate, test_NumberSchemaItemTest) { * and leave SmartObject in previous state. **/ TEST(test_double_no_default_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -443,20 +443,20 @@ TEST(test_double_no_default_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Obj bool obj = true; ASSERT_TRUE(obj.asBool()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); EXPECT_TRUE(obj.asBool()); // Obj string @@ -464,20 +464,20 @@ TEST(test_double_no_default_value, test_NumberSchemaItemTest) { ASSERT_EQ(std::string("Test"), obj.asString()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); // Set default value resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); } /** * Test NumberSchemaItem as DOUBLE with setted min value **/ TEST(test_double_min_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -490,28 +490,28 @@ TEST(test_double_min_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object double incorrect obj = 9.999999; ASSERT_EQ(9.999999, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); /* //Object int obj = 10; ASSERT_EQ(10, obj.asInt()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType);*/ + EXPECT_EQ(errors::INVALID_VALUE, resultType);*/ } /** * Test NumberSchemaItem as DOUBLE with setted max value **/ TEST(test_double_max_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -525,28 +525,28 @@ TEST(test_double_max_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object double incorrect obj = 749.0001; ASSERT_EQ(749.0001, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Object double correct obj = -750.0; ASSERT_EQ(-750.0, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); } /** * Test NumberSchemaItem as DOUBLE with setted min and max value **/ TEST(test_double_min_max_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -560,35 +560,35 @@ TEST(test_double_min_max_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object double incorrect obj = 749.001; ASSERT_EQ(749.001, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Object double correct obj = -949.0; ASSERT_EQ(-949.0, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object double incorrect obj = -949.00001; ASSERT_EQ(-949.00001, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); } /** * Test NumberSchemaItem as DOUBLE with correct default value **/ TEST(test_double_correct_default_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -603,44 +603,44 @@ TEST(test_double_correct_default_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object double incorrect obj = -12000.01; ASSERT_EQ(-12000.01, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Object double correct obj = 100.0; ASSERT_EQ(100.0, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object double incorrect obj = 100.001; ASSERT_EQ(100.001, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(-38.0, obj.asDouble()); // Object string obj = "string"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(-38.0, obj.asDouble()); } @@ -648,7 +648,7 @@ TEST(test_double_correct_default_value, test_NumberSchemaItemTest) { * Test NumberSchemaItem as DOUBLE with default value out of range **/ TEST(test_double_default_value_out_of_range, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -663,49 +663,49 @@ TEST(test_double_default_value_out_of_range, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object double incorrect obj = 89.999; ASSERT_EQ(89.999, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Object double correct obj = 100.0; ASSERT_EQ(100.0, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); // Object double incorrect obj = 100.001; ASSERT_EQ(100.001, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); EXPECT_EQ(50.0, obj.asDouble()); // Object string obj = "string"; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); EXPECT_EQ(50.0, obj.asDouble()); } TEST(test_double_map_validate, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -721,15 +721,15 @@ TEST(test_double_map_validate, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj["min"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj["max"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj["out_of_min"], &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj["out_of_max"], &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); bool resDefault = item->setDefaultValue(obj["aa"]); EXPECT_TRUE(resDefault); @@ -740,17 +740,17 @@ TEST(test_double_map_validate, test_NumberSchemaItemTest) { EXPECT_EQ(-38.0, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj["min"], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); } TEST(test_double_array_validate, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; @@ -766,21 +766,21 @@ TEST(test_double_array_validate, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj[0], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OUT_OF_RANGE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); resultType = item->validate(obj[2], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); resultType = item->validate(obj[3], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OUT_OF_RANGE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); bool resDefault = item->setDefaultValue(obj[0]); @@ -792,19 +792,19 @@ TEST(test_double_array_validate, test_NumberSchemaItemTest) { EXPECT_EQ(-38.0, obj.asDouble()); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::OK, resultType); + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::OK, resultType); resultType = item->validate(obj[0], &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(NsSmartDeviceLink::NsSmartObjects::Errors::INVALID_VALUE, + EXPECT_EQ(ns_smart_device_link::ns_smart_objects::errors::INVALID_VALUE, resultType); } TEST(test_int_double_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; ISchemaItemPtr item = TNumberSchemaItem<int>::create( TSchemaItemParameter<int>(10), @@ -817,11 +817,11 @@ TEST(test_int_double_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); } TEST(test_double_int_value, test_NumberSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; ISchemaItemPtr item = TNumberSchemaItem<double>::create( TSchemaItemParameter<double>(10.0), @@ -834,7 +834,7 @@ TEST(test_double_int_value, test_NumberSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); } } // namespace smart_object_test diff --git a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc index b11560914e..7d95a40b26 100644 --- a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc +++ b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc @@ -36,8 +36,6 @@ #include "gmock/gmock.h" -#include "utils/shared_ptr.h" - #include "smart_objects/smart_object.h" #include "smart_objects/smart_schema.h" #include "smart_objects/schema_item.h" @@ -58,8 +56,8 @@ namespace test { namespace components { namespace smart_object_test { -using namespace NsSmartDeviceLink::NsJSONHandler::strings; -using namespace NsSmartDeviceLink::NsSmartObjects; +using namespace ns_smart_device_link::ns_json_handler::strings; +using namespace ns_smart_device_link::ns_smart_objects; namespace TestType { enum eType { @@ -98,7 +96,7 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { clock_gettime(CLOCK_REALTIME, &convertionStartTime); // SmartObjects --> JSON - NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv2:: + ns_smart_device_link::ns_json_handler::formatters::CFormatterJsonSDLRPCv2:: toString(srcObj, jsonString); clock_gettime(CLOCK_REALTIME, &convertionEndTime); @@ -116,7 +114,7 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { clock_gettime(CLOCK_REALTIME, &convertionStartTime); // JSON --> SmartObjects - NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv2:: + ns_smart_device_link::ns_json_handler::formatters::CFormatterJsonSDLRPCv2:: fromString<FunctionIdTest::eType, MessageTypeTest::eType>( jsonString, dstObj, @@ -138,7 +136,7 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { clock_gettime(CLOCK_REALTIME, &convertionStartTime); // SmartObjects --> JSON - NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv1:: + ns_smart_device_link::ns_json_handler::formatters::CFormatterJsonSDLRPCv1:: toString(srcObj, jsonString); clock_gettime(CLOCK_REALTIME, &convertionEndTime); @@ -155,7 +153,7 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { clock_gettime(CLOCK_REALTIME, &convertionStartTime); // JSON --> SmartObjects - NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv1:: + ns_smart_device_link::ns_json_handler::formatters::CFormatterJsonSDLRPCv1:: fromString<FunctionIdTest::eType, MessageTypeTest::eType>(jsonString, dstObj); @@ -255,17 +253,18 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { messageType_allowedEnumSubsetValues); CObjectSchemaItem::Members paramsMembersMap; - paramsMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = - CObjectSchemaItem::SMember(functionId_SchemaItem, true); paramsMembersMap - [NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = + [ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = + CObjectSchemaItem::SMember(functionId_SchemaItem, true); + paramsMembersMap + [ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(messageType_SchemaItem, true); paramsMembersMap - [NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = + [ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true); std::map<std::string, CObjectSchemaItem::SMember> rootMembersMap; - rootMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] = + rootMembersMap[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(paramsMembersMap), true); @@ -331,35 +330,37 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { CObjectSchemaItem::SMember(tryAgainTime_SchemaItem, true); std::map<std::string, CObjectSchemaItem::SMember> paramsMembersMap; - paramsMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = - CObjectSchemaItem::SMember( - TEnumSchemaItem<FunctionIdTest::eType>::create( - functionId_allowedEnumSubsetValues), - true); paramsMembersMap - [NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = + [ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = + CObjectSchemaItem::SMember( + TEnumSchemaItem<FunctionIdTest::eType>::create( + functionId_allowedEnumSubsetValues), + true); + paramsMembersMap + [ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember( TEnumSchemaItem<MessageTypeTest::eType>::create( messageType_allowedEnumSubsetValues), true); paramsMembersMap - [NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = + [ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true); paramsMembersMap - [NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_VERSION] = + [ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember( TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1), TSchemaItemParameter<int>(2)), true); paramsMembersMap - [NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_TYPE] = + [ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true); std::map<std::string, CObjectSchemaItem::SMember> rootMembersMap; - rootMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS] = - CObjectSchemaItem::SMember(CObjectSchemaItem::create(schemaMembersMap), - true); - rootMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] = + rootMembersMap + [ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = + CObjectSchemaItem::SMember( + CObjectSchemaItem::create(schemaMembersMap), true); + rootMembersMap[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(paramsMembersMap), true); return CSmartSchema(CObjectSchemaItem::create(rootMembersMap)); @@ -640,8 +641,8 @@ TEST_F(SmartObjectConvertionTimeTest, test_object_without_enum_convertion) { } // namespace components } // namespace test -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { template <> const EnumConversionHelper<test::components::SmartObjects:: diff --git a/src/components/smart_objects/test/SmartObjectDraft_test.cc b/src/components/smart_objects/test/SmartObjectDraft_test.cc index de8103771c..cfb6785db7 100644 --- a/src/components/smart_objects/test/SmartObjectDraft_test.cc +++ b/src/components/smart_objects/test/SmartObjectDraft_test.cc @@ -44,8 +44,8 @@ namespace test { namespace components { namespace smart_object_test { -using NsSmartDeviceLink::NsSmartObjects::SmartObject; -using NsSmartDeviceLink::NsSmartObjects::SmartType; +using ns_smart_device_link::ns_smart_objects::SmartObject; +using ns_smart_device_link::ns_smart_objects::SmartType; TEST(SmartObjectsDraftTest, primitive_types) { SmartObject obj; @@ -126,7 +126,7 @@ TEST(SmartObjectsDraftTest, test_public_interface) { ASSERT_EQ(std::string("Hello, world"), obj.asString()); // ---- Binary ---- // - NsSmartDeviceLink::NsSmartObjects::SmartBinary binaryData; + ns_smart_device_link::ns_smart_objects::SmartBinary binaryData; binaryData.push_back('\0'); binaryData.push_back('a'); obj = binaryData; @@ -203,7 +203,7 @@ TEST(SmartObjectsDraftTest, test_helper_methods) { ASSERT_EQ(std::string("Hello, world"), obj.asString()); // ---- Binary ---- // - NsSmartDeviceLink::NsSmartObjects::SmartBinary binaryData; + ns_smart_device_link::ns_smart_objects::SmartBinary binaryData; binaryData.push_back('\0'); binaryData.push_back('a'); obj = binaryData; diff --git a/src/components/smart_objects/test/SmartObjectInvalid_test.cc b/src/components/smart_objects/test/SmartObjectInvalid_test.cc index 68afbb6237..ff5949df6a 100644 --- a/src/components/smart_objects/test/SmartObjectInvalid_test.cc +++ b/src/components/smart_objects/test/SmartObjectInvalid_test.cc @@ -40,7 +40,7 @@ namespace test { namespace components { namespace smart_object_test { -using namespace NsSmartDeviceLink::NsSmartObjects; +using namespace ns_smart_device_link::ns_smart_objects; TEST(test_SmartObjectInvalidTest, simple_type_can_be_set_in_constructor) { SmartObject objMap(SmartType_Map); @@ -116,7 +116,7 @@ TEST(test_SmartObjectInvalidTest, invalid_object_remains_invalid) { ASSERT_EQ(invalid_string_value, obj.asString()); // ---- BINARY ---- // - NsSmartDeviceLink::NsSmartObjects::SmartBinary binaryData; + ns_smart_device_link::ns_smart_objects::SmartBinary binaryData; binaryData.push_back('\0'); binaryData.push_back('a'); obj = binaryData; diff --git a/src/components/smart_objects/test/SmartObjectStress_test.cc b/src/components/smart_objects/test/SmartObjectStress_test.cc index 698bd0415a..4c0234589f 100644 --- a/src/components/smart_objects/test/SmartObjectStress_test.cc +++ b/src/components/smart_objects/test/SmartObjectStress_test.cc @@ -40,7 +40,7 @@ namespace test { namespace components { namespace smart_object_test { -using namespace NsSmartDeviceLink::NsSmartObjects; +using namespace ns_smart_device_link::ns_smart_objects; class StressTestHelper : public ::testing::Test { private: @@ -184,8 +184,8 @@ class StressTestHelper : public ::testing::Test { std::string strVal("c:"); strVal += strDataVal; - NsSmartDeviceLink::NsSmartObjects::SmartBinary binaryVal(dataSize, - randomChar); + ns_smart_device_link::ns_smart_objects::SmartBinary binaryVal( + dataSize, randomChar); obj = binaryVal; // string with binary data filled with random chars mVerifyMap[key_path] = strVal; @@ -259,10 +259,10 @@ TEST_F(StressTestHelper, StressTest) { if (!value.compare(0, 2, "c:")) { std::string etalonData = value.substr(2); - ASSERT_EQ(NsSmartDeviceLink::NsSmartObjects::SmartType_Binary, + ASSERT_EQ(ns_smart_device_link::ns_smart_objects::SmartType_Binary, obj.getType()); - NsSmartDeviceLink::NsSmartObjects::SmartBinary binaryData = + ns_smart_device_link::ns_smart_objects::SmartBinary binaryData = obj.asBinary(); ASSERT_EQ(etalonData.size(), binaryData.size()); @@ -270,10 +270,10 @@ TEST_F(StressTestHelper, StressTest) { { std::string etalonData = value.substr(2); - ASSERT_EQ(NsSmartDeviceLink::NsSmartObjects::SmartType_Binary, + ASSERT_EQ(ns_smart_device_link::ns_smart_objects::SmartType_Binary, obj.getType()); - NsSmartDeviceLink::NsSmartObjects::SmartBinary binaryData = + ns_smart_device_link::ns_smart_objects::SmartBinary binaryData = obj.asBinary(); ASSERT_EQ(etalonData.size(), binaryData.size()); diff --git a/src/components/smart_objects/test/SmartObjectUnit_test.cc b/src/components/smart_objects/test/SmartObjectUnit_test.cc index 0a67b7e922..2c03d8a329 100644 --- a/src/components/smart_objects/test/SmartObjectUnit_test.cc +++ b/src/components/smart_objects/test/SmartObjectUnit_test.cc @@ -37,7 +37,7 @@ namespace test { namespace components { namespace smart_object_test { -using namespace NsSmartDeviceLink::NsSmartObjects; +using namespace ns_smart_device_link::ns_smart_objects; class TestHelper : public ::testing::Test { protected: diff --git a/src/components/smart_objects/test/StringSchemaItem_test.cc b/src/components/smart_objects/test/StringSchemaItem_test.cc index 4e4688d354..7bf0d0ed89 100644 --- a/src/components/smart_objects/test/StringSchemaItem_test.cc +++ b/src/components/smart_objects/test/StringSchemaItem_test.cc @@ -49,7 +49,7 @@ namespace smart_object_test { * and leave SmartObject in previous state. **/ TEST(test_no_default_value, test_StringSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = @@ -61,7 +61,7 @@ TEST(test_no_default_value, test_StringSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); bool resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); EXPECT_EQ(std::string("New valid string"), obj.asString()); @@ -70,7 +70,7 @@ TEST(test_no_default_value, test_StringSchemaItemTest) { obj = true; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); EXPECT_TRUE(obj.asBool()); @@ -79,12 +79,12 @@ TEST(test_no_default_value, test_StringSchemaItemTest) { obj = 3.1415926; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); EXPECT_EQ(3.1415926, obj.asDouble()); } @@ -98,7 +98,7 @@ TEST(test_no_default_value, test_StringSchemaItemTest) { *default value. **/ TEST(test_item_with_default_value, test_StringSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = CStringSchemaItem::create( @@ -113,7 +113,7 @@ TEST(test_item_with_default_value, test_StringSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_EQ(std::string("Default string"), obj.asString()); @@ -122,7 +122,7 @@ TEST(test_item_with_default_value, test_StringSchemaItemTest) { obj = true; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_EQ(std::string("Default string"), obj.asString()); @@ -131,12 +131,12 @@ TEST(test_item_with_default_value, test_StringSchemaItemTest) { obj = 3.1415926; resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); EXPECT_EQ(std::string("Default string"), obj.asString()); } @@ -144,7 +144,7 @@ TEST(test_item_with_default_value, test_StringSchemaItemTest) { * Test StringSchemaItem with max length **/ TEST(test_item_with_max_length, test_StringSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = CStringSchemaItem::create( @@ -158,7 +158,7 @@ TEST(test_item_with_max_length, test_StringSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_EQ(std::string("Default string"), obj.asString()); @@ -168,17 +168,17 @@ TEST(test_item_with_max_length, test_StringSchemaItemTest) { ASSERT_EQ(std::string("New very very loooooong string"), obj.asString()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_EQ(std::string("Default string"), obj.asString()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); } TEST(test_map_validate, test_StringSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = CStringSchemaItem::create( @@ -193,19 +193,19 @@ TEST(test_map_validate, test_StringSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj["str"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj["long"], &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj["bool"], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj["num"], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); bool resDefault = item->setDefaultValue(obj["str"]); EXPECT_TRUE(resDefault); @@ -220,27 +220,27 @@ TEST(test_map_validate, test_StringSchemaItemTest) { EXPECT_EQ(std::string("Default string"), obj["num"].asString()); resultType = item->validate(obj["str"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj["long"], &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj["bool"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj["num"], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_EQ(std::string("Default string"), obj.asString()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); } TEST(test_array_validate, test_StringSchemaItemTest) { - using namespace NsSmartDeviceLink::NsSmartObjects; + using namespace ns_smart_device_link::ns_smart_objects; SmartObject obj; ISchemaItemPtr item = CStringSchemaItem::create( @@ -256,22 +256,22 @@ TEST(test_array_validate, test_StringSchemaItemTest) { rpc::ValidationReport report("RPC"); int resultType = item->validate(obj[0], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj[2], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[3], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[4], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); bool resDefault = item->setDefaultValue(obj[0]); EXPECT_TRUE(resDefault); @@ -290,24 +290,24 @@ TEST(test_array_validate, test_StringSchemaItemTest) { EXPECT_EQ(std::string("Default string"), obj[5].asString()); resultType = item->validate(obj[0], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj[1], &report); - EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); + EXPECT_EQ(errors::OUT_OF_RANGE, resultType); resultType = item->validate(obj[2], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj[3], &report); - EXPECT_EQ(Errors::INVALID_VALUE, resultType); + EXPECT_EQ(errors::INVALID_VALUE, resultType); resultType = item->validate(obj[4], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resultType = item->validate(obj[5], &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); EXPECT_EQ(std::string("Default string"), obj.asString()); resultType = item->validate(obj, &report); - EXPECT_EQ(Errors::OK, resultType); + EXPECT_EQ(errors::OK, resultType); } } // namespace smart_object_test diff --git a/src/components/smart_objects/test/smart_object_performance_test.cc b/src/components/smart_objects/test/smart_object_performance_test.cc index 503652dcda..11273e332f 100644 --- a/src/components/smart_objects/test/smart_object_performance_test.cc +++ b/src/components/smart_objects/test/smart_object_performance_test.cc @@ -37,7 +37,7 @@ #include "smart_objects/smart_object.h" -using namespace NsSmartDeviceLink::NsSmartObjects; +using namespace ns_smart_device_link::ns_smart_objects; namespace test { namespace components { |