Niels LohmannandClaude Opus 5.5
1d69ef9ab4
* CI: measure line coverage without lcov's unexecuted-block adjustment Drop geninfo_unexecuted_blocks=1 from the lcov capture of ci_test_coverage: it reset every line of an inlined or templated function to 0 as soon as one copy had an unexecuted block, which understated the line coverage by about three points. Add -fvar-tracking-assignments to both coverage builds. At -O0, GCC inlines always_inline functions before it places the coverage counters, so the call sites of such helpers (put_literal() and others) got no line record and showed as 0 in an -O3 translation unit that never reaches them. With the flag, the call sites carry counts in every translation unit. The generated code is identical. Signed-off-by: Niels Lohmann <mail@nlohmann.me> * Remove unreachable code found by the coverage analysis Remove code that no input can reach, and mark the lines that cannot be covered with LCOV_EXCL_LINE: - BJData writer: the dry_run parameter of the ND-array element writers was always true; replace them by range checks. - BON8 writer: call throw_integer_out_of_range() directly instead of write_bon8_value() for values that always throw. - binary_writer: integer_bits() is only called for integers of up to 64 bits. - serializer, view serializer, lexer: replace guards that the callers make unreachable by assertions or by the simpler code (surrogate pairs under ensure_ascii, next_unget, '-' at the end of the buffer). - json_view: drop unreachable branches in scalar(), set(), check_utf8_scan(), append_input_impl() and unescape(). - Mark exception-cleanup braces, 2 GiB limits, big-endian and 32-bit code, and fall-through case labels with LCOV_EXCL_LINE. No behavior changes for any input that reaches these functions. Signed-off-by: Niels Lohmann <mail@nlohmann.me> * Tests: cover the remaining lines of the library headers Add tests for the lines of include/nlohmann that were not covered: the binary readers and writers, the lexer and locale paths, the json_view modules, the custom number, key and array types, json_pointer, json_patch, diff and the iterators. Signed-off-by: Niels Lohmann <mail@nlohmann.me> * Fix test failures in the coverage tests - unit-custom-object-key-type: remove the unused make_strict_key(strict_key) overload, the unused range constructor and default constructor, and guard data() with JSON_DIAGNOSTICS (unused-function/-member-function errors with GCC and clang -Weverything). - unit-json_view_compare: move the two new sections to the new unit-json_view_compare_values.cpp, as the object file got too large for the MinGW assembler again, and use a std::map with std::greater instead of std::unordered_map, which does not accept the incomplete basic_json (clang 3.9, icpc). - unit-json_view_dump: rename the variables that hid outer ones (MSVC C4456). - unit-stream-bulk-scan: restore the real size of the oversized get area before the adapter is destroyed (JSON_PRECISE_STREAM_POSITION reads the character at the read position), and skip the test where the streambuf cannot hold a get area larger than an int (MSVC). - unit-regression1: with JSON_NO_THREAD_LOCAL, copies are built member by member and keep correct timestamps, so check the corresponding outcome. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01N5NasAgbDGG28MqXjQvLqp Signed-off-by: Claude <noreply@anthropic.com> * Return std::size_t from the hash helper in the ordered_json test MSVC (Win32) rejected the implicit conversion of the unsigned long long product to the 32-bit std::size_t (C4244 as an error). Also note when JSON_NO_THREAD_LOCAL is set in the regression test. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01N5NasAgbDGG28MqXjQvLqp Signed-off-by: Claude <noreply@anthropic.com> --------- Signed-off-by: Niels Lohmann <mail@nlohmann.me> Signed-off-by: Claude <noreply@anthropic.com> Co-authored-by: Claude <noreply@anthropic.com>
73 lines
2.3 KiB
C++
73 lines
2.3 KiB
C++
// __ _____ _____ _____
|
|
// __| | __| | | | JSON for Modern C++ (supporting code)
|
|
// | | |__ | | | | | | version 3.12.0
|
|
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
|
|
//
|
|
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
#include "doctest_compatibility.h"
|
|
|
|
#include <nlohmann/json.hpp>
|
|
|
|
#include "custom_key_test.hpp"
|
|
|
|
// object type whose key type has implicit conversion to std::string and operator== (see custom_key_test.hpp)
|
|
using custom_key_test::json_full;
|
|
|
|
TEST_CASE("custom object key types: copy (json_full)")
|
|
{
|
|
custom_key_test::test_copy<json_full>();
|
|
}
|
|
|
|
TEST_CASE("custom object key types: parse (json_full)")
|
|
{
|
|
custom_key_test::test_parse<json_full>();
|
|
}
|
|
|
|
TEST_CASE("custom object key types: merge_patch, update, and insert (json_full)")
|
|
{
|
|
custom_key_test::test_patch<json_full>();
|
|
}
|
|
|
|
TEST_CASE("custom object key types: at() reports a missing key (json_full)")
|
|
{
|
|
custom_key_test::test_at<json_full>();
|
|
}
|
|
|
|
TEST_CASE("custom object key types: BSON (json_full)")
|
|
{
|
|
custom_key_test::test_bson<json_full>();
|
|
}
|
|
|
|
TEST_CASE("custom object key types: CBOR (json_full)")
|
|
{
|
|
custom_key_test::test_cbor<json_full>();
|
|
}
|
|
|
|
TEST_CASE("custom object key types: MessagePack (json_full)")
|
|
{
|
|
custom_key_test::test_msgpack<json_full>();
|
|
}
|
|
|
|
TEST_CASE("custom object key types: patch (json_full)")
|
|
{
|
|
// the members of a patch are found by lookup, as their keys are not std::string
|
|
const json_full j = json_full::parse(R"({"a":1,"b":[1,2],"c":{"d":2}})");
|
|
const json_full patch = json_full::parse(R"([
|
|
{"op": "add", "path": "/e", "value": 5},
|
|
{"op": "remove", "path": "/a"},
|
|
{"op": "replace", "path": "/c/d", "value": 3},
|
|
{"op": "test", "path": "/c/d", "value": 3},
|
|
{"op": "move", "from": "/e", "path": "/f"},
|
|
{"op": "copy", "from": "/f", "path": "/g"},
|
|
{"op": "add", "path": "/b/-", "value": 7}
|
|
])");
|
|
|
|
CHECK(j.patch(patch).dump() == R"({"b":[1,2,7],"c":{"d":3},"f":5,"g":5})");
|
|
|
|
// a patch with a missing member is rejected
|
|
CHECK_THROWS_AS(j.patch(json_full::parse(R"([{"op": "add", "path": "/e"}])")), json_full::parse_error&);
|
|
CHECK_THROWS_AS(j.patch(json_full::parse(R"([{"op": "test", "path": "/a", "value": 2}])")), json_full::other_error&);
|
|
}
|