Follow renaming

1 files changed, 20 insertions, 16 deletions

diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
index 02d0bb5c056..8ccf4f792c5 100644
--- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
@@ -241,13 +241,13 @@ struct FixtureBase {
     }
 
     template <typename FunctionType>
-    void runInMaster(FunctionType func) {
+    void runInMasterAndSync(FunctionType func) {
         test::runInMasterAndSync(writeService, func);
     }
 
     void force_commit() {
         vespalib::Gate gate;
-        runInMaster([this, &gate] () {
+        runInMasterAndSync([this, &gate]() {
             feedview->forceCommit(search::CommitParam(serial_num), std::make_shared<vespalib::GateCallback>(gate));
         });
         gate.await();
@@ -285,7 +285,7 @@ TEST_F("require that prepareMove sets target db document id", Fixture)
 {
     Document::SP doc(new Document);
     MoveOperation op(BucketId(20, 42), Timestamp(10), doc, 1, subdb_id + 1);
-    f.runInMaster([&] () { f.feedview->prepareMove(op); });
+    f.runInMasterAndSync([&]() { f.feedview->prepareMove(op); });
 
     DbDocumentId targetId = op.getDbDocumentId();
     EXPECT_EQUAL(subdb_id, targetId.getSubDbId());
@@ -313,8 +313,8 @@ TEST_F("require that handleMove() adds document to target and removes it from so
     { // move from (subdb_id + 1) -> this (subdb_id)
         MoveOperation::UP op = makeMoveOp(DbDocumentId(subdb_id + 1, 1), subdb_id);
         TEST_DO(f.assertPutCount(0));
-        f.runInMaster([&]() { f.feedview->prepareMove(*op); });
-        f.runInMaster([&]() { f.feedview->handleMove(*op, f.beginMoveOp()); });
+        f.runInMasterAndSync([&]() { f.feedview->prepareMove(*op); });
+        f.runInMasterAndSync([&]() { f.feedview->handleMove(*op, f.beginMoveOp()); });
         TEST_DO(f.assertPutCount(1));
         TEST_DO(f.assertAndClearMoveOp());
         lid = op->getDbDocumentId().getLid();
@@ -326,7 +326,7 @@ TEST_F("require that handleMove() adds document to target and removes it from so
         MoveOperation::UP op = makeMoveOp(DbDocumentId(subdb_id, 1), subdb_id + 1);
         op->setDbDocumentId(DbDocumentId(subdb_id + 1, 1));
         TEST_DO(f.assertRemoveCount(0));
-        f.runInMaster([&]() { f.feedview->handleMove(*op, f.beginMoveOp()); });
+        f.runInMasterAndSync([&]() { f.feedview->handleMove(*op, f.beginMoveOp()); });
         EXPECT_FALSE(f.metaStore->validLid(lid));
         TEST_DO(f.assertRemoveCount(1));
         TEST_DO(f.assertAndClearMoveOp());
@@ -338,19 +338,23 @@ TEST_F("require that handleMove() handles move within same subdb and propagates
     Document::SP doc(new Document);
     DocumentId doc1id("id:test:foo:g=foo:1");
     uint32_t docSize = 1;
-    f.runInMaster([&] () { f.metaStore->put(doc1id.getGlobalId(),
-                      doc1id.getGlobalId().convertToBucketId(),
-                      Timestamp(9), docSize, 1, 0u); });
-    f.runInMaster([&] () { f.metaStore->put(doc->getId().getGlobalId(),
-                      doc->getId().getGlobalId().convertToBucketId(),
-                      Timestamp(10), docSize, 2, 0u); });
-    f.runInMaster([&] () { f.metaStore->remove(1, 0u); });
+    f.runInMasterAndSync([&]() {
+        f.metaStore->put(doc1id.getGlobalId(),
+                         doc1id.getGlobalId().convertToBucketId(),
+                         Timestamp(9), docSize, 1, 0u);
+    });
+    f.runInMasterAndSync([&]() {
+        f.metaStore->put(doc->getId().getGlobalId(),
+                         doc->getId().getGlobalId().convertToBucketId(),
+                         Timestamp(10), docSize, 2, 0u);
+    });
+    f.runInMasterAndSync([&]() { f.metaStore->remove(1, 0u); });
     f.metaStore->removes_complete({ 1 });
     MoveOperation::UP op = makeMoveOp(doc, DbDocumentId(subdb_id, 2), subdb_id);
     op->setTargetLid(1);
     TEST_DO(f.assertPutCount(0));
     TEST_DO(f.assertRemoveCount(0));
-    f.runInMaster([&] () { f.feedview->handleMove(*op, f.beginMoveOp()); });
+    f.runInMasterAndSync([&]() { f.feedview->handleMove(*op, f.beginMoveOp()); });
     TEST_DO(f.assertPutCount(1));
     TEST_DO(f.assertRemoveCount(1));
     TEST_DO(f.assertAndClearMoveOp());
@@ -370,7 +374,7 @@ TEST_F("require that prune removed documents removes documents",
     PruneRemovedDocumentsOperation op(lids->getDocIdLimit(), subdb_id);
     op.setLidsToRemove(lids);
     op.setSerialNum(1);  // allows use of meta store.
-    f.runInMaster([&] () { f.feedview->handlePruneRemovedDocuments(op); });
+    f.runInMasterAndSync([&]() { f.feedview->handlePruneRemovedDocuments(op); });
 
     EXPECT_EQUAL(2, f.removeCount);
     EXPECT_FALSE(f.metaStore->validLid(1));
@@ -386,7 +390,7 @@ TEST_F("require that heartbeat propagates and commits meta store", Fixture)
     EXPECT_EQUAL(0, f.feedview->heartBeatIndexedFieldsCount);
     EXPECT_EQUAL(0, f.feedview->heartBeatAttributesCount);
     EXPECT_EQUAL(0, f.heartbeatCount);
-    f.runInMaster([&] () { f.feedview->heartBeat(2); });
+    f.runInMasterAndSync([&]() { f.feedview->heartBeat(2); });
     EXPECT_EQUAL(2u, f.metaStore->getStatus().getLastSyncToken());
     EXPECT_EQUAL(1, f.feedview->heartBeatIndexedFieldsCount);
     EXPECT_EQUAL(1, f.feedview->heartBeatAttributesCount);