From 1e1758e8c30d30df0ebeefbada1e5a8f74d8a350 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Thu, 11 Jul 2024 13:22:16 +0200 Subject: Use static Create functions to construct ArtifactDescription ...instead of unobvious ctors relying on overload resolution. --- test/buildtool/file_system/file_root.test.cpp | 40 +++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'test/buildtool/file_system/file_root.test.cpp') diff --git a/test/buildtool/file_system/file_root.test.cpp b/test/buildtool/file_system/file_root.test.cpp index e5f84cfb..1f7bf927 100644 --- a/test/buildtool/file_system/file_root.test.cpp +++ b/test/buildtool/file_system/file_root.test.cpp @@ -367,8 +367,8 @@ TEST_CASE("Creating artifact descriptions", "[file_root]") { auto desc = root.ToArtifactDescription("baz/foo", "repo"); REQUIRE(desc); - CHECK(*desc == - ArtifactDescription(std::filesystem::path{"baz/foo"}, "repo")); + CHECK(*desc == ArtifactDescription::CreateLocal( + std::filesystem::path{"baz/foo"}, "repo")); CHECK(root.ToArtifactDescription("does_not_exist", "repo")); } @@ -381,17 +381,17 @@ TEST_CASE("Creating artifact descriptions", "[file_root]") { auto foo = root->ToArtifactDescription("baz/foo", "repo"); REQUIRE(foo); - CHECK(*foo == - ArtifactDescription{ArtifactDigest{kFooId, 3, /*is_tree=*/false}, - ObjectType::File, - "repo"}); + CHECK(*foo == ArtifactDescription::CreateKnown( + ArtifactDigest{kFooId, 3, /*is_tree=*/false}, + ObjectType::File, + "repo")); auto bar = root->ToArtifactDescription("baz/bar", "repo"); REQUIRE(bar); - CHECK(*bar == - ArtifactDescription{ArtifactDigest{kBarId, 3, /*is_tree=*/false}, - ObjectType::Executable, - "repo"}); + CHECK(*bar == ArtifactDescription::CreateKnown( + ArtifactDigest{kBarId, 3, /*is_tree=*/false}, + ObjectType::Executable, + "repo")); CHECK_FALSE(root->ToArtifactDescription("baz", "repo")); CHECK_FALSE(root->ToArtifactDescription("does_not_exist", "repo")); @@ -404,8 +404,8 @@ TEST_CASE("Creating artifact descriptions", "[file_root]") { auto desc = root.ToArtifactDescription("baz/foo", "repo"); REQUIRE(desc); - CHECK(*desc == - ArtifactDescription(std::filesystem::path{"baz/foo"}, "repo")); + CHECK(*desc == ArtifactDescription::CreateLocal( + std::filesystem::path{"baz/foo"}, "repo")); CHECK(root.ToArtifactDescription("does_not_exist", "repo")); } @@ -419,17 +419,17 @@ TEST_CASE("Creating artifact descriptions", "[file_root]") { auto foo = root->ToArtifactDescription("baz/foo", "repo"); REQUIRE(foo); - CHECK(*foo == - ArtifactDescription{ArtifactDigest{kFooId, 3, /*is_tree=*/false}, - ObjectType::File, - "repo"}); + CHECK(*foo == ArtifactDescription::CreateKnown( + ArtifactDigest{kFooId, 3, /*is_tree=*/false}, + ObjectType::File, + "repo")); auto bar = root->ToArtifactDescription("baz/bar", "repo"); REQUIRE(bar); - CHECK(*bar == - ArtifactDescription{ArtifactDigest{kBarId, 3, /*is_tree=*/false}, - ObjectType::Executable, - "repo"}); + CHECK(*bar == ArtifactDescription::CreateKnown( + ArtifactDigest{kBarId, 3, /*is_tree=*/false}, + ObjectType::Executable, + "repo")); CHECK_FALSE(root->ToArtifactDescription("baz", "repo")); CHECK_FALSE(root->ToArtifactDescription("does_not_exist", "repo")); -- cgit v1.2.3