From ed0cd750a98a9334f95d99a5ba4ce3abe17538f1 Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Fri, 12 Jul 2024 09:56:36 +0200
Subject: test: Reduce verbosity in config methods

As the classes describe the config type, their static creators can
have generic names, which reduces unnecessary verbosity.
---
 .../execution_engine/executor/executor_api_local.test.cpp      |  8 ++++----
 .../executor/executor_api_remote_bazel.test.cpp                | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'test/buildtool/execution_engine/executor')

diff --git a/test/buildtool/execution_engine/executor/executor_api_local.test.cpp b/test/buildtool/execution_engine/executor/executor_api_local.test.cpp
index 7d645e0e..5c423dea 100644
--- a/test/buildtool/execution_engine/executor/executor_api_local.test.cpp
+++ b/test/buildtool/execution_engine/executor/executor_api_local.test.cpp
@@ -45,7 +45,7 @@ TEST_CASE("Executor<LocalApi>: Compile hello world", "[executor]") {
     RepositoryConfig repo_config{};
     Statistics stats{};
     Progress progress{};
-    auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+    auto auth_config = TestAuthConfig::ReadFromEnvironment();
     REQUIRE(auth_config);
     TestHelloWorldCompilation(
         &repo_config,
@@ -65,7 +65,7 @@ TEST_CASE("Executor<LocalApi>: Compile greeter", "[executor]") {
     RepositoryConfig repo_config{};
     Statistics stats{};
     Progress progress{};
-    auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+    auto auth_config = TestAuthConfig::ReadFromEnvironment();
     REQUIRE(auth_config);
     TestGreeterCompilation(
         &repo_config,
@@ -85,7 +85,7 @@ TEST_CASE("Executor<LocalApi>: Upload and download trees", "[executor]") {
     RepositoryConfig repo_config{};
     Statistics stats{};
     Progress progress{};
-    auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+    auto auth_config = TestAuthConfig::ReadFromEnvironment();
     REQUIRE(auth_config);
     TestUploadAndDownloadTrees(
         &repo_config,
@@ -105,7 +105,7 @@ TEST_CASE("Executor<LocalApi>: Retrieve output directories", "[executor]") {
     RepositoryConfig repo_config{};
     Statistics stats{};
     Progress progress{};
-    auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+    auto auth_config = TestAuthConfig::ReadFromEnvironment();
     REQUIRE(auth_config);
     TestRetrieveOutputDirectories(
         &repo_config,
diff --git a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp
index d2f41bf1..cdd47068 100755
--- a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp
+++ b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp
@@ -28,7 +28,7 @@ TEST_CASE("Executor<BazelApi>: Upload blob", "[executor]") {
     RepositoryConfig repo_config{};
     ExecutionConfiguration config;
     auto const& info = RemoteExecutionConfig::RemoteAddress();
-    auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+    auto auth_config = TestAuthConfig::ReadFromEnvironment();
     REQUIRE(auth_config);
 
     TestBlobUpload(&repo_config, [&] {
@@ -46,7 +46,7 @@ TEST_CASE("Executor<BazelApi>: Compile hello world", "[executor]") {
 
     auto const& info = RemoteExecutionConfig::RemoteAddress();
 
-    auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+    auto auth_config = TestAuthConfig::ReadFromEnvironment();
     REQUIRE(auth_config);
 
     TestHelloWorldCompilation(
@@ -73,7 +73,7 @@ TEST_CASE("Executor<BazelApi>: Compile greeter", "[executor]") {
 
     auto const& info = RemoteExecutionConfig::RemoteAddress();
 
-    auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+    auto auth_config = TestAuthConfig::ReadFromEnvironment();
     REQUIRE(auth_config);
 
     TestGreeterCompilation(
@@ -100,7 +100,7 @@ TEST_CASE("Executor<BazelApi>: Upload and download trees", "[executor]") {
 
     auto const& info = RemoteExecutionConfig::RemoteAddress();
 
-    auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+    auto auth_config = TestAuthConfig::ReadFromEnvironment();
     REQUIRE(auth_config);
 
     TestUploadAndDownloadTrees(
@@ -127,7 +127,7 @@ TEST_CASE("Executor<BazelApi>: Retrieve output directories", "[executor]") {
 
     auto const& info = RemoteExecutionConfig::RemoteAddress();
 
-    auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+    auto auth_config = TestAuthConfig::ReadFromEnvironment();
     REQUIRE(auth_config);
 
     TestRetrieveOutputDirectories(
-- 
cgit v1.2.3