diff options
Diffstat (limited to 'src/components/formatters/test/CSmartFactory_test.cc')
-rw-r--r-- | src/components/formatters/test/CSmartFactory_test.cc | 84 |
1 files changed, 63 insertions, 21 deletions
diff --git a/src/components/formatters/test/CSmartFactory_test.cc b/src/components/formatters/test/CSmartFactory_test.cc index f98af88328..3713d076e2 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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::OK, obj.validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); 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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::OK, obj.validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); EXPECT_TRUE(obj.isValid()); } @@ -99,7 +103,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::MISSING_MANDATORY_PARAMETER, obj.validate()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate(&report)); + EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); EXPECT_FALSE(obj.isValid()); } @@ -120,7 +126,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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::OUT_OF_RANGE, obj.validate(&report)); + EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); EXPECT_FALSE(obj.isValid()); } @@ -141,7 +149,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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::INVALID_VALUE, obj.validate(&report)); + EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); EXPECT_FALSE(obj.isValid()); } @@ -163,7 +173,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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::OK, obj.validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); EXPECT_TRUE(obj.isValid()); } @@ -185,7 +197,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::MISSING_MANDATORY_PARAMETER, obj.validate()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate(&report)); + EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); EXPECT_FALSE(obj.isValid()); } @@ -221,7 +235,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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::INVALID_VALUE, obj.validate(&report)); + EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); EXPECT_FALSE(obj.isValid()); } @@ -236,7 +252,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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::OK, obj.validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); EXPECT_TRUE(obj.isValid()); } @@ -251,7 +269,9 @@ 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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate(&report)); + EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); EXPECT_FALSE(obj.isValid()); } @@ -266,7 +286,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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::OK, obj.validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); EXPECT_TRUE(obj.isValid()); } @@ -281,10 +303,14 @@ TEST(CSmartFactoryTest, obj["position"] = 200; obj["image"]["text"] = "test2"; obj["image"]["position"] = 100; - EXPECT_EQ(Errors::eType::OK, obj["image"].validate()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::OK, obj["image"].validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); std::set<std::string> keys = obj.enumerate(); EXPECT_EQ(3u, keys.size()); - EXPECT_EQ(Errors::eType::OK, obj.validate()); + report = rpc::ValidationReport("RPC"); + EXPECT_EQ(Errors::eType::OK, obj.validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); EXPECT_TRUE(obj.isValid()); } @@ -301,11 +327,15 @@ TEST( obj["image"]["text"] = "test2"; obj["image"]["position"] = 100; // Check object "image" - EXPECT_EQ(Errors::eType::OK, obj["image"].validate()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::OK, obj["image"].validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); std::set<std::string> keys = obj.enumerate(); EXPECT_EQ(3u, keys.size()); // Check global object - EXPECT_EQ(Errors::eType::OK, obj.validate()); + report = rpc::ValidationReport("RPC"); + EXPECT_EQ(Errors::eType::OK, obj.validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); EXPECT_TRUE(obj.isValid()); } @@ -321,11 +351,15 @@ TEST( obj["image"]["text"] = "test2"; obj["image"]["position"] = 100; // Check object "image" - EXPECT_EQ(Errors::eType::OK, obj["image"].validate()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::OK, obj["image"].validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); std::set<std::string> keys = obj.enumerate(); EXPECT_EQ(2u, keys.size()); // Check global object - EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate()); + report = rpc::ValidationReport("RPC"); + EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate(&report)); + EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); EXPECT_FALSE(obj.isValid()); } @@ -342,11 +376,15 @@ TEST( obj["image"]["text"] = "test2"; obj["image"]["position"] = 100; // Check object "image" - EXPECT_EQ(Errors::eType::OK, obj["image"].validate()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::OK, obj["image"].validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); std::set<std::string> keys = obj.enumerate(); EXPECT_EQ(3u, keys.size()); // Check global object - EXPECT_EQ(Errors::eType::OK, obj.validate()); + report = rpc::ValidationReport("RPC"); + EXPECT_EQ(Errors::eType::OK, obj.validate(&report)); + EXPECT_EQ(std::string(""), rpc::PrettyFormat(report)); EXPECT_TRUE(obj.isValid()); } @@ -363,7 +401,9 @@ 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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::MISSING_MANDATORY_PARAMETER, obj.validate(&report)); + EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); EXPECT_FALSE(obj.isValid()); } @@ -381,7 +421,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()); + rpc::ValidationReport report("RPC"); + EXPECT_EQ(Errors::eType::INVALID_VALUE, obj.validate(&report)); + EXPECT_NE(std::string(""), rpc::PrettyFormat(report)); EXPECT_FALSE(obj.isValid()); } |