fix tests

2 files changed, 14 insertions, 14 deletions

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index c79b540ea..a6e89e702 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -1586,8 +1586,8 @@ TEST_CASE("zcache.rpc")
 		Inst.WaitUntilReady();
 
 		CachePolicy				   Policy = CachePolicy::Default;
-		std::vector<zen::CacheKey> Keys	  = PutCacheRecords(BaseUri, "default"sv, "mastodon"sv, 128);
-		GetCacheRecordResult	   Result = GetCacheRecords(BaseUri, "default"sv, 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());
 
@@ -1625,7 +1625,7 @@ TEST_CASE("zcache.rpc")
 		Inst.WaitUntilReady();
 
 		CachePolicy				   Policy		= CachePolicy::Default;
-		std::vector<zen::CacheKey> ExistingKeys = PutCacheRecords(BaseUri, "default"sv, "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)
@@ -1634,7 +1634,7 @@ TEST_CASE("zcache.rpc")
 			Keys.push_back(CacheKey::Create("missing"sv, IoHash::Zero));
 		}
 
-		GetCacheRecordResult Result = GetCacheRecords(BaseUri, "default"sv, Keys, Policy);
+		GetCacheRecordResult Result = GetCacheRecords(BaseUri, "ue4.ddc"sv, Keys, Policy);
 
 		CHECK(Result.Records.size() == Keys.size());
 
@@ -1679,10 +1679,10 @@ TEST_CASE("zcache.rpc")
 		SpawnServer(UpstreamServer, UpstreamCfg);
 		SpawnServer(LocalServer, LocalCfg);
 
-		std::vector<zen::CacheKey> Keys = PutCacheRecords(UpstreamCfg.BaseUri, "default"sv, "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, "default"sv, Keys, Policy);
+		GetCacheRecordResult Result = GetCacheRecords(LocalCfg.BaseUri, "ue4.ddc"sv, Keys, Policy);
 
 		CHECK(Result.Records.size() == Keys.size());
 
@@ -1704,10 +1704,10 @@ TEST_CASE("zcache.rpc")
 		SpawnServer(UpstreamServer, UpstreamCfg);
 		SpawnServer(LocalServer, LocalCfg);
 
-		std::vector<zen::CacheKey> Keys = PutCacheRecords(UpstreamCfg.BaseUri, "default"sv, "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, "default"sv, Keys, Policy);
+		GetCacheRecordResult Result = GetCacheRecords(LocalCfg.BaseUri, "ue4.ddc"sv, Keys, Policy);
 
 		CHECK(Result.Records.size() == Keys.size());
 
@@ -1738,7 +1738,7 @@ TEST_CASE("zcache.rpc.allpolicies")
 
 	std::string_view TestVersion   = "F72150A02AE34B57A9EC91D36BA1CE08"sv;
 	std::string_view TestBucket	   = "allpoliciestest"sv;
-	std::string_view TestNamespace = "default"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)
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index a349f13e1..135572d07 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -2438,8 +2438,8 @@ TEST_CASE("z$service.parse.relative.Uri")
 	CHECK(LegacyValueContentIdRequest.ValueContentId == IoHash::FromHexString("56789abcdef12345678956789abcdef123456789"sv));
 
 	HttpRequestData V2DefaultNamespaceRequest;
-	CHECK(HttpRequestParseRelativeUri("default", V2DefaultNamespaceRequest));
-	CHECK(V2DefaultNamespaceRequest.Namespace == ZenCacheStore::DefaultNamespace);
+	CHECK(HttpRequestParseRelativeUri("ue4.ddc", V2DefaultNamespaceRequest));
+	CHECK(V2DefaultNamespaceRequest.Namespace == "ue4.ddc");
 	CHECK(!V2DefaultNamespaceRequest.Bucket.has_value());
 	CHECK(!V2DefaultNamespaceRequest.HashKey.has_value());
 	CHECK(!V2DefaultNamespaceRequest.ValueContentId.has_value());
@@ -2452,8 +2452,8 @@ TEST_CASE("z$service.parse.relative.Uri")
 	CHECK(!V2NamespaceRequest.ValueContentId.has_value());
 
 	HttpRequestData V2BucketRequestWithDefaultNamespace;
-	CHECK(HttpRequestParseRelativeUri("default/test", V2BucketRequestWithDefaultNamespace));
-	CHECK(V2BucketRequestWithDefaultNamespace.Namespace == ZenCacheStore::DefaultNamespace);
+	CHECK(HttpRequestParseRelativeUri("ue4.ddc/test", V2BucketRequestWithDefaultNamespace));
+	CHECK(V2BucketRequestWithDefaultNamespace.Namespace == "ue4.ddc");
 	CHECK(V2BucketRequestWithDefaultNamespace.Bucket == "test"sv);
 	CHECK(!V2BucketRequestWithDefaultNamespace.HashKey.has_value());
 	CHECK(!V2BucketRequestWithDefaultNamespace.ValueContentId.has_value());
@@ -2466,7 +2466,7 @@ TEST_CASE("z$service.parse.relative.Uri")
 	CHECK(!V2BucketRequestWithNamespace.ValueContentId.has_value());
 
 	HttpRequestData V2HashKeyRequest;
-	CHECK(HttpRequestParseRelativeUri("default/test/0123456789abcdef12340123456789abcdef1234", V2HashKeyRequest));
+	CHECK(HttpRequestParseRelativeUri("test/0123456789abcdef12340123456789abcdef1234", V2HashKeyRequest));
 	CHECK(V2HashKeyRequest.Namespace == ZenCacheStore::DefaultNamespace);
 	CHECK(V2HashKeyRequest.Bucket == "test");
 	CHECK(V2HashKeyRequest.HashKey == IoHash::FromHexString("0123456789abcdef12340123456789abcdef1234"sv));