3 files changed, 37 insertions, 57 deletions
diff --git a/src/components/formatters/test/include/SmartFactoryTestHelper.h b/src/components/formatters/test/include/formatters/SmartFactoryTestHelper.h
index ca7021b844..d195fe1833 100644
--- a/src/components/formatters/test/include/SmartFactoryTestHelper.h
+++ b/src/components/formatters/test/include/formatters/SmartFactoryTestHelper.h
@@ -36,7 +36,7 @@
 #include <map>
 #include <set>
 
-#include "formatters/CSmartFactory.hpp"
+#include "formatters/CSmartFactory.h"
 #include "HMI_API_schema.h"
 #include "smart_objects/always_true_schema_item.h"
 #include "smart_objects/always_false_schema_item.h"
@@ -74,12 +74,7 @@ enum eType {
 }  // namespace TestType
 
 namespace FunctionIdTest {
-enum eType {
-  INVALID_ENUM = -1,
-  Function1,
-  Function2,
-  Function3
-};
+enum eType { INVALID_ENUM = -1, Function1, Function2, Function3 };
 }  // namespace FunctionIdTest
 
 namespace MessageTypeTest {
@@ -93,69 +88,67 @@ enum eType {
 }  // namespace MessageTypeTest
 
 namespace StructIdentifiersTest {
-enum eType {
-  INVALID_ENUM = -1,
-  Common_1,
-  Common_2,
-  Common_3
-};
+enum eType { INVALID_ENUM = -1, Common_1, Common_2, Common_3 };
 }  // namespace StructIdentifiersTest
 
 class CSmartFactoryTest : public CSmartFactory<FunctionIdTest::eType,
-    MessageTypeTest::eType, StructIdentifiersTest::eType> {
+                                               MessageTypeTest::eType,
+                                               StructIdentifiersTest::eType> {
  public:
   CSmartFactoryTest();
   std::map<SmartSchemaKey<FunctionIdTest::eType, MessageTypeTest::eType>,
-      CSmartSchema> function_schemes() {
+           CSmartSchema>
+  function_schemes() {
     return functions_schemes_;
   }
   std::map<StructIdentifiersTest::eType, CSmartSchema> structs_schemes() {
     return structs_schemes_;
   }
+
  protected:
   typedef std::map<const StructIdentifiersTest::eType,
-      utils::SharedPtr<ISchemaItem> > TStructsSchemaItems;
+                   utils::SharedPtr<ISchemaItem> > TStructsSchemaItems;
 
   static utils::SharedPtr<ISchemaItem> ProvideObjectSchemaItemForStruct(
-      TStructsSchemaItems &struct_schema_items,
+      TStructsSchemaItems& struct_schema_items,
       const StructIdentifiersTest::eType struct_id);
 
-  void InitStructSchemes(TStructsSchemaItems &struct_schema_items);
+  void InitStructSchemes(TStructsSchemaItems& struct_schema_items);
 
   void InitFunctionSchemes(
-      const TStructsSchemaItems &struct_schema_items,
-      const std::set<FunctionIdTest::eType> &function_id_items,
-      const std::set<MessageTypeTest::eType> &message_type_items);
+      const TStructsSchemaItems& struct_schema_items,
+      const std::set<FunctionIdTest::eType>& function_id_items,
+      const std::set<MessageTypeTest::eType>& message_type_items);
 
   static CSmartSchema InitFunction_Function1_request(
-      const std::set<FunctionIdTest::eType> &function_id_items,
-      const std::set<MessageTypeTest::eType> &message_type_items);
+      const std::set<FunctionIdTest::eType>& function_id_items,
+      const std::set<MessageTypeTest::eType>& message_type_items);
 
   static CSmartSchema InitFunction_Function1_response(
-      const TStructsSchemaItems &struct_schema_items,
-      const std::set<FunctionIdTest::eType> &function_id_items,
-      const std::set<MessageTypeTest::eType> &message_type_items);
+      const TStructsSchemaItems& struct_schema_items,
+      const std::set<FunctionIdTest::eType>& function_id_items,
+      const std::set<MessageTypeTest::eType>& message_type_items);
 
   static CSmartSchema InitFunction_Function2_request(
-      const std::set<FunctionIdTest::eType> &function_id_items,
-      const std::set<MessageTypeTest::eType> &message_type_items);
+      const std::set<FunctionIdTest::eType>& function_id_items,
+      const std::set<MessageTypeTest::eType>& message_type_items);
 
   static CSmartSchema InitFunction_Function2_response(
-      const TStructsSchemaItems &struct_schema_items,
-      const std::set<FunctionIdTest::eType> &function_id_items,
-      const std::set<MessageTypeTest::eType> &message_type_items);
+      const TStructsSchemaItems& struct_schema_items,
+      const std::set<FunctionIdTest::eType>& function_id_items,
+      const std::set<MessageTypeTest::eType>& message_type_items);
 
   static CSmartSchema InitFunction_Function3_request(
-      const std::set<FunctionIdTest::eType> &function_id_items,
-      const std::set<MessageTypeTest::eType> &message_type_items);
+      const std::set<FunctionIdTest::eType>& function_id_items,
+      const std::set<MessageTypeTest::eType>& message_type_items);
 
   static CSmartSchema InitFunction_Function3_response(
-      const TStructsSchemaItems &struct_schema_items,
-      const std::set<FunctionIdTest::eType> &function_id_items,
-      const std::set<MessageTypeTest::eType> &message_type_items);
+      const TStructsSchemaItems& struct_schema_items,
+      const std::set<FunctionIdTest::eType>& function_id_items,
+      const std::set<MessageTypeTest::eType>& message_type_items);
 
   static utils::SharedPtr<ISchemaItem> InitStructSchemaItem_Common_1(
-      TStructsSchemaItems &struct_schema_items);
+      TStructsSchemaItems& struct_schema_items);
 
   static utils::SharedPtr<ISchemaItem> InitStructSchemaItem_Common_2();
 };
