feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Merge branch 'merge-parser-and-generator' of github.com:bblanchon/ArduinoJson into merge-parser-and-generator

Browse Source 
Conflicts:
	test/JsonObject_Iterator_Tests.cpp
This commit is contained in:
Benoit Blanchon
2014-10-23 17:43:40 +02:00
parent 451c0ee70d e4779512e6
commit ff5f3f3a2c
7 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/JsonObject_Iterator_Tests.cpp
View File

@ -17,11 +17,10 @@ TEST(JsonObject_Iterator_Test, SimpleTest)
EXPECT_NE(end, it);
EXPECT_STREQ("ab", it->key());
EXPECT_EQ(12, static_cast<int>(it->value()));
++it;
EXPECT_EQ(12, it->value().as<int>()); ++it;
EXPECT_NE(end, it);
EXPECT_STREQ("cd", it->key());
EXPECT_EQ(34, static_cast<int>(it->value()));
EXPECT_EQ(34, it->value().as<int>());
++it;
EXPECT_EQ(object.end(), it);
}