diff options
author | Tor Brede Vekterli <vekterli@vespa.ai> | 2023-10-24 15:32:31 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@vespa.ai> | 2023-10-24 15:32:31 +0000 |
commit | f868fb431c7934ca0346b8a50232cbcf57f4d5ef (patch) | |
tree | ea7756a2c3685d0d3ec9aec6f961b05951255bc6 /storage | |
parent | 81c7abb70e1385464698b22410fd9e43edd90cb0 (diff) |
Simplify and reuse utility config function
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/tests/bucketdb/bucketmanagertest.cpp | 3 | ||||
-rw-r--r-- | storage/src/tests/storageserver/service_layer_error_listener_test.cpp | 18 |
2 files changed, 8 insertions, 13 deletions
diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp index 7a2c22553f7..91e901c7254 100644 --- a/storage/src/tests/bucketdb/bucketmanagertest.cpp +++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp @@ -159,8 +159,7 @@ void BucketManagerTest::setupTestEnvironment(bool fakePersistenceLayer, bool noD _top->push_back(std::move(bottom)); } else { using vespa::config::content::StorFilestorConfig; - auto filestor_cfg = config_from<StorFilestorConfig>(config_uri); - auto bottom = std::make_unique<FileStorManager>(*filestor_cfg, + auto bottom = std::make_unique<FileStorManager>(*config_from<StorFilestorConfig>(config_uri), _node->getPersistenceProvider(), _node->getComponentRegister(), *_node, _node->get_host_info()); _top->push_back(std::move(bottom)); 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 a30594f6076..edb13eea5af 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 <vespa/storage/storageserver/service_layer_error_listener.h> -#include <vespa/storage/storageserver/mergethrottler.h> -#include <vespa/storageframework/defaultimplementation/component/componentregisterimpl.h> -#include <vespa/vdstestlib/config/dirconfig.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; @@ -35,19 +35,15 @@ private: }; struct Fixture { + using StorServerConfig = vespa::config::content::core::StorServerConfig; + vdstestlib::DirConfig config{getStandardConfig(true)}; TestServiceLayerApp app; ServiceLayerComponent component{app.getComponentRegister(), "dummy"}; - MergeThrottler merge_throttler{*config_from(config::ConfigUri(config.getConfigId())), app.getComponentRegister()}; + MergeThrottler merge_throttler{*config_from<StorServerConfig>(config::ConfigUri(config.getConfigId())), app.getComponentRegister()}; TestShutdownListener shutdown_listener; ServiceLayerErrorListener error_listener{component, merge_throttler}; - using StorServerConfig = vespa::config::content::core::StorServerConfig; - - static std::unique_ptr<StorServerConfig> config_from(const ::config::ConfigUri& cfg_uri) { - return ::config::ConfigGetter<StorServerConfig>::getConfig(cfg_uri.getConfigId(), cfg_uri.getContext()); - } - Fixture(); ~Fixture(); }; |