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

Remove createNestedArray() and createNestedObject()

Browse Source
This commit is contained in:
Benoit Blanchon
2023-08-09 11:31:29 +02:00
parent cdc1262127
commit 7f459adc4b
37 changed files with 99 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extras/tests/JsonArray/CMakeLists.txt
View File

@ -7,7 +7,6 @@ add_executable(JsonArrayTests
clear.cpp
compare.cpp
copyArray.cpp
createNested.cpp
equals.cpp
isNull.cpp
iterator.cpp

96
extras/tests/JsonArray/compare.cpp
View File

@ -43,15 +43,15 @@ TEST_CASE("Compare JsonArray with JsonArray") {
}
SECTION("Compare with identical array") {
JsonArray array1 = doc.createNestedArray();
JsonArray array1 = doc.add<JsonArray>();
array1.add(1);
array1.add("hello");
array1.createNestedObject();
array1.add<JsonObject>();
JsonArray array2 = doc.createNestedArray();
JsonArray array2 = doc.add<JsonArray>();
array2.add(1);
array2.add("hello");
array2.createNestedObject();
array2.add<JsonObject>();
CHECK(array1 == array2);
CHECK(array1 <= array2);
@ -62,15 +62,15 @@ TEST_CASE("Compare JsonArray with JsonArray") {
}
SECTION("Compare with different array") {
JsonArray array1 = doc.createNestedArray();
JsonArray array1 = doc.add<JsonArray>();
array1.add(1);
array1.add("hello1");
array1.createNestedObject();
array1.add<JsonObject>();
JsonArray array2 = doc.createNestedArray();
JsonArray array2 = doc.add<JsonArray>();
array2.add(1);
array2.add("hello2");
array2.createNestedObject();
array2.add<JsonObject>();
CHECK(array1 != array2);
CHECK_FALSE(array1 == array2);
@ -107,15 +107,15 @@ TEST_CASE("Compare JsonArray with JsonVariant") {
}
SECTION("Compare with identical array") {
JsonArray array = doc.createNestedArray();
JsonArray array = doc.add<JsonArray>();
array.add(1);
array.add("hello");
array.createNestedObject();
array.add<JsonObject>();
JsonVariant variant = doc.createNestedArray();
JsonVariant variant = doc.add<JsonArray>();
variant.add(1);
variant.add("hello");
variant.createNestedObject();
variant.add<JsonObject>();
CHECK(array == variant);
CHECK(array <= variant);
@ -133,15 +133,15 @@ TEST_CASE("Compare JsonArray with JsonVariant") {
}
SECTION("Compare with different array") {
JsonArray array = doc.createNestedArray();
JsonArray array = doc.add<JsonArray>();
array.add(1);
array.add("hello1");
array.createNestedObject();
array.add<JsonObject>();
JsonVariant variant = doc.createNestedArray();
JsonVariant variant = doc.add<JsonArray>();
variant.add(1);
variant.add("hello2");
variant.createNestedObject();
variant.add<JsonObject>();
CHECK(array != variant);
CHECK_FALSE(array == variant);
@ -199,15 +199,15 @@ TEST_CASE("Compare JsonArray with JsonVariantConst") {
}
SECTION("Compare with identical array") {
JsonArray array = doc.createNestedArray();
JsonArray array = doc.add<JsonArray>();
array.add(1);
array.add("hello");
array.createNestedObject();
array.add<JsonObject>();
JsonArray array2 = doc.createNestedArray();
JsonArray array2 = doc.add<JsonArray>();
array2.add(1);
array2.add("hello");
array2.createNestedObject();
array2.add<JsonObject>();
JsonVariantConst variant = array2;
CHECK(array == variant);
@ -226,15 +226,15 @@ TEST_CASE("Compare JsonArray with JsonVariantConst") {
}
SECTION("Compare with different array") {
JsonArray array = doc.createNestedArray();
JsonArray array = doc.add<JsonArray>();
array.add(1);
array.add("hello1");
array.createNestedObject();
array.add<JsonObject>();
JsonArray array2 = doc.createNestedArray();
JsonArray array2 = doc.add<JsonArray>();
array2.add(1);
array2.add("hello2");
array2.createNestedObject();
array2.add<JsonObject>();
JsonVariantConst variant = array2;
CHECK(array != variant);
@ -292,15 +292,15 @@ TEST_CASE("Compare JsonArray with JsonArrayConst") {
}
SECTION("Compare with identical array") {
JsonArray array1 = doc.createNestedArray();
JsonArray array1 = doc.add<JsonArray>();
array1.add(1);
array1.add("hello");
array1.createNestedObject();
array1.add<JsonObject>();
JsonArray array2 = doc.createNestedArray();
JsonArray array2 = doc.add<JsonArray>();
array2.add(1);
array2.add("hello");
array2.createNestedObject();
array2.add<JsonObject>();
JsonArrayConst carray2 = array2;
CHECK(array1 == carray2);
@ -319,15 +319,15 @@ TEST_CASE("Compare JsonArray with JsonArrayConst") {
}
SECTION("Compare with different array") {
JsonArray array1 = doc.createNestedArray();
JsonArray array1 = doc.add<JsonArray>();
array1.add(1);
array1.add("hello1");
array1.createNestedObject();
array1.add<JsonObject>();
JsonArray array2 = doc.createNestedArray();
JsonArray array2 = doc.add<JsonArray>();
array2.add(1);
array2.add("hello2");
array2.createNestedObject();
array2.add<JsonObject>();
JsonArrayConst carray2 = array2;
CHECK(array1 != carray2);
@ -387,16 +387,16 @@ TEST_CASE("Compare JsonArrayConst with JsonArrayConst") {
}
SECTION("Compare with identical array") {
JsonArray array1 = doc.createNestedArray();
JsonArray array1 = doc.add<JsonArray>();
array1.add(1);
array1.add("hello");
array1.createNestedObject();
array1.add<JsonObject>();
JsonArrayConst carray1 = array1;
JsonArray array2 = doc.createNestedArray();
JsonArray array2 = doc.add<JsonArray>();
array2.add(1);
array2.add("hello");
array2.createNestedObject();
array2.add<JsonObject>();
JsonArrayConst carray2 = array2;
CHECK(carray1 == carray2);
@ -408,16 +408,16 @@ TEST_CASE("Compare JsonArrayConst with JsonArrayConst") {
}
SECTION("Compare with different array") {
JsonArray array1 = doc.createNestedArray();
JsonArray array1 = doc.add<JsonArray>();
array1.add(1);
array1.add("hello1");
array1.createNestedObject();
array1.add<JsonObject>();
JsonArrayConst carray1 = array1;
JsonArray array2 = doc.createNestedArray();
JsonArray array2 = doc.add<JsonArray>();
array2.add(1);
array2.add("hello2");
array2.createNestedObject();
array2.add<JsonObject>();
JsonArrayConst carray2 = array2;
CHECK(carray1 != carray2);
@ -455,16 +455,16 @@ TEST_CASE("Compare JsonArrayConst with JsonVariant") {
}
SECTION("Compare with identical array") {
JsonArray array1 = doc.createNestedArray();
JsonArray array1 = doc.add<JsonArray>();
array1.add(1);
array1.add("hello");
array1.createNestedObject();
array1.add<JsonObject>();
JsonArrayConst carray1 = array1;
JsonArray array2 = doc.createNestedArray();
JsonArray array2 = doc.add<JsonArray>();
array2.add(1);
array2.add("hello");
array2.createNestedObject();
array2.add<JsonObject>();
JsonVariant variant2 = array2;
CHECK(carray1 == variant2);
@ -483,16 +483,16 @@ TEST_CASE("Compare JsonArrayConst with JsonVariant") {
}
SECTION("Compare with different array") {
JsonArray array1 = doc.createNestedArray();
JsonArray array1 = doc.add<JsonArray>();
array1.add(1);
array1.add("hello1");
array1.createNestedObject();
array1.add<JsonObject>();
JsonArrayConst carray1 = array1;
JsonArray array2 = doc.createNestedArray();
JsonArray array2 = doc.add<JsonArray>();
array2.add(1);
array2.add("hello2");
array2.createNestedObject();
array2.add<JsonObject>();
JsonVariant variant2 = array2;
CHECK(carray1 != variant2);

21
extras/tests/JsonArray/createNested.cpp
View File

@ -1,21 +0,0 @@
// ArduinoJson - https://arduinojson.org
// Copyright © 2014-2023, Benoit BLANCHON
// MIT License
#include <ArduinoJson.h>
#include <catch.hpp>
TEST_CASE("JsonArray basics") {
JsonDocument doc;
JsonArray array = doc.to<JsonArray>();
SECTION("CreateNestedArray") {
JsonArray arr = array.createNestedArray();
REQUIRE(arr == array[0].as<JsonArray>());
}
SECTION("CreateNestedObject") {
JsonObject obj = array.createNestedObject();
REQUIRE(obj == array[0].as<JsonObject>());
}
}

4
extras/tests/JsonArray/nesting.cpp
View File

@ -24,12 +24,12 @@ TEST_CASE("JsonArray::nesting()") {
}
SECTION("returns 2 with nested array") {
arr.createNestedArray();
arr.add<JsonArray>();
REQUIRE(arr.nesting() == 2);
}
SECTION("returns 2 with nested object") {
arr.createNestedObject();
arr.add<JsonObject>();
REQUIRE(arr.nesting() == 2);
}
}

8
extras/tests/JsonArray/unbound.cpp
View File

@ -19,14 +19,6 @@ TEST_CASE("Unbound JsonArray") {
REQUIRE(0 == array.size());
}
SECTION("CreateNestedArrayFails") {
REQUIRE(array.createNestedArray().isNull());
}
SECTION("CreateNestedObjectFails") {
REQUIRE(array.createNestedObject().isNull());
}
SECTION("PrintToWritesBrackets") {
char buffer[32];
serializeJson(array, buffer, sizeof(buffer));