fix bjson decoder
This commit is contained in:
parent
f8fadf8b74
commit
c3fb30b20e
@ -26,7 +26,7 @@ static void to_binary(ByteBuilder& builder, const Value& value) {
|
|||||||
builder.put(BJSON_END);
|
builder.put(BJSON_END);
|
||||||
break;
|
break;
|
||||||
case Type::bytes: {
|
case Type::bytes: {
|
||||||
const auto bytes = std::get<ByteBuffer_sptr>(value).get();
|
const auto& bytes = std::get<ByteBuffer_sptr>(value).get();
|
||||||
builder.put(BJSON_TYPE_BYTES);
|
builder.put(BJSON_TYPE_BYTES);
|
||||||
builder.putInt32(bytes->size());
|
builder.putInt32(bytes->size());
|
||||||
builder.put(bytes->data(), bytes->size());
|
builder.put(bytes->data(), bytes->size());
|
||||||
@ -132,7 +132,9 @@ static Value value_from_binary(ByteReader& reader) {
|
|||||||
throw std::runtime_error(
|
throw std::runtime_error(
|
||||||
"buffer_size > remaining_size "+std::to_string(size));
|
"buffer_size > remaining_size "+std::to_string(size));
|
||||||
}
|
}
|
||||||
return std::make_shared<ByteBuffer>(reader.pointer(), size);
|
auto bytes = std::make_shared<ByteBuffer>(reader.pointer(), size);
|
||||||
|
reader.skip(size);
|
||||||
|
return bytes;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
throw std::runtime_error(
|
throw std::runtime_error(
|
||||||
|
|||||||
38
test/coders/binary_json.cpp
Normal file
38
test/coders/binary_json.cpp
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
|
#include "data/dynamic.hpp"
|
||||||
|
#include "coders/binary_json.hpp"
|
||||||
|
|
||||||
|
TEST(BJSON, EncodeDecode) {
|
||||||
|
const std::string name = "JSON-encoder";
|
||||||
|
const int bytesSize = 5000;
|
||||||
|
const int year = 2019;
|
||||||
|
const float score = 3.141592;
|
||||||
|
dynamic::ByteBuffer 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);
|
||||||
|
|
||||||
|
bjsonBytes = json::to_binary(&map, 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;
|
||||||
|
EXPECT_EQ(bytes.size(), bytesSize);
|
||||||
|
for (int i = 0; i < bytesSize; i++) {
|
||||||
|
EXPECT_EQ(bytes[i], srcBytes[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -3,8 +3,6 @@
|
|||||||
#include "coders/json.hpp"
|
#include "coders/json.hpp"
|
||||||
#include "util/stringutil.hpp"
|
#include "util/stringutil.hpp"
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
TEST(JSON, EncodeDecode) {
|
TEST(JSON, EncodeDecode) {
|
||||||
const std::string name = "JSON-encoder";
|
const std::string name = "JSON-encoder";
|
||||||
const int bytesSize = 20;
|
const int bytesSize = 20;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user