summaryrefslogtreecommitdiff
path: root/test/buildtool/file_system
diff options
context:
space:
mode:
Diffstat (limited to 'test/buildtool/file_system')
-rw-r--r--test/buildtool/file_system/TARGETS20
-rw-r--r--test/buildtool/file_system/directory_entries.test.cpp4
-rw-r--r--test/buildtool/file_system/file_root.test.cpp7
-rw-r--r--test/buildtool/file_system/file_system_manager.test.cpp10
-rw-r--r--test/buildtool/file_system/git_repo.test.cpp6
-rw-r--r--test/buildtool/file_system/git_tree.test.cpp8
-rw-r--r--test/buildtool/file_system/object_cas.test.cpp3
-rw-r--r--test/buildtool/file_system/resolve_symlinks_map.test.cpp3
8 files changed, 44 insertions, 17 deletions
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"