diff options
Diffstat (limited to 'test')
10 files changed, 15 insertions, 15 deletions
diff --git a/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp b/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp index 26e741fb..d9fec4dc 100644 --- a/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp +++ b/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp @@ -19,7 +19,7 @@ #include "catch2/catch_test_macros.hpp" #include "gsl/gsl" #include "src/buildtool/common/artifact_digest.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp" #include "src/buildtool/execution_api/remote/config.hpp" diff --git a/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp b/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp index 6715a565..730420e9 100644 --- a/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp +++ b/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp @@ -17,7 +17,7 @@ #include "catch2/catch_test_macros.hpp" #include "src/buildtool/common/artifact_factory.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" @@ -89,7 +89,7 @@ TEST_CASE("Bazel internals: MessageFactory", "[execution_api]") { {link_blob->digest, link}}; // create blobs via tree - BlobContainer blobs{}; + BazelBlobContainer blobs{}; REQUIRE(BazelMsgFactory::CreateDirectoryDigestFromTree( *tree, [&fake_cas](std::vector<bazel_re::Digest> const& digests, diff --git a/test/buildtool/execution_api/bazel/bazel_network.test.cpp b/test/buildtool/execution_api/bazel/bazel_network.test.cpp index 240e3a16..9125fbc4 100644 --- a/test/buildtool/execution_api/bazel/bazel_network.test.cpp +++ b/test/buildtool/execution_api/bazel/bazel_network.test.cpp @@ -19,7 +19,7 @@ #include "catch2/catch_test_macros.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/compatibility/compatibility.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_network.hpp" #include "src/buildtool/execution_api/remote/config.hpp" @@ -47,7 +47,7 @@ TEST_CASE("Bazel network: write/read blobs", "[execution_api]") { /*is_exec=*/false}; // Search blobs via digest - REQUIRE(network.UploadBlobs(BlobContainer{{foo, bar, baz}})); + REQUIRE(network.UploadBlobs(BazelBlobContainer{{foo, bar, baz}})); // Read blobs in order auto reader = network.ReadBlobs( @@ -91,7 +91,7 @@ TEST_CASE("Bazel network: read blobs with unknown size", "[execution_api]") { /*is_exec=*/false}; // Upload blobs - REQUIRE(network.UploadBlobs(BlobContainer{{foo, bar}})); + REQUIRE(network.UploadBlobs(BazelBlobContainer{{foo, bar}})); // Set size to unknown foo.digest.set_size_bytes(0); diff --git a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp index bf6db6db..285ec7d7 100644 --- a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp +++ b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp @@ -17,7 +17,7 @@ #include "catch2/catch_test_macros.hpp" #include "src/buildtool/common/artifact_digest.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/execution_api/remote/bazel/bytestream_client.hpp" #include "src/buildtool/execution_api/remote/config.hpp" diff --git a/test/buildtool/execution_api/common/api_test.hpp b/test/buildtool/execution_api/common/api_test.hpp index ac8925f0..8d869116 100644 --- a/test/buildtool/execution_api/common/api_test.hpp +++ b/test/buildtool/execution_api/common/api_test.hpp @@ -217,7 +217,7 @@ inline void SetLauncher() { std::string output_path{"output_file"}; auto api = api_factory(); - CHECK(api->Upload(BlobContainer{{BazelBlob{ + CHECK(api->Upload(BazelBlobContainer{{BazelBlob{ test_digest, test_content, /*is_exec=*/false}}}, false)); diff --git a/test/buildtool/execution_api/local/local_execution.test.cpp b/test/buildtool/execution_api/local/local_execution.test.cpp index c55449e0..860f4c3e 100644 --- a/test/buildtool/execution_api/local/local_execution.test.cpp +++ b/test/buildtool/execution_api/local/local_execution.test.cpp @@ -216,7 +216,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, std::string test_content("test"); auto test_digest = ArtifactDigest::Create<ObjectType::File>(test_content); - REQUIRE(api.Upload(BlobContainer{{BazelBlob{ + REQUIRE(api.Upload(BazelBlobContainer{{BazelBlob{ test_digest, test_content, /*is_exec=*/false}}}, false)); diff --git a/test/buildtool/execution_engine/executor/executor.test.cpp b/test/buildtool/execution_engine/executor/executor.test.cpp index 02836d07..7a09dc84 100644 --- a/test/buildtool/execution_engine/executor/executor.test.cpp +++ b/test/buildtool/execution_engine/executor/executor.test.cpp @@ -174,7 +174,7 @@ class TestApi : public IExecutionApi { -> std::optional<std::string> override { return std::nullopt; // not needed by Executor } - auto Upload(BlobContainer const& blobs, bool /*unused*/) noexcept + auto Upload(BazelBlobContainer const& blobs, bool /*unused*/) noexcept -> bool final { auto blob_range = blobs.Blobs(); return std::all_of( diff --git a/test/buildtool/execution_engine/executor/executor_api.test.hpp b/test/buildtool/execution_engine/executor/executor_api.test.hpp index 1ff50831..c8ec19d7 100644 --- a/test/buildtool/execution_engine/executor/executor_api.test.hpp +++ b/test/buildtool/execution_engine/executor/executor_api.test.hpp @@ -51,7 +51,7 @@ static inline void RunBlobUpload(RepositoryConfig* repo_config, SetupConfig(repo_config); auto api = factory(); std::string const blob = "test"; - CHECK(api->Upload(BlobContainer{{BazelBlob{ + CHECK(api->Upload(BazelBlobContainer{{BazelBlob{ ArtifactDigest{HashFunction::ComputeBlobHash(blob).HexString(), blob.size(), /*is_tree=*/false}, @@ -383,8 +383,8 @@ static inline void TestUploadAndDownloadTrees( // upload blobs auto api = factory(); REQUIRE(api->Upload( - BlobContainer{{BazelBlob{foo_digest, foo, /*is_exec=*/false}, - BazelBlob{bar_digest, bar, /*is_exec=*/false}}})); + BazelBlobContainer{{BazelBlob{foo_digest, foo, /*is_exec=*/false}, + BazelBlob{bar_digest, bar, /*is_exec=*/false}}})); // define known artifacts auto foo_desc = ArtifactDescription{foo_digest, ObjectType::File}; diff --git a/test/buildtool/storage/local_cas.test.cpp b/test/buildtool/storage/local_cas.test.cpp index 512e9a1b..55a8d946 100644 --- a/test/buildtool/storage/local_cas.test.cpp +++ b/test/buildtool/storage/local_cas.test.cpp @@ -17,7 +17,7 @@ #include "catch2/catch_test_macros.hpp" #include "src/buildtool/common/artifact_digest.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "test/utils/blob_creator.hpp" diff --git a/test/utils/blob_creator.hpp b/test/utils/blob_creator.hpp index 3bc7d54c..baa7cc86 100644 --- a/test/utils/blob_creator.hpp +++ b/test/utils/blob_creator.hpp @@ -20,7 +20,7 @@ #include <string> #include "src/buildtool/common/artifact_digest.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" |