diff options
Diffstat (limited to 'zencore/compactbinarypackage.cpp')
| -rw-r--r-- | zencore/compactbinarypackage.cpp | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/zencore/compactbinarypackage.cpp b/zencore/compactbinarypackage.cpp index fbdcd24e9..88757d47f 100644 --- a/zencore/compactbinarypackage.cpp +++ b/zencore/compactbinarypackage.cpp @@ -83,8 +83,7 @@ CbAttachment::CbAttachment(const CbObject& InValue, const IoHash* const InHash) bool CbAttachment::TryLoad(IoBuffer& InBuffer, BufferAllocator Allocator) { - MemoryInStream InStream(InBuffer.Data(), InBuffer.Size()); - BinaryReader Reader(InStream); + BinaryReader Reader(InBuffer.Data(), InBuffer.Size()); return TryLoad(Reader, Allocator); } @@ -427,8 +426,7 @@ CbPackage::GatherAttachments(const CbObject& Value, AttachmentResolver Resolver) bool CbPackage::TryLoad(IoBuffer InBuffer, BufferAllocator Allocator, AttachmentResolver* Mapper) { - MemoryInStream InStream(InBuffer.Data(), InBuffer.Size()); - BinaryReader Reader(InStream); + BinaryReader Reader(InBuffer.Data(), InBuffer.Size()); return TryLoad(Reader, Allocator, Mapper); } @@ -670,8 +668,7 @@ namespace legacy { bool TryLoadCbPackage(CbPackage& Package, IoBuffer InBuffer, BufferAllocator Allocator, CbPackage::AttachmentResolver* Mapper) { - MemoryInStream InStream(InBuffer.Data(), InBuffer.Size()); - BinaryReader Reader(InStream); + BinaryReader Reader(InBuffer.Data(), InBuffer.Size()); return TryLoadCbPackage(Package, Reader, Allocator, Mapper); } @@ -764,24 +761,22 @@ TEST_CASE("usonpackage") Attachment.Save(Writer); CbFieldIterator Fields = Writer.Save(); - MemoryOutStream WriteStream; - BinaryWriter StreamWriter{WriteStream}; + BinaryWriter StreamWriter; Attachment.Save(StreamWriter); - CHECK(MakeMemoryView(WriteStream).EqualBytes(Fields.GetRangeBuffer().GetView())); - CHECK(ValidateCompactBinaryRange(MakeMemoryView(WriteStream), CbValidateMode::All) == CbValidateError::None); - CHECK(ValidateObjectAttachment(MakeMemoryView(WriteStream), CbValidateMode::All) == CbValidateError::None); + CHECK(MakeMemoryView(StreamWriter).EqualBytes(Fields.GetRangeBuffer().GetView())); + CHECK(ValidateCompactBinaryRange(MakeMemoryView(StreamWriter), CbValidateMode::All) == CbValidateError::None); + CHECK(ValidateObjectAttachment(MakeMemoryView(StreamWriter), CbValidateMode::All) == CbValidateError::None); CbAttachment FromFields; FromFields.TryLoad(Fields); CHECK(!bool(Fields)); CHECK(FromFields == Attachment); - CbAttachment FromArchive; - MemoryInStream InStream(MakeMemoryView(WriteStream)); - BinaryReader Reader(InStream); + CbAttachment FromArchive; + BinaryReader Reader(MakeMemoryView(StreamWriter)); FromArchive.TryLoad(Reader); - CHECK(Reader.CurrentOffset() == InStream.Size()); + CHECK(Reader.CurrentOffset() == Reader.Size()); CHECK(FromArchive == Attachment); }; @@ -956,9 +951,8 @@ TEST_CASE("usonpackage.serialization") Package.Save(Writer); CbFieldIterator Fields = Writer.Save(); - MemoryOutStream MemStream; - BinaryWriter WriteAr(MemStream); - Package.Save(WriteAr); + BinaryWriter MemStream; + Package.Save(MemStream); CHECK(MakeMemoryView(MemStream).EqualBytes(Fields.GetRangeBuffer().GetView())); CHECK(ValidateCompactBinaryRange(MakeMemoryView(MemStream), CbValidateMode::All) == CbValidateError::None); @@ -969,11 +963,10 @@ TEST_CASE("usonpackage.serialization") CHECK_FALSE(bool(Fields)); CHECK(FromFields == Package); - CbPackage FromArchive; - MemoryInStream ReadMemStream(MakeMemoryView(MemStream)); - BinaryReader ReadAr(ReadMemStream); + CbPackage FromArchive; + BinaryReader ReadAr(MakeMemoryView(MemStream)); FromArchive.TryLoad(ReadAr); - CHECK(ReadAr.CurrentOffset() == ReadMemStream.Size()); + CHECK(ReadAr.CurrentOffset() == ReadAr.Size()); CHECK(FromArchive == Package); }; @@ -1195,12 +1188,10 @@ TEST_CASE("usonpackage.serialization") CHECK(FieldsOuterBufferView.Contains(Level4Attachment->AsBinary().GetView())); CHECK(Level4Attachment->GetHash() == Level4Hash); - MemoryOutStream WriteStream; - BinaryWriter WriteAr(WriteStream); - Writer.Save(WriteAr); - CbPackage FromArchive; - MemoryInStream ReadStream(MakeMemoryView(WriteStream)); - BinaryReader ReadAr(ReadStream); + BinaryWriter WriteStream; + Writer.Save(WriteStream); + CbPackage FromArchive; + BinaryReader ReadAr(MakeMemoryView(WriteStream)); FromArchive.TryLoad(ReadAr); Writer.Reset(); |