diff options
Diffstat (limited to 'test/buildtool/execution_api')
6 files changed, 24 insertions, 32 deletions
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS index d3e42c6d..f9caa7ee 100644 --- a/test/buildtool/execution_api/bazel/TARGETS +++ b/test/buildtool/execution_api/bazel/TARGETS @@ -74,7 +74,7 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["", "catch-main"] - , ["@", "src", "src/buildtool/common", "artifact_factory"] + , ["@", "src", "src/buildtool/common", "artifact_description"] , [ "@" , "src" , "src/buildtool/execution_api/bazel_msg" 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 71dd67e3..b56021c8 100644 --- a/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp +++ b/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp @@ -16,7 +16,7 @@ #include <unordered_map> #include "catch2/catch_test_macros.hpp" -#include "src/buildtool/common/artifact_factory.hpp" +#include "src/buildtool/common/artifact_description.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" @@ -51,28 +51,22 @@ TEST_CASE("Bazel internals: MessageFactory", "[execution_api]") { // create known artifacts auto artifact1_opt = - ArtifactFactory::FromDescription(ArtifactFactory::DescribeKnownArtifact( - NativeSupport::Unprefix(file1_blob->digest.hash()), - static_cast<std::size_t>(file1_blob->digest.size_bytes()), - ObjectType::File)); - CHECK(artifact1_opt.has_value()); - auto artifact1 = DependencyGraph::ArtifactNode{std::move(*artifact1_opt)}; + ArtifactDescription::CreateKnown(ArtifactDigest{file1_blob->digest}, + ObjectType::File) + .ToArtifact(); + auto artifact1 = DependencyGraph::ArtifactNode{std::move(artifact1_opt)}; auto artifact2_opt = - ArtifactFactory::FromDescription(ArtifactFactory::DescribeKnownArtifact( - NativeSupport::Unprefix(file2_blob->digest.hash()), - static_cast<std::size_t>(file2_blob->digest.size_bytes()), - ObjectType::File)); - CHECK(artifact2_opt.has_value()); - auto artifact2 = DependencyGraph::ArtifactNode{std::move(*artifact2_opt)}; + ArtifactDescription::CreateKnown(ArtifactDigest{file2_blob->digest}, + ObjectType::File) + .ToArtifact(); + auto artifact2 = DependencyGraph::ArtifactNode{std::move(artifact2_opt)}; auto artifact3_opt = - ArtifactFactory::FromDescription(ArtifactFactory::DescribeKnownArtifact( - NativeSupport::Unprefix(link_blob->digest.hash()), - static_cast<std::size_t>(link_blob->digest.size_bytes()), - ObjectType::Symlink)); - CHECK(artifact3_opt.has_value()); - auto artifact3 = DependencyGraph::ArtifactNode{std::move(*artifact3_opt)}; + ArtifactDescription::CreateKnown(ArtifactDigest{link_blob->digest}, + ObjectType::Symlink) + .ToArtifact(); + auto artifact3 = DependencyGraph::ArtifactNode{std::move(artifact3_opt)}; // create directory tree auto tree = diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS index f49f65fc..b4e2c4a9 100644 --- a/test/buildtool/execution_api/common/TARGETS +++ b/test/buildtool/execution_api/common/TARGETS @@ -4,7 +4,7 @@ , "hdrs": ["api_test.hpp"] , "deps": [ ["@", "catch2", "", "catch2"] - , ["@", "src", "src/buildtool/common", "artifact_factory"] + , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/execution_api/common", "common"] , ["@", "src", "src/buildtool/execution_api/local", "config"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] diff --git a/test/buildtool/execution_api/common/api_test.hpp b/test/buildtool/execution_api/common/api_test.hpp index 413ed7fd..d43c850d 100644 --- a/test/buildtool/execution_api/common/api_test.hpp +++ b/test/buildtool/execution_api/common/api_test.hpp @@ -20,7 +20,7 @@ #include <vector> #include "catch2/catch_test_macros.hpp" -#include "src/buildtool/common/artifact_factory.hpp" +#include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/execution_api/common/execution_action.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_api/common/execution_response.hpp" @@ -207,11 +207,10 @@ inline void SetLauncher() { auto test_digest = ArtifactDigest::Create<ObjectType::File>(test_content); auto input_artifact_opt = - ArtifactFactory::FromDescription(ArtifactFactory::DescribeKnownArtifact( - test_digest.hash(), test_digest.size(), ObjectType::File)); - CHECK(input_artifact_opt.has_value()); + ArtifactDescription::CreateKnown(test_digest, ObjectType::File) + .ToArtifact(); auto input_artifact = - DependencyGraph::ArtifactNode{std::move(*input_artifact_opt)}; + DependencyGraph::ArtifactNode{std::move(input_artifact_opt)}; std::string input_path{"dir/subdir/input"}; std::string output_path{"output_file"}; diff --git a/test/buildtool/execution_api/local/TARGETS b/test/buildtool/execution_api/local/TARGETS index eb23c99a..09b88419 100644 --- a/test/buildtool/execution_api/local/TARGETS +++ b/test/buildtool/execution_api/local/TARGETS @@ -5,7 +5,7 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["", "catch-main"] - , ["@", "src", "src/buildtool/common", "artifact_factory"] + , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/execution_api/local", "config"] , ["@", "src", "src/buildtool/execution_api/local", "local"] diff --git a/test/buildtool/execution_api/local/local_execution.test.cpp b/test/buildtool/execution_api/local/local_execution.test.cpp index bbd48ddc..4c2e309c 100644 --- a/test/buildtool/execution_api/local/local_execution.test.cpp +++ b/test/buildtool/execution_api/local/local_execution.test.cpp @@ -19,7 +19,7 @@ #include <vector> #include "catch2/catch_test_macros.hpp" -#include "src/buildtool/common/artifact_factory.hpp" +#include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/execution_api/local/config.hpp" #include "src/buildtool/execution_api/local/local_api.hpp" @@ -233,11 +233,10 @@ TEST_CASE("LocalExecution: One input copied to output", "[execution_api]") { std::vector<std::string> const cmdline = {"cp", input_path, output_path}; auto local_artifact_opt = - ArtifactFactory::FromDescription(ArtifactFactory::DescribeKnownArtifact( - test_digest.hash(), test_digest.size(), ObjectType::File)); - REQUIRE(local_artifact_opt); + ArtifactDescription::CreateKnown(test_digest, ObjectType::File) + .ToArtifact(); auto local_artifact = - DependencyGraph::ArtifactNode{std::move(*local_artifact_opt)}; + DependencyGraph::ArtifactNode{std::move(local_artifact_opt)}; auto action = api.CreateAction(*api.UploadTree({{input_path, &local_artifact}}), |