diff options
author | Geir Storli <geirst@yahoo-inc.com> | 2016-09-02 09:52:42 +0200 |
---|---|---|
committer | Geir Storli <geirst@yahoo-inc.com> | 2016-09-02 10:40:42 +0200 |
commit | 0f4449ac5daba3e077ed22755ef803c8ec5dfe47 (patch) | |
tree | 11e4854e0f405621de01b7f9adc739f37b6aa973 /searchcore/src/tests | |
parent | 54c581949ccfaa61942e5c209fe7c02b9d172893 (diff) |
Integrate and populate matching::RankingConstants based on files acquired from file distribution.
Diffstat (limited to 'searchcore/src/tests')
5 files changed, 7 insertions, 2 deletions
diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp index a50a112aecc..c2f977c733a 100644 --- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp +++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp @@ -321,6 +321,7 @@ createConfig() 0, std::make_shared<RankProfilesConfig>(), std::make_shared<RankingConstantsConfig>(), + std::make_shared<matching::RankingConstants>(), std::make_shared<IndexschemaConfig>(), std::make_shared<AttributesConfig>(), std::make_shared<SummaryConfig>(), @@ -341,6 +342,7 @@ createConfig(const Schema::SP &schema) 0, std::make_shared<RankProfilesConfig>(), std::make_shared<RankingConstantsConfig>(), + std::make_shared<matching::RankingConstants>(), std::make_shared<IndexschemaConfig>(), std::make_shared<AttributesConfig>(), std::make_shared<SummaryConfig>(), diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp index 831c5d522d9..5cced5038c8 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp @@ -30,6 +30,7 @@ getConfig(int64_t generation, const Schema::SP &schema, generation, make_shared<RankProfilesConfig>(rankProfiles), make_shared<RankingConstantsConfig>(), + make_shared<matching::RankingConstants>(), make_shared<IndexschemaConfig>(), make_shared<AttributesConfig>(), make_shared<SummaryConfig>(), diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp index bb0a3e33b50..57b77c5a0a5 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp @@ -31,6 +31,7 @@ getConfig(int64_t generation, const Schema::SP &schema, generation, make_shared<RankProfilesConfig>(), make_shared<RankingConstantsConfig>(), + make_shared<matching::RankingConstants>(), make_shared<IndexschemaConfig>(), make_shared<AttributesConfig>(attributes), make_shared<SummaryConfig>(), diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp index ec47b3c3705..a0443d6c8e4 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp @@ -5,10 +5,8 @@ LOG_SETUP("fileconfigmanager_test"); #include "config-mycfg.h" #include <vespa/searchcore/proton/server/fileconfigmanager.h> -#include <vespa/searchcore/proton/server/documentdbconfigmanager.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/vespalib/util/closure.h> #include <vespa/searchcore/proton/common/schemautil.h> using namespace config; @@ -36,6 +34,7 @@ getConfig(int64_t generation, const Schema::SP &schema) generation, std::make_shared<vespa::config::search::RankProfilesConfig>(), std::make_shared<vespa::config::search::core::RankingConstantsConfig>(), + std::make_shared<matching::RankingConstants>(), std::make_shared<vespa::config::search::IndexschemaConfig>(), std::make_shared<vespa::config::search::AttributesConfig>(), std::make_shared<vespa::config::search::SummaryConfig>(), @@ -110,6 +109,7 @@ makeEmptyConfigSnapshot(void) 0, DocumentDBConfig::RankProfilesConfigSP(), DocumentDBConfig::RankingConstantsConfigSP(), + DocumentDBConfig::RankingConstants::SP(), DocumentDBConfig::IndexschemaConfigSP(), DocumentDBConfig::AttributesConfigSP(), DocumentDBConfig::SummaryConfigSP(), diff --git a/searchcore/src/tests/proton/server/memoryconfigstore_test.cpp b/searchcore/src/tests/proton/server/memoryconfigstore_test.cpp index f1cbd012ab5..1156da37aa1 100644 --- a/searchcore/src/tests/proton/server/memoryconfigstore_test.cpp +++ b/searchcore/src/tests/proton/server/memoryconfigstore_test.cpp @@ -25,6 +25,7 @@ getConfig(int64_t generation, const Schema::SP &schema) generation, DocumentDBConfig::RankProfilesConfigSP(), DocumentDBConfig::RankingConstantsConfigSP(), + DocumentDBConfig::RankingConstants::SP(), DocumentDBConfig::IndexschemaConfigSP(), DocumentDBConfig::AttributesConfigSP(), DocumentDBConfig::SummaryConfigSP(), |