diff options
Diffstat (limited to 'zenserver-test/zenserver-test.cpp')
| -rw-r--r-- | zenserver-test/zenserver-test.cpp | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index 794a5fe94..9b5a48128 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -968,9 +968,8 @@ TEST_CASE("project.basic") Body << "engine" << "/zooom"; - zen::MemoryOutStream MemOut; - zen::BinaryWriter Writer{MemOut}; - Body.Save(Writer); + zen::BinaryWriter MemOut; + Body.Save(MemOut); auto Response = cpr::Post(cpr::Url{BaseUri.c_str()}, cpr::Body{(const char*)MemOut.Data(), MemOut.Size()}); CHECK(Response.status_code == 201); @@ -1035,11 +1034,10 @@ TEST_CASE("project.basic") zen::CbObject Op = OpWriter.Save(); - zen::MemoryOutStream MemOut; - zen::BinaryWriter Writer(MemOut); - zen::CbPackage OpPackage(Op); + zen::BinaryWriter MemOut; + zen::CbPackage OpPackage(Op); OpPackage.AddAttachment(Attach); - OpPackage.Save(Writer); + OpPackage.Save(MemOut); { zen::StringBuilder<64> PostUri; @@ -1130,9 +1128,8 @@ TEST_CASE("zcache.basic") zen::CbObjectWriter Cbo; Cbo << "index" << i; - zen::MemoryOutStream MemOut; - zen::BinaryWriter Writer{MemOut}; - Cbo.Save(Writer); + zen::BinaryWriter MemOut; + Cbo.Save(MemOut); zen::IoHash Key = HashKey(i); @@ -1160,9 +1157,8 @@ TEST_CASE("zcache.basic") zen::CbObjectWriter Cbo; Cbo << "index" << 42; - zen::MemoryOutStream MemOut; - zen::BinaryWriter Writer{MemOut}; - Cbo.Save(Writer); + zen::BinaryWriter MemOut; + Cbo.Save(MemOut); zen::IoHash Key = HashKey(442); @@ -1218,10 +1214,9 @@ TEST_CASE("zcache.cbpackage") }; auto SerializeToBuffer = [](zen::CbPackage Package) -> zen::IoBuffer { - zen::MemoryOutStream MemStream; - zen::BinaryWriter Writer(MemStream); + zen::BinaryWriter MemStream; - Package.Save(Writer); + Package.Save(MemStream); return zen::IoBuffer(zen::IoBuffer::Clone, MemStream.Data(), MemStream.Size()); }; @@ -1469,9 +1464,8 @@ TEST_CASE("zcache.policy") }; auto ToBuffer = [](zen::CbPackage Package) -> zen::IoBuffer { - zen::MemoryOutStream MemStream; - zen::BinaryWriter Writer(MemStream); - Package.Save(Writer); + zen::BinaryWriter MemStream; + Package.Save(MemStream); return zen::IoBuffer(zen::IoBuffer::Clone, MemStream.Data(), MemStream.Size()); }; @@ -1828,8 +1822,7 @@ struct RemoteExecutionRequest } PrepReq.EndArray(); - zen::BinaryWriter MemWriter(m_MemOut); - PrepReq.Save(MemWriter); + PrepReq.Save(m_MemOut); } void Prep() @@ -1931,7 +1924,7 @@ private: const std::string m_BaseUri = "http://{}:{}/exec/jobs"_format(m_HostName, m_PortNumber); const std::string m_CasUri = "http://{}:{}/cas"_format(m_HostName, m_PortNumber); Visitor m_Visit{m_TreePath}; - zen::MemoryOutStream m_MemOut; + zen::BinaryWriter m_MemOut; }; TEST_CASE("exec.basic") |