diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-10 18:51:20 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-13 14:41:00 +0200 |
| commit | f60d39620b29aeaf1addeb244bdd6e15ddf4894c (patch) | |
| tree | 2617d65884c975b3fc63dd48e58242ec36138246 /test/buildtool/build_engine | |
| parent | ed8f24fb246142ffaa88707ae86b53c34df82986 (diff) | |
| download | justbuild-f60d39620b29aeaf1addeb244bdd6e15ddf4894c.tar.gz | |
Rename Compatibility class to ProtocolTraits
...and move it to the common stage.
Diffstat (limited to 'test/buildtool/build_engine')
| -rw-r--r-- | test/buildtool/build_engine/base_maps/TARGETS | 1 | ||||
| -rw-r--r-- | test/buildtool/build_engine/base_maps/source_map.test.cpp | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/test/buildtool/build_engine/base_maps/TARGETS b/test/buildtool/build_engine/base_maps/TARGETS index 855d6217..2c5f4029 100644 --- a/test/buildtool/build_engine/base_maps/TARGETS +++ b/test/buildtool/build_engine/base_maps/TARGETS @@ -63,6 +63,7 @@ , ["", "catch-main"] , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/common", "config"] + , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/build_engine/base_maps", "directory_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "source_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"] 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 44c6863a..b6c7f1c1 100644 --- a/test/buildtool/build_engine/base_maps/source_map.test.cpp +++ b/test/buildtool/build_engine/base_maps/source_map.test.cpp @@ -25,6 +25,7 @@ #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/file_system/file_root.hpp" #include "src/buildtool/multithreading/async_map_consumer.hpp" @@ -102,7 +103,8 @@ TEST_CASE("from file") { CHECK(ReadSourceTarget(name, consumer, /*use_git=*/true)); CHECK(artifacts["file"]["type"] == "KNOWN"); CHECK(artifacts["file"]["data"]["id"] == - (Compatibility::IsCompatible() ? kEmptySha256 : kEmptySha1)); + (ProtocolTraits::Instance().IsCompatible() ? kEmptySha256 + : kEmptySha1)); CHECK(artifacts["file"]["data"]["size"] == 0); } } @@ -168,7 +170,8 @@ TEST_CASE("subdir file") { CHECK(ReadSourceTarget(name, consumer, /*use_git=*/true)); CHECK(artifacts["bar/file"]["type"] == "KNOWN"); CHECK(artifacts["bar/file"]["data"]["id"] == - (Compatibility::IsCompatible() ? kEmptySha256 : kEmptySha1)); + (ProtocolTraits::Instance().IsCompatible() ? kEmptySha256 + : kEmptySha1)); CHECK(artifacts["bar/file"]["data"]["size"] == 0); } } @@ -189,9 +192,9 @@ TEST_CASE("subdir symlink") { SECTION("via git tree") { CHECK(ReadSourceTarget(name, consumer, /*use_git=*/true)); CHECK(artifacts["link"]["type"] == "KNOWN"); - CHECK(artifacts["link"]["data"]["id"] == (Compatibility::IsCompatible() - ? kSrcLinkIdSha256 - : kSrcLinkIdSha1)); + CHECK(artifacts["link"]["data"]["id"] == + (ProtocolTraits::Instance().IsCompatible() ? kSrcLinkIdSha256 + : kSrcLinkIdSha1)); CHECK(artifacts["link"]["data"]["size"] == 5); // content: dummy } } |