Remove capacity from JsonDocument's constructor

This commit is contained in:
Benoit Blanchon
2023-07-17 18:15:13 +02:00
parent 42b2840009
commit 0f319e7ca4
162 changed files with 438 additions and 500 deletions

View File

@ -7,7 +7,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::add()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
SECTION("add integer to new variant") {

View File

@ -15,7 +15,7 @@ enum MY_ENUM { ONE = 1, TWO = 2 };
TEST_CASE("JsonVariant::as()") {
static const char* null = 0;
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("not set") {

View File

@ -6,11 +6,10 @@
#include <stdint.h>
#include <catch.hpp>
using ArduinoJson::detail::sizeofArray;
using ArduinoJson::detail::sizeofString;
TEST_CASE("JsonVariant::clear()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
SECTION("size goes back to zero") {

View File

@ -9,7 +9,7 @@
// Here, we're just filling the holes
TEST_CASE("Compare JsonVariant with value") {
JsonDocument doc(256);
JsonDocument doc;
JsonVariant a = doc.add();
SECTION("null vs (char*)0") {
@ -37,7 +37,7 @@ TEST_CASE("Compare JsonVariant with value") {
}
TEST_CASE("Compare JsonVariant with JsonVariant") {
JsonDocument doc(256);
JsonDocument doc;
JsonVariant a = doc.add();
JsonVariant b = doc.add();

View File

@ -7,7 +7,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::containsKey()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
SECTION("containsKey(const char*)") {
@ -26,7 +26,7 @@ TEST_CASE("JsonVariant::containsKey()") {
}
TEST_CASE("JsonVariantConst::containsKey()") {
JsonDocument doc(4096);
JsonDocument doc;
doc["hello"] = "world";
JsonVariantConst cvar = doc.as<JsonVariant>();

View File

@ -32,7 +32,7 @@ bool canConvertFromJson(JsonVariantConst src, const Date&) {
} // namespace
TEST_CASE("Custom converter with overloading") {
JsonDocument doc(4096);
JsonDocument doc;
SECTION("convert JSON to Date") {
doc["date"]["day"] = 2;
@ -107,7 +107,7 @@ struct Converter<Complex> {
} // namespace ArduinoJson
TEST_CASE("Custom converter with specialization") {
JsonDocument doc(4096);
JsonDocument doc;
SECTION("convert JSON to Complex") {
doc["value"]["real"] = 2;

View File

@ -11,8 +11,8 @@ using ArduinoJson::detail::sizeofString;
TEST_CASE("JsonVariant::set(JsonVariant)") {
ControllableAllocator allocator;
SpyingAllocator spyingAllocator(&allocator);
JsonDocument doc1(4096, &spyingAllocator);
JsonDocument doc2(4096, &spyingAllocator);
JsonDocument doc1(&spyingAllocator);
JsonDocument doc2(&spyingAllocator);
JsonVariant var1 = doc1.to<JsonVariant>();
JsonVariant var2 = doc2.to<JsonVariant>();

View File

@ -7,7 +7,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::createNestedObject()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("promotes to array") {
@ -21,7 +21,7 @@ TEST_CASE("JsonVariant::createNestedObject()") {
}
TEST_CASE("JsonVariant::createNestedArray()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("promotes to array") {
@ -33,7 +33,7 @@ TEST_CASE("JsonVariant::createNestedArray()") {
}
TEST_CASE("JsonVariant::createNestedObject(key)") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("promotes to object") {
@ -46,7 +46,7 @@ TEST_CASE("JsonVariant::createNestedObject(key)") {
}
TEST_CASE("JsonVariant::createNestedArray(key)") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("promotes to object") {

View File

@ -8,7 +8,7 @@
enum MYENUM2 { ONE = 1, TWO = 2 };
TEST_CASE("JsonVariant::is<T>()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("unbound") {
@ -164,7 +164,7 @@ TEST_CASE("JsonVariant::is<T>()") {
}
TEST_CASE("JsonVariantConst::is<T>()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
JsonVariantConst cvariant = variant;

View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::isNull()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("returns true when Undefined") {
@ -20,7 +20,7 @@ TEST_CASE("JsonVariant::isNull()") {
}
SECTION("returns false when EmptyArray") {
JsonDocument doc2(4096);
JsonDocument doc2;
JsonArray array = doc2.to<JsonArray>();
variant.set(array);
@ -28,7 +28,7 @@ TEST_CASE("JsonVariant::isNull()") {
}
SECTION("returns false when EmptyObject") {
JsonDocument doc2(4096);
JsonDocument doc2;
JsonObject obj = doc2.to<JsonObject>();
variant.set(obj);

View File

@ -11,7 +11,7 @@ using ArduinoJson::detail::sizeofObject;
using ArduinoJson::detail::sizeofString;
TEST_CASE("JsonVariant::memoryUsage()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
SECTION("returns 0 if uninitialized") {

View File

@ -23,7 +23,7 @@ TEST_CASE("JsonVariant from JsonArray") {
}
SECTION("JsonArray is not null") {
JsonDocument doc(4096);
JsonDocument doc;
JsonArray arr = doc.to<JsonArray>();
arr.add(12);
arr.add(34);
@ -45,7 +45,7 @@ TEST_CASE("JsonVariant from JsonObject") {
}
SECTION("JsonObject is not null") {
JsonDocument doc(4096);
JsonDocument doc;
JsonObject obj = doc.to<JsonObject>();
obj["a"] = 12;
obj["b"] = 34;

View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::nesting()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
SECTION("return 0 if uninitialized") {

View File

@ -3,7 +3,7 @@
#include <catch.hpp>
TEST_CASE("nullptr") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("JsonVariant == nullptr") {

View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::operator|()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc["value"].to<JsonVariant>();
SECTION("null") {

View File

@ -7,7 +7,7 @@
template <typename TOut, typename TIn>
void shouldBeOk(TIn value) {
JsonDocument doc(1);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
var.set(value);
REQUIRE(var.as<TOut>() == TOut(value));
@ -15,7 +15,7 @@ void shouldBeOk(TIn value) {
template <typename TOut, typename TIn>
void shouldOverflow(TIn value) {
JsonDocument doc(1);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
var.set(value);
REQUIRE(var.as<TOut>() == 0);

View File

@ -10,7 +10,7 @@ using ArduinoJson::detail::sizeofArray;
using ArduinoJson::detail::sizeofString;
TEST_CASE("JsonVariant::remove(int)") {
JsonDocument doc(4096);
JsonDocument doc;
SECTION("release top level strings") {
doc.add(std::string("hello"));
@ -48,7 +48,7 @@ TEST_CASE("JsonVariant::remove(int)") {
}
TEST_CASE("JsonVariant::remove(const char *)") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
var["a"] = 1;
@ -60,7 +60,7 @@ TEST_CASE("JsonVariant::remove(const char *)") {
}
TEST_CASE("JsonVariant::remove(std::string)") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
var["a"] = 1;

View File

@ -13,7 +13,7 @@ using ArduinoJson::detail::sizeofString;
enum ErrorCode { ERROR_01 = 1, ERROR_10 = 10 };
TEST_CASE("JsonVariant::set() when there is enough memory") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("const char*") {
@ -133,7 +133,7 @@ TEST_CASE("JsonVariant::set() when there is enough memory") {
}
TEST_CASE("JsonVariant::set() with not enough memory") {
JsonDocument doc(1, FailingAllocator::instance());
JsonDocument doc(FailingAllocator::instance());
JsonVariant v = doc.to<JsonVariant>();
@ -161,10 +161,10 @@ TEST_CASE("JsonVariant::set() with not enough memory") {
}
TEST_CASE("JsonVariant::set(JsonDocument)") {
JsonDocument doc1(1024);
JsonDocument doc1;
doc1["hello"] = "world";
JsonDocument doc2(1024);
JsonDocument doc2;
JsonVariant v = doc2.to<JsonVariant>();
// Should copy the doc
@ -177,7 +177,7 @@ TEST_CASE("JsonVariant::set(JsonDocument)") {
}
TEST_CASE("JsonVariant::set() releases the previous value") {
JsonDocument doc(1024);
JsonDocument doc;
doc["hello"] = std::string("world");
REQUIRE(doc.memoryUsage() == sizeofObject(1) + sizeofString(5));

View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::size()") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("unbound reference") {

View File

@ -69,13 +69,13 @@ TEST_CASE("vector<int>") {
SECTION("toJson") {
std::vector<int> v = {1, 2};
JsonDocument doc(128);
JsonDocument doc;
doc.set(v);
REQUIRE(doc.as<std::string>() == "[1,2]");
}
SECTION("fromJson") {
JsonDocument doc(128);
JsonDocument doc;
doc.add(1);
doc.add(2);
@ -86,7 +86,7 @@ TEST_CASE("vector<int>") {
}
SECTION("checkJson") {
JsonDocument doc(128);
JsonDocument doc;
CHECK(doc.is<std::vector<int>>() == false);
doc.add(1);
@ -106,13 +106,13 @@ TEST_CASE("array<int, 2>") {
v[0] = 1;
v[1] = 2;
JsonDocument doc(128);
JsonDocument doc;
doc.set(v);
REQUIRE(doc.as<std::string>() == "[1,2]");
}
SECTION("fromJson") {
JsonDocument doc(128);
JsonDocument doc;
doc.add(1);
doc.add(2);
@ -123,7 +123,7 @@ TEST_CASE("array<int, 2>") {
}
SECTION("checkJson") {
JsonDocument doc(128);
JsonDocument doc;
CHECK(doc.is<array_type>() == false);
doc.add(1);

View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::operator[]") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
SECTION("The JsonVariant is null") {
@ -132,7 +132,7 @@ TEST_CASE("JsonVariant::operator[]") {
}
TEST_CASE("JsonVariantConst::operator[]") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant var = doc.to<JsonVariant>();
JsonVariantConst cvar = var;

View File

@ -9,7 +9,7 @@
template <typename T>
void checkValue(T expected) {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
variant.set(expected);
@ -24,7 +24,7 @@ void checkReference(T& expected) {
template <typename T>
void checkNumericType() {
JsonDocument docMin(4096), docMax(4096);
JsonDocument docMin, docMax;
JsonVariant variantMin = docMin.to<JsonVariant>();
JsonVariant variantMax = docMax.to<JsonVariant>();
@ -129,7 +129,7 @@ TEST_CASE("JsonVariant set()/get()") {
#endif
SECTION("CanStoreObject") {
JsonDocument doc(4096);
JsonDocument doc;
JsonObject object = doc.to<JsonObject>();
checkValue<JsonObject>(object);
@ -137,7 +137,7 @@ TEST_CASE("JsonVariant set()/get()") {
}
TEST_CASE("volatile") {
JsonDocument doc(4096);
JsonDocument doc;
JsonVariant variant = doc.to<JsonVariant>();
SECTION("volatile int") {