summaryrefslogtreecommitdiff
path: root/test/buildtool/execution_api
diff options
context:
space:
mode:
Diffstat (limited to 'test/buildtool/execution_api')
-rw-r--r--test/buildtool/execution_api/bazel/TARGETS41
-rw-r--r--test/buildtool/execution_api/bazel/bazel_api.test.cpp7
-rw-r--r--test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp7
-rw-r--r--test/buildtool/execution_api/bazel/bazel_execution_client.test.cpp9
-rw-r--r--test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp7
-rw-r--r--test/buildtool/execution_api/bazel/bazel_network.test.cpp11
-rw-r--r--test/buildtool/execution_api/bazel/bytestream_client.test.cpp5
-rw-r--r--test/buildtool/execution_api/common/TARGETS13
-rw-r--r--test/buildtool/execution_api/common/api_test.hpp13
-rw-r--r--test/buildtool/execution_api/common/bytestream_utils.test.cpp3
-rw-r--r--test/buildtool/execution_api/common/tree_rehashing.test.cpp5
-rw-r--r--test/buildtool/execution_api/execution_service/TARGETS4
-rw-r--r--test/buildtool/execution_api/execution_service/cas_server.test.cpp11
-rw-r--r--test/buildtool/execution_api/local/TARGETS17
-rw-r--r--test/buildtool/execution_api/local/local_api.test.cpp7
-rw-r--r--test/buildtool/execution_api/local/local_execution.test.cpp16
16 files changed, 156 insertions, 20 deletions
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS
index 7f0bd860..805b9797 100644
--- a/test/buildtool/execution_api/bazel/TARGETS
+++ b/test/buildtool/execution_api/bazel/TARGETS
@@ -6,9 +6,16 @@
[ ["@", "catch2", "", "catch2"]
, ["@", "gsl", "", "gsl"]
, ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
+ , ["@", "src", "src/buildtool/common", "bazel_types"]
+ , ["@", "src", "src/buildtool/common/remote", "remote_common"]
, ["@", "src", "src/buildtool/common/remote", "retry_config"]
, ["@", "src", "src/buildtool/crypto", "hash_function"]
, ["@", "src", "src/buildtool/execution_api/bazel_msg", "bazel_msg"]
+ , [ "@"
+ , "src"
+ , "src/buildtool/execution_api/common"
+ , "content_blob_container"
+ ]
, ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
, ["@", "src", "src/buildtool/execution_api/remote", "config"]
, ["@", "src", "src/buildtool/file_system", "object_type"]
@@ -25,9 +32,13 @@
, "srcs": ["bazel_execution_client.test.cpp"]
, "private-deps":
[ ["@", "catch2", "", "catch2"]
+ , ["@", "gsl", "", "gsl"]
, ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
+ , ["@", "src", "src/buildtool/common", "bazel_types"]
+ , ["@", "src", "src/buildtool/common/remote", "remote_common"]
, ["@", "src", "src/buildtool/common/remote", "retry_config"]
, ["@", "src", "src/buildtool/crypto", "hash_function"]
+ , ["@", "src", "src/buildtool/execution_api/bazel_msg", "bazel_msg"]
, ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
, ["@", "src", "src/buildtool/execution_api/remote", "config"]
, ["@", "src", "src/buildtool/file_system", "object_type"]
@@ -45,8 +56,10 @@
, "srcs": ["bytestream_client.test.cpp"]
, "private-deps":
[ ["@", "catch2", "", "catch2"]
- , ["@", "src", "src/buildtool/auth", "auth"]
+ , ["@", "grpc", "", "grpc"]
+ , ["@", "gsl", "", "gsl"]
, ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
+ , ["@", "src", "src/buildtool/common/remote", "remote_common"]
, ["@", "src", "src/buildtool/crypto", "hash_function"]
, ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"]
, ["@", "src", "src/buildtool/execution_api/common", "common"]
@@ -67,12 +80,25 @@
, "srcs": ["bazel_network.test.cpp"]
, "private-deps":
[ ["@", "catch2", "", "catch2"]
- , ["@", "src", "src/buildtool/auth", "auth"]
+ , ["@", "grpc", "", "grpc"]
+ , ["@", "gsl", "", "gsl"]
, ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
+ , ["@", "src", "src/buildtool/common", "bazel_types"]
, ["@", "src", "src/buildtool/common", "protocol_traits"]
+ , ["@", "src", "src/buildtool/common/remote", "remote_common"]
, ["@", "src", "src/buildtool/common/remote", "retry_config"]
, ["@", "src", "src/buildtool/crypto", "hash_function"]
, ["@", "src", "src/buildtool/execution_api/bazel_msg", "bazel_msg"]
+ , [ "@"
+ , "src"
+ , "src/buildtool/execution_api/common"
+ , "artifact_blob_container"
+ ]
+ , [ "@"
+ , "src"
+ , "src/buildtool/execution_api/common"
+ , "content_blob_container"
+ ]
, ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
, ["@", "src", "src/buildtool/execution_api/remote", "config"]
, ["@", "src", "src/buildtool/file_system", "object_type"]
@@ -100,12 +126,19 @@
, "src/buildtool/execution_api/bazel_msg"
, "bazel_msg_factory"
]
+ , ["@", "src", "src/buildtool/execution_api/bazel_msg", "directory_tree"]
, [ "@"
, "src"
, "src/buildtool/execution_api/common"
, "artifact_blob_container"
]
, ["@", "src", "src/buildtool/execution_api/common", "common"]
+ , [ "@"
+ , "src"
+ , "src/buildtool/execution_api/common"
+ , "content_blob_container"
+ ]
+ , ["@", "src", "src/buildtool/execution_engine/dag", "dag"]
, ["@", "src", "src/buildtool/file_system", "file_system_manager"]
, ["@", "src", "src/buildtool/file_system", "object_type"]
, ["", "catch-main"]
@@ -119,8 +152,12 @@
, "srcs": ["bazel_api.test.cpp"]
, "private-deps":
[ ["@", "catch2", "", "catch2"]
+ , ["@", "gsl", "", "gsl"]
+ , ["@", "src", "src/buildtool/auth", "auth"]
+ , ["@", "src", "src/buildtool/common/remote", "remote_common"]
, ["@", "src", "src/buildtool/common/remote", "retry_config"]
, ["@", "src", "src/buildtool/crypto", "hash_function"]
+ , ["@", "src", "src/buildtool/execution_api/common", "common"]
, ["@", "src", "src/buildtool/execution_api/remote", "bazel"]
, ["@", "src", "src/buildtool/execution_api/remote", "config"]
, ["buildtool/execution_api/common", "api_test"]
diff --git a/test/buildtool/execution_api/bazel/bazel_api.test.cpp b/test/buildtool/execution_api/bazel/bazel_api.test.cpp
index e201111c..982dc756 100644
--- a/test/buildtool/execution_api/bazel/bazel_api.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_api.test.cpp
@@ -14,12 +14,15 @@
#include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp"
-#include <cstdlib>
-#include <string>
+#include <optional>
#include "catch2/catch_test_macros.hpp"
+#include "gsl/gsl"
+#include "src/buildtool/auth/authentication.hpp"
+#include "src/buildtool/common/remote/remote_common.hpp"
#include "src/buildtool/common/remote/retry_config.hpp"
#include "src/buildtool/crypto/hash_function.hpp"
+#include "src/buildtool/execution_api/common/execution_api.hpp"
#include "src/buildtool/execution_api/remote/config.hpp"
#include "test/buildtool/execution_api/common/api_test.hpp"
#include "test/utils/hermeticity/test_hash_function_type.hpp"
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 e8234282..6eee8c86 100644
--- a/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
@@ -14,17 +14,20 @@
#include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp"
-#include <functional> // std::equal_to
+#include <memory>
+#include <optional>
#include <string>
#include <vector>
#include "catch2/catch_test_macros.hpp"
#include "gsl/gsl"
#include "src/buildtool/common/bazel_digest_factory.hpp"
+#include "src/buildtool/common/bazel_types.hpp"
+#include "src/buildtool/common/remote/remote_common.hpp"
#include "src/buildtool/common/remote/retry_config.hpp"
#include "src/buildtool/crypto/hash_function.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/common/content_blob_container.hpp"
#include "src/buildtool/execution_api/remote/config.hpp"
#include "src/buildtool/file_system/object_type.hpp"
#include "test/utils/hermeticity/test_hash_function_type.hpp"
diff --git a/test/buildtool/execution_api/bazel/bazel_execution_client.test.cpp b/test/buildtool/execution_api/bazel/bazel_execution_client.test.cpp
index 4594de8e..03bf529e 100644
--- a/test/buildtool/execution_api/bazel/bazel_execution_client.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_execution_client.test.cpp
@@ -14,12 +14,21 @@
#include "src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp"
+#include <map>
+#include <memory>
+#include <optional>
#include <string>
+#include <utility>
+#include <vector>
#include "catch2/catch_test_macros.hpp"
+#include "gsl/gsl"
#include "src/buildtool/common/bazel_digest_factory.hpp"
+#include "src/buildtool/common/bazel_types.hpp"
+#include "src/buildtool/common/remote/remote_common.hpp"
#include "src/buildtool/common/remote/retry_config.hpp"
#include "src/buildtool/crypto/hash_function.hpp"
+#include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp"
#include "src/buildtool/execution_api/remote/config.hpp"
#include "src/buildtool/file_system/object_type.hpp"
#include "test/utils/hermeticity/test_hash_function_type.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 ca9d3ca9..a6b155fd 100644
--- a/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp
@@ -15,16 +15,23 @@
#include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp"
#include <filesystem>
+#include <functional>
+#include <memory>
#include <optional>
#include <string>
#include <unordered_map>
+#include <utility>
+#include <vector>
#include "catch2/catch_test_macros.hpp"
#include "src/buildtool/common/artifact_description.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/bazel_msg/directory_tree.hpp"
#include "src/buildtool/execution_api/common/artifact_blob_container.hpp"
+#include "src/buildtool/execution_api/common/content_blob_container.hpp"
+#include "src/buildtool/execution_engine/dag/dag.hpp"
#include "src/buildtool/file_system/file_system_manager.hpp"
#include "src/buildtool/file_system/object_type.hpp"
#include "test/utils/hermeticity/test_hash_function_type.hpp"
diff --git a/test/buildtool/execution_api/bazel/bazel_network.test.cpp b/test/buildtool/execution_api/bazel/bazel_network.test.cpp
index e5dab868..1f504110 100644
--- a/test/buildtool/execution_api/bazel/bazel_network.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_network.test.cpp
@@ -15,18 +15,25 @@
#include "src/buildtool/execution_api/remote/bazel/bazel_network.hpp"
#include <cstddef>
+#include <memory>
#include <optional>
#include <string>
#include <vector>
+#include <grpc/grpc.h>
+
#include "catch2/catch_test_macros.hpp"
-#include "src/buildtool/auth/authentication.hpp"
+#include "gsl/gsl"
#include "src/buildtool/common/bazel_digest_factory.hpp"
+#include "src/buildtool/common/bazel_types.hpp"
#include "src/buildtool/common/protocol_traits.hpp"
+#include "src/buildtool/common/remote/remote_common.hpp"
#include "src/buildtool/common/remote/retry_config.hpp"
#include "src/buildtool/crypto/hash_function.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/common/artifact_blob_container.hpp"
+#include "src/buildtool/execution_api/common/content_blob_container.hpp"
+#include "src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp"
#include "src/buildtool/execution_api/remote/config.hpp"
#include "src/buildtool/file_system/object_type.hpp"
#include "test/utils/hermeticity/test_hash_function_type.hpp"
diff --git a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp
index 16adb0cd..3111d1ba 100644
--- a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp
+++ b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp
@@ -18,9 +18,12 @@
#include <optional>
#include <string>
+#include <grpc/grpc.h>
+
#include "catch2/catch_test_macros.hpp"
-#include "src/buildtool/auth/authentication.hpp"
+#include "gsl/gsl"
#include "src/buildtool/common/bazel_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"
#include "src/buildtool/execution_api/common/execution_common.hpp"
diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS
index 13b393e3..220c202c 100644
--- a/test/buildtool/execution_api/common/TARGETS
+++ b/test/buildtool/execution_api/common/TARGETS
@@ -4,14 +4,25 @@
, "hdrs": ["api_test.hpp"]
, "deps":
[ ["@", "catch2", "", "catch2"]
+ , ["@", "fmt", "", "fmt"]
+ , ["@", "gsl", "", "gsl"]
, ["@", "src", "src/buildtool/common", "artifact_description"]
, ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
+ , ["@", "src", "src/buildtool/common", "common"]
, ["@", "src", "src/buildtool/crypto", "hash_function"]
+ , [ "@"
+ , "src"
+ , "src/buildtool/execution_api/common"
+ , "artifact_blob_container"
+ ]
, ["@", "src", "src/buildtool/execution_api/common", "common"]
, ["@", "src", "src/buildtool/execution_api/local", "config"]
+ , ["@", "src", "src/buildtool/execution_engine/dag", "dag"]
, ["@", "src", "src/buildtool/file_system", "file_system_manager"]
+ , ["@", "src", "src/buildtool/file_system", "object_type"]
, ["@", "src", "src/buildtool/logging", "log_level"]
, ["@", "src", "src/buildtool/logging", "logging"]
+ , ["@", "src", "src/utils/cpp", "expected"]
, ["utils", "test_hash_function_type"]
]
, "stage": ["test", "buildtool", "execution_api", "common"]
@@ -27,6 +38,7 @@
, ["@", "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"]
, ["", "catch-main"]
, ["utils", "test_hash_function_type"]
]
@@ -48,6 +60,7 @@
, "bazel_msg_factory"
]
, ["@", "src", "src/buildtool/file_system", "file_system_manager"]
+ , ["@", "src", "src/buildtool/file_system", "object_type"]
, ["@", "src", "src/buildtool/storage", "config"]
, ["@", "src", "src/buildtool/storage", "storage"]
, ["@", "src", "src/utils/cpp", "expected"]
diff --git a/test/buildtool/execution_api/common/api_test.hpp b/test/buildtool/execution_api/common/api_test.hpp
index d00eec7b..fcb90634 100644
--- a/test/buildtool/execution_api/common/api_test.hpp
+++ b/test/buildtool/execution_api/common/api_test.hpp
@@ -15,24 +15,37 @@
#ifndef INCLUDED_SRC_TEST_BUILDTOOL_EXECUTION_API_COMMON_API_TEST_HPP
#define INCLUDED_SRC_TEST_BUILDTOOL_EXECUTION_API_COMMON_API_TEST_HPP
+#include <algorithm>
#include <cstdlib>
#include <filesystem>
#include <functional>
#include <map>
+#include <memory>
+#include <optional>
#include <string>
+#include <unordered_map>
+#include <utility>
#include <vector>
#include "catch2/catch_test_macros.hpp"
+#include "fmt/core.h"
+#include "gsl/gsl"
+#include "src/buildtool/common/artifact.hpp"
#include "src/buildtool/common/artifact_description.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/artifact_blob_container.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"
#include "src/buildtool/execution_api/local/config.hpp"
+#include "src/buildtool/execution_engine/dag/dag.hpp"
#include "src/buildtool/file_system/file_system_manager.hpp"
+#include "src/buildtool/file_system/object_type.hpp"
#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
+#include "src/utils/cpp/expected.hpp"
#include "test/utils/hermeticity/test_hash_function_type.hpp"
using ApiFactory = std::function<IExecutionApi::Ptr()>;
diff --git a/test/buildtool/execution_api/common/bytestream_utils.test.cpp b/test/buildtool/execution_api/common/bytestream_utils.test.cpp
index a2f139e7..41827673 100644
--- a/test/buildtool/execution_api/common/bytestream_utils.test.cpp
+++ b/test/buildtool/execution_api/common/bytestream_utils.test.cpp
@@ -14,7 +14,7 @@
#include "src/buildtool/execution_api/common/bytestream_utils.hpp"
-#include <functional>
+#include <optional>
#include <string>
#include "catch2/catch_test_macros.hpp"
@@ -22,6 +22,7 @@
#include "src/buildtool/common/bazel_types.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 "test/utils/hermeticity/test_hash_function_type.hpp"
TEST_CASE("ReadRequest", "[common]") {
diff --git a/test/buildtool/execution_api/common/tree_rehashing.test.cpp b/test/buildtool/execution_api/common/tree_rehashing.test.cpp
index bccec3ab..b44e5f65 100644
--- a/test/buildtool/execution_api/common/tree_rehashing.test.cpp
+++ b/test/buildtool/execution_api/common/tree_rehashing.test.cpp
@@ -15,18 +15,23 @@
#include <array>
#include <cstddef>
#include <filesystem>
+#include <functional>
+#include <memory>
#include <optional>
#include <string>
#include <unordered_map>
#include <utility>
+#include <variant>
#include "catch2/catch_test_macros.hpp"
+#include "src/buildtool/common/artifact.hpp"
#include "src/buildtool/common/artifact_digest.hpp"
#include "src/buildtool/common/artifact_digest_factory.hpp"
#include "src/buildtool/common/protocol_traits.hpp"
#include "src/buildtool/crypto/hash_function.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"
#include "src/buildtool/storage/config.hpp"
#include "src/buildtool/storage/storage.hpp"
#include "src/utils/cpp/expected.hpp"
diff --git a/test/buildtool/execution_api/execution_service/TARGETS b/test/buildtool/execution_api/execution_service/TARGETS
index 5c585c12..c71380c4 100644
--- a/test/buildtool/execution_api/execution_service/TARGETS
+++ b/test/buildtool/execution_api/execution_service/TARGETS
@@ -4,10 +4,12 @@
, "srcs": ["cas_server.test.cpp"]
, "private-deps":
[ ["@", "catch2", "", "catch2"]
+ , ["@", "grpc", "", "grpc++"]
, ["@", "gsl", "", "gsl"]
, ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
- , ["@", "src", "src/buildtool/common", "common"]
+ , ["@", "src", "src/buildtool/common", "bazel_types"]
, ["@", "src", "src/buildtool/common", "protocol_traits"]
+ , ["@", "src", "src/buildtool/crypto", "hash_function"]
, [ "@"
, "src"
, "src/buildtool/execution_api/execution_service"
diff --git a/test/buildtool/execution_api/execution_service/cas_server.test.cpp b/test/buildtool/execution_api/execution_service/cas_server.test.cpp
index af5a3d58..eb3665e9 100644
--- a/test/buildtool/execution_api/execution_service/cas_server.test.cpp
+++ b/test/buildtool/execution_api/execution_service/cas_server.test.cpp
@@ -14,13 +14,22 @@
#include "src/buildtool/execution_api/execution_service/cas_server.hpp"
+#include <functional>
+#include <optional>
#include <string>
+#include <utility>
+#include <vector>
+#include <grpcpp/support/status.h>
+
+// Don't include "proto"
+// IWYU pragma: no_include "build/bazel/remote/execution/v2/remote_execution.grpc.pb.h"
#include "catch2/catch_test_macros.hpp"
#include "gsl/gsl"
-#include "src/buildtool/common/artifact_digest.hpp"
#include "src/buildtool/common/bazel_digest_factory.hpp"
+#include "src/buildtool/common/bazel_types.hpp"
#include "src/buildtool/common/protocol_traits.hpp"
+#include "src/buildtool/crypto/hash_function.hpp"
#include "src/buildtool/execution_api/local/config.hpp"
#include "src/buildtool/execution_api/local/context.hpp"
#include "src/buildtool/file_system/git_repo.hpp"
diff --git a/test/buildtool/execution_api/local/TARGETS b/test/buildtool/execution_api/local/TARGETS
index bbf83da9..fea79bfb 100644
--- a/test/buildtool/execution_api/local/TARGETS
+++ b/test/buildtool/execution_api/local/TARGETS
@@ -4,17 +4,30 @@
, "srcs": ["local_execution.test.cpp"]
, "private-deps":
[ ["@", "catch2", "", "catch2"]
+ , ["@", "fmt", "", "fmt"]
+ , ["@", "gsl", "", "gsl"]
, ["@", "src", "src/buildtool/common", "artifact_description"]
, ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
+ , ["@", "src", "src/buildtool/common", "common"]
, ["@", "src", "src/buildtool/common", "config"]
+ , ["@", "src", "src/buildtool/crypto", "hash_function"]
+ , [ "@"
+ , "src"
+ , "src/buildtool/execution_api/common"
+ , "artifact_blob_container"
+ ]
+ , ["@", "src", "src/buildtool/execution_api/common", "common"]
, ["@", "src", "src/buildtool/execution_api/local", "config"]
, ["@", "src", "src/buildtool/execution_api/local", "context"]
, ["@", "src", "src/buildtool/execution_api/local", "local"]
+ , ["@", "src", "src/buildtool/execution_engine/dag", "dag"]
, ["@", "src", "src/buildtool/file_system", "file_system_manager"]
+ , ["@", "src", "src/buildtool/file_system", "object_type"]
, ["@", "src", "src/buildtool/logging", "log_level"]
, ["@", "src", "src/buildtool/logging", "logging"]
, ["@", "src", "src/buildtool/storage", "config"]
, ["@", "src", "src/buildtool/storage", "storage"]
+ , ["@", "src", "src/utils/cpp", "expected"]
, ["", "catch-main"]
, ["utils", "test_storage_config"]
]
@@ -26,10 +39,10 @@
, "srcs": ["local_api.test.cpp"]
, "private-deps":
[ ["@", "catch2", "", "catch2"]
- , ["@", "src", "src/buildtool/execution_api/local", "config"]
+ , ["@", "gsl", "", "gsl"]
+ , ["@", "src", "src/buildtool/execution_api/common", "common"]
, ["@", "src", "src/buildtool/execution_api/local", "context"]
, ["@", "src", "src/buildtool/execution_api/local", "local"]
- , ["@", "src", "src/buildtool/storage", "config"]
, ["@", "src", "src/buildtool/storage", "storage"]
, ["", "catch-main"]
, ["buildtool/execution_api/common", "api_test"]
diff --git a/test/buildtool/execution_api/local/local_api.test.cpp b/test/buildtool/execution_api/local/local_api.test.cpp
index 548b3497..ec065cb7 100644
--- a/test/buildtool/execution_api/local/local_api.test.cpp
+++ b/test/buildtool/execution_api/local/local_api.test.cpp
@@ -14,13 +14,10 @@
#include "src/buildtool/execution_api/local/local_api.hpp"
-#include <cstdlib>
-#include <string>
-
#include "catch2/catch_test_macros.hpp"
-#include "src/buildtool/execution_api/local/config.hpp"
+#include "gsl/gsl"
+#include "src/buildtool/execution_api/common/execution_api.hpp"
#include "src/buildtool/execution_api/local/context.hpp"
-#include "src/buildtool/storage/config.hpp"
#include "src/buildtool/storage/storage.hpp"
#include "test/buildtool/execution_api/common/api_test.hpp"
#include "test/utils/hermeticity/test_storage_config.hpp"
diff --git a/test/buildtool/execution_api/local/local_execution.test.cpp b/test/buildtool/execution_api/local/local_execution.test.cpp
index 28fd03c6..a3b5c9a1 100644
--- a/test/buildtool/execution_api/local/local_execution.test.cpp
+++ b/test/buildtool/execution_api/local/local_execution.test.cpp
@@ -12,24 +12,38 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <chrono>
#include <cstdlib>
#include <filesystem>
+#include <map>
+#include <memory>
+#include <optional>
#include <string>
+#include <unordered_map>
+#include <utility>
#include <vector>
#include "catch2/catch_test_macros.hpp"
+#include "fmt/core.h"
+#include "gsl/gsl"
#include "src/buildtool/common/artifact_description.hpp"
+#include "src/buildtool/common/artifact_digest.hpp"
#include "src/buildtool/common/artifact_digest_factory.hpp"
#include "src/buildtool/common/repository_config.hpp"
+#include "src/buildtool/crypto/hash_function.hpp"
+#include "src/buildtool/execution_api/common/artifact_blob_container.hpp"
+#include "src/buildtool/execution_api/common/execution_action.hpp"
+#include "src/buildtool/execution_api/common/execution_response.hpp"
#include "src/buildtool/execution_api/local/config.hpp"
#include "src/buildtool/execution_api/local/context.hpp"
#include "src/buildtool/execution_api/local/local_api.hpp"
+#include "src/buildtool/execution_engine/dag/dag.hpp"
#include "src/buildtool/file_system/file_system_manager.hpp"
+#include "src/buildtool/file_system/object_type.hpp"
#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/buildtool/storage/config.hpp"
#include "src/buildtool/storage/storage.hpp"
+#include "src/utils/cpp/expected.hpp"
#include "test/utils/hermeticity/test_storage_config.hpp"
namespace {