diff options
author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-08-01 18:07:02 +0200 |
---|---|---|
committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-08-07 14:43:19 +0200 |
commit | deef657f5615432f207c13bad969f8ed686a86ce (patch) | |
tree | cd229aa1555e8937ef53c077df8ac0c59bced4fa | |
parent | db20ff655a5ba65c69260a5eceec8a9f7cfc9f50 (diff) | |
download | justbuild-deef657f5615432f207c13bad969f8ed686a86ce.tar.gz |
Remove unused code from Artifact::ObjectInfo
Deserialization from json is used in a single test only
-rw-r--r-- | src/buildtool/common/artifact.hpp | 15 | ||||
-rw-r--r-- | test/buildtool/common/TARGETS | 20 | ||||
-rw-r--r-- | test/buildtool/common/artifact_object_info.test.cpp | 35 |
3 files changed, 1 insertions, 69 deletions
diff --git a/src/buildtool/common/artifact.hpp b/src/buildtool/common/artifact.hpp index 36f3e3d4..56c05e2f 100644 --- a/src/buildtool/common/artifact.hpp +++ b/src/buildtool/common/artifact.hpp @@ -105,21 +105,6 @@ class Artifact { } return std::nullopt; } - - [[nodiscard]] static auto FromJson(nlohmann::json const& j) - -> std::optional<ObjectInfo> { - if (j.is_object() and j["id"].is_string() and - j["size"].is_number() and j["file_type"].is_string()) { - auto const& object_type = - FromChar(*(j["file_type"].get<std::string>().c_str())); - return ObjectInfo{ - .digest = ArtifactDigest{j["id"].get<std::string>(), - j["size"].get<std::size_t>(), - IsTreeObject(object_type)}, - .type = object_type}; - } - return std::nullopt; - } }; explicit Artifact(ArtifactIdentifier id) noexcept : id_{std::move(id)} {} diff --git a/test/buildtool/common/TARGETS b/test/buildtool/common/TARGETS index c2ce0eac..00868a33 100644 --- a/test/buildtool/common/TARGETS +++ b/test/buildtool/common/TARGETS @@ -44,27 +44,9 @@ ] , "stage": ["test", "buildtool", "common"] } -, "artifact_object_info": - { "type": ["@", "rules", "CC/test", "test"] - , "name": ["artifact_object_info"] - , "srcs": ["artifact_object_info.test.cpp"] - , "private-deps": - [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["@", "json", "", "json"] - , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/file_system", "object_type"] - ] - , "stage": ["test", "buildtool", "common"] - } , "TESTS": { "type": "install" , "tainted": ["test"] - , "deps": - [ "action_description" - , "artifact_description" - , "repository_config" - , "artifact_object_info" - ] + , "deps": ["action_description", "artifact_description", "repository_config"] } } diff --git a/test/buildtool/common/artifact_object_info.test.cpp b/test/buildtool/common/artifact_object_info.test.cpp deleted file mode 100644 index cd78dd96..00000000 --- a/test/buildtool/common/artifact_object_info.test.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2022 Huawei Cloud Computing Technology Co., Ltd. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "catch2/catch_test_macros.hpp" -#include "nlohmann/json.hpp" -#include "src/buildtool/common/artifact.hpp" -#include "src/buildtool/common/artifact_digest.hpp" -#include "src/buildtool/file_system/object_type.hpp" - -TEST_CASE("Consistency check for serialization and de-serialization", - "[object_info]") { - - auto empty_blob = Artifact::ObjectInfo{ - .digest = - ArtifactDigest{ - "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", 0, false}, - .type = ObjectType::File}; - - auto x = empty_blob.ToJson().dump(); - - auto read = Artifact::ObjectInfo::FromJson(nlohmann::json::parse(x)); - REQUIRE(read.has_value()); - CHECK(*read == empty_blob); -} |