aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests
diff options
context:
space:
mode:
authorGeir Storli <geirst@oath.com>2017-09-05 14:30:47 +0000
committerGeir Storli <geirst@oath.com>2017-09-06 15:45:25 +0000
commit2b98bb212c745205d37666b3fdb9ad18243cb8fd (patch)
treec0551ed78c00a65a75fa24c2627efb84065a4111 /searchcore/src/tests
parente65e07a491c8ac14d2a951158b9d446339b1ad49 (diff)
Rename IAttributeWriter::commit() -> forceCommit().
Diffstat (limited to 'searchcore/src/tests')
-rw-r--r--searchcore/src/tests/proton/attribute/attribute_test.cpp8
-rw-r--r--searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp
index e6052c02ee6..ad80f99a6aa 100644
--- a/searchcore/src/tests/proton/attribute/attribute_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp
@@ -152,7 +152,7 @@ struct Fixture
_aw->remove(serialNum, lid, immediateCommit, emptyCallback);
}
void commit(SerialNum serialNum) {
- _aw->commit(serialNum, emptyCallback);
+ _aw->forceCommit(serialNum, emptyCallback);
}
void assertExecuteHistory(std::vector<uint32_t> expExecuteHistory) {
EXPECT_EQUAL(expExecuteHistory, _attributeFieldWriter.getExecuteHistory());
@@ -345,14 +345,14 @@ TEST_F("require that visibilitydelay is honoured", Fixture)
awDelayed.put(5, *doc, 4, false, emptyCallback);
EXPECT_EQUAL(5u, a1->getNumDocs());
EXPECT_EQUAL(3u, a1->getStatus().getLastSyncToken());
- awDelayed.commit(6, emptyCallback);
+ awDelayed.forceCommit(6, emptyCallback);
EXPECT_EQUAL(6u, a1->getStatus().getLastSyncToken());
AttributeWriter awDelayedShort(f._m);
awDelayedShort.put(7, *doc, 2, false, emptyCallback);
EXPECT_EQUAL(6u, a1->getStatus().getLastSyncToken());
awDelayedShort.put(8, *doc, 2, false, emptyCallback);
- awDelayedShort.commit(8, emptyCallback);
+ awDelayedShort.forceCommit(8, emptyCallback);
EXPECT_EQUAL(8u, a1->getStatus().getLastSyncToken());
verifyAttributeContent(*a1, 2, "10");
@@ -364,7 +364,7 @@ TEST_F("require that visibilitydelay is honoured", Fixture)
2, false, emptyCallback);
EXPECT_EQUAL(8u, a1->getStatus().getLastSyncToken());
verifyAttributeContent(*a1, 2, "10");
- awDelayed.commit(12, emptyCallback);
+ awDelayed.forceCommit(12, emptyCallback);
EXPECT_EQUAL(12u, a1->getStatus().getLastSyncToken());
verifyAttributeContent(*a1, 2, "30");
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index 8af365d6327..c02aa033bb9 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -385,7 +385,7 @@ struct MyAttributeWriter : public IAttributeWriter
virtual const proton::IAttributeManager::SP &getAttributeManager() const override {
return _mgr;
}
- void commit(SerialNum serialNum, OnWriteDoneType) override {
+ void forceCommit(SerialNum serialNum, OnWriteDoneType) override {
(void) serialNum; ++_commitCount;
_tracer.traceCommit(attributeAdapterTypeName, serialNum);
}