j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2054 from nlohmann/feature/issue1983

Browse source 
Fix bug in diff function
This commit is contained in:
Niels Lohmann 2020-04-20 19:44:35 +02:00 committed by GitHub
commit a29e3b1318
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/nlohmann/json.hpp
View file

@ -8347,7 +8347,7 @@ class basic_json
result.push_back( result.push_back(
{ {
{"op", "add"}, {"op", "add"},
{"path", path + "/" + std::to_string(i)}, {"path", path + "/-"},
{"value", target[i]} {"value", target[i]}
}); });
++i; ++i;

2
single_include/nlohmann/json.hpp
View file

@ -23833,7 +23833,7 @@ class basic_json
result.push_back( result.push_back(
{ {
{"op", "add"}, {"op", "add"},
{"path", path + "/" + std::to_string(i)}, {"path", path + "/-"},
{"value", target[i]} {"value", target[i]}
}); });
++i; ++i;

8
test/src/unit-regression.cpp
View file

@ -1896,6 +1896,14 @@ TEST_CASE("regression tests")
static_assert(!std::is_constructible<json, std::tuple<NotSerializableData, std::string>>::value, ""); static_assert(!std::is_constructible<json, std::tuple<NotSerializableData, std::string>>::value, "");
static_assert(std::is_constructible<json, std::tuple<int, std::string>>::value, ""); static_assert(std::is_constructible<json, std::tuple<int, std::string>>::value, "");
} }
SECTION("issue #1983 - JSON patch diff for op=add formation is not as per standard (RFC 6902)")
{
const auto source = R"({ "foo": [ "1", "2" ] })"_json;
const auto target = R"({"foo": [ "1", "2", "3" ]})"_json;
const auto result = json::diff(source, target);
CHECK(result.dump() == R"([{"op":"add","path":"/foo/-","value":"3"}])");
}
} }
#if not defined(JSON_NOEXCEPTION) #if not defined(JSON_NOEXCEPTION)