diff options
Diffstat (limited to 'storage/src/tests/persistence')
-rw-r--r-- | storage/src/tests/persistence/splitbitdetectortest.cpp | 14 | ||||
-rw-r--r-- | storage/src/tests/persistence/testandsettest.cpp | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/storage/src/tests/persistence/splitbitdetectortest.cpp b/storage/src/tests/persistence/splitbitdetectortest.cpp index d4e84836a5a..5c4dc85e825 100644 --- a/storage/src/tests/persistence/splitbitdetectortest.cpp +++ b/storage/src/tests/persistence/splitbitdetectortest.cpp @@ -15,6 +15,8 @@ using namespace ::testing; namespace storage { +using DocEntryList = std::vector<spi::DocEntry::UP>; + struct SplitBitDetectorTest : Test { document::TestDocMan testDocMan; spi::dummy::DummyPersistence provider; @@ -33,7 +35,7 @@ struct SplitBitDetectorTest : Test { }; TEST_F(SplitBitDetectorTest, two_users) { - std::vector<spi::DocEntry::UP> entries; + DocEntryList entries; for (uint32_t i = 0; i < 5; ++i) { document::Document::SP doc( testDocMan.createRandomDocumentAtLocation(1, i, 1, 1)); @@ -54,7 +56,7 @@ TEST_F(SplitBitDetectorTest, two_users) { } TEST_F(SplitBitDetectorTest, single_user) { - std::vector<spi::DocEntry::UP> entries; + DocEntryList entries; for (uint32_t i = 0; i < 10; ++i) { document::Document::SP doc( testDocMan.createRandomDocumentAtLocation(1, i, 1, 1)); @@ -71,7 +73,7 @@ TEST_F(SplitBitDetectorTest, single_user) { TEST_F(SplitBitDetectorTest, max_bits) { int minContentSize = 1, maxContentSize = 1; - std::vector<spi::DocEntry::UP> entries; + DocEntryList entries; for (uint32_t seed = 0; seed < 10; ++seed) { int location = 1; document::Document::SP doc(testDocMan.createRandomDocumentAtLocation( @@ -92,7 +94,7 @@ TEST_F(SplitBitDetectorTest, max_bits_one_below_max) { provider.createBucket(my_bucket, context); - std::vector<spi::DocEntry::UP> entries; + DocEntryList entries; for (uint32_t seed = 0; seed < 10; ++seed) { int location = 1 | (seed % 2 == 0 ? 0x8000 : 0); document::Document::SP doc(testDocMan.createRandomDocumentAtLocation( @@ -114,7 +116,7 @@ TEST_F(SplitBitDetectorTest, max_bits_one_below_max) { } TEST_F(SplitBitDetectorTest, unsplittable) { - std::vector<spi::DocEntry::UP> entries; + DocEntryList entries; for (uint32_t i = 0; i < 10; ++i) { document::Document::SP doc( @@ -130,7 +132,7 @@ TEST_F(SplitBitDetectorTest, unsplittable) { } TEST_F(SplitBitDetectorTest, unsplittable_min_count) { - std::vector<spi::DocEntry::UP> entries; + DocEntryList entries; for (uint32_t i = 0; i < 10; ++i) { document::Document::SP doc( diff --git a/storage/src/tests/persistence/testandsettest.cpp b/storage/src/tests/persistence/testandsettest.cpp index f6e48d6c325..8cf89b55ad0 100644 --- a/storage/src/tests/persistence/testandsettest.cpp +++ b/storage/src/tests/persistence/testandsettest.cpp @@ -74,7 +74,7 @@ struct TestAndSetTest : PersistenceTestUtils { static std::string expectedDocEntryString( api::Timestamp timestamp, const document::DocumentId & testDocId, - spi::DocumentMetaFlags removeFlag = spi::DocumentMetaFlags::NONE); + spi::DocumentMetaEnum removeFlag = spi::DocumentMetaEnum::NONE); }; TEST_F(TestAndSetTest, conditional_put_not_executed_on_condition_mismatch) { @@ -151,7 +151,7 @@ TEST_F(TestAndSetTest, conditional_remove_executed_on_condition_match) { ASSERT_EQ(fetchResult(asyncHandler->handleRemove(*remove, createTracker(remove, BUCKET))).getResult(), api::ReturnCode::Result::OK); EXPECT_EQ(expectedDocEntryString(timestampOne, testDocId) + - expectedDocEntryString(timestampTwo, testDocId, spi::DocumentMetaFlags::REMOVE_ENTRY), + expectedDocEntryString(timestampTwo, testDocId, spi::DocumentMetaEnum::REMOVE_ENTRY), dumpBucket(BUCKET_ID)); } @@ -292,12 +292,12 @@ void TestAndSetTest::assertTestDocumentFoundAndMatchesContent(const document::Fi std::string TestAndSetTest::expectedDocEntryString( api::Timestamp timestamp, const document::DocumentId & docId, - spi::DocumentMetaFlags removeFlag) + spi::DocumentMetaEnum removeFlag) { std::stringstream ss; ss << "DocEntry(" << timestamp << ", " << int(removeFlag) << ", "; - if (removeFlag == spi::DocumentMetaFlags::REMOVE_ENTRY) { + if (removeFlag == spi::DocumentMetaEnum::REMOVE_ENTRY) { ss << docId << ")\n"; } else { ss << "Doc(" << docId << "))\n"; |