From 1a98fd5dfcb3ab93aa2c4d5d476eefa2be92d791 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Wed, 1 Oct 2014 15:47:32 +0200 Subject: [PATCH] Serialize inner objects --- srcs/JsonNodeSerializer.cpp | 3 +++ tests/JsonObjectSerializationTests.cpp | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/srcs/JsonNodeSerializer.cpp b/srcs/JsonNodeSerializer.cpp index e33e8bf1..f7394933 100644 --- a/srcs/JsonNodeSerializer.cpp +++ b/srcs/JsonNodeSerializer.cpp @@ -22,6 +22,9 @@ size_t JsonNodeSerializer::serialize(const JsonNode* node) case JSON_BOOLEAN: return _sink.print(node->content.asBoolean ? "true" : "false"); + + case JSON_PROXY: + return serialize(node->content.asProxy.target); } if (node->type >= JSON_DOUBLE_0_DECIMALS) diff --git a/tests/JsonObjectSerializationTests.cpp b/tests/JsonObjectSerializationTests.cpp index 07f7d89d..74707208 100644 --- a/tests/JsonObjectSerializationTests.cpp +++ b/tests/JsonObjectSerializationTests.cpp @@ -21,8 +21,6 @@ protected: } JsonObject object; - -private: StaticJsonBuffer<5> json; }; @@ -134,12 +132,12 @@ TEST_F(JsonObjectSerializationTests, OneEmptyNestedArray) outputMustBe("{\"key\":[]}"); } - +*/ TEST_F(JsonObjectSerializationTests, OneEmptyNestedObject) { - auto nestedObject = JsonObject<1>(); + auto nestedObject = json.createObject(); object["key"] = nestedObject; outputMustBe("{\"key\":{}}"); -}*/ \ No newline at end of file +} \ No newline at end of file