diff options
Diffstat (limited to 'test')
104 files changed, 585 insertions, 185 deletions
diff --git a/test/buildtool/build_engine/base_maps/TARGETS b/test/buildtool/build_engine/base_maps/TARGETS index e243290c..2bd0882a 100644 --- a/test/buildtool/build_engine/base_maps/TARGETS +++ b/test/buildtool/build_engine/base_maps/TARGETS @@ -3,7 +3,7 @@ , "name": ["test_repo"] , "hdrs": ["test_repo.hpp"] , "deps": - [ ["@", "src", "src/buildtool/common", "config"] + [ ["@", "fmt", "", "fmt"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["utils", "shell_quoting"] ] @@ -15,7 +15,7 @@ , "srcs": ["entity_name.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name"] + , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"] , ["", "catch-main"] ] , "stage": ["test", "buildtool", "build_engine", "base_maps"] @@ -46,6 +46,7 @@ [ "test_repo" , ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/build_engine/base_maps", "json_file_map"] + , ["@", "src", "src/buildtool/build_engine/base_maps", "module_name"] , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/file_system", "file_root"] , ["@", "src", "src/buildtool/multithreading", "task_system"] @@ -63,14 +64,13 @@ , ["@", "catch2", "", "catch2"] , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/build_engine/base_maps", "directory_map"] - , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name"] , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"] , ["@", "src", "src/buildtool/build_engine/base_maps", "source_map"] , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/file_system", "file_root"] - , ["@", "src", "src/buildtool/multithreading", "async_map_consumer"] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/multithreading", "task_system"] , ["", "catch-main"] , ["utils", "test_hash_function_type"] @@ -85,9 +85,9 @@ , "private-deps": [ "test_repo" , ["@", "catch2", "", "catch2"] + , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"] , ["@", "src", "src/buildtool/build_engine/base_maps", "expression_map"] - , ["@", "src", "src/buildtool/build_engine/base_maps", "json_file_map"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/file_system", "file_root"] @@ -104,9 +104,9 @@ , "private-deps": [ "test_repo" , ["@", "catch2", "", "catch2"] + , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"] , ["@", "src", "src/buildtool/build_engine/base_maps", "expression_map"] - , ["@", "src", "src/buildtool/build_engine/base_maps", "json_file_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "rule_map"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , ["@", "src", "src/buildtool/common", "config"] diff --git a/test/buildtool/build_engine/base_maps/directory_map.test.cpp b/test/buildtool/build_engine/base_maps/directory_map.test.cpp index b59c4ff0..8129fe37 100644 --- a/test/buildtool/build_engine/base_maps/directory_map.test.cpp +++ b/test/buildtool/build_engine/base_maps/directory_map.test.cpp @@ -15,9 +15,11 @@ #include "src/buildtool/build_engine/base_maps/directory_map.hpp" #include <filesystem> -#include <memory> +#include <map> +#include <optional> #include <string> #include <utility> // std::move +#include <vector> #include "catch2/catch_test_macros.hpp" #include "src/buildtool/build_engine/base_maps/module_name.hpp" diff --git a/test/buildtool/build_engine/base_maps/entity_name.test.cpp b/test/buildtool/build_engine/base_maps/entity_name.test.cpp index be88f017..aee7e899 100644 --- a/test/buildtool/build_engine/base_maps/entity_name.test.cpp +++ b/test/buildtool/build_engine/base_maps/entity_name.test.cpp @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/buildtool/build_engine/base_maps/entity_name.hpp" +#include <string> #include "catch2/catch_test_macros.hpp" +#include "src/buildtool/build_engine/base_maps/entity_name_data.hpp" TEST_CASE("Normal module names") { using NT = BuildMaps::Base::NamedTarget; diff --git a/test/buildtool/build_engine/base_maps/expression_map.test.cpp b/test/buildtool/build_engine/base_maps/expression_map.test.cpp index 04d5b86e..57a87db4 100644 --- a/test/buildtool/build_engine/base_maps/expression_map.test.cpp +++ b/test/buildtool/build_engine/base_maps/expression_map.test.cpp @@ -15,14 +15,16 @@ #include "src/buildtool/build_engine/base_maps/expression_map.hpp" #include <filesystem> -#include <functional> -#include <memory> +#include <map> +#include <optional> #include <string> #include <utility> // std::move +#include <vector> #include "catch2/catch_test_macros.hpp" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/base_maps/entity_name_data.hpp" -#include "src/buildtool/build_engine/base_maps/json_file_map.hpp" +#include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/file_system/file_root.hpp" diff --git a/test/buildtool/build_engine/base_maps/json_file_map.test.cpp b/test/buildtool/build_engine/base_maps/json_file_map.test.cpp index 4a951012..2917476b 100644 --- a/test/buildtool/build_engine/base_maps/json_file_map.test.cpp +++ b/test/buildtool/build_engine/base_maps/json_file_map.test.cpp @@ -14,12 +14,15 @@ #include "src/buildtool/build_engine/base_maps/json_file_map.hpp" +#include <atomic> #include <filesystem> -#include <memory> +#include <map> +#include <optional> #include <string> #include <utility> #include "catch2/catch_test_macros.hpp" +#include "src/buildtool/build_engine/base_maps/module_name.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/multithreading/task_system.hpp" diff --git a/test/buildtool/build_engine/base_maps/rule_map.test.cpp b/test/buildtool/build_engine/base_maps/rule_map.test.cpp index 87a76c2b..6a247cca 100644 --- a/test/buildtool/build_engine/base_maps/rule_map.test.cpp +++ b/test/buildtool/build_engine/base_maps/rule_map.test.cpp @@ -15,15 +15,16 @@ #include "src/buildtool/build_engine/base_maps/rule_map.hpp" #include <filesystem> -#include <functional> -#include <memory> +#include <map> +#include <optional> #include <string> #include <utility> // std::move +#include <vector> #include "catch2/catch_test_macros.hpp" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/base_maps/entity_name_data.hpp" #include "src/buildtool/build_engine/base_maps/expression_map.hpp" -#include "src/buildtool/build_engine/base_maps/json_file_map.hpp" #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" #include "src/buildtool/common/repository_config.hpp" diff --git a/test/buildtool/build_engine/base_maps/source_map.test.cpp b/test/buildtool/build_engine/base_maps/source_map.test.cpp index ab5323e4..7903412e 100644 --- a/test/buildtool/build_engine/base_maps/source_map.test.cpp +++ b/test/buildtool/build_engine/base_maps/source_map.test.cpp @@ -15,21 +15,22 @@ #include "src/buildtool/build_engine/base_maps/source_map.hpp" #include <filesystem> -#include <memory> +#include <functional> +#include <map> #include <optional> #include <string> #include <utility> +#include <vector> #include "catch2/catch_test_macros.hpp" #include "nlohmann/json.hpp" #include "src/buildtool/build_engine/base_maps/directory_map.hpp" -#include "src/buildtool/build_engine/base_maps/entity_name.hpp" #include "src/buildtool/build_engine/base_maps/entity_name_data.hpp" #include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/file_root.hpp" -#include "src/buildtool/multithreading/async_map_consumer.hpp" +#include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/multithreading/task_system.hpp" #include "test/buildtool/build_engine/base_maps/test_repo.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" diff --git a/test/buildtool/build_engine/base_maps/test_repo.hpp b/test/buildtool/build_engine/base_maps/test_repo.hpp index 08acbdab..c4490925 100644 --- a/test/buildtool/build_engine/base_maps/test_repo.hpp +++ b/test/buildtool/build_engine/base_maps/test_repo.hpp @@ -21,7 +21,7 @@ #include <optional> #include <string> -#include "src/buildtool/common/repository_config.hpp" +#include "fmt/core.h" #include "src/buildtool/file_system/file_system_manager.hpp" #include "test/utils/shell_quoting.hpp" diff --git a/test/buildtool/build_engine/expression/TARGETS b/test/buildtool/build_engine/expression/TARGETS index 1b994a02..8ae22d12 100644 --- a/test/buildtool/build_engine/expression/TARGETS +++ b/test/buildtool/build_engine/expression/TARGETS @@ -6,7 +6,6 @@ [ ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/build_engine/expression", "linked_map"] , ["", "catch-main"] - , ["utils", "container_matchers"] ] , "stage": ["test", "buildtool", "build_engine", "expression"] } @@ -16,16 +15,17 @@ , "srcs": ["expression.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , [ "@" , "src" , "src/buildtool/build_engine/expression" , "expression_ptr_interface" ] + , ["@", "src", "src/buildtool/build_engine/expression", "linked_map"] , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/common", "common"] , ["", "catch-main"] - , ["utils", "container_matchers"] ] , "stage": ["test", "buildtool", "build_engine", "expression"] } @@ -35,9 +35,14 @@ , "srcs": ["configuration.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] + , [ "@" + , "src" + , "src/buildtool/build_engine/expression" + , "expression_ptr_interface" + ] , ["", "catch-main"] - , ["utils", "container_matchers"] ] , "stage": ["test", "buildtool", "build_engine", "expression"] } diff --git a/test/buildtool/build_engine/expression/configuration.test.cpp b/test/buildtool/build_engine/expression/configuration.test.cpp index 0a902c73..28d157e7 100644 --- a/test/buildtool/build_engine/expression/configuration.test.cpp +++ b/test/buildtool/build_engine/expression/configuration.test.cpp @@ -15,11 +15,13 @@ #include "src/buildtool/build_engine/expression/configuration.hpp" #include <string> +#include <utility> #include <vector> #include "catch2/catch_test_macros.hpp" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" -#include "test/utils/container_matchers.hpp" +#include "src/buildtool/build_engine/expression/expression_ptr.hpp" TEST_CASE("Access", "[configuration]") { auto env = diff --git a/test/buildtool/build_engine/expression/expression.test.cpp b/test/buildtool/build_engine/expression/expression.test.cpp index 3a34702d..7276f0a4 100644 --- a/test/buildtool/build_engine/expression/expression.test.cpp +++ b/test/buildtool/build_engine/expression/expression.test.cpp @@ -15,16 +15,20 @@ #include "src/buildtool/build_engine/expression/expression.hpp" #include <filesystem> +#include <functional> #include <sstream> #include <string> #include <vector> #include "catch2/catch_test_macros.hpp" #include "catch2/matchers/catch_matchers_all.hpp" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/configuration.hpp" +#include "src/buildtool/build_engine/expression/expression_ptr.hpp" #include "src/buildtool/build_engine/expression/function_map.hpp" +#include "src/buildtool/build_engine/expression/linked_map.hpp" +#include "src/buildtool/build_engine/expression/target_result.hpp" #include "src/buildtool/common/artifact_description.hpp" -#include "test/utils/container_matchers.hpp" TEST_CASE("Expression access", "[expression]") { // NOLINT using namespace std::string_literals; diff --git a/test/buildtool/build_engine/expression/linked_map.test.cpp b/test/buildtool/build_engine/expression/linked_map.test.cpp index 1a8ceff5..8adf6dc1 100644 --- a/test/buildtool/build_engine/expression/linked_map.test.cpp +++ b/test/buildtool/build_engine/expression/linked_map.test.cpp @@ -16,12 +16,14 @@ #include <algorithm> #include <cstddef> +#include <functional> +#include <iterator> #include <memory> #include <string> #include <utility> // std::move +#include <vector> #include "catch2/catch_test_macros.hpp" -#include "test/utils/container_matchers.hpp" TEST_CASE("Empty map", "[linked_map]") { using map_t = LinkedMap<std::string, int>; diff --git a/test/buildtool/build_engine/target_map/TARGETS b/test/buildtool/build_engine/target_map/TARGETS index f2d50fce..61e16910 100644 --- a/test/buildtool/build_engine/target_map/TARGETS +++ b/test/buildtool/build_engine/target_map/TARGETS @@ -5,11 +5,23 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "json", "", "json"] + , [ "@" + , "src" + , "src/buildtool/build_engine/analysed_target" + , "graph_information" + ] , ["@", "src", "src/buildtool/build_engine/analysed_target", "target"] + , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] + , [ "@" + , "src" + , "src/buildtool/build_engine/expression" + , "expression_ptr_interface" + ] , ["@", "src", "src/buildtool/build_engine/target_map", "result_map"] , ["@", "src", "src/buildtool/common", "action_description"] , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/common", "tree"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] , ["", "catch-main"] @@ -23,17 +35,39 @@ , "data": ["test_data"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "gsl", "", "gsl"] + , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/auth", "auth"] + , ["@", "src", "src/buildtool/build_engine/analysed_target", "target"] , ["@", "src", "src/buildtool/build_engine/base_maps", "directory_map"] - , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name"] + , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"] , ["@", "src", "src/buildtool/build_engine/base_maps", "expression_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "rule_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "source_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "targets_file_map"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] + , [ "@" + , "src" + , "src/buildtool/build_engine/expression" + , "expression_ptr_interface" + ] + , [ "@" + , "src" + , "src/buildtool/build_engine/target_map" + , "absent_target_map" + ] + , [ "@" + , "src" + , "src/buildtool/build_engine/target_map" + , "configured_target" + ] + , ["@", "src", "src/buildtool/build_engine/target_map", "result_map"] , ["@", "src", "src/buildtool/build_engine/target_map", "target_map"] + , ["@", "src", "src/buildtool/common", "action_description"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "config"] + , ["@", "src", "src/buildtool/common", "tree"] + , ["@", "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", "api_bundle"] @@ -42,11 +76,10 @@ , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/execution_api/remote", "context"] , ["@", "src", "src/buildtool/file_system", "file_root"] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/main", "analyse_context"] - , ["@", "src", "src/buildtool/multithreading", "async_map_consumer"] , ["@", "src", "src/buildtool/multithreading", "task_system"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] - , ["@", "src", "src/buildtool/serve_api/remote", "config"] , ["@", "src", "src/buildtool/serve_api/remote", "serve_api"] , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/buildtool/storage", "storage"] @@ -62,9 +95,15 @@ , "srcs": ["target_map_internals.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , [ "@" , "src" + , "src/buildtool/build_engine/expression" + , "expression_ptr_interface" + ] + , [ "@" + , "src" , "src/buildtool/build_engine/target_map" , "target_map_testable_internals" ] diff --git a/test/buildtool/build_engine/target_map/result_map.test.cpp b/test/buildtool/build_engine/target_map/result_map.test.cpp index c781d83c..e326c725 100644 --- a/test/buildtool/build_engine/target_map/result_map.test.cpp +++ b/test/buildtool/build_engine/target_map/result_map.test.cpp @@ -17,16 +17,26 @@ #include <cstdlib> #include <filesystem> #include <fstream> +#include <functional> +#include <map> #include <memory> +#include <set> #include <string> +#include <unordered_set> #include <vector> #include "catch2/catch_test_macros.hpp" #include "nlohmann/json.hpp" #include "src/buildtool/build_engine/analysed_target/analysed_target.hpp" +#include "src/buildtool/build_engine/analysed_target/target_graph_information.hpp" +#include "src/buildtool/build_engine/base_maps/entity_name_data.hpp" +#include "src/buildtool/build_engine/expression/configuration.hpp" +#include "src/buildtool/build_engine/expression/expression_ptr.hpp" #include "src/buildtool/build_engine/expression/target_result.hpp" +#include "src/buildtool/common/action.hpp" #include "src/buildtool/common/action_description.hpp" #include "src/buildtool/common/statistics.hpp" +#include "src/buildtool/common/tree.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/progress_reporting/progress.hpp" diff --git a/test/buildtool/build_engine/target_map/target_map.test.cpp b/test/buildtool/build_engine/target_map/target_map.test.cpp index 9f66fd92..f4e88c44 100644 --- a/test/buildtool/build_engine/target_map/target_map.test.cpp +++ b/test/buildtool/build_engine/target_map/target_map.test.cpp @@ -15,21 +15,38 @@ #include "src/buildtool/build_engine/target_map/target_map.hpp" #include <filesystem> +#include <iterator> +#include <map> +#include <memory> +#include <optional> #include <string> #include <utility> // std::move +#include <variant> +#include <vector> #include "catch2/catch_test_macros.hpp" +#include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/buildtool/auth/authentication.hpp" +#include "src/buildtool/build_engine/analysed_target/analysed_target.hpp" #include "src/buildtool/build_engine/base_maps/directory_map.hpp" -#include "src/buildtool/build_engine/base_maps/entity_name.hpp" +#include "src/buildtool/build_engine/base_maps/entity_name_data.hpp" #include "src/buildtool/build_engine/base_maps/expression_map.hpp" #include "src/buildtool/build_engine/base_maps/rule_map.hpp" #include "src/buildtool/build_engine/base_maps/source_map.hpp" #include "src/buildtool/build_engine/base_maps/targets_file_map.hpp" +#include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" +#include "src/buildtool/build_engine/expression/expression_ptr.hpp" +#include "src/buildtool/build_engine/target_map/absent_target_map.hpp" +#include "src/buildtool/build_engine/target_map/configured_target.hpp" +#include "src/buildtool/build_engine/target_map/result_map.hpp" +#include "src/buildtool/common/action_description.hpp" +#include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" +#include "src/buildtool/common/tree.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/api_bundle.hpp" #include "src/buildtool/execution_api/local/config.hpp" @@ -37,11 +54,10 @@ #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/execution_api/remote/context.hpp" #include "src/buildtool/file_system/file_root.hpp" +#include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/main/analyse_context.hpp" -#include "src/buildtool/multithreading/async_map_consumer.hpp" #include "src/buildtool/multithreading/task_system.hpp" #include "src/buildtool/progress_reporting/progress.hpp" -#include "src/buildtool/serve_api/remote/config.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" diff --git a/test/buildtool/build_engine/target_map/target_map_internals.test.cpp b/test/buildtool/build_engine/target_map/target_map_internals.test.cpp index 7db66c7c..b4e626f7 100644 --- a/test/buildtool/build_engine/target_map/target_map_internals.test.cpp +++ b/test/buildtool/build_engine/target_map/target_map_internals.test.cpp @@ -12,8 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <optional> +#include <string> + #include "catch2/catch_test_macros.hpp" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" +#include "src/buildtool/build_engine/expression/expression_ptr.hpp" #include "src/buildtool/build_engine/target_map/utils.hpp" TEST_CASE("Tree conflicts", "[tree_conflict]") { diff --git a/test/buildtool/common/TARGETS b/test/buildtool/common/TARGETS index 298f93eb..233d2135 100644 --- a/test/buildtool/common/TARGETS +++ b/test/buildtool/common/TARGETS @@ -25,7 +25,6 @@ , ["@", "src", "src/buildtool/common", "action_description"] , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["", "catch-main"] , ["utils", "test_hash_function_type"] ] @@ -43,7 +42,6 @@ , ["@", "src", "src/buildtool/execution_api/local", "local"] , ["@", "src", "src/buildtool/file_system", "file_root"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] - , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/buildtool/storage", "storage"] , ["", "catch-main"] , ["utils", "test_storage_config"] diff --git a/test/buildtool/common/action_description.test.cpp b/test/buildtool/common/action_description.test.cpp index 65f5d92e..4d097436 100644 --- a/test/buildtool/common/action_description.test.cpp +++ b/test/buildtool/common/action_description.test.cpp @@ -15,12 +15,18 @@ #include "src/buildtool/common/action_description.hpp" #include <filesystem> +#include <functional> +#include <map> +#include <memory> +#include <optional> +#include <string> +#include <utility> +#include <vector> #include "catch2/catch_test_macros.hpp" #include "nlohmann/json.hpp" #include "src/buildtool/common/action.hpp" #include "src/buildtool/common/artifact_description.hpp" -#include "src/buildtool/crypto/hash_function.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" TEST_CASE("From JSON", "[action_description]") { diff --git a/test/buildtool/common/artifact_description.test.cpp b/test/buildtool/common/artifact_description.test.cpp index 44acaae6..670b72ec 100644 --- a/test/buildtool/common/artifact_description.test.cpp +++ b/test/buildtool/common/artifact_description.test.cpp @@ -15,6 +15,7 @@ #include "src/buildtool/common/artifact_description.hpp" #include <filesystem> +#include <optional> #include <string> #include "catch2/catch_test_macros.hpp" diff --git a/test/buildtool/common/repository_config.test.cpp b/test/buildtool/common/repository_config.test.cpp index 6741b99f..8c1fd893 100644 --- a/test/buildtool/common/repository_config.test.cpp +++ b/test/buildtool/common/repository_config.test.cpp @@ -16,8 +16,10 @@ #include <atomic> #include <cstddef> +#include <cstdlib> #include <filesystem> #include <map> +#include <optional> #include <string> #include <unordered_map> #include <utility> // std::move @@ -28,7 +30,6 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" -#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" #include "test/utils/hermeticity/test_storage_config.hpp" diff --git a/test/buildtool/crypto/TARGETS b/test/buildtool/crypto/TARGETS index 40971816..40866044 100644 --- a/test/buildtool/crypto/TARGETS +++ b/test/buildtool/crypto/TARGETS @@ -16,6 +16,7 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["@", "src", "src/buildtool/crypto", "hasher"] , ["", "catch-main"] ] , "stage": ["test", "buildtool", "crypto"] diff --git a/test/buildtool/crypto/hash_function.test.cpp b/test/buildtool/crypto/hash_function.test.cpp index 89c073f4..dde935a9 100644 --- a/test/buildtool/crypto/hash_function.test.cpp +++ b/test/buildtool/crypto/hash_function.test.cpp @@ -18,6 +18,7 @@ #include <utility> // std::move #include "catch2/catch_test_macros.hpp" +#include "src/buildtool/crypto/hasher.hpp" TEST_CASE("Hash Function", "[crypto]") { std::string bytes{"test"}; diff --git a/test/buildtool/crypto/hash_info.test.cpp b/test/buildtool/crypto/hash_info.test.cpp index 0ef93f30..b3024a19 100644 --- a/test/buildtool/crypto/hash_info.test.cpp +++ b/test/buildtool/crypto/hash_info.test.cpp @@ -14,9 +14,6 @@ #include "src/buildtool/crypto/hash_info.hpp" -#include <optional> -#include <string> - #include "catch2/catch_test_macros.hpp" #include "src/buildtool/crypto/hash_function.hpp" diff --git a/test/buildtool/crypto/hasher.test.cpp b/test/buildtool/crypto/hasher.test.cpp index 8ace48ce..f21065df 100644 --- a/test/buildtool/crypto/hasher.test.cpp +++ b/test/buildtool/crypto/hasher.test.cpp @@ -14,6 +14,7 @@ #include "src/buildtool/crypto/hasher.hpp" +#include <optional> #include <string> #include <utility> // std::move 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 { diff --git a/test/buildtool/execution_engine/dag/dag.test.cpp b/test/buildtool/execution_engine/dag/dag.test.cpp index 521e650e..8bf188ee 100644 --- a/test/buildtool/execution_engine/dag/dag.test.cpp +++ b/test/buildtool/execution_engine/dag/dag.test.cpp @@ -16,15 +16,21 @@ #include <cstddef> #include <cstdint> +#include <filesystem> +#include <functional> #include <map> +#include <optional> #include <string> #include <unordered_set> +#include <utility> #include <vector> #include "catch2/catch_test_macros.hpp" +#include "catch2/matchers/catch_matchers_all.hpp" #include "gsl/gsl" #include "src/buildtool/common/action.hpp" #include "src/buildtool/common/action_description.hpp" +#include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/common/identifier.hpp" #include "test/utils/container_matchers.hpp" diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS index cc3e94d7..405080e8 100644 --- a/test/buildtool/execution_engine/executor/TARGETS +++ b/test/buildtool/execution_engine/executor/TARGETS @@ -6,19 +6,27 @@ [ ["@", "catch2", "", "catch2"] , ["@", "gsl", "", "gsl"] , ["@", "src", "src/buildtool/auth", "auth"] + , ["@", "src", "src/buildtool/common", "action_description"] , ["@", "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/common", "tree"] , ["@", "src", "src/buildtool/common/remote", "retry_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/remote", "config"] , ["@", "src", "src/buildtool/execution_api/remote", "context"] , ["@", "src", "src/buildtool/execution_engine/dag", "dag"] , ["@", "src", "src/buildtool/execution_engine/executor", "context"] , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] + , ["@", "src", "src/buildtool/file_system", "file_root"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/file_system", "object_type"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] , ["utils", "test_api_bundle"] , ["utils", "test_hash_function_type"] @@ -34,21 +42,32 @@ [ ["@", "catch2", "", "catch2"] , ["@", "gsl", "", "gsl"] , ["@", "src", "src/buildtool/auth", "auth"] + , ["@", "src", "src/buildtool/common", "action_description"] , ["@", "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/common/remote", "remote_common"] , ["@", "src", "src/buildtool/common/remote", "retry_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/remote", "config"] , ["@", "src", "src/buildtool/execution_api/remote", "context"] , ["@", "src", "src/buildtool/execution_engine/dag", "dag"] , ["@", "src", "src/buildtool/execution_engine/executor", "context"] , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] + , ["@", "src", "src/buildtool/file_system", "file_root"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/file_system", "object_type"] + , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] , ["@", "src", "src/utils/cpp", "expected"] + , ["@", "src", "src/utils/cpp", "transformed_range"] , ["", "catch-main"] , ["utils", "test_api_bundle"] , ["utils", "test_hash_function_type"] @@ -63,15 +82,13 @@ , "private-deps": [ "executor_api_tests" , ["@", "catch2", "", "catch2"] + , ["@", "gsl", "", "gsl"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "config"] , ["@", "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_api/remote", "config"] - , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] - , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/buildtool/storage", "storage"] , ["utils", "catch-main-remote-execution"] , ["utils", "test_auth_config"] @@ -87,13 +104,16 @@ , "private-deps": [ "executor_api_tests" , ["@", "catch2", "", "catch2"] + , ["@", "gsl", "", "gsl"] + , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "config"] + , ["@", "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"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] - , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] , ["utils", "catch-main-remote-execution"] , ["utils", "test_auth_config"] diff --git a/test/buildtool/execution_engine/executor/executor.test.cpp b/test/buildtool/execution_engine/executor/executor.test.cpp index 59b06648..56c02be0 100644 --- a/test/buildtool/execution_engine/executor/executor.test.cpp +++ b/test/buildtool/execution_engine/executor/executor.test.cpp @@ -15,31 +15,49 @@ #include "src/buildtool/execution_engine/executor/executor.hpp" #include <algorithm> +#include <chrono> +#include <exception> #include <filesystem> +#include <functional> #include <map> #include <memory> #include <optional> #include <string> #include <unordered_map> #include <utility> +#include <variant> #include <vector> #include "catch2/catch_test_macros.hpp" #include "gsl/gsl" #include "src/buildtool/auth/authentication.hpp" +#include "src/buildtool/common/action.hpp" +#include "src/buildtool/common/action_description.hpp" +#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/common/identifier.hpp" +#include "src/buildtool/common/remote/remote_common.hpp" +#include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.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/remote/config.hpp" #include "src/buildtool/execution_api/remote/context.hpp" +#include "src/buildtool/execution_engine/dag/dag.hpp" #include "src/buildtool/execution_engine/executor/context.hpp" +#include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/progress_reporting/progress.hpp" #include "src/utils/cpp/expected.hpp" +#include "src/utils/cpp/transformed_range.hpp" #include "test/utils/executor/test_api_bundle.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" @@ -71,11 +89,6 @@ static auto NamedDigest(std::string const& str) -> ArtifactDigest { str); } -// forward declarations -class TestApi; -class TestAction; -class TestResponse; - /// \brief Mockup Response, stores only config and action result class TestResponse : public IExecutionResponse { public: diff --git a/test/buildtool/execution_engine/executor/executor_api.test.hpp b/test/buildtool/execution_engine/executor/executor_api.test.hpp index 82643576..b61b66d3 100644 --- a/test/buildtool/execution_engine/executor/executor_api.test.hpp +++ b/test/buildtool/execution_engine/executor/executor_api.test.hpp @@ -18,26 +18,38 @@ #include <cstdlib> #include <filesystem> #include <functional> +#include <initializer_list> #include <map> +#include <memory> +#include <optional> #include <string> +#include <unordered_set> +#include <utility> #include <vector> #include "catch2/catch_test_macros.hpp" #include "gsl/gsl" +#include "src/buildtool/auth/authentication.hpp" +#include "src/buildtool/common/action.hpp" +#include "src/buildtool/common/action_description.hpp" #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/common/remote/retry_config.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" +#include "src/buildtool/common/tree.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_api.hpp" -#include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/execution_api/remote/context.hpp" #include "src/buildtool/execution_engine/dag/dag.hpp" #include "src/buildtool/execution_engine/executor/context.hpp" #include "src/buildtool/execution_engine/executor/executor.hpp" +#include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/progress_reporting/progress.hpp" #include "test/utils/executor/test_api_bundle.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" diff --git a/test/buildtool/execution_engine/executor/executor_api_local.test.cpp b/test/buildtool/execution_engine/executor/executor_api_local.test.cpp index 2e1dfaa2..89437507 100644 --- a/test/buildtool/execution_engine/executor/executor_api_local.test.cpp +++ b/test/buildtool/execution_engine/executor/executor_api_local.test.cpp @@ -13,17 +13,16 @@ // limitations under the License. #include <memory> +#include <optional> #include "catch2/catch_test_macros.hpp" +#include "gsl/gsl" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.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_api/remote/config.hpp" -#include "src/buildtool/execution_engine/executor/executor.hpp" #include "src/buildtool/progress_reporting/progress.hpp" -#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" #include "test/buildtool/execution_engine/executor/executor_api.test.hpp" #include "test/utils/hermeticity/test_storage_config.hpp" diff --git a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp index 7fc5018f..ec60b246 100644 --- a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp +++ b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp @@ -15,13 +15,16 @@ #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/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp" #include "src/buildtool/execution_api/remote/config.hpp" -#include "src/buildtool/execution_engine/executor/executor.hpp" #include "src/buildtool/progress_reporting/progress.hpp" #include "test/buildtool/execution_engine/executor/executor_api.test.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" diff --git a/test/buildtool/execution_engine/traverser/TARGETS b/test/buildtool/execution_engine/traverser/TARGETS index ba159245..161aacc6 100644 --- a/test/buildtool/execution_engine/traverser/TARGETS +++ b/test/buildtool/execution_engine/traverser/TARGETS @@ -4,9 +4,11 @@ , "srcs": ["traverser.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "gsl", "", "gsl"] + , ["@", "json", "", "json"] + , ["@", "src", "src/buildtool/common", "action_description"] , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_engine/dag", "dag"] , ["@", "src", "src/buildtool/execution_engine/traverser", "traverser"] , ["", "catch-main"] diff --git a/test/buildtool/execution_engine/traverser/traverser.test.cpp b/test/buildtool/execution_engine/traverser/traverser.test.cpp index 6bbafc03..2708a73e 100644 --- a/test/buildtool/execution_engine/traverser/traverser.test.cpp +++ b/test/buildtool/execution_engine/traverser/traverser.test.cpp @@ -15,16 +15,28 @@ #include "src/buildtool/execution_engine/traverser/traverser.hpp" #include <algorithm> +#include <atomic> +#include <filesystem> +#include <functional> +#include <iterator> +#include <map> #include <mutex> +#include <optional> #include <string> -#include <unordered_map> +#include <thread> #include <unordered_set> -#include <variant> +#include <utility> #include <vector> #include "catch2/catch_test_macros.hpp" +#include "catch2/matchers/catch_matchers_all.hpp" +#include "gsl/gsl" +#include "nlohmann/json.hpp" +#include "src/buildtool/common/action.hpp" +#include "src/buildtool/common/action_description.hpp" +#include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_description.hpp" -#include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/common/identifier.hpp" #include "src/buildtool/execution_engine/dag/dag.hpp" #include "test/utils/container_matchers.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" diff --git a/test/buildtool/file_system/TARGETS b/test/buildtool/file_system/TARGETS index 4210a13a..53c15fcc 100644 --- a/test/buildtool/file_system/TARGETS +++ b/test/buildtool/file_system/TARGETS @@ -5,10 +5,12 @@ , "data": ["test_data"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "fmt", "", "fmt"] , ["@", "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/system", "system"] , ["", "catch-main"] ] , "stage": ["test", "buildtool", "file_system"] @@ -19,8 +21,10 @@ , "srcs": ["object_cas.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "gsl", "", "gsl"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "object_cas"] , ["@", "src", "src/buildtool/file_system", "object_type"] @@ -38,12 +42,16 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "fmt", "", "fmt"] + , ["@", "gsl", "", "gsl"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "git_cas"] , ["@", "src", "src/buildtool/file_system", "git_repo"] , ["@", "src", "src/buildtool/file_system", "git_tree"] + , ["@", "src", "src/buildtool/file_system", "object_type"] + , ["@", "src", "src/utils/cpp", "atomic"] , ["@", "src", "src/utils/cpp", "hex_string"] + , ["@", "src", "src/utils/cpp", "path"] , ["", "catch-main"] , ["utils", "container_matchers"] , ["utils", "shell_quoting"] @@ -57,14 +65,17 @@ , "data": ["test_data"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "fmt", "", "fmt"] , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/file_system", "file_root"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/file_system", "object_type"] + , ["@", "src", "src/utils/cpp", "expected"] , ["", "catch-main"] - , ["utils", "container_matchers"] , ["utils", "shell_quoting"] , ["utils", "test_hash_function_type"] ] @@ -78,11 +89,9 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "fmt", "", "fmt"] - , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/file_system", "file_root"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["", "catch-main"] - , ["utils", "container_matchers"] , ["utils", "shell_quoting"] ] , "stage": ["test", "buildtool", "file_system"] @@ -118,14 +127,14 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "fmt", "", "fmt"] - , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "git_cas"] , ["@", "src", "src/buildtool/file_system", "git_repo"] + , ["@", "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/utils/cpp", "atomic"] + , ["@", "src", "src/utils/cpp", "expected"] , ["@", "src", "src/utils/cpp", "hex_string"] , ["", "catch-main"] , ["utils", "shell_quoting"] @@ -143,7 +152,6 @@ , ["@", "fmt", "", "fmt"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "git_cas"] - , ["@", "src", "src/buildtool/file_system", "git_repo"] , ["@", "src", "src/buildtool/file_system", "object_type"] , ["@", "src", "src/buildtool/file_system/symlinks_map", "pragma_special"] , [ "@" diff --git a/test/buildtool/file_system/directory_entries.test.cpp b/test/buildtool/file_system/directory_entries.test.cpp index 0de55726..4390f809 100644 --- a/test/buildtool/file_system/directory_entries.test.cpp +++ b/test/buildtool/file_system/directory_entries.test.cpp @@ -15,17 +15,15 @@ #include <atomic> #include <cstdlib> #include <filesystem> +#include <functional> #include <optional> #include <string> -#include <thread> #include <unordered_set> #include "catch2/catch_test_macros.hpp" #include "fmt/core.h" -#include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" -#include "test/utils/container_matchers.hpp" #include "test/utils/shell_quoting.hpp" namespace { diff --git a/test/buildtool/file_system/file_root.test.cpp b/test/buildtool/file_system/file_root.test.cpp index 94a2a552..db0fdf11 100644 --- a/test/buildtool/file_system/file_root.test.cpp +++ b/test/buildtool/file_system/file_root.test.cpp @@ -17,17 +17,20 @@ #include <atomic> #include <cstdlib> #include <filesystem> +#include <optional> #include <string> #include <string_view> -#include <thread> #include "catch2/catch_test_macros.hpp" +#include "fmt/core.h" #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/protocol_traits.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" -#include "test/utils/container_matchers.hpp" +#include "src/buildtool/file_system/object_type.hpp" +#include "src/utils/cpp/expected.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" #include "test/utils/shell_quoting.hpp" diff --git a/test/buildtool/file_system/file_system_manager.test.cpp b/test/buildtool/file_system/file_system_manager.test.cpp index 689dd9b1..86334faf 100644 --- a/test/buildtool/file_system/file_system_manager.test.cpp +++ b/test/buildtool/file_system/file_system_manager.test.cpp @@ -14,20 +14,26 @@ #include "src/buildtool/file_system/file_system_manager.hpp" -#include <algorithm> #include <chrono> +#include <cstddef> #include <cstdlib> #include <filesystem> #include <fstream> -#include <iostream> +#include <functional> +#include <optional> +#include <string> #include <unordered_map> +#include <unordered_set> +#include <utility> #include <vector> #include "catch2/catch_test_macros.hpp" #include "catch2/generators/catch_generators_all.hpp" +#include "fmt/core.h" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" +#include "src/buildtool/system/system.hpp" class CopyFileFixture { public: diff --git a/test/buildtool/file_system/git_repo.test.cpp b/test/buildtool/file_system/git_repo.test.cpp index 4fb5c0cb..4cbd1c88 100644 --- a/test/buildtool/file_system/git_repo.test.cpp +++ b/test/buildtool/file_system/git_repo.test.cpp @@ -17,21 +17,23 @@ #include <atomic> #include <cstdlib> #include <filesystem> +#include <functional> #include <memory> #include <optional> #include <string> #include <thread> +#include <utility> #include <vector> #include "catch2/catch_test_macros.hpp" #include "fmt/core.h" -#include "nlohmann/json.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_cas.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/utils/cpp/atomic.hpp" +#include "src/utils/cpp/expected.hpp" #include "src/utils/cpp/hex_string.hpp" #include "test/utils/hermeticity/test_storage_config.hpp" #include "test/utils/shell_quoting.hpp" diff --git a/test/buildtool/file_system/git_tree.test.cpp b/test/buildtool/file_system/git_tree.test.cpp index aeaa1a80..18309834 100644 --- a/test/buildtool/file_system/git_tree.test.cpp +++ b/test/buildtool/file_system/git_tree.test.cpp @@ -18,19 +18,27 @@ #include <atomic> #include <cstdlib> #include <filesystem> +#include <functional> +#include <memory> #include <optional> #include <string> #include <thread> +#include <unordered_map> #include <utility> #include <vector> #include "catch2/catch_test_macros.hpp" +#include "catch2/matchers/catch_matchers_all.hpp" #include "fmt/core.h" +#include "gsl/gsl" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_cas.hpp" #include "src/buildtool/file_system/git_repo.hpp" +#include "src/buildtool/file_system/object_type.hpp" +#include "src/utils/cpp/atomic.hpp" #include "src/utils/cpp/hex_string.hpp" +#include "src/utils/cpp/path.hpp" #include "test/utils/container_matchers.hpp" #include "test/utils/shell_quoting.hpp" diff --git a/test/buildtool/file_system/object_cas.test.cpp b/test/buildtool/file_system/object_cas.test.cpp index 1872f25b..44cea6bb 100644 --- a/test/buildtool/file_system/object_cas.test.cpp +++ b/test/buildtool/file_system/object_cas.test.cpp @@ -14,12 +14,15 @@ #include "src/buildtool/file_system/object_cas.hpp" +#include <filesystem> #include <optional> // has_value() #include <string> #include "catch2/catch_test_macros.hpp" +#include "gsl/gsl" #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/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/storage/config.hpp" diff --git a/test/buildtool/file_system/resolve_symlinks_map.test.cpp b/test/buildtool/file_system/resolve_symlinks_map.test.cpp index 5831aee1..bb65867b 100644 --- a/test/buildtool/file_system/resolve_symlinks_map.test.cpp +++ b/test/buildtool/file_system/resolve_symlinks_map.test.cpp @@ -17,16 +17,15 @@ #include <atomic> #include <cstdlib> #include <filesystem> +#include <memory> #include <optional> #include <string> -#include <thread> #include <vector> #include "catch2/catch_test_macros.hpp" #include "fmt/core.h" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_cas.hpp" -#include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/file_system/symlinks_map/pragma_special.hpp" #include "src/buildtool/multithreading/task_system.hpp" diff --git a/test/buildtool/graph_traverser/TARGETS b/test/buildtool/graph_traverser/TARGETS index 5e5633d5..f5592f51 100644 --- a/test/buildtool/graph_traverser/TARGETS +++ b/test/buildtool/graph_traverser/TARGETS @@ -7,7 +7,9 @@ , ["@", "gsl", "", "gsl"] , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/auth", "auth"] + , ["@", "src", "src/buildtool/common", "cli"] , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/common/remote", "retry_config"] , ["@", "src", "src/buildtool/execution_api/common", "api_bundle"] @@ -16,15 +18,17 @@ , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/execution_api/remote", "context"] , ["@", "src", "src/buildtool/execution_engine/executor", "context"] + , ["@", "src", "src/buildtool/file_system", "file_root"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "jsonfs"] + , ["@", "src", "src/buildtool/file_system", "object_type"] , ["@", "src", "src/buildtool/graph_traverser", "graph_traverser"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/buildtool/storage", "storage"] - , ["@", "src", "src/utils/cpp", "json"] + , ["@", "src", "src/utils/cpp", "expected"] , ["utils", "test_hash_function_type"] ] , "stage": ["test", "buildtool", "graph_traverser"] @@ -39,11 +43,10 @@ , ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/common", "protocol_traits"] + , ["@", "src", "src/buildtool/common/remote", "remote_common"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] - , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/buildtool/storage", "storage"] , ["", "catch-main"] - , ["utils", "test_auth_config"] , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "graph_traverser"] @@ -56,10 +59,14 @@ , "private-deps": [ "graph_traverser_tests" , ["@", "catch2", "", "catch2"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["@", "src", "src/buildtool/common/remote", "remote_common"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "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"] , ["utils", "catch-main-remote-execution"] , ["utils", "test_auth_config"] , ["utils", "test_hash_function_type"] diff --git a/test/buildtool/graph_traverser/graph_traverser.test.hpp b/test/buildtool/graph_traverser/graph_traverser.test.hpp index a9839638..9ccdf761 100644 --- a/test/buildtool/graph_traverser/graph_traverser.test.hpp +++ b/test/buildtool/graph_traverser/graph_traverser.test.hpp @@ -15,11 +15,12 @@ #ifndef INCLUDED_SRC_TEST_BUILDTOOL_GRAPH_GRAVERSER_GRAPH_TRAVERSER_TEST_HPP #define INCLUDED_SRC_TEST_BUILDTOOL_GRAPH_GRAVERSER_GRAPH_TRAVERSER_TEST_HPP +#include <algorithm> #include <chrono> #include <cstdlib> #include <filesystem> +#include <map> #include <optional> -#include <sstream> #include <string> #include <thread> #include <utility> @@ -29,8 +30,10 @@ #include "gsl/gsl" #include "nlohmann/json.hpp" #include "src/buildtool/auth/authentication.hpp" +#include "src/buildtool/common/cli.hpp" #include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/retry_config.hpp" +#include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/execution_api/common/api_bundle.hpp" #include "src/buildtool/execution_api/local/config.hpp" @@ -38,15 +41,17 @@ #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/execution_api/remote/context.hpp" #include "src/buildtool/execution_engine/executor/context.hpp" +#include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/jsonfs.hpp" +#include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/graph_traverser/graph_traverser.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/progress_reporting/progress.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" -#include "src/utils/cpp/json.hpp" +#include "src/utils/cpp/expected.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" // NOLINTNEXTLINE(google-build-namespaces) diff --git a/test/buildtool/graph_traverser/graph_traverser_local.test.cpp b/test/buildtool/graph_traverser/graph_traverser_local.test.cpp index 2c28323b..bde245da 100644 --- a/test/buildtool/graph_traverser/graph_traverser_local.test.cpp +++ b/test/buildtool/graph_traverser/graph_traverser_local.test.cpp @@ -12,14 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <optional> +#include <variant> +#include <vector> + #include "catch2/catch_test_macros.hpp" #include "src/buildtool/auth/authentication.hpp" +#include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/execution_api/remote/config.hpp" -#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" #include "test/buildtool/graph_traverser/graph_traverser.test.hpp" #include "test/utils/hermeticity/test_storage_config.hpp" -#include "test/utils/remote_execution/test_auth_config.hpp" TEST_CASE("Local: Output created when entry point is local artifact", "[graph_traverser]") { diff --git a/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp b/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp index a7888ac4..fa1a1e60 100644 --- a/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp +++ b/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp @@ -12,11 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <cstdlib> +#include <filesystem> +#include <optional> +#include <utility> +#include <vector> + #include "catch2/catch_test_macros.hpp" -#include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/execution_api/remote/config.hpp" +#include "src/buildtool/file_system/file_system_manager.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/buildtool/graph_traverser/graph_traverser.test.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" #include "test/utils/remote_execution/test_auth_config.hpp" diff --git a/test/buildtool/logging/log_sink_file.test.cpp b/test/buildtool/logging/log_sink_file.test.cpp index 08a59446..6f11c152 100644 --- a/test/buildtool/logging/log_sink_file.test.cpp +++ b/test/buildtool/logging/log_sink_file.test.cpp @@ -16,13 +16,11 @@ #include <filesystem> #include <fstream> -#include <iostream> #include <string> #include <thread> #include <vector> #include "catch2/catch_test_macros.hpp" -#include "catch2/generators/catch_generators_all.hpp" #include "catch2/matchers/catch_matchers_all.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_config.hpp" diff --git a/test/buildtool/logging/logger.test.cpp b/test/buildtool/logging/logger.test.cpp index deee7477..c5f10765 100644 --- a/test/buildtool/logging/logger.test.cpp +++ b/test/buildtool/logging/logger.test.cpp @@ -15,6 +15,7 @@ #include "src/buildtool/logging/logger.hpp" #include <atomic> +#include <memory> #include <string> #include <unordered_map> #include <vector> diff --git a/test/buildtool/main/install_cas.test.cpp b/test/buildtool/main/install_cas.test.cpp index b74ef143..c2aaf4b5 100644 --- a/test/buildtool/main/install_cas.test.cpp +++ b/test/buildtool/main/install_cas.test.cpp @@ -14,6 +14,8 @@ #include "src/buildtool/main/install_cas.hpp" +#include <optional> + #include "catch2/catch_test_macros.hpp" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/crypto/hash_function.hpp" diff --git a/test/buildtool/multithreading/TARGETS b/test/buildtool/multithreading/TARGETS index bd501759..c453d7e1 100644 --- a/test/buildtool/multithreading/TARGETS +++ b/test/buildtool/multithreading/TARGETS @@ -17,6 +17,7 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/multithreading", "task_system"] + , ["@", "src", "src/utils/cpp", "atomic"] , ["", "catch-main"] , ["utils", "container_matchers"] ] @@ -42,7 +43,6 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/multithreading", "async_map"] - , ["@", "src", "src/buildtool/multithreading", "async_map_node"] , ["@", "src", "src/buildtool/multithreading", "task_system"] , ["", "catch-main"] , ["utils", "container_matchers"] @@ -55,7 +55,6 @@ , "srcs": ["async_map_consumer.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["@", "src", "src/buildtool/multithreading", "async_map"] , ["@", "src", "src/buildtool/multithreading", "async_map_consumer"] , ["@", "src", "src/buildtool/multithreading", "task_system"] , ["", "catch-main"] diff --git a/test/buildtool/multithreading/async_map.test.cpp b/test/buildtool/multithreading/async_map.test.cpp index 7932f507..65185809 100644 --- a/test/buildtool/multithreading/async_map.test.cpp +++ b/test/buildtool/multithreading/async_map.test.cpp @@ -17,7 +17,6 @@ #include <string> #include "catch2/catch_test_macros.hpp" -#include "src/buildtool/multithreading/async_map_node.hpp" #include "src/buildtool/multithreading/task_system.hpp" TEST_CASE("Single-threaded: nodes only created once", "[async_map]") { diff --git a/test/buildtool/multithreading/async_map_consumer.test.cpp b/test/buildtool/multithreading/async_map_consumer.test.cpp index 4f7d54d8..fc3d0fac 100644 --- a/test/buildtool/multithreading/async_map_consumer.test.cpp +++ b/test/buildtool/multithreading/async_map_consumer.test.cpp @@ -14,9 +14,9 @@ #include "src/buildtool/multithreading/async_map_consumer.hpp" -#include <algorithm> // std::transform #include <atomic> #include <cstdint> // for fixed width integral types +#include <iterator> #include <mutex> #include <numeric> #include <optional> @@ -25,7 +25,6 @@ #include "catch2/catch_test_macros.hpp" #include "catch2/matchers/catch_matchers_all.hpp" -#include "src/buildtool/multithreading/async_map.hpp" #include "src/buildtool/multithreading/task_system.hpp" auto FibonacciMapConsumer() -> AsyncMapConsumer<int, std::uint64_t> { diff --git a/test/buildtool/multithreading/async_map_node.test.cpp b/test/buildtool/multithreading/async_map_node.test.cpp index d0c9a702..38718d1f 100644 --- a/test/buildtool/multithreading/async_map_node.test.cpp +++ b/test/buildtool/multithreading/async_map_node.test.cpp @@ -16,7 +16,6 @@ #include <mutex> #include <string> -#include <thread> #include <vector> #include "catch2/catch_test_macros.hpp" diff --git a/test/buildtool/multithreading/task_system.test.cpp b/test/buildtool/multithreading/task_system.test.cpp index 36b1cc14..ece75454 100644 --- a/test/buildtool/multithreading/task_system.test.cpp +++ b/test/buildtool/multithreading/task_system.test.cpp @@ -16,20 +16,25 @@ #include <atomic> #include <chrono> +#include <compare> #include <condition_variable> #include <cstddef> #include <cstdint> #include <functional> +#include <iterator> #include <mutex> #include <numeric> // std::iota +#include <ratio> #include <string> #include <thread> #include <unordered_set> +#include <utility> #include <vector> #include "catch2/catch_test_macros.hpp" #include "catch2/generators/catch_generators_all.hpp" #include "catch2/matchers/catch_matchers_all.hpp" +#include "src/utils/cpp/atomic.hpp" #include "test/utils/container_matchers.hpp" namespace { diff --git a/test/buildtool/serve_api/TARGETS b/test/buildtool/serve_api/TARGETS index 89e2379c..9e2738f8 100644 --- a/test/buildtool/serve_api/TARGETS +++ b/test/buildtool/serve_api/TARGETS @@ -5,14 +5,18 @@ , "data": [["buildtool/file_system", "test_data"]] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "gsl", "", "gsl"] , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "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/remote", "config"] , ["@", "src", "src/buildtool/execution_api/remote", "context"] + , ["@", "src", "src/buildtool/file_system", "git_types"] , ["@", "src", "src/buildtool/serve_api/remote", "config"] , ["@", "src", "src/buildtool/serve_api/remote", "source_tree_client"] + , ["@", "src", "src/utils/cpp", "expected"] , ["utils", "catch-main-serve"] , ["utils", "test_hash_function_type"] , ["utils", "test_serve_config"] diff --git a/test/buildtool/serve_api/source_tree_client.test.cpp b/test/buildtool/serve_api/source_tree_client.test.cpp index 8ada1317..f5428af8 100644 --- a/test/buildtool/serve_api/source_tree_client.test.cpp +++ b/test/buildtool/serve_api/source_tree_client.test.cpp @@ -14,17 +14,23 @@ #include "src/buildtool/serve_api/remote/source_tree_client.hpp" +#include <optional> #include <string> #include <variant> +#include <vector> #include "catch2/catch_test_macros.hpp" +#include "gsl/gsl" #include "src/buildtool/auth/authentication.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/remote/config.hpp" #include "src/buildtool/execution_api/remote/context.hpp" +#include "src/buildtool/file_system/git_types.hpp" #include "src/buildtool/serve_api/remote/config.hpp" +#include "src/utils/cpp/expected.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" #include "test/utils/serve_service/test_serve_config.hpp" diff --git a/test/buildtool/storage/TARGETS b/test/buildtool/storage/TARGETS index d3cc1c4c..e6b7fa91 100644 --- a/test/buildtool/storage/TARGETS +++ b/test/buildtool/storage/TARGETS @@ -16,8 +16,7 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] - , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/execution_api/bazel_msg", "bazel_msg"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "object_type"] , ["@", "src", "src/buildtool/storage", "config"] @@ -37,7 +36,7 @@ , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] , ["@", "src", "src/buildtool/common", "bazel_types"] , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/file_system", "object_type"] , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/buildtool/storage", "storage"] @@ -52,17 +51,20 @@ , "srcs": ["large_object_cas.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["@", "src", "src/buildtool/common", "bazel_types"] + , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "protocol_traits"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , [ "@" , "src" , "src/buildtool/execution_api/bazel_msg" , "bazel_msg_factory" ] + , ["@", "src", "src/buildtool/execution_api/common", "common"] , ["@", "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"] , ["@", "src", "src/utils/cpp", "tmp_dir"] , ["", "catch-main"] , ["utils", "large_object_utils"] diff --git a/test/buildtool/storage/large_object_cas.test.cpp b/test/buildtool/storage/large_object_cas.test.cpp index bd8fa98e..76ee7f88 100644 --- a/test/buildtool/storage/large_object_cas.test.cpp +++ b/test/buildtool/storage/large_object_cas.test.cpp @@ -16,25 +16,28 @@ #include <cstddef> #include <cstdint> -#include <cstdlib> #include <filesystem> +#include <memory> #include <optional> #include <string> -#include <string_view> +#include <tuple> #include <type_traits> #include <utility> -#include <variant> #include <vector> #include "catch2/catch_test_macros.hpp" -#include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/common/artifact_digest.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/execution_api/common/execution_common.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/garbage_collector.hpp" +#include "src/buildtool/storage/local_cas.hpp" #include "src/buildtool/storage/storage.hpp" +#include "src/utils/cpp/expected.hpp" #include "src/utils/cpp/tmp_dir.hpp" #include "test/utils/hermeticity/test_storage_config.hpp" #include "test/utils/large_objects/large_object_utils.hpp" diff --git a/test/buildtool/storage/local_ac.test.cpp b/test/buildtool/storage/local_ac.test.cpp index 73320ce4..1eac6397 100644 --- a/test/buildtool/storage/local_ac.test.cpp +++ b/test/buildtool/storage/local_ac.test.cpp @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "src/buildtool/storage/local_ac.hpp" + +#include <optional> #include <string> #include "catch2/catch_test_macros.hpp" @@ -19,9 +22,10 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/common/bazel_types.hpp" -#include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/storage/config.hpp" +#include "src/buildtool/storage/local_cas.hpp" #include "src/buildtool/storage/storage.hpp" #include "test/utils/hermeticity/test_storage_config.hpp" diff --git a/test/buildtool/storage/local_cas.test.cpp b/test/buildtool/storage/local_cas.test.cpp index c7b7f720..0d7510e7 100644 --- a/test/buildtool/storage/local_cas.test.cpp +++ b/test/buildtool/storage/local_cas.test.cpp @@ -13,12 +13,12 @@ // limitations under the License. #include <filesystem> +#include <optional> #include <string> #include "catch2/catch_test_macros.hpp" -#include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" +#include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/storage/config.hpp" diff --git a/test/buildtool/system/system_command.test.cpp b/test/buildtool/system/system_command.test.cpp index a2fc5d35..69301599 100644 --- a/test/buildtool/system/system_command.test.cpp +++ b/test/buildtool/system/system_command.test.cpp @@ -14,10 +14,14 @@ #include "src/buildtool/system/system_command.hpp" +#include <cstdio> #include <cstdlib> #include <filesystem> -#include <iostream> +#include <map> +#include <optional> #include <string> +#include <utility> +#include <vector> #include "catch2/catch_test_macros.hpp" #include "catch2/matchers/catch_matchers_all.hpp" diff --git a/test/end-to-end/just-mr/create_test_archives.cpp b/test/end-to-end/just-mr/create_test_archives.cpp index c860c872..35f5a906 100644 --- a/test/end-to-end/just-mr/create_test_archives.cpp +++ b/test/end-to-end/just-mr/create_test_archives.cpp @@ -13,16 +13,21 @@ // limitations under the License. #include <cstdlib> +#include <filesystem> +#include <functional> +#include <memory> #include <optional> #include <string> #include <unordered_map> #include <utility> // std::pair +#include <vector> #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_config.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/log_sink_cmdline.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/utils/archive/archive_ops.hpp" #include "src/utils/cpp/tmp_dir.hpp" diff --git a/test/main.cpp b/test/main.cpp index 54afa2dc..8be07fee 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include <cstdlib> -#include <filesystem> -#include <string> - #include "catch2/catch_session.hpp" #include "src/buildtool/file_system/git_context.hpp" #include "src/buildtool/storage/file_chunker.hpp" diff --git a/test/other_tools/git_operations/TARGETS b/test/other_tools/git_operations/TARGETS index f63258b5..77b1ee2f 100644 --- a/test/other_tools/git_operations/TARGETS +++ b/test/other_tools/git_operations/TARGETS @@ -6,9 +6,10 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "fmt", "", "fmt"] - , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/execution_api/common", "common"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/multithreading", "task_system"] + , ["@", "src", "src/other_tools/git_operations", "git_ops_types"] , ["@", "src", "src/other_tools/ops_maps", "critical_git_op_map"] , ["", "catch-main"] , ["utils", "shell_quoting"] @@ -30,11 +31,10 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "fmt", "", "fmt"] - , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/file_system", "git_cas"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] - , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/other_tools/git_operations", "git_repo_remote"] , ["@", "src", "src/utils/cpp", "atomic"] , ["", "catch-main"] diff --git a/test/other_tools/git_operations/critical_git_ops.test.cpp b/test/other_tools/git_operations/critical_git_ops.test.cpp index aa93b391..d36dadef 100644 --- a/test/other_tools/git_operations/critical_git_ops.test.cpp +++ b/test/other_tools/git_operations/critical_git_ops.test.cpp @@ -17,17 +17,18 @@ #include <cstddef> #include <cstdlib> // std::system #include <filesystem> +#include <memory> #include <numeric> #include <optional> #include <string> -#include <thread> #include <vector> #include "catch2/catch_test_macros.hpp" #include "fmt/core.h" -#include "nlohmann/json.hpp" #include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/multithreading/task_system.hpp" +#include "src/other_tools/git_operations/git_ops_types.hpp" #include "src/other_tools/ops_maps/critical_git_op_map.hpp" #include "test/utils/shell_quoting.hpp" diff --git a/test/other_tools/git_operations/git_config_run.test.cpp b/test/other_tools/git_operations/git_config_run.test.cpp index 34d625cd..324f6ca9 100644 --- a/test/other_tools/git_operations/git_config_run.test.cpp +++ b/test/other_tools/git_operations/git_config_run.test.cpp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <cstddef> #include <exception> #include <filesystem> #include <functional> diff --git a/test/other_tools/git_operations/git_repo_remote.test.cpp b/test/other_tools/git_operations/git_repo_remote.test.cpp index 39f0bd8a..15912670 100644 --- a/test/other_tools/git_operations/git_repo_remote.test.cpp +++ b/test/other_tools/git_operations/git_repo_remote.test.cpp @@ -17,18 +17,19 @@ #include <atomic> #include <cstdlib> #include <filesystem> +#include <functional> #include <memory> #include <optional> #include <string> #include <thread> +#include <vector> #include "catch2/catch_test_macros.hpp" #include "fmt/core.h" -#include "nlohmann/json.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/file_system/git_cas.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" -#include "src/buildtool/storage/config.hpp" #include "src/utils/cpp/atomic.hpp" #include "test/utils/hermeticity/test_storage_config.hpp" #include "test/utils/shell_quoting.hpp" diff --git a/test/other_tools/just_mr/TARGETS b/test/other_tools/just_mr/TARGETS index a74921ac..9e01a20f 100644 --- a/test/other_tools/just_mr/TARGETS +++ b/test/other_tools/just_mr/TARGETS @@ -4,7 +4,13 @@ , "srcs": ["rc_merge.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] + , [ "@" + , "src" + , "src/buildtool/build_engine/expression" + , "expression_ptr_interface" + ] , ["@", "src", "src/other_tools/just_mr", "rc_merge"] , ["", "catch-main"] ] diff --git a/test/other_tools/just_mr/rc_merge.test.cpp b/test/other_tools/just_mr/rc_merge.test.cpp index b40b1b48..0f1c62f9 100644 --- a/test/other_tools/just_mr/rc_merge.test.cpp +++ b/test/other_tools/just_mr/rc_merge.test.cpp @@ -15,8 +15,10 @@ #include "src/other_tools/just_mr/rc_merge.hpp" #include "catch2/catch_test_macros.hpp" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" +#include "src/buildtool/build_engine/expression/expression_ptr.hpp" TEST_CASE("Simple field") { auto conf = Configuration{Expression::FromJson(R"( diff --git a/test/other_tools/utils/curl_url.test.cpp b/test/other_tools/utils/curl_url.test.cpp index a591ac92..a10d48c0 100644 --- a/test/other_tools/utils/curl_url.test.cpp +++ b/test/other_tools/utils/curl_url.test.cpp @@ -12,6 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <filesystem> +#include <memory> +#include <optional> +#include <string> + #include "catch2/catch_test_macros.hpp" #include "src/other_tools/utils/curl_url_handle.hpp" diff --git a/test/other_tools/utils/curl_usage.test.cpp b/test/other_tools/utils/curl_usage.test.cpp index 980793bf..650255d8 100644 --- a/test/other_tools/utils/curl_usage.test.cpp +++ b/test/other_tools/utils/curl_usage.test.cpp @@ -14,8 +14,9 @@ #include <cstdlib> #include <filesystem> +#include <memory> +#include <optional> #include <string> -#include <vector> // std::erase_if #include "catch2/catch_test_macros.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" diff --git a/test/utils/TARGETS b/test/utils/TARGETS index d94feaa2..21e4fb9f 100644 --- a/test/utils/TARGETS +++ b/test/utils/TARGETS @@ -14,13 +14,16 @@ , "test_env" , "test_remote_config" , ["@", "gsl", "", "gsl"] - , ["@", "src", "src/buildtool/auth", "auth"] + , ["@", "protoc", "", "libprotobuf"] , ["@", "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"] ] , "stage": ["test", "utils"] } @@ -38,11 +41,6 @@ { "type": ["@", "rules", "CC", "library"] , "name": ["test_env"] , "hdrs": ["test_env.hpp"] - , "deps": - [ "log_config" - , ["@", "src", "src/buildtool/auth", "auth"] - , ["@", "src", "src/buildtool/common", "protocol_traits"] - ] , "stage": ["test", "utils"] } , "test_storage_config": @@ -52,10 +50,10 @@ , "deps": [ "test_hash_function_type" , ["@", "gsl", "", "gsl"] - , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/utils/cpp", "expected"] , ["@", "src", "src/utils/cpp", "tmp_dir"] ] , "stage": ["test", "utils"] @@ -93,11 +91,10 @@ , "test_env" , "test_remote_config" , ["@", "catch2", "", "catch2"] + , ["@", "src", "src/buildtool/auth", "auth"] + , ["@", "src", "src/buildtool/common/remote", "remote_common"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] - , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "git_context"] - , ["@", "src", "src/buildtool/logging", "log_level"] - , ["@", "src", "src/buildtool/logging", "logging"] ] , "stage": ["test", "utils"] } @@ -110,6 +107,7 @@ , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/serve_api/remote", "config"] + , ["@", "src", "src/utils/cpp", "expected"] ] , "stage": ["test", "utils"] } @@ -122,6 +120,7 @@ , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] + , ["@", "src", "src/utils/cpp", "expected"] ] , "stage": ["test", "utils"] } @@ -134,6 +133,7 @@ , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] + , ["@", "src", "src/utils/cpp", "expected"] ] , "stage": ["test", "utils"] } @@ -147,14 +147,12 @@ , "test_env" , "test_serve_config" , ["@", "catch2", "", "catch2"] - , ["@", "src", "src/buildtool/common", "protocol_traits"] - , ["@", "src", "src/buildtool/execution_api/remote", "config"] - , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "fmt", "", "fmt"] + , ["@", "src", "src/buildtool/common/remote", "remote_common"] , ["@", "src", "src/buildtool/file_system", "git_context"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/serve_api/remote", "config"] - , ["@", "src", "src/buildtool/storage", "storage"] ] , "stage": ["test", "utils"] } diff --git a/test/utils/archive/archive_usage.test.cpp b/test/utils/archive/archive_usage.test.cpp index 23313620..030cd223 100644 --- a/test/utils/archive/archive_usage.test.cpp +++ b/test/utils/archive/archive_usage.test.cpp @@ -12,21 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. +#ifdef __unix__ +#include <sys/types.h> // ssize_t +#else +#error "Non-unix is not supported yet" +#endif + #include <cstddef> #include <cstdint> #include <cstdlib> #include <filesystem> +#include <functional> #include <optional> #include <string> #include <unordered_map> +#include <utility> #include <vector> -#ifdef __unix__ -#include <sys/types.h> // ssize_t -#else -#error "Non-unix is not supported yet" -#endif - #include "catch2/catch_test_macros.hpp" #include "catch2/generators/catch_generators_all.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" diff --git a/test/utils/container_matchers.hpp b/test/utils/container_matchers.hpp index 7def6d57..d7a29c3a 100644 --- a/test/utils/container_matchers.hpp +++ b/test/utils/container_matchers.hpp @@ -16,14 +16,14 @@ #define INCLUDED_SRC_TEST_UTILS_CONTAINER_MATCHERS_HPP #include <algorithm> +#include <initializer_list> +#include <iterator> #include <numeric> #include <sstream> #include <string> -#include <type_traits> #include <unordered_set> #include <vector> -#include "catch2/catch_test_macros.hpp" #include "catch2/matchers/catch_matchers_all.hpp" /// \brief Matcher to check if the sets of elements present in two different diff --git a/test/utils/cpp/file_locking.test.cpp b/test/utils/cpp/file_locking.test.cpp index b5e38a9c..45b2a056 100644 --- a/test/utils/cpp/file_locking.test.cpp +++ b/test/utils/cpp/file_locking.test.cpp @@ -14,10 +14,10 @@ #include "src/utils/cpp/file_locking.hpp" -#include <atomic> #include <chrono> #include <cstdlib> #include <filesystem> +#include <optional> #include <string> #include <thread> #include <vector> diff --git a/test/utils/cpp/path.test.cpp b/test/utils/cpp/path.test.cpp index ecfc64c1..b0d67499 100644 --- a/test/utils/cpp/path.test.cpp +++ b/test/utils/cpp/path.test.cpp @@ -15,6 +15,7 @@ #include "src/utils/cpp/path.hpp" #include <filesystem> +#include <string> #include "catch2/catch_test_macros.hpp" diff --git a/test/utils/cpp/path_rebase.test.cpp b/test/utils/cpp/path_rebase.test.cpp index fe62e0be..d0d0b7e7 100644 --- a/test/utils/cpp/path_rebase.test.cpp +++ b/test/utils/cpp/path_rebase.test.cpp @@ -14,6 +14,9 @@ #include "src/utils/cpp/path_rebase.hpp" +#include <string> +#include <vector> + #include "catch2/catch_test_macros.hpp" TEST_CASE("rebase", "[path_rebase]") { diff --git a/test/utils/cpp/prefix.test.cpp b/test/utils/cpp/prefix.test.cpp index ae47c93d..5ddd9754 100644 --- a/test/utils/cpp/prefix.test.cpp +++ b/test/utils/cpp/prefix.test.cpp @@ -14,7 +14,7 @@ #include "src/utils/cpp/prefix.hpp" -#include <filesystem> +#include <string> #include "catch2/catch_test_macros.hpp" diff --git a/test/utils/executor/test_api_bundle.hpp b/test/utils/executor/test_api_bundle.hpp index 088c4323..5a27f556 100644 --- a/test/utils/executor/test_api_bundle.hpp +++ b/test/utils/executor/test_api_bundle.hpp @@ -15,8 +15,6 @@ #ifndef INCLUDED_SRC_TEST_UTILS_EXECUTOR_TEST_API_BUNDLE_HPP #define INCLUDED_SRC_TEST_UTILS_EXECUTOR_TEST_API_BUNDLE_HPP -#include <utility> // std::move - #include "gsl/gsl" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/api_bundle.hpp" diff --git a/test/utils/hermeticity/test_hash_function_type.hpp b/test/utils/hermeticity/test_hash_function_type.hpp index ab46f791..721b6dd4 100644 --- a/test/utils/hermeticity/test_hash_function_type.hpp +++ b/test/utils/hermeticity/test_hash_function_type.hpp @@ -15,7 +15,7 @@ #ifndef INCLUDED_SRC_TEST_UTILS_HERMETICITY_TEST_HASH_FUNCTION_TYPE_HPP #define INCLUDED_SRC_TEST_UTILS_HERMETICITY_TEST_HASH_FUNCTION_TYPE_HPP -#include <cstddef> //std::exit +#include <cstdlib> #include <optional> #include "src/buildtool/crypto/hash_function.hpp" diff --git a/test/utils/hermeticity/test_storage_config.hpp b/test/utils/hermeticity/test_storage_config.hpp index 4335592c..39d3ed24 100644 --- a/test/utils/hermeticity/test_storage_config.hpp +++ b/test/utils/hermeticity/test_storage_config.hpp @@ -17,14 +17,15 @@ #include <cstdlib> //std::exit, std::getenv #include <filesystem> +#include <memory> #include <string> #include <utility> //std::move #include "gsl/gsl" -#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/config.hpp" +#include "src/utils/cpp/expected.hpp" #include "src/utils/cpp/tmp_dir.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" diff --git a/test/utils/large_objects/large_object_utils.cpp b/test/utils/large_objects/large_object_utils.cpp index 0428b506..b61ea49e 100644 --- a/test/utils/large_objects/large_object_utils.cpp +++ b/test/utils/large_objects/large_object_utils.cpp @@ -14,6 +14,8 @@ #include "test/utils/large_objects/large_object_utils.hpp" +#include <algorithm> +#include <array> #include <cstddef> #include <cstdint> #include <fstream> diff --git a/test/utils/logging/log_config.hpp b/test/utils/logging/log_config.hpp index 3b920917..e7fc8a8b 100644 --- a/test/utils/logging/log_config.hpp +++ b/test/utils/logging/log_config.hpp @@ -18,6 +18,7 @@ #include <cstdlib> #include <exception> #include <string> // std::stoul +#include <vector> #include "src/buildtool/logging/log_config.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/test/utils/remote_execution/bazel_action_creator.hpp b/test/utils/remote_execution/bazel_action_creator.hpp index b7185121..1499424c 100644 --- a/test/utils/remote_execution/bazel_action_creator.hpp +++ b/test/utils/remote_execution/bazel_action_creator.hpp @@ -16,20 +16,24 @@ #define INCLUDED_SRC_TEST_UTILS_REMOTE_EXECUTION_ACTION_CREATOR_HPP #include <algorithm> // std::transform, std::copy +#include <iterator> #include <map> #include <memory> #include <optional> #include <string> #include <vector> +#include "google/protobuf/repeated_ptr_field.h" #include "gsl/gsl" -#include "src/buildtool/auth/authentication.hpp" #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_cas_client.hpp" #include "src/buildtool/execution_api/remote/config.hpp" +#include "src/buildtool/file_system/object_type.hpp" #include "test/utils/remote_execution/test_auth_config.hpp" #include "test/utils/remote_execution/test_remote_config.hpp" diff --git a/test/utils/remote_execution/main-remote-execution.cpp b/test/utils/remote_execution/main-remote-execution.cpp index f7bbc4fc..324d5634 100644 --- a/test/utils/remote_execution/main-remote-execution.cpp +++ b/test/utils/remote_execution/main-remote-execution.cpp @@ -15,17 +15,14 @@ #define CATCH_CONFIG_RUNNER #include <chrono> #include <cstdlib> -#include <iostream> -#include <sstream> +#include <optional> #include <thread> #include "catch2/catch_session.hpp" -#include "catch2/catch_test_macros.hpp" +#include "src/buildtool/auth/authentication.hpp" +#include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/execution_api/remote/config.hpp" -#include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_context.hpp" -#include "src/buildtool/logging/log_level.hpp" -#include "src/buildtool/logging/logger.hpp" #include "test/utils/logging/log_config.hpp" #include "test/utils/remote_execution/test_auth_config.hpp" #include "test/utils/remote_execution/test_remote_config.hpp" diff --git a/test/utils/remote_execution/test_auth_config.hpp b/test/utils/remote_execution/test_auth_config.hpp index 2f5cca25..c4ddfb99 100644 --- a/test/utils/remote_execution/test_auth_config.hpp +++ b/test/utils/remote_execution/test_auth_config.hpp @@ -16,12 +16,13 @@ #define INCLUDED_SRC_TEST_UTILS_REMOTE_EXECUTION_TEST_AUTH_CONFIG_HPP #include <optional> -#include <string> +#include <utility> #include <variant> #include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" +#include "src/utils/cpp/expected.hpp" #include "test/utils/test_env.hpp" class TestAuthConfig final { diff --git a/test/utils/remote_execution/test_remote_config.hpp b/test/utils/remote_execution/test_remote_config.hpp index 513b24ea..9aa2484a 100644 --- a/test/utils/remote_execution/test_remote_config.hpp +++ b/test/utils/remote_execution/test_remote_config.hpp @@ -16,10 +16,12 @@ #define INCLUDED_SRC_TEST_UTILS_REMOTE_EXECUTION_TEST_REMOTE_CONFIG_HPP #include <optional> +#include <utility> #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" +#include "src/utils/cpp/expected.hpp" #include "test/utils/test_env.hpp" class TestRemoteConfig final { diff --git a/test/utils/serve_service/main-serve.cpp b/test/utils/serve_service/main-serve.cpp index 59761832..ea60d726 100644 --- a/test/utils/serve_service/main-serve.cpp +++ b/test/utils/serve_service/main-serve.cpp @@ -16,21 +16,18 @@ #include <chrono> #include <cstdlib> #include <filesystem> -#include <iostream> -#include <sstream> +#include <optional> #include <string> #include <thread> +#include <vector> #include "catch2/catch_session.hpp" -#include "catch2/catch_test_macros.hpp" -#include "src/buildtool/common/protocol_traits.hpp" -#include "src/buildtool/execution_api/remote/config.hpp" -#include "src/buildtool/file_system/file_system_manager.hpp" +#include "fmt/core.h" +#include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/file_system/git_context.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/serve_api/remote/config.hpp" -#include "src/buildtool/storage/storage.hpp" #include "test/utils/logging/log_config.hpp" #include "test/utils/serve_service/test_serve_config.hpp" #include "test/utils/shell_quoting.hpp" diff --git a/test/utils/serve_service/test_serve_config.hpp b/test/utils/serve_service/test_serve_config.hpp index 4b94d0f7..6f6b712f 100644 --- a/test/utils/serve_service/test_serve_config.hpp +++ b/test/utils/serve_service/test_serve_config.hpp @@ -16,12 +16,12 @@ #define INCLUDED_SRC_TEST_UTILS_SERVE_SERVICE_TEST_SERVE_CONFIG_HPP #include <optional> -#include <string> -#include <variant> +#include <utility> #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/serve_api/remote/config.hpp" +#include "src/utils/cpp/expected.hpp" #include "test/utils/test_env.hpp" class TestServeConfig final { diff --git a/test/utils/test_env.hpp b/test/utils/test_env.hpp index ec03a9ee..0f93a898 100644 --- a/test/utils/test_env.hpp +++ b/test/utils/test_env.hpp @@ -17,14 +17,10 @@ #include <cstdlib> #include <filesystem> -#include <map> #include <optional> #include <sstream> #include <string> - -#include "src/buildtool/auth/authentication.hpp" -#include "src/buildtool/common/protocol_traits.hpp" -#include "test/utils/logging/log_config.hpp" +#include <vector> [[nodiscard]] static inline auto ReadPlatformPropertiesFromEnv() -> std::vector<std::string> { |