8000 Migrate more tests · sarfata/ArduinoJson@7a8a848 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7a8a848

Browse files
bblanchonbblanchon
committed
Migrate more tests
1 parent 214daf7 commit 7a8a848

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
lines changed

‎test/JsonVariant/subscript.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
#include <catch.hpp>
1010

1111
TEST_CASE("JsonVariant::operator[]") {
12-
DynamicJsonBuffer _jsonBuffer;
13-
1412
SECTION("Array") {
15-
JsonArray &array = _jsonBuffer.createArray();
13+
DynamicJsonArray array;
1614
array.add("element at index 0");
1715
array.add("element at index 1");
1816

@@ -29,7 +27,7 @@ TEST_CASE("JsonVariant::operator[]") {
2927
}
3028

3129
SECTION("Object") {
32-
JsonObject &object = _jsonBuffer.createObject();
30+
DynamicJsonObject object;
3331
object["a"] = "element at key \"a\"";
3432
object["b"] = "element at key \"b\"";
3533

@@ -57,7 +55,8 @@ TEST_CASE("JsonVariant::operator[]") {
5755
}
5856

5957
SECTION("ObjectSetValue") {
60-
JsonVariant var = _jsonBuffer.createObject();
58+
DynamicJsonObject object;
59+
JsonVariant var = object;
6160
var["hello"] = "world";
6261
REQUIRE(1 == var.size());
6362
REQUIRE(std::string("world") == var["hello"]);

‎test/JsonVariant/success.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ TEST_CASE("JsonVariant::success()") {
2020
}
2121

2222
SECTION("ReturnsTrue_WhenEmptyArray") {
23-
DynamicJsonBuffer jsonBuffer;
23+
DynamicJsonArray array;
2424

25-
JsonVariant variant = jsonBuffer.createArray();
25+
JsonVariant variant = array;
2626
REQUIRE(true == variant.success());
2727
}
2828

2929
SECTION("ReturnsTrue_WhenEmptyObject") {
30-
DynamicJsonBuffer jsonBuffer;
30+
DynamicJsonObject object;
3131

32-
JsonVariant variant = jsonBuffer.createObject();
32+
JsonVariant variant = object;
3333
REQUIRE(true == variant.success());
3434
}
3535

‎test/Misc/deprecated.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
#endif
2020

2121
TEST_CASE("Deprecated functions") {
22-
DynamicJsonBuffer jsonBuffer;
23-
2422
SECTION("JsonVariant::asArray()") {
25-
JsonVariant variant = jsonBuffer.createArray();
23+
DynamicJsonArray array;
24+
JsonVariant variant = array;
2625
REQUIRE(variant.asArray().success());
2726
}
2827

2928
SECTION("JsonVariant::asObject()") {
30-
JsonVariant variant = jsonBuffer.createObject();
29+
DynamicJsonObject object;
30+
JsonVariant variant = object;
3131
REQUIRE(variant.asObject().success());
3232
}
3333

@@ -37,7 +37,7 @@ TEST_CASE("Deprecated functions") {
3737
}
3838

3939
SECTION("JsonArray::removeAt()") {
40-
JsonArray& arr = jsonBuffer.createArray();
40+
DynamicJsonArray arr;
4141
arr.removeAt(0);
4242
}
4343

@@ -62,7 +62,7 @@ TEST_CASE("Deprecated functions") {
6262
}
6363

6464
SECTION("JsonArraySubscript::set(double, uint8_t)") {
65-
JsonArray& arr = jsonBuffer.createArray();
65+
DynamicJsonArray arr;
6666
arr.add(666);
6767
arr[0].set(123.45, 2);
6868
REQUIRE(123.45 == arr[0].as<double>());
@@ -71,26 +71,26 @@ TEST_CASE("Deprecated functions") {
7171
}
7272

7373
SECTION("JsonArray::add(double, uint8_t)") {
74-
JsonArray& arr = jsonBuffer.createArray();
74+
DynamicJsonArray arr;
7575
arr.add(3.14159265358979323846, 4);
7676
}
7777

7878
SECTION("JsonArray::add(float, uint8_t)") {
79-
JsonArray& arr = jsonBuffer.createArray();
79+
DynamicJsonArray arr;
8080
arr.add(3.14159265358979323846f, 4);
8181
}
8282

8383
SECTION("JsonObject::set(unsigned char[], double, uint8_t)") {
8484
unsigned char key[] = "hello";
8585

86-
JsonObject& obj = jsonBuffer.createObject();
86+
DynamicJsonObject obj;
8787
obj.set(key, 3.14, 2);
8888

8989
REQUIRE(3.14 == obj["hello"]);
9090
}
9191

9292
SECTION("JsonObject::set(const char*, double, uint8_t)") {
93-
JsonObject& obj = jsonBuffer.createObject();
93+
DynamicJsonObject obj;
9494
obj.set("hello", 123.45, 2);
9595

9696
REQUIRE(123.45 == obj["hello"].as<double>());
@@ -99,7 +99,7 @@ TEST_CASE("Deprecated functions") {
9999
}
100100

101101
SECTION("JsonObjectSubscript::set(double, uint8_t)") {
102-
JsonObject& obj = jsonBuffer.createObject();
102+
DynamicJsonObject obj;
103103
obj["hello"].set(123.45, 2);
104104

105105
REQUIRE(true == obj["hello"].is<double>());

‎test/Misc/vla.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ TEST_CASE("Variable Length Array") {
248248
obj.createNestedArray(vla);
249249
}
250250

251-
SECTION("createObject(char[n])") {
251+
SECTION("createNestedObject(char[n])") {
252252
int i = 16;
253253
char vla[i];
254254
strcpy(vla, "hello");

0 commit comments

Comments
 (0)
0