diff options
Diffstat (limited to 'persistence/src/tests')
-rw-r--r-- | persistence/src/tests/dummyimpl/dummypersistence_test.cpp | 16 | ||||
-rw-r--r-- | persistence/src/tests/spi/clusterstatetest.cpp | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp index 2c245f377e1..3fa1a8a9b8d 100644 --- a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp +++ b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp @@ -19,14 +19,14 @@ namespace { struct Fixture { BucketContent content; - void insert(DocumentId id, Timestamp timestamp, DocumentMetaFlags meta_flags) { + void insert(DocumentId id, Timestamp timestamp, DocumentMetaEnum meta_flags) { content.insert(DocEntry::create(timestamp, meta_flags, id)); } Fixture() { - insert(DocumentId("id:ns:type::test:3"), Timestamp(3), DocumentMetaFlags::NONE); - insert(DocumentId("id:ns:type::test:1"), Timestamp(1), DocumentMetaFlags::NONE); - insert(DocumentId("id:ns:type::test:2"), Timestamp(2), DocumentMetaFlags::NONE); + insert(DocumentId("id:ns:type::test:3"), Timestamp(3), DocumentMetaEnum::NONE); + insert(DocumentId("id:ns:type::test:1"), Timestamp(1), DocumentMetaEnum::NONE); + insert(DocumentId("id:ns:type::test:2"), Timestamp(2), DocumentMetaEnum::NONE); } }; @@ -63,13 +63,13 @@ TEST_F("require that BucketContent can provide bucket info", Fixture) { uint32_t lastChecksum = 0; EXPECT_NOT_EQUAL(lastChecksum, f.content.getBucketInfo().getChecksum()); lastChecksum = f.content.getBucketInfo().getChecksum(); - f.insert(DocumentId("id:ns:type::test:3"), Timestamp(4), DocumentMetaFlags::NONE); + f.insert(DocumentId("id:ns:type::test:3"), Timestamp(4), DocumentMetaEnum::NONE); EXPECT_NOT_EQUAL(lastChecksum, f.content.getBucketInfo().getChecksum()); lastChecksum = f.content.getBucketInfo().getChecksum(); - f.insert(DocumentId("id:ns:type::test:2"), Timestamp(5), DocumentMetaFlags::REMOVE_ENTRY); + f.insert(DocumentId("id:ns:type::test:2"), Timestamp(5), DocumentMetaEnum::REMOVE_ENTRY); EXPECT_NOT_EQUAL(lastChecksum, f.content.getBucketInfo().getChecksum()); - f.insert(DocumentId("id:ns:type::test:1"), Timestamp(6), DocumentMetaFlags::REMOVE_ENTRY); - f.insert(DocumentId("id:ns:type::test:3"), Timestamp(7), DocumentMetaFlags::REMOVE_ENTRY); + f.insert(DocumentId("id:ns:type::test:1"), Timestamp(6), DocumentMetaEnum::REMOVE_ENTRY); + f.insert(DocumentId("id:ns:type::test:3"), Timestamp(7), DocumentMetaEnum::REMOVE_ENTRY); EXPECT_EQUAL(0u, f.content.getBucketInfo().getChecksum()); } diff --git a/persistence/src/tests/spi/clusterstatetest.cpp b/persistence/src/tests/spi/clusterstatetest.cpp index c6c523c202d..2186d408791 100644 --- a/persistence/src/tests/spi/clusterstatetest.cpp +++ b/persistence/src/tests/spi/clusterstatetest.cpp @@ -267,7 +267,7 @@ TEST(DocEntryTest, test_basics) { } TEST(DocEntryTest, test_meta_only) { - DocEntry::UP e = DocEntry::create(Timestamp(9), DocumentMetaFlags::NONE); + DocEntry::UP e = DocEntry::create(Timestamp(9), DocumentMetaEnum::NONE); EXPECT_EQ(9, e->getTimestamp()); EXPECT_FALSE(e->isRemove()); EXPECT_EQ(24, e->getSize()); @@ -276,13 +276,13 @@ TEST(DocEntryTest, test_meta_only) { EXPECT_EQ("", e->getDocumentType()); EXPECT_EQ(GlobalId(), e->getGid()); - DocEntry::UP r = DocEntry::create(Timestamp(666), DocumentMetaFlags::REMOVE_ENTRY); + DocEntry::UP r = DocEntry::create(Timestamp(666), DocumentMetaEnum::REMOVE_ENTRY); EXPECT_EQ(666, r->getTimestamp()); EXPECT_TRUE(r->isRemove()); } TEST(DocEntryTest, test_docid_only) { - DocEntry::UP e = DocEntry::create(Timestamp(9), DocumentMetaFlags::NONE, DocumentId("id:test:test::1")); + DocEntry::UP e = DocEntry::create(Timestamp(9), DocumentMetaEnum::NONE, DocumentId("id:test:test::1")); EXPECT_EQ(9, e->getTimestamp()); EXPECT_FALSE(e->isRemove()); EXPECT_EQ(16, e->getSize()); @@ -293,7 +293,7 @@ TEST(DocEntryTest, test_docid_only) { } TEST(DocEntryTest, test_doctype_and_gid) { - DocEntry::UP e = DocEntry::create(Timestamp(9), DocumentMetaFlags::NONE, "doc_type", GlobalId::parse("gid(0xc4cef118f9f9649222750be2)")); + DocEntry::UP e = DocEntry::create(Timestamp(9), DocumentMetaEnum::NONE, "doc_type", GlobalId::parse("gid(0xc4cef118f9f9649222750be2)")); EXPECT_EQ(9, e->getTimestamp()); EXPECT_FALSE(e->isRemove()); EXPECT_EQ(20, e->getSize()); |