diff options
Diffstat (limited to 'src/components/smart_objects/test')
12 files changed, 655 insertions, 499 deletions
diff --git a/src/components/smart_objects/test/ArraySchemaItem_test.cc b/src/components/smart_objects/test/ArraySchemaItem_test.cc index f153a4c4a7..c4c7254cb8 100644 --- a/src/components/smart_objects/test/ArraySchemaItem_test.cc +++ b/src/components/smart_objects/test/ArraySchemaItem_test.cc @@ -50,7 +50,8 @@ TEST(test_no_default_value, test_ArraySchemaItemTest) { using namespace NsSmartDeviceLink::NsSmartObjects; SmartObject obj; - ISchemaItemPtr item = CArraySchemaItem::create(); // No schema item, no min and max size + ISchemaItemPtr item = + CArraySchemaItem::create(); // No schema item, no min and max size obj[0] = 38; obj[1] = true; @@ -97,20 +98,20 @@ TEST(test_no_default_value, test_ArraySchemaItemTest) { EXPECT_FALSE(obj[3][1].asBool()); EXPECT_EQ(std::string("Another String"), obj[3][2].asString()); - //Object - valid string + // Object - valid string obj = "New valid string"; ASSERT_EQ(std::string("New valid string"), obj.asString()); resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); - //Obj - bool + // Obj - bool obj = true; resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); - //Object - number + // Object - number obj = 3.1415926; resultType = item->validate(obj); @@ -221,7 +222,8 @@ TEST(test_array_with_max_size, test_ArraySchemaItemTest) { ISchemaItemPtr item = CArraySchemaItem::create( CStringSchemaItem::create(TSchemaItemParameter<size_t>(), TSchemaItemParameter<size_t>(25)), - TSchemaItemParameter<size_t>(), TSchemaItemParameter<size_t>(3)); // No min size + TSchemaItemParameter<size_t>(), + TSchemaItemParameter<size_t>(3)); // No min size obj[0] = "Some String"; @@ -259,7 +261,8 @@ TEST(test_array_with_min_and_max_size, test_ArraySchemaItemTest) { ISchemaItemPtr item = CArraySchemaItem::create( CStringSchemaItem::create(TSchemaItemParameter<size_t>(), TSchemaItemParameter<size_t>(25)), - TSchemaItemParameter<size_t>(2), TSchemaItemParameter<size_t>(4)); + TSchemaItemParameter<size_t>(2), + TSchemaItemParameter<size_t>(4)); obj[0] = "Some String"; @@ -300,7 +303,8 @@ TEST(test_map_validate, test_ArraySchemaItemTest) { ISchemaItemPtr item = CArraySchemaItem::create( CStringSchemaItem::create(TSchemaItemParameter<size_t>(), TSchemaItemParameter<size_t>(25)), - TSchemaItemParameter<size_t>(2), TSchemaItemParameter<size_t>(4)); + TSchemaItemParameter<size_t>(2), + TSchemaItemParameter<size_t>(4)); obj["array"][0] = "Some String"; @@ -339,4 +343,3 @@ TEST(test_map_validate, test_ArraySchemaItemTest) { } // namespace SmartObjects } // namespace components } // namespace test - diff --git a/src/components/smart_objects/test/BoolSchemaItem_test.cc b/src/components/smart_objects/test/BoolSchemaItem_test.cc index c56dd9aa2d..fa9c6a3d5d 100644 --- a/src/components/smart_objects/test/BoolSchemaItem_test.cc +++ b/src/components/smart_objects/test/BoolSchemaItem_test.cc @@ -48,14 +48,17 @@ using NsSmartDeviceLink::NsSmartObjects::ISchemaItemPtr; /** * Test BoolSchemaItem no default value * - * Create SchemaItem without default value. Method setDefaultValue should always return false + * Create SchemaItem without default value. Method setDefaultValue should always + *return false * and leave SmartObject in previous state. **/ TEST(test_no_default_value, test_BoolSchemaItemTest) { NsSmartDeviceLink::NsSmartObjects::SmartObject obj; ISchemaItemPtr item = - NsSmartDeviceLink::NsSmartObjects::CBoolSchemaItem::create(); // No default value + NsSmartDeviceLink::NsSmartObjects::CBoolSchemaItem::create(); // No + // default + // value obj = 5; ASSERT_EQ(5, obj.asInt()); @@ -89,16 +92,19 @@ TEST(test_no_default_value, test_BoolSchemaItemTest) { /** * Test BoolSchemaItem with default value * - * Create SchemaItem with default value. Method setDefaultValue should return true, + * Create SchemaItem with default value. Method setDefaultValue should return + *true, * Bool SmartObject should contain default value. - * Not bool SmartObject should converted to BoolObject and setted up by default value. + * Not bool SmartObject should converted to BoolObject and setted up by default + *value. **/ TEST(test_item_with_default_value, test_BoolSchemaItemTest) { NsSmartDeviceLink::NsSmartObjects::SmartObject obj; ISchemaItemPtr item = NsSmartDeviceLink::NsSmartObjects::CBoolSchemaItem::create( - NsSmartDeviceLink::NsSmartObjects::TSchemaItemParameter<bool>(false)); // Default value = false + NsSmartDeviceLink::NsSmartObjects::TSchemaItemParameter<bool>( + false)); // Default value = false obj = 5; ASSERT_EQ(5, obj.asInt()); @@ -135,7 +141,8 @@ TEST(test_map_validate, test_BoolSchemaItemTest) { NsSmartDeviceLink::NsSmartObjects::SmartObject obj; ISchemaItemPtr item = NsSmartDeviceLink::NsSmartObjects::CBoolSchemaItem::create( - NsSmartDeviceLink::NsSmartObjects::TSchemaItemParameter<bool>(false)); // Default value = false + NsSmartDeviceLink::NsSmartObjects::TSchemaItemParameter<bool>( + false)); // Default value = false obj["aa"] = true; ASSERT_TRUE(obj["aa"].asBool()); diff --git a/src/components/smart_objects/test/CObjectSchemaItem_test.cc b/src/components/smart_objects/test/CObjectSchemaItem_test.cc index b5e1286ee1..b3777ad028 100644 --- a/src/components/smart_objects/test/CObjectSchemaItem_test.cc +++ b/src/components/smart_objects/test/CObjectSchemaItem_test.cc @@ -43,7 +43,7 @@ #include "smart_objects/schema_item_parameter.h" #include "smart_objects/object_schema_item.h" #include "formatters/generic_json_formatter.h" -#include "formatters/CSmartFactory.hpp" +#include "formatters/CSmartFactory.h" namespace formatters = NsSmartDeviceLink::NsJSONHandler::Formatters; namespace smartobj = NsSmartDeviceLink::NsSmartObjects; @@ -120,8 +120,8 @@ class ObjectSchemaItemTest : public ::testing::Test { CObjectSchemaItem::Members paramsMembersMap; paramsMembersMap[S_FUNCTION_ID] = CObjectSchemaItem::SMember( TEnumSchemaItem<FunctionID::eType>::create(function_values), true); - paramsMembersMap[S_CORRELATION_ID] = CObjectSchemaItem::SMember( - TNumberSchemaItem<int>::create(), 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)), @@ -134,8 +134,8 @@ class ObjectSchemaItemTest : public ::testing::Test { CStringSchemaItem::create(TSchemaItemParameter<size_t>(0), TSchemaItemParameter<size_t>(10)), false); - schemaMembersMap[Keys::SUCCESS] = CObjectSchemaItem::SMember( - CBoolSchemaItem::create(), false); + schemaMembersMap[Keys::SUCCESS] = + CObjectSchemaItem::SMember(CBoolSchemaItem::create(), false); CObjectSchemaItem::Members rootMembersMap; rootMembersMap[S_PARAMS] = CObjectSchemaItem::SMember( @@ -313,7 +313,6 @@ TEST_F(ObjectSchemaItemTest, validation_unexpected_param_remove) { EXPECT_TRUE(obj[S_MSG_PARAMS].keyExists(Keys::SUCCESS)); EXPECT_EQ(Errors::OK, schema_item->validate(obj)); - obj[fake1] = SmartObject(static_cast<int64_t>(0)); obj[S_PARAMS][fake2] = SmartObject("123"); obj[S_MSG_PARAMS][fake3] = true; @@ -368,9 +367,11 @@ TEST_F(ObjectSchemaItemTest, test_strings_to_enum_conversion) { EnumConversionHelper<FunctionID::eType>::cstring_to_enum_map(); for (Results::const_iterator res_it = results.begin(); - res_it != results.end(); ++res_it) { + res_it != results.end(); + ++res_it) { for (Functions::const_iterator func_it = functions.begin(); - func_it != functions.end(); ++func_it) { + func_it != functions.end(); + ++func_it) { const char* const function_str = func_it->first; const char* const result_type_str = res_it->first; const FunctionID::eType function_type = func_it->second; @@ -401,7 +402,7 @@ TEST_F(ObjectSchemaItemTest, test_strings_to_enum_conversion) { } } // ---------------------------------------------------------------------------- -}// namespace SchemaItem +} // namespace SchemaItem } // namespace SmartObjects } // namespace components } // namespace test @@ -412,50 +413,74 @@ namespace NsSmartObjects { namespace FunctionID = test::components::SmartObjects::SchemaItem::FunctionID; typedef EnumConversionHelper<FunctionID::eType> FunctionConvertor; -template<> -const FunctionConvertor::EnumToCStringMap FunctionConvertor::enum_to_cstring_map_ = - FunctionConvertor::InitEnumToCStringMap(); - -template<> -const FunctionConvertor::CStringToEnumMap FunctionConvertor::cstring_to_enum_map_ = - FunctionConvertor::InitCStringToEnumMap(); - -template<> -const char* const FunctionConvertor::cstring_values_[] = - { "Function0", "Function1", "Function2", "Function3", "Function4", - "Function5", "Function6" }; - -template<> +template <> +const FunctionConvertor::EnumToCStringMap + FunctionConvertor::enum_to_cstring_map_ = + FunctionConvertor::InitEnumToCStringMap(); + +template <> +const FunctionConvertor::CStringToEnumMap + FunctionConvertor::cstring_to_enum_map_ = + FunctionConvertor::InitCStringToEnumMap(); + +template <> +const char* const FunctionConvertor::cstring_values_[] = {"Function0", + "Function1", + "Function2", + "Function3", + "Function4", + "Function5", + "Function6"}; + +template <> const FunctionID::eType FunctionConvertor::enum_values_[] = { - FunctionID::Function0, FunctionID::Function1, FunctionID::Function2, - FunctionID::Function3, FunctionID::Function4, FunctionID::Function5, - FunctionID::Function6 }; + FunctionID::Function0, + FunctionID::Function1, + FunctionID::Function2, + FunctionID::Function3, + FunctionID::Function4, + FunctionID::Function5, + FunctionID::Function6}; // ---------------------------------------------------------------------------- namespace ResultType = test::components::SmartObjects::SchemaItem::ResultType; typedef EnumConversionHelper<ResultType::eType> ResultTypeConvertor; -template<> -const ResultTypeConvertor::EnumToCStringMap ResultTypeConvertor::enum_to_cstring_map_ = - ResultTypeConvertor::InitEnumToCStringMap(); +template <> +const ResultTypeConvertor::EnumToCStringMap + ResultTypeConvertor::enum_to_cstring_map_ = + ResultTypeConvertor::InitEnumToCStringMap(); -template<> -const ResultTypeConvertor::CStringToEnumMap ResultTypeConvertor::cstring_to_enum_map_ = - ResultTypeConvertor::InitCStringToEnumMap(); +template <> +const ResultTypeConvertor::CStringToEnumMap + ResultTypeConvertor::cstring_to_enum_map_ = + ResultTypeConvertor::InitCStringToEnumMap(); -template<> +template <> const char* const ResultTypeConvertor::cstring_values_[] = { - "APPLICATION_NOT_REGISTERED", "SUCCESS", "TOO_MANY_PENDING_REQUESTS", - "REJECTED", "INVALID_DATA", "OUT_OF_MEMORY", "ABORTED", "USER_DISALLOWED", - "GENERIC_ERROR", "DISALLOWED" }; - -template<> + "APPLICATION_NOT_REGISTERED", + "SUCCESS", + "TOO_MANY_PENDING_REQUESTS", + "REJECTED", + "INVALID_DATA", + "OUT_OF_MEMORY", + "ABORTED", + "USER_DISALLOWED", + "GENERIC_ERROR", + "DISALLOWED"}; + +template <> const ResultType::eType ResultTypeConvertor::enum_values_[] = { - ResultType::APPLICATION_NOT_REGISTERED, ResultType::SUCCESS, - ResultType::TOO_MANY_PENDING_REQUESTS, ResultType::REJECTED, - ResultType::INVALID_DATA, ResultType::OUT_OF_MEMORY, ResultType::ABORTED, - ResultType::USER_DISALLOWED, ResultType::GENERIC_ERROR, - ResultType::DISALLOWED }; + ResultType::APPLICATION_NOT_REGISTERED, + ResultType::SUCCESS, + ResultType::TOO_MANY_PENDING_REQUESTS, + ResultType::REJECTED, + ResultType::INVALID_DATA, + ResultType::OUT_OF_MEMORY, + ResultType::ABORTED, + ResultType::USER_DISALLOWED, + ResultType::GENERIC_ERROR, + ResultType::DISALLOWED}; } // namespace NsSmartObjects } // namespace NsSmartDeviceLink diff --git a/src/components/smart_objects/test/EnumSchemaItem_test.cc b/src/components/smart_objects/test/EnumSchemaItem_test.cc index 6d007b74b6..24cde07193 100644 --- a/src/components/smart_objects/test/EnumSchemaItem_test.cc +++ b/src/components/smart_objects/test/EnumSchemaItem_test.cc @@ -71,8 +71,7 @@ class EnumSchemaItemTest : public ::testing::Test { testEnum.insert(TestType::APP_UNAUTHORIZED); } - virtual void SetUp() { - } + virtual void SetUp() {} std::set<TestType::eType> testEnum; }; @@ -80,9 +79,11 @@ class EnumSchemaItemTest : public ::testing::Test { /** * Test EnumSchemaItem * - * Create SchemaItem with default value. Method setDefaultValue should return true, + * Create SchemaItem with default value. Method setDefaultValue should return + *true, * SmartObject should contain default value. - * Not Enum SmartObject should converted to intObject and setted up by the default value. + * Not Enum SmartObject should converted to intObject and setted up by the + *default value. **/ TEST_F(EnumSchemaItemTest, test_item_with_default_value) { SmartObject obj; @@ -90,7 +91,7 @@ TEST_F(EnumSchemaItemTest, test_item_with_default_value) { testEnum, TSchemaItemParameter<TestType::eType>(TestType::FACTORY_DEFAULTS)); - //Object - valid enum + // Object - valid enum obj = TestType::BLUETOOTH_OFF; int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); @@ -98,7 +99,7 @@ TEST_F(EnumSchemaItemTest, test_item_with_default_value) { EXPECT_TRUE(resDefault); EXPECT_EQ(TestType::FACTORY_DEFAULTS, obj.asInt()); - //Obj - bool + // Obj - bool obj = true; resultType = item->validate(obj); @@ -107,7 +108,7 @@ TEST_F(EnumSchemaItemTest, test_item_with_default_value) { EXPECT_TRUE(resDefault); EXPECT_EQ(TestType::FACTORY_DEFAULTS, obj.asInt()); - //Object - number + // Object - number obj = 3.1415926; resultType = item->validate(obj); @@ -117,7 +118,7 @@ TEST_F(EnumSchemaItemTest, test_item_with_default_value) { EXPECT_TRUE(resDefault); EXPECT_EQ(TestType::FACTORY_DEFAULTS, obj.asInt()); - //Object - string + // Object - string obj = "Some string"; resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); @@ -130,7 +131,8 @@ TEST_F(EnumSchemaItemTest, test_item_with_default_value) { /** * Test EnumSchemaItem with default value * - * Create SchemaItem without default value. Method setDefaultValue should return false, + * Create SchemaItem without default value. Method setDefaultValue should return + *false, * SmartObject should contain previous value. **/ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { @@ -139,7 +141,7 @@ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { ISchemaItemPtr item = TEnumSchemaItem<TestType::eType>::create( testEnum, TSchemaItemParameter<TestType::eType>()); - //Object - valid enum + // Object - valid enum obj = TestType::BLUETOOTH_OFF; int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); @@ -147,7 +149,7 @@ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { EXPECT_FALSE(resDefault); EXPECT_EQ(TestType::BLUETOOTH_OFF, obj.asInt()); - //Obj - bool + // Obj - bool obj = true; resultType = item->validate(obj); @@ -156,7 +158,7 @@ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { EXPECT_FALSE(resDefault); EXPECT_TRUE(obj.asBool()); - //Object - number + // Object - number obj = 3.1415926; resultType = item->validate(obj); @@ -166,7 +168,7 @@ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { EXPECT_FALSE(resDefault); EXPECT_EQ(3.1415926, obj.asDouble()); - //Object - string + // Object - string obj = "Some string"; resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); @@ -175,12 +177,12 @@ TEST_F(EnumSchemaItemTest, test_item_without_default_value) { EXPECT_FALSE(resDefault); EXPECT_EQ(std::string("Some string"), obj.asString()); - //Object - int in range of enum + // Object - int in range of enum obj = 6; resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object - int out of enum range + // Object - int out of enum range obj = 15; resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); @@ -196,7 +198,7 @@ TEST_F(EnumSchemaItemTest, test_apply_unapply_schema) { testEnum, TSchemaItemParameter<TestType::eType>(TestType::FACTORY_DEFAULTS)); - //Object - valid enum + // Object - valid enum obj = TestType::BLUETOOTH_OFF; int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); @@ -226,7 +228,6 @@ TEST_F(EnumSchemaItemTest, test_apply_unapply_schema) { EXPECT_EQ(Errors::INVALID_VALUE, resultType); EXPECT_EQ(std::string("ENOUGH_REQUESTS"), obj.asString()); } - } } } @@ -235,38 +236,45 @@ TEST_F(EnumSchemaItemTest, test_apply_unapply_schema) { namespace NsSmartDeviceLink { namespace NsSmartObjects { -template<> -const EnumConversionHelper< - test::components::SmartObjects::SchemaItem::TestType::eType>::EnumToCStringMap EnumConversionHelper< - test::components::SmartObjects::SchemaItem::TestType::eType>::enum_to_cstring_map_ = - EnumConversionHelper< - test::components::SmartObjects::SchemaItem::TestType::eType>::InitEnumToCStringMap(); - -template<> -const EnumConversionHelper< - test::components::SmartObjects::SchemaItem::TestType::eType>::CStringToEnumMap EnumConversionHelper< - test::components::SmartObjects::SchemaItem::TestType::eType>::cstring_to_enum_map_ = - EnumConversionHelper< - test::components::SmartObjects::SchemaItem::TestType::eType>::InitCStringToEnumMap(); - -template<> +template <> +const EnumConversionHelper<test::components::SmartObjects::SchemaItem:: + TestType::eType>::EnumToCStringMap + EnumConversionHelper<test::components::SmartObjects::SchemaItem::TestType:: + eType>::enum_to_cstring_map_ = + EnumConversionHelper<test::components::SmartObjects::SchemaItem:: + TestType::eType>::InitEnumToCStringMap(); + +template <> +const EnumConversionHelper<test::components::SmartObjects::SchemaItem:: + TestType::eType>::CStringToEnumMap + EnumConversionHelper<test::components::SmartObjects::SchemaItem::TestType:: + eType>::cstring_to_enum_map_ = + EnumConversionHelper<test::components::SmartObjects::SchemaItem:: + TestType::eType>::InitCStringToEnumMap(); + +template <> const char* const EnumConversionHelper< - test::components::SmartObjects::SchemaItem::TestType::eType>::cstring_values_[] = - { "USER_EXIT", "IGNITION_OFF", "BLUETOOTH_OFF", "USB_DISCONNECTED", - "TOO_MANY_REQUESTS", "MASTER_RESET", "FACTORY_DEFAULTS", - "APP_UNAUTHORIZED" }; - -template<> -const test::components::SmartObjects::SchemaItem::TestType::eType EnumConversionHelper< - test::components::SmartObjects::SchemaItem::TestType::eType>::enum_values_[] = - { test::components::SmartObjects::SchemaItem::TestType::USER_EXIT, + test::components::SmartObjects::SchemaItem::TestType::eType>:: + cstring_values_[] = {"USER_EXIT", + "IGNITION_OFF", + "BLUETOOTH_OFF", + "USB_DISCONNECTED", + "TOO_MANY_REQUESTS", + "MASTER_RESET", + "FACTORY_DEFAULTS", + "APP_UNAUTHORIZED"}; + +template <> +const test::components::SmartObjects::SchemaItem::TestType::eType + EnumConversionHelper<test::components::SmartObjects::SchemaItem::TestType:: + eType>::enum_values_[] = { + test::components::SmartObjects::SchemaItem::TestType::USER_EXIT, test::components::SmartObjects::SchemaItem::TestType::IGNITION_OFF, test::components::SmartObjects::SchemaItem::TestType::BLUETOOTH_OFF, test::components::SmartObjects::SchemaItem::TestType::USB_DISCONNECTED, test::components::SmartObjects::SchemaItem::TestType::TOO_MANY_REQUESTS, test::components::SmartObjects::SchemaItem::TestType::MASTER_RESET, test::components::SmartObjects::SchemaItem::TestType::FACTORY_DEFAULTS, - test::components::SmartObjects::SchemaItem::TestType::APP_UNAUTHORIZED }; - + test::components::SmartObjects::SchemaItem::TestType::APP_UNAUTHORIZED}; } } diff --git a/src/components/smart_objects/test/NumberSchemaItem_test.cc b/src/components/smart_objects/test/NumberSchemaItem_test.cc index cc56228694..2c4b24e927 100644 --- a/src/components/smart_objects/test/NumberSchemaItem_test.cc +++ b/src/components/smart_objects/test/NumberSchemaItem_test.cc @@ -46,7 +46,8 @@ using NsSmartDeviceLink::NsSmartObjects::ISchemaItemPtr; /** * Test NumberSchemaItem as INT with no default value * - * Create SchemaItem without default value. Method setDefaultValue should always return false + * Create SchemaItem without default value. Method setDefaultValue should always + *return false * and leave SmartObject in previous state. **/ TEST(test_int_no_default_value, test_NumberSchemaItemTest) { @@ -54,30 +55,31 @@ TEST(test_int_no_default_value, test_NumberSchemaItemTest) { SmartObject obj; - ISchemaItemPtr item = TNumberSchemaItem<int>::create(); // No default value, no min, no max + ISchemaItemPtr item = + TNumberSchemaItem<int>::create(); // No default value, no min, no max - //Object int + // Object int obj = 5; ASSERT_EQ(5, obj.asInt()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Obj bool + // Obj bool obj = true; ASSERT_TRUE(obj.asBool()); resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); - //Set default value + // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); EXPECT_TRUE(obj.asBool()); - //Obj string + // Obj string obj = "Test"; ASSERT_EQ(std::string("Test"), obj.asString()); @@ -100,21 +102,21 @@ TEST(test_int_min_value, test_NumberSchemaItemTest) { ISchemaItemPtr item = TNumberSchemaItem<int>::create( TSchemaItemParameter<int>(10)); // No default value, no max value - //Object int correct + // Object int correct obj = 15; ASSERT_EQ(15, obj.asInt()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object int incorrect + // Object int incorrect obj = 9; ASSERT_EQ(9, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Object int correct + // Object int correct obj = 10; ASSERT_EQ(10, obj.asInt()); @@ -131,23 +133,24 @@ TEST(test_int_max_value, test_NumberSchemaItemTest) { SmartObject obj; ISchemaItemPtr item = TNumberSchemaItem<int>::create( - TSchemaItemParameter<int>(), TSchemaItemParameter<int>(749)); // No default value, no min value + TSchemaItemParameter<int>(), + TSchemaItemParameter<int>(749)); // No default value, no min value - //Object int correct + // Object int correct obj = 749; ASSERT_EQ(749, obj.asInt()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object int incorrect + // Object int incorrect obj = 750; ASSERT_EQ(750, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Object int correct + // Object int correct obj = -750; ASSERT_EQ(-750, obj.asInt()); @@ -164,36 +167,36 @@ TEST(test_int_min_max_value, test_NumberSchemaItemTest) { SmartObject obj; ISchemaItemPtr item = TNumberSchemaItem<int>::create( - TSchemaItemParameter<int>(-949), TSchemaItemParameter<int>(749)); // No default value + TSchemaItemParameter<int>(-949), + TSchemaItemParameter<int>(749)); // No default value - //Object int correct + // Object int correct obj = 749; ASSERT_EQ(749, obj.asInt()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object int incorrect + // Object int incorrect obj = 750; ASSERT_EQ(750, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Object int correct + // Object int correct obj = -949; ASSERT_EQ(-949, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object int incorrect + // Object int incorrect obj = -950; ASSERT_EQ(-950, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - } /** @@ -204,46 +207,47 @@ TEST(test_int_correct_default_value, test_NumberSchemaItemTest) { SmartObject obj; - ISchemaItemPtr item = TNumberSchemaItem<int>::create( - TSchemaItemParameter<int>(-12000), TSchemaItemParameter<int>(100), - TSchemaItemParameter<int>(-38)); + ISchemaItemPtr item = + TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(-12000), + TSchemaItemParameter<int>(100), + TSchemaItemParameter<int>(-38)); - //Object int correct + // Object int correct obj = -12000; ASSERT_EQ(-12000, obj.asInt()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object int incorrect + // Object int incorrect obj = -12001; ASSERT_EQ(-12001, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Object int correct + // Object int correct obj = 100; ASSERT_EQ(100, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object int incorrect + // Object int incorrect obj = 101; ASSERT_EQ(101, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Set default value + // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); EXPECT_EQ(-38, obj.asInt()); - //Object string + // Object string obj = "string"; resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); @@ -263,45 +267,46 @@ TEST(test_int_default_value_out_of_range, test_NumberSchemaItemTest) { SmartObject obj; ISchemaItemPtr item = TNumberSchemaItem<int>::create( - TSchemaItemParameter<int>(90), TSchemaItemParameter<int>(100), + TSchemaItemParameter<int>(90), + TSchemaItemParameter<int>(100), TSchemaItemParameter<int>(50)); // Default value out of range - //Object int correct + // Object int correct obj = 90; ASSERT_EQ(90, obj.asInt()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object int incorrect + // Object int incorrect obj = 89; ASSERT_EQ(89, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Object int correct + // Object int correct obj = 100; ASSERT_EQ(100, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object int incorrect + // Object int incorrect obj = 101; ASSERT_EQ(101, obj.asInt()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Set default value + // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); EXPECT_EQ(50, obj.asInt()); - //Object string + // Object string obj = "string"; resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); @@ -317,9 +322,10 @@ TEST(test_int_map_validate, test_NumberSchemaItemTest) { SmartObject obj; - ISchemaItemPtr item = TNumberSchemaItem<int>::create( - TSchemaItemParameter<int>(-120), TSchemaItemParameter<int>(100), - TSchemaItemParameter<int>(-38)); + ISchemaItemPtr item = + TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(-120), + TSchemaItemParameter<int>(100), + TSchemaItemParameter<int>(-38)); obj["min"] = -120; obj["out_of_min"] = -121; @@ -337,7 +343,7 @@ TEST(test_int_map_validate, test_NumberSchemaItemTest) { resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); - //Set default value + // Set default value bool resDefault = item->setDefaultValue(obj["aa"]); EXPECT_TRUE(resDefault); EXPECT_EQ(-38, obj["aa"].asInt()); @@ -361,9 +367,10 @@ TEST(test_int_array_validate, test_NumberSchemaItemTest) { SmartObject obj; - ISchemaItemPtr item = TNumberSchemaItem<int>::create( - TSchemaItemParameter<int>(-120), TSchemaItemParameter<int>(100), - TSchemaItemParameter<int>(-38)); + ISchemaItemPtr item = + TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(-120), + TSchemaItemParameter<int>(100), + TSchemaItemParameter<int>(-38)); obj[0] = -121; obj[1] = -120; @@ -411,7 +418,8 @@ TEST(test_int_array_validate, test_NumberSchemaItemTest) { /** * Test NumberSchemaItem as DOUBLE with no default value * - * Create SchemaItem without default value. Method setDefaultValue should always return false + * Create SchemaItem without default value. Method setDefaultValue should always + *return false * and leave SmartObject in previous state. **/ TEST(test_double_no_default_value, test_NumberSchemaItemTest) { @@ -419,37 +427,38 @@ TEST(test_double_no_default_value, test_NumberSchemaItemTest) { SmartObject obj; - ISchemaItemPtr item = TNumberSchemaItem<double>::create(); // No default value, no min, no max + ISchemaItemPtr item = + TNumberSchemaItem<double>::create(); // No default value, no min, no max - //Object int + // Object int obj = 5.79; ASSERT_EQ(5.79, obj.asDouble()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Obj bool + // Obj bool obj = true; ASSERT_TRUE(obj.asBool()); resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); - //Set default value + // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); EXPECT_TRUE(obj.asBool()); - //Obj string + // Obj string obj = "Test"; ASSERT_EQ(std::string("Test"), obj.asString()); resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); - //Set default value + // Set default value resDefault = item->setDefaultValue(obj); EXPECT_FALSE(resDefault); resultType = item->validate(obj); @@ -467,14 +476,14 @@ TEST(test_double_min_value, test_NumberSchemaItemTest) { ISchemaItemPtr item = TNumberSchemaItem<double>::create( TSchemaItemParameter<double>(10.0)); // No default value, no max value - //Object double correct + // Object double correct obj = 10.000001; ASSERT_EQ(10.000001, obj.asDouble()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object double incorrect + // Object double incorrect obj = 9.999999; ASSERT_EQ(9.999999, obj.asDouble()); @@ -498,23 +507,24 @@ TEST(test_double_max_value, test_NumberSchemaItemTest) { SmartObject obj; ISchemaItemPtr item = TNumberSchemaItem<double>::create( - TSchemaItemParameter<double>(), TSchemaItemParameter<double>(749.0)); // No default value, no min value + TSchemaItemParameter<double>(), + TSchemaItemParameter<double>(749.0)); // No default value, no min value - //Object double correct + // Object double correct obj = 749.0; ASSERT_EQ(749.0, obj.asDouble()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object double incorrect + // Object double incorrect obj = 749.0001; ASSERT_EQ(749.0001, obj.asDouble()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Object double correct + // Object double correct obj = -750.0; ASSERT_EQ(-750.0, obj.asDouble()); @@ -534,34 +544,33 @@ TEST(test_double_min_max_value, test_NumberSchemaItemTest) { TSchemaItemParameter<double>(-949.0), TSchemaItemParameter<double>(749.0)); // No default value - //Object double correct + // Object double correct obj = 749.0; ASSERT_EQ(749.0, obj.asDouble()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object double incorrect + // Object double incorrect obj = 749.001; ASSERT_EQ(749.001, obj.asDouble()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Object double correct + // Object double correct obj = -949.0; ASSERT_EQ(-949.0, obj.asDouble()); resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object double incorrect + // Object double incorrect obj = -949.00001; ASSERT_EQ(-949.00001, obj.asDouble()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - } /** @@ -572,46 +581,47 @@ TEST(test_double_correct_default_value, test_NumberSchemaItemTest) { SmartObject obj; - ISchemaItemPtr item = TNumberSchemaItem<double>::create( - TSchemaItemParameter<double>(-12000.0), - TSchemaItemParameter<double>(100.0), TSchemaItemParameter<double>(-38.0)); + ISchemaItemPtr item = + TNumberSchemaItem<double>::create(TSchemaItemParameter<double>(-12000.0), + TSchemaItemParameter<double>(100.0), + TSchemaItemParameter<double>(-38.0)); - //Object double correct + // Object double correct obj = -12000.0; ASSERT_EQ(-12000.0, obj.asDouble()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object double incorrect + // Object double incorrect obj = -12000.01; ASSERT_EQ(-12000.01, obj.asDouble()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Object double correct + // Object double correct obj = 100.0; ASSERT_EQ(100.0, obj.asDouble()); resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object double incorrect + // Object double incorrect obj = 100.001; ASSERT_EQ(100.001, obj.asDouble()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Set default value + // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); EXPECT_EQ(-38.0, obj.asDouble()); - //Object string + // Object string obj = "string"; resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); @@ -631,45 +641,46 @@ TEST(test_double_default_value_out_of_range, test_NumberSchemaItemTest) { SmartObject obj; ISchemaItemPtr item = TNumberSchemaItem<double>::create( - TSchemaItemParameter<double>(90.0), TSchemaItemParameter<double>(100.0), + TSchemaItemParameter<double>(90.0), + TSchemaItemParameter<double>(100.0), TSchemaItemParameter<double>(50.0)); // Default value out of range - //Object double correct + // Object double correct obj = 90.0; ASSERT_EQ(90.0, obj.asDouble()); int resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object double incorrect + // Object double incorrect obj = 89.999; ASSERT_EQ(89.999, obj.asDouble()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Object double correct + // Object double correct obj = 100.0; ASSERT_EQ(100.0, obj.asDouble()); resultType = item->validate(obj); EXPECT_EQ(Errors::OK, resultType); - //Object double incorrect + // Object double incorrect obj = 100.001; ASSERT_EQ(100.001, obj.asDouble()); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); - //Set default value + // Set default value bool resDefault = item->setDefaultValue(obj); EXPECT_TRUE(resDefault); resultType = item->validate(obj); EXPECT_EQ(Errors::OUT_OF_RANGE, resultType); EXPECT_EQ(50.0, obj.asDouble()); - //Object string + // Object string obj = "string"; resultType = item->validate(obj); EXPECT_EQ(Errors::INVALID_VALUE, resultType); @@ -685,9 +696,10 @@ TEST(test_double_map_validate, test_NumberSchemaItemTest) { SmartObject obj; - ISchemaItemPtr item = TNumberSchemaItem<double>::create( - TSchemaItemParameter<double>(-120.0), TSchemaItemParameter<double>(100.0), - TSchemaItemParameter<double>(-38.0)); + ISchemaItemPtr item = + TNumberSchemaItem<double>::create(TSchemaItemParameter<double>(-120.0), + TSchemaItemParameter<double>(100.0), + TSchemaItemParameter<double>(-38.0)); obj["min"] = -120.0; obj["out_of_min"] = -120.001; @@ -728,9 +740,10 @@ TEST(test_double_array_validate, test_NumberSchemaItemTest) { SmartObject obj; - ISchemaItemPtr item = TNumberSchemaItem<double>::create( - TSchemaItemParameter<double>(-120.0), TSchemaItemParameter<double>(100.0), - TSchemaItemParameter<double>(-38.0)); + ISchemaItemPtr item = + TNumberSchemaItem<double>::create(TSchemaItemParameter<double>(-120.0), + TSchemaItemParameter<double>(100.0), + TSchemaItemParameter<double>(-38.0)); obj[0] = -120.001; obj[1] = -120.0; @@ -791,7 +804,7 @@ TEST(test_int_double_value, test_NumberSchemaItemTest) { EXPECT_EQ(Errors::INVALID_VALUE, resultType); } -TEST(test_double_int_value, DISABLED_test_NumberSchemaItemTest) { +TEST(test_double_int_value, test_NumberSchemaItemTest) { using namespace NsSmartDeviceLink::NsSmartObjects; ISchemaItemPtr item = TNumberSchemaItem<double>::create( diff --git a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc index f1bf1df697..d9f099afb1 100644 --- a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc +++ b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc @@ -1,6 +1,7 @@ -//TODO -//this test file should be refactored. Now it doesn't test anything. -//Previously it tests equality of objects but should test time for object's conversion +// TODO +// this test file should be refactored. Now it doesn't test anything. +// Previously it tests equality of objects but should test time for object's +// conversion /* * Copyright (c) 2014, Ford Motor Company * All rights reserved. @@ -87,32 +88,27 @@ enum eType { } namespace MessageTypeTest { -enum eType { - INVALID_ENUM = -1, - request, - response, - notification -}; +enum eType { INVALID_ENUM = -1, request, response, notification }; } class SmartObjectConvertionTimeTest : public ::testing::Test { protected: - double getConvertionTimeToJsonV2Format(const SmartObject& srcObj, std::string& jsonString) { timespec convertionStartTime, convertionEndTime; clock_gettime(CLOCK_REALTIME, &convertionStartTime); // SmartObjects --> JSON - NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv2::toString( - srcObj, jsonString); + NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv2:: + toString(srcObj, jsonString); clock_gettime(CLOCK_REALTIME, &convertionEndTime); - return static_cast<double>(convertionEndTime.tv_sec - - convertionStartTime.tv_sec) - + static_cast<double>(convertionEndTime.tv_nsec - - convertionStartTime.tv_nsec) * 1e-9; + return static_cast<double>(convertionEndTime.tv_sec - + convertionStartTime.tv_sec) + + static_cast<double>(convertionEndTime.tv_nsec - + convertionStartTime.tv_nsec) * + 1e-9; } double getConvertionTimeFromJsonV2Format(std::string& jsonString, @@ -121,16 +117,20 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { clock_gettime(CLOCK_REALTIME, &convertionStartTime); // JSON --> SmartObjects - NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv2::fromString< - FunctionIdTest::eType, MessageTypeTest::eType>( - jsonString, dstObj, FunctionIdTest::RegisterAppInterface, - MessageTypeTest::request, 13); + NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv2:: + fromString<FunctionIdTest::eType, MessageTypeTest::eType>( + jsonString, + dstObj, + FunctionIdTest::RegisterAppInterface, + MessageTypeTest::request, + 13); clock_gettime(CLOCK_REALTIME, &convertionEndTime); - return static_cast<double>(convertionEndTime.tv_sec - - convertionStartTime.tv_sec) - + static_cast<double>(convertionEndTime.tv_nsec - - convertionStartTime.tv_nsec) * 1e-9; + return static_cast<double>(convertionEndTime.tv_sec - + convertionStartTime.tv_sec) + + static_cast<double>(convertionEndTime.tv_nsec - + convertionStartTime.tv_nsec) * + 1e-9; } double getConvertionTimeToJsonV1Format(const SmartObject& srcObj, @@ -139,14 +139,15 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { clock_gettime(CLOCK_REALTIME, &convertionStartTime); // SmartObjects --> JSON - NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv1::toString( - srcObj, jsonString); + NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv1:: + toString(srcObj, jsonString); clock_gettime(CLOCK_REALTIME, &convertionEndTime); - return static_cast<double>(convertionEndTime.tv_sec - - convertionStartTime.tv_sec) - + static_cast<double>(convertionEndTime.tv_nsec - - convertionStartTime.tv_nsec) * 1e-9; + return static_cast<double>(convertionEndTime.tv_sec - + convertionStartTime.tv_sec) + + static_cast<double>(convertionEndTime.tv_nsec - + convertionStartTime.tv_nsec) * + 1e-9; } double getConvertionTimeFromJsonV1Format(std::string& jsonString, @@ -155,14 +156,16 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { clock_gettime(CLOCK_REALTIME, &convertionStartTime); // JSON --> SmartObjects - NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv1::fromString< - FunctionIdTest::eType, MessageTypeTest::eType>(jsonString, dstObj); + NsSmartDeviceLink::NsJSONHandler::Formatters::CFormatterJsonSDLRPCv1:: + fromString<FunctionIdTest::eType, MessageTypeTest::eType>(jsonString, + dstObj); clock_gettime(CLOCK_REALTIME, &convertionEndTime); - return static_cast<double>(convertionEndTime.tv_sec - - convertionStartTime.tv_sec) - + static_cast<double>(convertionEndTime.tv_nsec - - convertionStartTime.tv_nsec) * 1e-9; + return static_cast<double>(convertionEndTime.tv_sec - + convertionStartTime.tv_sec) + + static_cast<double>(convertionEndTime.tv_nsec - + convertionStartTime.tv_nsec) * + 1e-9; } void calculateConvertionTime(SmartObject& srcObj, SmartObject& dstObj) { @@ -173,56 +176,60 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { for (int i = 0; i < cycles; i++) { convertionToTime += getConvertionTimeToJsonV1Format(srcObj, jsonString); -// printf("%s\n", jsonString.c_str()); - convertionFromTime += getConvertionTimeFromJsonV1Format(jsonString, - dstObj); + // printf("%s\n", jsonString.c_str()); + convertionFromTime += + getConvertionTimeFromJsonV1Format(jsonString, dstObj); } printf( "Format V1. Convertion TO time = %.8f, Convertion FROM time = %.8f\n", - convertionToTime / cycles, convertionFromTime / cycles); + convertionToTime / cycles, + convertionFromTime / cycles); - srcObj[S_PARAMS][S_PROTOCOL_VERSION] = 1; // adjust protocol version + srcObj[S_PARAMS][S_PROTOCOL_VERSION] = 1; // adjust protocol version srcObj.getSchema().applySchema(dstObj, false); // The objects are different after remove non-schemed fields -// EXPECT_TRUE(srcObj == dstObj); + // EXPECT_TRUE(srcObj == dstObj); convertionToTime = 0.0; convertionFromTime = 0.0; for (int i = 0; i < cycles; i++) { convertionToTime += getConvertionTimeToJsonV2Format(srcObj, jsonString); - convertionFromTime += getConvertionTimeFromJsonV2Format(jsonString, - dstObj); + convertionFromTime += + getConvertionTimeFromJsonV2Format(jsonString, dstObj); } printf( "Format V2. Convertion TO time = %.8f, Convertion FROM time = %.8f\n", - convertionToTime / cycles, convertionFromTime / cycles); + convertionToTime / cycles, + convertionFromTime / cycles); - srcObj[S_PARAMS][S_PROTOCOL_VERSION] = 2; // adjust protocol version + srcObj[S_PARAMS][S_PROTOCOL_VERSION] = 2; // adjust protocol version dstObj.getSchema().applySchema(dstObj, false); // The objects are different after remove non-schemed fields -// EXPECT_TRUE(srcObj == dstObj); + // EXPECT_TRUE(srcObj == dstObj); } void calculateConvertionTimeWithJsonStringOutput(const SmartObject& srcObj, SmartObject& dstObj) { std::string jsonString; - double convertionToTime = getConvertionTimeToJsonV1Format(srcObj, - jsonString); - double convertionFromTime = getConvertionTimeFromJsonV1Format(jsonString, - dstObj); + double convertionToTime = + getConvertionTimeToJsonV1Format(srcObj, jsonString); + double convertionFromTime = + getConvertionTimeFromJsonV1Format(jsonString, dstObj); printf("\nJSON string V1 = %s", jsonString.c_str()); printf( "\nFormat V1. Convertion TO time = %.8f, Convertion FROM time = %.8f\n", - convertionToTime, convertionFromTime); + convertionToTime, + convertionFromTime); convertionToTime = getConvertionTimeToJsonV2Format(srcObj, jsonString); convertionFromTime = getConvertionTimeFromJsonV2Format(jsonString, dstObj); printf("\nJSON string V2 = %s", jsonString.c_str()); printf( "\nFormat V2. Convertion TO time = %.8f, Convertion FROM time = %.8f\n", - convertionToTime, convertionFromTime); + convertionToTime, + convertionFromTime); } // The basic Schema just for enum conversion (FunctionId and MessageType) @@ -244,16 +251,19 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { TEnumSchemaItem<FunctionIdTest::eType>::create( functionId_allowedEnumSubsetValues); - ISchemaItemPtr messageType_SchemaItem = TEnumSchemaItem< - MessageTypeTest::eType>::create(messageType_allowedEnumSubsetValues); + ISchemaItemPtr messageType_SchemaItem = + TEnumSchemaItem<MessageTypeTest::eType>::create( + messageType_allowedEnumSubsetValues); CObjectSchemaItem::Members paramsMembersMap; paramsMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(functionId_SchemaItem, true); - paramsMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = - CObjectSchemaItem::SMember(messageType_SchemaItem, true); - paramsMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = - CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true); + paramsMembersMap + [NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = + CObjectSchemaItem::SMember(messageType_SchemaItem, true); + paramsMembersMap + [NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = + CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true); std::map<std::string, CObjectSchemaItem::SMember> rootMembersMap; rootMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] = @@ -263,7 +273,7 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { return CSmartSchema(CObjectSchemaItem::create(rootMembersMap)); } - //Create SmartObjectSchema for test object + // Create SmartObjectSchema for test object CSmartSchema initObjectSchema() { std::set<TestType::eType> resultCode_allowedEnumSubsetValues; resultCode_allowedEnumSubsetValues.insert( @@ -292,32 +302,34 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { messageType_allowedEnumSubsetValues.insert(MessageTypeTest::response); messageType_allowedEnumSubsetValues.insert(MessageTypeTest::notification); - ISchemaItemPtr success_SchemaItem = CBoolSchemaItem::create( - TSchemaItemParameter<bool>()); + ISchemaItemPtr success_SchemaItem = + CBoolSchemaItem::create(TSchemaItemParameter<bool>()); ISchemaItemPtr resultCode_SchemaItem = TEnumSchemaItem<TestType::eType>::create( resultCode_allowedEnumSubsetValues, TSchemaItemParameter<TestType::eType>()); - ISchemaItemPtr info_SchemaItem = CStringSchemaItem::create( - TSchemaItemParameter<size_t>(0), TSchemaItemParameter<size_t>(1000), - TSchemaItemParameter<std::string>()); + ISchemaItemPtr info_SchemaItem = + CStringSchemaItem::create(TSchemaItemParameter<size_t>(0), + TSchemaItemParameter<size_t>(1000), + TSchemaItemParameter<std::string>()); - ISchemaItemPtr tryAgainTime_SchemaItem = TNumberSchemaItem<int>::create( - TSchemaItemParameter<int>(0), TSchemaItemParameter<int>(2000000000), - TSchemaItemParameter<int>()); + ISchemaItemPtr tryAgainTime_SchemaItem = + TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(0), + TSchemaItemParameter<int>(2000000000), + TSchemaItemParameter<int>()); std::map<std::string, CObjectSchemaItem::SMember> schemaMembersMap; - schemaMembersMap["success"] = CObjectSchemaItem::SMember(success_SchemaItem, - true); - schemaMembersMap["resultCode"] = CObjectSchemaItem::SMember( - resultCode_SchemaItem, true); - schemaMembersMap["info"] = CObjectSchemaItem::SMember(info_SchemaItem, - false); - schemaMembersMap["tryAgainTime"] = CObjectSchemaItem::SMember( - tryAgainTime_SchemaItem, true); + schemaMembersMap["success"] = + CObjectSchemaItem::SMember(success_SchemaItem, true); + schemaMembersMap["resultCode"] = + CObjectSchemaItem::SMember(resultCode_SchemaItem, true); + schemaMembersMap["info"] = + CObjectSchemaItem::SMember(info_SchemaItem, false); + schemaMembersMap["tryAgainTime"] = + CObjectSchemaItem::SMember(tryAgainTime_SchemaItem, true); std::map<std::string, CObjectSchemaItem::SMember> paramsMembersMap; paramsMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = @@ -325,20 +337,24 @@ class SmartObjectConvertionTimeTest : public ::testing::Test { TEnumSchemaItem<FunctionIdTest::eType>::create( functionId_allowedEnumSubsetValues), true); - paramsMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = - CObjectSchemaItem::SMember( - TEnumSchemaItem<MessageTypeTest::eType>::create( - messageType_allowedEnumSubsetValues), - true); - paramsMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = - CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true); - paramsMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_VERSION] = - CObjectSchemaItem::SMember( - TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1), - TSchemaItemParameter<int>(2)), - true); - paramsMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_TYPE] = - CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true); + paramsMembersMap + [NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = + CObjectSchemaItem::SMember( + TEnumSchemaItem<MessageTypeTest::eType>::create( + messageType_allowedEnumSubsetValues), + true); + paramsMembersMap + [NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = + CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true); + paramsMembersMap + [NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_VERSION] = + CObjectSchemaItem::SMember( + TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1), + TSchemaItemParameter<int>(2)), + true); + paramsMembersMap + [NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_TYPE] = + CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true); std::map<std::string, CObjectSchemaItem::SMember> rootMembersMap; rootMembersMap[NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS] = @@ -535,8 +551,11 @@ TEST_F(SmartObjectConvertionTimeTest, test_array_convertion) { calculateConvertionTime(srcObj, dstObj); // Fourth iteration - printf("\n Array object [%d x %d x %d x %d].\n", arraySize, arraySize, - arraySize, arraySize); + printf("\n Array object [%d x %d x %d x %d].\n", + arraySize, + arraySize, + arraySize, + arraySize); innerObj = arrayObj; for (int i = 0; i < arraySize; i++) { arrayObj[i] = innerObj; @@ -552,8 +571,12 @@ TEST_F(SmartObjectConvertionTimeTest, test_array_convertion) { calculateConvertionTime(srcObj, dstObj); // Last iteration - printf("\n Array object [%d x %d x %d x %d x %d].\n", arraySize, arraySize, - arraySize, arraySize, arraySize); + printf("\n Array object [%d x %d x %d x %d x %d].\n", + arraySize, + arraySize, + arraySize, + arraySize, + arraySize); innerObj = arrayObj; for (int i = 0; i < arraySize; i++) { arrayObj[i] = innerObj; @@ -611,7 +634,6 @@ TEST_F(SmartObjectConvertionTimeTest, test_object_without_enum_convertion) { printf("\n Object without enum.\n"); calculateConvertionTime(srcObj, dstObj); } - } } } @@ -620,95 +642,144 @@ TEST_F(SmartObjectConvertionTimeTest, test_object_without_enum_convertion) { namespace NsSmartDeviceLink { namespace NsSmartObjects { -template<> -const EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::eType>::EnumToCStringMap EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::eType>::enum_to_cstring_map_ = - EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::eType>::InitEnumToCStringMap(); - -template<> -const EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::eType>::CStringToEnumMap EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::eType>::cstring_to_enum_map_ = - EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::eType>::InitCStringToEnumMap(); - -template<> +template <> +const EnumConversionHelper<test::components::SmartObjects:: + SmartObjectConvertionTimeTest::TestType::eType>:: + EnumToCStringMap EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::eType>::enum_to_cstring_map_ = + EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::eType>::InitEnumToCStringMap(); + +template <> +const EnumConversionHelper<test::components::SmartObjects:: + SmartObjectConvertionTimeTest::TestType::eType>:: + CStringToEnumMap EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::eType>::cstring_to_enum_map_ = + EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::eType>::InitCStringToEnumMap(); + +template <> const char* const EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::eType>::cstring_values_[] = - { "APPLICATION_NOT_REGISTERED", "SUCCESS", "TOO_MANY_PENDING_REQUESTS", - "REJECTED", "INVALID_DATA", "OUT_OF_MEMORY", "ABORTED", - "USER_DISALLOWED", "GENERIC_ERROR", "DISALLOWED" }; - -template<> -const test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::eType EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::eType>::enum_values_[] = - { - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::APPLICATION_NOT_REGISTERED, - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::SUCCESS, - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::TOO_MANY_PENDING_REQUESTS, - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::REJECTED, - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::INVALID_DATA, - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::OUT_OF_MEMORY, - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::ABORTED, - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::USER_DISALLOWED, - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::GENERIC_ERROR, - test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType::DISALLOWED }; - -template<> + test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType:: + eType>::cstring_values_[] = {"APPLICATION_NOT_REGISTERED", + "SUCCESS", + "TOO_MANY_PENDING_REQUESTS", + "REJECTED", + "INVALID_DATA", + "OUT_OF_MEMORY", + "ABORTED", + "USER_DISALLOWED", + "GENERIC_ERROR", + "DISALLOWED"}; + +template <> +const test::components::SmartObjects::SmartObjectConvertionTimeTest::TestType:: + eType EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::eType>::enum_values_[] = { + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::APPLICATION_NOT_REGISTERED, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::SUCCESS, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::TOO_MANY_PENDING_REQUESTS, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::REJECTED, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::INVALID_DATA, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::OUT_OF_MEMORY, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::ABORTED, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::USER_DISALLOWED, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::GENERIC_ERROR, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + TestType::DISALLOWED}; + +template <> const EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::eType>::EnumToCStringMap EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::eType>::enum_to_cstring_map_ = + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::eType>::EnumToCStringMap EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::eType>::InitEnumToCStringMap(); + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::eType>::enum_to_cstring_map_ = + EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::eType>::InitEnumToCStringMap(); -template<> +template <> const EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::eType>::CStringToEnumMap EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::eType>::cstring_to_enum_map_ = + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::eType>::CStringToEnumMap EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::eType>::InitCStringToEnumMap(); + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::eType>::cstring_to_enum_map_ = + EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::eType>::InitCStringToEnumMap(); -template<> +template <> const char* const EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::eType>::cstring_values_[] = - { "RegisterAppInterface", "UnregisterAppInterface", "SetGlobalProperties" }; - -template<> -const test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::eType EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::eType>::enum_values_[] = - { - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::RegisterAppInterface, - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::UnregisterAppInterface, - test::components::SmartObjects::SmartObjectConvertionTimeTest::FunctionIdTest::SetGlobalProperties }; - -template<> + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::eType>::cstring_values_[] = { + "RegisterAppInterface", "UnregisterAppInterface", "SetGlobalProperties"}; + +template <> +const test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::eType EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::eType>::enum_values_[] = { + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::RegisterAppInterface, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::UnregisterAppInterface, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + FunctionIdTest::SetGlobalProperties}; + +template <> const EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::eType>::EnumToCStringMap EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::eType>::enum_to_cstring_map_ = + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::eType>::EnumToCStringMap EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::eType>::InitEnumToCStringMap(); + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::eType>::enum_to_cstring_map_ = + EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::eType>::InitEnumToCStringMap(); -template<> +template <> const EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::eType>::CStringToEnumMap EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::eType>::cstring_to_enum_map_ = + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::eType>::CStringToEnumMap EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::eType>::InitCStringToEnumMap(); + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::eType>::cstring_to_enum_map_ = + EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::eType>::InitCStringToEnumMap(); -template<> +template <> const char* const EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::eType>::cstring_values_[] = - { "request", "response", "notification" }; - -template<> -const test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::eType EnumConversionHelper< - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::eType>::enum_values_[] = - { - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::request, - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::response, - test::components::SmartObjects::SmartObjectConvertionTimeTest::MessageTypeTest::notification }; - + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::eType>::cstring_values_[] = { + "request", "response", "notification"}; + +template <> +const test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::eType EnumConversionHelper< + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::eType>::enum_values_[] = { + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::request, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::response, + test::components::SmartObjects::SmartObjectConvertionTimeTest:: + MessageTypeTest::notification}; } } diff --git a/src/components/smart_objects/test/SmartObjectDraft_test.cc b/src/components/smart_objects/test/SmartObjectDraft_test.cc index 85c97c2625..2932a68167 100644 --- a/src/components/smart_objects/test/SmartObjectDraft_test.cc +++ b/src/components/smart_objects/test/SmartObjectDraft_test.cc @@ -190,7 +190,7 @@ TEST(SmartObjectsDraftTest, test_helper_methods) { // ---- DOUBLE ---- // obj = 3.14; ASSERT_EQ(3.14, obj.asDouble()); - //TEST_COMPONENTS_SMART_OBJECTS_SMARTOBJECTDRAFTTEST_H_ + // TEST_COMPONENTS_SMART_OBJECTS_SMARTOBJECTDRAFTTEST_H_ // ---- CHAR ---- // obj = 'a'; ASSERT_EQ('a', obj.asChar()); @@ -358,7 +358,7 @@ TEST(SmartObjectsDraftTest, compare_map_type) { ASSERT_NE(other_value2, SmartObject()); } // TODO(Ezamakhov): add test for conversion string/int/double -}// namespace SmartObjectDraftTest +} // namespace SmartObjectDraftTest } // namespace SmartObjects } // namespace components } // namespace test diff --git a/src/components/smart_objects/test/SmartObjectStress_test.cc b/src/components/smart_objects/test/SmartObjectStress_test.cc index 4fb7b2efc0..da6e804e2b 100644 --- a/src/components/smart_objects/test/SmartObjectStress_test.cc +++ b/src/components/smart_objects/test/SmartObjectStress_test.cc @@ -59,11 +59,14 @@ class StressTestHelper : public ::testing::Test { std::string to_string(const double value) const { // Content is the same as in SmartObject::convert_double_to_string std::stringstream ss; - ss << std::fixed << std::setprecision(10) << value; //convert double to string w fixed notation, hi precision - std::string s = ss.str(); //output to std::string - s.erase(s.find_last_not_of('0') + 1, std::string::npos); //remove trailing 000s (123.1200 => 123.12, 123.000 => 123.) + ss << std::fixed << std::setprecision(10) + << value; // convert double to string w fixed notation, hi precision + std::string s = ss.str(); // output to std::string + s.erase(s.find_last_not_of('0') + 1, + std::string::npos); // remove trailing 000s (123.1200 => 123.12, + // 123.000 => 123.) if (s[s.size() - 1] == '.') { - s.erase(s.end() - 1); //remove dangling decimal (123. => 123) + s.erase(s.end() - 1); // remove dangling decimal (123. => 123) } return s; } @@ -82,8 +85,8 @@ class StressTestHelper : public ::testing::Test { typedef std::map<std::string, std::string> VerificationMap; VerificationMap mVerifyMap; - std::vector<std::string> split(const std::string &s, char delim) const { - std::vector < std::string > elems; + std::vector<std::string> split(const std::string& s, char delim) const { + std::vector<std::string> elems; std::stringstream ss(s); std::string item; @@ -94,62 +97,63 @@ class StressTestHelper : public ::testing::Test { return elems; } - std::string generate_key(const char *pPrefix, const int index) const { + std::string generate_key(const char* pPrefix, const int index) const { char buff[32]; sprintf(buff, "%s%d", pPrefix, index); return std::string(buff); } - void makeRandomObject(SmartObject &obj, const int size, + void makeRandomObject(SmartObject& obj, + const int size, std::string key_path) { int type_id = rand() % 8; switch (type_id) { - case 0: // int + case 0: // int { int iVal = rand(); obj = iVal; mVerifyMap[key_path] = to_string(iVal); - //std::cout << "Created int, value: " << iVal << std::endl; + // std::cout << "Created int, value: " << iVal << std::endl; break; } - case 1: // bool + case 1: // bool { bool bVal = static_cast<bool>(rand() % 2); obj = bVal; mVerifyMap[key_path] = to_string(bVal); - //std::cout << "Created bool, value: " << to_string(bVal) << std::endl; + // std::cout << "Created bool, value: " << to_string(bVal) << std::endl; break; } - case 2: // double + case 2: // double { double dVal = 100.0 / (rand() % 200); obj = dVal; mVerifyMap[key_path] = to_string(dVal); - //std::cout << "Created double, value: " << dVal << std::endl; + // std::cout << "Created double, value: " << dVal << std::endl; break; } - case 3: // char + case 3: // char { char cVal = get_random_char(); obj = cVal; mVerifyMap[key_path] = to_string(cVal); - //std::cout << "Created char, value: " << cVal << std::endl; + // std::cout << "Created char, value: " << cVal << std::endl; break; } - case 4: // string + case 4: // string { std::string strVal(rand() % 200, get_random_char()); - obj = strVal; // string with random char filled random size + obj = strVal; // string with random char filled random size mVerifyMap[key_path] = strVal; - //std::cout << "Created string, value: " << strVal << std::endl; + // std::cout << "Created string, value: " << strVal << std::endl; break; } - case 5: // map + case 5: // map if (size <= 0) break; - //std::cout << "Creating a map with size: " << size << std::endl; + // std::cout << "Creating a map with size: " << size << std::endl; mVerifyMap[key_path] = "map"; for (int i = 0; i < size; i++) { std::string key = generate_key("M", i); @@ -157,23 +161,25 @@ class StressTestHelper : public ::testing::Test { obj[key] = key; #else obj[key] = SmartObject(); - makeRandomObject(obj[key], size - 1, key_path + key + ' '); // recursion -#endif // MAP_WORKAROUND + makeRandomObject( + obj[key], size - 1, key_path + key + ' '); // recursion +#endif // MAP_WORKAROUND } break; - case 6: // array + case 6: // array if (size <= 0) break; - //std::cout << "Creating an array with size: " << size << std::endl; + // std::cout << "Creating an array with size: " << size << std::endl; mVerifyMap[key_path] = "array"; for (int i = 0; i < size; i++) { - obj[i] = SmartObject(); // just init it as an array - makeRandomObject(obj[i], size - 1, + obj[i] = SmartObject(); // just init it as an array + makeRandomObject(obj[i], + size - 1, key_path + generate_key("A", i) + ' '); // recursion } break; - case 7: // binary + case 7: // binary int dataSize = rand() % 200; char randomChar = get_random_char(); std::string strDataVal(dataSize, randomChar); @@ -183,37 +189,38 @@ class StressTestHelper : public ::testing::Test { NsSmartDeviceLink::NsSmartObjects::SmartBinary binaryVal(dataSize, randomChar); - obj = binaryVal; // string with binary data filled with random chars + obj = binaryVal; // string with binary data filled with random chars mVerifyMap[key_path] = strVal; - //std::cout << "Created string, value: " << strVal << std::endl; + // std::cout << "Created string, value: " << strVal << std::endl; break; } } - SmartObject get_object(SmartObject &rootObj, const std::string &path) const { - std::vector < std::string > obj_tokens; + SmartObject get_object(SmartObject& rootObj, const std::string& path) const { + std::vector<std::string> obj_tokens; SmartObject lastObj = rootObj; obj_tokens = split(path, ' '); for (size_t i = 0; i < obj_tokens.size(); i++) { - if (obj_tokens[i][0] == 'A') // array - { - int index = atoi(&(obj_tokens[i].c_str()[1])); // get integer skipping first char + if (obj_tokens[i][0] == 'A') // array + { + int index = atoi( + &(obj_tokens[i].c_str()[1])); // get integer skipping first char #ifdef COPY_SUB_OBJECTS_WORKAROUND - lastObj = SmartObject(lastObj[index]); + lastObj = SmartObject(lastObj[index]); #else - lastObj = lastObj[index]; // go to the child object + lastObj = lastObj[index]; // go to the child object #endif - } else if (obj_tokens[i][0] == 'M') // map - { + } else if (obj_tokens[i][0] == 'M') // map + { #ifdef COPY_SUB_OBJECTS_WORKAROUND lastObj = SmartObject(lastObj[obj_tokens[i]]); #else - lastObj = lastObj[obj_tokens[i]]; // go to the child object + lastObj = lastObj[obj_tokens[i]]; // go to the child object #endif } else { - //FAIL(); + // FAIL(); EXPECT_TRUE(false); } } @@ -222,11 +229,14 @@ class StressTestHelper : public ::testing::Test { }; /* - * The test creates the initial SmartObject and use it as an array for the next SmartObjects. + * The test creates the initial SmartObject and use it as an array for the next + * SmartObjects. * Each next SmartObject is randomly assigned to some type. - * If one of the object happens to be a container it fills it with SmartObject of random type. The amount of these + * If one of the object happens to be a container it fills it with SmartObject + * of random type. The amount of these * objects is the size of the parent container -1. - * The iteration continues until all nodes are simple SmartObjects (not arrays or maps) + * The iteration continues until all nodes are simple SmartObjects (not arrays + * or maps) */ TEST_F(StressTestHelper, StressTest) { SmartObject objects; @@ -242,7 +252,8 @@ TEST_F(StressTestHelper, StressTest) { } for (VerificationMap::const_iterator it = mVerifyMap.begin(); - it != mVerifyMap.end(); it++) { + it != mVerifyMap.end(); + it++) { std::string value(it->second); SmartObject obj = get_object(objects, it->first); @@ -264,8 +275,8 @@ TEST_F(StressTestHelper, StressTest) { ASSERT_EQ(NsSmartDeviceLink::NsSmartObjects::SmartType_Binary, obj.getType()); - NsSmartDeviceLink::NsSmartObjects::SmartBinary binaryData = obj - .asBinary(); + NsSmartDeviceLink::NsSmartObjects::SmartBinary binaryData = + obj.asBinary(); ASSERT_EQ(etalonData.size(), binaryData.size()); for (size_t i = 0; i < etalonData.size(); ++i) { @@ -280,25 +291,27 @@ TEST_F(StressTestHelper, StressTest) { } #ifdef NO_INCLUSIVE_MAPS - if (!value.compare("map")) - { + if (!value.compare("map")) { std::vector<std::string> path = split(it->first, ' '); - std::string map_value = path[path.size()-1]; + std::string map_value = path[path.size() - 1]; ASSERT_EQ(map_value, static_cast<std::string>(obj)); continue; } #endif if (value.compare("map") && value.compare("array")) { - //std::cout << "Verification key: " << it->first << " Value: " << value << std::endl; - //std::cout << "Object Value: " << static_cast<std::string>(obj) << std::endl; + // std::cout << "Verification key: " << it->first << " Value: " << value + // << std::endl; + // std::cout << "Object Value: " << static_cast<std::string>(obj) << + // std::endl; if (!value.compare("true")) { ASSERT_TRUE(obj.asBool()); } else if (!value.compare("false")) { ASSERT_FALSE(obj.asBool()); } else { - ASSERT_EQ(value, obj.asString())<< "Object value is not correct. Object path: " << it->first; + ASSERT_EQ(value, obj.asString()) + << "Object value is not correct. Object path: " << it->first; } } } @@ -314,22 +327,22 @@ TEST_F(StressTestHelper, ExtraManualDebugTest) { obj[4] = true; obj[5] = 3.704; obj[6] = SmartObject(); - obj[6][0] = - std::string( - "ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt"); + obj[6][0] = std::string( + "tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt" + "ttttttttttttttttt"); obj[6][1] = 'K'; obj[6][2] = 0.735294; obj[6][3] = 'I'; obj[6][4] = SmartObject(); obj[6][4]["M0"] = 0.59432; - SmartObject & refObj = obj[6][4]; + SmartObject& refObj = obj[6][4]; refObj["M1"]["M0"]["M0"][0] = true; - // FIXME: Figure out why there's a trailing zero while converting from double to string + // FIXME: Figure out why there's a trailing zero while converting from double + // to string ASSERT_EQ("0.59432", get_object(obj, "A6 A4 M0").asString()); ASSERT_TRUE(get_object(obj, "A6 A4 M1 M0 M0 A0").asBool()); } - } } } diff --git a/src/components/smart_objects/test/SmartObjectUnit_test.cc b/src/components/smart_objects/test/SmartObjectUnit_test.cc index d1d790f9d4..cd5cd0c131 100644 --- a/src/components/smart_objects/test/SmartObjectUnit_test.cc +++ b/src/components/smart_objects/test/SmartObjectUnit_test.cc @@ -42,7 +42,6 @@ using namespace NsSmartDeviceLink::NsSmartObjects; class TestHelper : public ::testing::Test { protected: - void makeMapObject(SmartObject& obj, const int size) const { char i_key[8], j_key[8], k_key[8], value[8]; @@ -68,51 +67,54 @@ class TestHelper : public ::testing::Test { sprintf(k_key, "k_%d", k); sprintf(value, "%d", i + j + k); - ASSERT_EQ(std::string(value), obj[i_key][j_key][k_key].asString())<< - "Wrong value in the map at [" << i_key << "][" << j_key << "][" << k_key << "]"; + ASSERT_EQ(std::string(value), obj[i_key][j_key][k_key].asString()) + << "Wrong value in the map at [" << i_key << "][" << j_key << "][" + << k_key << "]"; } - } + } - void makeArrayObject(SmartObject& obj, int size, int base = 0) { - for (int i = 0; i < size; i++) - for (int j = 0; j < size; j++) + void makeArrayObject(SmartObject& obj, int size, int base = 0) { + for (int i = 0; i < size; i++) + for (int j = 0; j < size; j++) for (int k = 0; k < size; k++) { obj[i][j][k] = base + i + j + k; } - } + } - void checkArrayObject(SmartObject& obj, int size, int base = 0) { - for (int i = 0; i < size; i++) - for (int j = 0; j < size; j++) + void checkArrayObject(SmartObject& obj, int size, int base = 0) { + for (int i = 0; i < size; i++) + for (int j = 0; j < size; j++) for (int k = 0; k < size; k++) { - ASSERT_EQ(base + i + j + k, obj[i][j][k].asInt()) << - "Wrong value in the array at index: " << i << ", " << j << ", " << k; + ASSERT_EQ(base + i + j + k, obj[i][j][k].asInt()) + << "Wrong value in the array at index: " << i << ", " << j << ", " + << k; } - } - }; + } +}; - /* - * Tests different types sequentially - */ +/* + * Tests different types sequentially + */ TEST(BasicMixtedTypes, test_SmartObjectUnitTest) { SmartObject obj; - ASSERT_EQ(invalid_int_value, obj.asInt())<< "Wrong cast to int just after construction"; + ASSERT_EQ(invalid_int_value, obj.asInt()) + << "Wrong cast to int just after construction"; obj = 10; - ASSERT_EQ(10, obj.asInt())<< "Wrong cast to int"; + ASSERT_EQ(10, obj.asInt()) << "Wrong cast to int"; obj = "some string"; - ASSERT_EQ("some string", obj.asString())<< "Wrong cast to std::string"; + ASSERT_EQ("some string", obj.asString()) << "Wrong cast to std::string"; obj = false; - ASSERT_FALSE(obj.asBool())<< "Wrong cast to bool"; + ASSERT_FALSE(obj.asBool()) << "Wrong cast to bool"; obj = 'A'; - ASSERT_EQ('A', obj.asChar())<< "Wrong cast to char"; + ASSERT_EQ('A', obj.asChar()) << "Wrong cast to char"; obj = 3.14; - ASSERT_EQ(3.14, obj.asDouble())<< "Wrong cast to double"; + ASSERT_EQ(3.14, obj.asDouble()) << "Wrong cast to double"; // array test for (int i = 0; i < 100; i++) { @@ -132,23 +134,23 @@ TEST(BasicMixtedTypes, test_SmartObjectUnitTest) { TEST_F(TestHelper, BasicArrayTest) { SmartObject obj; - ASSERT_EQ(invalid_int_value, - obj[0].asInt())<< "Wrong value at accessing non existent index"; - ASSERT_EQ(invalid_int_value, - obj["non_existent_key"].asInt())<< "Wrong value at accessing non existent key"; + ASSERT_EQ(invalid_int_value, obj[0].asInt()) + << "Wrong value at accessing non existent index"; + ASSERT_EQ(invalid_int_value, obj["non_existent_key"].asInt()) + << "Wrong value at accessing non existent key"; obj[0] = 1; - ASSERT_EQ(1, obj[0].asInt())<< "Wrong value at 0 index"; + ASSERT_EQ(1, obj[0].asInt()) << "Wrong value at 0 index"; obj[1] = 2; - ASSERT_EQ(2, obj[1].asInt())<< "Wrong value at 1 index"; + ASSERT_EQ(2, obj[1].asInt()) << "Wrong value at 1 index"; obj[0][0] = 3; obj[1][0] = 1; - ASSERT_EQ(3, obj[0][0].asInt())<< "Wrong value at index 0, 0"; + ASSERT_EQ(3, obj[0][0].asInt()) << "Wrong value at index 0, 0"; obj[0][0][0] = 4; obj[0][1][0] = 5; - ASSERT_EQ(4, obj[0][0][0].asInt())<< "Wrong value at index 0, 0, 0"; + ASSERT_EQ(4, obj[0][0][0].asInt()) << "Wrong value at index 0, 0, 0"; const int size = 32; makeArrayObject(obj, size); @@ -159,16 +161,17 @@ TEST_F(TestHelper, BasicArrayTest) { TEST_F(TestHelper, BasicMapTest) { SmartObject obj; - ASSERT_EQ(invalid_int_value, - obj["non_existent_key"].asInt())<< "Wrong value for non existent key"; + ASSERT_EQ(invalid_int_value, obj["non_existent_key"].asInt()) + << "Wrong value for non existent key"; obj["abc"]["def"]["ghi"] = 5; - ASSERT_EQ(5, obj["abc"]["def"]["ghi"].asInt())<< "Wrong value for triple map"; + ASSERT_EQ(5, obj["abc"]["def"]["ghi"].asInt()) + << "Wrong value for triple map"; obj["123"]["456"]["789"] = "string test"; - ASSERT_EQ("string test", obj["123"]["456"]["789"].asString())<< - "Wrong value for triple map"; + ASSERT_EQ("string test", obj["123"]["456"]["789"].asString()) + << "Wrong value for triple map"; const int size = 32; @@ -179,33 +182,36 @@ TEST_F(TestHelper, BasicMapTest) { TEST(ConstructorsTest, test_SmartObjectUnitTest) { SmartObject objInt(5678); - ASSERT_EQ(5678, objInt.asInt())<< "Wrong constructor with int param"; + ASSERT_EQ(5678, objInt.asInt()) << "Wrong constructor with int param"; const char* c_str = "test c_string"; SmartObject obj_c_str(c_str); - ASSERT_EQ("test c_string", obj_c_str.asString())<< "Wrong constructor with c_str param"; + ASSERT_EQ("test c_string", obj_c_str.asString()) + << "Wrong constructor with c_str param"; SmartObject obj_std_str(std::string("test std_string")); ASSERT_EQ(std::string("test std_string"), obj_std_str.asString()); SmartObject obj_char('R'); - ASSERT_EQ('R', obj_char.asChar())<< "Wrong constructor with char param"; + ASSERT_EQ('R', obj_char.asChar()) << "Wrong constructor with char param"; SmartObject obj_double(-0.4321); - ASSERT_EQ(-0.4321, obj_double.asDouble())<< "Wrong constructor with double param"; + ASSERT_EQ(-0.4321, obj_double.asDouble()) + << "Wrong constructor with double param"; SmartObject obj_bool(true); - ASSERT_TRUE(obj_bool.asBool())<< "Wrong constructor with bool param"; + ASSERT_TRUE(obj_bool.asBool()) << "Wrong constructor with bool param"; SmartObject src_obj; - src_obj["key_1"] = "value_1"; // FIXME: String assignment crashes test + src_obj["key_1"] = "value_1"; // FIXME: String assignment crashes test src_obj["key_2"]["sub_key_1"] = "value_2"; SmartObject dst_obj(src_obj); - ASSERT_EQ("value_1", dst_obj["key_1"].asString())<< "Copy constructor is not correct"; - ASSERT_EQ("value_2", dst_obj["key_2"]["sub_key_1"].asString())<< - "Copy constructor is not correct"; + ASSERT_EQ("value_1", dst_obj["key_1"].asString()) + << "Copy constructor is not correct"; + ASSERT_EQ("value_2", dst_obj["key_2"]["sub_key_1"].asString()) + << "Copy constructor is not correct"; } TEST(FromString, TypeConversion) { @@ -379,7 +385,7 @@ TEST(FromDouble, TypeConversion) { SmartObject obj; obj = 0.1; - ASSERT_EQ("0.1", obj.asString()); // FIXME: result 0.100000 + ASSERT_EQ("0.1", obj.asString()); // FIXME: result 0.100000 ASSERT_EQ(0, obj.asInt()); ASSERT_EQ(invalid_char_value, obj.asChar()); ASSERT_EQ(0.1, obj.asDouble()); @@ -438,23 +444,23 @@ TEST_F(TestHelper, AssignmentTest) { objSrc = -6; objDst = 7; objDst = objSrc; - ASSERT_EQ(-6, objDst.asInt())<< "Wrong assignment for int object"; + ASSERT_EQ(-6, objDst.asInt()) << "Wrong assignment for int object"; objSrc = "Some test string"; objDst = "Other string"; objDst = objSrc; - ASSERT_EQ("Some test string", - objDst.asString())<< "Wrong assignment for std::string object"; + ASSERT_EQ("Some test string", objDst.asString()) + << "Wrong assignment for std::string object"; objSrc = 0.5; objDst = 4; objDst = objSrc; - ASSERT_EQ(0.5, objDst.asDouble())<< "Wrong assignment for double object"; + ASSERT_EQ(0.5, objDst.asDouble()) << "Wrong assignment for double object"; objSrc = true; objDst = false; objDst = objSrc; - ASSERT_TRUE(objDst.asBool())<< "Wrong assignment for bool object"; + ASSERT_TRUE(objDst.asBool()) << "Wrong assignment for bool object"; const int size = 32; makeMapObject(objSrc, size); @@ -471,30 +477,30 @@ TEST_F(TestHelper, AssignmentTest) { TEST_F(TestHelper, SizeTest) { SmartObject obj; - ASSERT_EQ(0u, obj.length())<< "Wrong size for the uninitialized object"; + ASSERT_EQ(0u, obj.length()) << "Wrong size for the uninitialized object"; obj = 1234; - ASSERT_EQ(0u, obj.length())<< "Wrong size for the int object"; + ASSERT_EQ(0u, obj.length()) << "Wrong size for the int object"; std::string str("Some test very long string"); obj = str; - ASSERT_EQ(str.size(), obj.length())<< - "The size of the object containing string is not correct"; + ASSERT_EQ(str.size(), obj.length()) + << "The size of the object containing string is not correct"; obj = true; - ASSERT_EQ(0u, obj.length())<< "Wrong size of the true"; + ASSERT_EQ(0u, obj.length()) << "Wrong size of the true"; obj = 0.1234; - ASSERT_EQ(0u, obj.length())<< "Wrong size of the double"; + ASSERT_EQ(0u, obj.length()) << "Wrong size of the double"; obj = 'A'; - ASSERT_EQ(0u, obj.length())<< "Wrong size of the char"; + ASSERT_EQ(0u, obj.length()) << "Wrong size of the char"; makeMapObject(obj, 12); - ASSERT_EQ(12u, obj.length())<< "Wrong size of the object containing map"; + ASSERT_EQ(12u, obj.length()) << "Wrong size of the object containing map"; makeArrayObject(obj, 21); - ASSERT_EQ(21u, obj.length())<< "Wrong size of the object containing array"; + ASSERT_EQ(21u, obj.length()) << "Wrong size of the object containing array"; } TEST(CopyObjectsTest, SmartObjectTest) { @@ -537,7 +543,8 @@ TEST(MapEraseTest, SmartObjectTest) { ASSERT_EQ(2u, srcObj.length()); ASSERT_EQ(-1, srcObj["two"].asInt()); - // The element "two" was accessed in the previous line so the element has been created + // The element "two" was accessed in the previous line so the element has been + // created ASSERT_EQ(3u, srcObj.length()); srcObj["two"] = 2; @@ -574,11 +581,11 @@ TEST(MapEraseTest, SmartObjectTest) { ASSERT_TRUE(srcObj["one"].erase("two")); ASSERT_EQ(0u, srcObj["one"].length()); - srcObj = 1234; // not a map + srcObj = 1234; // not a map ASSERT_FALSE(srcObj.erase("one")); } // TODO: Add a test to check accessing an array at strange indexes. -}// namespace SmartObjectUnitTest +} // namespace SmartObjectUnitTest } // namespace SmartObjects } // namespace components } // namespace test diff --git a/src/components/smart_objects/test/StringSchemaItem_test.cc b/src/components/smart_objects/test/StringSchemaItem_test.cc index 5fe179a7e1..c5c2b4dee0 100644 --- a/src/components/smart_objects/test/StringSchemaItem_test.cc +++ b/src/components/smart_objects/test/StringSchemaItem_test.cc @@ -45,16 +45,18 @@ namespace SchemaItem { /** * Test StringSchemaItem no default value * - * Create SchemaItem without default value. Method setDefaultValue should always return false + * Create SchemaItem without default value. Method setDefaultValue should always + *return false * and leave SmartObject in previous state. **/ TEST(test_no_default_value, test_StringSchemaItemTest) { using namespace NsSmartDeviceLink::NsSmartObjects; SmartObject obj; - ISchemaItemPtr item = CStringSchemaItem::create(); // No default value, no max length + ISchemaItemPtr item = + CStringSchemaItem::create(); // No default value, no max length - //Object - valid string + // Object - valid string obj = "New valid string"; ASSERT_EQ(std::string("New valid string"), obj.asString()); @@ -64,7 +66,7 @@ TEST(test_no_default_value, test_StringSchemaItemTest) { EXPECT_FALSE(resDefault); EXPECT_EQ(std::string("New valid string"), obj.asString()); - //Obj - bool + // Obj - bool obj = true; resultType = item->validate(obj); @@ -73,7 +75,7 @@ TEST(test_no_default_value, test_StringSchemaItemTest) { EXPECT_FALSE(resDefault); EXPECT_TRUE(obj.asBool()); - //Object - number + // Object - number obj = 3.1415926; resultType = item->validate(obj); @@ -89,19 +91,23 @@ TEST(test_no_default_value, test_StringSchemaItemTest) { /** * Test StringSchemaItem with default value * - * Create SchemaItem with default value. Method setDefaultValue should return true, + * Create SchemaItem with default value. Method setDefaultValue should return + *true, * String SmartObject should contain default value. - * Not string SmartObject should converted to StringObject and setted up by the default value. + * Not string SmartObject should converted to StringObject and setted up by the + *default value. **/ TEST(test_item_with_default_value, test_StringSchemaItemTest) { using namespace NsSmartDeviceLink::NsSmartObjects; SmartObject obj; ISchemaItemPtr item = CStringSchemaItem::create( - TSchemaItemParameter<size_t>(), TSchemaItemParameter<size_t>(), - TSchemaItemParameter<std::string>("Default string")); // Default value, no max length + TSchemaItemParameter<size_t>(), + TSchemaItemParameter<size_t>(), + TSchemaItemParameter<std::string>( + "Default string")); // Default value, no max length - //Object - valid string + // Object - valid string obj = "New valid string"; ASSERT_EQ(std::string("New valid string"), obj.asString()); @@ -111,7 +117,7 @@ TEST(test_item_with_default_value, test_StringSchemaItemTest) { EXPECT_TRUE(resDefault); EXPECT_EQ(std::string("Default string"), obj.asString()); - //Obj - bool + // Obj - bool obj = true; resultType = item->validate(obj); @@ -120,7 +126,7 @@ TEST(test_item_with_default_value, test_StringSchemaItemTest) { EXPECT_TRUE(resDefault); EXPECT_EQ(std::string("Default string"), obj.asString()); - //Object - number + // Object - number obj = 3.1415926; resultType = item->validate(obj); @@ -141,10 +147,11 @@ TEST(test_item_with_max_length, test_StringSchemaItemTest) { SmartObject obj; ISchemaItemPtr item = CStringSchemaItem::create( - TSchemaItemParameter<size_t>(0), TSchemaItemParameter<size_t>(25), + TSchemaItemParameter<size_t>(0), + TSchemaItemParameter<size_t>(25), TSchemaItemParameter<std::string>("Default string")); - //Object - valid string + // Object - valid string obj = "New valid string"; ASSERT_EQ(std::string("New valid string"), obj.asString()); @@ -154,7 +161,7 @@ TEST(test_item_with_max_length, test_StringSchemaItemTest) { EXPECT_TRUE(resDefault); EXPECT_EQ(std::string("Default string"), obj.asString()); - //Object - too long string + // Object - too long string obj = "New very very loooooong string"; ASSERT_EQ(std::string("New very very loooooong string"), obj.asString()); @@ -173,7 +180,8 @@ TEST(test_map_validate, test_StringSchemaItemTest) { SmartObject obj; ISchemaItemPtr item = CStringSchemaItem::create( - TSchemaItemParameter<size_t>(0), TSchemaItemParameter<size_t>(25), + TSchemaItemParameter<size_t>(0), + TSchemaItemParameter<size_t>(25), TSchemaItemParameter<std::string>("Default string")); obj["str"] = "New valid string"; @@ -233,7 +241,8 @@ TEST(test_array_validate, test_StringSchemaItemTest) { SmartObject obj; ISchemaItemPtr item = CStringSchemaItem::create( - TSchemaItemParameter<size_t>(0), TSchemaItemParameter<size_t>(25), + TSchemaItemParameter<size_t>(0), + TSchemaItemParameter<size_t>(25), TSchemaItemParameter<std::string>("Default string")); obj[0] = "New valid string"; @@ -267,7 +276,7 @@ TEST(test_array_validate, test_StringSchemaItemTest) { resDefault = item->setDefaultValue(obj[4]); EXPECT_TRUE(resDefault); - //Set default value for non-initialized element + // Set default value for non-initialized element resDefault = item->setDefaultValue(obj[5]); EXPECT_TRUE(resDefault); diff --git a/src/components/smart_objects/test/map_performance_test.cc b/src/components/smart_objects/test/map_performance_test.cc index e7e9ccffac..35863da420 100644 --- a/src/components/smart_objects/test/map_performance_test.cc +++ b/src/components/smart_objects/test/map_performance_test.cc @@ -41,7 +41,7 @@ typedef std::vector<std::string> Value; typedef std::map<Key, Value> Map; namespace { -void MakeMapObject(Map &obj, const int size) { +void MakeMapObject(Map& obj, const int size) { char i_key[8], j_key[8]; Value array; 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 72b6c1fa6d..e699da54fe 100644 --- a/src/components/smart_objects/test/smart_object_performance_test.cc +++ b/src/components/smart_objects/test/smart_object_performance_test.cc @@ -40,7 +40,7 @@ using namespace NsSmartDeviceLink::NsSmartObjects; namespace { -void MakeMapObject(SmartObject &obj, const int size) { +void MakeMapObject(SmartObject& obj, const int size) { char i_key[8], j_key[8]; SmartObject array; @@ -60,7 +60,7 @@ TEST(SmartObjectPerformanceTest, SmartObjectPerformance) { SmartObject object; MakeMapObject(object, 100); - std::set < std::string > keys = object.enumerate(); + std::set<std::string> keys = object.enumerate(); for (std::set<std::string>::iterator i = keys.begin(); i != keys.end(); ++i) { printf("%s - ", i->c_str()); SmartArray* array = object[*i].asArray(); |