diff options
Diffstat (limited to 'test/buildtool/build_engine/expression')
4 files changed, 19 insertions, 6 deletions
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>; |