Move constructor to cpp file.

3 files changed, 31 insertions, 28 deletions

diff --git a/searchlib/src/vespa/searchlib/test/features/CMakeLists.txt b/searchlib/src/vespa/searchlib/test/features/CMakeLists.txt
index 00b7073bf03..ba70fe57e88 100644
--- a/searchlib/src/vespa/searchlib/test/features/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/test/features/CMakeLists.txt
@@ -3,4 +3,5 @@ vespa_add_library(searchlib_searchlib_test_features
     SOURCES
     distance_closeness_fixture.cpp
     DEPENDS
+    searchlib
 )
diff --git a/searchlib/src/vespa/searchlib/test/features/distance_closeness_fixture.cpp b/searchlib/src/vespa/searchlib/test/features/distance_closeness_fixture.cpp
index 6ec81c8dbf0..76d40e14f48 100644
--- a/searchlib/src/vespa/searchlib/test/features/distance_closeness_fixture.cpp
+++ b/searchlib/src/vespa/searchlib/test/features/distance_closeness_fixture.cpp
@@ -6,5 +6,34 @@ namespace search::features::test {
 
 FeatureDumpFixture::~FeatureDumpFixture() = default;
 
+DistanceClosenessFixture::DistanceClosenessFixture(size_t fooCnt, size_t barCnt, const Labels &labels, const vespalib::string &featureName)
+    : queryEnv(&indexEnv), rankSetup(factory, indexEnv),
+      mdl(), match_data(), rankProgram(), fooHandles(), barHandles()
+{
+    for (size_t i = 0; i < fooCnt; ++i) {
+        uint32_t fieldId = indexEnv.getFieldByName("foo")->id();
+        fooHandles.push_back(mdl.allocTermField(fieldId));
+        SimpleTermData term;
+        term.setUniqueId(i + 1);
+        term.addField(fieldId).setHandle(fooHandles.back());
+        queryEnv.getTerms().push_back(term);
+    }
+    for (size_t i = 0; i < barCnt; ++i) {
+        uint32_t fieldId = indexEnv.getFieldByName("bar")->id();
+        barHandles.push_back(mdl.allocTermField(fieldId));
+        SimpleTermData term;
+        term.setUniqueId(fooCnt + i + 1);
+        term.addField(fieldId).setHandle(barHandles.back());
+        queryEnv.getTerms().push_back(term);
+    }
+    labels.inject(queryEnv.getProperties());
+    rankSetup.setFirstPhaseRank(featureName);
+    rankSetup.setIgnoreDefaultRankFeatures(true);
+    ASSERT_TRUE(rankSetup.compile());
+    match_data = mdl.createMatchData();
+    rankProgram = rankSetup.create_first_phase_program();
+    rankProgram->setup(*match_data, queryEnv);
+}
+
 }
 
diff --git a/searchlib/src/vespa/searchlib/test/features/distance_closeness_fixture.h b/searchlib/src/vespa/searchlib/test/features/distance_closeness_fixture.h
index 6063c22763b..cdb1379659e 100644
--- a/searchlib/src/vespa/searchlib/test/features/distance_closeness_fixture.h
+++ b/searchlib/src/vespa/searchlib/test/features/distance_closeness_fixture.h
@@ -55,34 +55,7 @@ struct DistanceClosenessFixture : BlueprintFactoryFixture, IndexEnvironmentFixtu
     RankProgram::UP          rankProgram;
     std::vector<TermFieldHandle> fooHandles;
     std::vector<TermFieldHandle> barHandles;
-    DistanceClosenessFixture(size_t fooCnt, size_t barCnt, const Labels &labels, const vespalib::string &featureName)
-        : queryEnv(&indexEnv), rankSetup(factory, indexEnv),
-          mdl(), match_data(), rankProgram(), fooHandles(), barHandles()
-    {
-        for (size_t i = 0; i < fooCnt; ++i) {
-            uint32_t fieldId = indexEnv.getFieldByName("foo")->id();
-            fooHandles.push_back(mdl.allocTermField(fieldId));
-            SimpleTermData term;
-            term.setUniqueId(i + 1);
-            term.addField(fieldId).setHandle(fooHandles.back());
-            queryEnv.getTerms().push_back(term);
-        }
-        for (size_t i = 0; i < barCnt; ++i) {
-            uint32_t fieldId = indexEnv.getFieldByName("bar")->id();
-            barHandles.push_back(mdl.allocTermField(fieldId));
-            SimpleTermData term;
-            term.setUniqueId(fooCnt + i + 1);
-            term.addField(fieldId).setHandle(barHandles.back());
-            queryEnv.getTerms().push_back(term);
-        }
-        labels.inject(queryEnv.getProperties());
-        rankSetup.setFirstPhaseRank(featureName);
-        rankSetup.setIgnoreDefaultRankFeatures(true);
-        ASSERT_TRUE(rankSetup.compile());
-        match_data = mdl.createMatchData();
-        rankProgram = rankSetup.create_first_phase_program();
-        rankProgram->setup(*match_data, queryEnv);
-    }
+    DistanceClosenessFixture(size_t fooCnt, size_t barCnt, const Labels &labels, const vespalib::string &featureName);
     feature_t getScore(uint32_t docId) {
         return Utils::getScoreFeature(*rankProgram, docId);
     }