Remove RankingConstantsConfig from DocumentDBConfig and add builder used in unit tests.

2 files changed, 4 insertions, 16 deletions

diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt
index 1ad3b7f21f6..ee339c1c145 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt
@@ -3,6 +3,7 @@ vespa_add_executable(searchcore_documentdbconfig_test_app TEST
     SOURCES
     documentdbconfig_test.cpp
     DEPENDS
+    searchcore_test
     searchcore_server
 )
 vespa_add_test(NAME searchcore_documentdbconfig_test_app COMMAND searchcore_documentdbconfig_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
index 5cced5038c8..8fd10b49409 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
@@ -5,6 +5,7 @@
 LOG_SETUP("documentdbconfig_test");
 
 #include <vespa/searchcore/proton/server/documentdbconfig.h>
+#include <vespa/searchcore/proton/test/documentdb_config_builder.h>
 #include <vespa/vespalib/testkit/testapp.h>
 
 using namespace document;
@@ -26,22 +27,8 @@ getConfig(int64_t generation, const Schema::SP &schema,
           shared_ptr<DocumentTypeRepo> repo,
           const RankProfilesConfig &rankProfiles)
 {
-    return make_shared<DocumentDBConfig>(
-            generation,
-            make_shared<RankProfilesConfig>(rankProfiles),
-            make_shared<RankingConstantsConfig>(),
-            make_shared<matching::RankingConstants>(),
-            make_shared<IndexschemaConfig>(),
-            make_shared<AttributesConfig>(),
-            make_shared<SummaryConfig>(),
-            make_shared<SummarymapConfig>(),
-            make_shared<summary::JuniperrcConfig>(),
-            make_shared<DocumenttypesConfig>(),
-            repo,
-            make_shared<TuneFileDocumentDB>(),
-            schema,
-            make_shared<DocumentDBMaintenanceConfig>(),
-            "client", "test");
+    return test::DocumentDBConfigBuilder(generation, schema, "client", "test").
+            repo(repo).rankProfiles(make_shared<RankProfilesConfig>(rankProfiles)).build();
 }
 
 }