j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

from_json: add overload for std::unordered_map

Browse source 
Fixes #1133
This commit is contained in:
Théo DELRIEU 2018-06-18 10:53:30 +02:00
parent 299469cfd5
commit 2b37d7ed86
No known key found for this signature in database
GPG key ID: A5A505438C20539A
2 changed files with 66 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

50
test/src/unit-conversions.cpp
View file

@ -40,6 +40,14 @@ using nlohmann::json;
#include <unordered_set>
#include <valarray>
namespace
{
template <typename MapType>
void map_type_conversion_checks()
{
}
}
TEST_CASE("value conversion")
{
SECTION("get an object (explicit)")
@ -1088,14 +1096,48 @@ TEST_CASE("value conversion")
CHECK(m == m2);
json j7 = {0, 1, 2, 3};
json j8 = 2;
CHECK_THROWS_AS((j7.get<std::map<int, int>>()), json::type_error&);
CHECK_THROWS_WITH((j7.get<std::map<int, int>>()), "[json.exception.type_error.302] type must be array, but is number");
CHECK_THROWS_AS((j8.get<std::map<int, int>>()), json::type_error&);
CHECK_THROWS_WITH((j7.get<std::map<int, int>>()),
"[json.exception.type_error.302] type must be array, "
"but is number");
CHECK_THROWS_WITH((j8.get<std::map<int, int>>()),
"[json.exception.type_error.302] type must be array, "
"but is number");
SECTION("superfluous entries")
{
json j8 = {{0, 1, 2}, {1, 2, 3}, {2, 3, 4}};
m2 = j8.get<std::map<int, int>>();
CHECK(m == m2);
json j9 = {{0, 1, 2}, {1, 2, 3}, {2, 3, 4}};
m2 = j9.get<std::map<int, int>>();
CHECK(m == m2);
}
}
SECTION("std::unordered_map (array of pairs)")
{
std::unordered_map<int, int> m{{0, 1}, {1, 2}, {2, 3}};
json j6 = m;
auto m2 = j6.get<std::unordered_map<int, int>>();
CHECK(m == m2);
json j7 = {0, 1, 2, 3};
json j8 = 2;
CHECK_THROWS_AS((j7.get<std::unordered_map<int, int>>()), json::type_error&);
CHECK_THROWS_AS((j8.get<std::unordered_map<int, int>>()), json::type_error&);
CHECK_THROWS_WITH((j7.get<std::unordered_map<int, int>>()),
"[json.exception.type_error.302] type must be array, "
"but is number");
CHECK_THROWS_WITH((j8.get<std::unordered_map<int, int>>()),
"[json.exception.type_error.302] type must be array, "
"but is number");
SECTION("superfluous entries")
{
json j9{{0, 1, 2}, {1, 2, 3}, {2, 3, 4}};
m2 = j9.get<std::unordered_map<int, int>>();
CHECK(m == m2);
}
}