Merge branch 'main' into blocks-metadata

test/coders/binary_json.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "data/dynamic.hpp"
+#include "util/Buffer.hpp"
 #include "coders/binary_json.hpp"
 
 TEST(BJSON, EncodeDecode) {
@@ -8,28 +8,28 @@ TEST(BJSON, EncodeDecode) {
     const int bytesSize = 5000;
     const int year = 2019;
     const float score = 3.141592;
-    dynamic::ByteBuffer srcBytes(bytesSize);
+    dv::objects::Bytes srcBytes(bytesSize);
     for (int i = 0; i < bytesSize; i ++) {
         srcBytes[i] = rand();
     }
 
     std::vector<ubyte> bjsonBytes;
     {
-        dynamic::Map map;
-        map.put("name", name);
-        map.put("year", year);
-        map.put("score", score);
-        map.put("data", &srcBytes);
+        auto object = dv::object();
+        object["name"] = name;
+        object["year"] = year;
+        object["score"] = score;
+        object["data"] = srcBytes;
 
-        bjsonBytes = json::to_binary(&map, false);
+        bjsonBytes = json::to_binary(object, false);
     }
     {
-        auto map = json::from_binary(bjsonBytes.data(), bjsonBytes.size());
-        EXPECT_EQ(map->get<std::string>("name"), name);
-        EXPECT_EQ(map->get<integer_t>("year"), year);
-        EXPECT_FLOAT_EQ(map->get<number_t>("score"), score);
-        auto bytesptr = map->bytes("data");
-        const auto& bytes = *bytesptr;
+        auto object = json::from_binary(bjsonBytes.data(), bjsonBytes.size());
+        
+        EXPECT_EQ(object["name"].asString(), name);
+        EXPECT_EQ(object["year"].asInteger(), year);
+        EXPECT_FLOAT_EQ(object["score"].asNumber(), score);
+        const auto& bytes = object["data"].asBytes();
         EXPECT_EQ(bytes.size(), bytesSize);
         for (int i = 0; i < bytesSize; i++) {
             EXPECT_EQ(bytes[i], srcBytes[i]);

test/coders/json.cpp

@@ -8,27 +8,30 @@ TEST(JSON, EncodeDecode) {
     const int bytesSize = 20;
     const int year = 2019;
     const float score = 3.141592;
-    dynamic::ByteBuffer srcBytes(bytesSize);
+    const bool visible = true;
+    dv::objects::Bytes srcBytes(bytesSize);
     for (int i = 0; i < bytesSize; i ++) {
         srcBytes[i] = rand();
     }
 
     std::string text;
     {
-        dynamic::Map map;
-        map.put("name", name);
-        map.put("year", year);
-        map.put("score", score);
-        map.put("data", &srcBytes);
+        auto object = dv::object();
+        object["name"] = name;
+        object["year"] = year;
+        object["score"] = score;
+        object["visible"] = visible;
+        object["data"] = srcBytes;
 
-        text = json::stringify(&map, false, "");
+        text = json::stringify(object, false, "");
     }
     {
-        auto map = json::parse(text);
-        EXPECT_EQ(map->get<std::string>("name"), name);
-        EXPECT_EQ(map->get<integer_t>("year"), year);
-        EXPECT_FLOAT_EQ(map->get<number_t>("score"), score);
-        auto b64string = map->get<std::string>("data");
+        auto object = json::parse(text);
+        EXPECT_EQ(object["name"].asString(), name);
+        EXPECT_EQ(object["year"].asInteger(), year);
+        EXPECT_FLOAT_EQ(object["score"].asNumber(), score);
+        EXPECT_EQ(object["visible"].asBoolean(), visible);
+        auto b64string = object["data"].asString();
 
         auto bytes = util::base64_decode(b64string);
         EXPECT_EQ(bytes.size(), bytesSize);

test/data/StructLayout.cpp

@@ -124,10 +124,10 @@ TEST(StructLayout, Serialization) {
     auto layout1 = StructLayout::create(fields);
     auto serialized = layout1.serialize();
 
-    std::cout << *serialized << std::endl;
+    std::cout << serialized << std::endl;
 
     StructLayout layout2;
-    layout2.deserialize(serialized.get());
+    layout2.deserialize(serialized);
 
     EXPECT_EQ(layout1, layout2);
 }

test/data/dv.cpp

@@ -0,0 +1,29 @@
+#include <gtest/gtest.h>
+
+#include "data/dv.hpp"
+
+TEST(dv, dv) {
+    auto value = dv::object();
+    {
+        auto& list = value.list("elements");
+        for (int i = 0; i < 10; i++) {
+            auto& obj = list.object();
+            obj["name"] = "user";
+            obj["age"] = 90;
+            obj["confirmed"] = true;
+            obj["position"] = dv::list({40, -41, 52});
+        }
+    }
+    {
+        const auto& list = value["elements"];
+        for (const auto& obj : list) {
+            EXPECT_EQ(obj["name"].asString(), "user");
+            EXPECT_EQ(obj["age"].asInteger(), 90);
+            EXPECT_EQ(obj["confirmed"].asBoolean(), true);
+            auto& position = obj["position"];
+            EXPECT_EQ(position[0].asInteger(), 40);
+            EXPECT_EQ(position[1].asInteger(), -41);
+            EXPECT_EQ(position[2].asInteger(), 52);
+        }
+    }
+}