Compare commits

...
Author SHA1 Message Date
Niels Lohmann ac2ebe8d76 Use a unique temp file in the diagnostic positions ifstream test
Since #6139, the C++11 and C++20 builds of unit-class_parser with
JSON_DIAGNOSTIC_POSITIONS run in parallel in the same directory. Both
wrote and removed the same fixed-name temp file, so one could read an
empty file ("attempting to parse an empty input"). Add a random suffix,
as unit-file_input does.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-22 19:51:05 +01:00
Niels Lohmann b64a0a6b49 Fix the AppVeyor build of develop with VS 2015 and VS 2017
unit-bon8: VS 2015 finds no unambiguous operator== for std::fpos and int,
even outside doctest's decomposition (#6128 did not help). Compare the
position as std::streamoff.

unit-ubjson_valueless: VS 2015/2017 warn C4309 (truncation of constant
value) for static_cast<std::uint8_t>(payload) with the constexpr payload
4096, which /WX turns into an error. Mask each byte before the cast.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-22 15:04:29 +01:00
3 changed files with 10 additions and 6 deletions

No files matched your search

+1 -1
View File
@@ -622,7 +622,7 @@ TEST_CASE("BON8")
// with a terminated string, strict = false leaves the next value in the stream
std::istringstream terminated(std::string("\x61\xFF\x90", 3));
CHECK(json::from_bon8(terminated, false) == "a");
CHECK((terminated.tellg() == 2));
CHECK(static_cast<std::streamoff>(terminated.tellg()) == 2);
CHECK(json::from_bon8(terminated, false) == 0);
// without the terminator, the next value would be lost
+7 -3
View File
@@ -41,6 +41,7 @@ using nlohmann::json;
#include <fstream>
#include <iterator>
#include <list>
#include <random>
#include <sstream>
#include <string>
#include <utility>
@@ -2875,13 +2876,16 @@ TEST_CASE("diagnostic positions: value lifetime, input adapters, and SAX")
SECTION("std::ifstream: positions are consistent, not npos")
{
const std::string s = R"({"a":1,"b":2})";
// the C++11 and C++20 builds of this test run in parallel in the same directory
std::random_device rd;
const std::string temp_name = "unit-class_parser_diagnostic_positions-" + std::to_string(rd()) + ".tmp";
{
std::ofstream file("unit-class_parser_diagnostic_positions.tmp");
std::ofstream file(temp_name);
file << s;
}
{
std::ifstream f("unit-class_parser_diagnostic_positions.tmp");
std::ifstream f(temp_name);
const json j = json::parse(f);
CHECK(j.start_pos() == 0);
@@ -2889,7 +2893,7 @@ TEST_CASE("diagnostic positions: value lifetime, input adapters, and SAX")
CHECK(j["a"].start_pos() == 5);
}
static_cast<void>(std::remove("unit-class_parser_diagnostic_positions.tmp"));
static_cast<void>(std::remove(temp_name.c_str()));
}
SECTION("iterator-pair input: positions are consistent, not npos")
+2 -2
View File
@@ -238,8 +238,8 @@ TEST_CASE("UBJSON the valueless elements of a whole input are bounded")
std::vector<std::uint8_t> input = {'['};
utils::append_valueless_array(input, 'Z', first_count);
input.insert(input.end(), {'[', '$', 'U', '#', 'l',
static_cast<std::uint8_t>(payload >> 24), static_cast<std::uint8_t>(payload >> 16),
static_cast<std::uint8_t>(payload >> 8), static_cast<std::uint8_t>(payload)
static_cast<std::uint8_t>((payload >> 24) & 0xFFu), static_cast<std::uint8_t>((payload >> 16) & 0xFFu),
static_cast<std::uint8_t>((payload >> 8) & 0xFFu), static_cast<std::uint8_t>(payload & 0xFFu)
});
input.insert(input.end(), payload, 0x01);
utils::append_valueless_array(input, 'Z', count);