test get(key, default)

cdunn2001 · cdunn2001 · commit d31151d150dd · 2015-03-05T16:44:50.000-06:00
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -1037,7 +1037,7 @@ Value Value::get(char const* key, Value const& defaultValue) const
 }
 Value Value::get(std::string const& key, Value const& defaultValue) const
 {
-  return get(key.c_str(), defaultValue);
+  return get(key.data(), key.data() + key.length(), defaultValue);
 }
 
 
diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
@@ -1578,6 +1578,7 @@ JSONTEST_FIXTURE(ValueTest, zeroesInKeys) {
     JSONTEST_ASSERT_STRING_EQUAL("there", root[binary].asString());
     JSONTEST_ASSERT(!root.isMember("hi"));
     JSONTEST_ASSERT(root.isMember(binary));
+    JSONTEST_ASSERT_STRING_EQUAL("there", root.get(binary, Json::Value::nullRef).asString());
     Json::Value removed;
     bool did;
     did = root.removeMember(binary.data(), binary.data() + binary.length(),
@@ -1588,6 +1589,8 @@ JSONTEST_FIXTURE(ValueTest, zeroesInKeys) {
         &removed);
     JSONTEST_ASSERT(!did);
     JSONTEST_ASSERT_STRING_EQUAL("there", removed.asString()); // still
+    JSONTEST_ASSERT(!root.isMember(binary));
+    JSONTEST_ASSERT_STRING_EQUAL("", root.get(binary, Json::Value::nullRef).asString());
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1037,7 +1037,7 @@ Value Value::get(char const* key, Value const& defaultValue) const`
`1037`	`1037`	`}`
`1038`	`1038`	`Value Value::get(std::string const& key, Value const& defaultValue) const`
`1039`	`1039`	`{`
`1040`		`- return get(key.c_str(), defaultValue);`
	`1040`	`+ return get(key.data(), key.data() + key.length(), defaultValue);`
`1041`	`1041`	`}`
`1042`	`1042`
`1043`	`1043`