Merge branch 'main' into lm/restrict-content-type

1 files changed, 21 insertions, 17 deletions

diff --git a/src/zenserver-test/projectstore-tests.cpp b/src/zenserver-test/projectstore-tests.cpp
index ead062628..eb2e187d7 100644
--- a/src/zenserver-test/projectstore-tests.cpp
+++ b/src/zenserver-test/projectstore-tests.cpp
@@ -27,6 +27,8 @@ namespace zen::tests {
 
 using namespace std::literals;
 
+TEST_SUITE_BEGIN("server.projectstore");
+
 TEST_CASE("project.basic")
 {
 	using namespace std::literals;
@@ -71,7 +73,7 @@ TEST_CASE("project.basic")
 
 			{
 				auto Response = Http.Get("/prj/test"sv);
-				CHECK(Response.StatusCode == HttpResponseCode::OK);
+				REQUIRE(Response.StatusCode == HttpResponseCode::OK);
 
 				CbObject ResponseObject = Response.AsObject();
 
@@ -92,7 +94,7 @@ TEST_CASE("project.basic")
 
 			{
 				auto Response = Http.Get(""sv);
-				CHECK(Response.StatusCode == HttpResponseCode::OK);
+				REQUIRE(Response.StatusCode == HttpResponseCode::OK);
 
 				CbObject ResponseObject = Response.AsObject();
 
@@ -213,7 +215,7 @@ TEST_CASE("project.basic")
 				auto Response = Http.Get(ChunkGetUri);
 
 				REQUIRE(Response);
-				CHECK(Response.StatusCode == HttpResponseCode::OK);
+				REQUIRE(Response.StatusCode == HttpResponseCode::OK);
 
 				IoBuffer Data		   = Response.ResponsePayload;
 				IoBuffer ReferenceData = IoBufferBuilder::MakeFromFile(RootPath / BinPath);
@@ -235,13 +237,13 @@ TEST_CASE("project.basic")
 				auto Response = Http.Get(ChunkGetUri, {{"Accept-Type", "application/x-ue-comp"}});
 
 				REQUIRE(Response);
-				CHECK(Response.StatusCode == HttpResponseCode::OK);
+				REQUIRE(Response.StatusCode == HttpResponseCode::OK);
 
 				IoBuffer		 Data = Response.ResponsePayload;
 				IoHash			 RawHash;
 				uint64_t		 RawSize;
 				CompressedBuffer Compressed = CompressedBuffer::FromCompressed(SharedBuffer(Data), RawHash, RawSize);
-				CHECK(Compressed);
+				REQUIRE(Compressed);
 				IoBuffer DataDecompressed = Compressed.Decompress().AsIoBuffer();
 				IoBuffer ReferenceData	  = IoBufferBuilder::MakeFromFile(RootPath / BinPath);
 				CHECK(RawSize == ReferenceData.GetSize());
@@ -436,14 +438,14 @@ TEST_CASE("project.remote")
 
 		HttpClient			 Http{UrlBase};
 		HttpClient::Response Response = Http.Post(fmt::format("/prj/{}", ProjectName), ProjectPayload);
-		CHECK(Response);
+		REQUIRE(Response);
 	};
 
 	auto MakeOplog = [](std::string_view UrlBase, std::string_view ProjectName, std::string_view OplogName) {
 		HttpClient			 Http{UrlBase};
 		HttpClient::Response Response =
 			Http.Post(fmt::format("/prj/{}/oplog/{}", ProjectName, OplogName), IoBuffer{}, ZenContentType::kCbObject);
-		CHECK(Response);
+		REQUIRE(Response);
 	};
 
 	auto MakeOp = [](std::string_view UrlBase, std::string_view ProjectName, std::string_view OplogName, const CbPackage& OpPackage) {
@@ -454,7 +456,7 @@ TEST_CASE("project.remote")
 
 		HttpClient			 Http{UrlBase};
 		HttpClient::Response Response = Http.Post(fmt::format("/prj/{}/oplog/{}/new", ProjectName, OplogName), Body);
-		CHECK(Response);
+		REQUIRE(Response);
 	};
 
 	MakeProject(Servers.GetInstance(0).GetBaseUri(), "proj0");
@@ -505,7 +507,7 @@ TEST_CASE("project.remote")
 
 			HttpClient::Response Response =
 				Http.Post(fmt::format("/prj/{}/oplog/{}/rpc", Project, Oplog), Payload, {{"Accept", "application/x-ue-cbpkg"}});
-			CHECK(Response);
+			REQUIRE(Response);
 			CbPackage ResponsePackage = ParsePackageMessage(Response.ResponsePayload);
 			CHECK(ResponsePackage.GetAttachments().size() == AttachmentHashes.size());
 			for (auto A : ResponsePackage.GetAttachments())
@@ -520,7 +522,7 @@ TEST_CASE("project.remote")
 
 		HttpClient			 Http{Servers.GetInstance(ServerIndex).GetBaseUri()};
 		HttpClient::Response Response = Http.Get(fmt::format("/prj/{}/oplog/{}/entries", Project, Oplog));
-		CHECK(Response);
+		REQUIRE(Response);
 
 		IoBuffer	Payload(Response.ResponsePayload);
 		CbObject	OplogResonse = LoadCompactBinaryObject(Payload);
@@ -542,7 +544,7 @@ TEST_CASE("project.remote")
 	auto HttpWaitForCompletion = [](ZenServerInstance& Server, const HttpClient::Response& Response) {
 		REQUIRE(Response);
 		const uint64_t JobId = ParseInt<uint64_t>(Response.AsText()).value_or(0);
-		CHECK(JobId != 0);
+		REQUIRE(JobId != 0);
 
 		HttpClient Http{Server.GetBaseUri()};
 
@@ -550,10 +552,10 @@ TEST_CASE("project.remote")
 		{
 			HttpClient::Response StatusResponse =
 				Http.Get(fmt::format("/admin/jobs/{}", JobId), {{"Accept", ToString(ZenContentType::kCbObject)}});
-			CHECK(StatusResponse);
+			REQUIRE(StatusResponse);
 			CbObject		 ResponseObject = StatusResponse.AsObject();
 			std::string_view Status			= ResponseObject["Status"sv].AsString();
-			CHECK(Status != "Aborted"sv);
+			REQUIRE(Status != "Aborted"sv);
 			if (Status == "Complete"sv)
 			{
 				return;
@@ -888,17 +890,17 @@ TEST_CASE("project.rpcappendop")
 		Project.AddString("project"sv, ""sv);
 		Project.AddString("projectfile"sv, ""sv);
 		HttpClient::Response Response = Client.Post(fmt::format("/prj/{}", ProjectName), Project.Save());
-		CHECK_MESSAGE(Response.IsSuccess(), Response.ErrorMessage(""));
+		REQUIRE_MESSAGE(Response.IsSuccess(), Response.ErrorMessage(""));
 	};
 
 	auto MakeOplog = [](HttpClient& Client, std::string_view ProjectName, std::string_view OplogName) {
 		HttpClient::Response Response =
 			Client.Post(fmt::format("/prj/{}/oplog/{}", ProjectName, OplogName), IoBuffer{}, ZenContentType::kCbObject);
-		CHECK_MESSAGE(Response.IsSuccess(), Response.ErrorMessage(""));
+		REQUIRE_MESSAGE(Response.IsSuccess(), Response.ErrorMessage(""));
 	};
 	auto GetOplog = [](HttpClient& Client, std::string_view ProjectName, std::string_view OplogName) {
 		HttpClient::Response Response = Client.Get(fmt::format("/prj/{}/oplog/{}", ProjectName, OplogName));
-		CHECK_MESSAGE(Response.IsSuccess(), Response.ErrorMessage(""));
+		REQUIRE_MESSAGE(Response.IsSuccess(), Response.ErrorMessage(""));
 		return Response.AsObject();
 	};
 
@@ -912,7 +914,7 @@ TEST_CASE("project.rpcappendop")
 		}
 		Request.EndArray();	 // "ops"
 		HttpClient::Response Response = Client.Post(fmt::format("/prj/{}/oplog/{}/rpc", ProjectName, OplogName), Request.Save());
-		CHECK_MESSAGE(Response.IsSuccess(), Response.ErrorMessage(""));
+		REQUIRE_MESSAGE(Response.IsSuccess(), Response.ErrorMessage(""));
 
 		CbObjectView		ResponsePayload = Response.AsPackage().GetObject();
 		CbArrayView			NeedArray		= ResponsePayload["need"sv].AsArrayView();
@@ -1055,6 +1057,8 @@ TEST_CASE("project.rpcappendop")
 	}
 }
 
+TEST_SUITE_END();
+
 }  // namespace zen::tests
 
 #endif