diff options
Diffstat (limited to 'src/components/formatters/test/include')
3 files changed, 17 insertions, 17 deletions
diff --git a/src/components/formatters/test/include/formatters/SmartFactoryTestHelper.h b/src/components/formatters/test/include/formatters/SmartFactoryTestHelper.h index 8f5ee96ce5..4b1ca94b98 100644 --- a/src/components/formatters/test/include/formatters/SmartFactoryTestHelper.h +++ b/src/components/formatters/test/include/formatters/SmartFactoryTestHelper.h @@ -52,9 +52,9 @@ namespace test { namespace components { namespace formatters { -using namespace NsSmartDeviceLink::NsSmartObjects; -using namespace NsSmartDeviceLink::NsJSONHandler; -using namespace NsSmartDeviceLink::NsJSONHandler::strings; +using namespace ns_smart_device_link::ns_smart_objects; +using namespace ns_smart_device_link::ns_json_handler; +using namespace ns_smart_device_link::ns_json_handler::strings; using namespace hmi_apis; namespace TestType { @@ -107,9 +107,9 @@ class CSmartFactoryTest : public CSmartFactory<FunctionIdTest::eType, protected: typedef std::map<const StructIdentifiersTest::eType, - utils::SharedPtr<ISchemaItem> > TStructsSchemaItems; + std::shared_ptr<ISchemaItem> > TStructsSchemaItems; - static utils::SharedPtr<ISchemaItem> ProvideObjectSchemaItemForStruct( + static std::shared_ptr<ISchemaItem> ProvideObjectSchemaItemForStruct( TStructsSchemaItems& struct_schema_items, const StructIdentifiersTest::eType struct_id); @@ -147,10 +147,10 @@ class CSmartFactoryTest : public CSmartFactory<FunctionIdTest::eType, const std::set<FunctionIdTest::eType>& function_id_items, const std::set<MessageTypeTest::eType>& message_type_items); - static utils::SharedPtr<ISchemaItem> InitStructSchemaItem_Common_1( + static std::shared_ptr<ISchemaItem> InitStructSchemaItem_Common_1( TStructsSchemaItems& struct_schema_items); - static utils::SharedPtr<ISchemaItem> InitStructSchemaItem_Common_2(); + static std::shared_ptr<ISchemaItem> InitStructSchemaItem_Common_2(); }; } // namespace formatters diff --git a/src/components/formatters/test/include/formatters/create_smartSchema.h b/src/components/formatters/test/include/formatters/create_smartSchema.h index 4d7a217317..73ff9ba77b 100644 --- a/src/components/formatters/test/include/formatters/create_smartSchema.h +++ b/src/components/formatters/test/include/formatters/create_smartSchema.h @@ -40,9 +40,9 @@ namespace test { namespace components { namespace formatters { -using namespace NsSmartDeviceLink::NsJSONHandler::strings; -using namespace NsSmartDeviceLink::NsJSONHandler::Formatters; -using namespace NsSmartDeviceLink::NsSmartObjects; +using namespace ns_smart_device_link::ns_json_handler::strings; +using namespace ns_smart_device_link::ns_json_handler::formatters; +using namespace ns_smart_device_link::ns_smart_objects; namespace FunctionIDTest { enum eType { diff --git a/src/components/formatters/test/include/formatters/meta_formatter_test_helper.h b/src/components/formatters/test/include/formatters/meta_formatter_test_helper.h index a58f69e386..0ee21d092c 100644 --- a/src/components/formatters/test/include/formatters/meta_formatter_test_helper.h +++ b/src/components/formatters/test/include/formatters/meta_formatter_test_helper.h @@ -51,24 +51,24 @@ class CMetaFormatterTestHelper : public ::testing::Test { virtual void TearDown(); void AnyObjectToJsonString( - const NsSmartDeviceLink::NsSmartObjects::SmartObject& obj, + const ns_smart_device_link::ns_smart_objects::SmartObject& obj, std::string& result_string); void FillObjectIdenticalToSchema( - NsSmartDeviceLink::NsSmartObjects::SmartObject& obj); + ns_smart_device_link::ns_smart_objects::SmartObject& obj); void FillObjectIdenticalToSchemaWithoutNoMandatoriesParams( - NsSmartDeviceLink::NsSmartObjects::SmartObject& obj); + ns_smart_device_link::ns_smart_objects::SmartObject& obj); void CompareObjects( - const NsSmartDeviceLink::NsSmartObjects::SmartObject& first, - const NsSmartDeviceLink::NsSmartObjects::SmartObject& second); + const ns_smart_device_link::ns_smart_objects::SmartObject& first, + const ns_smart_device_link::ns_smart_objects::SmartObject& second); void FillObjectWithDefaultValues( - NsSmartDeviceLink::NsSmartObjects::SmartObject& obj); + ns_smart_device_link::ns_smart_objects::SmartObject& obj); void FillObjectWithoutSomeMandatoryFields( - NsSmartDeviceLink::NsSmartObjects::SmartObject& obj); + ns_smart_device_link::ns_smart_objects::SmartObject& obj); // Members std::set<FunctionIDTest::eType> function_id_items_; |