fix cppcheck issues in component smart_objects

16 files changed, 16 insertions, 0 deletions

diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index 27c64de7e2..92410d9619 100644
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -139,6 +139,7 @@ errors::eType CObjectSchemaItem::validate(
     errors::eType result = errors::OK;
     // Check if MessageVersion matches schema version
     if (correct_member) {
+    // cppcheck-suppress redundantAssignment
       result =
           correct_member->mSchemaItem->validate(field,
                                                 &report__->ReportSubobject(key),
diff --git a/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc b/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc
index cded041bcc..83771655ab 100644
--- a/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc
+++ b/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc
@@ -46,6 +46,7 @@ using namespace ns_smart_device_link::ns_smart_objects;
 /**
  * Test AlwaysFalseSchemaItem
  **/
+// cppcheck-suppress syntaxError
 TEST(test_AlwaysFalseSchemaItemTest, simple_test) {
   SmartObject obj;
 
diff --git a/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc b/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc
index 54a9c8684f..f4e190a9e6 100644
--- a/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc
+++ b/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc
@@ -46,6 +46,7 @@ using namespace ns_smart_device_link::ns_smart_objects;
 /**
  * Test AlwaysTrueSchemaItem
  **/
+// cppcheck-suppress syntaxError
 TEST(test_AlwaysTrueSchemaItemTest, simple_test) {
   SmartObject obj;
 
diff --git a/src/components/smart_objects/test/ArraySchemaItem_test.cc b/src/components/smart_objects/test/ArraySchemaItem_test.cc
index a22a27399d..bc701f11fa 100644
--- a/src/components/smart_objects/test/ArraySchemaItem_test.cc
+++ b/src/components/smart_objects/test/ArraySchemaItem_test.cc
@@ -124,6 +124,7 @@ TEST(test_no_default_value, test_ArraySchemaItemTest) {
  * Create ArraySchemaItem with schema item. Method validate should return true
  * only if all array elements are valid schema item objects
  **/
+// cppcheck-suppress syntaxError
 TEST(test_item_with_default_value, test_ArraySchemaItemTest) {
   using namespace ns_smart_device_link::ns_smart_objects;
   SmartObject obj;
diff --git a/src/components/smart_objects/test/BoolSchemaItem_test.cc b/src/components/smart_objects/test/BoolSchemaItem_test.cc
index 7400729116..180a04f7c0 100644
--- a/src/components/smart_objects/test/BoolSchemaItem_test.cc
+++ b/src/components/smart_objects/test/BoolSchemaItem_test.cc
@@ -50,6 +50,7 @@ using ns_smart_device_link::ns_smart_objects::ISchemaItemPtr;
  *return false
  * and leave SmartObject in previous state.
  **/
+// cppcheck-suppress syntaxError
 TEST(test_no_default_value, test_BoolSchemaItemTest) {
   ns_smart_device_link::ns_smart_objects::SmartObject obj;
 
diff --git a/src/components/smart_objects/test/CObjectSchemaItem_test.cc b/src/components/smart_objects/test/CObjectSchemaItem_test.cc
index 8a7d09f31e..8c51f93deb 100644
--- a/src/components/smart_objects/test/CObjectSchemaItem_test.cc
+++ b/src/components/smart_objects/test/CObjectSchemaItem_test.cc
@@ -175,6 +175,7 @@ class ObjectSchemaItemTest : public ::testing::Test {
   }
 };
 
+// cppcheck-suppress syntaxError
 TEST_F(ObjectSchemaItemTest, validation_correct) {
   SmartObject obj;
   obj[S_PARAMS][S_FUNCTION_ID] = 0;
diff --git a/src/components/smart_objects/test/EnumSchemaItem_test.cc b/src/components/smart_objects/test/EnumSchemaItem_test.cc
index 4f675ab181..0752ed6727 100644
--- a/src/components/smart_objects/test/EnumSchemaItem_test.cc
+++ b/src/components/smart_objects/test/EnumSchemaItem_test.cc
@@ -84,6 +84,7 @@ class EnumSchemaItemTest : public ::testing::Test {
  * Not Enum SmartObject should converted to intObject and setted up by the
  *default value.
  **/
+// cppcheck-suppress syntaxError
 TEST_F(EnumSchemaItemTest, test_item_with_default_value) {
   SmartObject obj;
   ISchemaItemPtr item = TEnumSchemaItem<TestType::eType>::create(
diff --git a/src/components/smart_objects/test/NumberSchemaItem_test.cc b/src/components/smart_objects/test/NumberSchemaItem_test.cc
index 04010be3f3..1b1a3d9574 100644
--- a/src/components/smart_objects/test/NumberSchemaItem_test.cc
+++ b/src/components/smart_objects/test/NumberSchemaItem_test.cc
@@ -49,6 +49,7 @@ using ns_smart_device_link::ns_smart_objects::ISchemaItemPtr;
  *return false
  * and leave SmartObject in previous state.
  **/
+// cppcheck-suppress syntaxError
 TEST(test_int_no_default_value, test_NumberSchemaItemTest) {
   using namespace ns_smart_device_link::ns_smart_objects;
 
diff --git a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc
index 555239c489..e7e689eb91 100644
--- a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc
+++ b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc
@@ -358,6 +358,7 @@ class SmartObjectConvertionTimeTest : public ::testing::Test {
   }
 };
 
+// cppcheck-suppress syntaxError
 TEST_F(SmartObjectConvertionTimeTest, test_int_object_convertion) {
   SmartObject srcObj, dstObj;
   CSmartSchema schema = initObjectSchema();
diff --git a/src/components/smart_objects/test/SmartObjectDraft_test.cc b/src/components/smart_objects/test/SmartObjectDraft_test.cc
index d2382be51d..d2312abc63 100644
--- a/src/components/smart_objects/test/SmartObjectDraft_test.cc
+++ b/src/components/smart_objects/test/SmartObjectDraft_test.cc
@@ -47,6 +47,7 @@ namespace smart_object_test {
 using ns_smart_device_link::ns_smart_objects::SmartObject;
 using ns_smart_device_link::ns_smart_objects::SmartType;
 
+// cppcheck-suppress syntaxError
 TEST(SmartObjectsDraftTest, primitive_types) {
   SmartObject obj;
 
diff --git a/src/components/smart_objects/test/SmartObjectInvalid_test.cc b/src/components/smart_objects/test/SmartObjectInvalid_test.cc
index ff5949df6a..a5ba0b9d25 100644
--- a/src/components/smart_objects/test/SmartObjectInvalid_test.cc
+++ b/src/components/smart_objects/test/SmartObjectInvalid_test.cc
@@ -42,6 +42,7 @@ namespace smart_object_test {
 
 using namespace ns_smart_device_link::ns_smart_objects;
 
+// cppcheck-suppress syntaxError
 TEST(test_SmartObjectInvalidTest, simple_type_can_be_set_in_constructor) {
   SmartObject objMap(SmartType_Map);
   ASSERT_EQ(SmartType_Map, objMap.getType());
diff --git a/src/components/smart_objects/test/SmartObjectStress_test.cc b/src/components/smart_objects/test/SmartObjectStress_test.cc
index 4c0234589f..7ad75a6c86 100644
--- a/src/components/smart_objects/test/SmartObjectStress_test.cc
+++ b/src/components/smart_objects/test/SmartObjectStress_test.cc
@@ -236,6 +236,7 @@ class StressTestHelper : public ::testing::Test {
  * The iteration continues until all nodes are simple SmartObjects (not arrays
  * or maps)
  */
+// cppcheck-suppress syntaxError
 TEST_F(StressTestHelper, StressTest) {
   SmartObject objects;
 
diff --git a/src/components/smart_objects/test/SmartObjectUnit_test.cc b/src/components/smart_objects/test/SmartObjectUnit_test.cc
index 72f96ef939..3096f39793 100644
--- a/src/components/smart_objects/test/SmartObjectUnit_test.cc
+++ b/src/components/smart_objects/test/SmartObjectUnit_test.cc
@@ -95,6 +95,7 @@ class TestHelper : public ::testing::Test {
 /*
  * Tests different types sequentially
  */
+// cppcheck-suppress syntaxError
 TEST(BasicMixtedTypes, test_SmartObjectUnitTest) {
   SmartObject obj;
 
diff --git a/src/components/smart_objects/test/StringSchemaItem_test.cc b/src/components/smart_objects/test/StringSchemaItem_test.cc
index 7bf0d0ed89..1bb7cb13af 100644
--- a/src/components/smart_objects/test/StringSchemaItem_test.cc
+++ b/src/components/smart_objects/test/StringSchemaItem_test.cc
@@ -97,6 +97,7 @@ TEST(test_no_default_value, test_StringSchemaItemTest) {
  * Not string SmartObject should converted to StringObject and setted up by the
  *default value.
  **/
+// cppcheck-suppress syntaxError
 TEST(test_item_with_default_value, test_StringSchemaItemTest) {
   using namespace ns_smart_device_link::ns_smart_objects;
   SmartObject obj;
diff --git a/src/components/smart_objects/test/map_performance_test.cc b/src/components/smart_objects/test/map_performance_test.cc
index be29a93553..4fe6144b1c 100644
--- a/src/components/smart_objects/test/map_performance_test.cc
+++ b/src/components/smart_objects/test/map_performance_test.cc
@@ -61,6 +61,7 @@ void MakeMapObject(Map& obj, const int size) {
 }
 }  // namespace
 
+// cppcheck-suppress syntaxError
 TEST(SmartObjectPerformanceTest, SmartObjectMapPerformance) {
   Map object;
   MakeMapObject(object, 100);
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 ebf39e6b5c..d93aca24b9 100644
--- a/src/components/smart_objects/test/smart_object_performance_test.cc
+++ b/src/components/smart_objects/test/smart_object_performance_test.cc
@@ -60,6 +60,7 @@ void MakeMapObject(SmartObject& obj, const int size) {
 }
 }  // namespace
 
+// cppcheck-suppress syntaxError
 TEST(SmartObjectPerformanceTest, SmartObjectPerformance) {
   SmartObject object;
   MakeMapObject(object, 100);