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

Huge refactoring in progress...

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-29 21:18:27 +01:00
parent ba2b142c8a
commit 5cf744dbac
6 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/Issue10.cpp
View File

@ -43,10 +43,10 @@ class Issue10 : public testing::Test {
TEST_F(Issue10, PopulateArrayByAddingAnObject) {
StaticJsonBuffer<200> json;
JsonArray array = json.createArray();
JsonArray &array = json.createArray();
for (int i = 0; i < 2; i++) {
JsonObject object = json.createObject();
JsonObject &object = json.createObject();
object["id"] = persons[i].id;
object["name"] = persons[i].name;
@ -60,10 +60,10 @@ TEST_F(Issue10, PopulateArrayByAddingAnObject) {
TEST_F(Issue10, PopulateArrayByCreatingNestedObjects) {
StaticJsonBuffer<200> json;
JsonArray array = json.createArray();
JsonArray &array = json.createArray();
for (int i = 0; i < 2; i++) {
JsonObject object = array.createNestedObject();
JsonObject &object = array.createNestedObject();
object["id"] = persons[i].id;
object["name"] = persons[i].name;

11
test/JsonArray_Container_Tests.cpp
View File

@ -15,9 +15,8 @@ using namespace ArduinoJson;
class JsonArray_Container_Tests : public ::testing::Test {
protected:
virtual void SetUp() {
json.clear();
array = json.createArray();
JsonArray_Container_Tests()
: array(json.createArray()) {
}
template <typename T>
@ -33,7 +32,7 @@ class JsonArray_Container_Tests : public ::testing::Test {
void sizeMustBe(int expected) { EXPECT_EQ(expected, array.size()); }
StaticJsonBuffer<256> json;
JsonArray array;
JsonArray &array;
private:
template <typename T>
@ -92,8 +91,8 @@ TEST_F(JsonArray_Container_Tests, CanStoreStrings) {
}
TEST_F(JsonArray_Container_Tests, CanStoreNestedArrays) {
JsonArray innerarray1 = json.createArray();
JsonArray innerarray2 = json.createArray();
JsonArray &innerarray1 = json.createArray();
JsonArray &innerarray2 = json.createArray();
array.add(innerarray1);
array.add(innerarray2);

4
test/JsonArray_Iterator_Tests.cpp
View File

@ -13,7 +13,7 @@ using namespace ArduinoJson;
TEST(JsonArray_Iterator_Test, SimpleTest) {
StaticJsonBuffer<100> jsonBuffer;
JsonArray array = jsonBuffer.createArray();
JsonArray &array = jsonBuffer.createArray();
array.add(12);
array.add(34);
@ -26,5 +26,5 @@ TEST(JsonArray_Iterator_Test, SimpleTest) {
EXPECT_NE(end, it);
EXPECT_EQ(34, it->as<int>());
++it;
EXPECT_EQ(array.end(), it);
EXPECT_EQ(end, it);
}