diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-06 09:29:58 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-06 13:51:43 +0000 |
commit | 3110d9380650e0f68fad2a621ea71d083519446a (patch) | |
tree | 47e472faba8a07f8047424ef21c2d165f3265be4 /persistence/src/tests | |
parent | 6a27f0340bdc34b2ce3bbd1db29ca431ba8ed89e (diff) |
Simplify by avoid both DocumentSize and PersistedDocumentSize. That is the same.
Diffstat (limited to 'persistence/src/tests')
-rw-r--r-- | persistence/src/tests/dummyimpl/dummypersistence_test.cpp | 3 | ||||
-rw-r--r-- | persistence/src/tests/spi/clusterstatetest.cpp | 72 |
2 files changed, 27 insertions, 48 deletions
diff --git a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp index 21cf7cb9ae3..3b30f5e29ca 100644 --- a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp +++ b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp @@ -9,7 +9,6 @@ #include <vespa/vdslib/state/clusterstate.h> #include <vespa/config-stor-distribution.h> - using namespace storage::spi; using namespace storage; using document::test::makeBucketSpace; @@ -21,7 +20,7 @@ struct Fixture { BucketContent content; void insert(DocumentId id, Timestamp timestamp, int meta_flags) { - content.insert(DocEntry::UP(new DocEntry(timestamp, meta_flags, id))); + content.insert(DocEntry::create(timestamp, meta_flags, id)); } Fixture() { diff --git a/persistence/src/tests/spi/clusterstatetest.cpp b/persistence/src/tests/spi/clusterstatetest.cpp index 9d03cb982c8..205661ba930 100644 --- a/persistence/src/tests/spi/clusterstatetest.cpp +++ b/persistence/src/tests/spi/clusterstatetest.cpp @@ -262,62 +262,42 @@ TEST(ClusterStateTest, node_maintenance_state_is_set_independent_of_bucket_space } TEST(DocEntryTest, test_basics) { - EXPECT_EQ(40u, sizeof(DocEntry)); + EXPECT_EQ(24, sizeof(DocEntry)); } TEST(DocEntryTest, test_meta_only) { - DocEntry e(Timestamp(9), 0); - EXPECT_EQ(9, e.getTimestamp()); - EXPECT_FALSE(e.isRemove()); - EXPECT_EQ(40, e.getSize()); - EXPECT_EQ(0, e.getDocumentSize()); - EXPECT_EQ(0, e.getPersistedDocumentSize()); - EXPECT_EQ(nullptr, e.getDocument()); - EXPECT_EQ(nullptr, e.getDocumentId()); - - e.setPersistedDocumentSize(7); - EXPECT_EQ(40, e.getSize()); - EXPECT_EQ(0, e.getDocumentSize()); - EXPECT_EQ(7, e.getPersistedDocumentSize()); - - DocEntry r(Timestamp(666), 1); - EXPECT_EQ(666, r.getTimestamp()); - EXPECT_TRUE(r.isRemove()); + DocEntry::UP e = DocEntry::create(Timestamp(9), 0); + EXPECT_EQ(9, e->getTimestamp()); + EXPECT_FALSE(e->isRemove()); + EXPECT_EQ(24, e->getSize()); + EXPECT_EQ(0, e->getDocumentSize()); + EXPECT_EQ(nullptr, e->getDocument()); + EXPECT_EQ(nullptr, e->getDocumentId()); + + DocEntry::UP r = DocEntry::create(Timestamp(666), 1); + EXPECT_EQ(666, r->getTimestamp()); + EXPECT_TRUE(r->isRemove()); } TEST(DocEntryTest, test_docid_only) { - DocEntry e(Timestamp(9), 0, DocumentId("id:test:test::1")); - EXPECT_EQ(9, e.getTimestamp()); - EXPECT_FALSE(e.isRemove()); - EXPECT_EQ(56, e.getSize()); - EXPECT_EQ(16, e.getDocumentSize()); - EXPECT_EQ(16, e.getPersistedDocumentSize()); - EXPECT_EQ(nullptr, e.getDocument()); - EXPECT_NE(nullptr, e.getDocumentId()); - - e.setPersistedDocumentSize(7); - EXPECT_EQ(56, e.getSize()); - EXPECT_EQ(16, e.getDocumentSize()); - EXPECT_EQ(7, e.getPersistedDocumentSize()); - + DocEntry::UP e = DocEntry::create(Timestamp(9), 0, DocumentId("id:test:test::1")); + EXPECT_EQ(9, e->getTimestamp()); + EXPECT_FALSE(e->isRemove()); + EXPECT_EQ(48, e->getSize()); + EXPECT_EQ(16, e->getDocumentSize()); + EXPECT_EQ(nullptr, e->getDocument()); + EXPECT_NE(nullptr, e->getDocumentId()); } TEST(DocEntryTest, test_document_only) { document::TestDocMan testDocMan; - DocEntry e(Timestamp(9), 0, testDocMan.createRandomDocument(0, 1000)); - EXPECT_EQ(9, e.getTimestamp()); - EXPECT_FALSE(e.isRemove()); - EXPECT_EQ(672, e.getSize()); - EXPECT_EQ(632, e.getDocumentSize()); - EXPECT_EQ(632, e.getPersistedDocumentSize()); - EXPECT_NE(nullptr, e.getDocument()); - EXPECT_NE(nullptr, e.getDocumentId()); - - e.setPersistedDocumentSize(7); - EXPECT_EQ(672, e.getSize()); - EXPECT_EQ(632, e.getDocumentSize()); - EXPECT_EQ(7, e.getPersistedDocumentSize()); - + DocEntry::UP e = DocEntry::create(Timestamp(9), 0, testDocMan.createRandomDocument(0, 1000)); + EXPECT_EQ(9, e->getTimestamp()); + EXPECT_FALSE(e->isRemove()); + EXPECT_EQ(664, e->getSize()); + EXPECT_EQ(632, e->getDocumentSize()); + EXPECT_NE(nullptr, e->getDocument()); + EXPECT_NE(nullptr, e->getDocumentId()); } } |