From 1d103a15284daf1b380c4423be962ace2fb818f8 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Wed, 27 Apr 2022 14:58:37 +0200 Subject: [PATCH] MemberProxy: move tests for `createNestedArray()` and `createNestedObject()` --- extras/tests/JsonDocument/MemberProxy.cpp | 33 +++++++++++++++++++++++ extras/tests/JsonVariant/createNested.cpp | 28 ------------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/extras/tests/JsonDocument/MemberProxy.cpp b/extras/tests/JsonDocument/MemberProxy.cpp index 64cd06a0..087f5392 100644 --- a/extras/tests/JsonDocument/MemberProxy.cpp +++ b/extras/tests/JsonDocument/MemberProxy.cpp @@ -285,3 +285,36 @@ TEST_CASE("MemberProxy cast to JsonVariant") { CHECK(doc.as() == "{\"hello\":\"toto\"}"); } + +TEST_CASE("MemberProxy::createNestedArray()") { + StaticJsonDocument<1024> doc; + JsonArray arr = doc["items"].createNestedArray(); + arr.add(42); + + CHECK(doc["items"][0][0] == 42); +} + +TEST_CASE("MemberProxy::createNestedArray(key)") { + StaticJsonDocument<1024> doc; + JsonArray arr = doc["weather"].createNestedArray("temp"); + arr.add(42); + + CHECK(doc["weather"]["temp"][0] == 42); +} + +TEST_CASE("MemberProxy::createNestedObject()") { + StaticJsonDocument<1024> doc; + JsonObject obj = doc["items"].createNestedObject(); + obj["value"] = 42; + + CHECK(doc["items"][0]["value"] == 42); +} + +TEST_CASE("MemberProxy::createNestedObject(key)") { + StaticJsonDocument<1024> doc; + JsonObject obj = doc["status"].createNestedObject("weather"); + obj["temp"] = 42; + + CHECK(doc["status"]["weather"]["temp"] == 42); +} + diff --git a/extras/tests/JsonVariant/createNested.cpp b/extras/tests/JsonVariant/createNested.cpp index 34c74c47..efd75015 100644 --- a/extras/tests/JsonVariant/createNested.cpp +++ b/extras/tests/JsonVariant/createNested.cpp @@ -18,13 +18,6 @@ TEST_CASE("JsonVariant::createNestedObject()") { REQUIRE(variant[0]["value"] == 42); REQUIRE(obj.isNull() == false); } - - SECTION("works on MemberProxy") { - JsonObject obj = variant["items"].createNestedObject(); - obj["value"] = 42; - - REQUIRE(variant["items"][0]["value"] == 42); - } } TEST_CASE("JsonVariant::createNestedArray()") { @@ -37,13 +30,6 @@ TEST_CASE("JsonVariant::createNestedArray()") { REQUIRE(variant.is() == true); REQUIRE(arr.isNull() == false); } - - SECTION("works on MemberProxy") { - JsonArray arr = variant["items"].createNestedArray(); - arr.add(42); - - REQUIRE(variant["items"][0][0] == 42); - } } TEST_CASE("JsonVariant::createNestedObject(key)") { @@ -57,13 +43,6 @@ TEST_CASE("JsonVariant::createNestedObject(key)") { REQUIRE(variant.is() == true); REQUIRE(variant["weather"]["temp"] == 42); } - - SECTION("works on MemberProxy") { - JsonObject obj = variant["status"].createNestedObject("weather"); - obj["temp"] = 42; - - REQUIRE(variant["status"]["weather"]["temp"] == 42); - } } TEST_CASE("JsonVariant::createNestedArray(key)") { @@ -76,11 +55,4 @@ TEST_CASE("JsonVariant::createNestedArray(key)") { REQUIRE(variant.is() == true); REQUIRE(arr.isNull() == false); } - - SECTION("works on MemberProxy") { - JsonArray arr = variant["weather"].createNestedArray("temp"); - arr.add(42); - - REQUIRE(variant["weather"]["temp"][0] == 42); - } }