Migrate

bblanchon · bblanchon · commit 214daf78324c · 2017-07-02T15:51:26.000+02:00
diff --git a/test/JsonVariant/compare.cpp b/test/JsonVariant/compare.cpp
@@ -212,14 +212,10 @@ TEST_CASE("JsonVariant comparisons") {
   }
 
   SECTION("VariantsOfDifferentTypes") {
-    DynamicJsonBuffer jsonBuffer;
+    DynamicJsonArray array;
+    DynamicJsonObject object;
     JsonVariant variants[] = {
-        true,
-        42,
-        666.667,
-        "hello",
-        jsonBuffer.createArray(),
-        jsonBuffer.createObject(),
+        true, 42, 666.667, "hello", array, object,
     };
     size_t n = sizeof(variants) / sizeof(variants[0]);
 
diff --git a/test/JsonVariant/copy.cpp b/test/JsonVariant/copy.cpp
@@ -9,7 +9,6 @@
 #include <catch.hpp>
 
 TEST_CASE("JsonVariant copy") {
-  DynamicJsonBuffer _jsonBuffer;
   JsonVariant _variant1;
   JsonVariant _variant2;
 
@@ -46,7 +45,7 @@ TEST_CASE("JsonVariant copy") {
   }
 
   SECTION("ObjectsAreCopiedByReference") {
-    JsonObject &object = _jsonBuffer.createObject();
+    DynamicJsonObject object;
 
     _variant1 = object;
 
@@ -56,7 +55,7 @@ TEST_CASE("JsonVariant copy") {
   }
 
   SECTION("ArraysAreCopiedByReference") {
-    JsonArray &array = _jsonBuffer.createArray();
+    DynamicJsonArray array;
 
     _variant1 = array;
 
diff --git a/test/JsonVariant/set_get.cpp b/test/JsonVariant/set_get.cpp
@@ -125,9 +125,7 @@ TEST_CASE("JsonVariant set()/get()") {
 #endif
 
   SECTION("CanStoreObject") {
-    DynamicJsonBuffer jsonBuffer;
-    JsonObject &object = jsonBuffer.createObject();
-
-    checkReference(object);
+    DynamicJsonObject object;
+    checkReference<JsonObject>(object);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,7 @@ TEST_CASE("JsonVariant set()/get()") {`
`125`	`125`	`#endif`
`126`	`126`
`127`	`127`	`SECTION("CanStoreObject") {`
`128`		`- DynamicJsonBuffer jsonBuffer;`
`129`		`- JsonObject &object = jsonBuffer.createObject();`
`130`		`-`
`131`		`- checkReference(object);`
	`128`	`+ DynamicJsonObject object;`
	`129`	`+ checkReference<JsonObject>(object);`
`132`	`130`	`}`
`133`	`131`	`}`