🚨 fix warning
This commit is contained in:
parent
67ed63b196
commit
e22cbacc41
6 changed files with 12 additions and 12 deletions
25
test/src/test_utils.hpp
Normal file
25
test/src/test_utils.hpp
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
#pragma once
|
||||
|
||||
#include <cstdint> // uint8_t
|
||||
#include <fstream> // ifstream, istreambuf_iterator, ios
|
||||
#include <vector> // vector
|
||||
|
||||
namespace utils
|
||||
{
|
||||
|
||||
inline std::vector<std::uint8_t> read_binary_file(const std::string& filename)
|
||||
{
|
||||
std::ifstream file(filename, std::ios::binary);
|
||||
file.unsetf(std::ios::skipws);
|
||||
|
||||
file.seekg(0, std::ios::end);
|
||||
const auto size = file.tellg();
|
||||
file.seekg(0, std::ios::beg);
|
||||
|
||||
std::vector<std::uint8_t> byte_vector;
|
||||
byte_vector.reserve(static_cast<std::size_t>(size));
|
||||
byte_vector.insert(byte_vector.begin(), std::istream_iterator<std::uint8_t>(file), std::istream_iterator<std::uint8_t>());
|
||||
return byte_vector;
|
||||
}
|
||||
|
||||
} // namespace utils
|
||||
|
|
@ -35,7 +35,7 @@ using nlohmann::json;
|
|||
#include <fstream>
|
||||
#include <sstream>
|
||||
#include <test_data.hpp>
|
||||
#include <test_utils.hpp>
|
||||
#include "test_utils.hpp"
|
||||
|
||||
TEST_CASE("BSON")
|
||||
{
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ using nlohmann::json;
|
|||
#include <iostream>
|
||||
#include <set>
|
||||
#include <test_data.hpp>
|
||||
#include <test_utils.hpp>
|
||||
#include "test_utils.hpp"
|
||||
|
||||
namespace
|
||||
{
|
||||
|
|
@ -2709,19 +2709,19 @@ TEST_CASE("Tagged values")
|
|||
SECTION("tagged binary")
|
||||
{
|
||||
// create a binary value of subtype 42
|
||||
json j;
|
||||
j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
|
||||
json j_binary;
|
||||
j_binary["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
|
||||
|
||||
// convert to CBOR
|
||||
const auto v = json::to_cbor(j);
|
||||
CHECK(v == std::vector<std::uint8_t> {0xA1, 0x66, 0x62, 0x69, 0x6E, 0x61, 0x72, 0x79, 0xD8, 0x2A, 0x44, 0xCA, 0xFE, 0xBA, 0xBE});
|
||||
const auto vec = json::to_cbor(j_binary);
|
||||
CHECK(vec == std::vector<std::uint8_t> {0xA1, 0x66, 0x62, 0x69, 0x6E, 0x61, 0x72, 0x79, 0xD8, 0x2A, 0x44, 0xCA, 0xFE, 0xBA, 0xBE});
|
||||
|
||||
// parse error when parsing tagged value
|
||||
CHECK_THROWS_AS(json::from_cbor(v), json::parse_error);
|
||||
CHECK_THROWS_WITH(json::from_cbor(v), "[json.exception.parse_error.112] parse error at byte 9: syntax error while parsing CBOR value: invalid byte: 0xD8");
|
||||
CHECK_THROWS_AS(json::from_cbor(vec), json::parse_error);
|
||||
CHECK_THROWS_WITH(json::from_cbor(vec), "[json.exception.parse_error.112] parse error at byte 9: syntax error while parsing CBOR value: invalid byte: 0xD8");
|
||||
|
||||
// binary without subtype when tags are ignored
|
||||
json jb = json::from_cbor(v, true, true, json::cbor_tag_handler_t::ignore);
|
||||
json jb = json::from_cbor(vec, true, true, json::cbor_tag_handler_t::ignore);
|
||||
CHECK(jb.is_object());
|
||||
CHECK(jb["binary"].is_binary());
|
||||
CHECK(!jb["binary"].get_binary().has_subtype());
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ using nlohmann::json;
|
|||
#include <iomanip>
|
||||
#include <set>
|
||||
#include <test_data.hpp>
|
||||
#include <test_utils.hpp>
|
||||
#include "test_utils.hpp"
|
||||
|
||||
namespace
|
||||
{
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ using nlohmann::json;
|
|||
#include <fstream>
|
||||
#include <set>
|
||||
#include <test_data.hpp>
|
||||
#include <test_utils.hpp>
|
||||
#include "test_utils.hpp"
|
||||
|
||||
namespace
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue