Merged JsonArrayIterator and JsonObjectIterator into a one template class

This commit is contained in:
Benoit Blanchon
2014-10-24 18:53:03 +02:00
parent 1f6cd8e56e
commit 582216e004
11 changed files with 45 additions and 69 deletions

View File

@ -17,8 +17,8 @@ TEST(JsonArray_Iterator_Test, SimpleTest) {
array.add(12);
array.add(34);
JsonArrayIterator it = array.begin();
JsonArrayIterator end = array.end();
JsonArray::iterator it = array.begin();
JsonArray::iterator end = array.end();
EXPECT_NE(end, it);
EXPECT_EQ(12, it->as<int>());

View File

@ -17,8 +17,8 @@ TEST(JsonObject_Iterator_Test, SimpleTest) {
object["ab"] = 12;
object["cd"] = 34;
JsonObjectIterator it = object.begin();
JsonObjectIterator end = object.end();
JsonObject::iterator it = object.begin();
JsonObject::iterator end = object.end();
EXPECT_NE(end, it);
EXPECT_STREQ("ab", it->key());

View File

@ -7,6 +7,7 @@
#include <gtest/gtest.h>
#include <ArduinoJson/StaticJsonBuffer.hpp>
#include <ArduinoJson/JsonValue.hpp>
#include "Printers.hpp"
using namespace ArduinoJson;