From 4ebb3bf82551c334d16f4935c751fb554224e19c Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Thu, 27 Jun 2024 16:16:09 +0200
Subject: Pass Storage to RepositoryConfig

...and adjust AnalyseContext.
---
 .../build_engine/target_map/target_map.test.cpp          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'test/buildtool/build_engine/target_map/target_map.test.cpp')

diff --git a/test/buildtool/build_engine/target_map/target_map.test.cpp b/test/buildtool/build_engine/target_map/target_map.test.cpp
index a3e1d350..bb15a544 100644
--- a/test/buildtool/build_engine/target_map/target_map.test.cpp
+++ b/test/buildtool/build_engine/target_map/target_map.test.cpp
@@ -109,7 +109,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "simple targets", "[target_map]") {
                          RemoteExecutionConfig::RemoteAddress()};
     auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
-                       .target_cache = &Storage::Instance().TargetCache(),
+                       .storage = &Storage::Instance(),
                        .statistics = &stats,
                        .progress = &exports_progress,
                        .serve = serve ? &*serve : nullptr};
@@ -557,7 +557,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture,
                          RemoteExecutionConfig::RemoteAddress()};
     auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
-                       .target_cache = &Storage::Instance().TargetCache(),
+                       .storage = &Storage::Instance(),
                        .statistics = &stats,
                        .progress = &exports_progress,
                        .serve = serve ? &*serve : nullptr};
@@ -650,7 +650,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture,
                          RemoteExecutionConfig::RemoteAddress()};
     auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
-                       .target_cache = &Storage::Instance().TargetCache(),
+                       .storage = &Storage::Instance(),
                        .statistics = &stats,
                        .progress = &exports_progress,
                        .serve = serve ? &*serve : nullptr};
@@ -753,7 +753,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "built-in rules", "[target_map]") {
                          RemoteExecutionConfig::RemoteAddress()};
     auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
-                       .target_cache = &Storage::Instance().TargetCache(),
+                       .storage = &Storage::Instance(),
                        .statistics = &stats,
                        .progress = &exports_progress,
                        .serve = serve ? &*serve : nullptr};
@@ -966,7 +966,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "target reference", "[target_map]") {
                          RemoteExecutionConfig::RemoteAddress()};
     auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
-                       .target_cache = &Storage::Instance().TargetCache(),
+                       .storage = &Storage::Instance(),
                        .statistics = &stats,
                        .progress = &exports_progress,
                        .serve = serve ? &*serve : nullptr};
@@ -1112,7 +1112,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "trees", "[target_map]") {
                          RemoteExecutionConfig::RemoteAddress()};
     auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
-                       .target_cache = &Storage::Instance().TargetCache(),
+                       .storage = &Storage::Instance(),
                        .statistics = &stats,
                        .progress = &exports_progress,
                        .serve = serve ? &*serve : nullptr};
@@ -1224,7 +1224,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture,
                          RemoteExecutionConfig::RemoteAddress()};
     auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
-                       .target_cache = &Storage::Instance().TargetCache(),
+                       .storage = &Storage::Instance(),
                        .statistics = &stats,
                        .progress = &exports_progress,
                        .serve = serve ? &*serve : nullptr};
@@ -1393,7 +1393,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "wrong arguments", "[target_map]") {
                          RemoteExecutionConfig::RemoteAddress()};
     auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
-                       .target_cache = &Storage::Instance().TargetCache(),
+                       .storage = &Storage::Instance(),
                        .statistics = &stats,
                        .progress = &exports_progress,
                        .serve = serve ? &*serve : nullptr};
-- 
cgit v1.2.3