summaryrefslogtreecommitdiff
path: root/src/components/formatters
diff options
context:
space:
mode:
authorHerasym Oleh <oolleehh@gmail.com>2015-12-01 16:32:07 +0200
committerHerasym Oleh <oolleehh@gmail.com>2015-12-01 16:32:07 +0200
commit6db4399d61512c9c4c843d040b591dd9bb7e3b5c (patch)
treec2f55099a879e4ea0ff6a332ff2a4da3afe7c18f /src/components/formatters
parenta2bab2cd053a67cd4b1754ed6f38abbeb3779fde (diff)
downloadsdl_core-6db4399d61512c9c4c843d040b591dd9bb7e3b5c.tar.gz
hotfix/Fix_Unit_Tests_for_Formatter_in_Genivi
Enabled 2 UT in CFormatterJsonBase_test.cc Related: APPLINK-17577
Diffstat (limited to 'src/components/formatters')
-rw-r--r--src/components/formatters/test/CFormatterJsonBase_test.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/components/formatters/test/CFormatterJsonBase_test.cc b/src/components/formatters/test/CFormatterJsonBase_test.cc
index 9efbfdcf77..3765da29d4 100644
--- a/src/components/formatters/test/CFormatterJsonBase_test.cc
+++ b/src/components/formatters/test/CFormatterJsonBase_test.cc
@@ -100,15 +100,15 @@ 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::Int ui_val = Json::Value::maxInt;
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);
// Check conversion was successful
- EXPECT_EQ(ui_val, object.asUInt());
+ EXPECT_EQ(ui_val, object.asInt());
}
TEST(CFormatterJsonBaseTest, JSonSignedMaxInt64ValueToSmartObj_ExpectFailed) {
@@ -240,15 +240,15 @@ 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::Int ui_val = Json::Value::maxInt;
Json::Value json_value; // Json value from maximum unsigned int
SmartObject object(ui_val);
// Convert json to smart object
CFormatterJsonBase::objToJsonValue(object, json_value);
// Check conversion was successful
- EXPECT_EQ(ui_val, json_value.asUInt());
+ EXPECT_EQ(ui_val, json_value.asInt());
}
TEST(CFormatterJsonBaseTest, BoolSmartObjectToJSon_ExpectSuccessful) {