From 5b3ee91c84d37fe2cd7d4ddd9d26370447564161 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Thu, 20 Jun 2024 14:42:52 +0200 Subject: Mark IExecutionApi's methods constant --- .../execution_engine/executor/executor.test.cpp | 50 ++++++++++++---------- 1 file changed, 27 insertions(+), 23 deletions(-) (limited to 'test/buildtool/execution_engine/executor/executor.test.cpp') diff --git a/test/buildtool/execution_engine/executor/executor.test.cpp b/test/buildtool/execution_engine/executor/executor.test.cpp index 8eece895..9b1c8263 100644 --- a/test/buildtool/execution_engine/executor/executor.test.cpp +++ b/test/buildtool/execution_engine/executor/executor.test.cpp @@ -136,31 +136,32 @@ class TestApi : public IExecutionApi { explicit TestApi(TestApiConfig config) noexcept : config_{std::move(config)} {} - auto CreateAction( + [[nodiscard]] auto CreateAction( ArtifactDigest const& /*unused*/, std::vector const& /*unused*/, std::vector const& /*unused*/, std::vector const& /*unused*/, std::map const& /*unused*/, - std::map const& /*unused*/) noexcept + std::map const& /*unused*/) const noexcept -> IExecutionAction::Ptr final { return IExecutionAction::Ptr{new TestAction(config_)}; } - auto RetrieveToPaths( + [[nodiscard]] auto RetrieveToPaths( std::vector const& /*unused*/, std::vector const& /*unused*/, - std::optional< - gsl::not_null> const& /* unused */) noexcept - -> bool final { + std::optional> const& /* unused */) + const noexcept -> bool final { return false; // not needed by Executor } - auto RetrieveToFds(std::vector const& /*unused*/, - std::vector const& /*unused*/, - bool /*unused*/) noexcept -> bool final { + [[nodiscard]] auto RetrieveToFds( + std::vector const& /*unused*/, + std::vector const& /*unused*/, + bool /*unused*/) const noexcept -> bool final { return false; // not needed by Executor } - auto RetrieveToCas(std::vector const& unused, - gsl::not_null const& /*unused*/) noexcept + [[nodiscard]] auto RetrieveToCas( + std::vector const& unused, + gsl::not_null const& /*unused*/) const noexcept -> bool final { // Note that a false-positive "free-nonheap-object" warning is thrown by // gcc 12.2 with GNU libstdc++, if the caller passes a temporary vector @@ -169,26 +170,29 @@ class TestApi : public IExecutionApi { // irrelevant for testing though. return unused.empty(); // not needed by Executor } - auto RetrieveToMemory( - Artifact::ObjectInfo const& /*artifact_info*/) noexcept + [[nodiscard]] auto RetrieveToMemory( + Artifact::ObjectInfo const& /*artifact_info*/) const noexcept -> std::optional override { return std::nullopt; // not needed by Executor } - auto Upload(ArtifactBlobContainer&& blobs, bool /*unused*/) noexcept - -> bool final { + [[nodiscard]] auto Upload(ArtifactBlobContainer&& blobs, + bool /*unused*/) const noexcept -> bool final { auto blob_range = blobs.Blobs(); return std::all_of( blob_range.begin(), blob_range.end(), [this](auto const& blob) { - return config_.artifacts[*blob.data] - .uploads // for local artifacts - or config_.artifacts[blob.digest.hash()] - .uploads; // for known and action artifacts + // for local artifacts + auto it1 = config_.artifacts.find(*blob.data); + if (it1 != config_.artifacts.end() and it1->second.uploads) { + return true; + } + // for known and action artifacts + auto it2 = config_.artifacts.find(blob.digest.hash()); + return it2 != config_.artifacts.end() and it2->second.uploads; }); } - auto UploadTree( - std::vector< - DependencyGraph::NamedArtifactNodePtr> const& /*unused*/) noexcept - -> std::optional final { + [[nodiscard]] auto UploadTree( + std::vector const& /*unused*/) + const noexcept -> std::optional final { return ArtifactDigest{}; // not needed by Executor } [[nodiscard]] auto IsAvailable(ArtifactDigest const& digest) const noexcept -- cgit v1.2.3