github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 08:42:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added a test that adds a empty nested array in an array

Browse Source
This commit is contained in:
Benoît Blanchon
2014-06-25 13:28:56 +02:00
parent 4c387e9062
commit b8df795cb5
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
JsonGeneratorTests/JsonArray.h
View File

@@ -38,6 +38,13 @@ public:
addItem(JSON_BOOLEAN, v);
}
void add(JsonObjectBase& value)
{
JsonObjectValue v;
v.object = &value;
addItem(JSON_OBJECT, v);
}
void writeTo(char* buffer, size_t bufferSize)
{
StringBuilder sb(buffer, bufferSize);

5
JsonGeneratorTests/JsonArrayTests.cpp
View File

@@ -102,18 +102,15 @@ namespace JsonGeneratorTests
AssertJsonIs("[false,true]");
}
/*
TEST_METHOD(AddOneEmptyNestedArray)
{
JsonArray<0> nestedArray;
JsonArray<1> nestedArray;
arr.add(nestedArray);
AssertJsonIs("[[]]");
}
*/
void AssertJsonIs(const char* expected)
{
char buffer[256];

17
JsonGeneratorTests/JsonObjectBase.h
View File

@@ -21,13 +21,15 @@ protected:
JSON_STRING,
JSON_NUMBER,
JSON_BOOLEAN,
JSON_OBJECT,
};
union JsonObjectValue
{
const char* string;
double number;
bool boolean;
const char* string;
double number;
bool boolean;
JsonObjectBase* object;
};
struct JsonObject
@@ -36,7 +38,7 @@ protected:
JsonObjectValue value;
};
void writeObjectTo(const JsonObject& obj, StringBuilder& sb)
void writeObjectTo(JsonObject& obj, StringBuilder& sb)
{
switch (obj.type)
{
@@ -54,6 +56,13 @@ protected:
case JSON_BOOLEAN:
sb.append(obj.value.boolean ? "true" : "false");
break;
case JSON_OBJECT:
if (obj.value.object)
obj.value.object->writeTo(sb);
else
sb.append("null");
break;
}
}
};