diff options
Diffstat (limited to 'storage/src/tests/persistence')
-rw-r--r-- | storage/src/tests/persistence/has_mask_remapper_test.cpp | 15 | ||||
-rw-r--r-- | storage/src/tests/persistence/mergehandlertest.cpp | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/storage/src/tests/persistence/has_mask_remapper_test.cpp b/storage/src/tests/persistence/has_mask_remapper_test.cpp index 58f6f5b3fe7..de87797fb26 100644 --- a/storage/src/tests/persistence/has_mask_remapper_test.cpp +++ b/storage/src/tests/persistence/has_mask_remapper_test.cpp @@ -15,6 +15,7 @@ TEST(HasMaskRemapperTest, test_remap_none) for (uint32_t i = 0; i < (1u << merge_operation_nodes.size()); ++i) { EXPECT_EQ(i, remap_mask(i)); } + EXPECT_EQ(31u, remap_mask(255u)); } TEST(HasMaskRemapperTest, test_remap_subset) @@ -39,4 +40,18 @@ TEST(HasMaskRemapperTest, test_remap_swapped_subset) EXPECT_EQ((std::vector<uint16_t>{0u, 2u, 1u, 3u}), remapped); } +TEST(HasMaskRemapperTest, test_keep_unremapped_bits) +{ + NodeList reply_nodes{{0, true}, {1, true}, {3, false}}; + HasMaskRemapper remap_mask(merge_operation_nodes, reply_nodes); + EXPECT_EQ(20u, remap_mask(0u, (1u << 5) - 1)); + EXPECT_EQ(11u, remap_mask((1u << 3) - 1, 0u)); + EXPECT_EQ(31u, remap_mask((1u << 3) - 1, (1u << 5) - 1)); + EXPECT_EQ(24u, remap_mask(4u, 16u)); + HasMaskRemapper same_nodes_remap_mask(merge_operation_nodes, merge_operation_nodes); + EXPECT_EQ(31u, same_nodes_remap_mask(255u, 0u)); + EXPECT_EQ(224u, same_nodes_remap_mask(0u, 255u)); + EXPECT_EQ(255u, same_nodes_remap_mask(255u, 255u)); +} + } diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp index 7dad8260492..02527883022 100644 --- a/storage/src/tests/persistence/mergehandlertest.cpp +++ b/storage/src/tests/persistence/mergehandlertest.cpp @@ -1078,6 +1078,8 @@ TEST_F(MergeHandlerTest, remove_from_diff) { diff[1]._hasMask = 0x6; status.diff.insert(status.diff.end(), diff.begin(), diff.end()); + using NodeList = decltype(_nodes); + status.nodeList = NodeList{{0, true}, {1, true}, {2, true}}; { std::vector<api::ApplyBucketDiffCommand::Entry> applyDiff(2); |