Move DirectoryHandler from searchcore to searchlib.

12 files changed, 80 insertions, 108 deletions

diff --git a/searchcore/src/tests/proton/attribute/attribute_directory/attribute_directory_test.cpp b/searchcore/src/tests/proton/attribute/attribute_directory/attribute_directory_test.cpp
index 9d1ab5e3fef..471fcc5c7e1 100644
--- a/searchcore/src/tests/proton/attribute/attribute_directory/attribute_directory_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_directory/attribute_directory_test.cpp
@@ -1,16 +1,19 @@
 // Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/vespalib/testkit/testapp.h>
+
 #include <vespa/searchcore/proton/attribute/attribute_directory.h>
 #include <vespa/searchcore/proton/attribute/attributedisklayout.h>
-#include <vespa/searchcore/proton/test/directory_handler.h>
-#include <vespa/vespalib/stllike/string.h>
-#include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/io/fileutil.h>
+#include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/vespalib/stllike/string.h>
+#include <vespa/vespalib/testkit/testapp.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP("attribute_directory_test");
 
 using search::IndexMetaInfo;
 using search::SerialNum;
+using search::test::DirectoryHandler;
 
 namespace proton {
 
@@ -44,13 +47,13 @@ bool hasWriter(const std::unique_ptr<AttributeDirectory::Writer> &writer) {
 
 }
 
-struct Fixture : public test::DirectoryHandler
+struct Fixture : public DirectoryHandler
 {
 
     std::shared_ptr<AttributeDiskLayout> _diskLayout;
 
     Fixture()
-        : test::DirectoryHandler("attributes"),
+        : DirectoryHandler("attributes"),
           _diskLayout(AttributeDiskLayout::create("attributes"))
     {
     }
diff --git a/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp b/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp
index f5eb55f2abc..74320164965 100644
--- a/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp
@@ -1,19 +1,20 @@
 // Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/vespalib/stllike/string.h>
-#include <vespa/searchcore/proton/test/directory_handler.h>
-#include <vespa/searchlib/attribute/attributefactory.h>
-#include <vespa/searchcore/proton/test/attribute_utils.h>
-#include <vespa/searchcore/proton/attribute/attributedisklayout.h>
 #include <vespa/searchcore/proton/attribute/attribute_directory.h>
 #include <vespa/searchcore/proton/attribute/attribute_factory.h>
 #include <vespa/searchcore/proton/attribute/attribute_initializer.h>
+#include <vespa/searchcore/proton/attribute/attributedisklayout.h>
+#include <vespa/searchcore/proton/test/attribute_utils.h>
+#include <vespa/searchlib/attribute/attributefactory.h>
+#include <vespa/searchlib/test/directory_handler.h>
+#include <vespa/vespalib/stllike/string.h>
 
 using search::attribute::Config;
 using search::attribute::BasicType;
 using search::attribute::CollectionType;
 using search::SerialNum;
+using search::test::DirectoryHandler;
 
 const vespalib::string test_dir = "test_output";
 
@@ -69,7 +70,7 @@ saveAttr(const vespalib::string &name, const Config &cfg, SerialNum serialNum, S
 
 struct Fixture
 {
-    test::DirectoryHandler _dirHandler;
+    DirectoryHandler _dirHandler;
     std::shared_ptr<AttributeDiskLayout> _diskLayout;
     AttributeFactory       _factory;
     Fixture();
diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
index 6bf9544b3ea..e4a7ffe7f95 100644
--- a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
@@ -6,6 +6,7 @@ LOG_SETUP("attribute_manager_test");
 #include <vespa/config-attributes.h>
 #include <vespa/fastos/file.h>
 #include <vespa/searchcommon/attribute/attributecontent.h>
+#include <vespa/searchcommon/attribute/iattributevector.h>
 #include <vespa/searchcore/proton/attribute/attribute_collection_spec_factory.h>
 #include <vespa/searchcore/proton/attribute/attribute_manager_initializer.h>
 #include <vespa/searchcore/proton/attribute/attribute_writer.h>
@@ -19,24 +20,23 @@ LOG_SETUP("attribute_manager_test");
 #include <vespa/searchcore/proton/initializer/task_runner.h>
 #include <vespa/searchcore/proton/test/attribute_utils.h>
 #include <vespa/searchcore/proton/test/attribute_vectors.h>
-#include <vespa/searchcore/proton/test/directory_handler.h>
 #include <vespa/searchlib/attribute/attributefactory.h>
 #include <vespa/searchlib/attribute/attributevector.hpp>
 #include <vespa/searchlib/attribute/imported_attribute_vector.h>
 #include <vespa/searchlib/attribute/integerbase.h>
 #include <vespa/searchlib/attribute/predicate_attribute.h>
 #include <vespa/searchlib/attribute/reference_attribute.h>
+#include <vespa/searchlib/attribute/reference_attribute.h>
 #include <vespa/searchlib/attribute/singlenumericattribute.hpp>
 #include <vespa/searchlib/common/foregroundtaskexecutor.h>
 #include <vespa/searchlib/common/indexmetainfo.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/predicate/predicate_index.h>
 #include <vespa/searchlib/predicate/predicate_tree_annotator.h>
+#include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/searchlib/util/filekit.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
-#include <vespa/searchlib/attribute/reference_attribute.h>
-#include <vespa/searchcommon/attribute/iattributevector.h>
 
 namespace vespa { namespace config { namespace search {}}}
 
@@ -60,6 +60,7 @@ using search::attribute::ReferenceAttribute;
 using search::index::DummyFileHeaderContext;
 using search::predicate::PredicateIndex;
 using search::predicate::PredicateTreeAnnotations;
+using search::test::DirectoryHandler;
 using vespa::config::search::AttributesConfig;
 using vespa::config::search::AttributesConfigBuilder;
 using vespalib::eval::ValueType;
@@ -103,13 +104,13 @@ const AVConfig INT32_ARRAY = AttributeUtils::getInt32ArrayConfig();
 void
 fillAttribute(const AttributeVector::SP &attr, uint32_t numDocs, int64_t value, uint64_t lastSyncToken)
 {
-    test::AttributeUtils::fillAttribute(attr, numDocs, value, lastSyncToken);
+    AttributeUtils::fillAttribute(attr, numDocs, value, lastSyncToken);
 }
 
 void
 fillAttribute(const AttributeVector::SP &attr, uint32_t from, uint32_t to, int64_t value, uint64_t lastSyncToken)
 {
-    test::AttributeUtils::fillAttribute(attr, from, to, value, lastSyncToken);
+    AttributeUtils::fillAttribute(attr, from, to, value, lastSyncToken);
 }
 
 search::SerialNum getCreateSerialNum(const AttributeGuard::UP &guard)
@@ -141,7 +142,7 @@ struct ImportedAttributesRepoBuilder {
 
 struct BaseFixture
 {
-    test::DirectoryHandler _dirHandler;
+    DirectoryHandler _dirHandler;
     DummyFileHeaderContext _fileHeaderContext;
     ForegroundTaskExecutor _attributeFieldWriter;
     HwInfo                 _hwInfo;
diff --git a/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp b/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp
index 41ff853047d..0e1dca44f4a 100644
--- a/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp
@@ -5,22 +5,25 @@ LOG_SETUP("attribute_populator_test");
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <vespa/searchcommon/common/schema.h>
-#include <vespa/searchcore/proton/attribute/attributemanager.h>
 #include <vespa/searchcore/proton/attribute/attribute_populator.h>
+#include <vespa/searchcore/proton/attribute/attributemanager.h>
+#include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/test/test.h>
+#include <vespa/searchlib/common/foregroundtaskexecutor.h>
 #include <vespa/searchlib/index/docbuilder.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
+#include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/util/stringfmt.h>
-#include <vespa/searchcore/proton/common/hw_info.h>
-#include <vespa/searchlib/common/foregroundtaskexecutor.h>
 
 using namespace document;
 using namespace proton;
 using namespace search;
 using namespace search::index;
 
-typedef search::attribute::Config AVConfig;
-typedef search::attribute::BasicType AVBasicType;
+using search::test::DirectoryHandler;
+
+using AVBasicType = search::attribute::BasicType;
+using AVConfig = search::attribute::Config;
 
 const vespalib::string TEST_DIR = "testdir";
 const uint64_t CREATE_SERIAL_NUM = 8u;
@@ -53,7 +56,7 @@ struct DocContext
 
 struct Fixture
 {
-    test::DirectoryHandler _testDir;
+    DirectoryHandler _testDir;
     DummyFileHeaderContext _fileHeader;
     ForegroundTaskExecutor _attributeFieldWriter;
     HwInfo                 _hwInfo;
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp
index 173d8dd2a2a..880e5330f25 100644
--- a/searchcore/src/tests/proton/attribute/attribute_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp
@@ -32,7 +32,7 @@ LOG_SETUP("attribute_test");
 #include <vespa/searchlib/predicate/predicate_hash.h>
 #include <vespa/searchlib/common/foregroundtaskexecutor.h>
 #include <vespa/searchlib/common/sequencedtaskexecutorobserver.h>
-#include <vespa/searchcore/proton/test/directory_handler.h>
+#include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/eval/tensor/tensor.h>
 #include <vespa/eval/tensor/types.h>
 #include <vespa/eval/tensor/default_tensor.h>
@@ -50,12 +50,14 @@ using namespace search::index;
 using namespace search;
 using namespace vespa::config::search;
 
+using proton::test::AttributeUtils;
 using search::TuneFileAttributes;
 using search::index::DummyFileHeaderContext;
 using search::index::schema::CollectionType;
 using search::predicate::PredicateHash;
 using search::predicate::PredicateIndex;
 using search::tensor::TensorAttribute;
+using search::test::DirectoryHandler;
 using std::string;
 using vespalib::eval::ValueType;
 using vespalib::tensor::Tensor;
@@ -88,13 +90,13 @@ const AVConfig INT32_ARRAY = unregister(AVConfig(AVBasicType::INT32, AVCollectio
 void
 fillAttribute(const AttributeVector::SP &attr, uint32_t numDocs, int64_t value, uint64_t lastSyncToken)
 {
-    test::AttributeUtils::fillAttribute(attr, numDocs, value, lastSyncToken);
+    AttributeUtils::fillAttribute(attr, numDocs, value, lastSyncToken);
 }
 
 void
 fillAttribute(const AttributeVector::SP &attr, uint32_t from, uint32_t to, int64_t value, uint64_t lastSyncToken)
 {
-    test::AttributeUtils::fillAttribute(attr, from, to, value, lastSyncToken);
+    AttributeUtils::fillAttribute(attr, from, to, value, lastSyncToken);
 }
 
 const std::shared_ptr<IDestructorCallback> emptyCallback;
@@ -102,7 +104,7 @@ const std::shared_ptr<IDestructorCallback> emptyCallback;
 
 struct Fixture
 {
-    test::DirectoryHandler _dirHandler;
+    DirectoryHandler _dirHandler;
     DummyFileHeaderContext   _fileHeaderContext;
     ForegroundTaskExecutor   _attributeFieldWriterReal;
     SequencedTaskExecutorObserver _attributeFieldWriter;
@@ -518,7 +520,7 @@ const FilterAttributeManager::AttributeSet ACCEPTED_ATTRIBUTES = {"a2"};
 
 struct FilterFixture
 {
-    test::DirectoryHandler _dirHandler;
+    DirectoryHandler _dirHandler;
     DummyFileHeaderContext _fileHeaderContext;
     ForegroundTaskExecutor _attributeFieldWriter;
     HwInfo                 _hwInfo;
diff --git a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
index 5375f7817ec..09174441342 100644
--- a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
@@ -1,19 +1,19 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/vespalib/util/threadstackexecutor.h>
-#include <vespa/searchcore/proton/attribute/attributemanager.h>
-#include <vespa/searchcore/proton/attribute/attributedisklayout.h>
+#include <vespa/fastos/file.h>
 #include <vespa/searchcore/proton/attribute/attribute_writer.h>
+#include <vespa/searchcore/proton/attribute/attributedisklayout.h>
+#include <vespa/searchcore/proton/attribute/attributemanager.h>
 #include <vespa/searchcore/proton/attribute/flushableattribute.h>
 #include <vespa/searchlib/attribute/attributefactory.h>
 #include <vespa/searchlib/attribute/integerbase.h>
+#include <vespa/searchlib/common/foregroundtaskexecutor.h>
 #include <vespa/searchlib/common/indexmetainfo.h>
-#include <vespa/vespalib/io/fileutil.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
-#include <vespa/searchlib/common/foregroundtaskexecutor.h>
-#include <vespa/searchcore/proton/test/directory_handler.h>
-#include <vespa/fastos/file.h>
+#include <vespa/searchlib/test/directory_handler.h>
+#include <vespa/vespalib/io/fileutil.h>
+#include <vespa/vespalib/util/threadstackexecutor.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("attributeflush_test");
diff --git a/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp b/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp
index 49def82ec59..66d7037c82d 100644
--- a/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp
@@ -6,19 +6,20 @@ LOG_SETUP("attributes_state_explorer_test");
 
 #include <vespa/searchcore/proton/attribute/attribute_manager_explorer.h>
 #include <vespa/searchcore/proton/attribute/attributemanager.h>
+#include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/test/attribute_vectors.h>
-#include <vespa/searchcore/proton/test/directory_handler.h>
-#include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/common/foregroundtaskexecutor.h>
+#include <vespa/searchlib/index/dummyfileheadercontext.h>
+#include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/test/insertion_operators.h>
-#include <vespa/searchcore/proton/common/hw_info.h>
 
 using namespace proton;
 using namespace proton::test;
-using search::index::DummyFileHeaderContext;
 using search::AttributeVector;
-using search::TuneFileAttributes;
 using search::ForegroundTaskExecutor;
+using search::TuneFileAttributes;
+using search::index::DummyFileHeaderContext;
+using search::test::DirectoryHandler;
 
 const vespalib::string TEST_DIR = "test_output";
 
diff --git a/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp b/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
index e9ea623d554..7d4622a854a 100644
--- a/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
+++ b/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
@@ -1,13 +1,14 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
 
-#include <vespa/searchcore/proton/common/hw_info_sampler.h>
+#include <vespa/config/print/fileconfigwriter.h>
 #include <vespa/searchcore/config/config-hwinfo.h>
-#include <vespa/searchcore/proton/test/directory_handler.h>
+#include <vespa/searchcore/proton/common/hw_info_sampler.h>
+#include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/config/print/fileconfigwriter.h>
 
 using proton::HwInfoSampler;
+using search::test::DirectoryHandler;
 using vespa::config::search::core::HwinfoConfig;
 using vespa::config::search::core::HwinfoConfigBuilder;
 
@@ -28,7 +29,7 @@ long time_point_to_long(Clock::time_point tp)
 
 struct Fixture
 {
-    proton::test::DirectoryHandler _dirHandler;
+    DirectoryHandler _dirHandler;
 
     Fixture()
         : _dirHandler(test_dir)
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
index abfd80c9582..398cd1caab8 100644
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
@@ -16,14 +16,15 @@
 #include <vespa/searchcore/proton/server/document_subdb_explorer.h>
 #include <vespa/searchcore/proton/server/emptysearchview.h>
 #include <vespa/searchcore/proton/server/fast_access_document_retriever.h>
+#include <vespa/searchcore/proton/server/i_document_subdb_owner.h>
 #include <vespa/searchcore/proton/server/minimal_document_retriever.h>
 #include <vespa/searchcore/proton/server/searchabledocsubdb.h>
-#include <vespa/searchcore/proton/server/i_document_subdb_owner.h>
 #include <vespa/searchcore/proton/test/test.h>
 #include <vespa/searchcore/proton/test/thread_utils.h>
 #include <vespa/searchcorespi/plugin/iindexmanagerfactory.h>
-#include <vespa/searchlib/index/docbuilder.h>
 #include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/searchlib/index/docbuilder.h>
+#include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/test/insertion_operators.h>
 #include <vespa/vespalib/testkit/test_kit.h>
@@ -40,10 +41,11 @@ using namespace search::transactionlog;
 using namespace cloud::config::filedistribution;
 using namespace searchcorespi;
 using namespace vespalib;
+
 using proton::bucketdb::BucketDBHandler;
 using proton::bucketdb::IBucketDBHandler;
 using proton::bucketdb::IBucketDBHandlerInitializer;
-
+using search::test::DirectoryHandler;
 using searchcorespi::IFlushTarget;
 using searchcorespi::index::IThreadingService;
 using storage::spi::Timestamp;
@@ -295,7 +297,7 @@ struct FixtureBase
 	typename Traits::Context _ctx;
 	typename Traits::Schema _baseSchema;
 	MyConfigSnapshot::UP _snapshot;
-	test::DirectoryHandler _baseDir;
+	DirectoryHandler _baseDir;
 	typename Traits::SubDB _subDb;
 	IFeedView::SP _tmpFeedView;
 	FixtureBase()
@@ -321,7 +323,7 @@ struct FixtureBase
 	}
     template <typename FunctionType>
     void runInMaster(FunctionType func) {
-        test::runInMaster(_writeService, func);
+        proton::test::runInMaster(_writeService, func);
     }
 	void init() {
                 DocumentSubDbInitializer::SP task =
@@ -737,7 +739,7 @@ struct DocumentHandler
                 startAttributeField("attr2").addInt(attr2Value).endField().endDocument();
     }
     PutOperation createPut(Document::UP doc, Timestamp timestamp, SerialNum serialNum) {
-        test::Document testDoc(Document::SP(doc.release()), 0, timestamp);
+        proton::test::Document testDoc(Document::SP(doc.release()), 0, timestamp);
         PutOperation op(testDoc.getBucket(), testDoc.getTimestamp(), testDoc.getDoc());
         op.setSerialNum(serialNum);
         return op;
@@ -747,7 +749,7 @@ struct DocumentHandler
                              uint32_t targetSubDbId,
                              SerialNum serialNum)
     {
-        test::Document testDoc(Document::SP(doc.release()), 0, timestamp);
+        proton::test::Document testDoc(Document::SP(doc.release()), 0, timestamp);
         MoveOperation op(testDoc.getBucket(), testDoc.getTimestamp(), testDoc.getDoc(), sourceDbdId, targetSubDbId);
         op.setSerialNum(serialNum);
         return op;
diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp
index 73dfae75d7b..bd2b5d145d7 100644
--- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp
+++ b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp
@@ -3,29 +3,32 @@
 #include <vespa/log/log.h>
 LOG_SETUP("attribute_reprocessing_initializer_test");
 
+#include <vespa/searchcore/proton/attribute/attribute_directory.h>
 #include <vespa/searchcore/proton/attribute/attribute_populator.h>
-#include <vespa/searchcore/proton/attribute/attributemanager.h>
 #include <vespa/searchcore/proton/attribute/attributedisklayout.h>
-#include <vespa/searchcore/proton/attribute/attribute_directory.h>
+#include <vespa/searchcore/proton/attribute/attributemanager.h>
 #include <vespa/searchcore/proton/attribute/document_field_populator.h>
+#include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/common/i_indexschema_inspector.h>
 #include <vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.h>
 #include <vespa/searchcore/proton/reprocessing/i_reprocessing_handler.h>
 #include <vespa/searchcore/proton/test/attribute_utils.h>
-#include <vespa/searchcore/proton/test/directory_handler.h>
-#include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/attribute/attributefactory.h>
+#include <vespa/searchlib/common/foregroundtaskexecutor.h>
+#include <vespa/searchlib/index/dummyfileheadercontext.h>
+#include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/test/insertion_operators.h>
 #include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/searchcore/proton/common/hw_info.h>
-#include <vespa/searchlib/common/foregroundtaskexecutor.h>
 
 using namespace proton;
 using namespace search;
 using namespace search::index;
-using search::attribute::Config;
+
+using proton::test::AttributeUtils;
 using search::attribute::BasicType;
+using search::attribute::Config;
 using search::index::schema::DataType;
+using search::test::DirectoryHandler;
 
 const vespalib::string TEST_DIR = "test_output";
 const SerialNum INIT_SERIAL_NUM = 10;
@@ -64,13 +67,13 @@ struct MyConfig
     void addAttrs(const StringVector &attrs) {
         for (auto attr : attrs) {
             if (attr == "tensor") {
-                _mgr->addAttribute({attr, test::AttributeUtils::getTensorConfig()}, 1);
+                _mgr->addAttribute({attr, AttributeUtils::getTensorConfig()}, 1);
                 _schema.addAttributeField(Schema::AttributeField(attr, DataType::TENSOR));
             } else if (attr == "predicate") {
-                _mgr->addAttribute({attr, test::AttributeUtils::getPredicateConfig()}, 1);
+                _mgr->addAttribute({attr, AttributeUtils::getPredicateConfig()}, 1);
                 _schema.addAttributeField(Schema::AttributeField(attr, DataType::BOOLEANTREE));
             } else {
-                _mgr->addAttribute({attr, test::AttributeUtils::getStringConfig()}, 1);
+                _mgr->addAttribute({attr, AttributeUtils::getStringConfig()}, 1);
                 _schema.addAttributeField(Schema::AttributeField(attr, DataType::STRING));
             }
         }
@@ -125,7 +128,7 @@ struct MyIndexschemaInspector : public IIndexschemaInspector
 
 struct Fixture
 {
-    test::DirectoryHandler _dirHandler;
+    DirectoryHandler _dirHandler;
     DummyFileHeaderContext _fileHeaderContext;
     ForegroundTaskExecutor _attributeFieldWriter;
     HwInfo _hwInfo;
diff --git a/searchcore/src/vespa/searchcore/proton/test/directory_handler.h b/searchcore/src/vespa/searchcore/proton/test/directory_handler.h
deleted file mode 100644
index 11d41e99809..00000000000
--- a/searchcore/src/vespa/searchcore/proton/test/directory_handler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#pragma once
-
-#include <vespa/vespalib/io/fileutil.h>
-#include <vespa/vespalib/stllike/string.h>
-
-namespace proton {
-namespace test {
-
-class DirectoryHandler
-{
-private:
-    vespalib::string _mkdir;
-    vespalib::string _rmdir;
-    bool             _cleanup;
-
-public:
-    DirectoryHandler(const vespalib::string &mkdir)
-        : _mkdir(mkdir),
-          _rmdir(mkdir),
-          _cleanup(true)
-    {
-        vespalib::mkdir(_mkdir);
-    }
-    DirectoryHandler(const vespalib::string &mkdir,
-                     const vespalib::string &rmdir)
-        : _mkdir(mkdir),
-          _rmdir(rmdir),
-          _cleanup(true)
-    {
-        vespalib::mkdir(_mkdir);
-    }
-    ~DirectoryHandler() {
-        if (_cleanup) {
-            vespalib::rmdir(_rmdir, true);
-        }
-    }
-    void cleanup(bool v) { _cleanup = v; }
-};
-
-}
-}
-
diff --git a/searchcore/src/vespa/searchcore/proton/test/test.h b/searchcore/src/vespa/searchcore/proton/test/test.h
index 9aa02f74ace..1c0cd8f7516 100644
--- a/searchcore/src/vespa/searchcore/proton/test/test.h
+++ b/searchcore/src/vespa/searchcore/proton/test/test.h
@@ -9,7 +9,6 @@
 #include "dummy_document_sub_db.h"
 #include "dummy_feed_view.h"
 #include "dummy_summary_manager.h"
-#include "directory_handler.h"
 #include "resulthandler.h"
 #include "userdocuments.h"
 #include "userdocumentsbuilder.h"