From 3de9a65cd990f2a4f5395b7e2a094471633eb98b Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Thu, 11 Dec 2025 09:34:24 +0100 Subject: HTTP server API changes for improved extensibility (#684) * refactored `HttpServer` so all subclass member functions are proctected, to make it easier to extend base functionality * added API service, can be used to enumerate registered endpoints (at `/api`). Currently only very basic information is provided --- src/zenserver-test/buildstore-tests.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/zenserver-test/buildstore-tests.cpp') diff --git a/src/zenserver-test/buildstore-tests.cpp b/src/zenserver-test/buildstore-tests.cpp index 29afd3f9d..ec6f17d97 100644 --- a/src/zenserver-test/buildstore-tests.cpp +++ b/src/zenserver-test/buildstore-tests.cpp @@ -63,15 +63,15 @@ TEST_CASE("buildstore.blobs") { HttpClient::Response Result = Client.Get(fmt::format("{}/{}/{}/blobs/{}", Namespace, Bucket, BuildId, RawHash), HttpClient::Accept(ZenContentType::kCompressedBinary)); - CHECK(Result); + REQUIRE(Result); IoBuffer Payload = Result.ResponsePayload; - CHECK(Payload.GetContentType() == ZenContentType::kCompressedBinary); + REQUIRE(Payload.GetContentType() == ZenContentType::kCompressedBinary); IoHash VerifyRawHash; uint64_t VerifyRawSize; CompressedBuffer CompressedBlob = CompressedBuffer::FromCompressed(SharedBuffer(std::move(Payload)), VerifyRawHash, VerifyRawSize); - CHECK(CompressedBlob); - CHECK(VerifyRawHash == RawHash); + REQUIRE(CompressedBlob); + REQUIRE(VerifyRawHash == RawHash); IoBuffer Decompressed = CompressedBlob.Decompress().AsIoBuffer(); CHECK(IoHash::HashBuffer(Decompressed) == RawHash); } @@ -89,15 +89,15 @@ TEST_CASE("buildstore.blobs") { HttpClient::Response Result = Client.Get(fmt::format("{}/{}/{}/blobs/{}", Namespace, Bucket, BuildId, RawHash), HttpClient::Accept(ZenContentType::kCompressedBinary)); - CHECK(Result); + REQUIRE(Result); IoBuffer Payload = Result.ResponsePayload; - CHECK(Payload.GetContentType() == ZenContentType::kCompressedBinary); + REQUIRE(Payload.GetContentType() == ZenContentType::kCompressedBinary); IoHash VerifyRawHash; uint64_t VerifyRawSize; CompressedBuffer CompressedBlob = CompressedBuffer::FromCompressed(SharedBuffer(std::move(Payload)), VerifyRawHash, VerifyRawSize); - CHECK(CompressedBlob); - CHECK(VerifyRawHash == RawHash); + REQUIRE(CompressedBlob); + REQUIRE(VerifyRawHash == RawHash); IoBuffer Decompressed = CompressedBlob.Decompress().AsIoBuffer(); CHECK(IoHash::HashBuffer(Decompressed) == RawHash); } @@ -128,15 +128,15 @@ TEST_CASE("buildstore.blobs") { HttpClient::Response Result = Client.Get(fmt::format("{}/{}/{}/blobs/{}", Namespace, Bucket, BuildId, RawHash), HttpClient::Accept(ZenContentType::kCompressedBinary)); - CHECK(Result); + REQUIRE(Result); IoBuffer Payload = Result.ResponsePayload; - CHECK(Payload.GetContentType() == ZenContentType::kCompressedBinary); + REQUIRE(Payload.GetContentType() == ZenContentType::kCompressedBinary); IoHash VerifyRawHash; uint64_t VerifyRawSize; CompressedBuffer CompressedBlob = CompressedBuffer::FromCompressed(SharedBuffer(std::move(Payload)), VerifyRawHash, VerifyRawSize); - CHECK(CompressedBlob); - CHECK(VerifyRawHash == RawHash); + REQUIRE(CompressedBlob); + REQUIRE(VerifyRawHash == RawHash); IoBuffer Decompressed = CompressedBlob.Decompress().AsIoBuffer(); CHECK(IoHash::HashBuffer(Decompressed) == RawHash); } -- cgit v1.2.3