executor: Use ApiBundle

...instead of separate local and remote instances.

For tests, where different implementations of the IExecutionApi
interface are used, ApiBundle instances are created by explicitly
setting the struct fields instead of using ApiBundle::Create.

1 files changed, 35 insertions, 0 deletions

diff --git a/test/utils/executor/test_api_bundle.hpp b/test/utils/executor/test_api_bundle.hpp
new file mode 100644
index 00000000..1b582ce6
--- /dev/null
+++ b/test/utils/executor/test_api_bundle.hpp
@@ -0,0 +1,35 @@
+// Copyright 2024 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.
+
+#ifndef INCLUDED_SRC_TEST_UTILS_EXECUTOR_TEST_API_BUNDLE_HPP
+#define INCLUDED_SRC_TEST_UTILS_EXECUTOR_TEST_API_BUNDLE_HPP
+
+#include <utility>  // std::move
+
+#include "gsl/gsl"
+#include "src/buildtool/crypto/hash_function.hpp"
+#include "src/buildtool/execution_api/common/api_bundle.hpp"
+#include "src/buildtool/execution_api/common/execution_api.hpp"
+
+/// \brief Creates an ApiBundle that contains a given IExecutionApi
+/// implementation. As only the hash_function field is actually needed, the
+/// remote_context and repo_config are not needed to be provided.
+[[nodiscard]] static auto CreateTestApiBundle(
+    HashFunction hash_function,
+    gsl::not_null<IExecutionApi::Ptr> const& api) noexcept -> ApiBundle {
+    return ApiBundle{
+        .hash_function = hash_function, .local = api, .remote = api};
+}
+
+#endif  // INCLUDED_SRC_TEST_UTILS_EXECUTOR_TEST_API_BUNDLE_HPP