Rename search::index::EmptyDocBuilder to search::test::DocBuilder.

Rename search::index::StringFieldBuilder to search::test::StringFieldBuilder.

2 files changed, 4 insertions, 3 deletions

diff --git a/searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt b/searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt
index dea03cbf040..41b2037b6cb 100644
--- a/searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt
@@ -5,5 +5,6 @@ vespa_add_executable(searchcore_document_field_populator_test_app TEST
     DEPENDS
     searchcore_attribute
     searchcore_pcommon
+    searchlib_test
 )
 vespa_add_test(NAME searchcore_document_field_populator_test_app COMMAND searchcore_document_field_populator_test_app)
diff --git a/searchcore/src/tests/proton/attribute/document_field_populator/document_field_populator_test.cpp b/searchcore/src/tests/proton/attribute/document_field_populator/document_field_populator_test.cpp
index 055a38b9943..e831e8b2ac7 100644
--- a/searchcore/src/tests/proton/attribute/document_field_populator/document_field_populator_test.cpp
+++ b/searchcore/src/tests/proton/attribute/document_field_populator/document_field_populator_test.cpp
@@ -7,7 +7,7 @@
 #include <vespa/searchcore/proton/attribute/document_field_populator.h>
 #include <vespa/searchlib/attribute/attributefactory.h>
 #include <vespa/searchlib/attribute/integerbase.h>
-#include <vespa/searchlib/index/empty_doc_builder.h>
+#include <vespa/searchlib/test/doc_builder.h>
 #include <vespa/vespalib/util/stringfmt.h>
 
 #include <vespa/log/log.h>
@@ -16,14 +16,14 @@ LOG_SETUP("document_field_populator_test");
 using namespace document;
 using namespace proton;
 using namespace search;
-using namespace search::index;
+using search::test::DocBuilder;
 
 typedef search::attribute::Config AVConfig;
 typedef search::attribute::BasicType AVBasicType;
 
 struct DocContext
 {
-    EmptyDocBuilder _builder;
+    DocBuilder _builder;
     DocContext()
         : _builder([](auto& header) { header.addField("a1", DataType::T_INT); })
     {