aboutsummaryrefslogtreecommitdiff
path: root/zenserver-test/zenserver-test.cpp
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-10-20 13:19:39 +0200
committerMartin Ridgers <[email protected]>2021-10-20 13:19:39 +0200
commit13feae57532a1ad4d14feb5ee00f397fa6c370cc (patch)
tree4bfdfe0aa239435baddef9ee64965c39ec7f6551 /zenserver-test/zenserver-test.cpp
parentCompile fixes due to std::fs::path's differing character types (diff)
parentzen server: Added root manifest, with support for explicit schema versioning (diff)
downloadzen-13feae57532a1ad4d14feb5ee00f397fa6c370cc.tar.xz
zen-13feae57532a1ad4d14feb5ee00f397fa6c370cc.zip
Merged main
Diffstat (limited to 'zenserver-test/zenserver-test.cpp')
-rw-r--r--zenserver-test/zenserver-test.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 0f9026e76..ee9ab7cb3 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;
@@ -1831,7 +1832,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);
}
@@ -1839,7 +1840,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);
}
@@ -1847,7 +1848,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);
}
}
@@ -1875,7 +1876,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);
}
}