From 2c664233dc2e4e114d95f4a4d02e95276c75f167 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Tue, 19 Oct 2021 13:35:49 +0200 Subject: zenserver-test: Fixed up zcache tests --- zenserver-test/zenserver-test.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'zenserver-test/zenserver-test.cpp') diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index 9c9b73042..fec6ca17c 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -1036,10 +1036,11 @@ TEST_CASE("project.basic") zen::CbObject Op = OpWriter.Save(); - zen::BinaryWriter MemOut; zen::CbPackage OpPackage(Op); OpPackage.AddAttachment(Attach); - OpPackage.Save(MemOut); + + zen::BinaryWriter MemOut; + legacy::SaveCbPackage(OpPackage, MemOut); { zen::StringBuilder<64> PostUri; @@ -1829,7 +1830,7 @@ TEST_CASE("zcache.policy") { cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}?skip=data"_format(Cfg.BaseUri, Bucket, Key)}, cpr::Header{{"Accept", "application/x-ue-cbpkg"}}); - CHECK(Result.status_code == 200); + CHECK(IsHttpSuccessCode(Result.status_code)); CHECK(Result.text.size() == 0); } @@ -1837,7 +1838,7 @@ TEST_CASE("zcache.policy") { cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}?skip=data"_format(Cfg.BaseUri, Bucket, Key)}, cpr::Header{{"Accept", "application/x-ue-cbobject"}}); - CHECK(Result.status_code == 200); + CHECK(IsHttpSuccessCode(Result.status_code)); CHECK(Result.text.size() == 0); } @@ -1845,7 +1846,7 @@ TEST_CASE("zcache.policy") { cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}/{}?skip=data"_format(Cfg.BaseUri, Bucket, Key, PayloadId)}, cpr::Header{{"Accept", "application/x-ue-comp"}}); - CHECK(Result.status_code == 200); + CHECK(IsHttpSuccessCode(Result.status_code)); CHECK(Result.text.size() == 0); } } @@ -1873,7 +1874,7 @@ TEST_CASE("zcache.policy") { cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}?skip=data"_format(Cfg.BaseUri, Bucket, Key)}, cpr::Header{{"Accept", "application/octet-stream"}}); - CHECK(Result.status_code == 200); + CHECK(IsHttpSuccessCode(Result.status_code)); CHECK(Result.text.size() == 0); } } -- cgit v1.2.3