From 1e234886e11e1d4b78507d240e3bd7234f203466 Mon Sep 17 00:00:00 2001
From: Tor Brede Vekterli <vekterli@vespa.ai>
Date: Tue, 14 May 2024 12:31:29 +0000
Subject: Remove usages of deprecated DirConfig in storage unit tests

Introduce a distinct `StorageConfigSet` which wraps the actual
underlying config objects and exposes them through a unified
`ConfigUri`.
---
 .../src/tests/storageserver/service_layer_error_listener_test.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'storage/src/tests/storageserver/service_layer_error_listener_test.cpp')

diff --git a/storage/src/tests/storageserver/service_layer_error_listener_test.cpp b/storage/src/tests/storageserver/service_layer_error_listener_test.cpp
index 63d8eec6dc3..b84f96dd847 100644
--- a/storage/src/tests/storageserver/service_layer_error_listener_test.cpp
+++ b/storage/src/tests/storageserver/service_layer_error_listener_test.cpp
@@ -1,12 +1,12 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <tests/common/storage_config_set.h>
 #include <tests/common/testhelper.h>
 #include <tests/common/teststorageapp.h>
 #include <vespa/config/helper/configgetter.hpp>
 #include <vespa/storage/storageserver/mergethrottler.h>
 #include <vespa/storage/storageserver/service_layer_error_listener.h>
 #include <vespa/storageframework/defaultimplementation/component/componentregisterimpl.h>
-#include <vespa/vdstestlib/config/dirconfig.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
 using namespace ::testing;
@@ -37,10 +37,10 @@ private:
 struct Fixture {
     using StorServerConfig = vespa::config::content::core::StorServerConfig;
 
-    vdstestlib::DirConfig config{getStandardConfig(true)};
-    TestServiceLayerApp app;
+    std::unique_ptr<StorageConfigSet> config{StorageConfigSet::make_storage_node_config()};
+    TestServiceLayerApp app{config->config_uri()};
     ServiceLayerComponent component{app.getComponentRegister(), "dummy"};
-    MergeThrottler merge_throttler{*config_from<StorServerConfig>(config::ConfigUri(config.getConfigId())),
+    MergeThrottler merge_throttler{*config_from<StorServerConfig>(config->config_uri()),
                                    app.getComponentRegister(), vespalib::HwInfo()};
     TestShutdownListener shutdown_listener;
     ServiceLayerErrorListener error_listener{component, merge_throttler};
-- 
cgit v1.2.3