summaryrefslogtreecommitdiff
path: root/test/buildtool/execution_api/common
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2025-01-23 17:11:39 +0100
committerMaksim Denisov <denisov.maksim@huawei.com>2025-02-07 14:58:04 +0100
commit686a13142b816dfa334bb85f3ffdcc62a81a3bb4 (patch)
treef9296ee10f11b3528f5ef89f6bf544ff3182fdc4 /test/buildtool/execution_api/common
parentb22ee0740857dad1f24999953864150a4f6bbcc8 (diff)
downloadjustbuild-686a13142b816dfa334bb85f3ffdcc62a81a3bb4.tar.gz
ByteStreamUtils: Use ArtifactDigest
Diffstat (limited to 'test/buildtool/execution_api/common')
-rw-r--r--test/buildtool/execution_api/common/TARGETS5
-rw-r--r--test/buildtool/execution_api/common/bytestream_utils.test.cpp17
2 files changed, 14 insertions, 8 deletions
diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS
index a466ab67..2cffd0de 100644
--- a/test/buildtool/execution_api/common/TARGETS
+++ b/test/buildtool/execution_api/common/TARGETS
@@ -33,12 +33,13 @@
, "srcs": ["bytestream_utils.test.cpp"]
, "private-deps":
[ ["@", "catch2", "", "catch2"]
- , ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
- , ["@", "src", "src/buildtool/common", "bazel_types"]
+ , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
+ , ["@", "src", "src/buildtool/common", "common"]
, ["@", "src", "src/buildtool/crypto", "hash_function"]
, ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"]
, ["@", "src", "src/buildtool/execution_api/common", "common"]
, ["@", "src", "src/buildtool/file_system", "object_type"]
+ , ["@", "src", "src/utils/cpp", "expected"]
, ["", "catch-main"]
, ["utils", "test_hash_function_type"]
]
diff --git a/test/buildtool/execution_api/common/bytestream_utils.test.cpp b/test/buildtool/execution_api/common/bytestream_utils.test.cpp
index 41827673..82faef38 100644
--- a/test/buildtool/execution_api/common/bytestream_utils.test.cpp
+++ b/test/buildtool/execution_api/common/bytestream_utils.test.cpp
@@ -18,26 +18,29 @@
#include <string>
#include "catch2/catch_test_macros.hpp"
-#include "src/buildtool/common/bazel_digest_factory.hpp"
-#include "src/buildtool/common/bazel_types.hpp"
+#include "src/buildtool/common/artifact_digest.hpp"
+#include "src/buildtool/common/artifact_digest_factory.hpp"
#include "src/buildtool/crypto/hash_function.hpp"
#include "src/buildtool/execution_api/common/execution_common.hpp"
#include "src/buildtool/file_system/object_type.hpp"
+#include "src/utils/cpp/expected.hpp"
#include "test/utils/hermeticity/test_hash_function_type.hpp"
TEST_CASE("ReadRequest", "[common]") {
static constexpr auto* kInstanceName = "instance_name";
HashFunction const hash_function{TestHashType::ReadFromEnvironment()};
- auto const digest = BazelDigestFactory::HashDataAs<ObjectType::File>(
+ auto const digest = ArtifactDigestFactory::HashDataAs<ObjectType::File>(
hash_function, "test_string");
std::string const request =
ByteStreamUtils::ReadRequest{kInstanceName, digest}.ToString();
auto const parsed = ByteStreamUtils::ReadRequest::FromString(request);
+ auto parsed_digest = parsed->GetDigest(hash_function.GetType());
REQUIRE(parsed);
+ REQUIRE(parsed_digest);
CHECK(parsed->GetInstanceName() == kInstanceName);
- CHECK(std::equal_to<bazel_re::Digest>{}(parsed->GetDigest(), digest));
+ CHECK(parsed_digest.value() == digest);
}
TEST_CASE("WriteRequest", "[common]") {
@@ -48,14 +51,16 @@ TEST_CASE("WriteRequest", "[common]") {
REQUIRE(id);
std::string const uuid = CreateUUIDVersion4(*id);
- auto const digest = BazelDigestFactory::HashDataAs<ObjectType::File>(
+ auto const digest = ArtifactDigestFactory::HashDataAs<ObjectType::File>(
hash_function, "test_string");
std::string const request =
ByteStreamUtils::WriteRequest{kInstanceName, uuid, digest}.ToString();
auto const parsed = ByteStreamUtils::WriteRequest::FromString(request);
+ auto parsed_digest = parsed->GetDigest(hash_function.GetType());
REQUIRE(parsed);
+ REQUIRE(parsed_digest.has_value());
CHECK(parsed->GetInstanceName() == kInstanceName);
CHECK(parsed->GetUUID() == uuid);
- CHECK(std::equal_to<bazel_re::Digest>{}(parsed->GetDigest(), digest));
+ CHECK(parsed_digest.value() == digest);
}