add a switch to enable implicit conversions (defaults to true)
wrap implicit conversions tests around the JSON_USE_IMPLICIT_CONVERSIONS macro
This commit is contained in:
Théo DELRIEU
parent
2cd10a7405
commit
74b446f5fd
15 changed files with 151 additions and 64 deletions
|
|
@ -1011,21 +1011,21 @@ TEST_CASE("CBOR")
|
|||
SECTION("0 (0 00000 0000000000)")
|
||||
{
|
||||
json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x00, 0x00}));
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(d == 0.0);
|
||||
}
|
||||
|
||||
SECTION("-0 (1 00000 0000000000)")
|
||||
{
|
||||
json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x80, 0x00}));
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(d == -0.0);
|
||||
}
|
||||
|
||||
SECTION("2**-24 (0 00000 0000000001)")
|
||||
{
|
||||
json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x00, 0x01}));
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(d == std::pow(2.0, -24.0));
|
||||
}
|
||||
}
|
||||
|
|
@ -1035,7 +1035,7 @@ TEST_CASE("CBOR")
|
|||
SECTION("infinity (0 11111 0000000000)")
|
||||
{
|
||||
json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c, 0x00}));
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(d == std::numeric_limits<json::number_float_t>::infinity());
|
||||
CHECK(j.dump() == "null");
|
||||
}
|
||||
|
|
@ -1043,7 +1043,7 @@ TEST_CASE("CBOR")
|
|||
SECTION("-infinity (1 11111 0000000000)")
|
||||
{
|
||||
json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0xfc, 0x00}));
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(d == -std::numeric_limits<json::number_float_t>::infinity());
|
||||
CHECK(j.dump() == "null");
|
||||
}
|
||||
|
|
@ -1054,21 +1054,21 @@ TEST_CASE("CBOR")
|
|||
SECTION("1 (0 01111 0000000000)")
|
||||
{
|
||||
json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x3c, 0x00}));
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(d == 1);
|
||||
}
|
||||
|
||||
SECTION("-2 (1 10000 0000000000)")
|
||||
{
|
||||
json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0xc0, 0x00}));
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(d == -2);
|
||||
}
|
||||
|
||||
SECTION("65504 (0 11110 1111111111)")
|
||||
{
|
||||
json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7b, 0xff}));
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(d == 65504);
|
||||
}
|
||||
}
|
||||
|
|
@ -1076,7 +1076,7 @@ TEST_CASE("CBOR")
|
|||
SECTION("infinity")
|
||||
{
|
||||
json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c, 0x00}));
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(!std::isfinite(d));
|
||||
CHECK(j.dump() == "null");
|
||||
}
|
||||
|
|
@ -1084,7 +1084,7 @@ TEST_CASE("CBOR")
|
|||
SECTION("NaN")
|
||||
{
|
||||
json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7e, 0x00}));
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(std::isnan(d));
|
||||
CHECK(j.dump() == "null");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ TEST_CASE("constructors")
|
|||
CHECK(j.type() == json::value_t::array);
|
||||
CHECK(j == json({1, 2, 3, 4, 5}));
|
||||
|
||||
std::valarray<int> jva = j;
|
||||
auto jva = j.get<std::valarray<int>>();
|
||||
CHECK(jva.size() == va.size());
|
||||
for (size_t i = 0; i < jva.size(); ++i)
|
||||
{
|
||||
|
|
@ -356,7 +356,7 @@ TEST_CASE("constructors")
|
|||
CHECK(j.type() == json::value_t::array);
|
||||
CHECK(j == json({1.2, 2.3, 3.4, 4.5, 5.6}));
|
||||
|
||||
std::valarray<double> jva = j;
|
||||
auto jva = j.get<std::valarray<double>>();
|
||||
CHECK(jva.size() == va.size());
|
||||
for (size_t i = 0; i < jva.size(); ++i)
|
||||
{
|
||||
|
|
@ -846,7 +846,7 @@ TEST_CASE("constructors")
|
|||
CHECK(j.type() == json::value_t::number_float);
|
||||
|
||||
// check round trip of NaN
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK((std::isnan(d) && std::isnan(n)) == true);
|
||||
|
||||
// check that NaN is serialized to null
|
||||
|
|
@ -861,7 +861,7 @@ TEST_CASE("constructors")
|
|||
CHECK(j.type() == json::value_t::number_float);
|
||||
|
||||
// check round trip of infinity
|
||||
json::number_float_t d = j;
|
||||
json::number_float_t d{j};
|
||||
CHECK(d == n);
|
||||
|
||||
// check that inf is serialized to null
|
||||
|
|
|
|||
|
|
@ -189,6 +189,7 @@ TEST_CASE("value conversion")
|
|||
}
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("get an object (implicit)")
|
||||
{
|
||||
json::object_t o_reference = {{"object", json::object()},
|
||||
|
|
@ -230,6 +231,7 @@ TEST_CASE("value conversion")
|
|||
CHECK(json(o) == j);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("get an array (explicit)")
|
||||
{
|
||||
|
|
@ -276,7 +278,8 @@ TEST_CASE("value conversion")
|
|||
SECTION("reserve is called on containers that supports it")
|
||||
{
|
||||
// make sure all values are properly copied
|
||||
std::vector<int> v2 = json({1, 2, 3, 4, 5, 6, 7, 8, 9, 10});
|
||||
json j({1, 2, 3, 4, 5, 6, 7, 8, 9, 10});
|
||||
auto v2 = j.get<std::vector<int>>();
|
||||
CHECK(v2.size() == 10);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -405,6 +408,7 @@ TEST_CASE("value conversion")
|
|||
}
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("get an array (implicit)")
|
||||
{
|
||||
json::array_t a_reference{json(1), json(1u), json(2.2),
|
||||
|
|
@ -441,6 +445,7 @@ TEST_CASE("value conversion")
|
|||
CHECK(json(a) == j);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("get a string (explicit)")
|
||||
{
|
||||
|
|
@ -598,6 +603,7 @@ TEST_CASE("value conversion")
|
|||
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("get a string (implicit)")
|
||||
{
|
||||
json::string_t s_reference{"Hello world"};
|
||||
|
|
@ -623,6 +629,7 @@ TEST_CASE("value conversion")
|
|||
CHECK(json(s) == j);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("get a boolean (explicit)")
|
||||
{
|
||||
|
|
@ -695,6 +702,7 @@ TEST_CASE("value conversion")
|
|||
}
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("get a boolean (implicit)")
|
||||
{
|
||||
json::boolean_t b_reference{true};
|
||||
|
|
@ -712,6 +720,7 @@ TEST_CASE("value conversion")
|
|||
CHECK(json(b) == j);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("get an integer number (explicit)")
|
||||
{
|
||||
|
|
@ -962,6 +971,7 @@ TEST_CASE("value conversion")
|
|||
}
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("get an integer number (implicit)")
|
||||
{
|
||||
json::number_integer_t n_reference{42};
|
||||
|
|
@ -1173,6 +1183,7 @@ TEST_CASE("value conversion")
|
|||
CHECK(json(n) == j_unsigned);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("get a floating-point number (explicit)")
|
||||
{
|
||||
|
|
@ -1234,6 +1245,7 @@ TEST_CASE("value conversion")
|
|||
}
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("get a floating-point number (implicit)")
|
||||
{
|
||||
json::number_float_t n_reference{42.23};
|
||||
|
|
@ -1257,6 +1269,7 @@ TEST_CASE("value conversion")
|
|||
CHECK(json(n).m_value.number_float == Approx(j.m_value.number_float));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("get a binary value (explicit)")
|
||||
{
|
||||
|
|
@ -1364,6 +1377,7 @@ TEST_CASE("value conversion")
|
|||
}
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("get a binary value (implicit)")
|
||||
{
|
||||
json::binary_t n_reference{{1, 2, 3}};
|
||||
|
|
@ -1375,6 +1389,7 @@ TEST_CASE("value conversion")
|
|||
CHECK(*json(b).m_value.binary == *j.m_value.binary);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("get an enum")
|
||||
{
|
||||
|
|
@ -1481,15 +1496,15 @@ TEST_CASE("value conversion")
|
|||
SECTION("std::array is larger than JSON")
|
||||
{
|
||||
std::array<int, 6> arr6 = {{1, 2, 3, 4, 5, 6}};
|
||||
CHECK_THROWS_AS(arr6 = j1, json::out_of_range&);
|
||||
CHECK_THROWS_WITH(arr6 = j1, "[json.exception.out_of_range.401] "
|
||||
CHECK_THROWS_AS(j1.get_to(arr6), json::out_of_range&);
|
||||
CHECK_THROWS_WITH(j1.get_to(arr6), "[json.exception.out_of_range.401] "
|
||||
"array index 4 is out of range");
|
||||
}
|
||||
|
||||
SECTION("std::array is smaller than JSON")
|
||||
{
|
||||
std::array<int, 2> arr2 = {{8, 9}};
|
||||
arr2 = j1;
|
||||
j1.get_to(arr2);
|
||||
CHECK(arr2[0] == 1);
|
||||
CHECK(arr2[1] == 2);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -174,9 +174,9 @@ TEST_CASE("README" * doctest::skip())
|
|||
}
|
||||
|
||||
// getter/setter
|
||||
const std::string tmp = j[0];
|
||||
const auto tmp = j[0].get<std::string>();
|
||||
j[1] = 42;
|
||||
bool foo = j.at(2);
|
||||
bool foo{j.at(2)};
|
||||
CHECK(foo == true);
|
||||
|
||||
// other stuff
|
||||
|
|
@ -258,18 +258,18 @@ TEST_CASE("README" * doctest::skip())
|
|||
// strings
|
||||
std::string s1 = "Hello, world!";
|
||||
json js = s1;
|
||||
std::string s2 = js;
|
||||
auto s2 = js.get<std::string>();
|
||||
|
||||
// Booleans
|
||||
bool b1 = true;
|
||||
json jb = b1;
|
||||
bool b2 = jb;
|
||||
bool b2{jb};
|
||||
CHECK(b2 == true);
|
||||
|
||||
// numbers
|
||||
int i = 42;
|
||||
json jn = i;
|
||||
double f = jn;
|
||||
double f{jn};
|
||||
CHECK(f == 42);
|
||||
|
||||
// etc.
|
||||
|
|
|
|||
|
|
@ -240,12 +240,12 @@ TEST_CASE("regression tests")
|
|||
{
|
||||
json j1 = NAN;
|
||||
CHECK(j1.is_number_float());
|
||||
json::number_float_t f1 = j1;
|
||||
json::number_float_t f1{j1};
|
||||
CHECK(std::isnan(f1));
|
||||
|
||||
json j2 = json::number_float_t(NAN);
|
||||
CHECK(j2.is_number_float());
|
||||
json::number_float_t f2 = j2;
|
||||
json::number_float_t f2{j2};
|
||||
CHECK(std::isnan(f2));
|
||||
}
|
||||
|
||||
|
|
@ -253,12 +253,12 @@ TEST_CASE("regression tests")
|
|||
{
|
||||
json j1 = INFINITY;
|
||||
CHECK(j1.is_number_float());
|
||||
json::number_float_t f1 = j1;
|
||||
json::number_float_t f1{j1};
|
||||
CHECK(!std::isfinite(f1));
|
||||
|
||||
json j2 = json::number_float_t(INFINITY);
|
||||
CHECK(j2.is_number_float());
|
||||
json::number_float_t f2 = j2;
|
||||
json::number_float_t f2{j2};
|
||||
CHECK(!std::isfinite(f2));
|
||||
}
|
||||
}
|
||||
|
|
@ -332,11 +332,11 @@ TEST_CASE("regression tests")
|
|||
json j;
|
||||
ss >> j;
|
||||
|
||||
std::string test = j["Test"];
|
||||
auto test = j["Test"].get<std::string>();
|
||||
CHECK(test == "Test1");
|
||||
int number = j["Number"];
|
||||
int number{j["Number"]};
|
||||
CHECK(number == 100);
|
||||
float foo = j["Foo"];
|
||||
float foo{j["Foo"]};
|
||||
CHECK(static_cast<double>(foo) == Approx(42.42));
|
||||
}
|
||||
|
||||
|
|
@ -453,6 +453,7 @@ TEST_CASE("regression tests")
|
|||
CHECK(j["string"] == "\u0007\u0007");
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("issue #144 - implicit assignment to std::string fails")
|
||||
{
|
||||
json o = {{"name", "value"}};
|
||||
|
|
@ -470,6 +471,7 @@ TEST_CASE("regression tests")
|
|||
CHECK_THROWS_AS(s2 = o["int"], json::type_error);
|
||||
CHECK_THROWS_WITH(s2 = o["int"], "[json.exception.type_error.302] type must be string, but is number");
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("issue #146 - character following a surrogate pair is skipped")
|
||||
{
|
||||
|
|
@ -689,7 +691,7 @@ TEST_CASE("regression tests")
|
|||
{"object", {{"key1", 1}, {"key2", 2}}},
|
||||
};
|
||||
|
||||
int at_integer = j.at("/object/key2"_json_pointer);
|
||||
int at_integer{j.at("/object/key2"_json_pointer)};
|
||||
int val_integer = j.value("/object/key2"_json_pointer, 0);
|
||||
|
||||
CHECK(at_integer == val_integer);
|
||||
|
|
@ -1233,6 +1235,7 @@ TEST_CASE("regression tests")
|
|||
CHECK(j["double_value"].is_number_float());
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("issue #464 - VS2017 implicit to std::string conversion fix")
|
||||
{
|
||||
json v = "test";
|
||||
|
|
@ -1240,6 +1243,7 @@ TEST_CASE("regression tests")
|
|||
test = v;
|
||||
CHECK(v == "test");
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("issue #465 - roundtrip error while parsing 1000000000000000010E5")
|
||||
{
|
||||
|
|
@ -1250,6 +1254,7 @@ TEST_CASE("regression tests")
|
|||
CHECK(s1 == s2);
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("issue #473 - inconsistent behavior in conversion to array type")
|
||||
{
|
||||
json j_array = {1, 2, 3, 4};
|
||||
|
|
@ -1298,6 +1303,7 @@ TEST_CASE("regression tests")
|
|||
CHECK_THROWS_WITH(create(j_null), "[json.exception.type_error.302] type must be array, but is null");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("issue #486 - json::value_t can't be a map's key type in VC++ 2015")
|
||||
{
|
||||
|
|
@ -1377,6 +1383,7 @@ TEST_CASE("regression tests")
|
|||
CHECK_THROWS_AS(_ = json::parse(vec), json::parse_error&);
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("issue #600 - how does one convert a map in Json back to std::map?")
|
||||
{
|
||||
SECTION("example 1")
|
||||
|
|
@ -1409,6 +1416,7 @@ TEST_CASE("regression tests")
|
|||
CHECK(m1 == m2);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("issue #602 - BOM not skipped when using json:parse(iterator)")
|
||||
{
|
||||
|
|
@ -1417,6 +1425,7 @@ TEST_CASE("regression tests")
|
|||
CHECK_NOTHROW(_ = json::parse(i.begin(), i.end()));
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("issue #702 - conversion from valarray<double> to json fails to build")
|
||||
{
|
||||
SECTION("original example")
|
||||
|
|
@ -1445,6 +1454,7 @@ TEST_CASE("regression tests")
|
|||
"[json.exception.type_error.302] type must be array, but is null");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("issue #367 - Behavior of operator>> should more closely resemble that of built-in overloads.")
|
||||
{
|
||||
|
|
@ -1456,9 +1466,9 @@ TEST_CASE("regression tests")
|
|||
i1_2_3 >> j2;
|
||||
i1_2_3 >> j3;
|
||||
|
||||
std::map<std::string, std::string> m1 = j1;
|
||||
std::map<std::string, std::string> m2 = j2;
|
||||
int i3 = j3;
|
||||
auto m1 = j1.get<std::map<std::string, std::string>>();
|
||||
auto m2 = j2.get<std::map<std::string, std::string>>();
|
||||
int i3{j3};
|
||||
|
||||
CHECK( m1 == ( std::map<std::string, std::string> {{ "first", "one" }} ));
|
||||
CHECK( m2 == ( std::map<std::string, std::string> {{ "second", "two" }} ));
|
||||
|
|
@ -1513,6 +1523,7 @@ TEST_CASE("regression tests")
|
|||
CHECK_THROWS_WITH(j.dump(), "[json.exception.type_error.316] invalid UTF-8 byte at index 10: 0x7E");
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("issue #843 - converting to array not working")
|
||||
{
|
||||
json j;
|
||||
|
|
@ -1520,6 +1531,7 @@ TEST_CASE("regression tests")
|
|||
j = ar;
|
||||
ar = j;
|
||||
}
|
||||
#endif
|
||||
|
||||
SECTION("issue #894 - invalid RFC6902 copy operation succeeds")
|
||||
{
|
||||
|
|
@ -1632,7 +1644,7 @@ TEST_CASE("regression tests")
|
|||
SECTION("issue #977 - Assigning between different json types")
|
||||
{
|
||||
foo_json lj = ns::foo{3};
|
||||
ns::foo ff = lj;
|
||||
ns::foo ff(lj);
|
||||
CHECK(lj.is_object());
|
||||
CHECK(lj.size() == 1);
|
||||
CHECK(lj["x"] == 3);
|
||||
|
|
@ -1880,7 +1892,7 @@ TEST_CASE("regression tests")
|
|||
{
|
||||
{
|
||||
json j;
|
||||
NonDefaultFromJsonStruct x = j;
|
||||
NonDefaultFromJsonStruct x(j);
|
||||
NonDefaultFromJsonStruct y;
|
||||
CHECK(x == y);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -312,6 +312,7 @@ TEST_CASE("basic usage" * doctest::test_suite("udt"))
|
|||
CHECK(name.m_val == "new name");
|
||||
}
|
||||
|
||||
#if JSON_USE_IMPLICIT_CONVERSIONS
|
||||
SECTION("implicit conversions")
|
||||
{
|
||||
const udt::contact_book parsed_book = big_json;
|
||||
|
|
@ -335,6 +336,7 @@ TEST_CASE("basic usage" * doctest::test_suite("udt"))
|
|||
CHECK(book_name == udt::name{"C++"});
|
||||
CHECK(book == parsed_book);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRU
|
|||
CHECK(json(p1).dump() == "{\"age\":1,\"metadata\":{\"haircuts\":2},\"name\":\"Erik\"}");
|
||||
|
||||
// deserialization
|
||||
T p2 = json(p1);
|
||||
auto p2 = json(p1).get<T>();
|
||||
CHECK(p2 == p1);
|
||||
|
||||
// roundtrip
|
||||
|
|
@ -253,8 +253,7 @@ TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRU
|
|||
// check exception in case of missing field
|
||||
json j = json(p1);
|
||||
j.erase("age");
|
||||
T p3;
|
||||
CHECK_THROWS_WITH_AS(p3 = json(j), "[json.exception.out_of_range.403] key 'age' not found", json::out_of_range);
|
||||
CHECK_THROWS_WITH_AS(j.get<T>(), "[json.exception.out_of_range.403] key 'age' not found", json::out_of_range);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1168,7 +1168,7 @@ TEST_CASE("Unicode" * doctest::skip())
|
|||
continue;
|
||||
}
|
||||
|
||||
std::string ptr = s;
|
||||
auto ptr = s.get<std::string>();
|
||||
|
||||
// tilde must be followed by 0 or 1
|
||||
if (ptr == "~")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue