generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-12 10:03:51 +01:00
Code Issues Projects Releases Wiki Activity

change Value::null to Value::nullSingleton() (#1000)

Browse Source
This commit is contained in:
dota17 2019-08-14 13:42:10 +08:00 committed by Jordan Bayles
parent 7b28698c5c
commit 2cf939e8c3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test_lib_json/main.cpp
View File

@ -304,7 +304,7 @@ JSONTEST_FIXTURE(ValueTest, arrayIssue252) {
int count = 5; int count = 5;
Json::Value root; Json::Value root;
Json::Value item; Json::Value item;
root["array"] = Json::Value::nullRef; root["array"] = Json::Value::nullSingleton();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
item["a"] = i; item["a"] = i;
item["b"] = i; item["b"] = i;
@ -337,7 +337,7 @@ JSONTEST_FIXTURE(ValueTest, null) {
JSONTEST_ASSERT_EQUAL(0.0, null_.asFloat()); JSONTEST_ASSERT_EQUAL(0.0, null_.asFloat());
JSONTEST_ASSERT_STRING_EQUAL("", null_.asString()); JSONTEST_ASSERT_STRING_EQUAL("", null_.asString());
JSONTEST_ASSERT_EQUAL(Json::Value::null, null_); JSONTEST_ASSERT_EQUAL(Json::Value::nullSingleton(), null_);
// Test using a Value in a boolean context (false iff null) // Test using a Value in a boolean context (false iff null)
JSONTEST_ASSERT_EQUAL(null_, false); JSONTEST_ASSERT_EQUAL(null_, false);
@ -1749,7 +1749,7 @@ JSONTEST_FIXTURE(ValueTest, zeroesInKeys) {
JSONTEST_ASSERT(!root.isMember("h")); JSONTEST_ASSERT(!root.isMember("h"));
JSONTEST_ASSERT(root.isMember(binary)); JSONTEST_ASSERT(root.isMember(binary));
JSONTEST_ASSERT_STRING_EQUAL( JSONTEST_ASSERT_STRING_EQUAL(
"there", root.get(binary, Json::Value::nullRef).asString()); "there", root.get(binary, Json::Value::nullSingleton()).asString());
Json::Value removed; Json::Value removed;
bool did; bool did;
did = root.removeMember(binary.data(), binary.data() + binary.length(), did = root.removeMember(binary.data(), binary.data() + binary.length(),
@ -1762,7 +1762,7 @@ JSONTEST_FIXTURE(ValueTest, zeroesInKeys) {
JSONTEST_ASSERT_STRING_EQUAL("there", removed.asString()); // still JSONTEST_ASSERT_STRING_EQUAL("there", removed.asString()); // still
JSONTEST_ASSERT(!root.isMember(binary)); JSONTEST_ASSERT(!root.isMember(binary));
JSONTEST_ASSERT_STRING_EQUAL( JSONTEST_ASSERT_STRING_EQUAL(
"", root.get(binary, Json::Value::nullRef).asString()); "", root.get(binary, Json::Value::nullSingleton()).asString());
} }
} }