1 files changed, 23 insertions, 21 deletions

diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
index 68b9d2f8d6e..d51ea25f2f5 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
@@ -13,11 +13,13 @@
 #include <vespa/searchcore/proton/server/bootstrapconfig.h>
 #include <vespa/searchcore/proton/server/fileconfigmanager.h>
 #include <vespa/searchcore/proton/test/documentdb_config_builder.h>
+#include <vespa/searchcore/proton/test/transport_helper.h>
 #include <vespa/searchsummary/config/config-juniperrc.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/config-bucketspaces.h>
 #include <vespa/vespalib/testkit/test_kit.h>
 
+
 using namespace cloud::config::filedistribution;
 using namespace config;
 using namespace document;
@@ -39,7 +41,7 @@ using vespalib::nbostream;
 vespalib::string myId("myconfigid");
 
 DocumentDBConfig::SP
-makeBaseConfigSnapshot()
+makeBaseConfigSnapshot(FNET_Transport & transport)
 {
     ::config::DirSpec spec(TEST_PATH("cfg"));
 
@@ -52,7 +54,7 @@ makeBaseConfigSnapshot()
                                                std::make_shared<BucketspacesConfig>(),
                                                std::make_shared<TuneFileDocumentDB>(), HwInfo());
     dbcm.forwardConfig(b);
-    dbcm.nextGeneration(0ms);
+    dbcm.nextGeneration(transport, 0ms);
     DocumentDBConfig::SP snap = dbcm.getConfig();
     snap->setConfigId(myId);
     ASSERT_TRUE(snap);
@@ -60,9 +62,9 @@ makeBaseConfigSnapshot()
 }
 
 void
-saveBaseConfigSnapshot(const DocumentDBConfig &snap, SerialNum num)
+saveBaseConfigSnapshot(FNET_Transport & transport, const DocumentDBConfig &snap, SerialNum num)
 {
-    FileConfigManager cm("out", myId, snap.getDocTypeName());
+    FileConfigManager cm(transport, "out", myId, snap.getDocTypeName());
     cm.saveConfig(snap, num);
 }
 
@@ -125,55 +127,55 @@ addConfigsThatAreNotSavedToDisk(const DocumentDBConfig &cfg)
     return builder.build();
 }
 
-TEST_F("requireThatConfigCanBeSavedAndLoaded", DocumentDBConfig::SP(makeBaseConfigSnapshot()))
+TEST_FF("requireThatConfigCanBeSavedAndLoaded", TransportMgr(), DocumentDBConfig::SP(makeBaseConfigSnapshot(f1.transport())))
 {
 
-    DocumentDBConfig::SP fullCfg = addConfigsThatAreNotSavedToDisk(*f);
-    saveBaseConfigSnapshot(*fullCfg, 20);
+    DocumentDBConfig::SP fullCfg = addConfigsThatAreNotSavedToDisk(*f2);
+    saveBaseConfigSnapshot(f1.transport(), *fullCfg, 20);
     DocumentDBConfig::SP esnap(makeEmptyConfigSnapshot());
     {
-        FileConfigManager cm("out", myId, "dummy");
+        FileConfigManager cm(f1.transport(), "out", myId, "dummy");
         cm.loadConfig(*esnap, 20, esnap);
     }
-    assertEqualSnapshot(*f, *esnap);
+    assertEqualSnapshot(*f2, *esnap);
 }
 
-TEST_F("requireThatConfigCanBeSerializedAndDeserialized", DocumentDBConfig::SP(makeBaseConfigSnapshot()))
+TEST_FF("requireThatConfigCanBeSerializedAndDeserialized", TransportMgr(), DocumentDBConfig::SP(makeBaseConfigSnapshot(f1.transport())))
 {
-    saveBaseConfigSnapshot(*f, 30);
+    saveBaseConfigSnapshot(f1.transport(), *f2, 30);
     nbostream stream;
     {
-        FileConfigManager cm("out", myId, "dummy");
+        FileConfigManager cm(f1.transport(), "out", myId, "dummy");
         cm.serializeConfig(30, stream);
     }
     {
-        FileConfigManager cm("out", myId, "dummy");
+        FileConfigManager cm(f1.transport(), "out", myId, "dummy");
         cm.deserializeConfig(40, stream);
     }
     DocumentDBConfig::SP fsnap(makeEmptyConfigSnapshot());
     {
-        FileConfigManager cm("out", myId, "dummy");
+        FileConfigManager cm(f1.transport(), "out", myId, "dummy");
         cm.loadConfig(*fsnap, 40, fsnap);
     }
-    assertEqualSnapshot(*f, *fsnap);
+    assertEqualSnapshot(*f2, *fsnap);
     EXPECT_EQUAL("dummy", fsnap->getDocTypeName());
 }
 
-TEST_F("requireThatConfigCanBeLoadedWithoutExtraConfigsDataFile", DocumentDBConfig::SP(makeBaseConfigSnapshot()))
+TEST_FF("requireThatConfigCanBeLoadedWithoutExtraConfigsDataFile", TransportMgr(), DocumentDBConfig::SP(makeBaseConfigSnapshot(f1.transport())))
 {
-    saveBaseConfigSnapshot(*f, 70);
+    saveBaseConfigSnapshot(f1.transport(), *f2, 70);
     EXPECT_FALSE(vespalib::unlink("out/config-70/extraconfigs.dat"));
     DocumentDBConfig::SP esnap(makeEmptyConfigSnapshot());
     {
-        FileConfigManager cm("out", myId, "dummy");
+        FileConfigManager cm(f1.transport(), "out", myId, "dummy");
         cm.loadConfig(*esnap, 70, esnap);
     }
 }
 
 
-TEST_F("requireThatVisibilityDelayIsPropagated", DocumentDBConfig::SP(makeBaseConfigSnapshot()))
+TEST_FF("requireThatVisibilityDelayIsPropagated", TransportMgr(), DocumentDBConfig::SP(makeBaseConfigSnapshot(f1.transport())))
 {
-    saveBaseConfigSnapshot(*f, 80);
+    saveBaseConfigSnapshot(f1.transport(), *f2, 80);
     DocumentDBConfig::SP esnap(makeEmptyConfigSnapshot());
     {
         ProtonConfigBuilder protonConfigBuilder;
@@ -182,7 +184,7 @@ TEST_F("requireThatVisibilityDelayIsPropagated", DocumentDBConfig::SP(makeBaseCo
         ddb.visibilitydelay = 61.0;
         protonConfigBuilder.documentdb.push_back(ddb);
         protonConfigBuilder.maxvisibilitydelay = 100.0;
-        FileConfigManager cm("out", myId, "dummy");
+        FileConfigManager cm(f1.transport(), "out", myId, "dummy");
         cm.setProtonConfig(std::make_shared<ProtonConfig>(protonConfigBuilder));
         cm.loadConfig(*esnap, 70, esnap);
     }