1 files changed, 68 insertions, 21 deletions
diff --git a/src/components/formatters/test/CSmartFactory_test.cc b/src/components/formatters/test/CSmartFactory_test.cc
index f98af88328..f1df40d218 100644
--- a/src/components/formatters/test/CSmartFactory_test.cc
+++ b/src/components/formatters/test/CSmartFactory_test.cc
@@ -67,7 +67,9 @@ TEST(CSmartFactoryTest,
   obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
-  EXPECT_EQ(Errors::eType::OK, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::OK, obj.validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   EXPECT_TRUE(obj.isValid());
 }
 
@@ -79,7 +81,9 @@ TEST(CSmartFactoryTest,
       FunctionIdTest::Function1, MessageTypeTest::INVALID_ENUM);
   EXPECT_FALSE(SmartType::SmartType_Map == obj.getType());
   EXPECT_TRUE(SmartType::SmartType_Null == obj.getType());
-  EXPECT_EQ(Errors::eType::OK, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::OK, obj.validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   EXPECT_TRUE(obj.isValid());
 }
 
@@ -99,7 +103,10 @@ TEST(
   obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
-  EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER,
+            obj.validate(errorMessage));
+  EXPECT_NE(std::string(""), errorMessage);
   EXPECT_FALSE(obj.isValid());
 }
 
@@ -120,7 +127,9 @@ TEST(
   obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
-  EXPECT_EQ(Errors::eType::OUT_OF_RANGE, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::OUT_OF_RANGE, obj.validate(errorMessage));
+  EXPECT_NE(std::string(""), errorMessage);
   EXPECT_FALSE(obj.isValid());
 }
 
@@ -141,7 +150,9 @@ TEST(
   obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
-  EXPECT_EQ(Errors::eType::INVALID_VALUE, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::INVALID_VALUE, obj.validate(errorMessage));
+  EXPECT_NE(std::string(""), errorMessage);
   EXPECT_FALSE(obj.isValid());
 }
 
@@ -163,7 +174,9 @@ TEST(CSmartFactoryTest,
   obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
-  EXPECT_EQ(Errors::eType::OK, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::OK, obj.validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   EXPECT_TRUE(obj.isValid());
 }
 
@@ -185,7 +198,10 @@ TEST(
   obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
-  EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER,
+            obj.validate(errorMessage));
+  EXPECT_NE(std::string(""), errorMessage);
   EXPECT_FALSE(obj.isValid());
 }
 
@@ -221,7 +237,9 @@ TEST(
   obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
-  EXPECT_EQ(Errors::eType::INVALID_VALUE, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::INVALID_VALUE, obj.validate(errorMessage));
+  EXPECT_NE(std::string(""), errorMessage);
   EXPECT_FALSE(obj.isValid());
 }
 
@@ -236,7 +254,9 @@ TEST(CSmartFactoryTest,
   obj["position"] = 200;
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
-  EXPECT_EQ(Errors::eType::OK, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::OK, obj.validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   EXPECT_TRUE(obj.isValid());
 }
 
@@ -251,7 +271,10 @@ TEST(
   obj["text"] = "test";
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(1u, keys.size());
-  EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER,
+            obj.validate(errorMessage));
+  EXPECT_NE(std::string(""), errorMessage);
   EXPECT_FALSE(obj.isValid());
 }
 
@@ -266,7 +289,9 @@ TEST(CSmartFactoryTest,
   obj["position"] = 200;
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
-  EXPECT_EQ(Errors::eType::OK, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::OK, obj.validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   EXPECT_TRUE(obj.isValid());
 }
 
@@ -281,10 +306,14 @@ TEST(CSmartFactoryTest,
   obj["position"] = 200;
   obj["image"]["text"] = "test2";
   obj["image"]["position"] = 100;
-  EXPECT_EQ(Errors::eType::OK, obj["image"].validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::OK, obj["image"].validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(3u, keys.size());
-  EXPECT_EQ(Errors::eType::OK, obj.validate());
+  errorMessage = "";
+  EXPECT_EQ(Errors::eType::OK, obj.validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   EXPECT_TRUE(obj.isValid());
 }
 
@@ -301,11 +330,15 @@ TEST(
   obj["image"]["text"] = "test2";
   obj["image"]["position"] = 100;
   // Check object "image"
-  EXPECT_EQ(Errors::eType::OK, obj["image"].validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::OK, obj["image"].validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(3u, keys.size());
   // Check global object
-  EXPECT_EQ(Errors::eType::OK, obj.validate());
+  errorMessage = "";
+  EXPECT_EQ(Errors::eType::OK, obj.validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   EXPECT_TRUE(obj.isValid());
 }
 
@@ -321,11 +354,16 @@ TEST(
   obj["image"]["text"] = "test2";
   obj["image"]["position"] = 100;
   // Check object "image"
-  EXPECT_EQ(Errors::eType::OK, obj["image"].validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::OK, obj["image"].validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
   // Check global object
-  EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate());
+  errorMessage = "";
+  EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER,
+            obj.validate(errorMessage));
+  EXPECT_NE(std::string(""), errorMessage);
   EXPECT_FALSE(obj.isValid());
 }
 
@@ -342,11 +380,15 @@ TEST(
   obj["image"]["text"] = "test2";
   obj["image"]["position"] = 100;
   // Check object "image"
-  EXPECT_EQ(Errors::eType::OK, obj["image"].validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::OK, obj["image"].validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(3u, keys.size());
   // Check global object
-  EXPECT_EQ(Errors::eType::OK, obj.validate());
+  errorMessage = "";
+  EXPECT_EQ(Errors::eType::OK, obj.validate(errorMessage));
+  EXPECT_EQ(std::string(""), errorMessage);
   EXPECT_TRUE(obj.isValid());
 }
 
@@ -363,7 +405,10 @@ TEST(
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(2u, keys.size());
   // Check global object
-  EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER,
+            obj.validate(errorMessage));
+  EXPECT_NE(std::string(""), errorMessage);
   EXPECT_FALSE(obj.isValid());
 }
 
@@ -381,7 +426,9 @@ TEST(
   std::set<std::string> keys = obj.enumerate();
   EXPECT_EQ(3u, keys.size());
   // Check global object
-  EXPECT_EQ(Errors::eType::INVALID_VALUE, obj.validate());
+  std::string errorMessage;
+  EXPECT_EQ(Errors::eType::INVALID_VALUE, obj.validate(errorMessage));
+  EXPECT_NE(std::string(""), errorMessage);
   EXPECT_FALSE(obj.isValid());
 }