diff options
Diffstat (limited to 'test')
4 files changed, 19 insertions, 13 deletions
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS index 570a8111..d982c447 100644 --- a/test/buildtool/execution_api/bazel/TARGETS +++ b/test/buildtool/execution_api/bazel/TARGETS @@ -58,7 +58,7 @@ [ ["@", "catch2", "", "catch2"] , ["@", "grpc", "", "grpc"] , ["@", "gsl", "", "gsl"] - , ["@", "src", "src/buildtool/common", "bazel_digest_factory"] + , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] , ["@", "src", "src/buildtool/common/remote", "remote_common"] , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"] diff --git a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp index 3111d1ba..fa50eb0a 100644 --- a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp +++ b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp @@ -22,7 +22,7 @@ #include "catch2/catch_test_macros.hpp" #include "gsl/gsl" -#include "src/buildtool/common/bazel_digest_factory.hpp" +#include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/bytestream_utils.hpp" @@ -53,7 +53,7 @@ TEST_CASE("ByteStream Client: Transfer single blob", "[execution_api]") { std::string content("foobar"); // digest of "foobar" - auto digest = BazelDigestFactory::HashDataAs<ObjectType::File>( + auto digest = ArtifactDigestFactory::HashDataAs<ObjectType::File>( hash_function, content); CHECK(stream.Write( @@ -74,7 +74,7 @@ TEST_CASE("ByteStream Client: Transfer single blob", "[execution_api]") { std::string other_content("This is a differnt string"); // Valid digest, but for a different string - auto digest = BazelDigestFactory::HashDataAs<ObjectType::File>( + auto digest = ArtifactDigestFactory::HashDataAs<ObjectType::File>( hash_function, other_content); CHECK(not stream.Write( @@ -93,7 +93,7 @@ TEST_CASE("ByteStream Client: Transfer single blob", "[execution_api]") { } // digest of "instance_nameinstance_nameinstance_..." - auto digest = BazelDigestFactory::HashDataAs<ObjectType::File>( + auto digest = ArtifactDigestFactory::HashDataAs<ObjectType::File>( hash_function, content); CHECK(stream.Write( 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); } |