Merge pull request #186 from proppy/fix-number-decoding

firebaseobject: fix number decoding

Author: ed7coyne

src/FirebaseObject.cpp

@@ -36,17 +36,17 @@ bool FirebaseObject::getBool(const String& path) {
 
 int FirebaseObject::getInt(const String& path) {
   JsonVariant variant = getJsonVariant(path);
-  if (!variant.is<int>()) {
-    error_ = "failed to convert to int";
+  if (!variant.is<int>() && !variant.is<float>()) {
+    error_ = "failed to convert to number";
     return 0;
   }
   return static_cast<int>(variant);
 }
 
 float FirebaseObject::getFloat(const String& path) {
   JsonVariant variant = getJsonVariant(path);
-  if (!variant.is<float>()) {
-    error_ = "failed to convert to float";
+  if (!variant.is<float>() && !variant.is<int>()) {
+    error_ = "failed to convert to number";
     return 0;
   }
   return static_cast<float>(variant);

test/FirebaseArduino_test.cpp

@@ -26,19 +26,37 @@ TEST(FirebaseObjectTest, GetBool) {
 }
 
 TEST(FirebaseObjectTest, GetInt) {
-  FirebaseObject obj("42");
-  EXPECT_EQ(42, obj.getInt());
-  EXPECT_TRUE(obj.success());
-  EXPECT_FALSE(obj.failed());
-  EXPECT_EQ(obj.error(), "");
+  {
+    FirebaseObject obj("42");
+    EXPECT_EQ(42, obj.getInt());
+    EXPECT_TRUE(obj.success());
+    EXPECT_FALSE(obj.failed());
+    EXPECT_EQ(obj.error(), "");
+  }
+  {
+    FirebaseObject obj("42.0");
+    EXPECT_EQ(42, obj.getInt());
+    EXPECT_TRUE(obj.success());
+    EXPECT_FALSE(obj.failed());
+    EXPECT_EQ(obj.error(), "");
+  }
 }
 
 TEST(FirebaseObjectTest, GetFloat) {
-  FirebaseObject obj("43.0");
-  EXPECT_EQ(43, obj.getFloat());
-  EXPECT_TRUE(obj.success());
-  EXPECT_FALSE(obj.failed());
-  EXPECT_EQ(obj.error(), "");
+  {
+    FirebaseObject obj("43.0");
+    EXPECT_EQ(43, obj.getFloat());
+    EXPECT_TRUE(obj.success());
+    EXPECT_FALSE(obj.failed());
+    EXPECT_EQ(obj.error(), "");
+  }
+  {
+    FirebaseObject obj("43");
+    EXPECT_EQ(43, obj.getFloat());
+    EXPECT_TRUE(obj.success());
+    EXPECT_FALSE(obj.failed());
+    EXPECT_EQ(obj.error(), "");
+  }
 }
 
 TEST(FirebaseObjectTest, GetString) {
@@ -66,15 +84,15 @@ TEST(FirebaseObjectTest, GetIntFailure) {
   EXPECT_EQ(obj.getInt(), 0);
   EXPECT_FALSE(obj.success());
   EXPECT_TRUE(obj.failed());
-  EXPECT_EQ(obj.error(), "failed to convert to int");
+  EXPECT_EQ(obj.error(), "failed to convert to number");
 }
 
 TEST(FirebaseObjectTest, GetFloatFailure) {
   FirebaseObject obj("{\"foo\":\"bar\"}");
   EXPECT_EQ(obj.getFloat(), 0);
   EXPECT_FALSE(obj.success());
   EXPECT_TRUE(obj.failed());
-  EXPECT_EQ(obj.error(), "failed to convert to float");
+  EXPECT_EQ(obj.error(), "failed to convert to number");
 }
 
 TEST(FirebaseObjectTest, GetBoolFailure) {