From 25d8f6ac4469a580128ef1cb72e85f73f077267a Mon Sep 17 00:00:00 2001
From: Ewen Cheslack-Postava <ewencp@cs.stanford.edu>
Date: Mon, 17 Sep 2012 18:16:55 -0700
Subject: [PATCH] Fix getReal() with default value when an int rather than real
 is available.

Also add tests for default values, checking that they are returned
when a field isn't available and that the correct value, rather than
the default, (including an int for a getReal() call) is returned if it
is available.
---
 include/json_spirit/value.h |  2 +-
 test/value_test.cpp         | 53 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/include/json_spirit/value.h b/include/json_spirit/value.h
index 0e64e4f..3af0ead 100644
--- a/include/json_spirit/value.h
+++ b/include/json_spirit/value.h
@@ -954,7 +954,7 @@ template<class Config>
 double BasicValue<Config>::getReal(const typename Config::String_type& path, double default_, const typename Config::String_type::value_type delim) const {
     if (!contains(path, delim)) return default_;
     const BasicValue& val = get(path, delim);
-    if (val.type() != REAL_TYPE) return default_;
+    if (val.type() != REAL_TYPE && val.type() != INT_TYPE) return default_;
     return val.getReal();
 }
 
diff --git a/test/value_test.cpp b/test/value_test.cpp
index 82cf5b9..dcb1d98 100644
--- a/test/value_test.cpp
+++ b/test/value_test.cpp
@@ -443,6 +443,7 @@ void test_path_get_helpers() {
         ("bool", true)
         ("int", 42)
         ("real", 52.3)
+        ("realint", 12)
         ;
     Value v(foo);
 
@@ -453,7 +454,57 @@ void test_path_get_helpers() {
     assert_eq(v.getInt("int"), 42);
     assert_eq(v.getInt64("int"), (boost::int64_t)42);
     assert_eq(v.getUInt64("int"), (boost::uint64_t)42);
-    assert_eq(v.getReal("real"), 52.3);
+    assert_eq(v.getReal("realint"), 12.f);
+}
+
+// Test that get helpers *don't* get defaults when the values are available
+void test_path_get_helpers_not_defaults() {
+    // Test the helpers that extract values directly by path. Provide
+    // one of each type
+    const Object obj = map_list_of("a", 2)("b", 3);
+    const Array arr = list_of(2)(3);
+    const Object foo = map_list_of
+        ("string", Value("a string"))
+        ("object", obj)
+        ("array", arr)
+        ("bool", true)
+        ("int", 42)
+        ("real", 52.3)
+        ("realint", 12)
+        ;
+    Value v(foo);
+
+    const Object bad_obj = map_list_of("x", 4)("y", 5);
+    const Array bad_arr = list_of(7)(8);
+
+    assert_eq(v.getString("string", "not a string"), "a string");
+    assert_eq(v.getObject("object", bad_obj), obj);
+    assert_eq(v.getArray("array", bad_arr), arr);
+    assert_eq(v.getBool("bool", false), true);
+    assert_eq(v.getInt("int", 0), 42);
+    assert_eq(v.getInt64("int", (boost::int64_t)0), (boost::int64_t)42);
+    assert_eq(v.getUInt64("int", (boost::uint64_t)0), (boost::uint64_t)42);
+    assert_eq(v.getReal("realint", 0.f), 12.f);
+}
+
+// Test defaults are retrieved when fields are not available
+void test_path_get_helpers_defaults() {
+    // Test the helpers that extract values directly by path. Provide
+    // one of each type
+    const Object foo = map_list_of("x", 2);
+    Value v(foo);
+
+    const Object default_obj = map_list_of("x", 4)("y", 5);
+    const Array default_arr = list_of(7)(8);
+
+    assert_eq(v.getString("string", "not a string"), "not a string");
+    assert_eq(v.getObject("object", default_obj), default_obj);
+    assert_eq(v.getArray("array", default_arr), default_arr);
+    assert_eq(v.getBool("bool", false), false);
+    assert_eq(v.getInt("int", 0), 0);
+    assert_eq(v.getInt64("int", (boost::int64_t)0), (boost::int64_t)0);
+    assert_eq(v.getUInt64("int", (boost::uint64_t)0), (boost::uint64_t)0);
+    assert_eq(v.getReal("realint", 0.f), 0.f);
 }
 
 void test_path_insert() {