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

✏️ cleanup after #598

Browse source
This commit is contained in:
Niels Lohmann 2017-06-06 20:48:11 +02:00
parent bfdf0d1ce6
commit 92ef19696a
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 51 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -840,6 +840,7 @@ I deeply appreciate the help of the following people.
- [tinloaf](https://github.com/tinloaf) made sure all pushed warnings are properly popped. - [tinloaf](https://github.com/tinloaf) made sure all pushed warnings are properly popped.
- [Fytch](https://github.com/Fytch) found a bug in the documentation. - [Fytch](https://github.com/Fytch) found a bug in the documentation.
- [Jay Sistar](https://github.com/Type1J) implemented a Meson build description - [Jay Sistar](https://github.com/Type1J) implemented a Meson build description
- [Henry Lee](https://github.com/HenryRLee) fixed a warning in ICC
Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone. Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone.

100
test/src/unit-iterators1.cpp
View file

@ -1513,70 +1513,70 @@ TEST_CASE("iterators 1")
} }
SECTION("conversion from iterator to const iterator") SECTION("conversion from iterator to const iterator")
{ {
SECTION("boolean") SECTION("boolean")
{ {
json j = true; json j = true;
json::const_iterator it = j.begin(); json::const_iterator it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
it = j.begin(); it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
} }
SECTION("string") SECTION("string")
{ {
json j = "hello world"; json j = "hello world";
json::const_iterator it = j.begin(); json::const_iterator it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
it = j.begin(); it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
} }
SECTION("array") SECTION("array")
{ {
json j = {1, 2, 3}; json j = {1, 2, 3};
json::const_iterator it = j.begin(); json::const_iterator it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
it = j.begin(); it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
} }
SECTION("object") SECTION("object")
{ {
json j = {{"A", 1}, {"B", 2}, {"C", 3}}; json j = {{"A", 1}, {"B", 2}, {"C", 3}};
json::const_iterator it = j.begin(); json::const_iterator it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
it = j.begin(); it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
} }
SECTION("number (integer)") SECTION("number (integer)")
{ {
json j = 23; json j = 23;
json::const_iterator it = j.begin(); json::const_iterator it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
it = j.begin(); it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
} }
SECTION("number (unsigned)") SECTION("number (unsigned)")
{ {
json j = 23u; json j = 23u;
json::const_iterator it = j.begin(); json::const_iterator it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
it = j.begin(); it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
} }
SECTION("number (float)") SECTION("number (float)")
{ {
json j = 23.42; json j = 23.42;
json::const_iterator it = j.begin(); json::const_iterator it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
it = j.begin(); it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
} }
SECTION("null") SECTION("null")
{ {
json j = nullptr; json j = nullptr;
json::const_iterator it = j.begin(); json::const_iterator it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
it = j.begin(); it = j.begin();
CHECK(it == j.cbegin()); CHECK(it == j.cbegin());
} }
} }
} }