summaryrefslogtreecommitdiff
path: root/test/buildtool/common/artifact_description.test.cpp
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2024-07-11 15:14:05 +0200
committerMaksim Denisov <denisov.maksim@huawei.com>2024-07-12 15:43:37 +0200
commitacd81410b5205cb18a4bba3fea75ff2389f00635 (patch)
tree90e37f95b98712f30d4b2544111a511735a55e1d /test/buildtool/common/artifact_description.test.cpp
parentec4fe905bccd666c72e51fe1d822e7a575da8b70 (diff)
downloadjustbuild-acd81410b5205cb18a4bba3fea75ff2389f00635.tar.gz
ArtifactFactory: remove FromDescription method
...since it is used in tests only.
Diffstat (limited to 'test/buildtool/common/artifact_description.test.cpp')
-rw-r--r--test/buildtool/common/artifact_description.test.cpp30
1 files changed, 10 insertions, 20 deletions
diff --git a/test/buildtool/common/artifact_description.test.cpp b/test/buildtool/common/artifact_description.test.cpp
index d07efa93..c8fffc46 100644
--- a/test/buildtool/common/artifact_description.test.cpp
+++ b/test/buildtool/common/artifact_description.test.cpp
@@ -30,10 +30,8 @@
TEST_CASE("Local artifact", "[artifact_description]") {
auto local_desc = ArtifactDescription::CreateLocal(
std::filesystem::path{"local_path"}, "repo");
- auto local = local_desc.ToArtifact();
- auto local_from_factory =
- ArtifactFactory::FromDescription(local_desc.ToJson());
- CHECK(local == *local_from_factory);
+ auto from_json = ArtifactDescription::FromJson(local_desc.ToJson());
+ CHECK(local_desc == *from_json);
}
TEST_CASE("Known artifact", "[artifact_description]") {
@@ -41,38 +39,30 @@ TEST_CASE("Known artifact", "[artifact_description]") {
auto known_desc = ArtifactDescription::CreateKnown(
ArtifactDigest{std::string{"f_fake_hash"}, 0, /*is_tree=*/false},
ObjectType::File);
- auto known = known_desc.ToArtifact();
- auto known_from_factory =
- ArtifactFactory::FromDescription(known_desc.ToJson());
- CHECK(known == *known_from_factory);
+ auto from_json = ArtifactDescription::FromJson(known_desc.ToJson());
+ CHECK(known_desc == *from_json);
}
SECTION("Executable object") {
auto known_desc = ArtifactDescription::CreateKnown(
ArtifactDigest{std::string{"x_fake_hash"}, 1, /*is_tree=*/false},
ObjectType::Executable);
- auto known = known_desc.ToArtifact();
- auto known_from_factory =
- ArtifactFactory::FromDescription(known_desc.ToJson());
- CHECK(known == *known_from_factory);
+ auto from_json = ArtifactDescription::FromJson(known_desc.ToJson());
+ CHECK(known_desc == *from_json);
}
SECTION("Symlink object") {
auto known_desc = ArtifactDescription::CreateKnown(
ArtifactDigest{std::string{"l_fake_hash"}, 2, /*is_tree=*/false},
ObjectType::Symlink);
- auto known = known_desc.ToArtifact();
- auto known_from_factory =
- ArtifactFactory::FromDescription(known_desc.ToJson());
- CHECK(known == *known_from_factory);
+ auto from_json = ArtifactDescription::FromJson(known_desc.ToJson());
+ CHECK(known_desc == *from_json);
}
}
TEST_CASE("Action artifact", "[artifact_description]") {
auto action_desc = ArtifactDescription::CreateAction(
"action_id", std::filesystem::path{"out_path"});
- auto action = action_desc.ToArtifact();
- auto action_from_factory =
- ArtifactFactory::FromDescription(action_desc.ToJson());
- CHECK(action == *action_from_factory);
+ auto from_json = ArtifactDescription::FromJson(action_desc.ToJson());
+ CHECK(action_desc == *from_json);
}
TEST_CASE("From JSON", "[artifact_description]") {