External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add regression tests for #3204 and #3333

Browse Source
This commit is contained in:
Florian Albrechtskirchinger 2022-07-30 09:58:09 +02:00
parent e3095f636f
commit 062702aed5
No known key found for this signature in database
GPG Key ID: 19618CE9B2D4BE6D
1 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
tests/src/unit-regression2.cpp
View File

@ -270,6 +270,56 @@ inline void from_json(const json& j, for_3312& obj)
} }
#endif #endif
/////////////////////////////////////////////////////////////////////
// for #3204
/////////////////////////////////////////////////////////////////////
struct for_3204_foo
{
for_3204_foo() = default;
for_3204_foo(std::string /*unused*/) {}
};
struct for_3204_bar
{
enum constructed_from_t
{
constructed_from_none = 0,
constructed_from_foo = 1,
constructed_from_json = 2
};
for_3204_bar(std::function<void(for_3204_foo)> /*unused*/) // NOLINT(performance-unnecessary-value-param)
: constructed_from(constructed_from_foo) {}
for_3204_bar(std::function<void(json)> /*unused*/) // NOLINT(performance-unnecessary-value-param)
: constructed_from(constructed_from_json) {}
constructed_from_t constructed_from = constructed_from_none;
};
/////////////////////////////////////////////////////////////////////
// for #3333
/////////////////////////////////////////////////////////////////////
struct for_3333 final
{
for_3333(int x_ = 0, int y_ = 0) : x(x_), y(y_) {}
template <class T>
for_3333(const T& /*unused*/)
{
CHECK(false);
}
int x = 0;
int y = 0;
};
template <>
inline for_3333::for_3333(const json& json)
: for_3333(json.value("x", 0), json.value("y", 0))
{}
TEST_CASE("regression tests 2") TEST_CASE("regression tests 2")
{ {
SECTION("issue #1001 - Fix memory leak during parser callback") SECTION("issue #1001 - Fix memory leak during parser callback")
@ -862,6 +912,28 @@ TEST_CASE("regression tests 2")
CHECK(a2.type() == typeid(j)); CHECK(a2.type() == typeid(j));
} }
#endif #endif
SECTION("issue #3204 - ambiguous regression")
{
for_3204_bar bar_from_foo([](for_3204_foo) {});
for_3204_bar bar_from_json([](json) {});
CHECK(bar_from_foo.constructed_from == for_3204_bar::constructed_from_foo);
CHECK(bar_from_json.constructed_from == for_3204_bar::constructed_from_json);
}
SECTION("issue #3333 - Ambiguous conversion from nlohmann::basic_json<> to custom class")
{
const json j
{
{"x", 1},
{"y", 2}
};
for_3333 p = j;
CHECK(p.x == 1);
CHECK(p.y == 2);
}
} }
DOCTEST_CLANG_SUPPRESS_WARNING_POP DOCTEST_CLANG_SUPPRESS_WARNING_POP