Scarfski/bitsery
1
0
Fork 0
mirror of https://github.com/fraillt/bitsery.git synced 2026-06-08 08:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

few more renames and updated change log for version 5.0.0

Browse Source
This commit is contained in:
Mindaugas Vinkelis
2019-07-05 13:19:03 +03:00
committed by Mindaugas Vinkelis
parent f35ae3f4dc
commit f85dff7415
22 changed files with 215 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/serialization.cpp
View File

@@ -28,20 +28,20 @@ using testing::Eq;
TEST(Serialization, AdapterCanBeMovedInAndOut) {
Buffer buf{};
bitsery::BasicSerializer<Writer> ser1{buf};
bitsery::Serializer<Writer> ser1{buf};
ser1.object(MyStruct1{1, 2});
auto writeAdapter = std::move(ser1).adapter();
bitsery::BasicSerializer<Writer> ser2(std::move(writeAdapter));
bitsery::Serializer<Writer> ser2(std::move(writeAdapter));
ser2.object(MyStruct1{3, 4});
auto writtenBytesCount = ser2.adapter().writtenBytesCount();
EXPECT_THAT(writtenBytesCount, Eq(MyStruct1::SIZE + MyStruct1::SIZE));
MyStruct1 res{};
bitsery::BasicDeserializer<Reader> des1{buf.begin(), writtenBytesCount};
bitsery::Deserializer<Reader> des1{buf.begin(), writtenBytesCount};
des1.object(res);
EXPECT_THAT(res, Eq(MyStruct1{1, 2}));
auto readerAdapter = std::move(des1).adapter();
bitsery::BasicDeserializer<Reader> des2(std::move(readerAdapter));
bitsery::Deserializer<Reader> des2(std::move(readerAdapter));
des2.object(res);
EXPECT_THAT(res, Eq(MyStruct1{3, 4}));
EXPECT_TRUE(des2.adapter().isCompletedSuccessfully());

4
tests/serialization_ext_compact_value.cpp
View File

@@ -54,10 +54,10 @@ TValue getValue(bool isPositive, size_t significantBits) {
template <typename TConfig, typename TValue>
std::pair<TValue, size_t> serializeAndGetDeserialized(TValue data) {
Buffer buf{};
bitsery::BasicSerializer<bitsery::OutputBufferAdapter<Buffer, TConfig>> ser{buf};
bitsery::Serializer<bitsery::OutputBufferAdapter<Buffer, TConfig>> ser{buf};
ser.template ext<sizeof(TValue)>(data, CompactValue{});
bitsery::BasicDeserializer<bitsery::InputBufferAdapter<Buffer, TConfig>> des{buf.begin(), ser.adapter().writtenBytesCount()};
bitsery::Deserializer<bitsery::InputBufferAdapter<Buffer, TConfig>> des{buf.begin(), ser.adapter().writtenBytesCount()};
TValue res;
des.template ext<sizeof(TValue)>(res, CompactValue{});
return {res, ser.adapter().writtenBytesCount()};

7
tests/serialization_ext_pointer_with_allocator.cpp
View File

@@ -272,7 +272,7 @@ struct CustomBaseDeleter {
}
};
TEST_F(SerializeExtensionPointerWithAllocator, CustomDeleterIsUsedForStdUniquePtr) {
TEST_F(SerializeExtensionPointerWithAllocator, CustomDeleterIsNotUsedForStdUniquePtr) {
MemResourceForTest memRes{};
std::get<0>(plctx).setMemResource(&memRes);
@@ -282,7 +282,10 @@ TEST_F(SerializeExtensionPointerWithAllocator, CustomDeleterIsUsedForStdUniquePt
createDeserializer().ext(baseRes, StdSmartPtr{});
EXPECT_THAT(memRes.allocs.size(), Eq(0u));
EXPECT_THAT(memRes.deallocs.size(), Eq(0u));
EXPECT_THAT(memRes.deallocs.size(), Eq(1u));
EXPECT_THAT(memRes.deallocs[0].bytes, Eq(sizeof(Derived1)));
EXPECT_THAT(memRes.deallocs[0].alignment, Eq(alignof(Derived1)));
EXPECT_THAT(memRes.deallocs[0].typeId, Eq(bitsery::ext::StandardRTTI::get<Derived1>()));
}

4
tests/serialization_test_utils.h
View File

@@ -93,8 +93,8 @@ using Writer = bitsery::OutputBufferAdapter<Buffer>;
template <typename Context>
class BasicSerializationContext {
public:
using TSerializer = bitsery::BasicSerializer<Writer, Context>;
using TDeserializer = bitsery::BasicDeserializer<Reader, Context>;
using TSerializer = bitsery::Serializer<Writer, Context>;
using TDeserializer = bitsery::Deserializer<Reader, Context>;
using TSerializerBPEnabled = typename TSerializer::BPEnabledType;
using TDeserializerBPEnabled = typename TDeserializer::BPEnabledType;