diff options
Diffstat (limited to 'src/components/formatters/test/CFormatterJsonBase_test.cc')
-rw-r--r-- | src/components/formatters/test/CFormatterJsonBase_test.cc | 62 |
1 files changed, 43 insertions, 19 deletions
diff --git a/src/components/formatters/test/CFormatterJsonBase_test.cc b/src/components/formatters/test/CFormatterJsonBase_test.cc index 9efbfdcf77..ff1f60b8df 100644 --- a/src/components/formatters/test/CFormatterJsonBase_test.cc +++ b/src/components/formatters/test/CFormatterJsonBase_test.cc @@ -35,7 +35,7 @@ #include "json/value.h" #include "gtest/gtest.h" #include "json/reader.h" -#include "formatters/CFormatterJsonBase.hpp" +#include "formatters/CFormatterJsonBase.h" #include "formatters/generic_json_formatter.h" namespace test { @@ -100,10 +100,12 @@ TEST(CFormatterJsonBaseTest, JSonSignedMaxIntValueToSmartObj_ExpectSuccessful) { EXPECT_EQ(ival, object.asInt()); } -TEST(CFormatterJsonBaseTest, DISABLED_JSonUnsignedMaxIntValueToSmartObj_ExpectSuccessful) { +TEST(CFormatterJsonBaseTest, + JSonUnsignedMaxIntValueToSmartObj_ExpectSuccessful) { // Arrange value Json::UInt ui_val = Json::Value::maxUInt; - Json::Value json_value(ui_val); // Json value from maximum possible unsigned int + Json::Value json_value( + ui_val); // Json value from maximum possible unsigned int SmartObject object; // Convert json to smart object CFormatterJsonBase::jsonValueToObj(json_value, object); @@ -111,15 +113,26 @@ TEST(CFormatterJsonBaseTest, DISABLED_JSonUnsignedMaxIntValueToSmartObj_ExpectSu EXPECT_EQ(ui_val, object.asUInt()); } -TEST(CFormatterJsonBaseTest, JSonSignedMaxInt64ValueToSmartObj_ExpectFailed) { +TEST(CFormatterJsonBaseTest, JSonSignedMaxInt64ValueToSmartObj_ExpectSuccess) { // Arrange value Json::Int64 ival = Json::Value::maxInt64; Json::Value json_value(ival); // Json value from maximum possible signed int SmartObject object; // Convert json to smart object CFormatterJsonBase::jsonValueToObj(json_value, object); + // Check conversion was successful + EXPECT_EQ(ival, object.asInt()); +} + +TEST(CFormatterJsonBaseTest, JSonUnsignedMaxInt64ValueToSmartObj_ExpectFailed) { + // Arrange value + Json::UInt64 ival = Json::Value::maxUInt64; + Json::Value json_value(ival); // Json value from max possible unsigned int + SmartObject object; + // Convert json to smart object + CFormatterJsonBase::jsonValueToObj(json_value, object); // Check conversion was not successful as there is no such conversion - EXPECT_EQ(invalid_int64_value, object.asInt64()); + EXPECT_EQ(invalid_int64_value, object.asInt()); } TEST(CFormatterJsonBaseTest, JSonBoolValueToSmartObj_ExpectSuccessful) { @@ -151,7 +164,8 @@ TEST(CFormatterJsonBaseTest, JSonCStringValueToSmartObj_ExpectSuccessful) { TEST(CFormatterJsonBaseTest, JSonArrayValueToSmartObj_ExpectSuccessful) { // Arrange value - const char* json_array = "[\"test1\", \"test2\", \"test3\"]"; // Array in json format + const char* json_array = + "[\"test1\", \"test2\", \"test3\"]"; // Array in json format Json::Value json_value; // Json value from array. Will be initialized later SmartObject object; Json::Reader reader; // Json reader - Needed for correct parsing @@ -162,18 +176,21 @@ TEST(CFormatterJsonBaseTest, JSonArrayValueToSmartObj_ExpectSuccessful) { // Check conversion was successful EXPECT_TRUE(json_value.isArray()); EXPECT_EQ(3u, object.asArray()->size()); - SmartArray *ptr = NULL; // Smart Array pointer; + SmartArray* ptr = NULL; // Smart Array pointer; EXPECT_NE(ptr, object.asArray()); } TEST(CFormatterJsonBaseTest, JSonObjectValueToSmartObj_ExpectSuccessful) { // Arrange value const char* json_object = - "{ \"json_test_object\": [\"test1\", \"test2\", \"test3\"], \"json_test_object2\": [\"test11\", \"test12\", \"test13\" ]}"; // Json object + "{ \"json_test_object\": [\"test1\", \"test2\", \"test3\"], " + "\"json_test_object2\": [\"test11\", \"test12\", \"test13\" ]}"; Json::Value json_value; // Json value from object. Will be initialized later SmartObject object; Json::Reader reader; // Json reader - Needed for correct parsing - ASSERT_TRUE(reader.parse(json_object, json_value)); // If parsing not successful - no sense to continue + ASSERT_TRUE(reader.parse( + json_object, + json_value)); // If parsing not successful - no sense to continue CFormatterJsonBase::jsonValueToObj(json_value, object); // Check conversion was successful EXPECT_TRUE(json_value.isObject()); @@ -193,7 +210,7 @@ TEST(CFormatterJsonBaseTest, JSonObjectValueToSmartObj_ExpectSuccessful) { EXPECT_EQ(*it, *it1); ++it1; } - ASSERT(it == mems.end() && it1 == keys.end()); + EXPECT_TRUE(it == mems.end() && it1 == keys.end()); } TEST(CFormatterJsonBaseTest, StringSmartObjectToJSon_ExpectSuccessful) { @@ -240,7 +257,7 @@ TEST(CFormatterJsonBaseTest, MinIntSmartObjectToJSon_ExpectSuccessful) { EXPECT_EQ(ival, json_value.asInt()); } -TEST(CFormatterJsonBaseTest, DISABLED_UnsignedMaxIntSmartObjectToJSon_ExpectSuccessful) { +TEST(CFormatterJsonBaseTest, UnsignedMaxIntSmartObjectToJSon_ExpectSuccessful) { // Arrange value Json::UInt ui_val = Json::Value::maxUInt; Json::Value json_value; // Json value from maximum unsigned int @@ -280,13 +297,15 @@ TEST(CFormatterJsonBaseTest, CStringSmartObjectToJSon_ExpectSuccessful) { TEST(CFormatterJsonBaseTest, ArraySmartObjectToJSon_ExpectSuccessful) { // Arrange value - const char* json_array = "[\"test1\", \"test2\", \"test3\"]"; // Array in json format + const char* json_array = + "[\"test1\", \"test2\", \"test3\"]"; // Array in json format Json::Value json_value; // Json value from array. Will be initialized later - Json::Value result; // Json value from array. Will be initialized later + Json::Value result; // Json value from array. Will be initialized later SmartObject object; Json::Reader reader; // Json reader - Needed for correct parsing // Parse array to json value - ASSERT_TRUE(reader.parse(json_array, json_value)); // Convert json array to SmartObject + ASSERT_TRUE(reader.parse(json_array, + json_value)); // Convert json array to SmartObject // Convert json array to SmartObject CFormatterJsonBase::jsonValueToObj(json_value, object); // Convert SmartObject to JSon @@ -299,13 +318,18 @@ TEST(CFormatterJsonBaseTest, ArraySmartObjectToJSon_ExpectSuccessful) { TEST(CFormatterJsonBaseTest, JSonObjectValueToObj_ExpectSuccessful) { // Arrange value const char* json_object = - "{ \"json_test_object\": [\"test1\", \"test2\", \"test3\"], \"json_test_object2\": [\"test11\", \"test12\", \"test13\" ]}"; // Json object - Json::Value json_value; // Json value from json object. Will be initialized later - Json::Value result; // Json value from Smart object. Will keep conversion result + "{ \"json_test_object\": [\"test1\", \"test2\", \"test3\"], " + "\"json_test_object2\": [\"test11\", \"test12\", \"test13\" ]}"; + Json::Value + json_value; // Json value from json object. Will be initialized later + Json::Value + result; // Json value from Smart object. Will keep conversion result SmartObject object; Json::Reader reader; // Json reader - Needed for correct parsing // Parse json object to correct json value - ASSERT_TRUE(reader.parse(json_object, json_value)); // If parsing not successful - no sense to continue + ASSERT_TRUE(reader.parse( + json_object, + json_value)); // If parsing not successful - no sense to continue // Convert json array to SmartObject CFormatterJsonBase::jsonValueToObj(json_value, object); // Convert SmartObject to JSon @@ -329,7 +353,7 @@ TEST(CFormatterJsonBaseTest, JSonObjectValueToObj_ExpectSuccessful) { EXPECT_EQ(*it, *it1); ++it1; } - ASSERT(it == mems.end() && it1 == keys.end()); + EXPECT_TRUE(it == mems.end() && it1 == keys.end()); } } // namespace formatters |