Merge branch 'main' into use-catch2

1 files changed, 28 insertions, 14 deletions

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 391439ea1..452a67fd0 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -1451,9 +1451,11 @@ TEST_CASE("zcache.rpc")
 		return zen::IoBuffer(zen::IoBuffer::Clone, MemStream.Data(), MemStream.Size());
 	};
 
-	auto PutCacheRecords =
-		[&AppendCacheRecord,
-		 &ToIoBuffer](std::string_view BaseUri, std::string_view Bucket, size_t Num, size_t PayloadSize = 1024) -> std::vector<CacheKey> {
+	auto PutCacheRecords = [&AppendCacheRecord, &ToIoBuffer](std::string_view BaseUri,
+															 std::string_view Namespace,
+															 std::string_view Bucket,
+															 size_t			  Num,
+															 size_t			  PayloadSize = 1024) -> std::vector<CacheKey> {
 		std::vector<zen::CacheKey> OutKeys;
 
 		for (uint32_t Key = 1; Key <= Num; ++Key)
@@ -1472,6 +1474,7 @@ TEST_CASE("zcache.rpc")
 				{
 					CachePolicy BatchDefaultPolicy = CachePolicy::Default;
 					Writer << "DefaultPolicy"sv << WriteToString<128>(BatchDefaultPolicy);
+					Writer << "Namespace"sv << Namespace;
 					Writer.BeginArray("Requests"sv);
 					{
 						AppendCacheRecord(Package, Writer, CacheKey, PayloadSize, BatchDefaultPolicy, CachePolicy::Default);
@@ -1503,7 +1506,10 @@ TEST_CASE("zcache.rpc")
 		bool						  Success;
 	};
 
-	auto GetCacheRecords = [](std::string_view BaseUri, std::span<zen::CacheKey> Keys, zen::CachePolicy Policy) -> GetCacheRecordResult {
+	auto GetCacheRecords = [](std::string_view		   BaseUri,
+							  std::string_view		   Namespace,
+							  std::span<zen::CacheKey> Keys,
+							  zen::CachePolicy		   Policy) -> GetCacheRecordResult {
 		using namespace zen;
 
 		CbObjectWriter Request;
@@ -1512,6 +1518,8 @@ TEST_CASE("zcache.rpc")
 		Request.BeginObject("Params"sv);
 		{
 			Request << "DefaultPolicy"sv << WriteToString<128>(Policy);
+			Request << "Namespace"sv << Namespace;
+
 			Request.BeginArray("Requests"sv);
 			for (const CacheKey& Key : Keys)
 			{
@@ -1578,8 +1586,8 @@ TEST_CASE("zcache.rpc")
 		Inst.WaitUntilReady();
 
 		CachePolicy				   Policy = CachePolicy::Default;
-		std::vector<zen::CacheKey> Keys	  = PutCacheRecords(BaseUri, "mastodon"sv, 128);
-		GetCacheRecordResult	   Result = GetCacheRecords(BaseUri, Keys, Policy);
+		std::vector<zen::CacheKey> Keys	  = PutCacheRecords(BaseUri, "ue4.ddc"sv, "mastodon"sv, 128);
+		GetCacheRecordResult	   Result = GetCacheRecords(BaseUri, "ue4.ddc"sv, Keys, Policy);
 
 		CHECK(Result.Records.size() == Keys.size());
 
@@ -1617,7 +1625,7 @@ TEST_CASE("zcache.rpc")
 		Inst.WaitUntilReady();
 
 		CachePolicy				   Policy		= CachePolicy::Default;
-		std::vector<zen::CacheKey> ExistingKeys = PutCacheRecords(BaseUri, "mastodon"sv, 128);
+		std::vector<zen::CacheKey> ExistingKeys = PutCacheRecords(BaseUri, "ue4.ddc"sv, "mastodon"sv, 128);
 		std::vector<zen::CacheKey> Keys;
 
 		for (const zen::CacheKey& Key : ExistingKeys)
@@ -1626,7 +1634,7 @@ TEST_CASE("zcache.rpc")
 			Keys.push_back(CacheKey::Create("missing"sv, IoHash::Zero));
 		}
 
-		GetCacheRecordResult Result = GetCacheRecords(BaseUri, Keys, Policy);
+		GetCacheRecordResult Result = GetCacheRecords(BaseUri, "ue4.ddc"sv, Keys, Policy);
 
 		CHECK(Result.Records.size() == Keys.size());
 
@@ -1671,10 +1679,10 @@ TEST_CASE("zcache.rpc")
 		SpawnServer(UpstreamServer, UpstreamCfg);
 		SpawnServer(LocalServer, LocalCfg);
 
-		std::vector<zen::CacheKey> Keys = PutCacheRecords(UpstreamCfg.BaseUri, "mastodon"sv, 4);
+		std::vector<zen::CacheKey> Keys = PutCacheRecords(UpstreamCfg.BaseUri, "ue4.ddc"sv, "mastodon"sv, 4);
 
 		CachePolicy			 Policy = CachePolicy::QueryLocal;
-		GetCacheRecordResult Result = GetCacheRecords(LocalCfg.BaseUri, Keys, Policy);
+		GetCacheRecordResult Result = GetCacheRecords(LocalCfg.BaseUri, "ue4.ddc"sv, Keys, Policy);
 
 		CHECK(Result.Records.size() == Keys.size());
 
@@ -1696,10 +1704,10 @@ TEST_CASE("zcache.rpc")
 		SpawnServer(UpstreamServer, UpstreamCfg);
 		SpawnServer(LocalServer, LocalCfg);
 
-		std::vector<zen::CacheKey> Keys = PutCacheRecords(UpstreamCfg.BaseUri, "mastodon"sv, 4);
+		std::vector<zen::CacheKey> Keys = PutCacheRecords(UpstreamCfg.BaseUri, "ue4.ddc"sv, "mastodon"sv, 4);
 
 		CachePolicy			 Policy = (CachePolicy::QueryLocal | CachePolicy::QueryRemote);
-		GetCacheRecordResult Result = GetCacheRecords(LocalCfg.BaseUri, Keys, Policy);
+		GetCacheRecordResult Result = GetCacheRecords(LocalCfg.BaseUri, "ue4.ddc"sv, Keys, Policy);
 
 		CHECK(Result.Records.size() == Keys.size());
 
@@ -1728,8 +1736,9 @@ TEST_CASE("zcache.rpc.allpolicies")
 	SpawnServer(UpstreamServer, UpstreamCfg);
 	SpawnServer(LocalServer, LocalCfg);
 
-	std::string_view TestVersion = "F72150A02AE34B57A9EC91D36BA1CE08"sv;
-	std::string_view TestBucket	 = "allpoliciestest"sv;
+	std::string_view TestVersion   = "F72150A02AE34B57A9EC91D36BA1CE08"sv;
+	std::string_view TestBucket	   = "allpoliciestest"sv;
+	std::string_view TestNamespace = "ue4.ddc"sv;
 
 	// NumKeys = (2 Value vs Record)*(2 SkipData vs Default)*(2 ForceMiss vs Not)*(2 use local)
 	// *(2 use remote)*(2 UseValue Policy vs not)*(4 cases per type)
@@ -1930,6 +1939,7 @@ TEST_CASE("zcache.rpc.allpolicies")
 		{
 			CachePolicy BatchDefaultPolicy = CachePolicy::Default;
 			Writer << "DefaultPolicy"sv << WriteToString<128>(BatchDefaultPolicy);
+			Writer << "Namespace"sv << TestNamespace;
 			Writer.BeginArray("Requests"sv);
 			for (CachePutRequest& Request : PutRequests)
 			{
@@ -1985,6 +1995,7 @@ TEST_CASE("zcache.rpc.allpolicies")
 		{
 			CachePolicy BatchDefaultPolicy = CachePolicy::Default;
 			Writer << "DefaultPolicy"sv << WriteToString<128>(BatchDefaultPolicy);
+			Writer << "Namespace"sv << TestNamespace;
 			Writer.BeginArray("Requests"sv);
 			for (CachePutValueRequest& Request : PutValueRequests)
 			{
@@ -2040,6 +2051,7 @@ TEST_CASE("zcache.rpc.allpolicies")
 		{
 			CachePolicy BatchDefaultPolicy = CachePolicy::Default;
 			Writer << "DefaultPolicy"sv << WriteToString<128>(BatchDefaultPolicy);
+			Writer << "Namespace"sv << TestNamespace;
 			Writer.BeginArray("Requests"sv);
 			for (CacheGetRequest& Request : GetRequests)
 			{
@@ -2151,6 +2163,7 @@ TEST_CASE("zcache.rpc.allpolicies")
 		{
 			CachePolicy BatchDefaultPolicy = CachePolicy::Default;
 			Writer << "DefaultPolicy"sv << WriteToString<128>(BatchDefaultPolicy);
+			Writer << "Namespace"sv << TestNamespace;
 			Writer.BeginArray("Requests"sv);
 			for (CacheGetValueRequest& Request : GetValueRequests)
 			{
@@ -2245,6 +2258,7 @@ TEST_CASE("zcache.rpc.allpolicies")
 		{
 			CachePolicy BatchDefaultPolicy = CachePolicy::Default;
 			Writer << "DefaultPolicy"sv << WriteToString<128>(BatchDefaultPolicy);
+			Writer << "Namespace"sv << TestNamespace;
 			Writer.BeginArray("ChunkRequests"sv);
 			for (CacheGetChunkRequest& Request : ChunkRequests)
 			{