diff --git a/src/components/formatters/test/include/create_smartSchema.h b/src/components/formatters/test/include/formatters/create_smartSchema.h
index c3bc2651e5..3514b7fe94 100644
--- a/src/components/formatters/test/include/create_smartSchema.h
+++ b/src/components/formatters/test/include/formatters/create_smartSchema.h
@@ -33,7 +33,7 @@
 #ifndef SRC_COMPONENTS_FORMATTERS_TEST_INCLUDE_CREATESMARTSCHEMA_H_
 #define SRC_COMPONENTS_FORMATTERS_TEST_INCLUDE_CREATESMARTSCHEMA_H_
 
-#include "formatters/CFormatterJsonSDLRPCv1.hpp"
+#include "formatters/CFormatterJsonSDLRPCv1.h"
 #include "SmartFactoryTestHelper.h"
 
 namespace test {
@@ -54,18 +54,10 @@ enum eType {
 }
 
 namespace Language {
-enum eType {
-  INVALID_ENUM = -1,
-  EN_EU,
-  RU_RU
-};
+enum eType { INVALID_ENUM = -1, EN_EU, RU_RU };
 }
 namespace AppTypeTest {
-enum eType {
-  INVALID_ENUM = -1,
-  SYSTEM,
-  MEDIA
-};
+enum eType { INVALID_ENUM = -1, SYSTEM, MEDIA };
 }
 namespace SpeechCapabilities {
 enum eType {
@@ -75,11 +67,7 @@ enum eType {
 }
 
 namespace StructIdentifiers {
-enum eType {
-  INVALID_ENUM = -1,
-  Struct1,
-  Struct2
-};
+enum eType { INVALID_ENUM = -1, Struct1, Struct2 };
 }
 
 CSmartSchema initObjectSchema();
diff --git a/src/components/formatters/test/include/meta_formatter_test_helper.h b/src/components/formatters/test/include/formatters/meta_formatter_test_helper.h
index e2be3beb64..1494c75c4b 100644
--- a/src/components/formatters/test/include/meta_formatter_test_helper.h
+++ b/src/components/formatters/test/include/formatters/meta_formatter_test_helper.h
@@ -36,8 +36,8 @@
 #include "gtest/gtest.h"
 
 #include "smart_objects/smart_object.h"
-#include "formatters/CFormatterJsonSDLRPCv1.hpp"
-#include "formatters/CSmartFactory.hpp"
+#include "formatters/CFormatterJsonSDLRPCv1.h"
+#include "formatters/CSmartFactory.h"
 #include "create_smartSchema.h"
 
 namespace test {
@@ -46,7 +46,6 @@ namespace formatters {
 
 class CMetaFormatterTestHelper : public ::testing::Test {
  protected:
-
   virtual void SetUp();
 
   virtual void TearDown();
@@ -80,4 +79,4 @@ class CMetaFormatterTestHelper : public ::testing::Test {
 }  // namespace components
 }  // namespace test
 
-#endif // SRC_COMPONENTS_FORMATTERS_TEST_INCLUDE_METAFORMATTERTESTHELPER_H_
+#endif  // SRC_COMPONENTS_FORMATTERS_TEST_INCLUDE_METAFORMATTERTESTHELPER_H_