- Use common tranport for TlsClient.

- Also refactor to simplify unit tests.

1 files changed, 7 insertions, 12 deletions

diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index 9a8d8bad60e..0f1b4412c4f 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -22,7 +22,6 @@
 #include <vespa/searchcore/proton/server/configstore.h>
 #include <vespa/document/util/feed_reject_helper.h>
 #include <vespa/searchcore/proton/server/ddbstate.h>
-#include <vespa/searchcore/proton/server/executorthreadingservice.h>
 #include <vespa/searchcore/proton/server/feedhandler.h>
 #include <vespa/searchcore/proton/server/i_feed_handler_owner.h>
 #include <vespa/searchcore/proton/server/ireplayconfig.h>
@@ -409,11 +408,9 @@ struct MyTlsWriter : TlsWriter {
 struct FeedHandlerFixture
 {
     DummyFileHeaderContext       _fileHeaderContext;
-    TransportMgr                 _transport;
+    TransportAndExecutorService  _service;
     TransLogServer               tls;
     vespalib::string             tlsSpec;
-    vespalib::ThreadStackExecutor sharedExecutor;
-    ExecutorThreadingService     writeService;
     SchemaContext                schema;
     MyOwner                      owner;
     MyResourceWriteFilter        writeFilter;
@@ -426,11 +423,9 @@ struct FeedHandlerFixture
     FeedHandler                  handler;
     FeedHandlerFixture()
         : _fileHeaderContext(),
-          _transport(),
-          tls(_transport.transport(), "mytls", 9016, "mytlsdir", _fileHeaderContext, DomainConfig().setPartSizeLimit(0x10000)),
+          _service(1),
+          tls(_service.transport(), "mytls", 9016, "mytlsdir", _fileHeaderContext, DomainConfig().setPartSizeLimit(0x10000)),
           tlsSpec("tcp/localhost:9016"),
-          sharedExecutor(1, 0x10000),
-          writeService(sharedExecutor),
           schema(),
           owner(),
           _state(),
@@ -438,7 +433,7 @@ struct FeedHandlerFixture
           feedView(schema.getRepo(), schema.getDocType()),
           _bucketDB(),
           _bucketDBHandler(_bucketDB),
-          handler(writeService, tlsSpec, schema.getDocType(), owner,
+          handler(_service.write(), tlsSpec, schema.getDocType(), owner,
                   writeFilter, replayConfig, tls, &tls_writer)
     {
         _state.enterLoadState();
@@ -449,15 +444,15 @@ struct FeedHandlerFixture
     }
 
     ~FeedHandlerFixture() {
-        writeService.shutdown();
+        _service.shutdown();
     }
     template <class FunctionType>
     inline void runAsMaster(FunctionType &&function) {
-        writeService.master().execute(makeLambdaTask(std::move(function)));
+        _service.write().master().execute(makeLambdaTask(std::move(function)));
         syncMaster();
     }
     void syncMaster() {
-        writeService.master().sync();
+        _service.write().master().sync();
     }
 };